Slackware 13.0slackware-13.0

Wed Aug 26 10:00:38 CDT 2009
Slackware 13.0 x86_64 is released as stable!  Thanks to everyone who
helped make this release possible -- see the RELEASE_NOTES for the
credits.  The ISOs are off to the replicator.  This time it will be a
6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We're taking pre-orders now at store.slackware.com.  Please consider
picking up a copy to help support the project.  Once again, thanks to
the entire Slackware community for all the help testing and fixing
things and offering suggestions during this development cycle.
As always, have fun and enjoy!  -P.

932 files changed, 213801 insertions, 0 deletions

diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild
new file mode 100755
index 000000000..3d1a73051
--- /dev/null
+++ b/source/a/aaa_base/aaa_base.SlackBuild
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=13.0
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-aaa_base
+
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_aaa_base.tar.gz
+
+echo "+======================+"
+echo "| repackaging aaa_base |"
+echo "+======================+"
+
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/slackware-version > $PKG/etc/slackware-version
+
+# Add lib64 directories on x86_64:
+if [ "$ARCH" = "x86_64" ]; then
+  mkdir -p $PKG/lib64 $PKG/usr/lib64 $PKG/usr/local/lib64
+fi
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/aaa_base-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $PKG
+fi
diff --git a/source/a/aaa_base/slack-desc b/source/a/aaa_base/slack-desc
new file mode 100644
index 000000000..011f90fb4
--- /dev/null
+++ b/source/a/aaa_base/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------------------------------------------------------|
+aaa_base: aaa_base (Basic Linux filesystem package)
+aaa_base:
+aaa_base: Sets up the empty directory tree for Slackware and adds an email to
+aaa_base: root's mailbox welcoming them to Linux. :)  This package should be
+aaa_base: installed first, and never uninstalled.
+aaa_base:
+aaa_base:
+aaa_base:
+aaa_base:
+aaa_base:
+aaa_base:
diff --git a/source/a/aaa_base/slackware-version b/source/a/aaa_base/slackware-version
new file mode 100644
index 000000000..0c779cf82
--- /dev/null
+++ b/source/a/aaa_base/slackware-version
@@ -0,0 +1 @@
+Slackware 13.0.0.0.0
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
new file mode 100755
index 000000000..fd5ade86f
--- /dev/null
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/sh
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=aaa_elflibs
+VERSION=${VERSION:-13.0}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $PKG
+cat $CWD/symlinks-to-tracked-libs \
+  | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
+        -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
+  | while read library ; do
+  ( [ ! -e $library ] && continue
+    echo "Adding $library"
+    mkdir -p $(dirname $library | cut -b2- )
+    cd $(dirname $library | cut -b2- )
+    rm -f $(basename $library)
+    cp -a $library .
+    rm -f $(readlink $library)
+    cp -a $(dirname $library)/$(readlink $library) .
+  )
+done
+cat $CWD/tracked-files \
+  | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
+        -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
+  | while read library ; do
+  ( [ ! -e $library ] && continue
+    echo "Adding $library"
+    mkdir -p $(dirname $library | cut -b2- )
+    cd $(dirname $library | cut -b2- )
+    rm -f $(basename $library)
+    cp -a $library .
+  )
+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/a/aaa_elflibs/slack-desc b/source/a/aaa_elflibs/slack-desc
new file mode 100644
index 000000000..29a6c8fbe
--- /dev/null
+++ b/source/a/aaa_elflibs/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------------------------------------------------------|
+aaa_elflibs: aaa_elflibs (shared libraries needed by many programs)
+aaa_elflibs:
+aaa_elflibs: This is a collection of shared libraries needed to run Linux programs.
+aaa_elflibs: ELF (Executable and Linking Format) is the standard Linux binary 
+aaa_elflibs: format.  These libraries are gathered from other Slackware packages
+aaa_elflibs: and are intended to give a fairly complete initial set of libraries.
+aaa_elflibs: This package should be not upgraded or reinstalled (it could copy
+aaa_elflibs: over newer library versions).
+aaa_elflibs:
+aaa_elflibs:
+aaa_elflibs:
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs
new file mode 100644
index 000000000..b8c2c758a
--- /dev/null
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs
@@ -0,0 +1,55 @@
+/lib/libacl.so.1
+/lib/libattr.so.1
+/lib/libbz2.so.1
+/lib/libbz2.so.1.0
+/lib/libcap.so.2
+/lib/libdm.so.0
+/lib/libfuse.so.2
+/lib/libgpm.so.1
+/lib/libncurses.so.5
+/lib/libncursesw.so.5
+/lib/libsysfs.so.2
+/lib/libtermcap.so.2
+/usr/lib/libasound.so.2
+/usr/lib/libcurl.so.2
+/usr/lib/libcurl.so.3
+/usr/lib/libcurl.so.4
+/usr/lib/libexpat.so.0
+/usr/lib/libexpat.so.1
+/usr/lib/libform.so.5
+/usr/lib/libformw.so.5
+/usr/lib/libfreetype.so.6
+/usr/lib/libgdbm.so.2
+/usr/lib/libgdbm.so.3
+/usr/lib/libglib-2.0.so.0
+/usr/lib/libgmodule-2.0.so.0
+/usr/lib/libgmp.so.3
+/usr/lib/libgmpxx.so.3
+/usr/lib/libgobject-2.0.so.0
+/usr/lib/libgthread-2.0.so.0
+/usr/lib/libhistory.so.4
+/usr/lib/libhistory.so.5
+/usr/lib/libidn.so.11
+/usr/lib/libjpeg.so.62
+/usr/lib/liblber-2.3.so.0
+/usr/lib/libldap-2.3.so.0
+/usr/lib/libmenu.so.5
+/usr/lib/libmenuw.so.5
+/usr/lib/libmm.so.14
+/usr/lib/libmp.so.3
+/usr/lib/libpanel.so.5
+/usr/lib/libpanelw.so.5
+/usr/lib/libpcre.so.0
+/usr/lib/libpcreposix.so.0
+/usr/lib/libpng.so.3
+/usr/lib/libpng12.so.0
+/usr/lib/libpopt.so.0
+/usr/lib/libreadline.so.4
+/usr/lib/libreadline.so.5
+/usr/lib/libslang.so.1
+/usr/lib/libslang.so.2
+/usr/lib/libtiff.so.3
+/usr/lib/libusb-0.1.so.4
+/usr/lib/libvga.so.1
+/usr/lib/libvgagl.so.1
+/usr/lib/libz.so.1
diff --git a/source/a/aaa_elflibs/tracked-files b/source/a/aaa_elflibs/tracked-files
new file mode 100644
index 000000000..16b731ba0
--- /dev/null
+++ b/source/a/aaa_elflibs/tracked-files
@@ -0,0 +1,8 @@
+/lib/libdb-3.1.so
+/lib/libdb-3.3.so
+/lib/libdb-4.2.so
+/lib/libdb-4.4.so
+/lib/libdevmapper.so.1.02
+/usr/lib/libcups.so.2
+/usr/lib/libcupsimage.so.2
+/usr/lib/libgcc_s.so.1
diff --git a/source/a/aaa_terminfo/aaa_terminfo.SlackBuild b/source/a/aaa_terminfo/aaa_terminfo.SlackBuild
new file mode 100755
index 000000000..a1e7d288f
--- /dev/null
+++ b/source/a/aaa_terminfo/aaa_terminfo.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=aaa_terminfo
+# Note the version of ncurses in use:
+VERSION=${VERSION:-5.7}
+ARCH=${ARCH:-noarch}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Best do this on a machine with the terminfo
+# updated already.  ;-)
+cd $PKG
+
+# I wonder if anything still looks here?
+mkdir -p usr/lib${LIBDIRSUFFIX}
+( cd usr/lib${LIBDIRSUFFIX}
+  rm -rf terminfo
+  ln -sf /usr/share/terminfo terminfo
+)
+
+# This has been the tradition starter collection since forever.
+for dir in l n u v x ; do
+  mkdir -p usr/share/terminfo/$dir
+  ( cd usr/share/terminfo/$dir
+    cp -a /usr/share/terminfo/$dir/* .
+  )
+done
+
+# Remove dangling symlinks:
+( cd usr/share/terminfo
+  for file in $(find . -type l) ; do
+    if [ "$(readlink -e $file)" = "" ]; then
+      rm --verbose $file
+    fi
+  done
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $TMP/package-${PKGNAM}
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/aaa_terminfo/slack-desc b/source/a/aaa_terminfo/slack-desc
new file mode 100644
index 000000000..d393062f1
--- /dev/null
+++ b/source/a/aaa_terminfo/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------------------------------------------------------|
+aaa_terminfo: aaa_terminfo (a basic collection of terminfo entries)
+aaa_terminfo:
+aaa_terminfo: This is a starter set of files from the terminfo database, which
+aaa_terminfo: should be enough in most cases.  The complete set (from which this
+aaa_terminfo: is derived) can be found in the ncurses package.
+aaa_terminfo:
+aaa_terminfo: The terminfo database describes the characteristics of terminals, so
+aaa_terminfo: don't try to log in without this package.  :-)
+aaa_terminfo:
+aaa_terminfo:
+aaa_terminfo:
diff --git a/source/a/acl/acl.SlackBuild b/source/a/acl/acl.SlackBuild
new file mode 100755
index 000000000..7ad70d045
--- /dev/null
+++ b/source/a/acl/acl.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=2.2.47-1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-acl
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+
+rm -rf acl-$(echo $VERSION | cut -f 1 -d '-')
+tar xzvf $CWD/acl_$VERSION.tar.gz
+cd acl-$(echo $VERSION | cut -f 1 -d '-')
+
+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 {} \;
+
+# Add DESTDIR support and improve docs install location:
+zcat $CWD/acl.destdir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit
+
+# Make sure you have the same version of autoconf as the
+# developers did...  ;-)
+autoconf
+
+./configure \
+  --prefix=/ \
+  --exec-prefix=/ \
+  --sbindir=/bin \
+  --bindir=/usr/bin \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/lib${LIBDIRSUFFIX} \
+  --includedir=/usr/include \
+  --mandir=/usr/man \
+  --datadir=/usr/share
+
+make || exit 1
+make install DESTDIR=$PKG
+make install-dev DESTDIR=$PKG
+make install-lib DESTDIR=$PKG
+
+mv $PKG/usr/share/doc $PKG/usr
+( cd $PKG/usr/doc ; mv acl acl-$VERSION )
+#It would be nice to keep the same timestamps that the files have in the source:
+cp -a \
+  README doc/COPYING doc/PORTING \
+  $PKG/usr/doc/acl-$VERSION
+
+( 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
+)
+strip -g $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+# Remove bogus files:
+rm -f $PKG/lib${LIBDIRSUFFIX}/*.a $PKG/lib${LIBDIRSUFFIX}/libacl.so $PKG/lib${LIBDIRSUFFIX}/*.la $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+# Make /usr/lib${LIBDIRSUFFIX}/libacl.so a symlink to /lib${LIBDIRSUFFIX}:
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  rm -f libacl.so
+  ln -sf /lib${LIBDIRSUFFIX}/libacl.so.1 libacl.so
+)
+# Fix shared library perms:
+chmod 755 $PKG/lib${LIBDIRSUFFIX}/*
+
+# Gzip the man pages:
+( cd $PKG/usr/man
+  for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  gzip -9 */*.?
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/acl-$(echo $VERSION | tr - _ )-$ARCH-$BUILD.txz
+
diff --git a/source/a/acl/acl.destdir.diff b/source/a/acl/acl.destdir.diff
new file mode 100644
index 000000000..df284724b
--- /dev/null
+++ b/source/a/acl/acl.destdir.diff
@@ -0,0 +1,36 @@
+--- ./include/buildmacros.orig	2007-09-10 21:00:47.000000000 -0500
++++ ./include/buildmacros	2008-03-31 23:58:16.000000000 -0500
+@@ -27,7 +27,7 @@
+ 	  $(LFILES:.l=.o) \
+ 	  $(YFILES:%.y=%.tab.o)
+ 
+-INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/install-sh
+ 
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
+--- ./include/builddefs.in.orig	2007-09-10 21:00:47.000000000 -0500
++++ ./include/builddefs.in	2008-03-31 23:58:16.000000000 -0500
+@@ -27,14 +27,14 @@
+ PKG_VERSION	= @pkg_version@
+ PKG_PLATFORM	= @pkg_platform@
+ PKG_DISTRIBUTION= @pkg_distribution@
+-PKG_BIN_DIR	= @bindir@
+-PKG_SBIN_DIR	= @sbindir@
+-PKG_LIB_DIR	= @libdir@@libdirsuffix@
+-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
+-PKG_INC_DIR	= @includedir@
+-PKG_MAN_DIR	= @mandir@
+-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
+-PKG_LOCALE_DIR	= @datadir@/locale
++PKG_BIN_DIR	= $(DESTDIR)@bindir@
++PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
++PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
++PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
++PKG_INC_DIR	= $(DESTDIR)@includedir@
++PKG_MAN_DIR	= $(DESTDIR)@mandir@
++PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@
++PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
+ 
+ CC		= @cc@
+ AWK		= @awk@
diff --git a/source/a/acl/slack-desc b/source/a/acl/slack-desc
new file mode 100644
index 000000000..9609c5854
--- /dev/null
+++ b/source/a/acl/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------------------------------------------------------|
+acl: acl (tools for using POSIX Access Control Lists)
+acl:
+acl: This package contains a set of tools and libraries for manipulating
+acl: POSIX Access Control Lists.  POSIX Access Control Lists (defined in
+acl: POSIX 1003.1e draft standard 17) are used to define more fine-grained
+acl: discretionary access rights for files and directories.
+acl:
+acl:
+acl:
+acl:
+acl:
diff --git a/source/a/acpid/acpi_handler.sh b/source/a/acpid/acpi_handler.sh
new file mode 100644
index 000000000..386fa8d05
--- /dev/null
+++ b/source/a/acpid/acpi_handler.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Default acpi script that takes an entry for all actions
+
+IFS=${IFS}/
+set $@
+
+case "$1" in
+  button)
+    case "$2" in
+      power) /sbin/init 0
+         ;;
+      *) logger "ACPI action $2 is not defined"
+         ;;
+    esac
+    ;;
+  *)
+    logger "ACPI group $1 / action $2 is not defined"
+    ;;
+esac
diff --git a/source/a/acpid/acpid.SlackBuild b/source/a/acpid/acpid.SlackBuild
new file mode 100755
index 000000000..3010e0136
--- /dev/null
+++ b/source/a/acpid/acpid.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Copyright 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=1.0.8
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-acpid
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf acpid-$VERSION
+tar xvf $CWD/acpid-$VERSION.tar.?z* || exit 1
+cd acpid-$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 || exit 1
+strip acpid acpi_listen
+mkdir -p $PKG/usr/sbin
+cat acpid > $PKG/usr/sbin/acpid
+chmod 755 $PKG/usr/sbin/acpid
+mkdir -p $PKG/usr/bin
+cat acpi_listen > $PKG/usr/bin/acpi_listen
+chmod 755 $PKG/usr/bin/acpi_listen
+mkdir -p $PKG/usr/man/man8
+cat acpid.8 | gzip -9c > $PKG/usr/man/man8/acpid.8.gz
+cat acpi_listen.8 | gzip -9c > $PKG/usr/man/man8/acpi_listen.8.gz
+mkdir -p $PKG/usr/doc/acpid-$VERSION
+cp -a Changelog README \
+  $PKG/usr/doc/acpid-$VERSION
+cp -a samples $PKG/usr/doc/acpid-$VERSION
+mkdir -p $PKG/etc/acpi/events
+zcat $CWD/acpi_handler.sh.gz > $PKG/etc/acpi/acpi_handler.sh.new
+chmod 755 $PKG/etc/acpi/acpi_handler.sh.new
+zcat $CWD/default.gz > $PKG/etc/acpi/events/default
+mkdir -p $PKG/etc/rc.d
+zcat $CWD/rc.acpid.gz > $PKG/etc/rc.d/rc.acpid
+chmod 755 $PKG/etc/rc.d/rc.acpid
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/acpid-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/acpid/default b/source/a/acpid/default
new file mode 100644
index 000000000..db1233908
--- /dev/null
+++ b/source/a/acpid/default
@@ -0,0 +1,18 @@
+# This is the ACPID default configuration, it takes all
+# events and passes them to /etc/acpi/default.sh for further
+# processing.
+
+# event keeps a regular expression matching the event. To get
+# power events only, just use something like "event=button power.*"
+# to catch it.
+# action keeps the command to be executed after an event occurs
+# In case of the power event above, your entry may look this way:
+#event=button power.*
+#action=/sbin/init 0
+
+# Optionally you can specify the placeholder %e. It will pass
+# through the whole kernel event message to the program you've
+# specified.
+
+event=.*
+action=/etc/acpi/acpi_handler.sh %e
diff --git a/source/a/acpid/doinst.sh b/source/a/acpid/doinst.sh
new file mode 100644
index 000000000..c090b9fe5
--- /dev/null
+++ b/source/a/acpid/doinst.sh
@@ -0,0 +1,13 @@
+#!/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 etc/acpi/acpi_handler.sh.new
diff --git a/source/a/acpid/rc.acpid b/source/a/acpid/rc.acpid
new file mode 100644
index 000000000..32486d17c
--- /dev/null
+++ b/source/a/acpid/rc.acpid
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Start/stop/restart acpid.
+
+# Start acpid:
+acpid_start() {
+  if [ -x /usr/sbin/acpid -a -d /proc/acpi ]; then
+    echo "Starting ACPI daemon:  /usr/sbin/acpid"
+    /usr/sbin/acpid
+  fi
+}
+
+# Stop acpid:
+acpid_stop() {
+  killall acpid
+}
+
+# Restart acpid:
+acpid_restart() {
+  acpid_stop
+  sleep 1
+  acpid_start
+}
+
+case "$1" in
+'start')
+  acpid_start
+  ;;
+'stop')
+  acpid_stop
+  ;;
+'restart')
+  acpid_restart
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/source/a/acpid/slack-desc b/source/a/acpid/slack-desc
new file mode 100644
index 000000000..b72ac8e62
--- /dev/null
+++ b/source/a/acpid/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------------------------------------------------------|
+acpid: acpid (ACPI daemon)
+acpid:
+acpid: Most modern computers support the Advanced Configuration and Power
+acpid: Interface (ACPI) standard to allow intelligent power management.
+acpid: This package contains acpid, which is the user-space daemon needed in
+acpid: order to make the Linux ACPI support completely functional.
+acpid:
+acpid: ACPI must be compiled into the kernel to run acpid.
+acpid:
+acpid:
+acpid:
diff --git a/source/a/apmd/apmd.SlackBuild b/source/a/apmd/apmd.SlackBuild
new file mode 100755
index 000000000..13e472735
--- /dev/null
+++ b/source/a/apmd/apmd.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=${VERSION:-3.2.2}
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-apmd
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf apmd-$VERSION
+tar xvf $CWD/apmd-$VERSION.tar.bz2 || exit 1
+cd apmd-$VERSION
+
+if [ "$ARCH" = "x86_64" ]; then
+  sed -i -e "s#/lib#/lib64#" Makefile
+fi
+
+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="$SLKCFLAGS" make $NUMJOBS || exit 1
+CFLAGS="$SLKCFLAGS" make install DESTDIR=$PKG
+
+( cd xbattery
+  cp ../.libs/libapm.a ..
+  xmkmf
+  make -j3 
+)
+
+mkdir -p $PKG/usr/bin
+cat xapm > $PKG/usr/bin/xapm
+cat xbattery/xbattery > $PKG/usr/bin/xbattery
+chmod 755 $PKG/usr/bin/{xapm,xbattery}
+
+( 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
+)
+
+mkdir -p $PKG/usr/man/man1
+cat xbattery/xbattery.man | gzip -9c > $PKG/usr/man/man1/xbattery.1.gz
+for page in apm.1 apmsleep.1 on_ac_power.1 xapm.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/${page}.gz
+done
+mkdir -p $PKG/usr/man/man8
+cat apmd.8 | gzip -9c > $PKG/usr/man/man8/apmd.8.gz
+mkdir -p $PKG/usr/man/fr/man1
+cat apmsleep.fr.1 | gzip -9c > $PKG/usr/man/fr/man1/apmsleep.1.gz
+
+mkdir -p $PKG/usr/doc/apmd-$VERSION
+cp -a \
+  AUTHORS COPYING LSM README apmlib.COPYING apmsleep.README \
+  $PKG/usr/doc/apmd-$VERSION
+cp -a xbattery/README $PKG/usr/doc/apmd-$VERSION/README.xbattery
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -c n -l y $TMP/apmd-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/apmd/slack-desc b/source/a/apmd/slack-desc
new file mode 100644
index 000000000..a6f5c9a65
--- /dev/null
+++ b/source/a/apmd/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------------------------------------------------------|
+apmd: apmd (Advanced Power Management daemon)
+apmd:
+apmd: apmd is an APM monitoring daemon, and works in conjunction with the
+apmd: APM BIOS driver in the kernel.  Apmd (and the included tools) handle
+apmd: tasks such as automatically putting a laptop into suspend when the
+apmd: power level drop below a certain point.  This package also includes
+apmd: the graphical power management tools xapm and xbattery.
+apmd:
+apmd: The apmd tools were written by Rik Faith and are maintained by
+apmd: Avery Pennarun.  xbattery was written by Nathan Sidwell.
+apmd:
diff --git a/source/a/attr/attr.SlackBuild b/source/a/attr/attr.SlackBuild
new file mode 100755
index 000000000..9c16a8d60
--- /dev/null
+++ b/source/a/attr/attr.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Copyright 2005-2008, 2009  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.
+
+VERSION=2.4.43-1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-attr
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf attr-$(echo $VERSION | cut -f 1 -d '-')
+tar xzvf $CWD/attr_$VERSION.tar.gz
+cd attr-$(echo $VERSION | cut -f 1 -d '-')
+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 {} \;
+
+# Add DESTDIR support and improve docs install location:
+zcat $CWD/attr.destdir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
+# The 1/2 assed job has begun...  the onus of running autoconf should never
+# be placed on packagers.  They may not have the same autotools versions.
+autoconf
+
+./configure \
+  --prefix=/ \
+  --exec-prefix=/ \
+  --sbindir=/bin \
+  --bindir=/usr/bin \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/lib${LIBDIRSUFFIX} \
+  --includedir=/usr/include \
+  --mandir=/usr/man \
+  --datadir=/usr/share
+
+make || exit 1
+make install DESTDIR=$PKG
+make install-dev DESTDIR=$PKG
+make install-lib DESTDIR=$PKG
+
+mv $PKG/usr/share/doc $PKG/usr
+( cd $PKG/usr/doc ; mv attr attr-$VERSION )
+#It would be nice to keep the same timestamps that the files have in the source:
+rm -rf $PKG/usr/doc/attr-$VERSION/ea-conv
+cp -a \
+  README doc/COPYING doc/PORTING doc/ea-conv \
+  $PKG/usr/doc/attr-$VERSION
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+strip -g $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+# Remove bogus files:
+rm -f $PKG/lib${LIBDIRSUFFIX}/*.a $PKG/lib${LIBDIRSUFFIX}/libattr.so $PKG/lib${LIBDIRSUFFIX}/*.la $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+# Make /usr/lib${LIBDIRSUFFIX}/libattr.so a symlink to /lib${LIBDIRSUFFIX}:
+( cd $PKG/usr/lib${LIBDIRSUFFIX} ; rm -f libattr.so ; ln -sf /lib${LIBDIRSUFFIX}/libattr.so.1 libattr.so )
+# Fix shared library perms:
+chmod 755 $PKG/lib${LIBDIRSUFFIX}/*
+
+# Gzip the man pages:
+( cd $PKG/usr/man
+  for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  gzip -9 */*.?
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/attr-$(echo $VERSION | tr - _ )-$ARCH-$BUILD.txz
+
diff --git a/source/a/attr/attr.destdir.diff b/source/a/attr/attr.destdir.diff
new file mode 100644
index 000000000..ced69eefb
--- /dev/null
+++ b/source/a/attr/attr.destdir.diff
@@ -0,0 +1,36 @@
+--- ./include/buildmacros.orig	2007-09-10 21:00:49.000000000 -0500
++++ ./include/buildmacros	2008-03-31 23:54:02.000000000 -0500
+@@ -27,7 +27,7 @@
+ 	  $(LFILES:.l=.o) \
+ 	  $(YFILES:%.y=%.tab.o)
+ 
+-INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/install-sh
+ 
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
+--- ./include/builddefs.in.orig	2007-09-10 21:00:49.000000000 -0500
++++ ./include/builddefs.in	2008-03-31 23:54:02.000000000 -0500
+@@ -27,14 +27,14 @@
+ PKG_VERSION	= @pkg_version@
+ PKG_PLATFORM	= @pkg_platform@
+ PKG_DISTRIBUTION= @pkg_distribution@
+-PKG_BIN_DIR	= @bindir@
+-PKG_SBIN_DIR	= @sbindir@
+-PKG_LIB_DIR	= @libdir@@libdirsuffix@
+-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
+-PKG_INC_DIR	= @includedir@/attr
+-PKG_MAN_DIR	= @mandir@
+-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
+-PKG_LOCALE_DIR	= @datadir@/locale
++PKG_BIN_DIR	= $(DESTDIR)@bindir@
++PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
++PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
++PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
++PKG_INC_DIR	= $(DESTDIR)@includedir@/attr
++PKG_MAN_DIR	= $(DESTDIR)@mandir@
++PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@
++PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
+ 
+ CC		= @cc@
+ AWK		= @awk@
diff --git a/source/a/attr/build b/source/a/attr/build
new file mode 100644
index 000000000..52b6039a1
--- /dev/null
+++ b/source/a/attr/build
@@ -0,0 +1,7 @@
+I think I used this build order...  -P.
+
+1. attr
+2. acl
+3. xfsprogs
+4. dmapi
+5. xfsdump
diff --git a/source/a/attr/slack-desc b/source/a/attr/slack-desc
new file mode 100644
index 000000000..e9220f2fb
--- /dev/null
+++ b/source/a/attr/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------------------------------------------------------|
+attr: attr (tools for using extended attributes on filesystems)
+attr:
+attr: This package contains a set of tools for manipulating extended
+attr: attributes (name:value pairs associated permanently with files and
+attr: directories) on filesystem objects, and the library and header files
+attr: needed to develop programs which make use of extended attributes.
+attr: Extended attributes are used to provide additional functionality to
+attr: a filesystem.  For example, Access Control Lists (ACLs) are
+attr: implemented using extended attributes.
+attr:
+attr:
diff --git a/source/a/bash/bash.SlackBuild b/source/a/bash/bash.SlackBuild
new file mode 100755
index 000000000..04c8ff953
--- /dev/null
+++ b/source/a/bash/bash.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=3.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-bash
+
+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"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Determine bash patchlevel:
+PATCHLEVEL=`( cd $CWD/patches ; /bin/ls *gz | tail -1 | cut -f 2 -d - | cut -f 1 -d . 2> /dev/null )`
+if [ "$PATCHLEVEL" = "" ]; then
+  PATCHLEVEL=0
+fi
+
+cd $TMP
+rm -rf bash-$VERSION
+tar xzvf $CWD/bash-$VERSION.tar.gz || exit 1
+cd bash-$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 {} \;
+
+for patch in $CWD/patches/bash* ; do
+  zcat $patch | patch -p0 --verbose || exit 1
+done
+CFLAGS="$SLKCFLAGS" \
+./configure --prefix=/usr $ARCH-slackware-linux
+make -j3 || exit 1
+make install DESTDIR=$PKG
+mkdir -p $PKG/bin
+mv $PKG/usr/bin/bash $PKG/bin/bash2.new
+strip --strip-unneeded $PKG/bin/bash2.new
+# We don't include the "bashbug" script.
+rm -rf $PKG/usr/bin $PKG/usr/man/man1/bashbug.1
+gzip -9 $PKG/usr/man/man1/*
+mkdir -p $PKG/usr/doc/bash-$VERSION
+cp -a AUTHORS CHANGES COMPAT COPYING INSTALL MANIFEST NEWS NOTES \
+  README Y2K doc/FAQ doc/INTRO $PKG/usr/doc/bash-$VERSION
+cd doc
+groff -ms -Tascii article.ms > $PKG/usr/doc/bash-$VERSION/article.txt
+# bash.1 is already installed by "make install"
+for page in builtins.1 rbash.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
+done
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/bash-$VERSION.$PATCHLEVEL-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/bash-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/a/bash/doinst.sh b/source/a/bash/doinst.sh
new file mode 100644
index 000000000..21760838d
--- /dev/null
+++ b/source/a/bash/doinst.sh
@@ -0,0 +1,18 @@
+if [ -r bin/bash ]; then
+  mv bin/bash bin/bash.old
+fi
+mv bin/bash2.new bin/bash
+if [ -f bin/bash.old ]; then
+  rm -f bin/bash.old
+fi
+if [ ! -r etc/shells ]; then
+  touch etc/shells
+  chmod 644 etc/shells
+fi
+if fgrep "/bin/bash" etc/shells 1> /dev/null 2> /dev/null ; then
+  true
+else
+  echo "/bin/bash" >> etc/shells
+fi
+( cd usr/bin ; rm -rf bash )
+( cd usr/bin ; ln -sf /bin/bash bash )
diff --git a/source/a/bash/patches/bash31-001 b/source/a/bash/patches/bash31-001
new file mode 100644
index 000000000..4a10a02c1
--- /dev/null
+++ b/source/a/bash/patches/bash31-001
@@ -0,0 +1,104 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-001
+
+Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>
+Bug-Reference-ID: <20051212015924.GA820@toucan.gentoo.org> <20051214034438.GK1863@toucan.gentoo.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00030.html http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00041.html
+
+Bug-Description:
+
+There are parsing problems with compound assignments in several contexts,
+including as arguments to builtins like `local', `eval', and `let', and
+as multiple assignments in a single command.
+
+Patch:
+
+*** ../bash-3.1/parse.y	Fri Nov 11 23:14:18 2005
+--- parse.y	Fri Dec 16 20:43:07 2005
+***************
+*** 3696,3700 ****
+        b = builtin_address_internal (token, 0);
+        if (b && (b->flags & ASSIGNMENT_BUILTIN))
+!         parser_state |= PST_ASSIGNOK;
+      }
+  
+--- 3696,3702 ----
+        b = builtin_address_internal (token, 0);
+        if (b && (b->flags & ASSIGNMENT_BUILTIN))
+! 	parser_state |= PST_ASSIGNOK;
+!       else if (STREQ (token, "eval") || STREQ (token, "let"))
+! 	parser_state |= PST_ASSIGNOK;
+      }
+  
+***************
+*** 4687,4691 ****
+  {
+    WORD_LIST *wl, *rl;
+!   int tok, orig_line_number, orig_token_size;
+    char *saved_token, *ret;
+  
+--- 4689,4693 ----
+  {
+    WORD_LIST *wl, *rl;
+!   int tok, orig_line_number, orig_token_size, orig_last_token, assignok;
+    char *saved_token, *ret;
+  
+***************
+*** 4693,4696 ****
+--- 4695,4699 ----
+    orig_token_size = token_buffer_size;
+    orig_line_number = line_number;
++   orig_last_token = last_read_token;
+  
+    last_read_token = WORD;	/* WORD to allow reserved words here */
+***************
+*** 4699,4702 ****
+--- 4702,4707 ----
+    token_buffer_size = 0;
+  
++   assignok = parser_state&PST_ASSIGNOK;		/* XXX */
++ 
+    wl = (WORD_LIST *)NULL;	/* ( */
+    parser_state |= PST_COMPASSIGN;
+***************
+*** 4741,4745 ****
+      }
+  
+!   last_read_token = WORD;
+    if (wl)
+      {
+--- 4746,4750 ----
+      }
+  
+!   last_read_token = orig_last_token;		/* XXX - was WORD? */
+    if (wl)
+      {
+***************
+*** 4753,4756 ****
+--- 4758,4765 ----
+    if (retlenp)
+      *retlenp = (ret && *ret) ? strlen (ret) : 0;
++ 
++   if (assignok)
++     parser_state |= PST_ASSIGNOK;
++ 
+    return ret;
+  }
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 0
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 1
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-002 b/source/a/bash/patches/bash31-002
new file mode 100644
index 000000000..fac9a99af
--- /dev/null
+++ b/source/a/bash/patches/bash31-002
@@ -0,0 +1,239 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-002
+
+Bug-Reported-by: vapier@gentoo.org
+Bug-Reference-ID: <20051210223218.GD3324@toucan.gentoo.org>
+Bug-Reference-URL:http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00021.html
+
+Bug-Description:
+
+This corrects several omissions in the bash documentation:  It adds the new
+options to `ulimit', the exact expansions for `case' patterns, clarification
+of the language concerning the return value of `[[', and updated version
+information.
+
+Patch:
+
+*** ../bash-3.1/doc/bash.1	Wed Oct 12 11:40:52 2005
+--- doc/bash.1	Wed Dec 28 19:58:54 2005
+***************
+*** 7,16 ****
+  .\"	chet@po.cwru.edu
+  .\"
+! .\"	Last Change: Sat Aug 27 13:28:44 EDT 2005
+  .\"
+  .\" bash_builtins, strip all but Built-Ins section
+  .if \n(zZ=1 .ig zZ
+  .if \n(zY=1 .ig zY
+! .TH BASH 1 "2005 Aug 27" "GNU Bash-3.1-beta1"
+  .\"
+  .\" There's some problem with having a `@'
+--- 7,16 ----
+  .\"	chet@po.cwru.edu
+  .\"
+! .\"	Last Change: Wed Dec 28 19:58:45 EST 2005
+  .\"
+  .\" bash_builtins, strip all but Built-Ins section
+  .if \n(zZ=1 .ig zZ
+  .if \n(zY=1 .ig zY
+! .TH BASH 1 "2005 Dec 28" "GNU Bash-3.1"
+  .\"
+  .\" There's some problem with having a `@'
+***************
+*** 678,683 ****
+  is enabled, the match is performed without regard to the case
+  of alphabetic characters.
+! The return value is 0 if the string matches or does not match
+! the pattern, respectively, and 1 otherwise.
+  Any part of the pattern may be quoted to force it to be matched as a
+  string.
+--- 678,683 ----
+  is enabled, the match is performed without regard to the case
+  of alphabetic characters.
+! The return value is 0 if the string matches (\fB==\fP) or does not match
+! (\fB!=\fP) the pattern, and 1 otherwise.
+  Any part of the pattern may be quoted to force it to be matched as a
+  string.
+***************
+*** 808,811 ****
+--- 808,817 ----
+  .B Pathname Expansion
+  below).
++ The \fIword\fP is expanded using tilde
++ expansion, parameter and variable expansion, arithmetic substituion,
++ command substitution, process substitution and quote removal.
++ Each \fIpattern\fP examined is expanded using tilde
++ expansion, parameter and variable expansion, arithmetic substituion,
++ command substitution, and process substitution.
+  If the shell option
+  .B nocasematch
+***************
+*** 8485,8489 ****
+  none are found.
+  .TP
+! \fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]]
+  Provides control over the resources available to the shell and to
+  processes started by it, on systems that allow such control.
+--- 8485,8489 ----
+  none are found.
+  .TP
+! \fBulimit\fP [\fB\-SHacdfilmnpqstuvx\fP [\fIlimit\fP]]
+  Provides control over the resources available to the shell and to
+  processes started by it, on systems that allow such control.
+***************
+*** 8524,8527 ****
+--- 8524,8530 ----
+  The maximum size of files created by the shell
+  .TP
++ .B \-i
++ The maximum number of pending signals
++ .TP
+  .B \-l
+  The maximum size that may be locked into memory
+***************
+*** 8537,8540 ****
+--- 8540,8546 ----
+  The pipe size in 512-byte blocks (this may not be set)
+  .TP
++ .B \-q
++ The maximum number of bytes in POSIX message queues
++ .TP
+  .B \-s
+  The maximum stack size
+***************
+*** 8548,8551 ****
+--- 8554,8560 ----
+  .B \-v
+  The maximum amount of virtual memory available to the shell
++ .TP
++ .B \-x
++ The maximum number of file locks
+  .PD
+  .PP
+*** ../bash-3.1/doc/bashref.texi	Mon Oct  3 15:07:21 2005
+--- doc/bashref.texi	Fri Dec 30 10:50:39 2005
+***************
+*** 962,967 ****
+  is enabled, the match is performed without regard to the case
+  of alphabetic characters.
+! The return value is 0 if the string matches or does not match
+! the pattern, respectively, and 1 otherwise.
+  Any part of the pattern may be quoted to force it to be matched as a
+  string.
+--- 962,967 ----
+  is enabled, the match is performed without regard to the case
+  of alphabetic characters.
+! The return value is 0 if the string matches (@samp{==}) or does not
+! match (@samp{!=})the pattern, and 1 otherwise.
+  Any part of the pattern may be quoted to force it to be matched as a
+  string.
+***************
+*** 2599,2603 ****
+  or inconvenient to obtain with separate utilities.
+  
+! This section briefly the builtins which Bash inherits from
+  the Bourne Shell, as well as the builtin commands which are unique
+  to or have been extended in Bash.
+--- 2597,2601 ----
+  or inconvenient to obtain with separate utilities.
+  
+! This section briefly describes the builtins which Bash inherits from
+  the Bourne Shell, as well as the builtin commands which are unique
+  to or have been extended in Bash.
+***************
+*** 3834,3838 ****
+  @btindex ulimit
+  @example
+! ulimit [-acdflmnpstuvSH] [@var{limit}]
+  @end example
+  @code{ulimit} provides control over the resources available to processes
+--- 3834,3838 ----
+  @btindex ulimit
+  @example
+! ulimit [-acdfilmnpqstuvxSH] [@var{limit}]
+  @end example
+  @code{ulimit} provides control over the resources available to processes
+***************
+*** 3858,3861 ****
+--- 3858,3864 ----
+  The maximum size of files created by the shell.
+  
++ @item -i
++ The maximum number of pending signals.
++ 
+  @item -l
+  The maximum size that may be locked into memory.
+***************
+*** 3870,3873 ****
+--- 3873,3879 ----
+  The pipe buffer size.
+  
++ @item -q
++ The maximum number of bytes in POSIX message queues.
++ 
+  @item -s
+  The maximum stack size.
+***************
+*** 3882,3885 ****
+--- 3888,3894 ----
+  The maximum amount of virtual memory available to the process.
+  
++ @item -x
++ The maximum number of file locks.
++ 
+  @end table
+  
+***************
+*** 4090,4095 ****
+  
+  @item -x
+! Print a trace of simple commands, \fBfor\fP commands, \fBcase\fP
+! commands, \fBselect\fP commands, and arithmetic \fBfor\fP commands
+  and their arguments or associated word lists after they are
+  expanded and before they are executed.  The value of the @env{PS4}
+--- 4103,4108 ----
+  
+  @item -x
+! Print a trace of simple commands, @code{for} commands, @code{case}
+! commands, @code{select} commands, and arithmetic @code{for} commands
+  and their arguments or associated word lists after they are
+  expanded and before they are executed.  The value of the @env{PS4}
+*** ../bash-3.1/doc/version.texi	Tue Sep 20 14:52:56 2005
+--- doc/version.texi	Fri Dec 30 10:50:58 2005
+***************
+*** 3,10 ****
+  @end ignore
+  
+! @set LASTCHANGE Mon Sep  5 11:47:04 EDT 2005
+  
+! @set EDITION 3.1-beta1
+! @set VERSION 3.1-beta1
+! @set UPDATED 5 September 2005
+! @set UPDATED-MONTH September 2005
+--- 3,10 ----
+  @end ignore
+  
+! @set LASTCHANGE Fri Dec 30 10:50:51 EST 2005
+  
+! @set EDITION 3.1
+! @set VERSION 3.1
+! @set UPDATED 30 December 2005
+! @set UPDATED-MONTH December 2005
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 1
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 2
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-003 b/source/a/bash/patches/bash31-003
new file mode 100644
index 000000000..cd36dc83e
--- /dev/null
+++ b/source/a/bash/patches/bash31-003
@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-003
+
+Bug-Reported-by: Adam Buraczewski <adamb@nor.pl>
+Bug-Reference-ID: <200512210950.jBL9o4C2008608@localhost.localdomain>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00055.html
+
+Bug-Description:
+
+A missing #define guard causes bash to not compile when readline is not
+configured in, either as the result of explicit disabling or when the
+`--enable-minimal-config' option is given to configure.
+
+Patch:
+
+*** ../bash-3.1/variables.c	Sat Nov 12 21:22:37 2005
+--- variables.c	Mon Dec 26 13:34:03 2005
+***************
+*** 861,867 ****
+--- 863,871 ----
+    char val[INT_STRLEN_BOUND(int) + 1], *v;
+  
++ #if defined (READLINE)
+    /* If we are currently assigning to LINES or COLUMNS, don't do anything. */
+    if (winsize_assignment)
+      return;
++ #endif
+  
+    v = inttostr (lines, val, sizeof (val));
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 2
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 3
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-004 b/source/a/bash/patches/bash31-004
new file mode 100644
index 000000000..4f9d578ef
--- /dev/null
+++ b/source/a/bash/patches/bash31-004
@@ -0,0 +1,48 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-004
+
+Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>
+Bug-Reference-ID: <20051223172359.GF14579@toucan.gentoo.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00062.html
+
+Bug-Description:
+
+A local array variable declared at function scope that shadows a variable
+of the same name declared in a previous scope did not create a separate
+variable instance, but used the previous one.
+
+Patch:
+
+*** ../bash-3.1/subst.c	Mon Oct 24 09:51:13 2005
+--- subst.c	Fri Dec 30 12:11:53 2005
+***************
+*** 2188,2192 ****
+      {
+        v = find_variable (name);
+!       if (v == 0 || array_p (v) == 0)
+          v = make_local_array_variable (name);
+        v = assign_array_var_from_string (v, value, flags);
+--- 2188,2192 ----
+      {
+        v = find_variable (name);
+!       if (v == 0 || array_p (v) == 0 || v->context != variable_context)
+          v = make_local_array_variable (name);
+        v = assign_array_var_from_string (v, value, flags);
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 3
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 4
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-005 b/source/a/bash/patches/bash31-005
new file mode 100644
index 000000000..b6d5cdca8
--- /dev/null
+++ b/source/a/bash/patches/bash31-005
@@ -0,0 +1,54 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-005
+
+Bug-Reported-by:
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+When tilde expansion fails, POSIX leaves it unspecified whether or not the
+word undergoes the additional word expansions.  Bash-3.1 as distributed
+skipped the rest of the expansions; this patch restores the bash-3.0 behavior.
+
+This means that something like
+	USER=ratbert
+	echo ~$USER
+
+will echo `~ratbert' rather than `~$USER'.
+
+Patch:
+
+*** ../bash-3.1/subst.c	Mon Oct 24 09:51:13 2005
+--- subst.c	Fri Dec 30 12:11:53 2005
+***************
+*** 6796,6799 ****
+--- 6823,6832 ----
+  	    {
+  	      temp1 = bash_tilde_expand (temp, tflag);
++ 	      if  (temp1 && *temp1 == '~' && STREQ (temp, temp1))
++ 		{
++ 		  FREE (temp);
++ 		  FREE (temp1);
++ 		  goto add_character;		/* tilde expansion failed */
++ 		}
+  	      free (temp);
+  	      temp = temp1;
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 4
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 5
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-006 b/source/a/bash/patches/bash31-006
new file mode 100644
index 000000000..8d7499381
--- /dev/null
+++ b/source/a/bash/patches/bash31-006
@@ -0,0 +1,58 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-006
+
+Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>
+Bug-Reference-ID: <200601120613.11907.vapier@gentoo.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00045.html
+
+Bug-Description:
+
+Under some circumstances, Bash can use an incorrect setting for the flag
+that indicates whether or not the terminal can auto-wrap, resulting in line-
+wrapping errors.
+
+Patch:
+
+*** ../bash-3.1/lib/readline/terminal.c	Sat Nov 12 20:46:54 2005
+--- lib/readline/terminal.c	Tue Jan 31 10:57:54 2006
+***************
+*** 123,127 ****
+  
+  /* Non-zero means the terminal can auto-wrap lines. */
+! int _rl_term_autowrap;
+  
+  /* Non-zero means that this terminal has a meta key. */
+--- 126,130 ----
+  
+  /* Non-zero means the terminal can auto-wrap lines. */
+! int _rl_term_autowrap = -1;
+  
+  /* Non-zero means that this terminal has a meta key. */
+***************
+*** 275,278 ****
+--- 278,284 ----
+       int rows, cols;
+  {
++   if (_rl_term_autowrap == -1)
++     _rl_init_terminal_io (rl_terminal_name);
++ 
+    if (rows > 0)
+      _rl_screenheight = rows;
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 5
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 6
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-007 b/source/a/bash/patches/bash31-007
new file mode 100644
index 000000000..6233786c4
--- /dev/null
+++ b/source/a/bash/patches/bash31-007
@@ -0,0 +1,121 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-007
+
+Bug-Reported-by: Tim Waugh <twaugh@redhat.com>, Laird Breyer <laird@lbreyer.com>
+Bug-Reference-ID: <20060105174434.GY16000@redhat.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00009.html
+		   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347695
+
+Bug-Description:
+
+When the number of saved jobs exceeds the initial size of the jobs array
+(4096 slots), the array must be compacted and reallocated.  An error in
+the code to do that could cause a segmentation fault.
+
+Patch:
+
+*** ../bash-3.1/jobs.c	Fri Nov 11 23:13:27 2005
+--- jobs.c	Wed Feb  1 13:55:38 2006
+***************
+*** 845,851 ****
+  {
+    sigset_t set, oset;
+!   int nsize, i, j;
+    JOB **nlist;
+  
+    nsize = ((js.j_njobs + JOB_SLOTS - 1) / JOB_SLOTS);
+    nsize *= JOB_SLOTS;
+--- 888,895 ----
+  {
+    sigset_t set, oset;
+!   int nsize, i, j, ncur, nprev;
+    JOB **nlist;
+  
++   ncur = nprev = NO_JOB;
+    nsize = ((js.j_njobs + JOB_SLOTS - 1) / JOB_SLOTS);
+    nsize *= JOB_SLOTS;
+***************
+*** 855,869 ****
+  
+    BLOCK_CHILD (set, oset);
+!   nlist = (JOB **) xmalloc (nsize * sizeof (JOB *));
+    for (i = j = 0; i < js.j_jobslots; i++)
+      if (jobs[i])
+!       nlist[j++] = jobs[i];
+  
+    js.j_firstj = 0;
+!   js.j_lastj = (j > 0) ? j - 1: 0;
+    js.j_jobslots = nsize;
+  
+!   free (jobs);
+!   jobs = nlist;
+  
+    UNBLOCK_CHILD (oset);
+--- 899,947 ----
+  
+    BLOCK_CHILD (set, oset);
+!   nlist = (js.j_jobslots == nsize) ? jobs : (JOB **) xmalloc (nsize * sizeof (JOB *));
+! 
+    for (i = j = 0; i < js.j_jobslots; i++)
+      if (jobs[i])
+!       {
+! 	if (i == js.j_current)
+! 	  ncur = j;
+! 	if (i == js.j_previous)
+! 	  nprev = j;
+! 	nlist[j++] = jobs[i];
+!       }
+! 
+! #if defined (DEBUG)
+!   itrace ("realloc_jobs_list: resize jobs list from %d to %d", js.j_jobslots, nsize);
+!   itrace ("realloc_jobs_list: j_lastj changed from %d to %d", js.j_lastj, (j > 0) ? j - 1 : 0);
+!   itrace ("realloc_jobs_list: j_njobs changed from %d to %d", js.j_njobs, (j > 0) ? j - 1 : 0);
+! #endif
+  
+    js.j_firstj = 0;
+!   js.j_lastj = (j > 0) ? j - 1 : 0;
+!   js.j_njobs = j;
+    js.j_jobslots = nsize;
+  
+!   /* Zero out remaining slots in new jobs list */
+!   for ( ; j < nsize; j++)
+!     nlist[j] = (JOB *)NULL;
+! 
+!   if (jobs != nlist)
+!     {
+!       free (jobs);
+!       jobs = nlist;
+!     }
+! 
+!   if (ncur != NO_JOB)
+!     js.j_current = ncur;
+!   if (nprev != NO_JOB)
+!     js.j_previous = nprev;
+! 
+!   /* Need to reset these */
+!   if (js.j_current == NO_JOB || js.j_previous == NO_JOB || js.j_current > js.j_lastj || js.j_previous > js.j_lastj)
+!     reset_current ();
+! 
+! #ifdef DEBUG
+!   itrace ("realloc_jobs_list: reset js.j_current (%d) and js.j_previous (%d)", js.j_current, js.j_previous);
+! #endif
+  
+    UNBLOCK_CHILD (oset);
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 6
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 7
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-008 b/source/a/bash/patches/bash31-008
new file mode 100644
index 000000000..3427b64e0
--- /dev/null
+++ b/source/a/bash/patches/bash31-008
@@ -0,0 +1,51 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-008
+
+Bug-Reported-by: Ingemar Nilsson <init@kth.se>
+Bug-Reference-ID: <43C38D35.7020404@kth.se>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00044.html
+
+Bug-Description:
+
+In some cases, bash inappropriately allows SIGINT from the terminal to
+reach background processes.
+
+Patch:
+
+*** ../bash-3.1/jobs.c	Fri Nov 11 23:13:27 2005
+--- jobs.c	Wed Feb  1 13:55:38 2006
+***************
+*** 2199,2203 ****
+    wait_sigint_received = 0;
+    if (job_control == 0)
+!     old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler);
+  
+    termination_state = last_command_exit_value;
+--- 2298,2306 ----
+    wait_sigint_received = 0;
+    if (job_control == 0)
+!     {
+!       old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler);
+!       if (old_sigint_handler == SIG_IGN)
+! 	set_signal_handler (SIGINT, old_sigint_handler);
+!     }
+  
+    termination_state = last_command_exit_value;
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 7
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-009 b/source/a/bash/patches/bash31-009
new file mode 100644
index 000000000..8ef229585
--- /dev/null
+++ b/source/a/bash/patches/bash31-009
@@ -0,0 +1,66 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-009
+
+Bug-Reported-by: Joshua Neuheisel <jneuheisel@gmail.com>
+Bug-Reference-ID: <25d873330601140820v4ad8efd2t8bf683b073c138b3@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00062.html
+
+Bug-Description:
+
+Under some circumstances, background (asynchronous) jobs can set the terminal
+process group incorrectly.  This can cause a foreground process (including
+the foreground shell) to get read errors and exit.
+
+Patch:
+
+*** ../bash-3.1/jobs.c	Fri Nov 11 23:13:27 2005
+--- jobs.c	Wed Feb  1 13:55:38 2006
+***************
+*** 620,625 ****
+  	   * the parent gives it away.
+  	   *
+  	   */
+! 	  if (job_control && newjob->pgrp)
+  	    give_terminal_to (newjob->pgrp, 0);
+  	}
+--- 634,642 ----
+  	   * the parent gives it away.
+  	   *
++ 	   * Don't give the terminal away if this shell is an asynchronous
++ 	   * subshell.
++ 	   *
+  	   */
+! 	  if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0)
+  	    give_terminal_to (newjob->pgrp, 0);
+  	}
+***************
+*** 1656,1660 ****
+  	     shell's process group (we could be in the middle of a
+  	     pipeline, for example). */
+! 	  if (async_p == 0 && pipeline_pgrp != shell_pgrp)
+  	    give_terminal_to (pipeline_pgrp, 0);
+  
+--- 1743,1747 ----
+  	     shell's process group (we could be in the middle of a
+  	     pipeline, for example). */
+! 	  if (async_p == 0 && pipeline_pgrp != shell_pgrp && ((subshell_environment&SUBSHELL_ASYNC) == 0))
+  	    give_terminal_to (pipeline_pgrp, 0);
+  
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-010 b/source/a/bash/patches/bash31-010
new file mode 100644
index 000000000..066a3242d
--- /dev/null
+++ b/source/a/bash/patches/bash31-010
@@ -0,0 +1,54 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-010
+
+Bug-Reported-by: vw@vonwolff.de
+Bug-Reference-ID: <20060123135234.1AC2F1D596@wst07.vonwolff.de>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00090.html
+
+Bug-Description:
+
+There is a difference in behavior between bash-3.0 and bash-3.1 involving
+parsing of single- and double-quoted strings occurring in old-style
+command substitution.  The difference has to do with how backslashes are
+processed.  This patch restores a measure of backwards compatibility while
+the question of POSIX conformance and ultimately correct behavior is discussed.
+
+Patch:
+
+*** ../bash-3.1/parse.y	Fri Nov 11 23:14:18 2005
+--- parse.y	Wed Jan 25 14:55:18 2006
+***************
+*** 2899,2903 ****
+        else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0)
+  	{
+! 	  nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags);
+  	  goto add_nestret;
+  	}
+--- 2901,2909 ----
+        else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0)
+  	{
+! 	  /* Add P_ALLOWESC so backslash quotes the next character and
+! 	     shell_getc does the right thing with \<newline>.  We do this for
+! 	     a measure  of backwards compatibility -- it's not strictly the
+! 	     right POSIX thing. */
+! 	  nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_ALLOWESC);
+  	  goto add_nestret;
+  	}
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-011 b/source/a/bash/patches/bash31-011
new file mode 100644
index 000000000..025b83907
--- /dev/null
+++ b/source/a/bash/patches/bash31-011
@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-011
+
+Bug-Reported-by: Mike Stroyan <mike.stroyan@hp.com>
+Bug-Reference-ID: <E1EvwxP-0004LD-GC@localhost.localdomain>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00033.html
+
+Bug-Description:
+
+A change in bash-3.1 caused the single quotes to be stripped from ANSI-C
+quoting inside double-quoted command substitutions.
+
+Patch:
+
+*** ../bash-3.1/parse.y	Fri Nov 11 23:14:18 2005
+--- parse.y	Wed Jan 25 14:55:18 2006
+***************
+*** 2908,2912 ****
+  	    count--;
+  	  if (ch == '(')		/* ) */
+! 	    nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags);
+  	  else if (ch == '{')		/* } */
+  	    nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags);
+--- 2914,2918 ----
+  	    count--;
+  	  if (ch == '(')		/* ) */
+! 	    nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags & ~P_DQUOTE);
+  	  else if (ch == '{')		/* } */
+  	    nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags);
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-012 b/source/a/bash/patches/bash31-012
new file mode 100644
index 000000000..b0ddb3a48
--- /dev/null
+++ b/source/a/bash/patches/bash31-012
@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-012
+
+Bug-Reported-by: Alexander Kshevetskiy <alex@dgap.mipt.ru>
+Bug-Reference-ID: <308374997.20060124175849@dgap.mipt.ru>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00097.html
+
+Bug-Description:
+
+There is a parsing problem involving parentheses in assignment statements
+that causes words to be terminated prematurely.
+
+Patch:
+
+*** ../bash-3.1/parse.y	Fri Nov 11 23:14:18 2005
+--- parse.y	Wed Jan 25 14:55:18 2006
+***************
+*** 3579,3583 ****
+  	      all_digit_token = 0;
+  	      compound_assignment = 1;
+! #if 0
+  	      goto next_character;
+  #else
+--- 3584,3588 ----
+  	      all_digit_token = 0;
+  	      compound_assignment = 1;
+! #if 1
+  	      goto next_character;
+  #else
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-013 b/source/a/bash/patches/bash31-013
new file mode 100644
index 000000000..93c7c8fc8
--- /dev/null
+++ b/source/a/bash/patches/bash31-013
@@ -0,0 +1,44 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-013
+
+Bug-Reported-by: Bob Rossi <bob@brasko.net>
+Bug-Reference-ID: <43F60606.80708@case.edu>
+Bug-Reference-URL:
+
+Bug-Description:
+
+In some cases, readline will reference freed memory when attempting to
+display a portion of the prompt.
+
+Patch:
+
+*** ../bash-3.1-patched/lib/readline/readline.c	Mon Jul  4 22:29:35 2005
+--- lib/readline/readline.c	Fri Feb 17 22:54:22 2006
+***************
+*** 282,287 ****
+--- 282,288 ----
+  {
+    FREE (rl_prompt);
+    rl_prompt = prompt ? savestring (prompt) : (char *)NULL;
++   rl_display_prompt = rl_prompt ? rl_prompt : "";
+  
+    rl_visible_prompt_length = rl_expand_prompt (rl_prompt);
+    return 0;
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-014 b/source/a/bash/patches/bash31-014
new file mode 100644
index 000000000..82ff9b408
--- /dev/null
+++ b/source/a/bash/patches/bash31-014
@@ -0,0 +1,105 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-014
+
+Bug-Reported-by: Mike Stroyan <mike.stroyan@hp.com>
+Bug-Reference-ID: <20060203191607.GC27614@localhost>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00004.html
+
+Bug-Description:
+
+The displayed search prompt is corrupted when using non-incremental
+searches in vi and emacs mode if the prompt contains non-printing
+characters or spans multiple lines.  The prompt is expanded more than
+once; the second time without the escape sequences that protect non-
+printing characters from the length calculations.
+
+Patch:
+
+*** ../bash-3.1-patched/lib/readline/display.c	Wed Nov 30 14:05:02 2005
+--- lib/readline/display.c	Sat Feb 18 12:14:58 2006
+***************
+*** 1983,1993 ****
+       int pchar;
+  {
+    int len;
+!   char *pmt;
+  
+    rl_save_prompt ();
+  
+!   if (saved_local_prompt == 0)
+      {
+        len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
+        pmt = (char *)xmalloc (len + 2);
+--- 1998,2012 ----
+       int pchar;
+  {
+    int len;
+!   char *pmt, *p;
+  
+    rl_save_prompt ();
+  
+!   /* We've saved the prompt, and can do anything with the various prompt
+!      strings we need before they're restored.  We want the unexpanded
+!      portion of the prompt string after any final newline. */
+!   p = rl_prompt ? strrchr (rl_prompt, '\n') : 0;
+!   if (p == 0)
+      {
+        len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
+        pmt = (char *)xmalloc (len + 2);
+***************
+*** 1998,2016 ****
+      }
+    else
+      {
+!       len = *saved_local_prompt ? strlen (saved_local_prompt) : 0;
+        pmt = (char *)xmalloc (len + 2);
+        if (len)
+! 	strcpy (pmt, saved_local_prompt);
+        pmt[len] = pchar;
+        pmt[len+1] = '\0';
+!       local_prompt = savestring (pmt);
+!       prompt_last_invisible = saved_last_invisible;
+!       prompt_visible_length = saved_visible_length + 1;
+!     }
+  
+    prompt_physical_chars = saved_physical_chars + 1;
+- 
+    return pmt;
+  }
+  
+--- 2017,2033 ----
+      }
+    else
+      {
+!       p++;
+!       len = strlen (p);
+        pmt = (char *)xmalloc (len + 2);
+        if (len)
+! 	strcpy (pmt, p);
+        pmt[len] = pchar;
+        pmt[len+1] = '\0';
+!     }  
+  
++   /* will be overwritten by expand_prompt, called from rl_message */
+    prompt_physical_chars = saved_physical_chars + 1;
+    return pmt;
+  }
+  
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-015 b/source/a/bash/patches/bash31-015
new file mode 100644
index 000000000..deb9eed58
--- /dev/null
+++ b/source/a/bash/patches/bash31-015
@@ -0,0 +1,106 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-015
+
+Bug-Reported-by: Benoit Vila
+Bug-Reference-ID: <43FCA614.1090108@free.fr>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00058.html
+
+Bug-Description:
+
+A problem with the extended globbing code prevented dots from matching
+filenames when used in some extended matching patterns.
+
+Patch:
+
+*** ../bash-3.1-patched/lib/glob/sm_loop.c	Sun Oct 16 21:21:04 2005
+--- lib/glob/sm_loop.c	Mon Feb 27 17:18:43 2006
+***************
+*** 639,643 ****
+    CHAR *pnext;			/* pointer to next sub-pattern */
+    CHAR *srest;			/* pointer to rest of string */
+!   int m1, m2;
+  
+  #if DEBUG_MATCHING
+--- 638,642 ----
+    CHAR *pnext;			/* pointer to next sub-pattern */
+    CHAR *srest;			/* pointer to rest of string */
+!   int m1, m2, xflags;		/* xflags = flags passed to recursive matches */
+  
+  #if DEBUG_MATCHING
+***************
+*** 645,648 ****
+--- 644,648 ----
+  fprintf(stderr, "extmatch: s = %s; se = %s\n", s, se);
+  fprintf(stderr, "extmatch: p = %s; pe = %s\n", p, pe);
++ fprintf(stderr, "extmatch: flags = %d\n", flags);
+  #endif
+  
+***************
+*** 678,683 ****
+  		 multiple matches of the pattern. */
+  	      if (m1)
+! 		m2 = (GMATCH (srest, se, prest, pe, flags) == 0) ||
+! 		      (s != srest && GMATCH (srest, se, p - 1, pe, flags) == 0);
+  	      if (m1 && m2)
+  		return (0);
+--- 678,687 ----
+  		 multiple matches of the pattern. */
+  	      if (m1)
+! 		{
+! 		  /* if srest > s, we are not at start of string */
+! 		  xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags;
+! 		  m2 = (GMATCH (srest, se, prest, pe, xflags) == 0) ||
+! 			(s != srest && GMATCH (srest, se, p - 1, pe, xflags) == 0);
+! 		}
+  	      if (m1 && m2)
+  		return (0);
+***************
+*** 705,710 ****
+  	  for ( ; srest <= se; srest++)
+  	    {
+  	      if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 &&
+! 		  GMATCH (srest, se, prest, pe, flags) == 0)
+  		return (0);
+  	    }
+--- 709,716 ----
+  	  for ( ; srest <= se; srest++)
+  	    {
++ 	      /* if srest > s, we are not at start of string */
++ 	      xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags;
+  	      if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 &&
+! 		  GMATCH (srest, se, prest, pe, xflags) == 0)
+  		return (0);
+  	    }
+***************
+*** 727,731 ****
+  		break;
+  	    }
+! 	  if (m1 == 0 && GMATCH (srest, se, prest, pe, flags) == 0)
+  	    return (0);
+  	}
+--- 733,739 ----
+  		break;
+  	    }
+! 	  /* if srest > s, we are not at start of string */
+! 	  xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags;
+! 	  if (m1 == 0 && GMATCH (srest, se, prest, pe, xflags) == 0)
+  	    return (0);
+  	}
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-016 b/source/a/bash/patches/bash31-016
new file mode 100644
index 000000000..fa0ffe1c7
--- /dev/null
+++ b/source/a/bash/patches/bash31-016
@@ -0,0 +1,51 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-016
+
+Bug-Reported-by: Nikita Danilov <nikita@clusterfs.com>
+Bug-Reference-ID: <17397.51015.769854.541057@gargle.gargle.HOWL>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00064.html
+
+Bug-Description:
+
+Bash will dump core when attempting to perform globbing in directories with
+very large numbers of files.
+
+Patch:
+
+*** ../bash-3.1-patched/lib/glob/glob.c	Thu Mar 24 12:42:27 2005
+--- lib/glob/glob.c	Fri Mar  3 16:54:12 2006
+***************
+*** 361,364 ****
+--- 361,365 ----
+  
+    firstmalloc = 0;
++   nalloca = 0;
+  
+    /* If PAT is empty, skip the loop, but return one (empty) filename. */
+***************
+*** 547,550 ****
+--- 551,556 ----
+  	      tmplink = lastlink;
+  	    }
++ 	  else
++ 	    tmplink = 0;
+  	  free (lastlink->name);
+  	  lastlink = lastlink->next;
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 16
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/patches/bash31-017 b/source/a/bash/patches/bash31-017
new file mode 100644
index 000000000..84f891551
--- /dev/null
+++ b/source/a/bash/patches/bash31-017
@@ -0,0 +1,131 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.1
+Patch-ID: bash31-017
+
+Bug-Reported-by: syphir@syphir.sytes.net
+Bug-Reference-ID: <442421F5.3010105@syphir.sytes.net>
+Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358831
+
+Bug-Description:
+
+Array expansion fails with an arithmetic syntax error when the subscript
+appears within double quotes.  For example: ${a["4"]}.
+
+Patch:
+
+*** ../bash-3.1-patched/subst.c	Wed Apr 12 08:47:08 2006
+--- subst.c	Wed Apr 12 08:49:02 2006
+***************
+*** 2576,2579 ****
+--- 2576,2586 ----
+  }
+  
++ char *
++ expand_arith_string (string, quoted)
++      char *string;
++ {
++   return (expand_string_if_necessary (string, quoted, expand_string));
++ }
++ 
+  #if defined (COND_COMMAND)
+  /* Just remove backslashes in STRING.  Returns a new string. */
+***************
+*** 5249,5253 ****
+      t = (char *)0;
+  
+!   temp1 = expand_string_if_necessary (substr, Q_DOUBLE_QUOTES, expand_string);
+    *e1p = evalexp (temp1, &expok);
+    free (temp1);
+--- 5256,5260 ----
+      t = (char *)0;
+  
+!   temp1 = expand_arith_string (substr, Q_DOUBLE_QUOTES);
+    *e1p = evalexp (temp1, &expok);
+    free (temp1);
+***************
+*** 5294,5298 ****
+        t++;
+        temp2 = savestring (t);
+!       temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string);
+        free (temp2);
+        t[-1] = ':';
+--- 5301,5305 ----
+        t++;
+        temp2 = savestring (t);
+!       temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES);
+        free (temp2);
+        t[-1] = ':';
+***************
+*** 6436,6440 ****
+  
+  	  /* Expand variables found inside the expression. */
+! 	  temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string);
+  	  free (temp2);
+  
+--- 6443,6447 ----
+  
+  	  /* Expand variables found inside the expression. */
+! 	  temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES);
+  	  free (temp2);
+  
+***************
+*** 6478,6482 ****
+  
+         /* Do initial variable expansion. */
+!       temp1 = expand_string_if_necessary (temp, Q_DOUBLE_QUOTES, expand_string);
+  
+        goto arithsub;
+--- 6485,6489 ----
+  
+         /* Do initial variable expansion. */
+!       temp1 = expand_arith_string (temp, Q_DOUBLE_QUOTES);
+  
+        goto arithsub;
+*** ../bash-3.1-patched/subst.h	Sun Nov  7 15:12:28 2004
+--- subst.h	Mon Mar 27 09:10:38 2006
+***************
+*** 152,155 ****
+--- 152,158 ----
+  extern char *expand_assignment_string_to_string __P((char *, int));
+  
++ /* Expand an arithmetic expression string */
++ extern char *expand_arith_string __P((char *, int));
++ 
+  /* De-quoted quoted characters in STRING. */
+  extern char *dequote_string __P((char *));
+*** ../bash-3.1-patched/arrayfunc.c	Mon Jul  4 20:25:58 2005
+--- arrayfunc.c	Mon Mar 27 09:10:47 2006
+***************
+*** 593,601 ****
+    strncpy (exp, s, len - 1);
+    exp[len - 1] = '\0';
+! #if 0
+!   t = expand_string_to_string (exp, 0);
+! #else 
+!   t = expand_string_to_string (exp, Q_DOUBLE_QUOTES);
+! #endif
+    this_command_name = (char *)NULL;
+    val = evalexp (t, &expok);
+--- 591,595 ----
+    strncpy (exp, s, len - 1);
+    exp[len - 1] = '\0';
+!   t = expand_arith_string (exp, 0);
+    this_command_name = (char *)NULL;
+    val = evalexp (t, &expok);
+*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
+--- patchlevel.h	Wed Dec  7 13:48:42 2005
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 16
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 17
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/slack-desc b/source/a/bash/slack-desc
new file mode 100644
index 000000000..f2fdb9292
--- /dev/null
+++ b/source/a/bash/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------------------------------------------------------|
+bash: bash (sh-compatible shell)
+bash:
+bash: The GNU Bourne-Again SHell.  Bash is a sh-compatible command
+bash: interpreter that executes commands read from the standard input or
+bash: from a file.  Bash also incorporates useful features from the Korn
+bash: and C shells (ksh and csh).  Bash is ultimately intended to be a
+bash: conformant implementation of the IEEE Posix Shell and Tools
+bash: specification (IEEE Working Group 1003.2).
+bash:
+bash: Bash must be present for the system to boot properly.
+bash:
diff --git a/source/a/bin/bin.SlackBuild b/source/a/bin/bin.SlackBuild
new file mode 100755
index 000000000..69995accc
--- /dev/null
+++ b/source/a/bin/bin.SlackBuild
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=11.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-bin
+
+# These don't need to be real recent, as we only require a couple
+# of things such as 'mktemp' and 'tempfile'.
+DUTILS=2.7
+
+# The fbset package
+FBSET=2.1
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+echo "+=============+"
+echo "| debianutils |"
+echo "+=============+"
+cd $TMP
+rm -rf debianutils-$DUTILS
+tar xzvf $CWD/debianutils_$DUTILS.tar.gz
+cd debianutils-$DUTILS
+chown -R root:root .
+./configure --prefix=/usr
+make || exit 1
+## We use our own very simple run-parts script
+## in the dcron package instead.
+#cat run-parts > $PKG/usr/bin/run-parts
+#cat run-parts.8 | gzip -9c > $PKG/usr/man/man8/run-parts.8.gz
+mkdir -p $PKG/usr/bin $PKG/usr/man/man{1,8}
+cat mktemp > $PKG/usr/bin/mktemp
+cat mktemp.1 | gzip -9c > $PKG/usr/man/man1/mktemp.1.gz
+cat savelog > $PKG/usr/bin/savelog
+cat savelog.8 | gzip -9c > $PKG/usr/man/man8/savelog.8.gz
+cat tempfile > $PKG/usr/bin/tempfile
+cat tempfile.1 | gzip -9c > $PKG/usr/man/man1/tempfile.1.gz
+chmod 755 $PKG/usr/bin/*
+mkdir -p $PKG/usr/doc/debianutils-$DUTILS
+cp -a debian/copyright $PKG/usr/doc/debianutils-$DUTILS
+
+echo "+===========+"
+echo "| fbset-${FBSET} |"
+echo "+===========+"
+cd $TMP
+rm -rf fbset-${FBSET}
+tar xzvf $CWD/fbset-${FBSET}.tar.gz
+cd fbset-${FBSET}
+chown -R root:root .
+make || exit 1
+mkdir -p $PKG/usr/sbin
+cat fbset > $PKG/usr/sbin/fbset
+chmod 755 $PKG/usr/sbin/fbset
+mkdir -p $PKG/etc
+cat etc/fb.modes.ATI > $PKG/etc/fb.modes
+mkdir -p $PKG/usr/man/man5
+cat fb.modes.5 | gzip -9c > $PKG/usr/man/man5/fb.modes.5.gz
+mkdir -p $PKG/usr/man/man8
+cat fbset.8 | gzip -9c > $PKG/usr/man/man8/fbset.8.gz
+mkdir -p $PKG/usr/doc/fbset-${FBSET}
+cp -a \
+  INSTALL etc/* \
+  $PKG/usr/doc/fbset-${FBSET}
+rm -r $PKG/usr/doc/fbset-${FBSET}/CVS
+
+echo "+=========+"
+echo "| banners |"
+echo "+=========+"
+cd $TMP
+rm -rf banners
+tar xzvf $CWD/banners.tar.gz
+cd banners
+chown -R root:root .
+make || exit 1
+cat bban > $PKG/usr/bin/bban
+cat sysvbanner > $PKG/usr/bin/sysvbanner
+chmod 755 $PKG/usr/bin/{bban,sysvbanner}
+
+echo "+===============+"
+echo "| todos/fromdos |"
+echo "+===============+"
+cd $TMP
+rm -rf todos
+tar xzvf $CWD/todos.tar.gz
+cd todos
+chown -R root:root .
+make || exit 1
+mkdir -p $PKG/usr/bin
+cat todos > $PKG/usr/bin/todos
+cat fromdos > $PKG/usr/bin/fromdos
+chmod 755 $PKG/usr/bin/*dos
+mkdir -p $PKG/usr/man/man1
+cat todos.1.gz > $PKG/usr/man/man1/todos.1.gz
+cat fromdos.1.gz > $PKG/usr/man/man1/fromdos.1.gz
+
+# These are a couple of really old scripts that might still
+# be useful for a couple more years.  :-)
+zcat $CWD/scripts/diskcopy.gz > $PKG/usr/bin/diskcopy
+zcat $CWD/scripts/xx.gz > $PKG/usr/bin/xx
+chmod 755 $PKG/usr/bin/diskcopy
+chmod 755 $PKG/usr/bin/xx
+
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/bin-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/bin/debianutils_2.7.dsc b/source/a/bin/debianutils_2.7.dsc
new file mode 100644
index 000000000..25a643a7b
--- /dev/null
+++ b/source/a/bin/debianutils_2.7.dsc
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+Format: 1.0
+Source: debianutils
+Version: 2.7
+Binary: debianutils
+Maintainer: Clint Adams <schizo@debian.org>
+Architecture: any
+Standards-Version: 3.6.1
+Files: 
+ e966d93a3ee20068197104049ebd7d70 165590 debianutils_2.7.tar.gz
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+Comment: Debian!
+
+iD8DBQFAO4b85m0u66uWM3ARAotWAKCE/B4HoDVZ5rHi4AISWwHO59cEgwCgqQ6d
+Rt+5nuJdAgkcQgKDQu52RwI=
+=2QDD
+-----END PGP SIGNATURE-----
diff --git a/source/a/bin/scripts/diskcopy b/source/a/bin/scripts/diskcopy
new file mode 100644
index 000000000..9f3cc586f
--- /dev/null
+++ b/source/a/bin/scripts/diskcopy
@@ -0,0 +1,9 @@
+#!/bin/sh
+echo -n "Insert source disk in first floppy drive, then hit enter"
+read ans;
+MCOOKIE=`mcookie`
+dd if=/dev/fd0 of=/tmp/dcopy.$MCOOKIE
+echo -n "Remove source disk and insert destination disk, then hit enter"
+read ans;
+dd of=/dev/fd0 if=/tmp/dcopy.$MCOOKIE
+/bin/rm -f /tmp/dcopy.$MCOOKIE
diff --git a/source/a/bin/scripts/xx b/source/a/bin/scripts/xx
new file mode 100644
index 000000000..4116c2093
--- /dev/null
+++ b/source/a/bin/scripts/xx
@@ -0,0 +1,21 @@
+#
+# A script to extract binary files from uudecoded files. Ignores all headers
+# and irrelevant stuff. Has shortfalls like all such scripts/programs but works
+# (almost) 100% of the time. We tested it against many such tools available
+# at many ftp sites and found it having higher success rate. There are
+# a few c-programs out there and it is slower as compared to them but it
+# works even in those cases when they fail to work.
+# The only time it will not work is that if uuencoded source file is cut up
+# in many pieces and LAST part contains LESS THAN 3 SOURCE lines in it and
+# we know that such cases (almost) never arise....guarenteed....:)
+#
+# Written by Tahir Zia Khawaja   and
+#            Nasir Ahmed Noor
+#umnoor@ccu.umanitoba.ca
+#umkhawaj@ccu.umanitoba.ca
+#
+awk '$0 ~ /^begin / {print $0; exit}' $1 > $$gifile
+egrep "^M[^a-z]" $1 >> $$gifile
+awk 'NR > 2 {sl=lr; lr=pr; pr=$0} $1 ~ /^end/ {print sl; print lr; print pr; exit}' $1 >> $$gifile
+uudecode $$gifile
+rm $$gifile
diff --git a/source/a/bin/slack-desc b/source/a/bin/slack-desc
new file mode 100644
index 000000000..de9e307d7
--- /dev/null
+++ b/source/a/bin/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------------------------------------------------------|
+bin: bin (some command-line utilities)
+bin:
+bin: The bin package is a collection of miscellaneous command-line 
+bin: utilities.  Some of these (such as 'tempfile') are used in system
+bin: scripts.
+bin:
+bin:
+bin:
+bin:
+bin:
+bin:
diff --git a/source/a/bzip2/bzip2-1.0.4.saneso.diff b/source/a/bzip2/bzip2-1.0.4.saneso.diff
new file mode 100644
index 000000000..edbf1ad00
--- /dev/null
+++ b/source/a/bzip2/bzip2-1.0.4.saneso.diff
@@ -0,0 +1,20 @@
+--- ./Makefile-libbz2_so.orig	2007-01-02 20:00:55.000000000 -0600
++++ ./Makefile-libbz2_so	2007-01-23 22:02:29.000000000 -0600
+@@ -35,13 +35,13 @@
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
++	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.4 libbz2.so.1.0
++	rm -f libbz2.so.1
++	ln -s libbz2.so.1.0.4 libbz2.so.1
+ 
+ clean: 
+-	rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
++	rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1 bzip2-shared
+ 
+ blocksort.o: blocksort.c
+ 	$(CC) $(CFLAGS) -c blocksort.c
diff --git a/source/a/bzip2/bzip2.SlackBuild b/source/a/bzip2/bzip2.SlackBuild
new file mode 100755
index 000000000..465f75e07
--- /dev/null
+++ b/source/a/bzip2/bzip2.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=1.0.5
+SOLIB=1.0.4
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-bzip2
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf bzip2-$VERSION
+tar xzvf $CWD/bzip2-$VERSION.tar.gz
+cd bzip2-$VERSION
+chown -R root:root .
+# This should be ok, since libbz2.so.1.0 will still exist.
+zcat $CWD/bzip2-1.0.4.saneso.diff.gz | patch -p1 || exit
+make -f Makefile-libbz2_so || exit 1
+make || exit 1
+mkdir -p $PKG/usr/include
+cp -a bzlib.h $PKG/usr/include
+chown root:root $PKG/usr/include/bzlib.h
+chmod 644 $PKG/usr/include/bzlib.h
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+cp -a libbz2.a $PKG/usr/lib${LIBDIRSUFFIX}/libbz2.a
+mkdir -p $PKG/lib${LIBDIRSUFFIX}
+cp -a libbz2.so.$SOLIB $PKG/lib${LIBDIRSUFFIX}/libbz2.so.$SOLIB
+chmod 644 $PKG/usr/lib${LIBDIRSUFFIX}/libbz2.a
+chmod 755 $PKG/lib${LIBDIRSUFFIX}/libbz2.so.$SOLIB
+mkdir -p $PKG/bin
+cat bzip2-shared > $PKG/bin/bzip2
+cat bzip2recover > $PKG/bin/bzip2recover
+mkdir -p $PKG/usr/man/man1
+cat bzip2.1 | gzip -9c > $PKG/usr/man/man1/bzip2.1.gz
+echo '.so man1/bzip2.1' | gzip -9c > $PKG/usr/man/man1/bzip2recover.1.gz
+mkdir -p $PKG/usr/doc/bzip2-$VERSION
+cp -a CHANGES LICENSE README README.COMPILATION.PROBLEMS Y2K_INFO \
+  bzip2.txt *.html $PKG/usr/doc/bzip2-$VERSION
+chmod 644 $PKG/usr/doc/bzip2-$VERSION/*
+# Link up them links
+( cd $PKG
+  ( cd lib${LIBDIRSUFFIX}
+    rm -f libbz2.so.1.0 libbz2.so.1
+    ln -sf libbz2.so.$SOLIB libbz2.so.1.0
+    ln -sf libbz2.so.1.0 libbz2.so.1
+  )
+  ( cd usr/lib${LIBDIRSUFFIX}
+    ln -sf ../../lib${LIBDIRSUFFIX}/libbz2.so.1 libbz2.so
+  )
+  ( cd bin ; ln -sf bzip2 bunzip2 )
+  ( cd bin ; ln -sf bzip2 bzcat )
+  mkdir -p usr/bin
+  ( cd usr/bin
+    ln -sf ../../bin/bzip2 .
+    ln -sf ../../bin/bzip2 bunzip2
+    ln -sf ../../bin/bzip2 bzcat
+    ln -sf bzmore bzless
+  )
+)
+# Here are some optional scripts:
+for file in bzdiff bzgrep bzmore ; do
+  cat $file > $PKG/usr/bin/$file
+  cat ${file}.1 | gzip -9c > $PKG/usr/man/man1/${file}.1.gz
+done
+( 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
+)
+chmod 755 $PKG/bin/* $PKG/usr/bin/*
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/bzip2-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/bzip2-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/a/bzip2/slack-desc b/source/a/bzip2/slack-desc
new file mode 100644
index 000000000..8026e7553
--- /dev/null
+++ b/source/a/bzip2/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------------------------------------------------------|
+bzip2: bzip2 (a block-sorting file compressor)
+bzip2:
+bzip2: Bzip2 compresses files using the Burrows-Wheeler block sorting text
+bzip2: compression algorithm, and Huffman coding.  Compression is generally
+bzip2: considerably better than that achieved by more conventional LZ77/LZ78-
+bzip2: based compressors, and approaches the performance of the PPM family of
+bzip2: statistical compressors. 
+bzip2:
+bzip2: Julian Seward <jseward@acm.org> is the author of bzip2.
+bzip2:
+bzip2:
diff --git a/source/a/coreutils/DIR_COLORS b/source/a/coreutils/DIR_COLORS
new file mode 100644
index 000000000..2556aa014
--- /dev/null
+++ b/source/a/coreutils/DIR_COLORS
@@ -0,0 +1,202 @@
+# Configuration file for dircolors, a utility to help you set the
+# LS_COLORS environment variable used by GNU ls with the --color option.
+
+# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
+# slackware version of dircolors) are recognized but ignored.
+# (see the scripts in /etc/profile.d/coreutils-dircolors.* to change default
+# options in the Slackware aliases)
+
+# Below, there should be one TERM entry for each termtype that is colorizable
+TERM linux
+TERM linux-c
+TERM mach-color
+TERM console
+TERM con132x25
+TERM con132x30
+TERM con132x43
+TERM con132x60
+TERM con80x25
+TERM con80x28
+TERM con80x30
+TERM con80x43
+TERM con80x50
+TERM con80x60
+TERM cygwin
+TERM dtterm
+TERM putty
+TERM xterm
+TERM xterm-color
+TERM xterm-debian
+TERM rxvt
+TERM screen
+TERM screen-bce
+TERM screen-w
+TERM vt100
+TERM Eterm
+
+# Below are the color init strings for the basic file types. A color init
+# string consists of one or more of the following numeric codes:
+# Attribute codes:
+# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
+# Text color codes:
+# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
+# Background color codes:
+# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
+NORMAL 00      # global default, although everything should be something.
+FILE 00        # normal file
+# RESET 0        # reset to "normal" color
+DIR 01;34      # directory
+LINK 01;36     # symbolic link. (If you set this to 'target' instead of a
+               # numerical value, the color is as for the file pointed to.)
+# HARDLINK 44;37  # regular file with more than one link
+FIFO 40;33     # pipe
+SOCK 01;35     # socket
+DOOR 01;35     # door
+BLK 40;33;01   # block device driver
+CHR 40;33;01   # character device driver
+ORPHAN 40;31;01 # symlink to nonexistent file
+SETUID 37;41   # file that is setuid (u+s)
+SETGID 30;43   # file that is setgid (g+s)
+CAPABILITY 30;41        # file with capability
+STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
+OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
+STICKY 37;44   # dir with the sticky bit set (+t) and not other-writable
+EXEC 01;32     # This is for files with execute permission:
+
+# List any file extensions like '.gz' or '.tar' that you would like ls
+# to colorize below. Put the extension, a space, and the color init string.
+# (and any comments you want to add after a '#')
+ 
+# DOS-style executables (bright green)
+.bat  01;32
+.BAT  01;32
+.btm  01;32
+.BTM  01;32
+.cmd  01;32
+.CMD  01;32
+.com  01;32
+.COM  01;32
+.dll  01;32
+.DLL  01;32
+.exe  01;32
+.EXE  01;32
+
+# archives or compressed (bright red)
+.7z   01;31
+.ace  01;31
+.arj  01;31
+.bz2  01;31
+.cpio  01;31
+.deb  01;31
+.dz   01;31
+.gz   01;31
+.jar  01;31
+.lzh  01;31
+.lzma  01;31
+.rar  01;31
+.RAR  01;31
+.rpm  01;31
+.rz   01;31
+.tar  01;31
+.taz  01;31
+.tb2  01;31
+.tbz2 01;31
+.tbz  01;31
+.tgz  01;31
+.tlz  01;31
+.trz  01;31
+.txz  01;31
+.tz   01;31
+.tz2  01;31
+.xz   01;31
+.z    01;31
+.Z    01;31
+.zip  01;31
+.ZIP  01;31
+.zoo  01;31
+
+# multimedia (video/image/sound) file formats
+.aac 00;35
+.anx 01;35
+.asf 01;35
+.ASF 01;35
+.au 00;35
+.axa 00;35
+.axv 01;35
+.avi 01;35
+.AVI 01;35
+.bmp 01;35
+.BMP 01;35
+.flac 01;35
+.FLAC 01;35
+.gif 01;35
+.GIF 01;35
+.jpg 01;35
+.JPG 01;35
+.jpeg 01;35
+.JPEG 01;35
+.m2a 01;35
+.M2A 01;35
+.m2v 01;35
+.M2V 01;35
+.m4a 01;35
+.M4A 01;35
+.m4p 01;35
+.M4P 01;35
+.m4v 01;35
+.M4V 01;35
+.mid 00;35
+.midi 00;35
+.mka 00;35
+.mov 01;35
+.MOV 01;35
+.mp3 01;35
+.MP3 01;35
+.mp4 01;35
+.mp4v 01;35
+.mpc 01;35
+.MPC 01;35
+.mpeg 01;35
+.MPEG 01;35
+.mpg 01;35
+.MPG 01;35
+.nuv 01;35
+.oga 00;35
+.ogv 01;35
+.ogx 01;35
+.ogg 01;35
+.OGG 01;35
+.pbm 01;35
+.pgm 01;35
+.png 01;35
+.PNG 01;35
+.ppm 01;35
+.qt  01;35
+.ra 00;35
+.ram 01;35
+.RAM 01;35
+.rm 01;35
+.RM 01;35
+.spx 00;35
+.svg 01;35
+.svgz 01;35
+.tga 01;35
+.TGA 01;35
+.tif 01;35
+.TIF 01;35
+.tiff 01;35
+.TIFF 01;35
+.vob 01;35
+.wav 01;35
+.WAV 01;35
+.wma 01;35
+.WMA 01;35
+.wmv 01;35
+.WMV 01;35
+.xbm 01;35
+.xcf 01;35
+.xpm 01;35
+.xspf 00;35
+.xwd 01;35
+.XWD 01;35
+
diff --git a/source/a/coreutils/coreutils-dircolors.csh b/source/a/coreutils/coreutils-dircolors.csh
new file mode 100644
index 000000000..38d73ca2a
--- /dev/null
+++ b/source/a/coreutils/coreutils-dircolors.csh
@@ -0,0 +1,48 @@
+# Slackware color ls profile script for /bin/csh-like shells.
+
+# Set up LS_OPTIONS environment variable.
+# This contains extra command line options to use with ls.
+# The default ones are:
+#  -F = show '/' for dirs, '*' for executables, etc.
+#  -T 0 = don't trust tab spacing when formatting ls output.
+#  -b = better support for special characters
+setenv OPTIONS "-F -b -T 0"
+
+# COLOR needs one of these arguments:
+# 'auto' colorizes output to ttys, but not pipes.
+# 'always' adds color characters to all output.
+# 'never' shuts colorization off.
+setenv COLOR auto
+
+# This section shouldn't require any user adjustment since it is
+# simply setting the LS_OPTIONS variable using the information
+# already given above:
+setenv LS_OPTIONS " $OPTIONS --color=$COLOR "
+unset COLOR
+unset OPTIONS
+
+# Set up aliases to use color ls by default.  A few additional
+# aliases like 'dir', 'vdir', etc, are some ancient artifacts
+# from 1992 or so...  possibly they should be disabled, but maybe
+# someone out there is actually using them?  :-)
+alias ls '/bin/ls $LS_OPTIONS';
+alias dir '/bin/ls $LS_OPTIONS --format=vertical';
+alias vdir '/bin/ls $LS_OPTIONS --format=long';
+alias d dir;
+alias v vdir;
+unset noglob;
+
+# Set up the LS_COLORS environment:
+[ -f $HOME/.dir_colors ]
+if ($status == 0) then
+  eval `/bin/dircolors -c $HOME/.dir_colors`
+endif
+[ -f /etc/DIR_COLORS ] 
+if ($status == 0) then
+  eval `/bin/dircolors -c /etc/DIR_COLORS`
+endif
+[ ! -f $HOME/.dir_colors -a ! -f /etc/DIR_COLORS ]
+if ($status == 0) then
+  eval `/bin/dircolors -c`
+endif
+
diff --git a/source/a/coreutils/coreutils-dircolors.sh b/source/a/coreutils/coreutils-dircolors.sh
new file mode 100644
index 000000000..728ea7452
--- /dev/null
+++ b/source/a/coreutils/coreutils-dircolors.sh
@@ -0,0 +1,65 @@
+# Slackware color ls profile script for /bin/sh-like shells.
+
+# Set up LS_OPTIONS environment variable.
+# This contains extra command line options to use with ls.
+# The default ones are:
+#  -F = show '/' for dirs, '*' for executables, etc.
+#  -T 0 = don't trust tab spacing when formatting ls output.
+#  -b = better support for special characters
+if [ "$SHELL" != "/bin/zsh" ]; then
+  # Edit options below for all sh-like shells except zsh:
+  OPTIONS="-F -b -T 0"
+else
+  # If you use zsh, edit the options below instead:
+  OPTIONS=( -F -b -T 0 )
+fi
+
+# COLOR needs one of these arguments:
+# 'auto' colorizes output to ttys, but not pipes.
+# 'always' adds color characters to all output.
+# 'never' shuts colorization off.
+COLOR=auto
+
+# This section shouldn't require any user adjustment since it is
+# simply setting the LS_OPTIONS variable using the information
+# already given above:
+if [ "$SHELL" = "/bin/zsh" ]; then
+  LS_OPTIONS=( $OPTIONS --color=$COLOR );
+else
+  LS_OPTIONS=" $OPTIONS --color=$COLOR ";
+fi
+export LS_OPTIONS;
+unset COLOR
+unset OPTIONS
+
+# Set up aliases to use color ls by default.  A few additional
+# aliases like 'dir', 'vdir', etc, are some ancient artifacts
+# from 1992 or so...  possibly they should be disabled, but maybe
+# someone out there is actually using them?  :-)
+# Assume shell aliases are supported.  Ash is going to freak out
+# when it sees zsh syntax anyway, so whatever.
+alias ls='/bin/ls $LS_OPTIONS';
+alias dir='/bin/ls $LS_OPTIONS --format=vertical';
+alias vdir='/bin/ls $LS_OPTIONS --format=long';
+alias d=dir;
+alias v=vdir;
+
+# Just for fun, here are the old sh/ash style shell functions.
+# this script isn't currently working with ash (and makes some noisy
+# error messages), but perhaps these will still be of use to
+# someone...
+#ls () { /bin/ls $LS_OPTIONS "$@" ; };
+#dir () { /bin/ls $LS_OPTIONS --format=vertical "$@" ; };
+#vdir () { /bin/ls $LS_OPTIONS --format=long "$@" ; };
+#d () { dir "$@" ; };
+#v () { vdir "$@" ; };
+
+# Set up the LS_COLORS environment:
+if [ -f $HOME/.dir_colors ]; then
+  eval `/bin/dircolors -b $HOME/.dir_colors`
+elif [ -f /etc/DIR_COLORS ]; then
+  eval `/bin/dircolors -b /etc/DIR_COLORS`
+else
+  eval `/bin/dircolors -b`
+fi
+
diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild
new file mode 100755
index 000000000..bc0434277
--- /dev/null
+++ b/source/a/coreutils/coreutils.SlackBuild
@@ -0,0 +1,168 @@
+#!/bin/sh
+
+# Copyright 2005-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.
+
+PRGNAM=coreutils
+VERSION=${VERSION:-7.4}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+elif [ "$ARCH" = "armel" ]; then
+  SLKCFLAGS="-O2 -march=armv4t"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+
+rm -rf $PRGNAM-$VERSION
+if [ -r $CWD/$PRGNAM-$VERSION.tar.gz ]; then
+  tar xf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+elif [ -r $CWD/$PRGNAM-$VERSION.tar.bz2 ]; then
+  tar xf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+elif [ -r $CWD/$PRGNAM-$VERSION.tar.xz ]; then
+  tar xf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1
+elif [ -r $CWD/$PRGNAM-$VERSION.tar.lzma ]; then
+  tar xf $CWD/$PRGNAM-$VERSION.tar.lzma || exit 1
+else
+  exit 1
+fi
+
+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 {} \;
+
+# Patch in the uname for Linux enhancements
+zcat $CWD/$PRGNAM.uname.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
+# Compilation with glibc version later than 2.3.2 needs the environment
+# variable DEFAULT_POSIX2_VERSION set to 199209.
+# Without the next line, the coreutils will start complaining about 'obsolete'
+# command switches, like "tail -20" will be considered obsolete.
+# This behaviour breaks many other packages... the 'obsolete' parameters are
+# too commonly used to disregard them.  Better to stick with the older more
+# widely accepted standards until things begin to demand the new way.
+
+CFLAGS="$SLKCFLAGS" \
+DEFAULT_POSIX2_VERSION=199209 \
+./configure \
+  --prefix=/usr \
+  --bindir=/bin \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --sysconfdir=/etc \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+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
+
+# We have had the mktemp from debianutils included with Slackware for quite a
+# long time, and certain options are changed here, like changing -u to mean a
+# dry-run rather than to unlink the tempfile when finished.  Since this could
+# break existing scripts, unless someone can tell me a good reason why we
+# should start using a new version of mktemp, we will continue to use the
+# one we've been using.  If the new one starts to become expected, let me know.
+# We'll figure out what the best options are and go from there.
+mv $PKG/bin/mktemp $PKG/bin/mktemp-gnu
+mv $PKG/usr/man/man1/mktemp.1 $PKG/usr/man/man1/mktemp-gnu.1
+
+# This seems wrong, and it stomps on files in the ksh93 package, though I'm
+# not sure the placement of those is correct, either...  The ksh93 package
+# installs them as flat text files, while coreutils installs empty directories
+# Oh well, this is what we've done for years, and nobody's complained...
+rm -rf $PKG/usr/share/locale/*/LC_TIME
+
+# These are important enough that they should probably all go into /bin at this
+# point...   Having some of them unavailable when /usr isn't mounted is just a
+# source of unending bug reports for various third party applications.
+# Time to end those reports.  :-)
+mkdir -p $PKG/bin $PKG/usr/bin
+( cd $PKG/usr/bin
+  for file in ../../bin/* ; do
+    ln --verbose -sf $file .
+  done
+)
+
+# Add some defaults, although a very slack-like set of default options are built
+# into /bin/ls now anyway:
+mkdir -p $PKG/etc
+zcat $CWD/DIR_COLORS.gz > $PKG/etc/DIR_COLORS.new
+
+# Since dircolors no longer provides any default aliases these scripts
+# will be needed for ls to act as expected:
+mkdir -p $PKG/etc/profile.d
+zcat $CWD/coreutils-dircolors.csh.gz > $PKG/etc/profile.d/coreutils-dircolors.csh
+zcat $CWD/coreutils-dircolors.sh.gz > $PKG/etc/profile.d/coreutils-dircolors.sh
+chmod 755 $PKG/etc/profile.d/*
+
+# Remove things that are provided by other Slackware packages:
+for dupe in hostname kill su uptime ; do
+  rm -f $PKG/bin/${dupe} $PKG/usr/bin/${dupe} \
+    $PKG/usr/sbin/${dupe} $PKG/usr/man/man?/${dupe}.* ;
+done
+
+# Add ginstall links (there's still a lot of stuff that needs this to compile):
+( cd $PKG/bin ; ln -sf install ginstall )
+( cd $PKG/usr/bin ; ln -sf ../../bin/ginstall ginstall )
+( cd $PKG/usr/man/man1 ; ln -sf install.1 ginstall.1 )
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING* NEWS README THANKS THANKS-to-translators TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/coreutils/coreutils.uname.diff b/source/a/coreutils/coreutils.uname.diff
new file mode 100644
index 000000000..bd39221c1
--- /dev/null
+++ b/source/a/coreutils/coreutils.uname.diff
@@ -0,0 +1,161 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-08-24
+Initial Package Version: 5.97
+Upstream Status: Not Accepted
+Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
+Description: Display CPU Information from /proc/cpuinfo or /proc/sysinfo
+
+Original Patch by - Matthew Burgess and Scot McPherson
+
+diff -Nur coreutils-7.1.orig/src/uname.c coreutils-7.1/src/uname.c
+--- coreutils-7.1/src/uname.c	2008-09-18 02:06:57.000000000 -0500
++++ coreutils-7.1/src/uname.c	2009-02-22 21:23:02.209219703 -0600
+@@ -50,6 +50,11 @@
+ # include <mach-o/arch.h>
+ #endif
+ 
++#if defined (__linux__)
++# define USE_PROCINFO
++# define UNAME_HARDWARE_PLATFORM
++#endif
++
+ #include "system.h"
+ #include "error.h"
+ #include "quote.h"
+@@ -155,6 +160,106 @@
+   exit (status);
+ }
+ 
++#if defined(USE_PROCINFO)
++
++# if defined(__s390__) || defined(__s390x__)
++#  define CPUINFO_FILE    "/proc/sysinfo"
++#  define CPUINFO_FORMAT  "%64[^\t :]%*[ :]%256[^\n]%c"
++# else
++#  define CPUINFO_FILE    "/proc/cpuinfo"
++#  define CPUINFO_FORMAT  "%64[^\t:]\t:%256[^\n]%c"
++# endif
++
++# define PROCINFO_PROCESSOR      0
++# define PROCINFO_HARDWARE_PLATFORM 1
++
++static void __eat_cpuinfo_space(char *buf)
++{
++	/* first eat trailing space */
++	char *tmp = buf + strlen(buf) - 1;
++	while (tmp > buf && isspace(*tmp))
++		*tmp-- = '\0';
++	/* then eat leading space */
++	tmp = buf;
++	while (*tmp && isspace(*tmp))
++		tmp++;
++	if (tmp != buf)
++		memmove(buf, tmp, strlen(tmp)+1);
++}
++
++static int __linux_procinfo (int x, char *fstr, size_t s)
++{
++	FILE *fp;
++
++	char *procinfo_keys[] = {
++		/* --processor --hardware-platform */
++		#if defined(__alpha__)
++			"cpu model", "system type"
++		#elif defined(__arm__)
++			"Processor", "Hardware"
++		#elif defined(bfin)
++			"CPU", "BOARD Name"
++		#elif defined(__cris__)
++			"cpu", "cpu model"
++		#elif defined(__frv__)
++			"CPU-Core", "System"
++		#elif defined(__i386__) || defined(__x86_64__)
++			"model name", "vendor_id"
++		#elif defined(__ia64__)
++			"family", "vendor"
++		#elif defined(__hppa__)
++			"cpu", "model"
++		#elif defined(__m68k__)
++			"CPU", "MMU"
++		#elif defined(__mips__)
++			"cpu model", "system type"
++		#elif defined(__powerpc__) || defined(__powerpc64__)
++			"cpu", "machine"
++		#elif defined(__s390__) || defined(__s390x__)
++			"Type", "Manufacturer"
++		#elif defined(__sh__)
++			"cpu type", "machine"
++		#elif defined(sparc) || defined(__sparc__)
++			"type", "cpu"
++		#elif defined(__vax__)
++			"cpu type", "cpu"
++		#else
++			"unknown", "unknown"
++		#endif
++	};
++
++	if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
++		char key[65], value[257], eol, *ret = NULL;
++
++		while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
++			__eat_cpuinfo_space(key);
++			if (!strcmp(key, procinfo_keys[x])) {
++				__eat_cpuinfo_space(value);
++				ret = value;
++				break;
++			}
++			if (eol != '\n') {
++				/* we need two fscanf's here in case the previous
++				 * length limit caused us to read right up to the
++				 * newline ... doing "%*[^\n]\n" wont eat the newline
++				 */
++				fscanf(fp, "%*[^\n]");
++				fscanf(fp, "\n");
++			}
++		}
++		fclose(fp);
++
++		if (ret) {
++			strncpy(fstr, ret, s);
++			return 0;
++		}
++	}
++
++	return -1;
++}
++
++#endif
++
+ /* Print ELEMENT, preceded by a space if something has already been
+    printed.  */
+ 
+@@ -302,10 +407,14 @@
+   if (toprint & PRINT_PROCESSOR)
+     {
+       char const *element = unknown;
+-#if HAVE_SYSINFO && defined SI_ARCHITECTURE
++#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
+       {
+ 	static char processor[257];
++#if defined(USE_PROCINFO)
++	if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
++#else
+ 	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
++#endif
+ 	  element = processor;
+       }
+ #endif
+@@ -358,9 +467,13 @@
+       if (element == unknown)
+ 	{
+ 	  static char hardware_platform[257];
++#if defined(USE_PROCINFO)
++	  if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
++#else
+ 	  size_t s = sizeof hardware_platform;
+ 	  static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
+ 	  if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
++#endif
+ 	    element = hardware_platform;
+ 	}
+ #endif
diff --git a/source/a/coreutils/doinst.sh b/source/a/coreutils/doinst.sh
new file mode 100644
index 000000000..b1a6112ff
--- /dev/null
+++ b/source/a/coreutils/doinst.sh
@@ -0,0 +1,13 @@
+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/DIR_COLORS.new
+
diff --git a/source/a/coreutils/slack-desc b/source/a/coreutils/slack-desc
new file mode 100644
index 000000000..57e562d34
--- /dev/null
+++ b/source/a/coreutils/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------------------------------------------------------|
+coreutils: coreutils (core GNU utilities)
+coreutils:
+coreutils: These are the GNU core utilities, the basic command line programs
+coreutils: such as 'mkdir', 'ls', and 'rm' that are needed for the system to
+coreutils: run.  This package is the union of the GNU fileutils, sh-utils, and
+coreutils: textutils packages.  Most of these programs have significant
+coreutils: advantages over their Unix counterparts, such as greater speed,
+coreutils: additional options, and fewer arbitrary limits.
+coreutils:
+coreutils:
+coreutils:
diff --git a/source/a/cpio/cpio-2.9.gcc43.diff b/source/a/cpio/cpio-2.9.gcc43.diff
new file mode 100644
index 000000000..cfe02d7f0
--- /dev/null
+++ b/source/a/cpio/cpio-2.9.gcc43.diff
@@ -0,0 +1,30 @@
+--- ./lib/argp-fmtstream.h.orig	2006-01-21 04:37:18.000000000 -0600
++++ ./lib/argp-fmtstream.h	2009-03-15 15:17:22.000000000 -0500
+@@ -198,8 +198,12 @@
+ #endif
+ 
+ #ifndef ARGP_FS_EI
++#ifdef __GNUC_STDC_INLINE__
++#define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
++#else
+ #define ARGP_FS_EI extern inline
+ #endif
++#endif
+ 
+ ARGP_FS_EI size_t
+ __argp_fmtstream_write (argp_fmtstream_t __fs,
+--- ./lib/argp.h.orig	2007-03-30 11:20:19.000000000 -0500
++++ ./lib/argp.h	2009-03-15 15:16:34.000000000 -0500
+@@ -580,7 +580,11 @@
+ # endif
+ 
+ # ifndef ARGP_EI
+-#  define ARGP_EI extern __inline__
++#  if defined __GNUC_STDC_INLINE__
++#   define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
++#  else
++#   define ARGP_EI extern __inline__
++#  endif
+ # endif
+ 
+ ARGP_EI void
diff --git a/source/a/cpio/cpio.SlackBuild b/source/a/cpio/cpio.SlackBuild
new file mode 100755
index 000000000..9cb6054bc
--- /dev/null
+++ b/source/a/cpio/cpio.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+PKGNAM=cpio
+VERSION=${VERSION:-2.9}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  LIBDIRSUFFIX=""
+elif [ "$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.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
+
+zcat $CWD/cpio-2.9.gcc43.diff.gz | patch -p1 --verbose || 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 {} \;
+
+# Use the rmt provided by the tar package
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --bindir=/bin \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/${PKGNAM}-$VERSION \
+  --enable-mt \
+  --with-rmt=/sbin/rmt \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG INSTALL="install -p" || exit 1
+
+# Remove an empty directory
+rmdir $PKG/usr/libexec
+
+# Do not clash with the 'mt' which is part of tar:
+mv $PKG/bin/mt{,-GNU}
+mv $PKG/usr/man/man1/mt{,-GNU}.1
+
+# Strip stuff:
+find $PKG | xargs file | grep -e "executable" -e "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
+
+# Compress info pages:
+rm -f $PKG/usr/info/dir
+gzip -9f $PKG/usr/info/*
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/cpio-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO \
+  $PKG/usr/doc/cpio-$VERSION
+chmod 644 $PKG/usr/doc/cpio-$VERSION/*
+
+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/a/cpio/slack-desc b/source/a/cpio/slack-desc
new file mode 100644
index 000000000..90f820c22
--- /dev/null
+++ b/source/a/cpio/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------------------------------------------------------|
+cpio: cpio (backup and archiving utility)
+cpio:
+cpio: This is GNU cpio, a program to manage archives of files. This package
+cpio: also includes mt, a tape drive control program. cpio copies files into
+cpio: or out of a cpio or tar archive, which is a file that contains other
+cpio: files plus information about them, such as their pathname, owner,
+cpio: timestamps, and access permissions. The archive can be another file on
+cpio: the disk, a magnetic tape, or a pipe.
+cpio:
+cpio:
+cpio:
diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild
new file mode 100755
index 000000000..7a7f3a8ba
--- /dev/null
+++ b/source/a/cryptsetup/cryptsetup.SlackBuild
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+# Copyright (c) 2007, 2009 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2007, 2009 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.
+
+# -----------------------------------------------------------------------------
+#
+# Slackware SlackBuild script 
+# ===========================
+# By:        Eric Hameleers <alien@slackware.com>
+# For:       cryptsetup
+# Descr:     Utility for setting up encrypted filesystems
+# URL:       http://luks.endorphin.org/dm-crypt
+# 
+# -----------------------------------------------------------------------------
+
+PRGNAM=cryptsetup
+VERSION=${VERSION:-1.0.7}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-cryptsetup
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr
+
+cd $TMP
+rm -rf cryptsetup-$VERSION
+tar xvf $CWD/cryptsetup-$VERSION.tar.bz2 || exit 1
+cd cryptsetup-$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 {} \;
+
+echo Building ...
+LDFLAGS="$SLKLDFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --enable-libgcrypt \
+  --enable-libdevmapper \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux
+make
+make DESTDIR=$PKG install
+
+# 
+# Next, make the static version that we will use for mkinitrd:
+#
+
+make clean
+echo Building ...
+LDFLAGS="$SLKLDFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --enable-libgcrypt \
+  --enable-libdevmapper \
+  --enable-static \
+  --disable-shared \
+  --disable-shared-library \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux
+make
+
+# I have to do one old-school thing to leave a mark here:
+mkdir -p $PKG/sbin
+cat src/cryptsetup > $PKG/sbin/cryptsetup.static
+chmod 755 $PKG/sbin/cryptsetup.static
+
+mv $PKG/usr/sbin/cryptsetup $PKG/usr/sbin/cryptsetup.dynamic
+# Replace with a link:
+( cd $PKG/usr/sbin ; ln -sf cryptsetup.dynamic cryptsetup )
+# In /sbin, use the static version as /usr *might* not be mounted yet.
+# However, note that some cryptsetup operations cause the static
+# version to segfault, so for things like formatting you'll want
+# to use the dynamic one.  That's what should be in the $PATH first.
+( cd $PKG/sbin ; ln -sf cryptsetup.static cryptsetup )
+
+# Remove unneeded empty directory:
+#rmdir $PKG/usr/lib/cryptsetup
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+
+find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; || true
+
+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/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+
diff --git a/source/a/cryptsetup/slack-desc b/source/a/cryptsetup/slack-desc
new file mode 100644
index 000000000..fbc0035b5
--- /dev/null
+++ b/source/a/cryptsetup/slack-desc
@@ -0,0 +1,21 @@
+# 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------------------------------------------------------|
+cryptsetup: cryptsetup (utility for setting up encrypted filesystems)
+cryptsetup:
+cryptsetup: LUKS is a standard for cross-platform hard disk encryption.
+cryptsetup: It provides secure management of multiple userpasswords and
+cryptsetup: stores setup information in the partition header.
+cryptsetup: LUKS for dm-crypt is now implemented in cryptsetup replacing the
+cryptsetup: original cryptsetup. It provides all the functionally of the
+cryptsetup: original version plus all LUKS features.
+cryptsetup:
+cryptsetup: cryptsetup home: http://luks.endorphin.org/dm-crypt
+cryptsetup:
+
+
diff --git a/source/a/cups/cups.SlackBuild b/source/a/cups/cups.SlackBuild
new file mode 100755
index 000000000..5ae070951
--- /dev/null
+++ b/source/a/cups/cups.SlackBuild
@@ -0,0 +1,171 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+# CUPS build script by volkerdi@slackware.com.
+
+VERSION=1.3.11
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-cups
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf cups-$VERSION
+tar xvf $CWD/cups-$VERSION-source.tar.?z* || exit 1
+cd cups-$VERSION
+
+zcat $CWD/cups.firefox.desktop.diff.gz | patch -p1 --verbose || exit 1
+
+sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure
+./configure \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --enable-ssl \
+  --enable-openssl=yes \
+  --enable-gnutls=no \
+  --enable-cdsassl=no \
+  --docdir=/usr/doc \
+  --without-php \
+  --disable-pam \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || exit 1
+mkdir -p $PKG/etc/cups
+mkdir -p $PKG/var/spool
+make BUILDROOT=$PKG install || exit 1
+
+# I've added so many things like /etc/init.d/ to Slackware that CUPS
+# is now installing init scripts to the Red Hat locations.  We'll move
+# them to the usual locations:
+mkdir -p $PKG/etc/rc.d
+# Handle this as a config file, and non-executable in a default install:
+mv $PKG/etc/init.d/cups $PKG/etc/rc.d/rc.cups.new
+chmod 644 $PKG/etc/rc.d/rc.cups.new
+# Clear out the additions:
+rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d
+
+# I'm not sure if overwriting this blindly could have ill effects,
+# but it never hurts to play it safe.  According to the dbus-daemon
+# manpage, only files ending in .conf will be used, so there won't
+# be any unintended doubling up.
+mv $PKG/etc/dbus-1/system.d/cups.conf $PKG/etc/dbus-1/system.d/cups.conf.new
+
+# For full CUPS SMB support, you'll need to install the cups-samba
+# package from the source in this directory.  There's no easy way
+# to add that to a package build, and the requests aren't pouring in,
+# so you'll have to install it yourself.  It's easy to do.
+
+# However, this will get you the most useful SMB support for free.
+# Thanks to Boris Kurktchiev for the tip.  :-)
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/cups/backend
+  if [ ! -e smb ]; then
+    ln -sf /usr/bin/smbspool smb
+  fi
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Remove preformatted manpages and move the manpages to /usr/man:
+( cd $PKG/usr/share/man
+  find . -type d -name "cat*" | xargs rm -rf
+  cd ..
+  mv man ..
+)
+
+# Adjust/expand docs:
+( mkdir -p $PKG/usr/doc
+  mv $PKG/usr/share/doc/cups $PKG/usr/doc/cups-$VERSION
+  rmdir $PKG/usr/share/doc
+  cd $PKG/usr/doc
+  ln -sf cups-$VERSION cups )
+
+# I'm sorry, but PDF files are almost as bloated and annoying as
+# MS Word documents.  We'll retain the HTML files in /usr/doc.
+( cd $PKG/usr/doc
+  find . -name "*.pdf" -exec rm -f {} \; )
+
+# Apply no-clobber fix to conffiles:
+( cd $PKG/etc/cups
+  for file in * ; do
+    if [ -f $file ]; then
+      mv $file $file.new
+    fi
+  done )
+
+# Strip stuff:
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Use symlinks to certain binaries so that CUPS and LPRng can coexist:
+SUFFIX=cups
+for file in \
+usr/bin/cancel \
+usr/bin/lp \
+usr/bin/lpq \
+usr/bin/lpr \
+usr/bin/lprm \
+usr/bin/lpstat \
+usr/sbin/lpc ; do
+  ( cd $PKG
+    mv ${file} ${file}-${SUFFIX}
+    ( cd `dirname ${file}` ; ln -sf `basename ${file}`-${SUFFIX} `basename ${file}` )
+  )
+done
+# Now fix the associated man pages:
+mv $PKG/usr/man/man1/cancel.1.gz $PKG/usr/man/man1/cancel-${SUFFIX}.1.gz
+mv $PKG/usr/man/man1/lp.1.gz $PKG/usr/man/man1/lp-${SUFFIX}.1.gz
+mv $PKG/usr/man/man1/lpq.1.gz $PKG/usr/man/man1/lpq-${SUFFIX}.1.gz
+mv $PKG/usr/man/man1/lpr.1.gz $PKG/usr/man/man1/lpr-${SUFFIX}.1.gz
+mv $PKG/usr/man/man1/lprm.1.gz $PKG/usr/man/man1/lprm-${SUFFIX}.1.gz
+mv $PKG/usr/man/man1/lpstat.1.gz $PKG/usr/man/man1/lpstat-${SUFFIX}.1.gz
+mv $PKG/usr/man/man8/lpc.8.gz $PKG/usr/man/man8/lpc-${SUFFIX}.8.gz
+( cd $PKG/usr/man/man1
+  ln -sf cancel-${SUFFIX}.1.gz cancel.1.gz
+  ln -sf lp-${SUFFIX}.1.gz lp.1.gz
+  ln -sf lpq-${SUFFIX}.1.gz lpq.1.gz
+  ln -sf lpr-${SUFFIX}.1.gz lpr.1.gz
+  ln -sf lprm-${SUFFIX}.1.gz lprm.1.gz
+  ln -sf lpstat-${SUFFIX}.1.gz lpstat.1.gz
+)
+( cd $PKG/usr/man/man8
+  ln -sf lpc-${SUFFIX}.8.gz lpc.8.gz
+)
+
+# Add the doinst.sh that installs the .new conffiles:
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/cups-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/cups/cups.firefox.desktop.diff b/source/a/cups/cups.firefox.desktop.diff
new file mode 100644
index 000000000..96affd5a3
--- /dev/null
+++ b/source/a/cups/cups.firefox.desktop.diff
@@ -0,0 +1,11 @@
+diff -u -r --new-file cups-1.3.11.orig/desktop/cups.desktop cups-1.3.11/desktop/cups.desktop
+--- cups-1.3.11.orig/desktop/cups.desktop	2008-09-05 19:30:39.000000000 -0500
++++ cups-1.3.11/desktop/cups.desktop	2009-08-21 20:18:23.604682681 -0500
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Categories=System;Printing;HardwareSettings;X-Red-Hat-Base;
+-Exec=htmlview http://localhost:631/
++Exec=firefox http://localhost:631/
+ Icon=cups
+ StartupNotify=false
+ Terminal=false
diff --git a/source/a/cups/doinst.sh b/source/a/cups/doinst.sh
new file mode 100644
index 000000000..3f56dab3f
--- /dev/null
+++ b/source/a/cups/doinst.sh
@@ -0,0 +1,28 @@
+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...
+}
+for file in etc/cups/*.new ; do
+  config $file
+done
+config etc/dbus-1/system.d/cups.conf.new
+
+# Leave any new rc.cups with the same permissions as the old one:
+# This is a kludge, but it's because there's no --reference option
+# on busybox's 'chmod':
+if [ -e etc/rc.d/rc.cups ]; then
+  if [ -x etc/rc.d/rc.cups ]; then
+    chmod 755 etc/rc.d/rc.cups.new
+  else
+    chmod 644 etc/rc.d/rc.cups.new
+  fi
+fi
+# Then config() it:
+config etc/rc.d/rc.cups.new
diff --git a/source/a/cups/slack-desc b/source/a/cups/slack-desc
new file mode 100644
index 000000000..c2e1643c9
--- /dev/null
+++ b/source/a/cups/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------------------------------------------------------|
+cups: CUPS (Common UNIX Printing System)
+cups:
+cups: The Common UNIX Printing System provides a portable printing layer for
+cups: UNIX(R)-like operating systems. It has been developed by Easy Software
+cups: Products to promote a standard printing solution for all UNIX vendors
+cups: and users.  CUPS uses the Internet Printing Protocol ("IPP") as the
+cups: basis for managing print jobs and queues.  The CUPS package includes
+cups: System V and Berkeley command-line interfaces, a PostScript RIP
+cups: package for supporting non-PostScript printer drivers, and tools for
+cups: creating additional printer drivers and other CUPS services.
+cups:
diff --git a/source/a/cxxlibs/cxxlibs.SlackBuild b/source/a/cxxlibs/cxxlibs.SlackBuild
new file mode 100755
index 000000000..025a64949
--- /dev/null
+++ b/source/a/cxxlibs/cxxlibs.SlackBuild
@@ -0,0 +1,57 @@
+#!/bin/sh
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=cxxlibs
+VERSION=${VERSION:-6.0.10}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $PKG
+cat $CWD/symlinks-to-tracked-libs${LIBDIRSUFFIX} | while read library ; do
+  ( mkdir -p $(dirname $library | cut -b2- )
+    cd $(dirname $library | cut -b2- )
+    rm -f $(basename $library)
+    cp -a $library .
+    rm -f $(readlink $library)
+    cp -a $(dirname $library)/$(readlink $library) .
+  )
+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/a/cxxlibs/oldgcc/oldgcc.build b/source/a/cxxlibs/oldgcc/oldgcc.build
new file mode 100755
index 000000000..471fefa13
--- /dev/null
+++ b/source/a/cxxlibs/oldgcc/oldgcc.build
@@ -0,0 +1,73 @@
+#!/bin/sh
+# GCC package build script (written by volkerdi@slackware.com)
+#
+# Copyright 2003, 2005  Slackware Linux, Inc., Concord, California, 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.
+#
+
+# NOTE - THIS DOESN'T MAKE PACKAGES! IT JUST BUILDS GCC AND G++
+# this is for the purpose of getting libstdc++.so.5
+VERSION=3.3.6
+ARCH=${ARCH:-x86_64}
+TARGET=${TARGET:-$ARCH-slackware-linux}
+BUILD=${BUILD:-1}
+
+CWD=`pwd`
+# Temporary build location.  This should *NOT* be a directory
+# path a non-root user could create later...
+TMP=/gcc-build-$(mcookie)
+
+# Clear the build locations:
+if [ -d $TMP ]; then
+  rm -rf $TMP
+fi
+
+EXTRA=--disable-multilib
+
+mkdir -p $TMP
+cd $TMP
+tar xjvf $CWD/gcc-$VERSION.tar.bz2
+# install docs
+( cd gcc-$VERSION
+  # Fix perms/owners
+  chown -R root.root .
+  find . -perm 777 -exec chmod 755 {} \;
+  find . -perm 775 -exec chmod 755 {} \;
+  find . -perm 754 -exec chmod 755 {} \;
+  find . -perm 664 -exec chmod 644 {} \;
+)
+# build gcc
+( mkdir gcc.build.lnx;
+  cd gcc.build.lnx;
+  CFLAGS="-O2 -fPIC" \
+  ../gcc-$VERSION/configure \
+              --enable-shared \
+              --enable-threads=posix \
+              --enable-__cxa_atexit \
+              --enable-languages=c,c++ \
+              --disable-checking \
+              --with-gnu-ld \
+              --verbose \
+              --target=${TARGET} \
+              --host=${TARGET} \
+	      $EXTRA
+  # Include all debugging info (for now):
+  make #bootstrap;
+) 2>&1 | tee $TMP/gcc.build.log
diff --git a/source/a/cxxlibs/slack-desc b/source/a/cxxlibs/slack-desc
new file mode 100644
index 000000000..c1428f943
--- /dev/null
+++ b/source/a/cxxlibs/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------------------------------------------------------|
+cxxlibs: cxxlibs (C++ shared library compatibility package)
+cxxlibs:
+cxxlibs: This package contains the shared libraries needed to run dynamically
+cxxlibs: linked C++ binaries linked with older versions of libstdc++.
+cxxlibs:
+cxxlibs:
+cxxlibs:
+cxxlibs:
+cxxlibs:
+cxxlibs:
+cxxlibs:
diff --git a/source/a/cxxlibs/symlinks-to-tracked-libs b/source/a/cxxlibs/symlinks-to-tracked-libs
new file mode 100644
index 000000000..e4f67cf60
--- /dev/null
+++ b/source/a/cxxlibs/symlinks-to-tracked-libs
@@ -0,0 +1,5 @@
+/usr/i486-slackware-linux/lib/libstdc++-libc6.1-2.so.3
+/usr/i486-slackware-linux/lib/libstdc++-libc6.2-2.so.3
+/usr/i486-slackware-linux/lib/libstdc++.so.4
+/usr/i486-slackware-linux/lib/libstdc++.so.5
+/usr/lib/libstdc++.so.6
diff --git a/source/a/cxxlibs/symlinks-to-tracked-libs64 b/source/a/cxxlibs/symlinks-to-tracked-libs64
new file mode 100644
index 000000000..3a348cf1e
--- /dev/null
+++ b/source/a/cxxlibs/symlinks-to-tracked-libs64
@@ -0,0 +1,2 @@
+/usr/lib64/libstdc++.so.5
+/usr/lib64/libstdc++.so.6
diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild
new file mode 100755
index 000000000..c761ce54c
--- /dev/null
+++ b/source/a/dbus/dbus.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+# Copyright 2007, 2008  Robby Workman  <http://rlworkman.net>
+# Copyright 2007, 2008, 2009  Patrick 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.
+
+PRGNAM=dbus
+VERSION=1.2.14
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1
+cd $PRGNAM-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared=yes \
+  --enable-static=no \
+  --with-system-pid-file=/var/run/dbus/dbus.pid \
+  --with-system-socket=/var/run/dbus/system_bus_socket \
+  --with-init-scripts=slackware \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+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
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
+# Install a custom init script for dbus - the included one is not good for us
+rm $PKG/etc/rc.d/*
+zcat $CWD/rc.messagebus.gz > $PKG/etc/rc.d/rc.messagebus.new
+chmod 0755 $PKG/etc/rc.d/rc.messagebus.new
+
+# Let's not clobber existing config files
+mv $PKG/etc/dbus-1/session.conf $PKG/etc/dbus-1/session.conf.new
+mv $PKG/etc/dbus-1/system.conf $PKG/etc/dbus-1/system.conf.new
+
+# Fix some directory ownership
+chown messagebus $PKG/var/lib/dbus
+
+# Add documentation
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING HACKING INSTALL NEWS README doc/*.{txt,html,dtd} \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
+
+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/a/dbus/doinst.sh b/source/a/dbus/doinst.sh
new file mode 100644
index 000000000..71c3d7a07
--- /dev/null
+++ b/source/a/dbus/doinst.sh
@@ -0,0 +1,24 @@
+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...
+}
+
+# Keep same perms on rc.messagebus.new:
+if [ -e etc/rc.d/rc.messagebus ]; then
+  cp -a etc/rc.d/rc.messagebus etc/rc.d/rc.messagebus.new.incoming
+  cat etc/rc.d/rc.messagebus.new > etc/rc.d/rc.messagebus.new.incoming
+  mv etc/rc.d/rc.messagebus.new.incoming etc/rc.d/rc.messagebus.new
+fi
+
+config etc/dbus-1/session.conf.new
+config etc/dbus-1/system.conf.new
+config etc/rc.d/rc.messagebus.new
+
diff --git a/source/a/dbus/rc.messagebus b/source/a/dbus/rc.messagebus
new file mode 100644
index 000000000..7b27eb599
--- /dev/null
+++ b/source/a/dbus/rc.messagebus
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# messagebus:   The D-BUS systemwide message bus
+#
+# description:  This is a daemon which broadcasts notifications of system events \
+#               and other messages. See http://www.freedesktop.org/software/dbus/
+#
+# processname: dbus-daemon
+# pidfile: /var/run/dbus/pid
+
+# This is a modified version of the rc.messagebus script distributed with the
+# dbus sources.  Thanks to Don Tanner of the GWare <http://gware.org> Project
+# for most of the work involved      --Robby Workman <rworkman@slackware.com>
+
+
+PIDFILE=/var/run/dbus/dbus.pid
+
+start() {
+  if ! ps axc | grep -w dbus-daemon ; then
+    rm -f $(dirname $PIDFILE)/*
+    if [ -x /usr/bin/dbus-uuidgen -a -x /usr/bin/dbus-daemon ] ; then
+      echo "Starting system message bus:  /usr/bin/dbus-uuidgen --ensure ; /usr/bin/dbus-daemon --system"
+      /usr/bin/dbus-uuidgen --ensure
+      /usr/bin/dbus-daemon --system 1> /dev/null
+    fi
+  fi
+}
+
+stop() {
+  if [ -e "$PIDFILE" ]; then
+    echo "Stopping system message bus..."
+    pid=$(cat $PIDFILE)
+    kill $pid 1> /dev/null 2> /dev/null
+    # Just in case:
+    killall dbus-daemon 1> /dev/null 2> /dev/null
+    rm -f $PIDFILE
+  fi
+}
+
+reload() {
+  echo "Reloading system message bus configuration..."
+  if [ -e "$PIDFILE" ]; then
+    pid=$(cat $PIDFILE)
+    kill -HUP $pid
+  else
+    killall -HUP dbus-daemon
+  fi
+}
+
+status() {
+  if ps axc | grep -wq dbus-daemon 2>/dev/null ; then
+    echo "dbus-daemon is running."
+  else
+    echo "dbus is stopped."
+  fi
+}
+
+# See how we were called.
+case "$1" in
+  start)
+    start
+    ;;
+  stop)
+    stop
+    ;;
+  restart)
+    stop
+    start
+    ;;
+  reload)
+    reload
+    ;;
+  status)
+    status
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|restart|reload|status}"
+    ;;
+esac
+
diff --git a/source/a/dbus/slack-desc b/source/a/dbus/slack-desc
new file mode 100644
index 000000000..0610ab8d3
--- /dev/null
+++ b/source/a/dbus/slack-desc
@@ -0,0 +1,18 @@
+# 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------------------------------------------------------|
+dbus: dbus (D-Bus message bus system)
+dbus:
+dbus: D-Bus supplies both a system daemon (for events such as "new hardware
+dbus: device added" or "printer queue changed") and a per user login
+dbus: session daemon (for general IPC needs among user applications).
+dbus: Also, the message bus is built on top of a general one-to-one message
+dbus: passing framework, which can be used by any two apps to communicate
+dbus: directly (without going through the message bus daemon). 
+dbus:
+dbus:
+dbus:
diff --git a/source/a/dcron/dcron-2.3.3.crontab.diff4 b/source/a/dcron/dcron-2.3.3.crontab.diff4
new file mode 100644
index 000000000..30d0501a0
--- /dev/null
+++ b/source/a/dcron/dcron-2.3.3.crontab.diff4
@@ -0,0 +1,19 @@
+--- ./crontab.c.orig	Wed Feb 20 14:31:32 2002
++++ ./crontab.c	Wed Feb 20 14:33:13 2002
+@@ -197,14 +197,14 @@
+ 	    int n;
+ 
+ 	    snprintf(path, sizeof(path), "%s.new", pas->pw_name);
+-	    if ((fd = open(path, O_CREAT|O_TRUNC|O_EXCL|O_APPEND|O_WRONLY, 0600)) >= 0) {
++	    if ((fd = open(path, O_CREAT|O_TRUNC|O_APPEND|O_WRONLY, 0600)) >= 0) {
+ 		while ((n = read(repFd, buf, sizeof(buf))) > 0) {
+ 		    write(fd, buf, n);
+ 		}
+ 		close(fd);
+ 		rename(path, pas->pw_name);
+ 	    } else {
+-		fprintf(stderr, "unable to create %s/%s\n", CDir, buf);
++		fprintf(stderr, "unable to create %s/%s\n", CDir, path);
+ 	    }
+ 	    close(repFd);
+ 	}
diff --git a/source/a/dcron/dcron-2.3.3.diff b/source/a/dcron/dcron-2.3.3.diff
new file mode 100644
index 000000000..22806de3e
--- /dev/null
+++ b/source/a/dcron/dcron-2.3.3.diff
@@ -0,0 +1,40 @@
+--- ./defs.h.orig	Fri Sep  5 14:44:32 1997
++++ ./defs.h	Thu Aug 26 16:56:10 1999
+@@ -29,7 +29,7 @@
+ #define CRONTABS	"/var/spool/cron/crontabs"
+ #endif
+ #ifndef TMPDIR
+-#define TMPDIR		"/tmp"
++#define TMPDIR		"/var/spool/cron"
+ #endif
+ #ifndef OPEN_MAX
+ #define OPEN_MAX	256
+--- ./subs.c.orig	Mon Feb 16 13:35:10 1998
++++ ./subs.c	Thu Aug 26 16:57:21 1999
+@@ -15,7 +15,7 @@
+ Prototype int ChangeUser(const char *user, short dochdir);
+ Prototype void vlog(int level, int fd, const char *ctl, va_list va);
+ Prototype int slog(char *buf, size_t sz, const char *ctl, va_list va, short useDate);
+-Prototype char *strdup(const char *);
++Prototype char *xx_strdup(const char *);
+ 
+ void 
+ log9(const char *ctl, ...)
+@@ -80,7 +80,7 @@
+ 
+     buf[0] = 0;
+     if (useDate)
+-	strftime(buf, 128, "%d-%b-%y %H:%M  ", tp);
++	strftime(buf, 128, "%d-%b-%Y %H:%M  ", tp);
+     vsnprintf(buf + strlen(buf), sz - strlen(buf), ctl, va);
+     return(strlen(buf));
+ }
+@@ -132,7 +132,7 @@
+ }
+ 
+ char *
+-strdup(const char *str)
++xx_strdup(const char *str)
+ {
+     char *ptr = malloc(strlen(str) + 1);
+ 
diff --git a/source/a/dcron/dcron-2.3.3.diff2 b/source/a/dcron/dcron-2.3.3.diff2
new file mode 100644
index 000000000..8eb8242c5
--- /dev/null
+++ b/source/a/dcron/dcron-2.3.3.diff2
@@ -0,0 +1,477 @@
+--- ./CHANGES:1.1	Fri Jan  7 18:15:59 2000
++++ ./CHANGES	Thu Apr 20 12:10:36 2000
+@@ -1,3 +1,15 @@
++20/03/00 - TEMHOTA <temnota@kmv.ru>
++	Adding SIGHUP signal handler. crond die when init send to it SIGHUP.
++	Rewrtited all loging code. Added logging through syslog and normal
++	logging to file. 
++
++	Technical details:
++	+ logging through syslog used facility LOG_CRON
++	+ log_err - now *always* write message to logger (if selected logging
++	  through syslog - message send as LOG_ERR).
++	+ log9 - sends message hrough syslog loglevel LOG_WARNING
++	+ for all other log levels - default syslog loglevel LOG_NOTICE
++
+ 02/16/98 - Jordan Mendelson (jordy@wserv.com)
+ 
+ 	Numerous people have reported a problem with logging. I'm sorry
+--- ./Makefile:1.1	Fri Jan  7 18:15:59 2000
++++ ./Makefile	Thu Apr 20 12:24:40 2000
+@@ -27,7 +27,7 @@
+ 	rm -f crond crontab
+ 
+ cleano:
+-	rm -f *.o dcron.tgz $(PROTOS)
++	rm -f *.o dcron.tgz $(PROTOS) *~
+ 
+ install: crond crontab
+ 	install -o root -g root -m 0755 crond /usr/sbin
+--- ./crontab.c:1.1	Fri Jan  7 18:15:59 2000
++++ ./crontab.c	Sun Mar 19 15:03:36 2000
+@@ -15,6 +15,9 @@
+ char  *CDir = CRONTABS;
+ int   UserId;
+ short LogLevel = 9;
++short DebugOpt = 0;
++short LoggerOpt = 0;
++char  *LogFile = LOG_FILE;
+ 
+ void EditFile(const char *user, const char *file);
+ int GetReplaceStream(const char *user, const char *file);
+@@ -136,7 +139,7 @@
+      */
+ 
+     if (chdir(CDir) < 0) {
+-        fprintf(stderr, "cannot change diir to %s: %s\n", CDir, strerror(errno));
++        fprintf(stderr, "cannot change dir to %s: %s\n", CDir, strerror(errno));
+         exit(1);
+     }
+ 
+--- ./defs.h:1.1	Fri Jan  7 18:15:59 2000
++++ ./defs.h	Sun Mar 19 15:03:36 2000
+@@ -17,6 +17,9 @@
+ #include <pwd.h>
+ #include <unistd.h>
+ #include <grp.h>
++#include <syslog.h>
++#include <signal.h>
++#include <getopt.h>
+ #include <sys/ioctl.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+@@ -30,6 +33,9 @@
+ #endif
+ #ifndef TMPDIR
+ #define TMPDIR		"/var/spool/cron"
++#endif
++#ifndef LOG_FILE
++#define LOG_FILE	"/var/log/cron"
+ #endif
+ #ifndef OPEN_MAX
+ #define OPEN_MAX	256
+--- ./job.c:1.1	Fri Jan  7 18:15:59 2000
++++ ./job.c	Thu Apr 20 12:10:36 2000
+@@ -16,7 +16,7 @@
+ {
+     char mailFile[128];
+     int mailFd;
+-
++     
+     line->cl_Pid = 0;
+     line->cl_MailFlag = 0;
+ 
+@@ -57,14 +57,6 @@
+ 	    log(5, "Child Running %s\n", line->cl_Shell);
+ 
+ 	/*
+-	 * Setup close-on-exec descriptor in case exec fails
+-	 */
+-
+-	dup2(2, 8);
+-	fcntl(8, F_SETFD, 1);
+-	fclose(stderr);
+-
+-	/*
+ 	 * stdin is already /dev/null, setup stdout and stderr
+ 	 */
+ 
+@@ -73,13 +65,13 @@
+ 	    dup2(mailFd, 2);
+ 	    close(mailFd);
+ 	} else {
+-	    logfd(8, "unable to create mail file user %s file %s, output to /dev/null\n",
++	    log_err("unable to create mail file user %s file %s, output to /dev/null\n",
+ 	        file->cf_User,
+ 	        mailFile
+ 	    );
+ 	}
+ 	execl("/bin/sh", "/bin/sh", "-c", line->cl_Shell, NULL, NULL);
+-	logfd(8, "unable to exec, user %s cmd /bin/sh -c %s\n", 
++	log_err("unable to exec, user %s cmd /bin/sh -c %s\n", 
+ 	    file->cf_User,
+ 	    line->cl_Shell
+ 	);
+@@ -89,7 +81,7 @@
+ 	/*
+ 	 * PARENT, FORK FAILED
+ 	 */
+-        log9("couldn't fork, user %s\n", file->cf_User);
++        log_err("couldn't fork, user %s\n", file->cf_User);
+         line->cl_Pid = 0;
+         remove(mailFile);
+     } else {
+@@ -158,6 +150,7 @@
+     if (mailFd < 0) {
+         return;
+     }
++
+     if (fstat(mailFd, &sbuf) < 0 || 
+         sbuf.st_uid != DaemonUid || 
+         sbuf.st_nlink != 0 ||
+@@ -182,15 +175,6 @@
+ 	    exit(0);
+ 
+ 	/*
+-	 * create close-on-exec log descriptor in case exec fails
+-	 */
+-
+-	dup2(2, 8);
+-	fcntl(8, F_SETFD, 1);
+-
+-	fclose(stderr);
+-
+-	/*
+ 	 * run sendmail with mail file as standard input, only if
+ 	 * mail file exists!
+ 	 */
+@@ -200,7 +184,7 @@
+ 	close(mailFd);
+ 
+ 	execl(SENDMAIL, SENDMAIL, SENDMAIL_ARGS, NULL, NULL);
+-	logfd(8, "unable to exec %s %s, user %s, output to sink null", 
++	log_err("unable to exec %s %s, user %s, output to sink null", 
+ 	    SENDMAIL,
+ 	    SENDMAIL_ARGS,
+ 	    file->cf_User
+@@ -210,7 +194,7 @@
+ 	/*
+ 	 * PARENT, FORK FAILED
+ 	 */
+-	log9("unable to fork, user %s", file->cf_User);
++	log_err("unable to fork, user %s", file->cf_User);
+ 	line->cl_Pid = 0;
+     } else {
+ 	/*
+--- ./main.c:1.1	Fri Jan  7 18:15:59 2000
++++ ./main.c	Sun Mar 19 15:03:36 2000
+@@ -15,14 +15,18 @@
+ Prototype short DebugOpt;
+ Prototype short LogLevel;
+ Prototype short ForegroundOpt;
+-Prototype char *CDir;
+-Prototype int DaemonUid;
++Prototype short LoggerOpt;
++Prototype char  *CDir;
++Prototype char  *LogFile;
++Prototype uid_t DaemonUid;
+ 
+ short DebugOpt;
+ short LogLevel = 8;
+-short ForegroundOpt;
++short ForegroundOpt = 0;
++short LoggerOpt;
+ char  *CDir = CRONTABS;
+-int DaemonUid;
++char  *LogFile = LOG_FILE;
++uid_t DaemonUid;
+ 
+ int
+ main(int ac, char **av)
+@@ -35,48 +39,49 @@
+ 
+     DaemonUid = getuid();
+ 
+-    for (i = 1; i < ac; ++i) {
+-        char *ptr = av[i];
++    opterr = 0;		/* disable getopt 'errors' message.*/
+ 
+-        if (*ptr == '-') {
+-	    ptr += 2;
+-
+-	    switch(ptr[-1]) {
++    while ((i = getopt(ac,av,"d:l:L:fbSc:")) != EOF){
++	
++  	switch (i){
+ 	    case 'l':
+-		LogLevel = (*ptr) ? strtol(ptr, NULL, 0) : 1;
+-		continue;
++		LogLevel = atoi(optarg);
++                break;
+ 	    case 'd':
+-		DebugOpt = (*ptr) ? strtol(ptr, NULL, 0) : 1;
++		DebugOpt = atoi(optarg);
+ 		LogLevel = 0;
+ 		/* fall through */
++		break;
+ 	    case 'f':
+ 		ForegroundOpt = 1;
+-		continue;
++		break;
+ 	    case 'b':
+ 	        ForegroundOpt = 0;
+-	        continue;
++	        break;
++	    case 'S':			/* select logging to syslog */
++		LoggerOpt = 0;
++		break;
++	    case 'L':			/* select internal file logger */
++	        LoggerOpt = 1;
++	        if (*optarg != 0) LogFile = optarg;
++	        break;
+ 	    case 'c':
+-		CDir = (*ptr) ? ptr : av[++i];
+-		continue;
++		if (*optarg != 0) CDir = optarg;
++		break;
+ 	    default:
++                /*
++                 * parse error
++                 */
++	        printf("dcron " VERSION "\n");
++	        printf("dcron -d [#] -l [#] -S -L logfile -f -b -c dir\n");
++	        printf("-d num\tdebug level\n-l num\tlog level (8 - default)\n-S\tlog to syslod (defualt)\n");
++	        printf("-L file\tlog to file\n-f\trun in fordeground\n");
++	        printf("-b\trun in background (default)\n-c dir\tworking dir\n");
++	        exit(1);
+ 		break;
+-	    }
+-	}
+-	break;	/* error */
+-    }
+-
+-    /*
+-     * check for parse error
+-     */
+-
+-    if (i != ac) {
+-        if (i > ac)
+-            puts("expected argument for option");
+-	printf("dcron " VERSION "\n");
+-	printf("dcron -d[#] -l[#] -f -b -c dir\n");
+-	exit(1);
++        }
+     }
+-
++    
+     /*
+      * change directory
+      */
+@@ -87,14 +92,15 @@
+     }
+ 
+     /*
+-     * close stdin and stdout (stderr normally redirected by caller).
+-     * close unused descriptors
++     * close stdin and stdout, stderr.
++     * close unused descriptors -  don't need.
+      * optional detach from controlling terminal
+      */
+ 
+     fclose(stdin);
+     fclose(stdout);
+-
++    fclose(stderr);
++    
+     i = open("/dev/null", O_RDWR);
+     if (i < 0) {
+         perror("open: /dev/null:");
+@@ -102,15 +108,14 @@
+     }
+     dup2(i, 0);
+     dup2(i, 1);
++    dup2(i, 2);
+ 
+-    for (i = 3; i < OPEN_MAX; ++i) {
+-        close(i);
+-    }
+-
+     if (ForegroundOpt == 0) {
+         int fd;
+         int pid;
+-
++	if (setsid() < 0)
++	    perror("setsid");
++	    
+         if ((fd = open("/dev/tty", O_RDWR)) >= 0) {
+             ioctl(fd, TIOCNOTTY, 0);
+             close(fd);
+@@ -125,13 +130,17 @@
+         if (pid > 0)
+             exit(0);
+     }
+-
++    
++    (void)startlogger();		/* need if syslog mode selected */
++    (void)initsignals();		/* set some signal handlers */
++    
+     /* 
+      * main loop - synchronize to 1 second after the minute, minimum sleep
+      *             of 1 second.
+      */
++
++    log(9,"%s " VERSION " dillon, started, log level %d\n", av[0], LogLevel);
+ 
+-    log9("%s " VERSION " dillon, started\n", av[0]);
+     SynchronizeDir(".");
+ 
+     {
+--- ./subs.c:1.1	Fri Jan  7 18:15:59 2000
++++ ./subs.c	Sun Mar 19 15:03:36 2000
+@@ -10,43 +10,62 @@
+ 
+ Prototype void log(int level, const char *ctl, ...);
+ Prototype void log9(const char *ctl, ...);
+-Prototype void logfd(int fd, const char *ctl, ...);
++Prototype void log_err(const char *ctl, ...);
+ Prototype void fdprintf(int fd, const char *ctl, ...);
+-Prototype int ChangeUser(const char *user, short dochdir);
+-Prototype void vlog(int level, int fd, const char *ctl, va_list va);
+-Prototype int slog(char *buf, size_t sz, const char *ctl, va_list va, short useDate);
++Prototype void vlog(int level, int MLOG_LEVEL, const char *ctl, va_list va);
++Prototype int  ChangeUser(const char *user, short dochdir);
+ Prototype char *xx_strdup(const char *);
++Prototype void startlogger(void);
++Prototype void initsignals(void);
+ 
++/*
++	set log_level=9 and log messages
++*/
++
+ void 
+ log9(const char *ctl, ...)
+ {
+     va_list va;
+ 
+     va_start(va, ctl);
+-    vlog(9, 2, ctl, va);
++    vlog(9, LOG_WARNING, ctl, va);
+     va_end(va);
+ }
+ 
++/*
++	normal logger call point.
++*/
++
+ void 
+ log(int level, const char *ctl, ...)
+ {
+     va_list va;
+ 
+     va_start(va, ctl);
+-    vlog(level, 2, ctl, va);
++    vlog(level, LOG_NOTICE, ctl, va);
+     va_end(va);
+ }
+ 
++/*
++	Original: void 
++		  logfd(int fd, const char *ctl, ...)
++	Updated to: log_error (used by jobs.c)
++*/
++
+ void 
+-logfd(int fd, const char *ctl, ...)
++log_err(const char *ctl, ...)
+ {
+     va_list va;
+ 
+     va_start(va, ctl);
+-    vlog(9, fd, ctl, va);
++    vlog(20, LOG_ERR, ctl, va);
+     va_end(va);
+ }
+ 
++/*
++	used by jobs.c (write to temp file..)
++*/
++
+ void 
+ fdprintf(int fd, const char *ctl, ...)
+ {
+@@ -60,32 +79,28 @@
+ }
+ 
+ void
+-vlog(int level, int fd, const char *ctl, va_list va)
++vlog(int level, int MLOG_LEVEL, const char *ctl, va_list va)
+ {
+     char buf[1024];
+-    short n;
+-    static short useDate = 1;
++    int  logfd;
+ 
+     if (level >= LogLevel) {
+-        write(fd, buf, n = slog(buf, sizeof(buf), ctl, va, useDate));
+-	useDate = (n && buf[n-1] == '\n');
++    	
++	vsnprintf(buf,sizeof(buf), ctl, va);
++	if (DebugOpt) fprintf(stderr,"%s",buf);
++	else 
++	    if (LoggerOpt == 0) syslog(MLOG_LEVEL, "%s",buf );
++            else { 
++                 if ((logfd = open(LogFile,O_WRONLY|O_CREAT|O_APPEND,600)) >= 0){
++                    write(logfd, buf, strlen(buf));
++                    close(logfd);
++                 } else 
++                    fprintf(stderr,"Can't open log file. Err: %s",strerror(errno));
++            } 
+     }
+ }
+ 
+ int
+-slog(char *buf, size_t sz, const char *ctl, va_list va, short useDate)
+-{
+-    time_t t = time(NULL);
+-    struct tm *tp = localtime(&t);
+-
+-    buf[0] = 0;
+-    if (useDate)
+-	strftime(buf, 128, "%d-%b-%Y %H:%M  ", tp);
+-    vsnprintf(buf + strlen(buf), sz - strlen(buf), ctl, va);
+-    return(strlen(buf));
+-}
+-
+-int
+ ChangeUser(const char *user, short dochdir)
+ {
+     struct passwd *pas;
+@@ -141,3 +156,28 @@
+     return(ptr);
+ }
+ 
++
++void
++startlogger(void){
++int  logfd;
++
++    if (LoggerOpt == 0)
++	openlog("crond",LOG_CONS|LOG_PID,LOG_CRON);
++
++    else { /* test logfile */
++        if ((logfd = open(LogFile,O_WRONLY|O_CREAT|O_APPEND,600)) >= 0)
++           close(logfd);
++        else
++           printf("Failed to open log file '%s' reason: %s",LogFile,strerror(errno));
++    }
++}
++
++
++void
++initsignals(void){
++
++      signal(SIGHUP,SIG_IGN);	/* hmm.. but, if kill -HUP original 
++                                 * version - his died. ;(
++                                 */
++                                 
++}
diff --git a/source/a/dcron/dcron-2.3.3.diff3 b/source/a/dcron/dcron-2.3.3.diff3
new file mode 100644
index 000000000..25c72fc96
--- /dev/null
+++ b/source/a/dcron/dcron-2.3.3.diff3
@@ -0,0 +1,11 @@
+--- ./defs.h.orig	Wed May 30 14:13:05 2001
++++ ./defs.h	Wed May 30 14:13:13 2001
+@@ -41,7 +41,7 @@
+ #define OPEN_MAX	256
+ #endif
+ #ifndef SENDMAIL
+-#define SENDMAIL	"/usr/lib/sendmail"
++#define SENDMAIL	"/usr/sbin/sendmail"
+ #endif
+ #ifndef SENDMAIL_ARGS
+ #define SENDMAIL_ARGS	"-t", "-oem", "-i"
diff --git a/source/a/dcron/dcron-2.3.3.lsm b/source/a/dcron/dcron-2.3.3.lsm
new file mode 100644
index 000000000..5c161b50a
--- /dev/null
+++ b/source/a/dcron/dcron-2.3.3.lsm
@@ -0,0 +1,17 @@
+Begin3
+Title:          DCron - yet another cron
+Version:        2.3.3
+Entered-date:   17Feb98
+Description:    A multi-user cron written from scratch by the author,
+		similar to vixie-cron but with significant differences.
+		Attention paid less to feature creep and more to usability
+		and reliability
+Keywords:       cron crontab dcron
+Author:         dillon@apollo.west.oic.com (Matthew Dillon)
+Maintained-by:  dillon@apollo.west.oic.com (Matthew Dillon)
+Primary-site:   sunsite.unc.edu /pub/Linux/system/daemons/cron
+Alternate-site: 
+Original-site:  
+Platforms:      
+Copying-policy: GPL
+End
diff --git a/source/a/dcron/dcron-2.3.3.version.diff b/source/a/dcron/dcron-2.3.3.version.diff
new file mode 100644
index 000000000..1b65a0c98
--- /dev/null
+++ b/source/a/dcron/dcron-2.3.3.version.diff
@@ -0,0 +1,11 @@
+--- ./defs.h.orig	Tue Apr  9 01:07:07 2002
++++ ./defs.h	Tue Apr  9 01:07:15 2002
+@@ -51,7 +51,7 @@
+ #endif
+ 
+ 
+-#define VERSION	"2.3.2"
++#define VERSION	"2.3.3"
+ 
+ typedef struct CronFile {
+     struct CronFile *cf_Next;
diff --git a/source/a/dcron/dcron.SlackBuild b/source/a/dcron/dcron.SlackBuild
new file mode 100755
index 000000000..c9bb62ff3
--- /dev/null
+++ b/source/a/dcron/dcron.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=2.3.3
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-dcron
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_dcron.tar.gz
+
+cd $TMP
+rm -rf dcron-$VERSION
+tar xzvf $CWD/dcron-$VERSION.tar.gz
+cd dcron-$VERSION
+mkdir -p $PKG/usr/doc/dcron-$VERSION
+cp -a CHANGES README dcron-$VERSION.lsm $PKG/usr/doc/dcron-2.3.3
+chown root:root $PKG/usr/doc/dcron-$VERSION/*
+chmod 644 $PKG/usr/doc/dcron-$VERSION/*
+zcat $CWD/dcron-$VERSION.diff.gz | patch -p1 -E --verbose --backup || exit
+# Added signal handling/logging patch from TEMHOTA <temnota@kmv.ru>:
+zcat $CWD/dcron-$VERSION.diff2.gz | patch -p1 -E --verbose --backup || exit
+# Use /usr/sbin/sendmail, not /usr/lib/sendmail.  Fixes cron working
+# with Postfix.  Suggested by Big Brother.
+zcat $CWD/dcron-$VERSION.diff3.gz | patch -p1 -E --verbose --backup || exit
+# Fix problem where user creates /var/spool/cron/crontabs/<user>.new 
+# using 'crontab -', exits with control-c, and then crontab refuses to
+# overwrite the junk file:
+zcat $CWD/dcron-$VERSION.crontab.diff4.gz | patch -p1 -E --verbose --backup || exit
+# Dcron reports wrong version:
+zcat $CWD/dcron-2.3.3.version.diff.gz | patch -p1 || exit
+# Keep dcron from improperly forking in some circumstances.
+# Thanks to Henrik Carlqvist for the patch.
+zcat $CWD/dcron.fork.diff.gz | patch -p1
+make
+strip crond crontab
+cat crond > $PKG/usr/sbin/crond
+cat crontab > $PKG/usr/bin/crontab
+zcat $CWD/run-parts.gz > $PKG/usr/bin/run-parts
+cat crontab.1 | gzip -9c > $PKG/usr/man/man1/crontab.1.gz
+cat crond.8 | gzip -9c > $PKG/usr/man/man8/crond.8.gz
+cat $CWD/run-parts.8.gz > $PKG/usr/man/man8/run-parts.8.gz
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/dcron-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/dcron/dcron.fork.diff b/source/a/dcron/dcron.fork.diff
new file mode 100644
index 000000000..b3aefc054
--- /dev/null
+++ b/source/a/dcron/dcron.fork.diff
@@ -0,0 +1,11 @@
+--- ./job.c.orig	2005-09-11 16:36:43.000000000 -0700
++++ ./job.c	2005-09-11 16:37:51.000000000 -0700
+@@ -51,7 +51,7 @@
+ 	 */
+ 
+ 	if (ChangeUser(file->cf_User, 1) < 0)
+-	    return;
++	    exit(0);
+ 
+ 	if (DebugOpt)
+ 	    log(5, "Child Running %s\n", line->cl_Shell);
diff --git a/source/a/dcron/dcron.tmpdir.diff b/source/a/dcron/dcron.tmpdir.diff
new file mode 100644
index 000000000..3946fedeb
--- /dev/null
+++ b/source/a/dcron/dcron.tmpdir.diff
@@ -0,0 +1,11 @@
+--- defs.h.orig	Mon May  2 10:27:40 1994
++++ defs.h	Sun Apr  4 22:09:00 1999
+@@ -29,7 +29,7 @@
+ #define CRONTABS	"/var/spool/cron/crontabs"
+ #endif
+ #ifndef TMPDIR
+-#define TMPDIR		"/tmp"
++#define TMPDIR		"/var/spool/cron"
+ #endif
+ #ifndef OPEN_MAX
+ #define OPEN_MAX	256
diff --git a/source/a/dcron/run-parts b/source/a/dcron/run-parts
new file mode 100644
index 000000000..dd6b59b3e
--- /dev/null
+++ b/source/a/dcron/run-parts
@@ -0,0 +1,49 @@
+#!/bin/sh
+# run-parts:  Runs all the scripts found in a directory.
+
+# keep going when something fails
+set +e
+
+if [ $# -lt 1 ]; then
+  echo "Usage: run-parts <directory>"
+  exit 1
+fi
+
+if [ ! -d $1 ]; then
+  echo "Not a directory: $1"
+  echo "Usage: run-parts <directory>"
+  exit 1
+fi
+
+# There are several types of files that we would like to
+# ignore automatically, as they are likely to be backups
+# of other scripts:
+IGNORE_SUFFIXES="~ ^ , .bak .new .rpmsave .rpmorig .rpmnew .swp"
+
+# Main loop:
+for SCRIPT in $1/* ; do
+  # If this is not a regular file, skip it:
+  if [ ! -f $SCRIPT ]; then
+    continue
+  fi
+  # Determine if this file should be skipped by suffix:
+  SKIP=false
+  for SUFFIX in $IGNORE_SUFFIXES ; do
+    if [ ! "`basename $SCRIPT $SUFFIX`" = "`basename $SCRIPT`" ]; then
+      SKIP=true
+      break
+    fi
+  done
+  if [ "$SKIP" = "true" ]; then
+    continue
+  fi
+  # If we've made it this far, then run the script if it's executable:
+  if [ -x $SCRIPT ]; then
+    echo "$SCRIPT:"
+    echo
+    $SCRIPT 2>&1
+    echo
+  fi
+done
+
+exit 0
diff --git a/source/a/dcron/run-parts.8 b/source/a/dcron/run-parts.8
new file mode 100644
index 000000000..2d5e5f6ad
--- /dev/null
+++ b/source/a/dcron/run-parts.8
@@ -0,0 +1,36 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH RUN-PARTS 8 "14 Apr 2002" "Slackware Version 8.1.0
+.SH NAME
+run-parts \- run scripts found in a directory
+.SH SYNOPSIS
+.B run-parts <directory>
+.LP
+.SH DESCRIPTION
+.B run-parts
+is a utility that will run scripts that are found in a directory.  For example,
+it might be useful to create an /etc/cron.daily directory and put scripts in
+there for daily cron jobs.  Then
+.B run-parts
+can be called once a day from root's crontab to run all the scripts found in
+/etc/cron.daily:
+
+40 4 * * * run-parts /etc/cron.daily
+
+.B run-parts
+automatically skips files with certain suffixes that are generally associated
+with backup or extra files.  Any file that ends in one of these will be silently
+ignored:  ~ ^ , .bak .new .rpmsave .rpmorig .rpmnew .swp
+.SH AUTHOR
+Patrick J. Volkerding <volkerdi@slackware.com>, with ideas borrowed from the
+Red Hat and Debian versions of this utility.
+.SH "SEE ALSO"
+.BR crond(8),
+.BR crontab(8).
diff --git a/source/a/dcron/slack-desc b/source/a/dcron/slack-desc
new file mode 100644
index 000000000..d56e60871
--- /dev/null
+++ b/source/a/dcron/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------------------------------------------------------|
+dcron: dcron (Dillon's Cron daemon)
+dcron:
+dcron: The cron daemon runs in the background and executes tasks on behalf of
+dcron: users at the appropriate time.  Many timed system tasks are started
+dcron: with cron, such as the nightly indexing with updatedb.
+dcron:
+dcron: dcron was written entirely from scratch by Matthew Dillon.
+dcron:
+dcron:
+dcron:
+dcron:
diff --git a/source/a/device-mapper/64-device-mapper.rules b/source/a/device-mapper/64-device-mapper.rules
new file mode 100644
index 000000000..7e9a235db
--- /dev/null
+++ b/source/a/device-mapper/64-device-mapper.rules
@@ -0,0 +1,37 @@
+# device mapper links hook into "change" events, when the dm table
+# becomes available; some table-types must be ignored
+
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+KERNEL!="dm-*", GOTO="device_mapper_end"
+ACTION!="add|change", GOTO="device_mapper_end"
+
+# lookup device name
+# use dmsetup, until devmap_name is provided by sys-fs/device-mapper
+PROGRAM=="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info",
+	ENV{DM_NAME}="%c"
+
+# do not do anything if dmsetup does not provide a name
+ENV{DM_NAME}=="", NAME="", OPTIONS="ignore_device"
+
+# ignore luks crypt devices while not fully up
+ENV{DM_NAME}=="temporary-cryptsetup-*", NAME="", OPTIONS="ignore_device"
+
+# use queried name
+ENV{DM_NAME}=="?*", NAME="mapper/$env{DM_NAME}"
+
+SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}"
+SYMLINK+="disk/by-name/$env{DM_NAME}"
+
+PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end"
+ENV{DM_TYPE}="%c{3}"
+
+ENV{DM_TYPE}=="|*error*", GOTO="device_mapper_end"
+
+IMPORT{program}="vol_id --export $tempnode"
+OPTIONS="link_priority=50"
+ENV{DM_TYPE}=="*snapshot-origin*", OPTIONS="link_priority=60"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+
+LABEL="device_mapper_end"
diff --git a/source/a/device-mapper/device-mapper.SlackBuild b/source/a/device-mapper/device-mapper.SlackBuild
new file mode 100755
index 000000000..d770deed7
--- /dev/null
+++ b/source/a/device-mapper/device-mapper.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=1.02.28
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-device-mapper
+
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf device-mapper.$VERSION
+tar xvf $CWD/device-mapper.$VERSION.tar.bz2 || exit 1
+cd device-mapper.$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --enable-static_link \
+  --enable-pkgconfig \
+  --enable-dmeventd \
+  --disable-selinux \
+  --with-device-uid=0 \
+  --with-device-gid=6 \
+  --with-device-mode=0660 \
+  --build=$ARCH-slackware-linux
+  # I tried adding --enable-compat but that failed to compile
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# On x86_64 the pkgconfig files are installed to the wrong directory, but
+# the .pc content is correct, so we just move them over:
+if [ ! -d $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ]; then
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+  mv $PKG/usr/lib/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}/
+  rmdir $PKG/usr/lib || exit 1
+fi
+
+mkdir -p $PKG/lib/udev/rules.d
+cat $CWD/64-device-mapper.rules > $PKG/lib/udev/rules.d/64-device-mapper.rules
+
+( 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
+)
+
+mkdir -p $PKG/usr/doc/device-mapper.$VERSION
+cp -a \
+  COPYING* INSTALL INTRO README* VERSION WHATS_NEW \
+  $PKG/usr/doc/device-mapper.$VERSION
+
+# 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
+makepkg -l y -c n $TMP/device-mapper-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/device-mapper/slack-desc b/source/a/device-mapper/slack-desc
new file mode 100644
index 000000000..2708a39fb
--- /dev/null
+++ b/source/a/device-mapper/slack-desc
@@ -0,0 +1,20 @@
+# 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------------------------------------------------------|
+device-mapper: device-mapper (device-mapper for logical volume management)
+device-mapper:
+device-mapper: The goal of device-mapper is to support volume management.  The
+device-mapper: driver enables the definition of new block devices composed of
+device-mapper: ranges of sectors of existing devices.  This can be used to define
+device-mapper: disk partitions or logical volumes.
+device-mapper:
+device-mapper: device-mapper is required by LVM2, the Logical Volume Manager.
+device-mapper:
+device-mapper:
+device-mapper:
+
diff --git a/source/a/devs/devs.SlackBuild b/source/a/devs/devs.SlackBuild
new file mode 100755
index 000000000..61ddf33b4
--- /dev/null
+++ b/source/a/devs/devs.SlackBuild
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=2.3.1
+ARCH=noarch
+BUILD=${BUILD:-25}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-devs
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_devs.tar.gz
+
+cd $TMP
+rm -r MAKEDEV-${VERSION}
+tar xzvf $CWD/makedev_${VERSION}.orig.tar.gz
+cd MAKEDEV-${VERSION}
+zcat $CWD/makedev_2.3.1-46.2.diff.gz | patch -p1 -E
+#zcat $CWD/makedev_.slack.diff.gz | patch -p1 -E
+# Add many more IDE devices:
+zcat $CWD/makedev_2.3.1.hd.diff.gz | patch -p1 -E
+# Still not enough:
+zcat $CWD/makedev.hd.diff.gz | patch -p1 -E
+cat MAKEDEV > $PKG/dev/MAKEDEV
+cat README > $PKG/dev/README.MAKEDEV
+gzip -9c MAKEDEV.man > $PKG/usr/man/man8/MAKEDEV.8.gz
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/devs-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/MAKEDEV-${VERSION}
+  rm -rf $PKG
+fi
diff --git a/source/a/devs/makedev.hd.diff b/source/a/devs/makedev.hd.diff
new file mode 100644
index 000000000..7276c1dc0
--- /dev/null
+++ b/source/a/devs/makedev.hd.diff
@@ -0,0 +1,92 @@
+--- ./MAKEDEV.orig	2002-06-09 12:31:22.000000000 -0700
++++ ./MAKEDEV	2002-06-09 12:31:51.000000000 -0700
+@@ -914,7 +914,7 @@
+ 		base=`index ab $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+ 		do
+ 			makedev hd$unit$part b $major `math $base + $part` $disk
+ 		done
+@@ -925,7 +925,7 @@
+ 		base=`index cd $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+ 		do
+ 			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+@@ -936,7 +936,7 @@
+ 		base=`index ef $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+ 		do
+ 			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+@@ -947,7 +947,7 @@
+ 		base=`index gh $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+ 		do
+ 			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+@@ -958,7 +958,7 @@
+ 		base=`index ij $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+ 		do
+ 			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+@@ -969,7 +969,7 @@
+ 		base=`index kl $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+ 		do
+ 			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+@@ -980,7 +980,7 @@
+ 		base=`index mn $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+ 		do
+ 			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+@@ -991,7 +991,7 @@
+                 base=`index op $unit`
+                 base=`math $base \* 64`
+                 makedev hd$unit b $major $base $disk
+-                for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+                 do
+                         makedev hd$unit$part b $major $(( $base + $part )) $disk
+                 done
+@@ -1002,7 +1002,7 @@
+                 base=`index qr $unit`
+                 base=`math $base \* 64`
+                 makedev hd$unit b $major $base $disk
+-                for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+                 do
+                         makedev hd$unit$part b $major $(( $base + $part )) $disk
+                 done
+@@ -1013,7 +1013,7 @@
+                 base=`index st $unit`
+                 base=`math $base \* 64`
+                 makedev hd$unit b $major $base $disk
+-                for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                for part in 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 26 27 28 29 30 31 32
+                 do
+                         makedev hd$unit$part b $major $(( $base + $part )) $disk
+                 done
diff --git a/source/a/devs/makedev_2.3.1-46.2.diff b/source/a/devs/makedev_2.3.1-46.2.diff
new file mode 100644
index 000000000..87ad22f85
--- /dev/null
+++ b/source/a/devs/makedev_2.3.1-46.2.diff
@@ -0,0 +1,2952 @@
+--- makedev-2.3.1.orig/MAKEDEV.man
++++ makedev-2.3.1/MAKEDEV.man
+@@ -124,8 +124,7 @@
+ .BI ttyC x
+ and the corresponding dial-out device is
+ .BI cub x 
+-By default devices for 7 lines are created, but this can be changed to
+-15 by removing the comment.
++Devices for 32 lines are created.
+ .TP
+ .B Pseudo Terminals
+ .TP
+@@ -387,4 +386,4 @@
+ Linux Allocated Devices, maintained by H.\ Peter Anvin,
+ <Peter.Anvin@linux.org>.
+ .SH AUTHOR
+-Nick Holloway, <Nick.Hollowa
+\ No newline at end of file
++Nick Holloway, <Nick.Hollowa
+--- makedev-2.3.1.orig/MAKEDEV
++++ makedev-2.3.1/MAKEDEV
+@@ -10,25 +10,38 @@
+ # system, and you may change the permissions to suit your preference.  These
+ # lines _must_ be of the format "user group perm".
+ 
+- public="  root sys    666"
+- system="  root sys    660"
+-   kmem="  root kmem   660"
+-    tty="  root tty    666"
+-   cons="  root tty    622"	# 622 for console?
+-    vcs="  root sys    600"
+-dialout="  root uucp   660"
+-  mouse="  root sys    666"
+-printer="  root daemon 660"
+- floppy="  root floppy 660"
+-   disk="  root disk   660"
+-   scsi="  root sys    600"
+-  cdrom="  root disk   660"
+-   tape="  root disk   660"
+-  audio="  root sys    666"
+-  ibcs2="  root sys    666"
+-scanner="  root sys    666"
++ public="  root root   0666"
++private="  root root   0600"
++ system="  root root   0660"
++   kmem="  root kmem   0640"
++    tty="  root tty    0666"
++   cons="  root tty    0622"
++    vcs="  root root   0600"
++dialout="  root dialout 0660"
++  mouse="  root root   0660"
++printer="  root lp     0660"
++ floppy="  root floppy 0660"
++   disk="  root disk   0660"
++   scsi="  root root   0600"
++  cdrom="  root cdrom  0660"
++   tape="  root tape   0660"
++  audio="  root audio  0660"
++  video="  root video  0660"
++  ibcs2="  root root   0666"
++scanner="  root root   0666"
++   coda="  root root   0600"
++  ipsec="  root root   0200"
++readable="  root root   0444"
+ 
+-MAXVT=8
++MAXVT=63
++
++# defaults for $major_*
++major_ide0=3
++major_ide1=22
++major_sd=8
++major_lp=6
++
++# Remark: OSS/Linux becomes major_OSSLinux
+ 
+ #---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#
+ 
+@@ -94,41 +107,30 @@
+ 
+ #---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#
+ 
+-# For bash and ksh, we can use faster builtin routines to do manipulation,
+-# otherwise (ash) fall back to slower method using `expr'.
+-# The extra level of indirection using `eval' is necessary a) for ksh, and
+-# b) to get past ash.
++# Debian allows us to assume /bin/sh is a POSIX compliant shell, so go for it!
+ 
+-if [ "$RANDOM" != "$RANDOM" ]
+-then
+-	math () {
+-		eval echo "\$(($*))"
+-	}
+-	index () {	# index string c
+-		eval "I=\${1%$2*}"
+-		eval echo "\${#I}"
+-	}
+-	suffix () {
+-	    eval echo "\${1#$2}"
+-	}
+-	strip () {
+-		eval echo "\${1% $2 *} \${1#* $2 }"
+-	}
+-else
+-	math () {
+-		expr "$@"
+-	}
+-	index () {	# index string c
+-		expr $1 : ".*$2" - 1
+-	}
+-	suffix () {
+-		expr "$1" : "$2\(.*\)"
+-	}
+-	strip () {
+-		echo "[$1][$2]" >&2
+-		echo "`expr \"$1\" : \"\(.*\) $2 \"` `expr \"$1\" : \".* $2 \(.*\)\"`"
+-	}
+-fi
++math () {
++	eval echo "\$(($*))"
++}
++index () {	# index string c
++	eval "I=\${1%$2*}"
++	eval echo "\${#I}"
++}
++suffix () {
++	eval echo "\${1#$2}"
++}
++strip () {
++	eval echo "\${1% $2 *} \${1#* $2 }"
++}
++first () {
++	eval echo "\${1:0:1}"
++}
++second () {
++	eval echo "\${1:1:1}"
++}
++substr () {
++	echo $1 | cut -c $2
++}
+ 
+ #---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#
+ 
+@@ -140,6 +142,7 @@
+ 	exec 3<$procfs/devices
+ 	while read major device <&3
+ 	do
++		device=`echo $device|tr -d /`
+ 		case "$major" in
+ 			Character|Block|'')
+ 				;;
+@@ -166,7 +169,7 @@
+ 	while [ $# -ne 0 ]
+ 	do
+ 		case "$1" in
+-			mem|tty|ttyp|cua|cub)	;;
++			mem|tty|ttyp|cua|cub|cui)	;;
+ 			hd)	(for d in a b c d e f g h ; do
+ 					echo -n hd$d " "
+ 				 done) ; echo
+@@ -175,13 +178,16 @@
+ 			ide1)	echo hdc hdd ;;
+ 			ide2)	echo hde hdf ;;
+ 			ide3)	echo hdg hdh ;;
+-			sd)	echo sda sdb ;;
+-			sr)	echo scd0 ;;
++			sd)	echo sda sdb sdc sdd ;;
++			sg)	echo sg ;;
++			sr)	echo scd ;;
+ 			st)	echo st0 ;;
+ 			xd)	echo xda xdb ;;
++			ad)	echo ada adb ;;
+ 			fd)	echo fd0 fd1 ;;
+ 			lp)	echo lp ;;
+ 			mt)	echo ftape ;;
++			qft)	echo ftape ;;
+ 			loop)	echo loop ;;
+ 			md)	echo md ;;
+ 			ibcs2)	echo ibcs2 ;;
+@@ -191,13 +197,31 @@
+ 			ac4096)		echo ac4096 ;;
+ 			hw)	echo helloworld ;;
+ 			sbpcd | sbpcd[123])	echo $1 ;;
+-			Joystick)	echo js ;;
++			joystick)	echo js ;;
+ 			apm_bios)	echo apm ;;
+ 			dcf)		echo dcf ;;
+ 			aztcd)		echo aztcd ;;
++			cm206cd)	echo cm206cd ;;
++			gscd)		echo gscd ;;
+ 			pcmcia)	;; # taken care of by its own driver
+ 			ttyC)	echo cyclades ;;
++			isdn)	echo isdnmodem isdnbri dcbri ;;
+ 			vcs)	;;
++			pty)	echo pty ;;
++			misc)	echo misc ;;
++			3dfx)	echo 3dfx ;;
++			agpgart)	echo agpgart ;;
++			ipmi|ipmikcs)	echo ipmi ;;
++			fb)	echo fb ;;
++			nb)	echo nb0 nb1 ;;
++			netlink)	echo netlink ;;
++			hamradio)	echo hamradio ;;
++			snd)	;;
++			ptm)	;;
++			pts)	;;
++			ttyS)	echo ttyS0 ttyS1 ttyS2 ttyS3 ;;
++			ttyI)	echo ttyI0 ttyI1 ttyI2 ttyI3 ;;
++			ircomm|irlpt)	irda ;;
+ 			*)	echo "$0: don't know what \"$1\" is" >&2 ;;
+ 		esac
+ 		shift
+@@ -206,20 +230,148 @@
+ 
+ for arg
+ do
++#	case `cvt $arg` in
+ 	case $arg in
+ 	generic)
++		# pick the right generic-<arch> using dpkg's knowledge
++		case `dpkg --print-installation-architecture` in
++			alpha)
++				$0 $opts generic-alpha
++				;;
++			arm)
++				$0 $opts generic-arm
++				;;
++			i386)
++				$0 $opts generic-i386
++				;;
++			m68k)
++				$0 $opts generic-m68k
++				;;
++			powerpc)
++				$0 $opts generic-powerpc
++				;;
++			sparc)
++				$0 $opts generic-sparc
++				;;
++			*)
++				echo "$0: no support for generic-$arg" >&2
++				exit 1
++				;;
++		esac
++		;;
++	generic-alpha)
+ 		$0 $opts std
+ 		$0 $opts fd
+ 		$0 $opts fd0 fd1
+-		$0 $opts hda hdb
++		$0 $opts hda hdb hdc hdd
++		$0 $opts xda xdb
++		$0 $opts sda sdb sdc sdd
++		$0 $opts scd0 scd1
++		$0 $opts st0 st1
++		$0 $opts sg
++		$0 $opts pty
++		$0 $opts console
++		$0 $opts ttyS0 ttyS1 ttyS2 ttyS3
++		$0 $opts busmice
++		$0 $opts lp
++		$0 $opts par
++		$0 $opts audio
++		$0 $opts fb
++		;;
++	generic-arm)
++		$0 $opts std
++		$0 $opts fd
++		$0 $opts fd0 fd1
++		$0 $opts hda hdb hdc hdd
++		$0 $opts xda xdb
++		$0 $opts sda sdb sdc sdd
++		$0 $opts scd0 scd1
++		$0 $opts st0 st1
++		$0 $opts sg
++		$0 $opts pty
++		$0 $opts console
++		$0 $opts ttyS0 ttyS1 ttyS2 ttyS3
++		$0 $opts busmice
++		$0 $opts lp
++		$0 $opts par
++		$0 $opts audio
++		$0 $opts fb
++		;;
++	generic-i386)
++		$0 $opts std
++		$0 $opts fd
++		$0 $opts fd0 fd1
++		$0 $opts hda hdb hdc hdd
+ 		$0 $opts xda xdb
+-		$0 $opts sda sdb
++		$0 $opts sda sdb sdc sdd
++		$0 $opts scd0 scd1
++		$0 $opts st0 st1
++		$0 $opts sg
+ 		$0 $opts pty
+ 		$0 $opts console
+ 		$0 $opts ttyS0 ttyS1 ttyS2 ttyS3
+ 		$0 $opts busmice
+ 		$0 $opts lp
+ 		$0 $opts par
++		$0 $opts audio
++		$0 $opts fb
++		;;
++	generic-m68k)
++		$0 $opts std
++		$0 $opts fd
++		$0 $opts fd0-bare fd1-bare
++		$0 $opts hda hdb
++		$0 $opts sda sdb sdc sdd
++		$0 $opts sg
++		$0 $opts ada adb
++		$0 $opts pty
++		$0 $opts console
++		$0 $opts ttyS0 ttyS1 ttyS2 ttyS3 ttyS5
++		$0 $opts m68k-mice
++		$0 $opts lp
++		$0 $opts par
++		$0 $opts nvram
++		$0 $opts audio
++		$0 $opts fb
++		;;
++	generic-powerpc)
++		$0 $opts std
++		$0 $opts fd
++		$0 $opts fd0-bare fd1-bare
++		$0 $opts hda hdb hdc hdd
++		$0 $opts sda sdb sdc sdd
++		$0 $opts scd0 scd1
++		$0 $opts st0 st1
++		$0 $opts sg
++		$0 $opts pty
++		$0 $opts console
++		$0 $opts ttyS0 ttyS1 ttyS2 ttyS3
++		$0 $opts busmice
++		$0 $opts lp
++		$0 $opts par
++		$0 $opts nvram
++		$0 $opts audio
++		$0 $opts adb
++		$0 $opts fb
++		$0 $opts rtc
++		;;
++	generic-sparc)
++		$0 $opts std
++		$0 $opts fd0-bare fd1-bare
++		$0 $opts hda hdb
++		$0 $opts sda sdb sdc sdd
++		$0 $opts scd0 scd1
++		$0 $opts st0 st1
++		$0 $opts sg
++		$0 $opts pty
++		$0 $opts console
++		$0 $opts ttyS0 ttyS1 ttyS2 ttyS3
++		$0 $opts fb
++		$0 $opts rtc
++		makedev kbd  c 11 0 $cons
++		makedev sunmouse  c 10 6 $mouse
++		symlink sunmouse mouse
++		makedev openprom  c 10 139 $private
+ 		;;
+ 	local)
+ 		$0.local $opts
+@@ -232,22 +384,71 @@
+ 		makedev zero c 1 5 $public
+ 		symlink core $procfs/kcore
+ 		makedev full c 1 7 $public
+-		$0 ram
++		makedev random c 1 8 $readable
++		makedev urandom c 1 9 $readable
+ 		makedev tty  c 5 0 $tty
++		$0 $opts ram
++		$0 $opts loop
++		;;
++	hamradio)
++		$0 $opts scc
++		$0 $opts bc
++		;;
++	scc)
++		for unit in 0 1 2 3 4 5 6 7 
++		do
++			makedev scc$unit c 34 $unit $system
++		done
++		;;
++	bc)	
++		for unit in 0 1 2 3
++		do
++			makedev bc$unit c 51 $unit $system
++		done
++		;;
++	random)
++		makedev random c 1 8 $readable
++		;;
++	urandom)
++		makedev urandom c 1 9 $readable
+ 		;;
+ 	ram)
+-		for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 ; do
++		for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 ; do
+ 			makedev ram$i  b 1 $i $disk
+ 		done
+-		ln -sf ram1 ram
++		symlink ram ram1
+ 		;;
+-	console)
+-		major=`Major vcs`	# not fatal
+-		# console
++	ram[0-9]|ram1[0-6])
++		unit=`suffix $arg ram`
++		makedev ram$unit b 1 $unit $disk
++		;;
++	initrd)
++		makedev initrd b 1 250 $disk
++		;;
++	consoleonly)
+ 		makedev tty0 c 4 0 $cons
+-		symlink console tty0
++		#	new kernels need a device, old ones a symlink... sigh
++		kern_rev1=`uname -r | awk -F'.' '{print $1}'`
++		kern_rev2=`uname -r | awk -F'.' '{print $2}'`
++		if [ $kern_rev1 -gt 2 ]
++		then
++			makedev console c 5 1 $cons
++		else
++			if [ $kern_rev1 -eq 2 -a $kern_rev2 -ge 1 ]
++			then
++				makedev console c 5 1 $cons
++			else
++				symlink console tty0
++			fi
++		fi
++		;;
++	console)
++		$0 $opts consoleonly
++		major=`Major vcs 7`       # not fatal
+ 		[ "$major" ] && makedev vcs0 c $major 0 $vcs
+-		[ "$major" ] && makedev vcsa c $major 128 $vcs
++		symlink vcs vcs0
++		[ "$major" ] && makedev vcsa0 c $major 128 $vcs
++		symlink vcsa vcsa0
+ 		# individual vts
+ 		line=1
+ 		while [ $line -le $MAXVT -a $line -le 63 ]
+@@ -258,6 +459,32 @@
+ 			line=`math $line + 1`
+ 		done
+ 		;;
++	adb)
++		# pick the right arch device using dpkg's knowledge
++		case `dpkg --print-installation-architecture` in
++			powerpc)
++				# ADB bus devices (char)
++				makedev adb c 56 0 $mouse
++				makedev adbmouse c 10 10 $mouse
++				;;
++			m68k)
++				# ACSI disk 2, whole device (block)
++				makedev adb b 28 16 $disk
++				for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
++				do
++					minor=$(( 16 + $part ))
++					makedev adb$part b 28 $minor $disk
++				done
++				;;
++			*)
++				echo "no support for adb on $arg" >&2
++				exit 1
++				;;
++		esac
++		;;
++	nvram)
++		makedev nvram c 10 144 $kmem
++		;;
+ 	tty[1-9]|tty[1-5][0-9]|tty[6][0-3])
+ 		line=`suffix $arg tty`
+ 		makedev tty$line c 4 $line $tty
+@@ -265,8 +492,7 @@
+ 	ttyS[0-9]|ttyS[1-5][0-9]|ttyS[6][0-3])
+ 		line=`suffix $arg ttyS`
+ 		minor=`math 64 + $line`
+-		makedev ttyS$line c 4 $minor $tty
+-		makedev cua$line c 5 $minor $dialout
++		makedev ttyS$line c 4 $minor $dialout
+ 		;;
+ 	pty[a-ep-z])
+ 		bank=`suffix $arg pty`
+@@ -285,42 +511,350 @@
+ 		do
+ 			ptysufs="$ptysufs pty$i"
+ 		done
+-		$0 $opts $ptysufs
++		$0 $opts $ptysufs ptmx
+ 		;;
+-	cyclades)
+-		major1=`Major ttyC` || continue
+-		major2=`Major cub` || continue
++	ptmx)
++		# master pty multiplexer for 2.1 kernels
++		makedev ptmx c 5 2 $tty
++		;;
++	cyclades|ttyC)
++		major1=`Major ttyC 19` || continue
++		#major2=`Major cub 20` || continue
+ 		for i in 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 26 27 28 29 30 31 32
++                         16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 
++		do
++			makedev ttyC$i c $major1 $i $dialout
++			#makedev cub$i c $major2 $i $dialout
++		done
++		;;
++	stallion|ttyE)
++		major1=`Major ttyE 24` || continue
++		#major2=`Major cue 25` || continue
++		majorc=28
++		minor=0
++		until [ $minor -gt 256 ]
++		do
++			makedev ttyE$minor c $major1 $minor $dialout
++			#makedev cue$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		for i in 0 1 2 3
++		do
++			makedev staliomem$i c $majorc $i $private
++		done
++		;;
++	chase|ttyH)
++		major1=`Major ttyH 17` || continue
++		#major2=`Major cuh 18` || continue
++		minor=0
++		until [ $minor -gt 16 ] # tell me if 16 is wrong
++		do
++			makedev ttyH$minor c $major1 $minor $dialout
++			#makedev cuh$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	rocketport|ttyR)
++		major1=`Major ttyR 46` || continue
++		#major2=`Major cur 47` || continue
++		minor=0
++		until [ $minor -gt 64 ] # tell me if 64 is wrong
++		do
++			makedev ttyR$minor c $major1 $minor $dialout
++			#makedev cur$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	ttyV)
++		major1=`Major ttyV 105` || continue
++		#major2=`Major cuv 106` || continue
++		minor=0
++		until [ $minor -gt 16 ] # tell me if 16 is wrong
++		do
++			makedev ttyV$minor c $major1 $minor $dialout
++			#makedev cuv$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	digi|ttyD)
++		major1=`Major ttyD 22` || continue
++		#major2=`Major cud 23` || continue
++		minor=0
++		until [ $minor -gt 16 ] # tell me if 16 is wrong
++		do
++			makedev ttyD$minor c $major1 $minor $dialout
++			#makedev cud$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	specialix|ttyX)
++		major1=`Major ttyX 32` || continue
++		#major2=`Major cux 33` || continue
++		minor=0
++		until [ $minor -gt 16 ] # tell me if 16 is wrong
++		do
++			makedev ttyX$minor c $major1 $minor $dialout
++			#makedev cux$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	specialixIO8|ttyW)
++		major1=`Major ttyW 75` || continue
++		#major2=`Major cuw 76` || continue
++		minor=0
++		until [ $minor -gt 16 ] # tell me if 16 is wrong
++		do
++			makedev ttyW$minor c $major1 $minor $dialout
++			#makedev cuw$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	PAM|ttyM)
++		major1=`Major ttyM 79` || continue
++		#major2=`Major cum 80` || continue
++		minor=0
++		until [ $minor -gt 16 ] # tell me if 16 is wrong
++		do
++			makedev ttyM$minor c $major1 $minor $dialout
++			#makedev cum$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	riscom|ttyL)
++		major=`Major ttyL 48` || continue
++		minor=0
++		until [ $minor -gt 16 ] # tell me if 16 is wrong
++		do
++			makedev ttyL$minor c $major $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	computone|ttyF)
++		major=`Major ttyF 71` || continue
++		#major2=`Major cuf 72` || continue
++		minor=0
++		until [ $minor -gt 255 ]
++		do
++			makedev ttyF$minor c $major $minor $dialout
++			#makedev cuf$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		major=73
++		for i in 0 4 8 12
++		do
++			makedev ip2ipl$i  c $major $i $private
++			makedev ip2stat$i c $major `math $i + 1` $private
++		done
++		;;
++	ESP|ttyP)
++		major=`Major ttyP 57` || continue
++		#major2=`Major cup 58` || continue
++		minor=0
++		until [ $minor -gt 4 ] # tell me if 4 is wrong
++		do
++			makedev ttyP$minor c $major $minor $dialout
++			#makedev cup$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	COMX|comx)
++		major=`Major comx 88` || continue
++		minor=0
++		until [ $minor -gt 4 ] # tell me if 4 is wrong
++		do
++			makedev comx$minor c $major $minor $private
++			minor=`math $minor + 1`
++		done
++		;;
++	isdnmodem|ttyI)
++		major1=`Major ttyI 43` || continue
++		#major2=`Major cui 44` || continue
++		minor=0
++		until [ $minor -gt 63 ]
++		do
++			makedev ttyI$minor c $major1 $minor $dialout
++			#makedev cui$minor c $major2 $minor $dialout
++			minor=`math $minor + 1`
++		done
++		;;
++	isdnbri)
++		major=45
++		minor=0
++		until [ $minor -gt 63 ]
++		do
++			makedev isdn$minor c $major $minor $private
++			makedev isdnctrl$minor c $major `math $minor + 64` $private
++			makedev ippp$minor c $major `math $minor + 128` $private
++			minor=`math $minor + 1`
++		done
++		makedev isdninfo c $major 255 $private
++		;;
++	dcbri)
++		major=52
++		for i in 0 1 2 3
++		do
++			makedev dcbri$i c $major $i $private
++		done
++		;;
++	capi)
++		major=68
++		makedev capi20 c $major 0 $private
++		for i in 0 1 2 3 4 5 6 7 8 9
++		do
++			makedev capi20.0$i c $major `math $i + 1` $private
++		done
++		for i in 10 11 12 13 14 15 16 17 18 19
++		do
++			makedev capi20.$i c $major `math $i + 1` $private
++		done
++		;;
++	fb)
++		for i in 0 1 2 3 4 5 6 7
++		do
++			makedev fb$i c 29 `math 32 \* $i` $cons
++			makedev fb${i}current c 29 `math 32 \* $i` $cons
++			makedev fb${i}autodetect c 29 `math 32 \* $i + 1` $cons
++		done
++		;;
++	fb[0-7])
++		dev=`suffix $arg fb`
++		base=`math 32 \* $dev`
++		makedev fb$dev c 29 $base $cons
++		makedev fb${dev}current c 29 $base $cons
++		makedev fb${dev}autodetect c 29 `math $base + 1` $cons
++		for i in 0 1 2 3 4 5 6 7
+ 		do
+-			makedev ttyC$i c $major1 $i $tty
+-			makedev cub$i c $major2 $i $dialout
++			makedev fb${dev}user$i c 29 `math $base + 24 + $i` $cons
++		done
++		;;
++	netlink)
++		makedev route     c 36 0 $coda
++		makedev skip      c 36 1 $coda
++		makedev fwmonitor c 36 3 $coda
++		for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
++		do
++			makedev tap$i c 36 `math $i + 16` $coda
+ 		done
+ 		;;
+ 	lp)
+-		major=`Major lp` || continue
++		major=`Major lp 6` || continue
+ 		makedev ${arg}0 c $major 0 $printer
+ 		makedev ${arg}1 c $major 1 $printer
+ 		makedev ${arg}2 c $major 2 $printer
+ 		;;
+ 	par)
+-		major=`Major lp` || continue
++		major=`Major lp 6` || continue
++		makedev ${arg}0 c $major 0 $printer
++		makedev ${arg}1 c $major 1 $printer
++		makedev ${arg}2 c $major 2 $printer
++		;;
++	parport)
++		major=`Major parport 99` || continue
+ 		makedev ${arg}0 c $major 0 $printer
+ 		makedev ${arg}1 c $major 1 $printer
+ 		makedev ${arg}2 c $major 2 $printer
+ 		;;
++	slm)
++		major=`Major slm 28` || continue
++		for i in 0 1 2 3
++		do
++			makedev slm c $major $i $printer
++		done
++		;;
+ 	busmice)
+ 		major=`Major mouse 10` || continue
+-		makedev logimouse c $major 0 $mouse
+-		makedev psmouse   c $major 1 $mouse
+-		makedev msmouse   c $major 2 $mouse
+-		makedev atimouse  c $major 3 $mouse
+-		makedev jmouse    c $major 4 $mouse
++		makedev logibm	  c $major 0 $mouse
++		makedev psaux     c $major 1 $mouse
++		makedev inportbm  c $major 2 $mouse
++		makedev atibm     c $major 3 $mouse
++		makedev jbm       c $major 4 $mouse
++		makedev usbmouse  c $major 32 $mouse
++		;;
++	m68k-mice)
++		major=`Major mouse 10` || continue
++		makedev amigamouse c $major 4 $mouse
++		makedev atarimouse c $major 5 $mouse
++		makedev amigamouse1 c $major 7 $mouse
++		makedev adbmouse  c $major 10 $mouse
++		;;
++	3dfx)
++		major=`Major $arg 107` || continue
++		makedev $arg	c $major 0 $video
++		;;
++	agpgart)
++		major=`Major $arg 10` || continue
++		makedev $arg	c $major 175 $video
++		;;
++	ipmi|ipmikcs)
++		major=`Major ipmikcs 10` || continue
++		makedev ipmikcs	c $major 173 $private
++		;;
++	irda)
++		for i in 0 1
++		do
++			makedev ircomm$i c 161 $i $mouse
++			makedev irlpt$i  c 161 `math $i + 16` $mouse
++		done
++		;;
++	misc)
++		major=`Major mouse 10` || continue
++		makedev logibm	  c $major 0 $mouse
++		makedev psaux     c $major 1 $mouse
++		makedev inportbm  c $major 2 $mouse
++		makedev atibm     c $major 3 $mouse
++		makedev jbm       c $major 4 $mouse
++		makedev amigamouse c $major 4 $mouse
++		makedev atarimouse c $major 5 $mouse
++		makedev sunmouse  c $major 6 $mouse
++		makedev amigamouse1 c $major 7 $mouse
++		makedev smouse    c $major 8 $mouse
++		makedev pc110pad  c $major 9 $mouse
++		makedev adbmouse  c $major 10 $mouse
++		makedev beep      c $major 128 $mouse
++		makedev modreq    c $major 129 $mouse
++		makedev watchdog  c $major 130 $mouse
++		makedev temperature c $major 131 $mouse
++		makedev hwtrap    c $major 132 $mouse
++		makedev exttrp    c $major 133 $mouse
++		makedev apm_bios  c $major 134 $mouse
++		makedev rtc       c $major 135 $mouse
++		makedev openprom  c $major 139 $mouse
++		makedev relay8    c $major 140 $mouse
++		makedev relay16   c $major 141 $mouse
++		makedev msr       c $major 142 $mouse
++		makedev pciconf   c $major 143 $mouse
++		makedev nvram     c $major 144 $mouse
++		makedev hfmodem   c $major 145 $mouse
++		makedev led       c $major 151 $mouse
++		makedev mergemem  c $major 153 $mouse
++		makedev pmu       c $major 154 $mouse
++		;;
++	smapi|thinkpad)
++		major=`Major mouse 10` || continue
++		makedev smapi     c $major 170 $mouse
++		symlink smapi thinkpad
++		;;
++        rtc)
++		major=`Major mouse 10` || continue
++		makedev rtc       c $major 135 $mouse
+ 		;;
+ 	js)
+-		major=`Major Joystick` || continue
+-		makedev js0 c $major 0 $mouse
+-		makedev js1 c $major 1 $mouse
++		major=`Major Joystick 15` || continue
++		for unit in 0 1 2 3
++		do
++			makedev js$unit c $major $unit $readable
++			makedev djs$unit c $major `math $unit + 128` $readable
++		done
++		;;
++	fd[0-7]-bare)
++		sarg="${arg%-bare}" 
++		major=`Major fd 2` || continue
++		base=`suffix $sarg fd`
++		if [ $base -ge 4 ]
++		then
++			base=`math $base + 124`
++		fi
++		makedev ${sarg} b $major $base $floppy
+ 		;;
+ 	fd[0-7])
+ 		major=`Major fd 2` || continue
+@@ -332,39 +866,47 @@
+ 		makedev ${arg} b $major $base $floppy
+ 		makedev ${arg}d360  b $major `math $base +  4` $floppy
+ 		makedev ${arg}h1200 b $major `math $base +  8` $floppy
+-		makedev ${arg}D360  b $major `math $base + 12` $floppy
+-		makedev ${arg}D720  b $major `math $base + 16` $floppy
++		makedev ${arg}u360  b $major `math $base + 12` $floppy
++		makedev ${arg}u720  b $major `math $base + 16` $floppy
+ 		makedev ${arg}h360  b $major `math $base + 20` $floppy
+ 		makedev ${arg}h720  b $major `math $base + 24` $floppy
+-		makedev ${arg}H1440 b $major `math $base + 28` $floppy
+-		makedev ${arg}E2880 b $major `math $base + 32` $floppy
++		makedev ${arg}u1440 b $major `math $base + 28` $floppy
++		makedev ${arg}u2880 b $major `math $base + 32` $floppy
+ 		makedev ${arg}CompaQ b $major `math $base + 36` $floppy
+ 
+-		symlink ${arg}H360 ${arg}D360
+-		symlink ${arg}H720 ${arg}D720
+-
+ 		makedev ${arg}h1440 b $major `math $base + 40` $floppy
+-		makedev ${arg}H1680 b $major `math $base + 44` $floppy
++		makedev ${arg}u1680 b $major `math $base + 44` $floppy
+ 		makedev ${arg}h410  b $major `math $base + 48` $floppy
+-		makedev ${arg}H820  b $major `math $base + 52` $floppy
++		makedev ${arg}u820  b $major `math $base + 52` $floppy
+ 		makedev ${arg}h1476 b $major `math $base + 56` $floppy
+-		makedev ${arg}H1722 b $major `math $base + 60` $floppy
++		makedev ${arg}u1722 b $major `math $base + 60` $floppy
+ 		makedev ${arg}h420  b $major `math $base + 64` $floppy
+-		makedev ${arg}H830  b $major `math $base + 68` $floppy
++		makedev ${arg}u830  b $major `math $base + 68` $floppy
+ 		makedev ${arg}h1494 b $major `math $base + 72` $floppy
+-		makedev ${arg}H1743 b $major `math $base + 76` $floppy
++		makedev ${arg}u1743 b $major `math $base + 76` $floppy
+ 		makedev ${arg}h880  b $major `math $base + 80` $floppy
+-		makedev ${arg}D1040 b $major `math $base + 84` $floppy
+-		makedev ${arg}D1120 b $major `math $base + 88` $floppy
++		makedev ${arg}u1040 b $major `math $base + 84` $floppy
++		makedev ${arg}u1120 b $major `math $base + 88` $floppy
+ 		makedev ${arg}h1600 b $major `math $base + 92` $floppy
+-		makedev ${arg}H1760 b $major `math $base + 96` $floppy
+-		makedev ${arg}H1920 b $major `math $base + 100` $floppy
+-		makedev ${arg}E3200 b $major `math $base + 104` $floppy
+-		makedev ${arg}E3520 b $major `math $base + 108` $floppy
+-		makedev ${arg}E3840 b $major `math $base + 112` $floppy
+-		makedev ${arg}H1840 b $major `math $base + 116` $floppy
+-		makedev ${arg}D800  b $major `math $base + 120` $floppy
+-		makedev ${arg}H1600 b $major `math $base + 124` $floppy
++		makedev ${arg}u1760 b $major `math $base + 96` $floppy
++		makedev ${arg}u1920 b $major `math $base + 100` $floppy
++		makedev ${arg}u3200 b $major `math $base + 104` $floppy
++		makedev ${arg}u3520 b $major `math $base + 108` $floppy
++		makedev ${arg}u3840 b $major `math $base + 112` $floppy
++		makedev ${arg}u1840 b $major `math $base + 116` $floppy
++		makedev ${arg}u800  b $major `math $base + 120` $floppy
++		makedev ${arg}u1600 b $major `math $base + 124` $floppy
++		;;
++	ed[a-b])
++		major=`Major ed 36` || continue
++		unit=`suffix $arg ed`
++		base=`index ab $unit`
++		base=`math $base \* 64`
++		makedev ed$unit b $major $base $disk
++		for part in 1 2 3 4 5 6 7 8 # 9 10 11 12 13 14 15 16 17 18 19 20
++		do
++			makedev ed$unit$part b $major `math $base + $part` $disk
++		done
+ 		;;
+ 	hd[a-b])
+ 		major=`Major ide0` || major=`Major hd 3` || continue
+@@ -372,7 +914,7 @@
+ 		base=`index ab $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 # 9 10 11 12 13 14 15 16 17 18 19 20
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+ 		do
+ 			makedev hd$unit$part b $major `math $base + $part` $disk
+ 		done
+@@ -383,9 +925,9 @@
+ 		base=`index cd $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 # 9 10 11 12 13 14 15 16 17 18 19 20
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+ 		do
+-			makedev hd$unit$part b $major `expr $base + $part` $disk
++			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+ 		;;
+ 	hd[e-f])
+@@ -394,9 +936,9 @@
+ 		base=`index ef $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 # 9 10 11 12 13 14 15 16 17 18 19 20
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+ 		do
+-			makedev hd$unit$part b $major `expr $base + $part` $disk
++			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+ 		;;
+ 	hd[g-h])
+@@ -405,18 +947,47 @@
+ 		base=`index gh $unit`
+ 		base=`math $base \* 64`
+ 		makedev hd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 # 9 10 11 12 13 14 15 16 17 18 19 20
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++		do
++			makedev hd$unit$part b $major $(( $base + $part )) $disk
++		done
++		;;
++	hd[i-j])
++		major=`Major ide4 56` || continue
++		unit=`suffix $arg hd`
++		base=`index ij $unit`
++		base=`math $base \* 64`
++		makedev hd$unit b $major $base $disk
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+ 		do
+-			makedev hd$unit$part b $major `expr $base + $part` $disk
++			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+ 		;;
+-	ht)
++	hd[k-l])
++		major=`Major ide4 57` || continue
++		unit=`suffix $arg hd`
++		base=`index kl $unit`
++		base=`math $base \* 64`
++		makedev hd$unit b $major $base $disk
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++		do
++			makedev hd$unit$part b $major $(( $base + $part )) $disk
++		done
++		;;
++	ht0)
+ 		major=`Major ht0 37` || continue
+ 		# Only one IDE tape drive is currently supported; ht0.
+ 		makedev ht0 c $major 0 $tape
+-		makedev ht0 c $major 0 $tape
+ 		makedev nht0 c $major 128 $tape
+ 		;;
++	pt)
++		major=`Major pt 96` || continue
++		for i in 0 1 2 3
++		do
++			makedev pt$i c $major $i $tape
++			makedev npt$i c $major `math $i + 128` $tape
++		done
++		;;
+ 	xd[a-d])
+ 		major=`Major xd 13` || continue
+ 		unit=`suffix $arg xd`
+@@ -425,31 +996,139 @@
+ 		makedev xd$unit b $major $base $disk
+ 		for part in 1 2 3 4 5 6 7 8 # 9 10 11 12 13 14 15 16 17 18 19 20
+ 		do
+-			makedev xd$unit$part b $major `expr $base + $part` $disk
++			makedev xd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+ 		;;
+-	sd[a-h])
++	sd[a-z])
+ 		major=`Major sd 8` || continue
+ 		unit=`suffix $arg sd`
+-		base=`index abcdefgh $unit`
+-		base=`math $base \* 16`
++		base=`index abcdefghijklmnopqrstuvwxyz $unit`
++		base=$(( $base * 16 ))
++		if [ $base -lt 256 ]; then
++			major=8
++		else
++			major=65
++			base=$(( $base - 256 ))
++		fi
++		makedev sd$unit b $major $base $disk
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
++		do
++			minor=$(( $base + $part ))
++			makedev sd$unit$part b $major $minor $disk
++		done
++		;;
++	sd[a-d][a-z])
++		unit=`suffix $arg sd`
++		unitmaj=`first $unit`
++		unitmin=`second $unit`
++		basemaj=`index Xabcd $unitmaj`
++		basemin=`index abcdefghijklmnopqrstuvwxyz $unitmin`
++		basemaj=`math $basemaj \* 416`
++		basemin=`math $basemin \* 16`
++		base=`math $basemaj + $basemin`
++		basemaj=`math $base / 256`
++		base=`math $base % 256`
++		major=`math basemaj \+ 64`
++		if [ $major -gt 71 ]; then
++			echo "$0: don't know how to make device \"$arg\"" >&2
++			exit 0
++		fi
+ 		makedev sd$unit b $major $base $disk
+-		for part in 1 2 3 4 5 6 7 8 # 9 10 11 12 13 14 15
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+ 		do
+-			minor=`expr $base + $part`
++			minor=$(( $base + $part ))
+ 			makedev sd$unit$part b $major $minor $disk
+ 		done
++                ;;
++	ad[a-p])
++		major=`Major ad 28` || continue
++		unit=`suffix $arg ad`
++		base=`index abcdefghijklmnop $unit`
++		base=`math $base \* 16`
++		makedev ad$unit b $major $base $disk
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
++		do
++			minor=$(( $base + $part ))
++			makedev ad$unit$part b $major $minor $disk
++		done
++		;;
++	dac960)
++		for ctr in 0 1 2 3 4 5 6 7
++		do
++			$0 $opts dac960.$ctr
++		done
++		;;
++	dac960.[0-7])
++		[ -d rd ] || {
++			mkdir rd
++			chown root.root rd
++			chmod 755 rd
++		}
++		unit=`suffix $arg dac960.`
++		    major=`math 48 + $unit`
++		    minor=0
++		    for ld in 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 26 27 28 29 30 31
++		    do
++			makedev rd/c${unit}d${ld} b $major $minor $disk
++			minor=`math $minor + 1`
++			for part in 1 2 3 4 5 6 7
++			do
++			    makedev rd/c${unit}d${ld}p$part b $major $minor $disk
++			    minor=`math $minor + 1`
++			done
++		    done
++		;;
++	ida)
++		for ctr in 0 1 2 # 3 4 5 6 7
++		do
++			$0 $opts ida.$ctr
++		done
++		;;
++	ida.[0-7])
++		[ -d ida ] || {
++			mkdir ida
++			chown root.root ida
++			chmod 755 ida
++		}
++		unit=`suffix $arg ida.`
++		major=`math 72 + $unit`
++		minor=0
++		for ld in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
++		do
++		    makedev ida/c${unit}d${ld} b $major $minor $disk
++		    minor=`math $minor + 1`
++		    for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
++		    do
++			makedev ida/c${unit}d${ld}p$part b $major $minor $disk
++			minor=`math $minor + 1`
++		    done
++		done
++		;;
++	rom)
++		major=`Major rom 31`
++		for i in 0 1 2 3 4 5 6 7
++		do
++			makedev rom$i    b $major $i $disk
++			makedev rrom$i   b $major `math $i +8` $disk
++			makedev flash$i  b $major `math $i +16` $disk
++			makedev rflash$i b $major `math $i +24` $disk
++		done
++		;;
++	nb[0-7])
++		major=`Major nbd 43` || continue
++		minor=`suffix $arg nb`
++		makedev nb$minor b $major $minor $disk
+ 		;;
+ 	loop)
+-		major=`Major loop` || continue
+ 		for part in 0 1 2 3 4 5 6 7
+ 		do
+-			makedev loop$part b $major $part $disk
++			makedev loop$part b 7 $part $disk
+ 		done
+ 		;;
+ 	md)
+-		major=`Major md` || continue
+-		for part in 0 1 2 3
++		major=`Major md 9` || continue
++		for part in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+ 		do
+ 			makedev md$part b $major $part $disk
+ 		done
+@@ -457,42 +1136,129 @@
+ 	st[0-7])
+ 		major=`Major st 9`
+ 		unit=`suffix $arg st`
+-		makedev st$unit c $major $unit $tape
+-		makedev nst$unit c $major `math 128 + $unit` $tape
++		makedev st${unit}   c $major $unit $tape
++		makedev nst${unit}  c $major `math 128 + $unit` $tape
++
++		makedev st${unit}l  c $major `math 32 + $unit` $tape
++		makedev nst${unit}l c $major `math 160 + $unit` $tape
++
++		makedev st${unit}m  c $major `math 64 + $unit` $tape
++		makedev nst${unit}m c $major `math 192 + $unit` $tape
++
++		makedev st${unit}a  c $major `math 96 + $unit` $tape
++		makedev nst${unit}a c $major `math 224 + $unit` $tape
+ 		;;
+ 	qic)
+ 		major=`Major tpqic02 12`
++		makedev ntpqic11   c $major   2 $tape
++		makedev tpqic11    c $major   3 $tape
++		makedev ntpqic24   c $major   4 $tape
++		makedev tpqic24    c $major   5 $tape
++		makedev ntpqic120  c $major   6 $tape
++		makedev tpqic120   c $major   7 $tape
++		makedev ntpqic150  c $major   8 $tape
++		makedev tpqic150   c $major   9 $tape
+ 		makedev rmt8       c $major   6 $tape
+ 		makedev rmt16      c $major   8 $tape
+ 		makedev tape-d     c $major 136 $tape
+ 		makedev tape-reset c $major 255 $tape
++		$0 $opts qft
+ 		;;
+ 	ftape)
+-		major=`Major mt 27` || continue
++		major=`Major qft 27` || continue
+ 		for unit in 0 1 2 3
+ 		do
+-			makedev rft$unit c $major $unit $tape
+-			makedev nrft$unit c $major `math $unit + 4` $tape
++			makedev qft$unit     c $major $unit $tape
++			makedev nqft$unit    c $major `math $unit + 4` $tape
++			makedev zqft$unit    c $major `math $unit + 16` $tape
++			makedev nzqft$unit   c $major `math $unit + 20` $tape
++			makedev rawqft$unit  c $major `math $unit + 32` $tape
++			makedev nrawqft$unit c $major `math $unit + 36` $tape
++		done
++		symlink ftape qft0
++		symlink nftape nqft0
++		;;
++	sr|scd|scd-all)
++		major=`Major sr 11` || continue
++		for unit in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
++		do
++			makedev scd$unit b $major $unit $cdrom
++			symlink sr$unit scd$unit
+ 		done
+-		symlink ftape rft0
+-		symlink nftape nrft0
+ 		;;
+-	scd[0-7])
++	cfs0)
++		makedev cfs0 c 67 0 $coda
++		;;
++	scd[0-9]|scd[0-1][0-9])
+ 		major=`Major sr 11` || continue
+ 		unit=`suffix $arg scd`
+ 		makedev scd$unit b $major $unit $cdrom
++		ln -f scd$unit sr$unit
++		;;
++	ttyI[0-9]|ttyI[1-5][0-9]|ttyI[6][0-3])
++		major=43
++		unit=`suffix $arg ttyI`
++		makedev ttyI$unit c $major $unit $dialout
++		;;
++	ippp[0-9]|ippp[1-5][0-9]|ippp[6][0-3])
++		major=45
++		unit=`suffix $arg ippp`
++		minor=`math $unit + 128`
++		makedev ippp$unit c $major $minor $dialout
++		;;
++	isdn[0-9]|isdn[1-5][0-9]|isdn[6][0-3])
++		major=45
++		unit=`suffix $arg isdn`
++		minor=`math $unit + 0`
++		makedev isdn$unit c $major $minor $dialout
++		;;
++	isdnctrl[0-9]|isdnctrl[1-5][0-9]|isdnctrl[6][0-3])
++		major=45
++		unit=`suffix $arg isdnctrl`
++		minor=`math $unit + 64`
++		makedev isdnctrl$unit c $major $minor $dialout
++		;;
++	isdninfo)
++		makedev isdninfo c 45 255 $dialout
++		;;
++	isdn-tty)
++		major=43
++		for unit in 0 1 2 3 4 5 6 7
++		do
++			makedev ttyI$unit c $major $unit $dialout
++		done
++		;;
++	isdn-ippp)
++		major=45
++		for unit in 0 1 2 3 4 5 6 7
++		do
++			makedev ippp$unit c $major `math $unit + 128` $dialout
++		done
++		;;
++	isdn-io)
++		for unit in 0 1 2 3 4 5 6 7
++		do
++			makedev isdn$unit c 45 $unit $dialout
++			makedev isdnctrl$unit c 45 `math $unit + 64` $dialout
++			makedev ippp$unit c 45 `math $unit + 128` $dialout
++		done
++		makedev isdninfo c 45 255 $dialout
+ 		;;
+ 	sonycd)
+-		major=`Major cdu31a` || continue
++		major=`Major sonycd 15` || continue
+ 		makedev $arg b $major 0 $cdrom
+ 		;;
+ 	mcd)
+ 		major=`Major mcd 23` || continue
+ 		makedev $arg b $major 0 $cdrom
+ 		;;
+-	mcdx)
+-		major=`Major mcdx 20` || continue
+-		makedev $arg b $major 0 $cdrom
++	mcdx|mcdx[0-4])
++		major=`Major $arg 20` || continue
++		for unit in 0 1 2 3 4
++		do
++			makedev mcdx$unit b $major $unit $cdrom
++		done
++		test -r mcdx || symlink mcdx mcdx0
+ 		;;
+ 	cdu535)
+ 		makedev $arg b 24 0 $cdrom
+@@ -501,28 +1267,51 @@
+ 		makedev $arg b 24 0 $cdrom
+ 		;;
+ 	sbpcd|sbpcd[123])
+-		major=`Major $arg` || continue
++		major=`Major $arg 25` || continue
+ 		base=`suffix ${arg}0 sbpcd`
+-		# base=`expr ${arg}0 : "sbpcd\(.\)"`
+ 		for minor in 0 1 2 3
+ 		do
+ 			# XXX
+-			unit=`expr substr 0123456789abcdef \( $base \* 4 + $minor + 1 \) 1`
++			unit=$(substr 0123456789abcdef $(( $base * 4 + $minor + 1 )) )
+ 			makedev sbpcd$unit b $major $minor $cdrom
+ 		done
+ 		[ $arg = sbpcd ] && symlink $arg ${arg}0
+ 		;;
+ 	aztcd)
+-		major=`Major $arg` || continue
++		major=`Major $arg 29` || continue
++		makedev ${arg}0 b $major 0 $cdrom
++		;;
++	cm206cd)
++		major=`Major $arg 30` || continue
++		makedev ${arg}0 b $major 0 $cdrom
++		;;
++	gscd)
++		major=`Major $arg 16` || continue
+ 		makedev ${arg}0 b $major 0 $cdrom
+ 		;;
+ 	bpcd)
+ 		makedev $arg b 41 0 $cdrom
+ 		;;
++	optcd)
++		makedev $arg b 17 0 $cdrom
++		;;
++	sjcd)
++		makedev $arg b 18 0 $cdrom
++		;;
++	cfs|coda)
++		makedev cfs0 c 67 0 $private
++		;;
++	xfs|arla)
++		makedev xfs0 c 103 0 $private
++		;;
+ 	logiscan)
+ 		major=`Major logiscan` || continue
+ 		makedev $arg c $major 0 $scanner
+ 		;;
++	toshiba)
++		major=`Major $arg 10` || continue
++		makedev $arg c $major 181 root root 0666
++		;;
+ 	m105scan)
+ 		major=`Major m105` || continue
+ 		makedev $arg c $major 0 $scanner
+@@ -534,34 +1323,119 @@
+ 	audio)
+ 		major=`Major sound 14`
+ 		makedev mixer      c $major  0 $audio
++		makedev mixer1     c $major 16 $audio
++		makedev mixer2     c $major 32 $audio
++		makedev mixer3     c $major 48 $audio
+ 		makedev sequencer  c $major  1 $audio
+ 		makedev midi00     c $major  2 $audio
+-		makedev dsp        c $major  3 $audio
+-		makedev audio      c $major  4 $audio
+-		makedev sndstat    c $major  6 $audio
+-#		makedev sequencer2 c $major  8 $audio
+-		makedev mixer1     c $major 16 $audio
+-#		makedev patmgr0    c $major 17 $audio
+ 		makedev midi01     c $major 18 $audio
+-		makedev dsp1       c $major 19 $audio
+-		makedev audio1     c $major 20 $audio
+-#		makedev patmgr1    c $major 33 $audio
+ 		makedev midi02     c $major 34 $audio
+ 		makedev midi03     c $major 50 $audio
++		makedev dsp        c $major  3 $audio
++		makedev dsp1       c $major 19 $audio
++		makedev dsp2       c $major 35 $audio
++		makedev dsp3       c $major 51 $audio
++		makedev audio      c $major  4 $audio
++		makedev audio1     c $major 20 $audio
++		makedev audio2     c $major 36 $audio
++		makedev audio3     c $major 52 $audio
++		makedev sndstat    c $major  6 $audio
++		makedev audioctl   c $major  7 $audio
++		major=31
++		makedev mpu401data c $major 0  $audio
++		makedev mpu401stat c $major 1  $audio
++		major=35
++		for i in 0 1 2 3
++		do
++			makedev midi$i  c $major $i $audio
++			makedev rmidi$i c $major `math $i + 64` $audio
++			makedev smpte$i c $major `math $i + 128` $audio
++		done
+ 		;;
+ 	pcaudio)
+-		major=`Major pcsp` || continue
++		major=`Major pcsp 13` || continue
+ 		makedev pcmixer c $major 0 $audio
+ 		makedev pcsp    c $major 3 $audio
+ 		makedev pcaudio c $major 4 $audio
+ 		;;
+-	sg)
++	video|video4linux|v4l|radio)
++		# video4linux api includes radio, teletext, etc.
++		major=`Major video 81` || continue
++		minor=0
++		until [ $minor -gt 63 ]
++		do
++			makedev video$minor c $major $minor $video
++			makedev radio$minor c $major `math $minor + 64` $video
++			minor=`math $minor + 1`
++		done
++		symlink radio radio0
++		minor=0
++		until [ $minor -gt 31 ]
++		do
++			makedev vtx$minor c $major `math $minor + 192` $video
++			makedev vbi$minor c $major `math $minor + 224` $video
++			minor=`math $minor + 1`
++		done
++		symlink video video0
++		symlink vbi vbi0
++		major=82
++		minor=0
++		until [ $minor -gt 1 ]
++		do
++			makedev winradio$minor c $major $minor $video
++			minor=`math $minor + 1`
++		done
++		major=83
++		makedev vtx     c $major 0 $video
++		makedev vttuner c $major 16 $video
++		;;
++	i2c)
++		major=`Major i2c 89` || continue
++		minor=0
++		until [ $minor -gt 1 ] # tell me if 1 is wrong...
++		do
++			makedev i2c-$minor c $major $minor $private
++			minor=`math $minor + 1`
++		done
++		;;
++	tlk)
++		major=102
++		minor=0
++		until [ $minor -gt 3 ] # tell me if 3 is wrong...
++		do
++			makedev tlk$minor c $major $minor $video
++			minor=`math $minor + 1`
++		done
++		;;
++	srnd)
++		makedev srnd0 c 110 0 $video
++		makedev srnd1 c 110 1 $video
++		;;
++	fgrab)
++		makedev mmetfgrab c 40 0 $video
++		makedev wvisfgrab c 26 0 $video
++		for i in 0 1 # more?
++		do
++			makedev iscc$i    c 93 $i $video
++			makedev isccctl$i c 93 `math $i + 128` $video
++		done
++		for i in 0 1 # more?
++		do
++			makedev dcxx$i c 94 $i $video
++		done
++		;;
++	sg|sg-all)
+ 		major=`Major sg 21`
+-		for unit in a b c d e f g h
++		for unit in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+ 		do
+-			minor=`index abcdefgh $unit`
+-			# minor=`expr abcdefgh : ".*$unit" - 1`
+-			makedev $arg$unit c $major $minor $scsi
++			makedev sg$unit c $major $unit $scsi
++		done
++		;;
++	pg)
++		major=`Major pg 97`
++		for unit in 0 1 2 3
++		do
++			makedev pg$unit c $major $unit $scsi
+ 		done
+ 		;;
+ 	fd)
+@@ -572,15 +1446,34 @@
+ 		symlink stderr fd/2
+ 		;;
+ 	ibcs2)
+-		major=`Major ibcs2` || continue
++		major=`Major ibcs2 30` || continue
+ 		makedev socksys c $major 0 $ibcs2
+ 		symlink nfsd socksys
+ 		makedev spx     c $major 1 $ibcs2
+ 		symlink X0R null
+ 		;;
++	netlink)
++		major=36
++		makedev route c $major 0 $private
++		makedev skip  c $major 1 $private
++		;;
++	enskip)
++		major=64
++		makedev enskip c $major 0 $private
++		;;
++	ipfilt*)
++		major=95
++		makedev ipl     c $major 0 $private
++		makedev ipnat   c $major 1 $private
++		makedev ipstate c $major 2 $private
++		makedev ipauth  c $major 3 $private
++		;;
++	qng)
++		makedev qng c 77 0 $private
++		;;
+ 	apm)
+-		major=`Major apm_bios` || continue
+-		makedev $arg c $major 0 $system
++		major=`Major mouse 10` || continue
++		makedev apm_bios  c $major 134 $mouse
+ 		;;
+ 	dcf)
+ 		major=`Major dcf` || continue
+@@ -590,6 +1483,11 @@
+ 		major=`Major hw` || continue
+ 		makedev helloworld c $major 0 $public
+ 		;;
++	ipsec)
++		# For the Free S/WAN (http://www.xs4all.nl/~freeswan/)
++		# implementation of IPSEC
++		makedev ipsec c 36 10 $ipsec
++		;;
+ 	update)
+ 		if [ ! "$devices" ]
+ 		then
+@@ -619,7 +1517,6 @@
+ 					create="$create "`cvt $device`
+ 				fi
+ 				devs=`strip " $devs " $device`
+-				# devs=`expr "$devs" : "\(.*\) $device"``expr "$devs" : ".* $device\(.*\)"`
+ 			done
+ 			exec 3<&-
+ 		fi
+@@ -637,6 +1534,7 @@
+ 		;;
+ 	*)
+ 		echo "$0: don't know how to make device \"$arg\"" >&2
++		exit 1
+ 		;;
+ 	esac
+ done
+--- makedev-2.3.1.orig/Makefile
++++ makedev-2.3.1/Makefile
+@@ -1,14 +1,15 @@
+ # $Id: Makefile,v 2.2 1995/05/21 17:45:18 alfie Exp $
+ 
++BINDIR  = $(ROOT)/sbin
+ DEVDIR  = $(ROOT)/dev
+-MANDIR  = $(ROOT)/usr/man
++MANDIR  = $(ROOT)/usr/share/man
+ MANEXT  = 8
+ 
+ default:
+ 	@echo Nothing to make.
+ 	
+ install:
+-	install -m 755 MAKEDEV $(DEVDIR)
++	install -m 755 MAKEDEV $(BINDIR)
+ 	install -m 644 MAKEDEV.man $(MANDIR)/man$(MANEXT)/MAKEDEV.$(MANEXT)
+ 
+ clean:
+--- makedev-2.3.1.orig/debian/old/README.debian
++++ makedev-2.3.1/debian/old/README.debian
+@@ -0,0 +1,95 @@
++makedev for DEBIAN
++==================
++
++The /etc/makedev.cfg and /etc/devinfo files are rewritten to fit the
++Debian /dev layout.
++
++Security : all mouse devices are changed to mode 600. Only serial
++devices are mode 660 root:dialout. It's possible to crash x11 and
++console with writing random bytes to a mouse device.
++
++Serial console :
++/dev/console should be a symlink to your real console device.
++If it does not exist, or is not a symlink, it will be replaced with a
++symlink console -> tty0.
++
++This version of makedev will check /dev for tty*/pty* devices, and if
++there are some with the old major number, it will create a
++/etc/rc.boot/makedev script. This will script will change the
++master/slave devices the next time you boot.
++
++serial devices should be owned by user "uucp" and group "dialout".
++former they were owned by root. new devices are created with uucp as
++owner, but you will have to change old devices to user uucp on your own.
++It's new policy to have all serial devices owned by uucp, but the last
++word in this discussion isn't said...
++
++some device names have changed. please read
++/usr/doc/makedev/devices.{txt|html}
++
++the permissions should be secure enough, but if you find any bugs, or
++unfounded hard permissions, please let me know (i don't know much about
++the right permissions for devices, i yust used the value, everybody else
++was using, and made read & write only available for root, whenever i
++found nothing better.
++
++/dev/console is now a symlink to /dev/tty0. for more infomation, please
++look at a new 2.1 linux kernel : Documentation/devices.txt. That is the
++"Linux Allocated Device" paper, the official list of linux devices.
++If your boot console is a serial device, you will have to change that
++symlink.
++
++MAKEDEV-C will not work with any kernel with mcdx support, if
++/proc/devices contains "Mitsumi CD-ROM". if so, patch
++/usr/src/linux/driver/cdrom/mcdx.c :
++1149c1149
++<     if (unregister_blkdev(MAJOR_NR, "mcdx") != 0) {
++---
++>     if (unregister_blkdev(MAJOR_NR, DEVICE_NAME) != 0) {
++1270c1270
++< 		if (register_blkdev(MAJOR_NR, "mcdx", &mcdx_fops) != 0) {
++---
++> 		if (register_blkdev(MAJOR_NR, DEVICE_NAME, &mcdx_fops) != 0) {
++
++
++about call out devices (/dev/cu*) :
++
++      /dev/ttySxx devices are fully POSIX-compliant TTY devices.  If you
++      are only going to be using one set of tty devices, you should be
++      using /dev/ttySxx.
++
++      /dev/cuaXX devices are different from /dev/ttySXX in two ways ---
++      first of all, they will allow you to open the device even if
++      CLOCAL is not set and the O_NONBLOCK flag was not given to the
++      open device.  This allows programs that don't use the
++      POSIX-mondated interface for opening /dev/ttySxx devices to be
++      able to use /dev/cuaXX to make outgoing phone calls on their modem
++      (cu stands for "callout", and is taken from SunOS).
++
++      The second way in which /dev/cuaXX differs from /dev/ttySXX is
++      that if they are used, they will trigger a simplistic kernel-based
++      locking scheme: If /dev/ttySXX is opened by one or more processes,
++      then an attempt to open /dev/cuaXX will return EAGAIN.  If
++      /dev/cuaXX is opened by one or more processes, then an attempt to
++      open /dev/ttySXX will result the open blocking until /dev/cuaXX is
++      closed, and the carrier detect line goes high. the open blocking
++      until /dev/cuaXX is closed, and the carrier detect line goes high.
++
++      While this will allow for simple lockouts between a user using a
++      modem for callout and a getty listening on the line for logins, it
++      doesn't work if you need to arbitrate between multiple programs
++      wanting to do dialout --- for example, users wanting to do dialout
++      and UUCP.
++
++      I originally implemented the cuaXX/ttySXX lockout mechanism back
++      before FSSTND established a standard convention for the use of tty
++      lock files.  Now that it's there, people should use the tty lock
++      files and not try using /dev/cuaXX.  The only reason why
++      /dev/cuaXX hasn't disappeared yet is for backwards compatibility
++      reasons.			  -- Theodore Ts'o <tytso@mit.edu>
++
++
++debian has no /dev/cu* devices. But you can create them, if you need
++them. Read devices.txt for details.
++
++Andreas Jellinghaus <aj@debian.org>, Sun, 13 Apr 1997 21:05:58 +0200
+--- makedev-2.3.1.orig/debian/old/devices.sgml
++++ makedev-2.3.1/debian/old/devices.sgml
+@@ -0,0 +1,294 @@
++<!doctype linuxdoc system>
++
++<article>
++
++<title>devices created by makedev
++<author> Andreas Jellinghaus <tt>aj@debian.org</tt>
++<date> version 0.3, based on Linux allocated device 2.1.62
++<abstract>
++	some devices are created by default, some are left out on boot
++	floppies, other devices are only created on demand and some
++	devices are obsolete or have new names. 
++</abstract>
++
++<sect> batches <p>
++
++call out devices are not generated by default. however if you need them,
++you can generate them (see below).
++
++<descrip>
++<tag/generic/all standard batches for normal Linux\/i386 systems.
++	(standard misc devices, ttyS[0-3], mouse, printer, tapes
++	(scsi, qic, qic117), audio, scsi generic, standard disk, cdroms
++	and ttys) 
++<tag/generic-m68k/all generic devices for m68k (additional
++	framebuffer, some mouse devices and m68k scsi disk devices are
++	included,
++	but busmouse devices and qic and qic117 are left out).
++<tag/boot-floppy/a subset of generic. (no audio, less ttys)
++<tag/std-hd/standard hard disks (hd[a-h,xd[ab],sd[a-h],ram disk,md,loop)
++<tag/std-cdrom/standard cdroms (scsi, old non-scsi non-atapi cdroms)
++<tag/compatiblity/collection of old devices. It is usefull to remove them, but
++make sure, that you have generated the new ones, and that you know, what
++you are doing !  serial-cu, printer-old, mouse-old, sr-old,
++qic-old, misc-old, sg-old
++<tag/update/special tag : reads \/proc\/devices and generates new devices
++	found there.
++</descrip>
++
++<sect> Limits (standard devices) <p>
++
++There are some limits in this version of devinfo : it will only create a
++special number of devices (e.g. ramdisks, hda partitions). If one of
++these limits is unrealistic, please tell me. Most limits have no good
++reason, I just didn't want to create hundreds of devices, so I only
++created a few. If a limit is too low for you : a) please tell me and b)
++modify /etc/devinfo (should be easy). <p>
++
++<descrip>
++<tag/ramdisks/8 devices ram[0-7]
++<tag/ide harddisks/20 partitions each (devices hd[a-h])
++<tag/xt harddisks/20 partitions each (devices xd[ab]
++<tag/loopback/8 devices loop[0-7] 
++<tag/metadisk/4 devices md[0-3]
++<tag/scsi cdrom/scd: 8 devices scd[0-7] 
++<tag/scsi cdrom/scd-all : 16 devices scd[0-15] 
++<tag/scsi generic/sg : 8 devices sg[0-7]
++<tag/scsi generic/sg-all : 16 devices sg[0-15]
++<tag/scsi tapes/8 devices st[0-7] 
++<tag/mscdex/4 cdrom devices dos_cd[0-3] 
++<tag/joysticks/2 devices each js[0-1] djs[0-1]
++<tag/other cdroms/only one device created : sonycd, gscd, optcd, sjcd,
++hitcd, mcd, cdu535, aztcd, cm206cd, bpcd (if there are several cdroms
++possible : please tell me !)          
++<tag/serial/default bootdisks and base system will only have ttyS[0-3],
++but you can create all possible devices ttyS[0-63] with "MAKEDEV serial"
++or several additional devices with "MAKEDEV ttyS4 ttyS5 ...".
++</descrip>
++
++<sect> additional devices <p>
++
++you can create these devices with "MAKEDEV name" and delete them with
++"MAKEDEV -d name". you can either use the name listed here (this will
++create all possible devices), or individual devices (use the device
++name) e.g. "serial" will create all 64 serial devices ttyS[0-63] but
++"ttyS0" will only create this one. 
++
++<sect1> serial devices <p>
++
++<descrip>
++<tag/isdn-tty/isdn terminal devices. 8 devices : ttyI[0-7]
++<tag/isdn-tty-all/isdn terminal devices. 64 devices : ttyI[0-63]
++
++<tag/isdn-ppp/isdn sync ppp network devices. 8 devices : ippp[0-7]
++<tag/isdn-ppp-all/isdn sync ppp network devices. 64 devices : ippp[0-63]
++
++<tag/isdn-io/isdn raw and control devices. 18 devices : 
++	isdn[0-7] isdnctrl[0-7] isdnctrl isdninfo
++<tag/isdn-io-all/isdn raw and control devices. 130 devices : 
++	isdn[0-63] isdnctrl[0-63] isdnctrl isdninfo
++
++<tag/serial-cu/serial callout devices. they are only for compatibility,
++most people don't need them. 64 devices : cua[0-63]
++
++<tag/isdn-cu/isdn call out devices. they are only for compatibility,
++most people don't need them. 64 devices : cui[0-7]
++<tag/isdn-cu-all/isdn call out devices. they are only for compatibility,
++most people don't need them. 64 devices : cui[0-63]
++
++<tag/chase{-cu}/devices for chase serial card (append -cu to create
++call out devices). 32 devices ttyH[0-31] (cuh[0-31])
++
++<tag/cyclades{-cu}/devices for cyclades serial card (append -cu to create
++call out devices). 32 devices ttyC[0-31] (cub[0-31])
++
++<tag/digiboard{-cu}/devices for digiboard serial card (append -cu to create
++call out devices). 32 devices ttyD[0-31] (cud[0-31])
++
++<tag/stallion{-cu}/devices for stallion serial card (append -cu to create
++callout devices). 32 devices ttyE[0-31] (cue[0-31])
++
++<tag/stallion-mem/devices to access stallion serial card. 4 devices
++stallionmem[0-3]
++
++<tag/specialix{-cu}/devices for specialix serial card (append -cu to create
++call out devices). 32 devices ttyX[0-31] (cux[0-31])
++
++<tag/rockport{-cu}/devices for rockport serial card (append -cu to create
++call out devices). 32 devices ttyR[0-31] (cur[0-31])
++
++<tag/riscom{-cu}/devices for riscom serial card (append -cu to create
++call out devices). 32 devices ttyL[0-31] (cul[0-31])
++
++<tag/hayes{-cu}/devices for hayes serial card (append -cu to create
++call out devices). 32 devices ttyP[0-31] (cup[0-31])
++
++<tag/baycom/devices for baycom radio modem. 32 devices bc[0-31]
++
++<tag/computone{-cu}/devices for computone intelliport II serial card
++(append -cu to create call out devices). 32 devices ttyF[0-31]
++(cuf[0-31])
++
++<tag/computone-ctrl/devices to access computone intelliport II serial
++card. 8 devices ip2ipl[0-3] and ip2stat[0-3]
++
++<tag/dcbri/spellcaster datacomm\/bri isdn card. 4 devices dcbri[0-3]
++<tag/specialix{-cu}/devices for specialix IO8+ serial card. 32 devices
++ttyW[0-31] (cuw[0-32])
++<tag/pam{-cu}/devices for PAM Software's mulitmodem boards. 32 devices
++ttyM[0-31] (cum[0-31])
++</descrip>
++
++<sect1> misc devices <p>
++
++<descrip>
++<tag/pty[p-za-e]/master pty devices. 16 devices pty?[0-9a-f] each
++<tag/tty[p-za-e]/slave tty devices. 16 devices pty?[0-9a-f] each
++<tag/floppy-all/generic only includes the fd0 and fd1 devices. this way
++you can generate devices for the 3rd ... 8th floppies. i recommend to
++install fdutils and use MAKEFLOPPIES to create the floppy devices you
++need. 30 devices each fd[0-7]*
++
++<tag/framebuffer/universal frame buffer (68k,sparc).
++	22 devices fb0* fb1*
++<tag/other-arch/amigamouse, atarimouse, sunmouse, openprom, kbd
++<tag/double/"double" compressed disk. 16 devices [c]double[0-7]
++<tag/ez[a-d]/syquest ex135 parallel port removable drive. 
++	20 partitions each
++<tag/ed[ab]/mca esdi hard disk. 20 partitions ed?* each
++
++<tag/sbpcd[234]/2nd,3rd,4th sound blaster cdrom controller. 4 devices sbpcdXX each
++<tag/mscdex/MSCDEX CD-ROM callback support. 4 devices dos_cd[0-3]
++<tag/cm205cd/cm205 cdrom devices (not supported in 2.x).
++	2 device cm205cd lmscd
++<tag/ad[a-p]/acsi disc\/cdrom (68k\/atari). 16 devices ad?* each
++<tag/gs4500/genius 4500 handheld scanner. 1 device gs4500
++<tag/slm/atari sm asci laser printer (68k\/atari). 4 devices slm[0-3]
++<tag/ht/ide tape. 2 devices ht0 nht0
++<tag/z2ram/zorro II ramdisk. 1 device z2ram
++<tag/cfs/coda network file-system.
++	1 device cfs0
++<tag/dtlk/DoubleTalk PC speech synthesizer, from RC Systems. 1 device dtlk
++
++<tag/ibcs2/ibcs2 devices as described in "Linux Allocated Devices".
++you need to create the directory /dev/inet before running makedev.
++ibcs2-unoff has lots more devices (i don't know if all are needed, or
++not. in doubt use ibcs2-unoff). 9 devices (socksys spx nfsd X0R inet/*).
++
++<tag/ibcs2-unoff/ibcs2 devices as described in the ibcs2 package. you
++need to create the directories "X" and "inet" before creating these
++devices. 74 devices (arp egp ggp icmp ip ipip pup rawip rip tcp udp nfsd
++X0R socksys spx pty[10-47] inet/* X/*)
++
++<tag/nvram/some special m68k hardware ? 1 device nvram
++
++<tag/system-sgi/devices for linux/sgi. 5 devices graphics opengl gfx
++input/mouse input/keyboard
++
++<tag/nb/network block devices. 8 devices nb*
++<tag/ftl/flash translatio layer (FTL) filesystems. max. 16 drives a-p
++with each 15 partitions (like scsi disks sd*).
++<tag/qng/Quantum Noice Generator. 1 device qng
++<tag/at200/Photometrics AT200 CCD camera. 1 device at200
++<tag/bttv/Brooktree Bt848 frame grabbers. 12 devices bttv[0-3]
++bttvc[0-3] bttv-vbi[0-3]
++<tag/winradio/WiNRADiO communications receiver card. 4 devices
++winradio[0-3]
++<tag/videotext/Teletext/videotext interfaces 2 devices vtx vttuner
++<tag/ihcp/ikon 1011[57] Versatec Greensheet Interface. 2devices ihcp[0-1]
++<tag/shimq/Linux/SGI shared memory input queue. 5 devices shmiq
++qcntl[0-3]
++<tag/sch/SCSI media changer. 8 devices sch[0-7]
++<tag/controla/Sony control-a1 stereo control bus. 
++</descrip>
++
++<sect1> sound <p>
++<descrip>
++<tag/mpu401/mpu401 MIDI data & status ports. 
++	2 devices mpu401{data,stat}
++<tag/tclmidi/tclmidi midi driver. 
++	12 devices midi[0-3] rmidi[0-3] smpte[0-3]
++</descrip>
++
++<sect1> misc <p>
++<descrip>
++<tag/wvisfgrab/quanta winvision frame grabber. 
++	1 device wvisfrab
++<tag/mmetfgrab/matrox meteor frame grabber.
++	1 device mmetfgrab
++<tag/ml16p[abc]/ml-16p experimental i\/o board.
++	20 device ml16p?* each
++<tag/scc/Z8530 HDLC driver. 8 devices scc[0-7]
++<tag/rom/rom\/flash memory card. 
++	32 devices rom[0-7] rrom[0-7] flash[0-7] rflash[0-7]
++<tag/netlink/netlink support. 2 devices route skip
++<tag/mlanai/myricom pci myrinet board. 8 devices mlanai[0-7]
++<tag/yamm/yet another micro monitor. 1 device yamm
++<tag/bdm/bdm interface for remote debugging MC683xx mc. 
++	6 devices pd_bdm[0-2] icd_bdm[0-2]
++<tag/holter/electrocardiognosis holter serial port.
++	3 devices holter[0-2]
++<tag/dsp56k/dsp56001 digital signal processor.
++	1 device dsp56k
++<tag/adbus/apple desktop bus. this was disabled, because it clashes with
++ab[b], the second acsi device (m68k/atari acsi disk).
++	1 device adb
++<tag/firewall/sf firewall package.
++	1 device firewall
++<tag/plink/sundance plink transputer boards.
++	12 devices [r]plink[0-3][d]
++<tag/enskip/enskip kernel encryption package
++<tag/yppcpci/yarc powerpc pci coprocessor card
++<tag/capi20/CAPI 2.0 interface.
++	21 devices capi20 capi20.[01-19]
++<tag/ma16/ma16 numeric accelerator card
++<tag/aps/spellcaster protocol service interface.
++	7 devices aps*
++<tag/sci/dolphin interconnect solutions' pci-sci bridge.
++	4 devices SCI\/[0-3]
++</descrip>
++
++<sect> compatibility <p>
++
++not all devices have a standard device name shared by all linux
++distributions, and many names have changed in the past. here is a list,
++so you can find new names, create the old devices (if you want), or
++remove them (to get rid of duplicates).
++
++<descrip>
++<tag/call out devices/cu* devices are not created by default. but you
++can create or remove them : serial-cu chase-cu cyclades-cu digiboard-cu
++stallion-cu specialix-cu isdn-cu     rockport-cu riscom-cu  hayes-cu
++computone-cu  
++<tag/printer-old/parallel port devices, standard name is lp[0-3], not par[0-3]
++<tag/mouse-old/(bus-)mouse devices : logimouse(logibm) psmouse(psaux)
++msmouse(inportbm) atimouse(atibm) jmouse(jbm)
++<tag/sr-old/scsi cdrom devices (now called scd)
++<tag/qic-old/qic streamer devices : nqt qt nqt11 qt11 nqt24 qt24 nqt120
++qt120 nqt150 qt150 qt-reset
++<tag/misc-old/for standardized names, some devices got renamed. old :
++midi, sbpcd, aztcd0, vcs0, lmscd, ramdisk
++new : midi00, sbpcd0, aztcd, vcs, ram0, cm205cd, ram0
++<tag/sg-old/scsi generic devices now use numbers (sg[0-7]), not letters
++sg[a-h])
++<tag/isdn-old/an old version created ipp* devices. this was a typo, they
++are called ippp*
++</descrip>
++
++i left some links : even if they are for compatibility, removing them
++might break existing software.
++
++<descrip>
++<tag/isdnctrl/link to "isdnctrl0"
++<tag/mfd0/m68k amiga hd floppy device
++</descrip>
++
++<sect> note about console and tty0 <p>
++
++New standard is : /dev/tty0 is a device (char,4,0).
++console should be a symlink : to tty0, or whatever your console is.
++If it is not a symlink, makedev will replace it with a symlink to tty0.
++Someday there will be a kernel managed device /dev/console to handle
++this (it will be char 5 1).
++
++</article> 
+--- makedev-2.3.1.orig/debian/changelog
++++ makedev-2.3.1/debian/changelog
+@@ -0,0 +1,747 @@
++makedev (2.3.1-46.2) stable unstable; urgency=low
++
++  * non-maintainer update
++  * argh, target stable and unstable
++
++ -- Adam Di Carlo <aph@debian.org>  Sun, 15 Oct 2000 14:01:16 -0400
++
++makedev (2.3.1-46.1) unstable; urgency=low
++
++  * non-maintainer update
++  * 'symlink mcdx mcdx0' was reversed (one line patch)
++
++ -- Adam Di Carlo <aph@debian.org>  Sun, 15 Oct 2000 04:36:30 -0400
++
++makedev (2.3.1-46) stable unstable; urgency=medium
++
++  * fix silly symlink loop between ram and ram1, closes: #69475, #69351
++  * fix similar symlink reversal between scd and sr devices, and make 'sr'
++    a valid target, not just when using 'update', closes: #69500
++  * change agpart to agpgart as per devices.txt, closes: #69319
++  * add sg* devices to generic targets that include SCSI, closes: #69231
++
++ -- Bdale Garbee <bdale@gag.com>  Tue, 29 Aug 2000 01:13:30 -0600
++
++makedev (2.3.1-45) stable unstable; urgency=low
++
++  * incorporates work done by Martin Schulze <joey@finlandia.infodrom.north.de>
++    with my profound thanks.
++  * Added gscd and cm206cd device files, closes: #69057
++  * Corrected mcdx drivers, support all five drives, closes: #69058
++  * Corrected symlink creation (i.e. use symlink() instead of ln -s)
++  * Added /dev/toshiba (Toshiba laptop SMM support), closes: #54729, #59242
++  * Added sdc and sdd to generic-m68k since they were missing, closes: #61027
++  * Made joystick devices readable by everybody (closes: Bug#61499)
++  * Added '$opts' whenever $0 aka MAKEDEV gets called, thus `-n' is passed
++    to the child properly, closes: #63159
++  * Added hyphen `-' between i2c and the number as described by devices.txt, 
++    closes: #63523
++  * Fixed wrong creation of hdi hdj hdk and hdl, closes: #64881
++  * Added hdc and hdd to generic-powerpc since they were missing, 
++    closes: #65852
++  * Added support for ttyI and cui (ignored) to 'update' target by
++    modifying cvt(), closes: #66838
++  * Corrected a whole bunch of math errors where a `$' was missing, trying
++    to add 1 to 'minor', closes: #68915
++  * Fixed /proc/devices-parser to ignore slashes, closes: #31854
++  * Removed out-dated Replaces, closes: #61256
++  * Added audioctl, closes: #60755
++  * Added agpart, closes: #61084
++  * Adjusted 3dfx to have file mode $video instead of $audio
++  * Added ipmikcs (Intelligent Platform Management) with mode 0600 (mode
++    may be unpracticable), closes: #67431
++
++ -- Bdale Garbee <bdale@gag.com>  Tue, 15 Aug 2000 21:52:23 -0600
++
++makedev (2.3.1-44) frozen unstable; urgency=low
++
++  * patch from tausq for a case I missed when converting expr to $(( )),
++    fixes problem creating sbpcd devices.  Target frozen since this was
++    marked release-critical.  Closes: #63585
++
++ -- Bdale Garbee <bdale@gag.com>  Sat,  6 May 2000 20:24:40 -0600
++
++makedev (2.3.1-43) frozen unstable; urgency=low
++
++  * add invocation of '/sbin/MAKEDEV std' to postinst to ensure key devices
++    have proper owner/group/perms on upgrades, closes: #61367
++  * replace /dev/MAKEDEV references with /sbin/MAKEDEV references in the
++    postinst
++  * target frozen since broken perms on /dev/tty keeps xterm from working
++    which is very confusing and frustrating on upgrades.
++
++ -- Bdale Garbee <bdale@gag.com>  Wed,  3 May 2000 14:27:04 -0600
++
++makedev (2.3.1-42) frozen unstable; urgency=low
++
++  * eliminate the use of expr, since it is in /usr, which may not be mounted
++    during system recovery when makedev is often needed.  Target frozen since
++    this was tagged release critical, closes: #62925
++
++ -- Bdale Garbee <bdale@gag.com>  Mon, 24 Apr 2000 22:27:18 -0600
++
++makedev (2.3.1-41) frozen unstable; urgency=low
++
++  * Arrange for all scd* devices to have hardlinked sr* counterparts as per
++    devices.txt.  Target frozen since this is release critical, closes: #61862
++
++ -- Bdale Garbee <bdale@gag.com>  Fri,  7 Apr 2000 20:01:39 -0600
++
++makedev (2.3.1-40) frozen unstable; urgency=low
++
++  * fix flakey code for discovering proper major numbers for several device
++    types.  This broke the raidtools postinst in some cases, which I think
++    makes this worth adding to frozen, even though there's no bug in the BTS
++    about it (problem reported and fixed during an IRC session).  There are
++    still a few potential major number problems in MAKEDEV, but they're all
++    for obscure devices that are not in devices.txt, and which I'll therefore 
++    probably remove entirely when rewriting makedev for woody.
++  * fix type, smtpe should be smpte, closes: #59061
++
++ -- Bdale Garbee <bdale@gag.com>  Sun, 19 Mar 2000 20:28:30 -0700
++
++makedev (2.3.1-39) frozen unstable; urgency=low
++
++  * add missing major number clause to thinkpad/smapi device, closes: #57381
++    target frozen since this is clearly release-critical
++
++ -- Bdale Garbee <bdale@gag.com>  Wed,  9 Feb 2000 12:07:07 -0700
++
++makedev (2.3.1-38) frozen unstable; urgency=low
++
++  * target frozen since 56724 was tagged release-critical
++  * rework ftape stuff to match 2.2 kernel device definitions, closes: #56724
++  * add code to create /dev/smapi and symlink it as /dev/thinkpad.  This can
++    be called as either smapi or thinkpad.  Closes: #54714
++  * add /dev/radio symlink to radio0, closes: #55649
++  * update the netlink target to create fwmonitor and the tap* devices,
++    closes: #54772
++  * add IRDA device support, closes: #47296
++
++ -- Bdale Garbee <bdale@gag.com>  Thu,  3 Feb 2000 23:51:58 -0700
++
++makedev (2.3.1-37) unstable; urgency=low
++
++  * add openprom entry for Sparc systems, closes: #54296
++
++ -- Bdale Garbee <bdale@gag.com>  Fri,  7 Jan 2000 20:03:00 -0700
++
++makedev (2.3.1-36) unstable; urgency=low
++
++  * fix cyclades target to make 32 instead of 33 devices, and update man page
++    to match what the code does, closes: #51892
++  * add st0/st1/scd0/scd1 to generic-i386 and generic-alpha to improve the
++    consistency across platforms, closes: #52871
++  * create an initial generic-arm target, anticipating the need as debian-arm
++    struggles to get ready to release with potato.
++  * update handling of network block devices (nb) so that specifying a single
++    device works as expected.  calling for 'nb' will give nb0 and nb1.  
++    Closes: #53781
++  * support digital joysticks (djs) in joystick/js target, closes: #53314
++  * update to current policy rev, add Build-Depends.
++
++ -- Bdale Garbee <bdale@gag.com>  Fri,  7 Jan 2000 02:14:24 -0700
++
++makedev (2.3.1-35) unstable; urgency=low
++
++  * change group of video4linux devices to new group video appearing in
++    base-passwd 3.0.4, closes: 51429
++
++ -- Bdale Garbee <bdale@gag.com>  Sun, 28 Nov 1999 20:00:12 -0700
++
++makedev (2.3.1-34) unstable; urgency=low
++
++  * re-craft 'ida' target the same way we did dac960 to allow the boot-floopies
++    folks to create just one or two cards worth.  Closes: #51341
++
++ -- Bdale Garbee <bdale@gag.com>  Fri, 26 Nov 1999 17:54:56 -0700
++
++makedev (2.3.1-33) unstable; urgency=low
++
++  * add usbmouse support to busmice target, closes: #50326
++
++ -- Bdale Garbee <bdale@gag.com>  Tue, 16 Nov 1999 03:20:03 -0700
++
++makedev (2.3.1-32) unstable; urgency=low
++
++  * add 'audio' to the targets for generic-i386, closes: #49935
++  * craft an initial generic-alpha target to make the boot-floppies stuff
++    work right.  For now, just clone the i386 target since I have no idea
++    what is really needed...  closes: #49934
++  * add support for creating ramN devices one at a time, closes: #49853
++  * add target 'consoleonly' that creates the minimum number of devices to
++    support /dev/console, and recraft the 'console' target to use it and then
++    add all the vcs* devices, et al.  Closes: #49852
++  * re-craft 'dac960' target to be a loop around targets dac960.[0-7] so that
++    boot-floppies creators can create just one or two cards worth of devices
++    instead of having to do them all.  Closes: #49864
++
++ -- Bdale Garbee <bdale@gag.com>  Mon, 15 Nov 1999 22:38:43 -0700
++
++makedev (2.3.1-31) unstable; urgency=low
++
++  * fixes for major numbers on some oddball CDROM types, needed for boot disks
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 10 Nov 1999 23:58:56 -0700
++
++makedev (2.3.1-30) unstable; urgency=low
++  
++  * fill in a few more audio devices, closes: #49107
++
++ -- Bdale Garbee <bdale@gag.com>  Wed,  3 Nov 1999 20:28:54 -0700
++
++makedev (2.3.1-29) unstable; urgency=low
++
++  * the /dev/vcs* handling is correct, closes: #42035
++  * fix case construct for ht0, closes: #42519
++  * fix major number determination for several devices, closes: #43560
++  * add js2, js3 to joystick device creation, but leave owner/group/mode
++    the same as for mice until/unless some more compelling argument is
++    presented, closes: #43790
++  * improve consistency of vcs device creation, making vcs0 and vcsa0, with
++    symlinks for vcs and vcsa, closes: #45698
++  * add support for /dev/3dfx, closes: #48734
++  * /dev/sr* is obsolete, use /dev/scd*, closes: #32723
++  * RH 2.5 was merged as of 2.3.1-24, closes: #45153
++  * FHS compliance
++
++ -- Bdale Garbee <bdale@gag.com>  Sat, 30 Oct 1999 16:53:32 -0600
++
++makedev (2.3.1-28) unstable; urgency=medium
++
++  * /o\ oops... -27 was broken badly.  Close 42355, 42359, 42361. 
++
++ -- Bdale Garbee <bdale@gag.com>  Tue,  3 Aug 1999 02:38:06 -0600
++
++makedev (2.3.1-27) unstable; urgency=medium
++
++  * fix loop's major number, closes 38559.
++  * fix group of scd* to be cdrom, not disk.  Closes 41227, 41812.
++  * add vbi symlink, closes 39406
++
++ -- Bdale Garbee <bdale@gag.com>  Mon,  2 Aug 1999 00:59:19 -0600
++
++makedev (2.3.1-26) unstable; urgency=medium
++
++  * fix another syntax error introduced in -25...  /o\
++
++ -- Bdale Garbee <bdale@gag.com>  Sat, 29 May 1999 03:12:32 -0600
++
++makedev (2.3.1-25) unstable; urgency=medium
++
++  * fix *ugly* typos introduced in -24, closes 38489, 38465.
++  * update MAKEDEV to install the mouse -> sunmouse link in generic-sparc,
++    in addition to making it in the postinst if needed.  Closes 38432.
++  * have MAKEDEV exit with error 1 if we hit a "don't know how to make device"
++    situation.  I'm a bit concerned about this since it *might* break a
++    package postinst somewhere.  However, it is clearly the right thing to do
++    on a purely conceptual level.  Closes 29974.
++  * add support for Free S/WAN (IPSEC) device, closes 38372.
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 26 May 1999 14:00:29 -0600
++
++makedev (2.3.1-24) unstable; urgency=low
++
++  * fold in patch from Espy to provide all the functionality of the RedHat
++    makedev 2.5.  Leave our version number as 2.3.1-XX for now, since we're
++    not actually cleanly derived from the 2.5 RedHat bits. Closes 37795, 28616.
++  * make 'scd' act like 'scd-all', closes 37071
++  * patch for postinst typo, closes 37612
++  * move MAKEDEV to /sbin, create an init.d fragment to put a symlink in the
++    /dev directory at boot time.  This should allow devfs to do its thing,
++    closing 37795, 33025.
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 26 May 1999 14:00:29 -0600
++
++makedev (2.3.1-23) stable unstable; urgency=low
++
++  * fix problems with st* and adb pointed out by Hartmut
++
++ -- Bdale Garbee <bdale@gag.com>  Thu, 15 Apr 1999 08:39:39 -0600
++
++makedev (2.3.1-22) unstable; urgency=low
++
++  * add 'hamradio' as a target, which is a macro for the new scc[0-7] and
++    bc[0-3] targets, closes 34773.  
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 14 Apr 1999 11:55:46 -0600
++
++makedev (2.3.1-21) stable unstable; urgency=low
++
++  * make /dev/mouse a symlink to /dev/sunmouse on sparc, closes 35616
++  * have postinst create audio devices, closes 35646
++  * also create [alm] suffix versions for st* devices, closes 33041
++  * add support for hd[ijkl]... noticed while investigating bug 33798
++  * use the same owner/group/perms for nvram that we use for kmem, closes 34111
++  * add loop to the std device set, closes 34899
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 14 Apr 1999 11:13:47 -0600
++
++makedev (2.3.1-20) stable unstable; urgency=medium
++
++  * release-critical fixes from Hartmut for powerpc, closes 34004
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 10 Mar 1999 07:51:08 -0700
++
++makedev (2.3.1-19) frozen unstable; urgency=medium
++
++  * fix identification of 'sg' in update, closes the part of 33752 (grave)
++    that I can duplicate on i386 in -18
++
++ -- Bdale Garbee <bdale@gag.com>  Tue, 23 Feb 1999 07:44:30 -0700
++
++makedev (2.3.1-18) frozen unstable; urgency=medium
++
++  * as requested by Wichert, have the postinst force /dev/kmem owner, group,
++    and permissions since this is a security issue, closes 33703.
++  * another patch needed for m68k slink boot floppies from Michael Schmitz
++
++ -- Bdale Garbee <bdale@gag.com>  Mon, 22 Feb 1999 22:56:47 -0700
++
++makedev (2.3.1-17) frozen unstable; urgency=low
++
++  * Wichert points out that /dev/kmem doesn't need to be group writeable.
++
++ -- Bdale Garbee <bdale@gag.com>  Sat, 20 Feb 1999 16:12:29 -0700
++
++makedev (2.3.1-16) frozen unstable; urgency=medium
++
++  * apply patch for m68k that is release-critical for slink
++
++ -- Bdale Garbee <bdale@gag.com>  Fri, 19 Feb 1999 20:07:05 -0700
++
++makedev (2.3.1-15) frozen unstable; urgency=medium
++
++  * fix major number for sunmouse as per Eric Delaunay, closes 33425
++  * tighten default permission on mouse and joystick devices, closes 32378
++  * change audio devices to root.audio 660, closes 32849
++  * apply patch from Eric Delaunay to fix problem with scsi devices and 2.2
++    kernels, closes 32999
++  * target 'frozen' since the sunmouse fix at the very least should be in 
++    slink...
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 17 Feb 1999 16:53:41 -0700
++
++makedev (2.3.1-14) frozen unstable; urgency=low
++
++  * additions from Eric Delaunay needed for sparc frozen, closes 32458
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 27 Jan 1999 13:54:31 -0700
++
++makedev (2.3.1-13) frozen unstable; urgency=low
++
++  * make random/urandom available separately, not just in std, closes 32145
++
++ -- Bdale Garbee <bdale@gag.com>  Tue, 19 Jan 1999 21:27:14 -0700
++
++makedev (2.3.1-12) frozen unstable; urgency=low
++
++  * add random/urandom to the std target, closes 31562 and 29193
++  * update manpage to indicate the manpage is out of date, I need to make a
++    chunk of time at some point to give it a thorough review/update.
++  * don't make /dev/cua*, fix group on /dev/ttyS*, closes 30867
++  * change postinst to use syntax that isn't bash-specific, closes 18807 
++    and 30849
++
++ -- Bdale Garbee <bdale@gag.com>  Sat,  9 Jan 1999 00:39:25 -0700
++
++makedev (2.3.1-11) frozen unstable; urgency=low
++
++  * allow 16 sd's instead of 8, as the kernel does.  closes 30555.
++  * create hdc and hdd in generic-i386, and create 20 partitions per hd 
++    instead of 4, closes 30522.
++  * go back (forward?) to using 'u' instead of '[DHE]' in fd entries, 
++    closes 30438.
++  * add 'fb' to both the generic-i386 and generic-powerpc clauses, closes
++    29228
++
++ -- Bdale Garbee <bdale@gag.com>  Sat, 12 Dec 1998 08:10:22 -0700
++
++makedev (2.3.1-10) frozen unstable; urgency=low
++
++  * instead of having the postinst explicitly link /dev/console, have it
++    call MAKEDEV if console doesn't exist.  Update MAKEDEV to know how to
++    link it for 2.0 kernels and prior, and create the explicit device for
++    2.1 and later running kernels.  Building this based on running kernel
++    revision doesn't feel clean, but I see no better way.
++
++ -- Bdale Garbee <bdale@gag.com>  Sun,  8 Nov 1998 18:49:30 -0700
++
++makedev (2.3.1-9) frozen unstable; urgency=low
++
++  * fix postinst to cd to /dev so that devices don't end up in /, now that
++    we don't do the cd in MAKEDEV itself
++  * move 'generic' to 'generic-i386', and have 'generic' use dpkg to determine
++    which generic-<arch> to use... this paves the way for fixing support for
++    other architectures.
++  * Several changes per drow on IRC:
++      change MAXVT from 8 to 63
++      change sd[ab] to create 15 instead of 8 subdevices
++      fix char->block on one scd instance
++      diffs to add support for powerpc machines
++
++ -- Bdale Garbee <bdale@gag.com>  Sun,  8 Nov 1998 18:49:30 -0700
++
++makedev (2.3.1-8) frozen unstable; urgency=low
++
++  * add support for ram0 to the ram* list (0 was omitted), part of 28933.
++  * device 'rtc' was part of 'misc', give it a top-level entry too to reduce
++    possible confusion.  Part of 28933.
++  * add an entry for 'initrd', closes 28933 (slink release-critical).
++
++ -- Bdale Garbee <bdale@gag.com>  Sun,  8 Nov 1998 10:18:37 -0700
++
++makedev (2.3.1-7) frozen unstable; urgency=low
++
++  * now that MAKEDEV is a script, this can be an 'all' package instead of
++    an 'any'.  Thanks to Hartmut Koptein for pointing this out.
++
++ -- Bdale Garbee <bdale@gag.com>  Fri,  6 Nov 1998 11:42:58 -0700
++
++makedev (2.3.1-6) frozen unstable; urgency=low
++
++  * add ttyS entry so update works with recent 2.1 kernels
++
++ -- Bdale Garbee <bdale@gag.com>  Mon,  2 Nov 1998 21:47:34 -0700
++
++makedev (2.3.1-5) frozen unstable; urgency=low
++
++  * fix typo affecting fb devices, closes 28742
++  * fix syntax used for wildcarded devices, part of closing 28769
++  * fix error in minor numbers for isdn-ippp, part of closing 28769
++
++ -- Bdale Garbee <bdale@gag.com>  Sun,  1 Nov 1998 23:09:45 -0700
++
++makedev (2.3.1-4) frozen unstable; urgency=low
++
++  * add support for additional scd and sg devices, closes 28029.
++  * change device names for busmice back to what we used in makedev-1.*, which
++    is also what the kernel documentation uses.  Closes 28143.
++  * add support for various devices in contemporary kernels, closes 27720.
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 28 Oct 1998 23:41:58 -0700
++
++makedev (2.3.1-3) unstable; urgency=low
++
++  * use 'dialout' instead of 'serial' to select owner/group/perms for ISDN
++    devices, closes 27536
++  * use 'dialout' as group for serial devices instead of 'uucp' to be 
++    compatible with prior Debian makedev packages. 
++
++ -- Bdale Garbee <bdale@gag.com>  Wed,  7 Oct 1998 22:50:36 -0600
++
++makedev (2.3.1-2) unstable; urgency=low
++
++  * fix scd-all and sg-all entry points.  The latter is just an alias for 'sg',
++    but the former was genuinely missing.  Switch sg devices to numeric suffix
++    to comply with kernel's devices.txt.  Closes 27490.
++  * close 26586, since I'm pretty sure it's a weirdy not caused by the package.
++  * add ISDN devices, closes 26971.
++  * add cfs0 for CODA, closes 23815.
++
++ -- Bdale Garbee <bdale@gag.com>  Tue,  6 Oct 1998 00:33:59 -0600
++
++makedev (2.3.1-1) unstable; urgency=low
++
++  * New upstream version.  This is a *significant* change!
++    This is a move (back?) from the short-lived makedev that depended on a     
++    non-free parser to the one that is just a shell script.  We will now be    
++    more like other Linux distributions, no longer depending on a non-free     
++    hunk of code to build the makedev package, and some porting and other      
++    issues will get better.                                                    
++  * With the major change in upstream code, several bugs are not relevant 
++    any more.  Therefore, close 12949, 18037, 18807, 20665, 22648, 22868, 
++    23771, 23898, 24477, 24572, 25660, 25840, 26058.
++  * add support for /dev/ptmx, built as part of pty*, closes 23612.
++  * add support for /dev/ed[ab], closes 23887.
++
++ -- Bdale Garbee <bdale@gag.com>  Sun,  6 Sep 1998 21:21:32 -0600
++
++makedev (1.6-32) frozen unstable; urgency=medium
++
++  * serial devices now owned by root.dialout, closes 22297 (important)
++  * tape devices now owned by root.tape, closes 11910 
++  * be explicit about which 'ls' we're calling, closes 22225
++
++ -- Bdale Garbee <bdale@gag.com>  Fri, 22 May 1998 23:52:58 -0600
++
++makedev (1.6-31) unstable; urgency=low
++
++  * add powerpc support, closes 21949
++  * lose the menu entry
++
++ -- Bdale Garbee <bdale@gag.com>  Sat,  2 May 1998 01:29:06 -0600
++
++makedev (1.6-30) unstable; urgency=low
++
++  * change from debmake to debhelper
++  * fix errors and warnings reported by lintian
++  * deliver devices.sgml instead of trying to build the .txt and .html files,
++    closes bug 16953
++
++ -- Bdale Garbee <bdale@gag.com>  Mon,  9 Feb 1998 22:31:43 -0700
++
++makedev (1.6-29) unstable; urgency=low
++
++  * add arpd device, on request of Elie Rosenblum <erosenbl@nyx.net>.
++
++ -- Bdale Garbee <bdale@gag.com>  Wed, 14 Jan 1998 09:42:14 -0700
++
++makedev (1.6-28) unstable; urgency=low
++
++  * new maintainer
++
++ -- Bdale Garbee <bdale@gag.com>  Fri,  5 Dec 1997 23:22:57 -0700
++
++makedev (1.6-27) unstable; urgency=low
++
++  * changed /dev/console handling. 
++  * updated devinfo to kernel 2.1.62 device list.
++  * changed all device with group "sys" to group "root".
++
++ -- Andreas Jellinghaus <aj@debian.org>  Sat,  8 Nov 1997 11:56:18 +0100
++
++makedev (1.6-26) unstable; urgency=low
++
++  * fixed bug #13787 : amigamouse1 was not corrected by postinst.
++  * fixed ad devices.
++  * added nvram device, added ad* to std-hd-m68k, added ttyS4 and ttyS6
++    to m68k boot-floppies and m68k generic
++
++ -- Andreas Jellinghaus <aj@debian.org>  Thu, 16 Oct 1997 20:09:14 +0200
++
++makedev (1.6-25) unstable; urgency=low
++
++  * bug #9077 is obsolete (kernel bug, fixed in kernel).
++  * libc6 release : closes bugs #12791 and #13122.
++  * fixed bug #12158 : added sr* and sg* devices.
++  * fixed bug #12385 : wrong standard number.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Fri, 19 Sep 1997 16:12:32 +0200
++
++makedev (1.6-24) unstable; urgency=low
++
++  * removed support for old floppy devices.
++  * only create generic floppy devices.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Wed, 10 Sep 1997 10:31:53 +0200
++
++makedev (1.6-23) unstable; urgency=low
++
++  * renamed isdn batches : isdn-xx is 8 devices, isdn-xx-all are 64
++    devices (isdn-io, isdn-tty, isdn-ippp, isdn-cu).
++  * increased numer to 5500 devices. (makedev is getting too large).
++
++ -- Andreas Jellinghaus <aj@debian.org>  Mon,  8 Sep 1997 21:40:11 +0200
++
++makedev (1.6-22) unstable; urgency=low
++
++  * bugfix with cvstree (i forgot to commit befor tagging :-()
++
++ -- Andreas Jellinghaus <aj@debian.org>  Mon,  8 Sep 1997 21:30:08 +0200
++
++makedev (1.6-21) unstable; urgency=low
++
++  * bugfix : out of memory. aarrgg : makedev has fixed size tables.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Mon,  8 Sep 1997 21:28:24 +0200
++
++makedev (1.6-20) unstable; urgency=low
++
++  * corrected problem with my own cvs tree
++
++ -- Andreas Jellinghaus <aj@debian.org>  Sun,  7 Sep 1997 16:54:10 +0200
++
++makedev (1.6-19) unstable; urgency=low
++
++  * changed /dev/full to mode 0622 (0666 was a security hole, as
++  			discussed on linux-kernel).
++
++ -- Andreas Jellinghaus <aj@debian.org>  Sun,  7 Sep 1997 16:22:27 +0200
++
++makedev (1.6-18) unstable; urgency=low
++
++  * added isdn-*-small devices (only 8 devices, not 64). 
++
++ -- Andreas Jellinghaus <aj@debian.org>  Fri, 22 Aug 1997 12:57:20 +0200
++
++makedev (1.6-17) unstable; urgency=low
++
++  * close bug 6541 (missing audio device) : not reproduceable 
++  * generate random and urandom, if missing (bug #12134)
++  * enabled makedev to create more sg* and sr* devices (bug #12158)
++  * changed doubletalkt to dtlk as requested
++  * sd[a-h]16 removed (bug, sda16 = sdb, scsi only supports 15
++    partitions) 
++
++ -- Andreas Jellinghaus <aj@debian.org>  Sun, 17 Aug 1997 19:19:33 +0200
++
++makedev (1.6-16) stable unstable; urgency=low
++
++  * security bug fixed : all mouse devices are now mode 600.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Wed, 30 Jul 1997 10:31:04 +0200
++
++makedev (1.6-15) unstable; urgency=low
++
++  * ibcs2 removed from generic set. revised ibcs2-unoff.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Tue, 29 Jul 1997 13:13:43 +0200
++
++makedev (1.6-14) unstable; urgency=low
++
++  * bug in postinst : type "MAKDEV" and "/dev/tty0" instead of "tty0" (#11441)
++  * stable version (libc5 compiled) for isdnutils
++
++ -- Andreas Jellinghaus <aj@debian.org>  Fri, 25 Jul 1997 10:12:14 +0200
++
++makedev (1.6-13) unstable; urgency=low
++
++  * fixed menu entry (thanks to Abdallah Chatila <acha@poboxes.com>)
++
++ -- Andreas Jellinghaus <aj@debian.org>  Wed,  9 Jul 1997 21:33:55 +0200
++
++makedev (1.6-12) unstable; urgency=low
++
++  * bug fix (changed doubletalk to class audio).
++
++ -- Andreas Jellinghaus <aj@debian.org>  Wed,  9 Jul 1997 09:45:38 +0200
++
++makedev (1.6-11) unstable; urgency=low
++
++  * Fixed isdn devices (ippp were missing).
++  * No longer create isdn device as default (that is done by isdnutils).
++  * Added doubletalk device. Added more ibcs2 stuff.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Tue,  8 Jul 1997 19:04:45 +0200
++
++makedev (1.6-10) unstable stable; urgency=low
++
++  * fixed console device, added documentation.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Wed, 25 Jun 1997 13:20:46 +0200
++
++makedev (1.6-9) unstable stable; urgency=low
++
++  * Added comment about cua devices.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Tue, 24 Jun 1997 09:21:20 +0200
++
++makedev (1.6-8) unstable stable; urgency=low
++
++  * changed /dev/console to be a symlink to /dev/tty0.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Sun, 22 Jun 1997 21:42:35 +0200
++
++makedev (1.6-7) unstable stable; urgency=low
++
++  * fixed bug with possible /dev/console symlink.
++  * fixed bug with not always creating /dev/tty0. (xfree 3.3 need this)
++
++ -- Andreas Jellinghaus <aj@debian.org>  Thu, 19 Jun 1997 22:38:46 +0200
++
++makedev (1.6-6) unstable; urgency=low
++
++  * fixed documentation (thanks to David Welton <davidw@efn.org>)
++  * patch for m68k from frank neumann included
++
++ -- Andreas Jellinghaus <aj@debian.org>  Mon,  9 Jun 1997 15:45:00 +0200
++
++makedev (1.6-5) unstable; urgency=low
++
++  * libc6 release
++  * added postinst script to change tty/pty devices to new major
++    numbers (the next time you boot).
++  * changed all serial devices from root.dialout to uucp.dialout
++  * added generic-ARCH batches
++  * changed (u)random permissions from 444 to 644
++  * corrected mcd/mcdx handling.
++  * small bugfix in manpages.
++
++ -- Andreas Jellinghaus <aj@debian.org>  Thu, 24 Apr 1997 19:12:58 +0200
++
++makedev (1.6-4) unstable frozen; urgency=low
++
++  * fixed manpage, added generic-m68k, added mfd0, changed framebuffer
++        create both : fb[01] and fb[01]current, changed framebuffer
++        class to mode 664. disabled adb (apple desktob bus).
++        this fixes bug #9053
++  * fixed mitsumi cdrom detection. 
++
++ -- Andreas Jellinghaus <aj@debian.org>  Wed, 23 Apr 1997 16:23:50 +0200
++
++makedev (1.6-3) unstable frozen; urgency=low
++
++  * bug fixed : st?l devices (nor st?1). 
++  * only create fd0 and fd1 with generic
++  * seperated old device names to "-old" groups
++  * not generating cm205cd by default
++  * "boot-floppy" added with less devices
++  * documentation in sgml and txt format
++
++ -- Andreas Jellinghaus <aj@debian.org>  Wed, 16 Apr 1997 12:58:56 +0200
++
++makedev (1.6-2) unstable frozen; urgency=high
++
++  * new maintainer Andreas Jellinghaus <aj@debian.org> 
++  * rewrote devinfo (according to linux allocated devices, 2.0.30,2.1.31
++  * this fixes bug #8396 (isdn devices)
++  * this fixes bug #8399 (don't generate cu* devices)
++  * this fixes bug #7144 (device for goldstar cdrom - gscd)
++  * this fixes bug #8173 (new names for floppy devices fd*)
++  * this fixes bug #8068 (hd[efgh] devises added : now ide[0123])
++    (this includes: renamed all floppy device (bug #8173),
++  * this fixes bug #3493 (isdn devices)
++  * this fixes bug #5542 (ttyS* group dialout, cu* not generated)
++  * this fixes bug #6926 (loop back devices corrected)
++  * this fixes bug #6983 (loop back devices creatable)
++  * this fixes bug #7038 (mcd device creatable (only one))
++  * this fixes bug #7754 (sr* devices are created for compatibility)
++  * this fixes parts of bug #7783 (only new tty/pty are created)
++  * bug #7755 obsolete (old cat file ? current man page is ok)
++  * bug #8009 obsolete (disks 1997-04-04 are ok)
++  * remove from generic : cua[0-3] lmscd ram sbpcd[9-15] vcs0
++    added to generic: X0R aztcd beep bpcd cm205cd cm206cd exttrp gscd
++      hd[efgh]* hitcd hwtrap initrd ippp* jbm loop* mcd md* modreq nsfd
++      nst*[1am] optcd ram[0-7] ramdisk relay16 relay8 rtc sd[abcdefgh][9-16]
++      sequence2 sg[0-7] sjcd socksys spx sr[0-7] st*[1am] tpqic* tty[13-63]
++      ttyI[0-63] urandom vcs vcs[13-63] vcsa vcsa[13-63] watchdog
++         (ca. + 600 devices, size + 11 k in a ext2fs)
++
++ -- Andreas Jellinghaus <aj@debian.org>  Sun, 13 Apr 1997 21:06:14 +0200
++
++makedev (1.6-1) unstable; urgency=low
++
++  * New upstream version.
++
++ -- Bruce Perens <bruce@pixar.com>  Wed, 19 Mar 1997 20:40:17 -0800
++
++makedev (1.5-4) unstable; urgency=low
++
++  * Add devices. Increase the maximum size of a batch from 32 to 1024.
++
++ -- Bruce Perens <bruce@pixar.com>  Tue, 17 Dec 1996 20:34:06 -0800
++
++makedev (1.5-3) unstable; urgency=low
++
++  * Make hd[a-d][8-20] and sd[a-h][8-20]. Remove bad empty "omit" from
++    makedev.cfg
++
++ -- Bruce Perens <bruce@pixar.com>  Sun, 8 Dec 1996 09:42:18 -0800
++
++makedev (1.5-2) unstable; urgency=low
++
++  * Change class of ttySn devices to dialout.
++  * Add ISDN.
++
++ -- Bruce Perens <bruce@pixar.com>  Fri, 6 Dec 1996 21:17:12 -0800
++
++makedev (1.5-1) unstable; urgency=low
++
++  * Initial Release.
++
++ -- Bruce Perens <bruce@pixar.com>  Wed, 30 Oct 1996 20:36:44 -0800
++
++Local variables:
++mode: debian-changelog
++End:
+--- makedev-2.3.1.orig/debian/conffiles
++++ makedev-2.3.1/debian/conffiles
+@@ -0,0 +1 @@
++/etc/init.d/makedev
+--- makedev-2.3.1.orig/debian/control
++++ makedev-2.3.1/debian/control
+@@ -0,0 +1,13 @@
++Source: makedev
++Section: base
++Priority: required
++Maintainer: Bdale Garbee <bdale@gag.com>
++Build-Depends: debhelper
++Standards-Version: 3.1.1.1
++
++Package: makedev
++Architecture: all
++Depends: base-passwd (>= 3.0.4)
++Description: Creates special device files in /dev.
++ The MAKEDEV executable is used to populate the /dev directory with device
++ files.
+--- makedev-2.3.1.orig/debian/copyright
++++ makedev-2.3.1/debian/copyright
+@@ -0,0 +1,45 @@
++This package is maintained for Debian by Bdale Garbee, <bdale@gag.com>.
++
++It was downloaded from ftp.redhat.com, as a source .rpm from the 5.1 release
++tree.
++
++Copyright:
++
++No explicit copyright is asserted.  Nick Holloway is the earliest author 
++recorded in the sourcecode.  I queried him for an explicit statement 
++regarding the license status of this work, and this is his reply:
++  
++ Date: Tue, 21 Jul 1998 19:57:10 +0100
++ From: Nick Holloway <Nick.Holloway@alfie.demon.co.uk>
++ Message-Id: <199807211857.TAA19068@alfie.demon.co.uk>
++ To: Bdale Garbee <bdale@gag.com>
++ Subject: Re: makedev license?
++ 
++ > I maintain the makedev package for Debian GNU/Linux.  I am about to move 
++ > from the ill-fated makedev-1.6 to the makedev-2.3.1 derived from your work 
++ > by the folks at Redhat.  I don't see any evidence of a copyright assertion 
++ > or explicit license statement in the source.  Your name appears to be the 
++ > earliest attached to the current sourcecode.  Am I correct in assuming the 
++ > GPL?  We try to be meticulous about having our base system be compliant 
++ > with our Debian Free Software Guidelines, so I'd like an explicit statement.
++ 
++ It was never explictly released as GPL, as that would have required
++ including the file COPYING which would have been much larger than the
++ actual MAKEDEV script (I was also too lazy to find out what incantations
++ needed to be made).  However, it is intended to be used as anyone sees
++ fit, and the statement under "Copying Policy" is "Freely Redistributable"
++ (see MAKEDEV.lsm from any of the releases I made).
++ 
++ The more recent modifications were done by Michael K. Johnson at
++ Redhat.  I think the understanding was that he would be taking over the
++ maintenance of MAKEDEV (our discussion took place last September).
++ 
++ The only previous history was (according to an old posting to
++ comp.os.linux) that I started with Jim Winstead's script.
++ 
++ So, as far as I am concerned, it is consistentwith the Debian FSG.
++ 
++ -- 
++  `O O'  | Home: Nick.Holloway@alfie.demon.co.uk  http://www.alfie.demon.co.uk/
++ // ^ \\ | Work: Nick.Holloway@parallax.co.uk
++ 
+--- makedev-2.3.1.orig/debian/dirs
++++ makedev-2.3.1/debian/dirs
+@@ -0,0 +1,2 @@
++sbin
++usr/share/man/man8
+--- makedev-2.3.1.orig/debian/init.d
++++ makedev-2.3.1/debian/init.d
+@@ -0,0 +1,21 @@
++#! /bin/sh
++
++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
++
++set -e
++
++case "$1" in
++  start)
++	ln -fs /sbin/MAKEDEV /dev/MAKEDEV
++	;;
++  stop|reload|restart|force-reload)
++	;;
++  *)
++	N=/etc/init.d/makedev
++	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
++	echo "Usage: $N {start|stop|restart|force-reload}" >&2
++	exit 1
++	;;
++esac
++
++exit 0
+--- makedev-2.3.1.orig/debian/postinst
++++ makedev-2.3.1/debian/postinst
+@@ -0,0 +1,62 @@
++#!/bin/sh
++
++set +e
++
++#DEBHELPER#
++
++cd /dev
++
++/sbin/MAKEDEV std
++
++test -e /dev/console || /sbin/MAKEDEV console
++test -e /dev/tty0 || /sbin/MAKEDEV tty0
++test -e /dev/random || /sbin/MAKEDEV random
++test -e /dev/urandom || /sbin/MAKEDEV urandom
++test -e /dev/full && chmod 0622 /dev/full
++test -e /dev/audio || /sbin/MAKEDEV audio
++
++[ ! -f /dev/mouse -a -f /dev/sunmouse ] && ln -s sunmouse mouse
++
++for A in sda16 sdb16 sdc16 sdd16 sde16 sdf16 sdg16 sdh16 \
++	 ada16 adb16 adc16 add16 ade16 adf16 adg16 adh16
++do
++	test -e /dev/$A && rm /dev/$A
++done
++
++for A in logibm psaux inportbm atibm jbm smouse logimouse psmouse \
++msmouse atimouse jmouse amigamouse atarimouse sunmouse amigamouse1
++do
++	test -e /dev/$A && chmod 600 /dev/$A
++done
++
++# fix security hole caused by group-write permissions on kmem
++test -e /dev/kmem && chown root.kmem /dev/kmem && chmod 0640 /dev/kmem
++
++LIST=""
++
++for TYPE in tty pty ; do
++	for LETTER in p q r s t u v w x y z a b c d e ; do
++		if [ -e /dev/$TYPE$LETTER"0" ]; then
++			MAJOR="`/bin/ls -l /dev/$TYPE$LETTER"0"|cut -c33-36`"
++			if [ "$MAJOR" = 4 ] ; then
++				LIST="$LIST $TYPE$LETTER"
++			fi
++		fi
++	done
++done
++
++if [ -n "$LIST" ]; then
++	cat > /etc/rc.boot/makedev << EOF
++#!/bin/sh
++
++echo "Creating new console devices"
++/sbin/MAKEDEV $LIST
++
++rm /etc/rc.boot/makedev ; exit 0
++EOF
++
++chmod 755 /etc/rc.boot/makedev
++
++fi
++
++exit 0
+--- makedev-2.3.1.orig/debian/preinst
++++ makedev-2.3.1/debian/preinst
+@@ -0,0 +1,5 @@
++#!/bin/sh
++
++rm -f /usr/man/man8/MAKEDEV.8 /usr/man/man8/MAKEDEV-C.8 \
++	/usr/man/man8/MAKEDEV-C.8.gz
++exit 0
+--- makedev-2.3.1.orig/debian/rules
++++ makedev-2.3.1/debian/rules
+@@ -0,0 +1,56 @@
++#!/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
++
++build: build-stamp
++build-stamp:
++	dh_testdir
++	touch build-stamp
++
++clean:
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp
++	-$(MAKE) clean
++	-rm -f debian/devices.txt debian/devices*html
++	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
++
++	ROOT=debian/tmp $(MAKE) install 
++
++	dh_installdocs 
++	dh_installexamples
++	dh_installmenu
++	dh_installinit
++	dh_installcron
++	dh_installmanpages
++	dh_undocumented
++	dh_installchangelogs
++	dh_strip
++	dh_compress
++	dh_fixperms
++	dh_suidregister
++	dh_installdeb
++	dh_shlibdeps
++	dh_gencontrol
++#	dh_makeshlibs
++	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
diff --git a/source/a/devs/makedev_2.3.1.hd.diff b/source/a/devs/makedev_2.3.1.hd.diff
new file mode 100644
index 000000000..4f5058b23
--- /dev/null
+++ b/source/a/devs/makedev_2.3.1.hd.diff
@@ -0,0 +1,71 @@
+--- ./MAKEDEV.orig	Sun Feb 24 15:46:03 2002
++++ ./MAKEDEV	Sun Feb 24 16:12:18 2002
+@@ -147,7 +147,7 @@
+ 			Character|Block|'')
+ 				;;
+ 			*)
+-				eval "major_$device=$major"
++				# eval "major_$device=$major"
+ 				devices="$devices $device"
+ 				;;
+ 		esac
+@@ -964,7 +964,7 @@
+ 		done
+ 		;;
+ 	hd[k-l])
+-		major=`Major ide4 57` || continue
++		major=`Major ide5 57` || continue
+ 		unit=`suffix $arg hd`
+ 		base=`index kl $unit`
+ 		base=`math $base \* 64`
+@@ -974,6 +974,50 @@
+ 			makedev hd$unit$part b $major $(( $base + $part )) $disk
+ 		done
+ 		;;
++	hd[m-n])
++		major=`Major ide6 88` || continue
++		unit=`suffix $arg hd`
++		base=`index mn $unit`
++		base=`math $base \* 64`
++		makedev hd$unit b $major $base $disk
++		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++		do
++			makedev hd$unit$part b $major $(( $base + $part )) $disk
++		done
++		;;
++        hd[o-p])
++                major=`Major ide7 89` || continue
++                unit=`suffix $arg hd`
++                base=`index op $unit`
++                base=`math $base \* 64`
++                makedev hd$unit b $major $base $disk
++                for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                do
++                        makedev hd$unit$part b $major $(( $base + $part )) $disk
++                done
++                ;;
++        hd[q-r])
++                major=`Major ide8 90` || continue
++                unit=`suffix $arg hd`
++                base=`index qr $unit`
++                base=`math $base \* 64`
++                makedev hd$unit b $major $base $disk
++                for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                do
++                        makedev hd$unit$part b $major $(( $base + $part )) $disk
++                done
++                ;;
++        hd[s-t])
++                major=`Major ide9 91` || continue
++                unit=`suffix $arg hd`
++                base=`index st $unit`
++                base=`math $base \* 64`
++                makedev hd$unit b $major $base $disk
++                for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
++                do
++                        makedev hd$unit$part b $major $(( $base + $part )) $disk
++                done
++                ;;
+ 	ht0)
+ 		major=`Major ht0 37` || continue
+ 		# Only one IDE tape drive is currently supported; ht0.
diff --git a/source/a/devs/makedev_2.3.1.slack.diff b/source/a/devs/makedev_2.3.1.slack.diff
new file mode 100644
index 000000000..8a1998561
--- /dev/null
+++ b/source/a/devs/makedev_2.3.1.slack.diff
@@ -0,0 +1,19 @@
+--- ./MAKEDEV.orig	2004-05-20 19:27:42.000000000 -0700
++++ ./MAKEDEV	2004-05-20 19:28:47.000000000 -0700
+@@ -17,14 +17,14 @@
+     tty="  root tty    0666"
+    cons="  root tty    0622"
+     vcs="  root root   0600"
+-dialout="  root dialout 0660"
++dialout="  root uucp   0660"
+   mouse="  root root   0660"
+ printer="  root lp     0660"
+  floppy="  root floppy 0660"
+    disk="  root disk   0660"
+    scsi="  root root   0600"
+   cdrom="  root cdrom  0660"
+-   tape="  root tape   0660"
++   tape="  root disk   0660"
+   audio="  root audio  0660"
+   video="  root video  0660"
+   ibcs2="  root root   0666"
diff --git a/source/a/devs/slack-desc b/source/a/devs/slack-desc
new file mode 100644
index 000000000..e8b5d1d5f
--- /dev/null
+++ b/source/a/devs/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------------------------------------------------------|
+devs: devs (system device files)
+devs:
+devs: This package creates special files in the /dev directory that 
+devs: represent your system's hardware, and a tool (/dev/MAKEDEV) for
+devs: creating new device files.  These files are required to access
+devs: hardware on a Linux system.
+devs:
+devs:
+devs:
+devs:
+devs:
diff --git a/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild
new file mode 100755
index 000000000..9c9bd3f65
--- /dev/null
+++ b/source/a/dialog/dialog.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=dialog
+VERSION=${VERSION:-1.1-20080819}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+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"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "armel" ]; then
+  SLKCFLAGS="-O2 -march=armv4t"
+  LIBDIRSUFFIX=""
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
+
+zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || 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 \
+  --disable-static \
+  --enable-nls \
+  --with-ncursesw \
+  --enable-widec \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make -j4 || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Keep the old traditional looknfeel :-)
+mkdir -p $PKG/etc
+cat samples/slackware.rc > $PKG/etc/dialogrc
+
+mkdir -p $PKG/bin
+mv $PKG/usr/bin/dialog $PKG/bin
+( cd $PKG/usr/bin
+  ln -sf ../../bin/dialog .
+)
+
+# 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
+
+# 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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  CHANGES COPYING README VERSION dialog.lsm \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $TMP/package-${PKGNAM}
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
+
diff --git a/source/a/dialog/dialog.smaller.min.height.diff b/source/a/dialog/dialog.smaller.min.height.diff
new file mode 100644
index 000000000..c9a327af3
--- /dev/null
+++ b/source/a/dialog/dialog.smaller.min.height.diff
@@ -0,0 +1,22 @@
+--- ./checklist.c.orig	2008-06-20 15:58:21.000000000 -0500
++++ ./checklist.c	2009-04-22 19:00:18.000000000 -0500
+@@ -31,7 +31,7 @@
+ 
+ static int list_width, check_x, item_x, checkflag;
+ 
+-#define MIN_HIGH  (1 + (5 * MARGIN))
++#define MIN_HIGH 4
+ 
+ #define LLEN(n) ((n) * CHECKBOX_TAGS)
+ #define ItemData(i)    &items[LLEN(i)]
+--- ./menubox.c.orig	2008-06-19 19:54:16.000000000 -0500
++++ ./menubox.c	2009-04-22 19:00:07.000000000 -0500
+@@ -35,7 +35,7 @@
+     Editing
+ } Mode;
+ 
+-#define MIN_HIGH  (1 + (5 * MARGIN))
++#define MIN_HIGH 4
+ 
+ #define INPUT_ROWS     3	/* rows per inputmenu entry */
+ 
diff --git a/source/a/dialog/slack-desc b/source/a/dialog/slack-desc
new file mode 100644
index 000000000..8c20026f8
--- /dev/null
+++ b/source/a/dialog/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------------------------------------------------------|
+dialog: dialog (display dialog boxes from shell scripts)
+dialog:
+dialog: Dialog is a program to present a variety of questions or display
+dialog: messages using dialog boxes from a shell script.  The Slackware
+dialog: package management script "pkgtool" uses this, as do various other
+dialog: menu-driven console scripts.
+dialog:
+dialog: Dialog was originally contributed to Slackware by Savio Lam, and has
+dialog: been contributed to by many.  Dialog is currently maintained by
+dialog: Thomas E. Dickey.
+dialog:
diff --git a/source/a/dosfstools/dosfstools.SlackBuild b/source/a/dosfstools/dosfstools.SlackBuild
new file mode 100755
index 000000000..ebe99c68b
--- /dev/null
+++ b/source/a/dosfstools/dosfstools.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Copyright 2007-2009  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.
+
+VERSION=2.11
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-dosfstools
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf dosfstools-$VERSION
+tar xzvf $CWD/dosfstools-$VERSION.src.tar.gz
+cd dosfstools-$VERSION
+chown -R root:root .
+make -j4 || exit 1
+
+( cd mkdosfs
+  mkdir -p $PKG/sbin
+  cat mkdosfs > $PKG/sbin/mkdosfs
+  chmod 755 $PKG/sbin/mkdosfs
+  mkdir -p $PKG/usr/man/man8
+  cat mkdosfs.8 | gzip -9c > $PKG/usr/man/man8/mkdosfs.8.gz
+)
+( cd $PKG/sbin ; rm -f mkfs.msdos ; ln -sf mkdosfs mkfs.msdos )
+( cd dosfsck
+  cat dosfsck > $PKG/sbin/dosfsck
+  chmod 755 $PKG/sbin/dosfsck
+  cat dosfsck.8 | gzip -9c > $PKG/usr/man/man8/dosfsck.8.gz
+)
+mkdir -p $PKG/usr/doc/dosfstools-$VERSION
+cp -a \
+  CHANGES README.Atari TODO \
+  $PKG/usr/doc/dosfstools-$VERSION
+mkdir -p $PKG/usr/doc/dosfstools-$VERSION/mkdosfs
+( cd mkdosfs ; cp -a ANNOUNCE COPYING README mkdosfs-ygg-0.3b.lsm $PKG/usr/doc/dosfstools-$VERSION/mkdosfs )
+mkdir -p $PKG/usr/doc/dosfstools-$VERSION/dosfsck
+( cd dosfsck ; cp -a CHANGES COPYING README $PKG/usr/doc/dosfstools-$VERSION/dosfsck )
+
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/dosfstools-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/dosfstools/slack-desc b/source/a/dosfstools/slack-desc
new file mode 100644
index 000000000..b070c1e29
--- /dev/null
+++ b/source/a/dosfstools/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------------------------------------------------------|
+dosfstools: dosfstools (tools for working with FAT filesystems)
+dosfstools:
+dosfstools: Utilities for creating FAT filesystems (mkdosfs), and for checking
+dosfstools: and repairing them (dosfsck).
+dosfstools:
+dosfstools:
+dosfstools:
+dosfstools:
+dosfstools:
+dosfstools:
+dosfstools:
diff --git a/source/a/e2fsprogs/doinst.sh b/source/a/e2fsprogs/doinst.sh
new file mode 100644
index 000000000..c47d7e847
--- /dev/null
+++ b/source/a/e2fsprogs/doinst.sh
@@ -0,0 +1,18 @@
+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/mke2fs.conf.new
+
+if [ -x /usr/bin/install-info ]; then
+  install-info --info-dir=/usr/info /usr/info/libext2fs.info.gz 2> /dev/null
+fi
+
diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild
new file mode 100755
index 000000000..c57cea4f3
--- /dev/null
+++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild
@@ -0,0 +1,159 @@
+#!/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:-1.41.8}
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-e2fsprogs
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf e2fsprogs-$VERSION
+tar xvf $CWD/e2fsprogs-$VERSION.tar.?z* || exit 1
+cd e2fsprogs-$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 {} \;
+
+# Disable --uuidd builds the same functionality into libuuid.*.
+# It's better that way.
+# Keep the included libblkid and libuuid for now, but we'll be using the 
+# system-wide one from util-linux-ng sooner or later...
+# fsck.* will also be moving to u-l-ng
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix= \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --bindir=/usr/bin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/e2fsprogs-$VERSION \
+  --enable-elf-shlibs \
+  --enable-libblkid \
+  --enable-libuuid \
+  --disable-uuidd \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+make install-libs DESTDIR=$PKG || exit 1
+
+# I guess Ted would rather not have this included, so we won't.
+# ( cd misc 
+#   make findsuper
+#   cat findsuper > $PKG/sbin/findsuper
+#   chmod 0755 $PKG/sbin/findsuper )
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Don't clobber an existing config file
+mv $PKG/etc/mke2fs.conf $PKG/etc/mke2fs.conf.new
+
+# Fix up package:
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/lib${LIBDIRSUFFIX}/*.so \
+  $PKG/usr/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  for i in *.so ; do 
+    ln -sf /lib${LIBDIRSUFFIX}/$(readlink $i) $i ; 
+  done
+)
+( cd $PKG/sbin
+  rm -f \
+    mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.ext4dev \
+    fsck.ext2 fsck.ext3 fsck.ext4dev e2label findfs
+  ln -sf mke2fs mkfs.ext2
+  ln -sf mke2fs mkfs.ext3
+  ln -sf mke2fs mkfs.ext4
+  ln -sf mke2fs mkfs.ext4dev
+  ln -sf tune2fs e2label
+  ln -sf tune2fs findfs
+  cat << EOF > fsck.ext2
+#!/bin/sh
+exec /sbin/e2fsck -C 0 \$*
+EOF
+  chmod 0755 fsck.ext2
+  # Why won't symlinks work here?  --RW
+  # Because $0 will always be "fsck.ext2" in that case.  --PJV
+  cp -a fsck.ext2 fsck.ext3
+  cp -a fsck.ext2 fsck.ext4
+  cp -a fsck.ext2 fsck.ext4dev
+)
+( cd $PKG/usr/man/man3
+  rm -f uuid_generate_random.3 uuid_generate_time.3
+  ln -sf uuid_generate.3 uuid_generate_random.3
+  ln -sf uuid_generate.3 uuid_generate_time.3 
+)
+( cd $PKG/usr/man/man8
+  rm -f fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \
+    mkfs.ext4.8 mkfs.ext4dev.8
+  ln -sf e2fsck.8 fsck.ext2.8
+  ln -sf e2fsck.8 fsck.ext3.8
+  ln -sf e2fsck.8 fsck.ext4.8
+  ln -sf e2fsck.8 fsck.ext4dev.8
+  ln -sf mke2fs.8 mkfs.ext2.8
+  ln -sf mke2fs.8 mkfs.ext3.8
+  ln -sf mke2fs.8 mkfs.ext4.8
+  ln -sf mke2fs.8 mkfs.ext4dev.8
+)
+
+# Compress and link manpages
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/usr/doc/e2fsprogs-$VERSION
+cp -a \
+  COPYING* INSTALL INSTALL.elfbin README* RELEASE-NOTES SHLIBS \
+  $PKG/usr/doc/e2fsprogs-$VERSION
+chmod 644 $PKG/usr/doc/e2fsprogs-$VERSION/*
+
+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/e2fsprogs-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/e2fsprogs/slack-desc b/source/a/e2fsprogs/slack-desc
new file mode 100644
index 000000000..e35c02a2b
--- /dev/null
+++ b/source/a/e2fsprogs/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------------------------------------------------------|
+e2fsprogs: e2fsprogs (ext2 and ext3 filesystems utilities)
+e2fsprogs:
+e2fsprogs: Utilities needed to create and maintain ext2 and ext3 filesystems.
+e2fsprogs:
+e2fsprogs: These utilities were written by Remy Card (the developer and
+e2fsprogs: maintainer of the ext2 fs) and Theodore T'so.
+e2fsprogs:
+e2fsprogs:
+e2fsprogs:
+e2fsprogs:
+e2fsprogs:
diff --git a/source/a/ed/ed.SlackBuild b/source/a/ed/ed.SlackBuild
new file mode 100755
index 000000000..534ca116d
--- /dev/null
+++ b/source/a/ed/ed.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=ed
+VERSION=${VERSION:-1.3}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION
+
+# 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 \
+  --infodir=/usr/info \
+  --mandir=/usr/man
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+if [ ! -r $PKG/usr/man/man1/ed.1 ]; then
+  mkdir -p $PKG/usr/man/man1
+  cat doc/ed.1 > $PKG/usr/man/man1/ed.1
+fi
+
+# Traditional:
+( mkdir $PKG/bin
+  rm $PKG/usr/bin/red
+  mv $PKG/usr/bin/ed $PKG/bin
+  cd $PKG/bin
+  ln -sf ed red
+  cd $PKG/usr/bin
+  ln -sf ../../bin/ed .
+  ln -sf ed red
+)
+
+# 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
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $TMP/package-${PKGNAM}
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/ed/slack-desc b/source/a/ed/slack-desc
new file mode 100644
index 000000000..b0121daa5
--- /dev/null
+++ b/source/a/ed/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------------------------------------------------------|
+ed: ed (text editor)
+ed:
+ed: GNU ed is an 8-bit clean, more or less POSIX-compliant implementation
+ed: of the standard Unix line editor.  These days, full-screen editors
+ed: have rendered 'ed' mostly of historical interest.  Nonetheless, it
+ed: appeals to a handful of aging programmers who still believe that
+ed: "Small is Beautiful".
+ed:
+ed:
+ed:
+ed:
diff --git a/source/a/eject/eject.SlackBuild b/source/a/eject/eject.SlackBuild
new file mode 100755
index 000000000..56d1e79fc
--- /dev/null
+++ b/source/a/eject/eject.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Copyright 2006, 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.
+
+
+PKGNAM=eject
+VERSION=${VERSION:-2.1.5}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+
+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"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}
+tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2
+cd ${PKGNAM}
+
+# 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 \
+  $ARCH-slackware-linux
+
+# Build and install:
+make -j4 || 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-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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING NEWS PORTING PROBLEMS README TODO eject-$VERSION.lsm \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $TMP/package-${PKGNAM}
+makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/eject/slack-desc b/source/a/eject/slack-desc
new file mode 100644
index 000000000..624b05b7d
--- /dev/null
+++ b/source/a/eject/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------------------------------------------------------|
+eject: eject (a tool to eject removable media)
+eject:
+eject: Eject allows removable media (typically a DVD, CD, floppy disk, tape,
+eject: etc.) to be ejected under software control.  The command can also
+eject: control some multi-disc changers, the auto-eject feature supported by
+eject: some devices, and can close the disc tray of some drives.
+eject:
+eject: The 'eject' program was written by Jeff Tranter.
+eject:
+eject:
+eject:
diff --git a/source/a/elvis/elvis.SlackBuild b/source/a/elvis/elvis.SlackBuild
new file mode 100755
index 000000000..3bb83ba70
--- /dev/null
+++ b/source/a/elvis/elvis.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=2.2_0
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-elvis
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr
+cd $TMP
+rm -rf elvis-$VERSION
+tar xjvf $CWD/elvis-$VERSION.tar.bz2
+cd elvis-$VERSION
+chown -R root:root .
+# Time for a kludge (i.e. don't suggest this kind of thing be
+# done as a rule... I don't know why I'm crazy today).
+# First we build and install this with a bogus --prefix, and
+# then build it again and replace the binaries.
+# (to prevent compiling in /tmp/package-elvis/ paths)
+./configure \
+  --without-x \
+  --without-gnome \
+  --bindir=$PKG/usr/bin \
+  --datadir=$PKG/usr/share/elvis-$VERSION \
+  --docdir=$PKG/usr/share/elvis-$VERSION/doc \
+  --verbose
+make
+make install
+# Now we make the real binaries:
+make clean
+./configure \
+  --without-x \
+  --without-gnome \
+  --bindir=/usr/bin \
+  --datadir=/usr/share/elvis-$VERSION \
+  --docdir=/usr/share/elvis-$VERSION/doc \
+  --verbose
+make
+# And install them:
+cat elvis > $PKG/usr/bin/elvis
+cat elvtags > $PKG/usr/bin/elvtags
+cat ref > $PKG/usr/bin/ref
+# Turn off color highlighting by default.  I can't imagine editing files like
+# that all day...  (this coming from the inventor of /etc/(DIR|LS)_COLORS ;-)
+cp -a $CWD/elvis.clr* $PKG/usr/share/elvis-$VERSION
+chown root:root $PKG/usr/share/elvis-$VERSION/elvis.clr*
+( 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
+)
+# Install the man pages:
+mkdir -p $PKG/usr/man/man1
+( cd doc
+  cat ctags.man | gzip -9c > $PKG/usr/man/man1/elvtags.1.gz
+  cat elvfmt.man | gzip -9c > $PKG/usr/man/man1/elvfmt.1.gz
+  cat elvis.man | gzip -9c > $PKG/usr/man/man1/elvis.1.gz
+  cat ref.man | gzip -9c > $PKG/usr/man/man1/ref.1.gz
+)
+cp -a \
+  BUGS COPYING INSTALL README.html \
+  $PKG/usr/share/elvis-$VERSION
+# If this is actually useful for anything, fill me in on what it's for:
+rm -f $PKG/usr/share/elvis-$VERSION/tags
+rm -f $PKG/usr/share/elvis-$VERSION/doc/*.man
+rm -f $PKG/usr/share/elvis-$VERSION/doc/printdoc.bat
+
+# Add /usr/bin/ex and /usr/bin/vi symlinks.
+( cd $PKG/usr/bin ; ln -sf elvis ex ; ln -sf elvis vi )
+mkdir $PKG/usr/doc
+( cd $PKG/usr/doc ; ln -sf /usr/share/elvis-$VERSION . )
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/elvis-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/elvis/elvis.clr b/source/a/elvis/elvis.clr
new file mode 100644
index 000000000..6b906afaf
--- /dev/null
+++ b/source/a/elvis/elvis.clr
@@ -0,0 +1,56 @@
+switch gui
+case windows
+case x11 {
+"  color normal black on gray90
+"  color argument like keyword green or dark green
+"  color bottom like normal
+"  color comment italic dark green or light green
+"  color cursor blue on navyblue
+"  color fixed gray35 or gray80
+"  color function Red4 or pink
+"  color guide white
+"  color hexheading gray70
+"  color hlsearch boxed
+"  color keyword bold
+"  color libt like keyword italic
+"  color linenumber gray
+"  color link like formatted underlined blue or light blue
+"  color number Blue4 or light blue
+"  color other like keyword
+"  color prep bold Blue4 or light blue
+"  color prepquote like string
+"  color scroll like tool
+"  color scrollbar like toolbar
+"  color selection on tan
+"  color spell on pink
+"  color status like tool
+"  color statusbar like toolbar
+"  color string tan4 or tan1
+"  color tool black on gray75
+"  color toolbar white on gray40
+"  color variable Gray15 or palegoldenrod
+}
+case vio
+case termcap {
+"  color normal yellow or black
+"  color char like string
+"  color comment italic light green or green
+"  color fixed white or gray
+"  color function light cyan or cyan
+"  color hexheading gray
+"  color hlsearch bold
+"  color keyword bold white or black
+"  color libt like keyword
+"  color linenumber gray
+"  color link underlined blue or light cyan
+"  color number light cyan or blue
+"  color other like keyword
+"  color prep bold magenta or blue
+"  color prepquote like string
+"  color regexp like string
+"  color ruler blue or light cyan
+"  color showmode green boxed
+"  color spell red or light magenta
+"  color string white or brown
+"  color variable like normal
+}
diff --git a/source/a/elvis/elvis.clr.orig b/source/a/elvis/elvis.clr.orig
new file mode 100644
index 000000000..d132c6738
--- /dev/null
+++ b/source/a/elvis/elvis.clr.orig
@@ -0,0 +1,56 @@
+switch gui
+case windows
+case x11 {
+  color normal black on gray90
+  color argument like keyword green or dark green
+  color bottom like normal
+  color comment italic dark green or light green
+  color cursor blue on navyblue
+  color fixed gray35 or gray80
+  color function Red4 or pink
+  color guide white
+  color hexheading gray70
+  color hlsearch boxed
+  color keyword bold
+  color libt like keyword italic
+  color linenumber gray
+  color link like formatted underlined blue or light blue
+  color number Blue4 or light blue
+  color other like keyword
+  color prep bold Blue4 or light blue
+  color prepquote like string
+  color scroll like tool
+  color scrollbar like toolbar
+  color selection on tan
+  color spell on pink
+  color status like tool
+  color statusbar like toolbar
+  color string tan4 or tan1
+  color tool black on gray75
+  color toolbar white on gray40
+  color variable Gray15 or palegoldenrod
+}
+case vio
+case termcap {
+  color normal yellow or black
+  color char like string
+  color comment italic light green or green
+  color fixed white or gray
+  color function light cyan or cyan
+  color hexheading gray
+  color hlsearch bold
+  color keyword bold white or black
+  color libt like keyword
+  color linenumber gray
+  color link underlined blue or light cyan
+  color number light cyan or blue
+  color other like keyword
+  color prep bold magenta or blue
+  color prepquote like string
+  color regexp like string
+  color ruler blue or light cyan
+  color showmode green boxed
+  color spell red or light magenta
+  color string white or brown
+  color variable like normal
+}
diff --git a/source/a/elvis/slack-desc b/source/a/elvis/slack-desc
new file mode 100644
index 000000000..f60d350d8
--- /dev/null
+++ b/source/a/elvis/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------------------------------------------------------|
+elvis: elvis (text editor)
+elvis:
+elvis: Elvis is a text editor.  It is intended to be a modern replacement
+elvis: for the classic ex/vi editor of UNIX fame.  Elvis supports many new
+elvis: features, including multiple edit buffers, multiple windows, and a
+elvis: variety of display modes.
+elvis:
+elvis: As elvis is Slackware's default vi, this is a required package.
+elvis:
+elvis:
+elvis:
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
new file mode 100755
index 000000000..6c708883b
--- /dev/null
+++ b/source/a/etc/etc.SlackBuild
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Copyright 2005-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=13.0
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-etc
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_etc.tar.gz
+# Fix for ARCH:
+sed -i -e "s#/i486-slackware-linux#/${ARCH}-slackware-linux#" etc/ld.so.conf.new
+cp -a $CWD/termcap-BSD.gz etc/termcap-BSD.gz
+gzip -d --force etc/termcap-BSD.gz
+chown root:root etc/termcap-BSD
+chmod 644 etc/termcap-BSD
+zcat $CWD/nsswitch.conf.gz > $PKG/etc/nsswitch.conf.new
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n  $TMP/etc-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/etc/nsswitch.conf b/source/a/etc/nsswitch.conf
new file mode 100644
index 000000000..3d993afcb
--- /dev/null
+++ b/source/a/etc/nsswitch.conf
@@ -0,0 +1,42 @@
+#
+# /etc/nsswitch.conf
+#
+# An example Name Service Switch config file. This file should be
+# sorted with the most-used services at the beginning.
+#
+# The entry '[NOTFOUND=return]' means that the search for an
+# entry should stop if the search in the previous entry turned
+# up nothing. Note that if the search failed due to some other reason
+# (like no NIS server responding) then the search continues with the
+# next entry.
+#
+# Legal entries are:
+#
+#      nisplus or nis+         Use NIS+ (NIS version 3)
+#      nis or yp               Use NIS (NIS version 2), also called YP
+#      dns                     Use DNS (Domain Name Service)
+#      files                   Use the local files
+#      [NOTFOUND=return]       Stop searching if not found so far
+#
+
+# passwd: 	files nis
+# shadow: 	files nis
+# group:  	files nis
+
+passwd: 	compat
+group:  	compat
+
+hosts:  	files dns
+networks:       files
+
+services:       files
+protocols:      files
+rpc:    	files
+ethers: 	files
+netmasks:       files
+netgroup:       files
+bootparams:     files
+
+automount:      files
+aliases:        files
+
diff --git a/source/a/etc/slack-desc b/source/a/etc/slack-desc
new file mode 100644
index 000000000..9d9d9bbd4
--- /dev/null
+++ b/source/a/etc/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------------------------------------------------------|
+etc: etc (system configuration files)
+etc:
+etc: System configuration files.  The /etc directory is traditionally the
+etc: location where configuration files are found.
+etc:
+etc:
+etc:
+etc:
+etc:
+etc:
+etc:
diff --git a/source/a/etc/termcap-BSD b/source/a/etc/termcap-BSD
new file mode 100644
index 000000000..01094d609
--- /dev/null
+++ b/source/a/etc/termcap-BSD
@@ -0,0 +1,16470 @@
+######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
+#
+#	Version 11.0.1
+#	$Date: 2000/03/02 15:51:11 $
+#	termcap syntax
+#
+#	Eric S. Raymond		(current maintainer)
+#	John Kunze, Berkeley
+#	Craig Leres, Berkeley
+#
+# Please e-mail changes to terminfo@thyrsus.com; the old termcap@berkeley.edu
+# address is no longer valid.  The latest version can always be found at
+# <http://www.tuxedo.org/terminfo>.
+#
+# PURPOSE OF THIS FILE:
+#
+# This file describes the capabilities of various character-cell terminals,
+# as needed by software such as screen-oriented editors.
+#
+# Other terminfo and termcap files exist, supported by various OS vendors
+# or as relics of various older versions of UNIX.  This one is the longest
+# and most comprehensive one in existence.  It subsumes not only the entirety
+# of the historical 4.4BSD, GNU, System V and SCO termcap files and the BRL
+# termcap file, but also large numbers of vendor-maintained termcap and
+# terminfo entries more complete and carefully tested than those in historical
+# termcap/terminfo versions.
+#
+# Pointers to related resources (including the ncurses distribution) may
+# be found at <http://www.tuxedo.org/terminfo>.
+#
+# INTERNATIONALIZATION:
+#
+# This file uses only the US-ASCII character set (no ISO8859 characters).
+#
+# This file assumes a US-ASCII character set. If you need to fix this, start
+# by global-replacing \E(B and \E)B with the appropriate ISO 6429 enablers
+# for your character set.  \E(A and \E)A enables the British character set
+# with the pound sign at position 2/3.  
+#
+# In a Japanese-processing environment using EUC/Japanese or Shift-JIS,
+# C1 characters are considered the first-byte set of the Japanese encodings,
+# so \E)0 should be avoided in <enacs> and initialization strings.
+#
+# FILE FORMAT:
+#
+# The version you are looking at may be in any of three formats: master
+# (terminfo with OT capabilities), stock terminfo, or termcap.  You can tell
+# which by the format given in the header above.
+#
+# The master format is accepted and generated by the terminfo tools in the
+# ncurses suite; it differs from stock (System V-compatible) terminfo only
+# in that it admits a group of capabilities (prefixed `OT') equivalent to
+# various obsolete termcap capabilities.  You can, thus, convert from master
+# to stock terminfo simply by filtering with `sed "/OT[^,]*,/s///"'; but if
+# you have ncurses `tic -I' is nicer (among other things, it automatically
+# outputs entries in a canonical form).
+#
+# The termcap version is generated automatically from the master version
+# using tic -C.  This filtering leaves in the OT capabilities under their
+# original termcap names.  All translated entries fit within the 1023-byte
+# string-table limit of archaic termcap libraries except where explicitly
+# noted below.  Note that the termcap translation assumes that your termcap
+# library can handle multiple tc capabilities in an entry. 4.4BSD has this
+# capability.  Older versions of GNU termcap, through 1.3, do not. 
+#
+# For details on these formats, see terminfo(5) in the ncurses distribution,
+# and termcap(5) in the 4.4BSD Unix Programmer's Manual.  Be aware that 4.4BSD
+# curses has been declared obsolete by the caretakers of the 4.4BSD sources
+# as of June 1995; they are encouraging everyone to migrate to ncurses.
+#
+# Note: unlike some other distributed terminfo files (Novell Unix & SCO's),
+# no entry in this file has embedded comments.  This is so source translation
+# to termcap only has to carry over leading comments.  Also, no name field
+# contains embedded whitespace (such whitespace confuses rdist).
+#
+# Further note: older versions of this file were often installed with an editor
+# script (reorder) that moved the most common terminal types to the front of
+# the file.  This should no longer be necessary, as the file is now ordered
+# roughly by type frequency with ANSI/VT100 and other common types up front.
+#
+# Some information has been merged in from terminfo files distributed by
+# USL and SCO (see COPYRIGHTS AND OTHER DELUSIONS below).  Much information
+# comes from vendors who maintain official terminfos for their hardware
+# (notably DEC and Wyse).
+#
+# A detailed change history is included at the end of this file.
+#
+# FILE ORGANIZATION:
+#
+# Comments in this file begin with # - they cannot appear in the middle
+# of a terminfo/termcap entry (this feature had to be sacrificed in order
+# to allow standard terminfo and termcap syntax to be generated cleanly from
+# the master format).  Individual capabilities are commented out by
+# placing a period between the colon and the capability name.
+#
+# The file is divided up into major sections (headed by lines beginning with 
+# the string "########") and minor sections (beginning with "####"); do
+#
+#	grep "^####" <file> | more
+#
+# to see a listing of section headings.  The intent of the divisions is
+# (a) to make it easier to find things, and (b) to order the database so
+# that important and frequently-encountered terminal types are near the
+# front (so that you'll get reasonable search efficiency from a linear
+# search of the termcap form even if you don't use reorder).  Minor sections
+# usually correspond to manufacturers or standard terminal classes. 
+# Parenthesized words following manufacturer names are type prefixes or
+# product line names used by that manufacturers.
+#
+# HOW TO READ THE ENTRIES:
+#
+# The first name in an entry is the canonical name for the model or
+# type, last entry is a verbose description.  Others are mnemonic synonyms for
+# the terminal.
+#
+# Terminal names look like <manufacturer> <model> - <modes/options>
+# The part to the left of the dash, if a dash is present, describes the
+# particular hardware of the terminal.  The part to the right may be used
+# for flags indicating special ROMs, extra memory, particular terminal modes,
+# or user preferences.
+#
+# All names should be in lower case, for consistency in typing.
+#
+# The following are conventionally used suffixes:
+#	-2p	Has two pages of memory.  Likewise 4p, 8p, etc.
+#	-am	Enable auto-margin.
+#	-m	Monochrome.  Suppress color support
+#	-mc	Magic-cookie.  Some terminals (notably older Wyses) can
+#		only support one attribute without magic-cookie lossage.
+#		Their base entry is usually paired with another that
+#		uses magic cookies to support multiple attributes.
+#	-nam	No auto-margin - suppress :am: capability
+#	-nl	No labels - suppress soft labels
+#	-ns	No status line - suppress status line
+#	-rv	Terminal in reverse video mode (black on white)
+#	-s	Enable status line.
+#	-vb	Use visible bell (:vb:) rather than :bl:.
+#	-w	Wide - in 132 column mode.
+# If a name has multiple suffixes and one is a line height, that one should 
+# go first.  Thus `aaa-30-s-rv' is recommended over `aaa-s-rv-30'.  
+# 
+# Entries with embedded plus signs are designed to be included through use/tc
+# capabilities, not used as standalone entries. 
+#
+# To avoid search clashes, some older all-numeric names for terminals have
+# been removed (i.e., "33" for the Model 33 Teletype, "2621" for the HP2621).
+# All primary names of terminals now have alphanumeric prefixes.
+#
+# Comments marked "esr" are mostly results of applying the termcap-compiler
+# code packaged with ncurses and contemplating the resulting error messages. 
+# In many cases, these indicated obvious fixes to syntax garbled by the
+# composers.  In a few cases, I was able to deduce corrected forms for garbled
+# capabilities by looking at context.  All the information in the original
+# entries is preserved in the comments.
+#
+# In the comments, terminfo capability names are bracketed with <> (angle
+# brackets).  Termcap capability names are bracketed with :: (colons).
+#
+# INTERPRETATION OF USER CAPABILITIES
+#
+# The System V Release 4 and XPG4 terminfo format defines ten string
+# capabilities for use by applications, <u0>...<u9>.   In this file, we use
+# certain of these capabilities to describe functions which are not covered
+# by terminfo.  The mapping is as follows:
+#
+#	u9	terminal enquire string (equiv. to ANSI/ECMA-48 DA)
+#	u8	terminal answerback description
+#	u7	cursor position request (equiv. to VT100/ANSI/ECMA-48 DSR 6)
+#	u6	cursor position report (equiv. to ANSI/ECMA-48 CPR)
+#
+# The terminal enquire string <u9> should elicit an answerback response
+# from the terminal.  Common values for <u9> will be ^E (on older ASCII
+# terminals) or \E[c (on newer VT100/ANSI/ECMA-48-compatible terminals).
+#
+# The cursor position request (<u7>) string should elicit a cursor position
+# report.  A typical value (for VT100 terminals) is \E[6n.
+#
+# The terminal answerback description (u8) must consist of an expected
+# answerback string.  The string may contain the following scanf(3)-like
+# escapes:
+#
+#	%c	Accept any character
+#	%[...]	Accept any number of characters in the given set
+#
+# The cursor position report (<u6>) string must contain two scanf(3)-style 
+# %d format elements.  The first of these must correspond to the Y coordinate
+# and the second to the %d.  If the string contains the sequence %i, it is
+# taken as an instruction to decrement each value after reading it (this is
+# the inverse sense from the cup string).  The typical CPR value is
+# \E[%i%d;%dR (on VT100/ANSI/ECMA-48-compatible terminals).
+#
+# These capabilities are used by tac(1m), the terminfo action checker
+# (distributed with ncurses 5.0).
+#
+# TABSET FILES
+#
+# All the entries in this file have been edited to assume that the tabset
+# files directory is /usr/share/tabset, in conformance with the File Hierarchy
+# Standard for Linux and open-source BSD systems.  Some vendors (notably Sun)
+# use /usr/lib/tabset or (more recently) /usr/share/lib/tabset.  
+#
+# No curses package we know of actually uses these files.  If their location
+# is an issue, you will have to hand-patch the file locations before compiling
+# this file.
+# 
+# REQUEST FOR CONTACT INFORMATION AND HISTORICAL MATERIAL
+#
+# As the ANSI/ECMA-48 standard and variants take firmer hold, and as
+# character-cell terminals are increasingly replaced by X displays, much of
+# this file is becoming a historical document (this is part of the reason for
+# the new organization, which puts ANSI types, xterm, Unix consoles,
+# and vt100 up front in confidence that this will catch 95% of new hardware).
+#
+# For the terminal types still alive, I'd like to have manufacturer's
+# contact data (Internet address and/or snail-mail + phone).
+#
+# I'm also interested in enriching the comments so that the latter portions of
+# the file do in fact become a potted history of VDT technology as seen by
+# UNIX hackers.  Ideally, I'd like the headers for each manufacturer to
+# include its live/dead/out-of-the-business status, and for as many
+# terminal types as possible to be tagged with information like years
+# of heaviest use, popularity, and interesting features.
+#
+# I'm especially interested in identifying the obscure entries listed under
+# `Miscellaneous obsolete terminals, manufacturers unknown' before the tribal
+# wisdom about them gets lost.  If you know a lot about obscure old terminals,
+# please go to the terminfo resource page, grab the UFO file (ufo.ti), and 
+# eyeball it for things you can identify and describe. 
+#
+# If you have been around long enough to contribute, please read the file
+# with this in mind and send me your annotations.
+#
+# COPYRIGHTS AND OTHER DELUSIONS
+#
+# The BSD ancestor of this file had a standard Regents of the University of
+# California copyright with dates from 1980 to 1993.
+#
+# Some information has been merged in from a terminfo file SCO distributes.
+# It has an obnoxious boilerplate copyright which I'm ignoring because they 
+# took so much of the content from the ancestral BSD versions of this file
+# and didn't attribute it, thereby violating the BSD Regents' copyright.
+#
+# Not that anyone should care.  However many valid functions copyrights may
+# serve, putting one on a termcap/terminfo file with hundreds of anonymous
+# contributors makes about as much sense as copyrighting a wall-full of
+# graffiti -- it's legally dubious, ethically bogus, and patently ridiculous.
+#
+# This file deliberately has no copyright.  It belongs to no one and everyone.
+# If you claim you own it, you will merely succeed in looking like a fool. 
+# Use it as you like.  Use it at your own risk.  Copy and redistribute freely.
+# There are no guarantees anywhere.  Svaha!
+#
+
+######## ANSI, UNIX CONSOLE, AND SPECIAL TYPES
+#
+# This section describes terminal classes and brands that are still
+# quite common.
+#
+
+#### Specials
+#
+# Special "terminals".  These are used to label tty lines when you don't
+# know what kind of terminal is on it.  The characteristics of an unknown
+# terminal are the lowest common denominator - they look about like a ti 700.
+#
+
+dumb|80-column dumb tty:\
+	:am:\
+	:co#80:\
+	:bl=^G:cr=^M:do=^J:sf=^J:
+unknown|unknown terminal type:\
+	:gn:tc=dumb:
+lpr|printer|line printer:\
+	:bs:hc:os:\
+	:co#132:li#66:\
+	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
+glasstty|classic glass tty interpreting ASCII control characters:\
+	:am:bs:\
+	:co#80:\
+	:bl=^G:cl=^L:cr=^M:do=^J:kd=^J:kl=^H:le=^H:nw=^M^J:ta=^I:
+vanilla:\
+	:bs:\
+	:bl=^G:cr=^M:do=^J:sf=^J:
+
+#### ANSI.SYS/ISO 6429/ECMA-48 Capabilities
+#
+# See the end-of-file comment for more on these.
+#
+
+# ANSI capabilities are broken up into pieces, so that a terminal
+# implementing some ANSI subset can use many of them.
+ansi+local1:\
+	:do=\E[B:le=\E[D:nd=\E[C:up=\E[A:
+ansi+local:\
+	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:tc=ansi+local1:
+ansi+tabs:\
+	:bt=\E[Z:ct=\E[2g:st=\EH:ta=^I:
+ansi+inittabs:\
+	:it#8:tc=ansi+tabs:
+ansi+erase:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:
+ansi+rca:\
+	:ch=\E[%+^AG:cv=\E[%+^Ad:
+ansi+cup:\
+	:cm=\E[%i%d;%dH:ho=\E[H:
+ansi+rep:\
+	:..rp=%p1%c\E[%p2%{1}%-%db:
+ansi+idl1:\
+	:al=\E[L:dl=\E[M:
+ansi+idl:\
+	:AL=\E[%dL:DL=\E[%dM:tc=ansi+idl1:
+ansi+idc:\
+	:IC=\E[%d@:dc=\E[P:ei=\E6:ic=\E[@:im=\E6:
+ansi+arrows:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:
+ansi+sgr|ansi graphic renditions:\
+	:mb=\E[5m:me=\E[0m:mk=\E[8m:mr=\E[7m:
+ansi+sgrso|ansi standout only:\
+	:se=\E[m:so=\E[7m:
+ansi+sgrul|ansi underline only:\
+	:ue=\E[m:us=\E[4m:
+ansi+sgrbold|ansi graphic renditions; assuming terminal has bold; not dim:\
+	:md=\E[1m:\
+	:..sa=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m:tc=ansi+sgr:tc=ansi+sgrso:tc=ansi+sgrul:
+ansi+sgrdim|ansi graphic renditions; assuming terminal has dim; not bold:\
+	:mh=\E[2m:\
+	:..sa=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p5%t2;%;m:tc=ansi+sgr:tc=ansi+sgrso:tc=ansi+sgrul:
+ansi+pp|ansi printer port:\
+	:pf=\E[4i:po=\E[5i:ps=\E[0i:
+ansi+csr|ansi scroll-region plus cursor save & restore:\
+	:cs=\E[%i%d;%dr:rc=\E8:sc=\E7:
+
+# The IBM PC alternate character set.  Plug this into any Intel console entry.
+# We use \E[11m for rmacs rather than \E[12m so the <acsc> string can use the
+# ROM graphics for control characters such as the diamond, up- and down-arrow.
+# This works with the System V, Linux, and BSDI consoles.  It's a safe bet this
+# will work with any Intel console, they all seem to have inherited \E[11m
+# from the ANSI.SYS de-facto standard.
+klone+acs|alternate character set for ansi.sys displays:\
+	:ac=+\020\054\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376:\
+	:ae=\E[10m:as=\E[11m:
+
+# Highlight controls corresponding to the ANSI.SYS standard.  Most 
+# console drivers for Intel boxes obey these.  Makes the same assumption
+# about \E[11m as klone+acs.  True ANSI/ECMA-48 would have :se=\E[27m:,
+# :ue=\E[24m:, but this isn't a documented feature of ANSI.SYS.
+klone+sgr|attribute control for ansi.sys displays:\
+	:S2=\E[11m:S3=\E[10m:mb=\E[5m:md=\E[1m:me=\E[0;10m:\
+	:mk=\E[8m:mr=\E[7m:\
+	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m:\
+	:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:\
+	:tc=klone+acs:
+
+# Highlight controls corresponding to the ANSI.SYS standard.  *All*
+# console drivers for Intel boxes obey these.  Does not assume \E[11m will
+# work; uses \E[12m instead, which is pretty bulletproof but loses you the ACS
+# diamond and arrow characters under curses.
+klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m):\
+	:as=\E[12m:mb=\E[5m:md=\E[1m:me=\E[0;10m:mk=\E[8m:\
+	:mr=\E[7m:\
+	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m:\
+	:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:\
+	:tc=klone+acs:
+
+# KOI8-R (RFC1489) acs (alternate character set)
+# From: Qing Long <qinglong@Bolizm.ihep.su>, 24 Feb 1996.
+klone+koi8acs|alternate character set for ansi.sys displays with KOI8 charset:\
+	:ac=+\020\054\021-\036.^_0\215`\004a\237f\234g\232h\222i\220j\205k\203l\202m\204n\212o\213p\216q\0r\217s\214t\206u\207v\210w\211x\201y\230z\231{\267|\274}L~\225:\
+	:ae=\E[10m:as=\E[11m:
+
+# ANSI.SYS color control.  The setab/setaf caps depend on the coincidence
+# between SVr4/XPG4's color numbers and ANSI.SYS attributes.  Here are longer
+# but equivalent strings that don't rely on that coincidence:
+# setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+# setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+# The DOS 5 manual asserts that these sequences meet the ISO 6429 standard.
+# They match a subset of ECMA-48.
+klone+color|color control for ansi.sys and ISO6429-compatible displays:\
+	:Co#8:NC#3:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:op=\E[37;40m:
+
+# This is better than klone+color, it doesn't assume white-on-black as the
+# default color pair,  but many `ANSI' terminals don't grok the <op> cap.
+ecma+color|color control for ECMA-48-compatible terminals:\
+	:Co#8:NC#3:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:op=\E[39;49m:
+
+# Attribute control for ECMA-48-compatible terminals
+ecma+sgr|attribute capabilities for true ECMA-48 terminals:\
+	:se=\E[27m:ue=\E[24m:\
+	:tc=klone+sgr:
+
+# For comparison, here are all the capabilities implied by the Intel
+# Binary Compatibility Standard (level 2) that fit within terminfo.
+# For more detail on this rather pathetic standard, see the comments
+# near the end of this file.
+ibcs2|Intel Binary Compatibility Standard prescriptions:\
+	:AL=\E[%dL:DC=\E[%dP:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
+	:RA=\E[?7l:RI=\E[%dC:S1=\E=%p1%dg:SA=\E[?7h:SF=\E[%dS:\
+	:SR=\E[%dT:UP=\E[%dA:bt=\E[Z:ch=\E[%i%dG:cl=\Ec:\
+	:cm=\E[%i%d;%dH:ct=\E[g:cv=\E[%i%dd:ec=\E[%dX:ei=:im=:\
+	:rc=\E7:sc=\E7:st=\EH:
+
+#### ANSI/ECMA-48 terminals and terminal emulators
+#
+# See near the end of this file for details on ANSI conformance.
+# Don't mess with these entries!  Lots of other entries depend on them!
+#
+# This section lists entries in a least-capable to most-capable order.
+# if you're in doubt about what `ANSI' matches yours, try them in that
+# order and back off from the first that breaks.
+
+# ansi-mr is for ANSI terminals with ONLY relative cursor addressing
+# and more than one page of memory.  It uses local motions instead of
+# direct cursor addressing, and makes almost no assumptions. It does
+# assume auto margins, no padding and/or xon/xoff, and a 24x80 screen.
+ansi-mr|mem rel cup ansi:\
+	:am:xo:\
+	:co#80:li#24:tc=vanilla:tc=ansi+erase:tc=ansi+local1:
+
+# ansi-mini is a bare minimum ANSI terminal. This should work on anything, but 
+# beware of screen size problems and memory relative cursor addressing.
+ansi-mini|minimum ansi standard terminal:\
+	:am:xo:\
+	:co#80:li#24:tc=vanilla:tc=ansi+cup:tc=ansi+erase:
+
+# ansi-mtabs adds relative addressing and minimal tab support 
+ansi-mtabs|any ansi terminal with pessimistic assumptions:\
+	:it#8:\
+	:ta=^I:tc=ansi+local1:tc=ansi-mini:
+
+# ANSI X3.64 from emory!mlhhh (Hugh Hansard) via BRL
+#
+# The following is an entry for the full ANSI 3.64 (1977).  It lacks
+# padding, but most terminals using the standard are "fast" enough
+# not to require any -- even at 9600 bps.  If you encounter problems,
+# try including the padding specifications.
+#
+# Note: the :as: and :ae: specifications are not implemented here, for
+# the available termcap documentation does not make clear WHICH alternate
+# character set to specify.  ANSI 3.64 seems to make allowances for several.
+# Please make the appropriate adjustments to fit your needs -- that is
+# if you will be using alternate character sets.
+#
+# There are very few terminals running the full ANSI 3.64 standard,
+# so I could only test this entry on one verified terminal (Visual 102).
+# I would appreciate the results on other terminals sent to me.
+#
+# Please report comments, changes, and problems to:
+#
+# U.S. MAIL:   Hugh Hansard
+#              Box: 22830
+#              Emory University
+#              Atlanta, GA. 30322.
+#
+# USENET {akgua,msdc,sb1,sb6,gatech}!emory!mlhhh.
+#
+# (Added vt100 :rc:,:sc: to quiet a tic warning --esr)
+ansi77|ansi 3.64 standard 1977 version:\
+	:am:bs:mi:\
+	:co#80:it#8:li#24:\
+	:al=5*\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=5*\E[M:\
+	:do=\E[B:ei=\E[4l:ho=\E[H:im=\E[4h:k1=\EOP:k2=\EOR:k4=\EOS:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:nd=\E[C:nw=^M\ED:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:\
+	:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+
+# Procomm and some other ANSI emulations don't recognize all of the ANSI-
+# standard capabilities.  This entry deletes :UP:, :RI:, :DO:, :LE:, and 
+# <vpa>/<hpa> capabilities, forcing curses to use repetitions of :up:, 
+# :nd:, :do: and :le:.  Also deleted :IC: and :ic:, as QModem up to 
+# 5.03 doesn't recognize these.  Finally, we delete :rp: and :sr:, which seem
+# to confuse many emulators.  On the other hand, we can count on these programs
+# doing :ae:/:as:/:sa:. Older versions of this entry featured 
+# <invis=\E[9m>, but <invis=\E[8m> now seems to be more common under
+# ANSI.SYS influence.
+# From: Eric S. Raymond <esr@snark.thyrsus.com> Oct 30 1995
+pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ansi (mono mode):\
+	:am:bs:mi:ms:\
+	:co#80:it#8:li#24:\
+	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:dc=\E[P:dl=\E[M:do=\E[B:\
+	:ho=\E[H:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=\E[D:nd=\E[C:sf=^J:st=\EH:ta=^I:up=\E[A:\
+	:tc=klone+sgr-dumb:
+pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode):\
+	:li#25:tc=pcansi-m:
+pcansi-33-m|pcansi33m|ibm-pc terminal programs with 33 lines (mono mode):\
+	:li#33:tc=pcansi-m:
+pcansi-43-m|ansi43m|ibm-pc terminal programs with 43 lines (mono mode):\
+	:li#43:tc=pcansi-m:
+# The color versions.  All PC emulators do color...
+pcansi|ibm-pc terminal programs claiming to be ansi:\
+	:tc=klone+color:tc=pcansi-m:
+pcansi-25|pcansi25|ibm-pc terminal programs with 25 lines:\
+	:li#25:tc=pcansi:
+pcansi-33|pcansi33|ibm-pc terminal programs with 33 lines:\
+	:li#33:tc=pcansi:
+pcansi-43|pcansi43|ibm-pc terminal programs with 43 lines:\
+	:li#43:tc=pcansi:
+
+# ansi-m -- full ANSI X3.64 with ANSI.SYS-compatible attributes, no color.
+# If you want pound signs rather than dollars, replace `B' with `A'
+# in the <s0ds>, <s1ds>, <s2ds>, and <s3ds> capabilities.
+# From: Eric S. Raymond <esr@snark.thyrsus.com> Nov 6 1995
+ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes:\
+	:5i:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:cb=\E[1K:ch=\E[%i%dG:ct=\E[2g:cv=\E[%i%dd:ec=\E[%dX:ei=:\
+	:im=:kB=\E[Z:kI=\E[L:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:nw=\r\E[S:pf=\E[4i:po=\E[5i:..rp=%p1%c\E[%p2%{1}%-%db:\
+	:s0=\E(B:s1=\E)B:s2=\E*B:s3=\E+B:ta=\E[I:\
+	:tc=pcansi-m:
+
+# ansi -- this terminfo expresses the largest subset of X3.64 that will fit in
+# standard terminfo.  Assumes ANSI.SYS-compatible attributes and color.
+# From: Eric S. Raymond <esr@snark.thyrsus.com> Nov 6 1995
+ansi|ansi/pc-term compatible with color:\
+	:u6=\E[%i%d;%dR:u7=\E[6n:..u8=\E[?%[;0123456789]c:\
+	:u9=\E[c:\
+	:tc=ecma+color:tc=klone+sgr:tc=ansi-m:
+
+# ansi-generic is a vanilla ANSI terminal. This is assumed to implement 
+# all the normal ANSI stuff with no extensions. It assumes 
+# insert/delete line/char is there, so it won't work with 
+# vt100 clones. It assumes video attributes for bold, blink, 
+# underline, and reverse, which won't matter much if the terminal 
+# can't do some of those. Padding is assumed to be zero, which 
+# shouldn't hurt since xon/xoff is assumed.
+ansi-generic|generic ansi standard terminal:\
+	:am:xo:\
+	:co#80:li#24:tc=vanilla:tc=ansi+csr:tc=ansi+cup:\
+	:tc=ansi+rca:tc=ansi+erase:tc=ansi+tabs:tc=ansi+local:\
+	:tc=ansi+idc:tc=ansi+idl:tc=ansi+rep:tc=ansi+sgrbold:\
+	:tc=ansi+arrows:
+
+#### Linux consoles
+#
+
+# This entry is good for the 1.2.13 or later version of the Linux console.
+#
+# ***************************************************************************
+# *                                                                         *
+# *                           WARNING:                                      *
+# * Linuxes come with a default keyboard mapping kcbt=^I.  This entry, in   *
+# * response to user requests, assumes kcbt=\E[Z, the ANSI/ECMA reverse-tab *
+# * character. Here are the keymap replacement lines that will set this up: *
+# *                                                                         *
+#	keycode  15 = Tab             Tab
+#		alt     keycode  15 = Meta_Tab
+#		shift	keycode  15 = F26
+#	string F26 ="\033[Z"
+# *                                                                         *
+# * This has to use a key slot which is unfortunate (any unused one will    *
+# * do, F26 is the higher-numbered one).  The change ought to be built      *
+# * into the kernel tables.                                                 *
+# *                                                                         *
+# ***************************************************************************
+#
+# The 1.3.x kernels add color-change capabilities; if yours doesn't have this
+# and it matters, turn off <ccc>.  The %02x escape used to implement this is
+# not back-portable to SV curses and not supported in ncurses versions before
+# 1.9.9. All linux kernels since 1.2.13 (at least) set the screen size
+# themselves; this entry assumes that capability.
+#
+# This entry is good for the 1.2.13 or later version of the Linux console.
+#
+# ***************************************************************************
+# *                                                                         *
+# *                           WARNING:                                      *
+# * Linuxes come with a default keyboard mapping kcbt=^I.  This entry, in   *
+# * response to user requests, assumes kcbt=\E[Z, the ANSI/ECMA reverse-tab *
+# * character. Here are the keymap replacement lines that will set this up: *
+# *                                                                         *
+#	keycode  15 = Tab             Tab
+#		alt     keycode  15 = Meta_Tab
+#		shift	keycode  15 = F26
+#	string F26 ="\033[Z"
+# *                                                                         *
+# * This has to use a key slot which is unfortunate (any unused one will    *
+# * do, F26 is the higher-numbered one).  The change ought to be built      *
+# * into the kernel tables.                                                 *
+# *                                                                         *
+# ***************************************************************************
+#
+# The 1.3.x kernels add color-change capabilities; if yours doesn't have this
+# and it matters, turn off <ccc>.  The %02x escape used to implement this is
+# not back-portable to SV curses and not supported in ncurses versions before
+# 1.9.9. All linux kernels since 1.2.13 (at least) set the screen size
+# themselves; this entry assumes that capability.
+#
+# The 2.2.x kernels add a private mode that sets the cursor type; use that to
+# get a block cursor for cvvis.
+# reported by Frank Heckenbach <frank@g-n-u.de>.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+linux|linux console:\
+	:am:eo:mi:ms:xn:xo:\
+	:it#8:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:K2=\E[G:al=\E[L:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
+	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:k1=\E[[A:k2=\E[[B:\
+	:k3=\E[[C:k4=\E[[D:k5=\E[[E:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
+	:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:\
+	:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:se=\E[27m:sf=^J:\
+	:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=200\E[?5h\E[?5l:ve=\E[?25h\E[?0c:vi=\E[?25l\E[?1c:\
+	:vs=\E[?25h\E[?8c:\
+	:tc=klone+sgr:tc=ecma+color:
+linux-m|Linux console no color:\
+	:Co@:pa@:\
+	:AB@:AF@:Sb@:Sf@:tc=linux:
+linux-c-nc|linux console 1.3.x hack for ncurses only:\
+	:cc:\
+	:..Ic=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x:\
+	:oc=\E]R:\
+	:tc=linux:
+# From: Dennis Henriksen <opus@osrl.dk>, 9 July 1996
+linux-c|linux console 1.3.6+ with private palette for each virtual console:\
+	:cc:\
+	:Co#8:pa#64:\
+	:..Ic=\E]P%?%p1%{9}%>%t%p1%{10}%-%'a'%+%c%e%p1%d%;%p2%{255}%&%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%p3%{255}%&%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%p4%{255}%&%Pr%gr%{16}%/%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;%gr%{15}%&%Px%?%gx%{9}%>%t%gx%{10}%-%'A'%+%c%e%gx%d%;:\
+	:oc=\E]R:\
+	:tc=linux:
+
+# See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
+linux-nic|linux with ich/ich1 suppressed for non-curses programs:\
+	:IC@:ei=:ic@:im=:\
+	:tc=linux:
+
+# This assumes you have used setfont(8) to load one of the Linux koi8-r fonts.
+# acsc entry from Pavel Roskin" <pavel@absolute.spb.su>, 29 Sep 1997.
+linux-koi8|linux with koi8 alternate character set:\
+	:ac=+\020\054\021-\030.^Y0\215`\004a\221f\234g\237h\220i\276j\205k\203l\202m\204n\212o~p\0q\0r\0s_t\206u\207v\211w\210x\201y\230z\231{\267|\274~\224:tc=linux:\
+	:tc=klone+koi8acs:
+
+# Another entry for KOI8-r with Qing Long's acsc.
+# (which one better complies with the standard?)
+linux-koi8r|linux with koi8-r alternate character set:\
+	:tc=linux:tc=klone+koi8acs:
+
+# Entry for the latin1 and latin2 fonts
+linux-lat|linux with latin1 or latin2 alternate character set:\
+	:ac=+\020\054\021-\030.^Y0\333`\004a\013f\370g\361h\260i\316j\211k\214l\206m\203n\305o~p\304q\212r\304s_t\207u\215v\301w\302x\205y\363z\362{\343|\330}\234~\376:\
+	:tc=linux:
+
+#### NetBSD consoles
+#
+# pcvt termcap database entries (corresponding to release 3.31)
+# Author's last edit-date: [Fri Sep 15 20:29:10 1995]
+#
+# (For the terminfo master file, I translated these into terminfo syntax.
+# Then I dropped all the pseudo-HP entries. we don't want and can't use
+# the :Xs: flag. Then I split :is: into a size-independent :i1: and a
+# size-dependent :is:.  Finally, I added <rmam>/<smam> -- esr)
+
+# NOTE: :ic: has been taken out of this entry. for reference, it should
+# be <ich1=\E[@>.  For discussion, see ICH/ICH1 VERSUS RMIR/SMIR below.
+# (esr: added :vi: and :ve: to resolve NetBSD Problem Report #4583)
+pcvtXX|pcvt vt200 emulator (DEC VT220):\
+	:am:km:mi:ms:xn:\
+	:it#8:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:SF=\E[%dS:\
+	:SR=\E[%dT:UP=\E[%dA:\
+	:ac=++\054\054--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz~~:\
+	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:i1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:im=\E[4h:\
+	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
+	:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=\177:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:r1=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:rf=/usr/share/tabset/vt100:sc=\E7:se=\E[27m:sf=\ED:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:ve=\E[?25h:vi=\E[?25l:
+
+#	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
+#	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
+#	50 lines entries; 80 columns
+pcvt25|dec vt220 emulation with 25 lines:\
+	:co#80:li#25:\
+	:is=\E[1;25r\E[25;1H:tc=pcvtXX:
+pcvt28|dec vt220 emulation with 28 lines:\
+	:co#80:li#28:\
+	:is=\E[1;28r\E[28;1H:tc=pcvtXX:
+pcvt35|dec vt220 emulation with 35 lines:\
+	:co#80:li#35:\
+	:is=\E[1;35r\E[35;1H:tc=pcvtXX:
+pcvt40|dec vt220 emulation with 40 lines:\
+	:co#80:li#40:\
+	:is=\E[1;40r\E[40;1H:tc=pcvtXX:
+pcvt43|dec vt220 emulation with 43 lines:\
+	:co#80:li#43:\
+	:is=\E[1;43r\E[43;1H:tc=pcvtXX:
+pcvt50|dec vt220 emulation with 50 lines:\
+	:co#80:li#50:\
+	:is=\E[1;50r\E[50;1H:tc=pcvtXX:
+
+#	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
+#	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
+#	50 lines entries; 132 columns
+pcvt25w|dec vt220 emulation with 25 lines and 132 cols:\
+	:co#132:li#25:\
+	:is=\E[1;25r\E[25;1H:tc=pcvtXX:
+pcvt28w|dec vt220 emulation with 28 lines and 132 cols:\
+	:co#132:li#28:\
+	:is=\E[1;28r\E[28;1H:tc=pcvtXX:
+pcvt35w|dec vt220 emulation with 35 lines and 132 cols:\
+	:co#132:li#35:\
+	:is=\E[1;35r\E[35;1H:tc=pcvtXX:
+pcvt40w|dec vt220 emulation with 40 lines and 132 cols:\
+	:co#132:li#40:\
+	:is=\E[1;40r\E[40;1H:tc=pcvtXX:
+pcvt43w|dec vt220 emulation with 43 lines and 132 cols:\
+	:co#132:li#43:\
+	:is=\E[1;43r\E[43;1H:tc=pcvtXX:
+pcvt50w|dec vt220 emulation with 50 lines and 132 cols:\
+	:co#132:li#50:\
+	:is=\E[1;50r\E[50;1H:tc=pcvtXX:
+
+# Terminfo entries to enable the use of the ncurses library in colour on a
+# NetBSD-arm32 console (only tested on a RiscPC).
+# Created by Dave Millen <dmill@globalnet.co.uk> 22.07.98
+# modified codes for setf/setb to setaf/setab, then to klone+color, corrected
+# typo in invis - TD
+arm100|arm100-am|Arm(RiscPC) ncurses compatible (for 640x480):\
+	:am:ms:ut:xn:xo:\
+	:co#80:it#8:li#30:\
+	:@8=\E[M:DO=\E[%dB:K1=\E[q:K2=\E[r:K3=\E[s:K4=\E[p:K5=\E[n:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:\
+	:eA=\E(B\E)0:ho=\E[H:k0=\E[y:k1=\E[P:k2=\E[Q:k3=\E[R:\
+	:k4=\E[S:k5=\E[t:k6=\E[u:k7=\E[v:k8=\E[l:k9=\E[w:k;=\E[x:\
+	:kb=^H:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kr=\E[C:ks=\E[?1h\E=:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mk=\E[8m:\
+	:mr=\E[6m:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:rc=\E8:\
+	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:\
+	:tc=ecma+sgr:tc=klone+color:
+arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768):\
+	:co#132:li#50:tc=arm100:
+
+# NetBSD/x68k console vt200 emulator. This port runs on a 68K machine
+# manufactured by Sharp for the Japenese market.
+# From Minoura Makoto <minoura@netlaputa.or.jp>, 12 May 1996
+x68k|x68k-ite|NetBSD/x68k ITE:\
+	:co#96:li#32:\
+	:%1=\E[28~:kC=\E[9~:tc=vt220:
+
+# <tv@pobox.com>:
+# Entry for the DNARD OpenFirmware console, close to ANSI but not quite.
+#
+# (still unfinished, but good enough so far.)
+ofcons:\
+	:bw:\
+	:co#80:li#30:\
+	:AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:\
+	:LE=\233%dD:RI=\233%dC:UP=\233%dA:al=\233L:bl=^G:cd=\233J:\
+	:ce=\233K:cl=^L:cm=\233%i%d;%dH:cr=^M:dc=\233P:dl=\233M:\
+	:do=\233B:ei=:ic=\233@:im=:k1=\2330P:k2=\2330Q:k3=\2330W:\
+	:k4=\2330x:k5=\2330t:k6=\2330u:k7=\2330q:k8=\2330r:\
+	:k9=\2330p:k;=\2330M:kD=\233P:kN=\233/:kP=\233?:kb=^H:\
+	:kd=\233B:kl=\233D:kr=\233C:ku=\233A:le=\233D:mb=\2337;2m:\
+	:md=\2331m:me=\2330m:mh=\2332m:mk=\2338m:mr=\2337m:\
+	:nd=\233C:nw=^M^J:se=\2330m:sf=^J:ta=^I:ue=\2330m:up=\233A:\
+	:vb=^G:
+
+# NetBSD "wscons" emulator in vt220 mode
+# These are micro-minimal and probably need to be redone for real
+# after the manner of the pcvt entries.
+wsvt25|NetBSD wscons in 25 line DEC VT220 mode:\
+	:co#80:li#25:tc=vt220:
+
+wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta:\
+	:km:\
+	:co#80:li#25:tc=vt220:
+
+# `rasterconsole' provided by 4.4BSD, NetBSD and OpenBSD on SPARC, and 
+# DECstation/pmax.
+rcons|BSD rasterconsole:\
+	:tc=sun-il:
+# Color version of above. Color currenly only provided by NetBSD.
+rcons-color|BSD rasterconsole with ANSI color:\
+	:ut:\
+	:Co#8:pa#64:\
+	:AB=\E[4%dm:AF=\E[3%dm:op=\E[m:tc=rcons:
+
+#### FreeBSD console entries
+#
+# From: Andrey Chernov <ache@astral.msk.su> 29 Mar 1996
+# Andrey Chernov maintains the FreeBSD termcap distributions.
+#
+# Note: Users of FreeBSD 2.1.0 and older versions must either upgrade
+# or comment out the :cb: capability in the console entry.
+#
+# Alexander Lukyanov reports:
+# I have seen FreeBSD-2.1.5R... The old el1 bug changed, but it is still there.
+# Now el1 clears not only to the line beginning, but also a large chunk
+# of previous line. But there is another bug - ech does not work at all.
+#
+
+# for syscons
+# common entry without semigraphics
+# Bug: The <op> capability resets attributes.
+# Bug? The ech and el1 attributes appear to move the cursor in some cases; for
+# instance el1 does if the cursor is moved to the right margin first.  Removed
+# by T.Dickey 97/5/3 (ech=\E[%p1%dX, el1=\E[1K)
+#
+# Setting colors turns off reverse; we cannot guarantee order, so use ncv.
+# Note that this disables standout with color.
+cons25w|ansiw|ansi80x25-raw|freebsd console (25-line raw mode):\
+	:NP:am:bw:eo:ms:ut:\
+	:Co#8:NC#21:co#80:it#8:li#25:pa#64:\
+	:@7=\E[F:AB=\E[4%p1%dm:AF=\E[3%p1%dm:AL=\E[%dL:DC=\E[%dP:\
+	:DL=\E[%dM:DO=\E[%dB:F1=\E[W:F2=\E[X:IC=\E[%d@:K2=\E[E:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%d`:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cv=\E[%i%dd:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k1=\E[M:k2=\E[N:\
+	:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:\
+	:k;=\E[V:kB=\E[Z:kD=\177:kI=\E[L:kN=\E[G:kP=\E[I:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mh=\E[30;1m:mr=\E[7m:nd=\E[C:nw=\E[E:\
+	:op=\E[x:r1=\E[x\E[m\Ec:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:\
+	:ta=^I:up=\E[A:ve=\E[=0C:vs=\E[=1C:
+cons25|ansis|ansi80x25|freebsd console (25-line ansi mode):\
+	:ac=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263y\363z\362~\371:\
+	:tc=cons25w:
+cons25-m|ansis-mono|ansi80x25-mono|freebsd console (25-line mono ansi mode):\
+	:Co@:pa@:\
+	:AB@:AF@:md@:mh@:op@:ue=\E[m:us=\E[4m:tc=cons25:
+cons30|ansi80x30|freebsd console (30-line ansi mode):\
+	:li#30:tc=cons25:
+cons30-m|ansi80x30-mono|freebsd console (30-line mono ansi mode):\
+	:li#30:tc=cons25-m:
+cons43|ansi80x43|freebsd console (43-line ansi mode):\
+	:li#43:tc=cons25:
+cons43-m|ansi80x43-mono|freebsd console (43-line mono ansi mode):\
+	:li#43:tc=cons25-m:
+cons50|ansil|ansi80x50|freebsd console (50-line ansi mode):\
+	:li#50:tc=cons25:
+cons50-m|ansil-mono|ansi80x50-mono|freebsd console (50-line mono ansi mode):\
+	:li#50:tc=cons25-m:
+cons60|ansi80x60|freebsd console (60-line ansi mode):\
+	:li#60:tc=cons25:
+cons60-m|ansi80x60-mono|freebsd console (60-line mono ansi mode):\
+	:li#60:tc=cons25-m:
+cons25r|pc3r|ibmpc3r|cons25-koi8-r|freebsd console w/koi8-r cyrillic:\
+	:ac=-\030.^Y0\215`\004a\220f\234h\221i\025j\205k\203l\202m\204n\212q\0t\206u\207v\211w\210x\201y\230z\231~\225:\
+	:tc=cons25w:
+cons25r-m|pc3r-m|ibmpc3r-mono|cons25-koi8r-m|freebsd console w/koi8-r cyrillic (mono):\
+	:Co@:pa@:\
+	:AB@:AF@:op@:ue=\E[m:us=\E[4m:tc=cons25r:
+cons50r|cons50-koi8r|freebsd console w/koi8-r cyrillic (50 lines):\
+	:li#50:tc=cons25r:
+cons50r-m|cons50-koi8r-m|freebsd console w/koi8-r cyrillic (50-line mono):\
+	:li#50:tc=cons25r-m:
+cons60r|cons60-koi8r|freebsd console w/koi8-r cyrillic (60 lines):\
+	:li#60:tc=cons25r:
+cons60r-m|cons60-koi8r-m|freebsd console w/koi8-r cyrillic (60-line mono):\
+	:li#60:tc=cons25r-m:
+# ISO 8859-1 FreeBSD console
+cons25l1|cons25-iso8859|freebsd console w/iso 8859-1 chars:\
+	:ac=+\253\054\273-\030.\031`\201a\202f\207g\210i\247j\213k\214l\215m\216n\217o\220p\221q\222r\223s\224t\225u\226v\227w\230x\231y\232z\233~\237:\
+	:tc=cons25w:
+cons25l1-m|cons25-iso-m|freebsd console w/iso 8859-1 chars (mono):\
+	:Co@:pa@:\
+	:AB@:AF@:md@:mh@:op@:ue=\E[m:us=\E[4m:tc=cons25l1:
+cons50l1|cons50-iso8859|freebsd console w/iso 8859-1 chars (50 lines):\
+	:li#50:tc=cons25l1:
+cons50l1-m|cons50-iso-m|freebsd console w/iso 8859-1 chars (50-line mono):\
+	:li#50:tc=cons25l1-m:
+cons60l1|cons60-iso|freebsd console w/iso 8859-1 chars (60 lines):\
+	:li#60:tc=cons25l1:
+cons60l1-m|cons60-iso-m|freebsd console w/iso 8859-1 chars (60-line mono):\
+	:li#60:tc=cons25l1-m:
+
+#### 386BSD and BSD/OS Consoles
+#
+
+# This was the original 386BSD console entry (I think).  
+# Some places it's named oldpc3|oldibmpc3.
+# From: Alex R.N. Wetmore <aw2t@andrew.cmu.edu>
+origpc3|origibmpc3|IBM PC 386BSD Console:\
+	:am:bw:eo:xo:\
+	:co#80:li#25:\
+	:ac=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263:\
+	:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:ho=\E[H:\
+	:kd=\E[B:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:md=\E[7m:\
+	:me=\E[m\E[1;0x\E[2;7x:nd=\E[C:se=\E[1;0x\E[2;7x:\
+	:sf=\E[S:so=\E[1;7x\E[2;0x:sr=\E[T:ue=\E[1;0x\E[2;7x:\
+	:up=\E[A:us=\E[1;7x\E[2;0x:
+
+# description of BSD/386 console emulator in version 1.0 (supplied by BSDI)
+oldpc3|oldibmpc3|old IBM PC BSD/386 Console:\
+	:km:\
+	:li#25:\
+	:al=\E[L:bl=^G:cr=^M:dl=\E[M:do=^J:kH=\E[F:kI=\E[L:kN=\E[G:\
+	:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:md=\E[=15F:me=\E[=R:mh=\E[=8F:nw=^M^J:sf=^J:ta=^I:
+
+# Description of BSD/OS console emulator in version 1.1, 2.0, 2.1
+# Note, the emulator supports many of the additional console features
+# listed in the iBCS2 (e.g. character-set selection) though not all
+# are described here.  This entry really ought to be upgraded.
+# Also note, the console will also work with fewer lines after doing
+# "stty rows NN", e.g. to use 24 lines.
+# (Color support from Kevin Rosenberg <kevin@cyberport.com>, 2 May 1996) 
+# Bug: The <op> capability resets attributes.
+bsdos-pc-nobold|BSD/OS PC console w/o bold:\
+	:am:eo:km:xo:\
+	:co#80:it#8:li#25:\
+	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
+	:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\Ec:\
+	:cm=\E[%i%d;%dH:cr=^M:dl=\E[M:do=^J:ho=\E[H:kH=\E[F:\
+	:kI=\E[L:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:nw=^M^J:rc=\E8:\
+	:..sa=\E[0;10%?%p1%t;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m%?%p5%t\E[=8F%;:\
+	:sc=\E7:sf=^J:ta=^I:up=\E[A:\
+	:tc=klone+sgr:tc=klone+color:
+bsdos-pc|IBM PC BSD/OS Console:\
+	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;1%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m:tc=bsdos-pc-nobold:
+
+# Old names for BSD/OS PC console used in releases before 4.1. 
+pc3|BSD/OS on the PC Console:\
+	:tc=bsdos-pc-nobold:
+ibmpc3|pc3-bold|BSD/OS on the PC Console with bold instead of underline:\
+	:tc=bsdos-pc:
+ 
+# BSD/OS on the SPARC 
+bsdos-sparc|Sun SPARC BSD/OS Console:\
+	:tc=sun:
+	 
+# BSD/OS on the PowerPC 
+bsdos-ppc|PowerPC BSD/OS Console:\
+	:tc=bsdos-pc:
+
+#### DEC VT100 and compatibles
+#
+# DEC terminals from the vt100 forward are collected here. Older DEC terminals
+# and micro consoles can be found in the `obsolete' section.  More details on
+# the relationship between the VT100 and ANSI X3.64/ISO 6429/ECMA-48 may be
+# found near the end of this file.
+#
+# Except where noted, these entries are DEC's official terminfos.
+# Contact Bill Hedberg <hedberg@hannah.enet.dec.com> of Terminal Support
+# Engineering for more information.  Updated terminfos and termcaps 
+# are kept available at ftp://gatekeeper.dec.com/pub/DEC/termcaps.
+#
+# In October 1995 DEC sold its terminals business, including the VT and Dorio
+# line and trademark, to SunRiver Data Systems.  SunRiver has since changed
+# its name to Boundless Technologies; see http://www.boundless.com.
+#
+
+# NOTE:  Any VT100 emulation, whether in hardware or software, almost
+# certainly includes what DEC called the `Level 1 editing extension' codes;
+# only the very oldest VT100s lacked these and there probably aren't any of
+# those left alive.  To capture these, use one of the VT102 entries.
+#
+# Note that the :xn: glitch in vt100 is not quite the same as on the Concept,
+# since the cursor is left in a different position while in the
+# weird state (concept at beginning of next line, vt100 at end
+# of this line) so all versions of vi before 3.7 don't handle
+# :xn: right on vt100. The correct way to handle :xn: is when
+# you output the char in column 80, immediately output CR LF
+# and then assume you are in column 1 of the next line. If :xn:
+# is on, am should be on too.
+# 
+# I assume you have smooth scroll off or are at a slow enough baud
+# rate that it doesn't matter (1200? or less). Also this assumes
+# that you set auto-nl to "on", if you set it off use vt100-nam 
+# below.
+# 
+# The padding requirements listed here are guesses. It is strongly
+# recommended that xon/xoff be enabled, as this is assumed here.
+# 
+# The vt100 uses <rs2> and <rf> rather than :is:/:ct:/:st: because the 
+# tab settings are in non-volatile memory and don't need to be 
+# reset upon login. Also setting the number of columns glitches 
+# the screen annoyingly. You can type "reset" to get them set.
+#
+# The VT100 series terminals have cursor ("arrows") keys which can operate
+# in two different modes: Cursor Mode and Application Mode.  Cursor Mode
+# is the reset state, and is assumed to be the normal state.  Application
+# Mode is the "set" state.  In Cursor Mode, the cursor keys transmit
+# "Esc [ {code}" sequences, conforming to ANSI standards.  In Application
+# Mode, the cursor keys transmit "Esc O <code>" sequences.  Application Mode
+# was provided primarily as an aid to the porting of VT52 applications.  It is
+# assumed that the cursor keys are normally in Cursor Mode, and expected that
+# applications such as vi will always transmit the :ks: string.  Therefore,
+# the definitions for the cursor keys are made to match what the terminal
+# transmits after the :ks: string is transmitted.  If the :ks: string
+# is a null string or is not defined, then cursor keys are assumed to be in
+# "Cursor Mode", and the cursor keys definitions should match that assumption,
+# else the appication may fail.  It is also expected that applications will
+# always transmit the :ke: string to the terminal before they exit.
+#
+# The VT100 series terminals have an auxilliary keypad, commonly referred to as
+# the "Numeric Keypad", because it is a cluster of numeric and function keys.
+# The Numeric Keypad which can operate in two different modes: Numeric Mode and
+# Application Mode.  Numeric Mode is the reset state, and is assumed to be
+# the normal state.  Application Mode is the "set" state.  In Numeric Mode,
+# the numeric and punctuation keys transmit ASCII 7-bit characters, and the 
+# Enter key transmits the same as the Return key (Note: the Return key
+# can be configured to send either LF (\015) or CR LF).  In Application Mode,
+# all the keypad keys transmit "Esc O {code}" sequences.  The PF1 - PF4 keys
+# always send the same "Esc O {code}" sequences.  It is assumed that the keypad
+# is normally in Numeric Mode.  If an application requires that the keypad be
+# in Application Mode then it is expected that the user, or the application,
+# will set the TERM environment variable to point to a terminfo entry which has
+# defined the :ks: string to include the codes that switch the keypad into
+# Application Mode, and the terminfo entry will also define function key
+# fields to match the Application Mode control codes.  If the :ks: string
+# is a null string or is not defined, then the keypad is assumed to be in
+# Numeric Mode.  If the :ks: string switches the keypad into Application
+# Mode, it is expected that the :ke: string will contain the control codes
+# necessary to reset the keypad to "Normal" mode, and it is also expected that
+# applications which transmit the :ks: string will also always transmit the
+# :ke: string to the terminal before they exit.
+#
+# Here's a diagram of the VT100 keypad keys with their bindings.
+# The top line is the name of the key (some DEC keyboards have the keys
+# labelled somewhat differently, like GOLD instead of PF1, but this is
+# the most "official" name).  The second line is the escape sequence it
+# generates in Application Keypad mode (where "$" means the ESC
+# character).  The third line contains two items, first the mapping of
+# the key in terminfo, and then in termcap.
+#   _______________________________________
+#  |   PF1   |   PF2   |   PF3   |   PF4   |
+#  |   $OP   |   $OQ   |   $OR   |   $OS   |
+#  |_kf1__k1_|_kf2__k2_|_kf3__k3_|_kf4__k4_|
+#  |    7         8         9         -    |
+#  |   $Ow   |   $Ox   |   $Oy   |   $Om   |
+#  |_kf9__k9_|_kf10_k;_|_kf0__k0_|_________|
+#  |    4    |    5    |    6    |    ,    |
+#  |   $Ot   |   $Ou   |   $Ov   |   $Ol   |
+#  |_kf5__k5_|_kf6__k6_|_kf7__k7_|_kf8__k8_|
+#  |    1    |    2    |    3    |         |
+#  |   $Oq   |   $Or   |   $Os   |  enter  |
+#  |_ka1__K1_|_kb2__K2_|_ka3__K3_|  $OM    |
+#  |         0         |   .     |         |
+#  |        $Op        |  $On    |         |
+#  |___kc1_______K4____|_kc3__K5_|_kent_@8_|
+#
+# And here, for those of you with orphaned VT100s lacking documentation, is
+# a description of the soft switches invoked when you do `Set Up'.
+# 
+#  Scroll 0-Jump               Shifted 3   0-#
+#  |      1-Smooth             |           1-British pound sign
+#  | Autorepeat 0-Off          | Wrap Around 0-Off
+#  | |          1-On           | |           1-On
+#  | | Screen 0-Dark Bkg       | | New Line 0-Off
+#  | | |      1-Light Bkg      | | |        1-On
+#  | | | Cursor 0-Underline    | | | Interlace 0-Off
+#  | | | |      1-Block        | | | |         1-On
+#  | | | |                     | | | |
+#  1 1 0 1       1 1 1 1       0 1 0 0       0 0 1 0       <--Standard Settings
+#                | | | |                     | | | |
+#                | | | Auto XON/XOFF 0-Off   | | | Power 0-60 Hz
+#                | | |               1-On    | | |       1-50 Hz
+#                | | Ansi/VT52 0-VT52        | | Bits Per Char. 0-7 Bits
+#                | |           1-ANSI        | |                1-8 Bits
+#                | Keyclick 0-Off            | Parity 0-Off
+#                |          1-On             |        1-On
+#                Margin Bell 0-Off           Parity Sense 0-Odd
+#                            1-On                         1-Even
+#
+# The following SET-UP modes are assumed for normal operation:
+#	ANSI_MODE	AUTO_XON/XOFF_ON	NEWLINE_OFF	80_COLUMNS
+#	WRAP_AROUND_ON  JUMP_SCROLL_OFF
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements; I recommend
+#	AUTOREPEAT_ON	BLOCK_CURSOR	MARGIN_BELL_OFF    SHIFTED_3_#
+# Unless you have a graphics add-on such as Digital Engineering's VT640
+# (and even then, whenever it can be arranged!) you should set
+#	INTERLACE_OFF
+#
+# (vt100: I added <rmam>/<smam> based on the init string, also :bs:. -- esr)
+vt100|vt100-am|dec vt100 (w/advanced video):\
+	:am:bs:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:\
+	:eA=\E(B\E)0:ho=\E[H:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\
+	:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
+vt100nam|vt100-nam|vt100 no automargins:\
+	:am@:xn@:tc=vt100-am:
+vt100-vb|dec vt100 (w/advanced video) & no beep:\
+	:bl@:vb=\E[?5h\E[?5l:tc=vt100:
+
+# Ordinary vt100 in 132 column ("wide") mode.
+vt100-w|vt100-w-am|dec vt100 132 cols (w/advanced video):\
+	:co#132:li#24:\
+	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?8h:tc=vt100-am:
+vt100-w-nam|vt100-nam-w|dec vt100 132 cols (w/advanced video no automargin):\
+	:co#132:li#14:vt@:\
+	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?8h:tc=vt100-nam:
+
+# vt100 with no advanced video.
+vt100-nav|vt100 without advanced video option:\
+	:sg#1:\
+	:mb@:md@:me@:mr@:sa@:se=\E[m:so=\E[7m:ue@:us@:tc=vt100:
+vt100-nav-w|vt100-w-nav|dec vt100 132 cols 14 lines (no advanced video option):\
+	:co#132:li#14:tc=vt100-nav:
+
+# vt100 with one of the 24 lines used as a status line.
+# We put the status line on the top.
+vt100-s|vt100-s-top|vt100-top-s|vt100 for use with top sysline:\
+	:es:hs:\
+	:li#23:\
+	:cl=\E[2;1H\E[J:cm=\E[%i%+^A;%dH:cs=\E[%i%i%d;%dr:\
+	:ds=\E7\E[1;24r\E8:fs=\E8:ho=\E[2;1H:is=\E7\E[2;24r\E8:\
+	:ts=\E7\E[1;%p1%dH\E[1K:\
+	:tc=vt100-am:
+
+# Status line at bottom. 
+# Clearing the screen will clobber status line.
+vt100-s-bot|vt100-bot-s|vt100 for use with bottom sysline:\
+	:es:hs:\
+	:li#23:\
+	:ds=\E7\E[1;24r\E8:fs=\E8:is=\E[1;23r\E[23;1H:\
+	:ts=\E7\E[24;%p1%dH\E[1K:\
+	:tc=vt100-am:
+
+# Most of the `vt100' emulators out there actually emulate a vt102
+# This entry (or vt102-nsgr) is probably the right thing to use for
+# these.  
+vt102|dec vt102:\
+	:mi:\
+	:al=\E[L:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:tc=vt100:
+vt102-w|dec vt102 in wide mode:\
+	:co#132:\
+	:r3=\E[?3h:tc=vt102:
+
+# Many brain-dead PC comm programs that pretend to be `vt100-compatible'
+# fail to interpret the ^O and ^N escapes properly.  Symptom: the :me:
+# string in the canonical vt100 entry above leaves the screen littered
+# with little  snowflake or star characters (IBM PC ROM character \017 = ^O)
+# after highlight turnoffs.  This entry should fix that, and even leave
+# ACS support working, at the cost of making multiple-highlight changes 
+# slightly more expensive.
+# From: Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995
+vt102-nsgr|vt102 no sgr (use if you see snowflakes after highlight changes):\
+	:me=\E[m:sa@:\
+	:tc=vt102:
+
+# VT125 Graphics CRT.  Clear screen also erases graphics
+vt125|vt125 graphics terminal:\
+	:cl=\E[H\E[2J\EPpS(E)\E\:tc=vt100:
+
+# This isn't a DEC entry, it came from University of Wisconsin.
+# (vt131: I added <rmam>/<smam> based on the init string, also :bs: -- esr)
+vt131|dec vt131:\
+	:am:bs:xn:\
+	:co#80:it#8:li#24:vt#3:\
+	:RA=\E[?7h:SA=\E[?7h:bl=^G:cd=50\E[J:ce=3\E[K:\
+	:cl=50\E[;H\E[2J:cm=5\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:do=^J:ho=\E[H:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=2\E[5m:md=2\E[1m:\
+	:me=2\E[m:mr=2\E[7m:nd=2\E[C:nw=^M^J:\
+	:r1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:sc=\E7:\
+	:se=2\E[m:so=2\E[7m:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:\
+	:us=2\E[4m:
+
+# vt132 - like vt100 but slower and has ins/del line and such.
+# I'm told that :im:/:ei: are backwards in the terminal from the
+# manual and from the ANSI standard, this describes the actual 
+# terminal. I've never actually used a vt132 myself, so this 
+# is untested.
+#
+vt132|DEC vt132:\
+	:xn:\
+	:al=\E[L:dc=\E[P:dl=\E[M:ei=\E[4h:im=\E[4l:ip=:sf=\n:tc=vt100:
+
+# This vt220 description maps F5--F9 to the second block of function keys
+# at the top of the keyboard.  The "DO" key is used as F10 to avoid conflict
+# with the key marked (ESC) on the vt220.  See vt220d for an alternate mapping.
+# PF1--PF4 are used as F1--F4.
+#
+vt220-old|vt200-old|DEC VT220 in vt100 emulation mode:\
+	:am:bs:mi:pt:xn:xo:\
+	:co#80:li#24:vt#3:\
+	:@7=\E[4~:RA=\E[?7l:SA=\E[?7h:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:if=/usr/share/tabset/vt100:im=\E[4h:\
+	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:k9=\E[21~:\
+	:k;=\E[29~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:\
+	:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nl=^J:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:rf=/usr/share/tabset/vt100:\
+	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
+	:sc=\E7:se=\E[27m:sf=20\ED:so=\E[7m:sr=14\EM:ta=^I:\
+	:ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
+
+# A much better description of the VT200/220; used to be vt220-8
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+vt220|vt200|dec vt220:\
+	:am:bs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
+	:ei=\E[4l:ho=\E[H:if=/usr/share/tabset/vt100:im=\E[4h:\
+	:is=\E[?7h\E[>\E[?1h\E F\E[?4l:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\
+	:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:
+vt220-w|vt200-w|DEC vt220 in wide mode:\
+	:co#132:\
+	:r3=\E[?3h:tc=vt220:
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+vt220-8bit|vt220-8|vt200-8bit|vt200-8|dec vt220/200 in 8-bit mode:\
+	:am:bs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:\
+	:LE=\233%dD:RI=\233%dC:UP=\233%dA:ae=^O:al=\233L:as=^N:\
+	:bl=^G:cd=\233J:ce=\233K:cl=\233H\233J:cm=\233%i%d;%dH:\
+	:cr=^M:cs=\233%i%d;%dr:ct=\2333g:dc=\233P:dl=\233M:do=^J:\
+	:ec=\233%dX:ei=\2334l:ho=\233H:\
+	:if=/usr/share/tabset/vt100:im=\2334h:\
+	:is=\233?7h\233>\233?1h\E F\233?4l:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k6=\23317~:k7=\23318~:k8=\23319~:\
+	:k9=\23320~:kI=\2332~:kN=\2336~:kP=\2335~:kb=^H:kd=\233B:\
+	:kh=\233H:kl=\233D:kr=\233C:ku=\233A:le=^H:mb=\2335m:\
+	:md=\2331m:me=\233m:mr=\2337m:nd=\233C:nw=\EE:rc=\E8:\
+	:sc=\E7:se=\23327m:sf=\ED:so=\2337m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\23324m:up=\233A:us=\2334m:vb=\233?5h\233?5l:
+
+#
+# vt220d:
+# This vt220 description regards F6--F10 as the second block of function keys
+# at the top of the keyboard.  This mapping follows the description given
+# in the VT220 Programmer Reference Manual and agrees with the labeling
+# on some terminals that emulate the vt220.  There is no support for an F5.
+# See vt220 for an alternate mapping. 
+#
+vt220d|DEC VT220 in vt100 mode with DEC function key labeling:\
+	:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
+	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:k5@:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
+	:tc=vt220-old:
+
+vt220-nam|v200-nam|VT220 in vt100 mode with no auto margins:\
+	:am@:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h:tc=vt220:
+
+# vt220 termcap written Tue Oct 25 20:41:10 1988 by Alex Latzko
+# (not an official DEC entry!)
+# The problem with real vt220 terminals is they don't send escapes when in
+# in vt220 mode.  This can be gotten around two ways.  1> don't send
+# escapes or 2> put the vt220 into vt100 mode and use all the nifty
+# features of vt100 advanced video which it then has.
+#
+# This entry takes the view of putting a vt220 into vt100 mode so
+# you can use the escape key in emacs and everything else which needs it.
+#
+# You probably don't want to use this on a VMS machine since VMS will think
+# it has a vt220 and will get fouled up coming out of emacs
+#
+# From: Alexander Latzko <latzko@marsenius.rutgers.edu>, 30 Dec 1996
+# (Added vt100 :rc:,:sc: to quiet a tic warning -- esr)
+vt200-js|vt220-js|dec vt200 series with jump scroll:\
+	:am:\
+	:co#80:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:dm=:do=^J:ed=:\
+	:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E[61"p\E[H\E[?3l\E[?4l\E[?1l\E[?5l\E[?6l\E[?7h\E[?8h\E[?25h\E>\E[m:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:\
+	:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
+	:nw=^M\ED:r1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:rf=/usr/lib/tabset/vt100:sc=\E7:se=5\E[27m:sf=\ED:\
+	:so=5\E[7m:sr=\EM:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:
+ 
+
+# This was DEC's vt320.  Use the purpose-built one below instead 
+#vt320|DEC VT320 in vt100 emulation mode,
+#	use=vt220,
+
+#
+# Use v320n for SCO's LYRIX.  Otherwise, use Adam Thompson's vt320-nam.
+#
+vt320nam|v320n|DEC VT320 in vt100 emul. mode with NO AUTO WRAP mode:\
+	:am@:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h:tc=vt220:
+
+# These entries are not DEC's official ones, they were purpose-built for the 
+# VT320.  Here are the designer's notes:
+# <kel> is end on a PC kbd.  Actually 'select' on a VT.  Mapped to 
+# 'Erase to End of Field'... since nothing seems to use 'end' anyways...
+# khome is Home on a PC kbd.  Actually 'FIND' on a VT.
+# Things that use <knxt> usually use tab anyways... and things that don't use
+# tab usually use <knxt> instead...
+# kprv is same as tab - Backtab is useless...
+# I left out :sa: because of its RIDICULOUS complexity,
+# and the resulting fact that it causes the termcap translation of the entry
+# to SMASH the 1k-barrier...
+# From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
+# (vt320: uncommented :fs:, comnmmented out <kslt> to avoid a conflict --esr) 
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+vt320|vt300|dec vt320 7 bit terminal:\
+	:am:es:hs:mi:ms:xn:\
+	:co#80:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
+	:ei=\E[4l:fs=\E[0$}:ho=\E[H:im=\E[4h:\
+	:is=\E>\E[?3l\E[?4l\E[5?l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=\177:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:\
+	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=\ED:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ts=\E[1$}\E[H\E[K:ue=\E[m:\
+	:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
+vt320-nam|vt300-nam|dec vt320 7 bit terminal with no am to make SAS happy:\
+	:am@:\
+	:is=\E>\E[?3l\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
+	:r2=\E>\E[?3l\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
+	:tc=vt320:
+# We have to init 132-col mode, not 80-col mode.
+vt320-w|vt300-w|dec vt320 wide 7 bit terminal:\
+	:co#132:ws#132:\
+	:is=\E>\E[?3h\E[?4l\E[5?l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:r2=\E>\E[?3h\E[?4l\E[5?l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:tc=vt320:
+vt320-w-nam|vt300-w-nam|dec vt320 wide 7 bit terminal with no am:\
+	:am@:\
+	:is=\E>\E[?3h\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
+	:r2=\E>\E[?3h\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
+	:tc=vt320-w:
+
+# VT330 and VT340 -- These are ReGIS and SIXEL graphics terminals
+#   which are pretty much a superset of the VT320.  They have the
+#   host writable status line, yet another different DRCS matrix size,
+#   and such, but they add the DEC Technical character set, Multiple text
+#   pages, selectable length pages, and the like.  The difference between
+#   the vt330 and vt340 is that the latter has only 2 planes and a monochrome
+#   monitor, the former has 4 planes and a color monitor.  These terminals
+#   support VT131 and ANSI block mode, but as with much of these things,
+#   termcap/terminfo doesn't deal with these features.
+#
+# Note that this entry is are set up in what was the standard way for GNU
+# Emacs v18 terminal modes to deal with the cursor keys in that the arrow
+# keys were switched into application mode at the same time the numeric pad
+# is switched into application mode.  This changes the definitions of the
+# arrow keys.  Emacs v19 is smarter and mines its keys directly out of 
+# your termcap or terminfo entry,
+#
+# From: Daniel Glasser <dag@persoft.persoft.com>, 13 Oct 1993
+# (vt340: string capability "sb=\E[M" corrected to "sr";
+# also, added <rmam>/<smam> based on the init string -- esr)
+vt340|dec-vt340|vt330|dec-vt330|dec vt340 graphics terminal with 24 line page:\
+	:am:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[L:as=^N:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:\
+	:fs=\E[$}:ho=\E[H:im=\E[4h:\
+	:is=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l1=pf1:l2=pf2:l3=pf3:l4=pf4:\
+	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M\ED:\
+	:r1=\E[?3l:rc=\E8:rf=/usr/share/tabset/vt300:sc=\E7:\
+	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=200\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
+
+# DEC doesn't supply a vt400 description, so we add Daniel Glasser's
+# (originally written with vt420 as its primary name, and usable for it).
+# 
+# VT400/420 -- This terminal is a superset of the vt320.  It adds the multiple 
+#    text pages and long text pages with selectable length of the vt340, along
+#    with left and right margins, rectangular area text copy, fill, and erase
+#    operations, selected region character attribute change operations,
+#    page memory and rectangle checksums, insert/delete column, reception
+#    macros, and other features too numerous to remember right now.  TERMCAP
+#    can only take advantage of a few of these added features.
+#
+# Note that this entry is are set up in what was the standard way for GNU
+# Emacs v18 terminal modes to deal with the cursor keys in that the arrow
+# keys were switched into application mode at the same time the numeric pad
+# is switched into application mode.  This changes the definitions of the
+# arrow keys.  Emacs v19 is smarter and mines its keys directly out of 
+# your termcap entry,
+#
+# From: Daniel Glasser <dag@persoft.persoft.com>, 13 Oct 1993
+# (vt400: string capability ":sb=\E[M:" corrected to ":sr=\E[M:";
+# also, added <rmam>/<smam> based on the init string -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+vt400|vt400-24|dec-vt400|dec vt400 24x80 column autowrap:\
+	:am:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
+	:cd=10\E[J:ce=4\E[K:cl=10\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:fs=\E[$}:ho=\E[H:\
+	:ic=\E[@:im=\E[4h:\
+	:is=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M\ED:rc=\E8:sc=\E7:se=\E[27m:\
+	:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=200\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
+
+# (vt420: I removed :k0:, it collided with <kf10>.  I also restored
+# a missing :sc: -- esr)
+vt420|DEC VT420:\
+	:am:mi:xn:xo:\
+	:co#80:li#24:vt#3:\
+	:*6=\E[4~:@0=\E[1~:RA=\E[?7l:\
+	:S5=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:SA=\E[?7h:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt300:\
+	:im=\E[4h:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:\
+	:k9=\E[21~:k;=\E[29~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:ke=\E>:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r3=\E[?67h\E[64;1"p:rc=\E8:rf=/usr/share/tabset/vt300:\
+	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
+	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
+
+#
+# DEC VT220 and up support DECUDK (user-defined keys).  DECUDK (i.e., pfx)
+# takes two parameters, the key and the string.  Translating the key is
+# straightforward (keys 1-5 are not defined on real terminals, though some
+# emulators define these):
+#
+#               if (key < 16) then  value = key;
+#               else if (key < 21) then value = key + 1; 
+#               else if (key < 25) then value = key + 2;
+#               else if (key < 27) then value = key + 3;
+#               else if (key < 30) then value = key + 4;
+#               else value = key + 5;
+#
+# The string must be the hexadecimal equivalent, e.g., "5052494E" for "PRINT". 
+# There's no provision in terminfo for emitting a string in this format, so the
+# application has to know it.
+#
+vt420pc|DEC VT420 w/PC keyboard:\
+	:@7=\E[4~:F1=\E[23~:F2=\E[24~:F3=\E[11;2~:F4=\E[12;2~:\
+	:F5=\E[13;2~:F6=\E[14;2~:F7=\E[15;2~:F8=\E[17;2~:\
+	:F9=\E[18;2~:FA=\E[19;2~:FB=\E[20;2~:FC=\E[21;2~:\
+	:FD=\E[23;2~:FE=\E[24;2~:FF=\E[23~:FG=\E[24~:FH=\E[25~:\
+	:FI=\E[26~:FJ=\E[28~:FK=\E[29~:FL=\E[31~:FM=\E[32~:\
+	:FN=\E[33~:FO=\E[34~:FP=\E[35~:FQ=\E[36~:FR=\E[23;2~:\
+	:FS=\E[24;2~:FT=\E[25;2~:FU=\E[26;2~:FV=\E[28;2~:\
+	:FW=\E[29;2~:FX=\E[31;2~:FY=\E[32;2~:FZ=\E[33;2~:\
+	:Fa=\E[34;2~:Fb=\E[35;2~:Fc=\E[36;2~:\
+	:S6=USR_TERM\072vt420pcdos\072:k1=\E[11~:k2=\E[12~:\
+	:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:k;=\E[21~:kD=\177:kh=\E[H:\
+	:..px=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\:tc=vt420:
+
+vt420pcdos|DEC VT420 w/PC for DOS Merge:\
+	:li#25:\
+	:S1=%?%p2%{19}%=%t\E\023\021%e%p2%{32}%<%t\E%p2%c%e%p2%{127}%=%t\E\177%e%p2%c%;:\
+	:S4=\E[?1;2r\E[34h:\
+	:S5=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:S6@:\
+	:me=\E[m:sa@:\
+	:tc=vt420pc:
+
+vt420f|DEC VT420 with VT kbd; VT400 mode; F1-F5 used as Fkeys:\
+	:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
+	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
+	:kD=\177:kh=\E[H:l1=\EOP:l2=\EOQ:l3=\EOR:l4=\EOS:\
+	:tc=vt420:
+
+vt510|DEC VT510:\
+	:tc=vt420:
+vt510pc|DEC VT510 w/PC keyboard:\
+	:tc=vt420pc:
+vt510pcdos|DEC VT510 w/PC for DOS Merge:\
+	:tc=vt420pcdos:
+
+# VT520/VT525
+#
+# The VT520 is a monochrome text terminal capable of managing up to
+# four independent sessions in the terminal.  It has multiple ANSI
+# emulations (VT520, VT420, VT320, VT220, VT100, VT PCTerm, SCO Console)
+# and ASCII emulations (WY160/60, PCTerm, 50/50+, 150/120, TVI 950,
+# 925 910+, ADDS A2).  This terminfo data is for the ANSI emulations only.
+#
+# Terminal Set-Up is entered by pressing [F3], [Caps Lock]/[F3] or
+# [Alt]/[Print Screen] depending upon which keyboard and which
+# terminal mode is being used.  If Set-Up has been disabled or
+# assigned to an unknown key, Set-Up may be entered by pressing
+# [F3] as the first key after power up, regardless of keyboard type.
+# (vt520: I added <rmam>/<smam> based on the init string, also :sc: -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+vt520|DEC VT520:\
+	:am:mi:xn:xo:\
+	:co#80:li#24:vt#3:\
+	:*6=\E[4~:@0=\E[1~:RA=\E[?7l:\
+	:S5=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:SA=\E[?7h:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt300:\
+	:im=\E[4h:is=\E[1;24r\E[24;1H:k0=\E[29~:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:\
+	:k9=\E[21~:k;=\E[29~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:r3=\E[?67h\E[64;1"p:\
+	:rc=\E8:rf=/usr/share/tabset/vt300:sc=\E7:se=\E[m:sf=\ED:\
+	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+
+# (vt525: I added <rmam>/<smam> based on the init string;
+# removed :se:=\E[m, :ue:=\E[m, added :sc: -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+vt525|DEC VT525:\
+	:am:mi:xn:xo:\
+	:co#80:li#24:vt#3:\
+	:*6=\E[4~:@0=\E[1~:RA=\E[?7l:\
+	:S5=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:SA=\E[?7h:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt300:\
+	:im=\E[4h:is=\E[1;24r\E[24;1H:k0=\E[29~:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:\
+	:k9=\E[21~:k;=\E[29~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:r3=\E[?67h\E[64;1"p:\
+	:rc=\E8:rf=/usr/share/tabset/vt300:sc=\E7:se=\E[m:sf=\ED:\
+	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+
+#### VT100 emulations
+#
+
+# John Hawkinson <jhawk@MIT.EDU> tells us that the EWAN telnet for Windows
+# (the best Windows telnet as of September 1995) presents the name `dec-vt100'
+# to telnetd.   Michael Deutschmann <ldeutsch@mail.netshop.net> informs us
+# that this works best with a stock vt100 entry.
+dec-vt100|EWAN telnet's vt100 emulation:\
+	:tc=vt100:
+
+# From: Adrian Garside <94ajg2@eng.cam.ac.uk>, 19 Nov 1996
+dec-vt220|DOS tnvt200 terminal emulator:\
+	:am@:tc=vt220:
+
+# Zstem340 is an (IMHO) excellent VT emulator for PC's.  I recommend it to
+# anyone who needs PC VT340 emulation. (or anything below that level, for
+# that matter -- DEC's ALL-in-1 seems happy with it, as does INFOPLUS's
+# RDBM systems, it includes ReGIS and SiXel support!  I'm impressed...
+# I can send the address if requested.
+# (z340: changed garbled \E[5?l to \E[?5l, DEC smooth scroll off -- esr)
+# From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
+z340|zstem vt340 terminal emulator 132col 42line:\
+	:li#42:\
+	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H:\
+	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H:\
+	:tc=vt320-w:
+z340-nam|zstem vt340 terminal emulator 132col 42line (no automatic margins):\
+	:am@:\
+	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H:\
+	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H:\
+	:tc=z340:
+
+# CRT is shareware.  It implements some xterm features, including mouse.
+crt|crt-vt220|CRT 2.3 emulating VT220:\
+	:ms:ut:\
+	:Co#8:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:Sb=\E[4%dm:Sf=\E[3%dm:\
+	:op=\E[39;49m:st=\EH:u6=\E[%i%d;%dR:u7=\E[6n:u8=\E[?1;2c:\
+	:u9=\E[c:\
+	:tc=vt220:
+
+# This entry is for Tera Term Pro version 2.3, for MS-Windows 95/NT written by
+# T. Teranishi dated Mar 10, 1998.  It is a free software terminal emulator
+# (communication program) which supports:
+#
+#	- Serial port connections.
+#	- TCP/IP (telnet) connections.
+#	- VT100 emulation, and selected VT200/300 emulation.
+#	- TEK4010 emulation.
+#	- File transfer protocols (Kermit, XMODEM, ZMODEM, B-PLUS and
+#	  Quick-VAN).
+#	- Scripts using the "Tera Term Language".
+#	- Japanese and Russian character sets.
+#
+# The program does not come with terminfo or termcap entries.  However, the
+# emulation (testing with vttest and ncurses) is reasonably close to vt100 (no
+# vt52 or doublesize character support; blinking is done with color).  Besides
+# the HPA, VPA extensions it also implements CPL and CNL.
+#
+# All of the function keys can be remapped.  This description shows the default
+# mapping, as installed.  Both vt100 PF1-PF4 keys and quasi-vt220 F1-F4 keys
+# are supported.  F13-F20 are obtained by shifting F3-F10.  The editing keypad
+# is laid out like vt220, rather than the face codes on the PC keyboard, i.e,
+#	kfnd	Insert
+#	kslt	Delete
+#	kich1	Home
+#	kdch1	PageUp
+#	kpp	End
+#	knp	PageDown
+#
+# ANSI colors are implemented, but cannot be combined with video attributes
+# except for reverse.
+#
+# No fonts are supplied with the program, so the acsc string is chosen to
+# correspond with the default Microsoft terminal font.
+#
+# Tera Term recognizes some xterm sequences, including those for setting and
+# retrieving the window title, and for setting the window size (i.e., using
+# "resize -s"), though it does not pass SIGWINCH to the application if the
+# user resizes the window with the mouse.
+teraterm|Tera Term Pro:\
+	:km:xo@:\
+	:NC#43:vt@:\
+	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
+	:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
+	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
+	:ac=+\020\054\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376:\
+	:al=\E[L:cb=\E[1K:cd=\E[J:ce=\E[K:ch=\E[%i%dG:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cv=\E[%i%dd:dc=\E[P:dl=\E[M:ec=\E[%dX:\
+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
+	:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:op=\E[100m:se=\E[27m:so=\E[7m:\
+	:sr=\EM:u6=\E[%i%d;%dR:u7=\E[6n:u8=\E[?1;2c:u9=\E[c:\
+	:ue=\E[24m:up=\E[A:us=\E[4m:vb=200\E[?5h\E[?5l:\
+	:ve=\E[?25h:vi=\E[?25l:\
+	:tc=klone+color:tc=vt100:
+
+# Tested with WinNT 4.0, the telnet application assumes the screensize is
+# 25x80.  This entry uses the 'Terminal' font, to get line-drawing characters.
+ms-vt100|MS telnet imitating dec vt100:\
+	:li#25:\
+	:ac=+\020\054\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376:\
+	:ct@:u6=\E[%i%d;%dR:u7=\E[6n:u8=\E[?6c:u9=\E[c:\
+	:tc=vt100:
+
+#### X terminal emulators
+#
+# You can add the following line to your .Xdefaults to change the terminal type
+# set by the xterms you start up to my-xterm:
+#
+# *termName:  my-xterm
+#
+# System administrators can change the default entry for xterm instances
+# by adding a similar line to /usr/X11/lib/X11/app-defaults/XTerm.  In either
+# case, xterm will detect and reject an invalid terminal type, falling back
+# to the default of xterm.
+#
+
+# X10/6.6	11/7/86, minus alternate screen, plus (csr)
+# (xterm: ":MT:" changed to ":km:"; added <smam>/<rmam> based on init string;
+# removed (hs, eslok, tsl=\E[?E\E[?%i%dT, fsl=\E[?F, dsl=\E[?E)
+# as these seem not to work -- esr)
+x10term|vs100-x10|xterm terminal emulator (X10 window system):\
+	:am:bs:km:mi:ms:xn:xo:\
+	:co#80:it#8:li#65:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:RA=\E[?7l:SA=\E[?7h:\
+	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
+	:im=\E[4h:is=\E\E[m\E[?7h\E[?1;4l:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
+# Compatible with the R5 xterm 
+# (from the XFree86 3.2 distribution, <blink=@> removed)
+# added khome/kend, rmir/smir, rmul/smul based on the R5 xterm code - TD
+# corrected typos in rs2 string - TD
+xterm-r5|xterm R5 version:\
+	:am:bs:km:ms:xn:\
+	:co#80:it#8:li#24:\
+	:@7=\E[4~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
+	:F1=\E[23~:F2=\E[24~:IC=\E[%d@:Km=\E[M:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:ic=\E[@:\
+	:im=\E[4h:k0=\EOq:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
+	:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
+	:k;=\E[21~:kA=\E[30~:kD=\E[3~:kE=\E[8~:kI=\E[2~:kL=\E[31~:\
+	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H:\
+	:rc=\E8:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
+# Compatible with the R6 xterm
+# (from XFree86 3.2 distribution, <acsc> and :it: added, <blink@> removed)
+# added khome/kend - TD
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+xterm-r6|xterm-old|xterm X11R6 version:\
+	:am:bs:km:mi:ms:xn:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
+	:ho=\E[H:im=\E[4h:\
+	:is=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
+	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+# This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
+# The name has been changed and some aliases have been removed.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System):\
+	:am:bs:km:mi:ms:xn:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
+	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:\
+	:is=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:\
+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\177:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\EOH:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:\
+	:me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\
+	:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:te=\E[2J\E[?47l\E8:\
+	:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
+
+# This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
+# codes for F1-F4 except while in VT220 mode.
+xterm-xf86-v33|xterm terminal emulator (XFree86 3.3 Window System):\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:tc=xterm-xf86-v32:
+
+# This version was released in XFree86 3.3.3 (November 1998).
+# Besides providing printer support, it exploits a new feature that allows
+# xterm to use terminfo-based descriptions with the titeInhibit resource.
+xterm-xf86-v333|xterm terminal emulator (XFree86 3.3.3 Window System):\
+	:5i:\
+	:*6@:@0@:@7=\E[4~:ei=:ic@:im=:is=\E[\041p\E[?3;4l\E[4l\E>:\
+	:kD=\E[3~:kh=\E[1~:mb=\E[5m:mk=\E[8m:pf=\E[4i:po=\E[5i:\
+	:ps=\E[i:r1=\Ec:r2=\E[\041p\E[?3;4l\E[4l\E>:\
+	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;:\
+	:te=\E[?1047l\E[?1048l:ti=\E[?1048h\E[?1047h:\
+	:tc=xterm-xf86-v33:
+
+# This beta version will probably be released in XFree86 4.0.
+xterm-xf86-v40|xterm terminal emulator (XFree86 4.0 Window System):\
+	:@7=\EOF:K1=\EOH:K2=\EOE:K3=\E[5~:K4=\EOF:K5=\E[6~:kD=\177:\
+	:kh=\EOH:te=\E[?1049l:ti=\E[?1049h:\
+	:tc=xterm-xf86-v333:
+
+xterm-xfree86|xterm-new|xterm terminal emulator (XFree86 4.0 Window System):\
+	:tc=xterm-xf86-v40:
+
+# From: David J. MacKenzie <djm@va.pubnix.com>, 14 Nov 1997
+xterm-xi|xterm on XI Graphics Accelerated X under BSD/OS 3.1:\
+	:se=\E[m:ue=\E[m:\
+	:tc=xterm-xf86-v33:
+
+# This is one of the variants of XFree86 3.3 xterm, updated for 4.0 (T.Dickey)
+xterm-16color|xterm with 16 colors like aixterm:\
+	:Co#16:NC#32:pa#256:\
+	:AB=\E[%?%p1%{8}%<%t%p1%{40}%+%e%p1%{92}%+%;%dm:\
+	:AF=\E[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm:\
+	:..Sb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m:\
+	:..Sf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m:\
+	:tc=xterm-xf86-v40:
+
+# This is another variant, for XFree86 4.0 xterm (T.Dickey)
+# This is an 8-bit version of xterm, which emulates DEC vt220 with ANSI color.
+# To use it, your decTerminalID resource must be set to 200 or above.
+#
+#	HTS	\E H	\210
+#	RI	\E M	\215
+#	SS3	\E O	\217
+#	CSI	\E [	\233
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+xterm-8bit|xterm terminal emulator 8-bit controls (X Window System):\
+	:am:bs:km:mi:ms:xn:\
+	:co#80:it#8:li#24:\
+	:AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:\
+	:K1=\217w:K2=\217y:K3=\217u:K4=\217q:K5=\217s:LE=\233%dD:\
+	:RI=\233%dC:UP=\233%dA:ae=^O:al=\233L:as=^N:bl=^G:bt=\233Z:\
+	:cd=\233J:ce=\233K:cl=\233H\2332J:cm=\233%i%d;%dH:cr=^M:\
+	:cs=\233%i%d;%dr:ct=\2333g:dc=\233P:dl=\233M:do=^J:\
+	:ec=\233%dX:ei=\2334l:ho=\233H:im=\2334h:\
+	:is=\E7\E G\233r\233m\233?7h\233?1;3;4;6l\2334l\E8\E>:\
+	:k1=\23311~:k2=\23312~:k3=\23313~:k4=\23314~:k5=\23315~:\
+	:k6=\23317~:k7=\23318~:k8=\23319~:k9=\23320~:kD=\2333~:\
+	:kI=\2332~:kN=\2336~:kP=\2335~:kb=^H:kd=\217B:\
+	:ke=\233?1l\E>:kh=\2331~:kl=\217D:kr=\217C:ks=\233?1h\E=:\
+	:ku=\217A:le=^H:mb=\2335m:md=\2331m:me=\233m^O:mr=\2337m:\
+	:nd=\233C:rc=\E8:sc=\E7:se=\23327m:sf=^J:so=\2337m:sr=\215:\
+	:st=\210:ta=^I:te=\233?1049l:ti=\233?1049h:ue=\23324m:\
+	:up=\233A:us=\2334m:vb=\233?5h\233?5l:ve=\233?25h:\
+	:vi=\233?25l:vs=\233?25h:
+
+xterm-24|vs100|xterms|xterm terminal emulator (X Window System):\
+	:li#24:tc=xterm:
+
+# This is xterm for ncurses.
+xterm|xterm terminal emulator (X Window System):\
+	:Km=\E[M:\
+	:ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:u6=\E[%i%d;%dR:u7=\E[6n:u8=\E[?1;2c:u9=\E[c:\
+	:tc=xterm-r6:
+
+# These entries allow access to the X titlebar and icon name as a status line. 
+# Note that twm (and possibly window managers descended from it such as tvtwm, 
+# ctwm, and vtwm) track windows by icon-name; thus, you don't want to mess
+# with it.
+xterm+sl|access X title line and icon name:\
+	:hs:\
+	:ws#40:\
+	:ds=\E]0;\007:fs=^G:ts=\E]0;:tc=xterm:
+xterm+sl-twm|access X title line (pacify twm-descended window managers):\
+	:hs:\
+	:ws#40:\
+	:ds=\E]2;\007:fs=^G:ts=\E]2;:tc=xterm:
+
+#
+# The following xterm variants don't depend on your base version
+#
+# xterm with bold instead of underline
+xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold:\
+	:so=\E[7m:us=\E[1m:\
+	:tc=xterm:
+# (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr)
+# (kterm should not invoke DEC Graphics as the alternate character set
+#  -- Kenji Rikitake)
+kterm|kterm kanji terminal emulator (X window system):\
+	:es:hs:\
+	:Km=\E[M:ac@:ae@:as@:cs=\E[%i%d;%dr:ds=\E[?H:eA@:fs=\E[?F:\
+	:op=\E[39;49m:rc=\E8:sc=\E7:ts=\E[?E\E[?%i%dT:\
+	:tc=xterm-r6:tc=klone+color:
+# See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
+xterm-nic|xterm with ich/ich1 suppressed for non-curses programs:\
+	:IC@:ei=:ic@:im=:\
+	:tc=xterm:
+# From: Mark Sheppard <kimble@mistral.co.uk>, 4 May 1996 
+xterm1|xterm terminal emulator ignoring the alternate screen buffer:\
+	:te@:ti@:\
+	:tc=xterm:
+
+# This describes the capabilities of color_xterm, an xterm variant from
+# before ECMA-64 color support was folded into the main-line xterm release.
+# This entry is straight from color_xterm's maintainer.
+# From: Jacob Mandelson <jlm@ugcs.caltech.edu>, 09 Nov 1996
+# The README's with the distribution also say that it supports SGR 21, 24, 25
+# and 27, but they are not present in the terminfo or termcap.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+color_xterm|cx|cx100|color_xterm color terminal emulator for X:\
+	:am:bs:km:mi:ms:xn:\
+	:co#80:it#8:li#65:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
+	:i1=\E[r\E[m\E[?7h\E[?4;6l\E[4l:im=\E[4h:k1=\E[11~:\
+	:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\EOB:kh=\E[7~:kl=\EOD:kr=\EOC:ku=\EOA:le=^H:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\
+	:sf=^J:so=\E[7m:sr=\EM:ta=^I:te=\E>\E[?41;1r:\
+	:ti=\E[?1;41s\E[?1;41h\E=:ue=\E[24m:up=\E[A:us=\E[4m:
+
+# The 'nxterm' distributed with Redhat Linux is a slight rehack of
+# xterm-sb_right-ansi-3d, which implements ANSI colors, but does not support
+# SGR 39 or 49.  SGR 0 does reset colors (along with everything else).  This
+# description is "compatible" with color_xterm, rxvt and XFree86 xterm, except
+# that each of those implements the home, end, delete keys differently.
+nxterm|xterm-color|generic color xterm:\
+	:NC@:\
+	:op=\E[m:tc=xterm-r6:tc=klone+color:
+
+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
+# Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
+# Notes:
+# rxvt 2.21b uses
+#	smacs=\E(B\E)U^N, rmacs=\E(B\E)0^O,
+# but some applications don't work with that.
+# It also has an AIX extension
+#	box2=lqkxjmwuvtn,
+# and
+#	ech=\E[%p1%dX,
+# but the latter does not work correctly.
+#
+# The distributed terminfo says it implements hpa and vpa, but they are not
+# implemented correctly, using relative rather than absolute positioning.
+#
+# rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM.
+# Since rxvt is not really compatible with xterm, it should be configured as
+# "rxvt" (monochrome) and "rxvt-color". 
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+rxvt|rxvt terminal base (X Window System):\
+	:am:bs:eo:km:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
+	:ho=\E[H:i1=\E[?47l\E=\E[?1l:ic=\E[@:im=\E[4h:\
+	:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
+	:k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
+	:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
+	:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:\
+	:kh=\E[7~:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[0m\017:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
+	:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\
+	:vs=\E[?25h:
+rxvt-color|rxvt terminal emulator (X Window System):\
+	:Co#8:pa#64:\
+	:AB=\E[%p1%{40}%+%dm:AF=\E[%p1%{30}%+%dm:me=\E[m\017:\
+	:op=\E[39;49m:\
+	:tc=rxvt:
+
+# These (xtermc and xtermm) are distributed with Solaris.  They refer to a
+# variant of xterm which is apparently no longer supported, but are interesting
+# because they illustrate SVr4 curses mouse controls - T.Dickey
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+xtermm|xterm terminal emulator (monocrome):\
+	:am:bs:km:mi:ms:xn:\
+	:BT#3:co#80:it#8:li#24:\
+	:@7=\E[Y:@8=\EOM:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
+	:F1=\EOZ:F2=\EOA:Gm=\E[%p1%dY:IC=\E[%d@:K1=\EOq:K2=\EOr:\
+	:K3=\EOs:K4=\EOp:K5=\EOn:Km=\E[^_:LE=\E[%dD:RI=\E[%dC:\
+	:RQ=\E[492Z:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[L:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:eA=\E(B\E)0:ei=:ho=\E[H:\
+	:ic=\E[@:im=:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:k9=\EOX:k;=\EOY:kN=\E[U:\
+	:kP=\E[V:kb=^H:kd=\EOB:kh=\E[H:kl=\EOD:kr=\EOC:ku=\EOA:\
+	:le=\E[1D:mb=@:md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:\
+	:r1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:te=\E@0\E[?4r:\
+	:ti=\E@0\E[?4s\E[?4h\E@1:up=\E[A:
+
+xtermc|xterm terminal emulator (color):\
+	:Co#8:NC#7:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:\
+	:..Sb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m:\
+	:..Sf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m:\
+	:op=\E[100m:\
+	:tc=xtermm:
+
+# From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995
+# Here's a termcap entry I've been using for xterm_color, which comes
+# with BSD/OS 2.0, and the X11R6 contrib tape too I think.  Besides the
+# color stuff, I also have a status line defined as the window manager
+# title bar. [I have translated it to terminfo -- ESR]
+xterm-pcolor|xterm with color used for highlights and status line:\
+	:md=\E[1m\E[43m:mr=\E[7m\E[34m:so=\E[7m\E[31m:\
+	:us=\E[4m\E[42m:\
+	:tc=xterm+sl:tc=xterm-r6:
+
+# HP ships this, except for the pb#9600 which was merged in from BSD termcap.
+# (hpterm: added empty <acsc>, we have no idea what ACS chars look like --esr)
+hpterm|X-hpterm|hp X11 terminal emulator:\
+	:am:da:db:mi:xs:\
+	:Nl#8:co#80:lh#2:li#24:lm#0:lw#8:pb#9600:sg#0:\
+	:LF=\E&j@:LO=\E&jB:ac=:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:\
+	:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:\
+	:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:dl=\EM:do=\EB:ei=\ER:im=\EQ:\
+	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:\
+	:kA=\EL:kC=\EJ:kD=\EP:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:\
+	:kM=\ER:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:kb=^H:\
+	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:\
+	:ku=\EA:le=^H:md=\E&dB:me=\E&d@:mh=\E&dH:ml=\El:mr=\E&dB:\
+	:mu=\Em:nd=\EC:..pk=\E&f%p1%dk%p2%l%dL%p2%s:\
+	:..pl=\E&f1a%p1%dk%p2%l%dL%p2%s:\
+	:..pn=\E&f%p1%dk%p2%l%dd0L%p2%s:\
+	:..px=\E&f2a%p1%dk%p2%l%dL%p2%s:\
+	:..sa=\E&d%?%p7%t%{115}%c%;%p1%p3%|%p6%|%{2}%*%p2%{4}%*%+%p4%+%p5%{8}%*%+%{64}%+%c%?%p9%t%'\016'%c%e%'\017'%c%;:\
+	:se=\E&d@:sf=^J:so=\E&dJ:sr=\ET:st=\E1:ta=^I:ue=\E&d@:\
+	:up=\EA:us=\E&dD:
+
+# This entry describes an xterm with Sun-style function keys enabled
+# via the X resource setting "xterm*sunFunctionKeys:true"
+# To understand <kf11>/<kf12> note that L1,L2 and F11,F12 are the same.
+# The <kf13>...<kf20> keys are L3-L10.  We don't set <kf16=\E[197z>
+# because we want it to be seen as <kcpy>. 
+# The <kf31>...<kf45> keys are R1-R15.  We treat some of these in accordance
+# with their Sun keyboard labels instead.
+# From: Simon J. Gerraty <sjg@zen.void.oz.au> 10 Jan 1996
+xterm-sun|xterm with sunFunctionKeys true:\
+	:%1=\E[196z:&8=\E[195z:@0=\E[200z:@5=\E[197z:@7=\E[220z:\
+	:F1=\E[192z:F2=\E[193z:F3=\E[194z:F4=\E[195z:F5=\E[196z:\
+	:F7=\E[198z:F8=\E[199z:F9=\E[200z:FA=\E[201z:FL=\E[208z:\
+	:FM=\E[209z:FN=\E[210z:FO=\E[211z:FP=\E[212z:FQ=\E[213z:\
+	:FS=\E[215z:FU=\E[217z:FW=\E[219z:FY=\E[221z:K2=\E[218z:\
+	:k1=\E[224z:k2=\E[225z:k3=\E[226z:k4=\E[227z:k5=\E[228z:\
+	:k6=\E[229z:k7=\E[230z:k8=\E[231z:k9=\E[232z:k;=\E[233z:\
+	:kI=\E[2z:kN=\E[222z:kP=\E[216z:kh=\E[214z:\
+	:tc=xterm:
+xterms-sun|small (80x24) xterm with sunFunctionKeys true:\
+	:co#80:li#24:tc=xterm-sun:
+
+# This is for the extensible terminal emulator on the X11R6 contrib tape.
+emu|emu native mode:\
+	:mi:ms:xo:\
+	:Co#15:co#80:it#8:li#24:pa#64:vt#200:\
+	:*6=\Esel:@0=\Efind:@8=^M:AB=\Es%i%p1%d;:AF=\Er%i%p1%d;:\
+	:AL=\EQ%d;:DC=\EI%d;:DL=\ER%d;:DO=\Ep%d;:F1=\EF11:\
+	:F2=\EF12:F3=\EF13:F4=\EF14:F5=\EF15:F6=\EF16:F7=\EF17:\
+	:F8=\EF18:F9=\EF19:FA=\EF20:LE=\Eq-%d;:RI=\Eq%d;:\
+	:UP=\Ep-%d;:\
+	:ac=61a\202f\260g2j\213k\214l\215m\216n\217o\220q\222s\224t\225u\226v\227w\230x\231~\244:\
+	:ae=\0:al=\EQ1;:as=\0:bl=^G:cb=\EL:cd=\EN:ce=\EK:\
+	:cl=\EP\EE0;0;:cm=\EE%d;%d;:cr=^M:cs=\Ek%d;%d;:ct=\Ej:\
+	:dc=\EI1;:dl=\ER1;:do=\EB:eA=\0:ec=\Ej%d;:ei=\EX:\
+	:ho=\EE0;0;:im=\EY:is=\ES\Er0;\Es0;:k0=\EF00:k1=\EF01:\
+	:k2=\EF02:k3=\EF03:k4=\EF04:k5=\EF05:k6=\EF06:k7=\EF07:\
+	:k8=\EF08:k9=\EF09:k;=\EF10:kD=\177:kI=\Eins:kN=\Enext:\
+	:kP=\Eprior:kb=^H:kd=\EB:kl=\EC:kr=\ED:ku=\EA:le=^H:\
+	:mb=\ES\EW:md=\ES\EU:me=\ES:mr=\ES\ET:nd=\ED:\
+	:oc=\Es0;\Er0;:r2=\ES\Es0;\Er0;:se=\ES:sf=\EG:so=\ES\ET:\
+	:sr=\EF:st=\Eh:ta=^I:ue=\ES:up=\EA:us=\ES\EV:ve=\Ea:vi=\EZ:\
+	:vs=\Ea:
+
+######## COMMERCIAL WORKSTATION CONSOLES
+#
+
+#### Alpha consoles
+#
+
+# This is from the OSF/1 Release 1.0 termcap file
+pccons|pcconsole|ANSI (mostly) Alpha PC console terminal emulation:\
+	:am:xo:\
+	:co#80:li#25:\
+	:al=\E[L:bl=^G:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:dc=\E[P:dl=\E[M:do=^J:ei=:ho=\E[H:ic=\E[@:im=:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nw=^M^J:se=\E[m:so=\E[7m:ta=^I:up=\E[A:
+
+#### AT&T consoles
+#
+
+# This actually describes the generic SVr4 display driver for Intel boxes.
+# The :mh=\E[2m: isn't documented and therefore may not be reliable.
+# From: Eric Raymond <esr@snark.thyrsus.com> Mon Nov 27 19:00:53 EST 1995
+att6386|at386|386at|AT&T WGS 6386 console:\
+	:am:bw:eo:xo:\
+	:co#80:it#8:li#25:\
+	:@7=\E[Y:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\EOZ:\
+	:F2=\EOA:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:\
+	:SR=\E[%dT:UP=\E[%dA:\
+	:ac=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~:\
+	:ae=\E[10m:al=\E[1L:as=\E[12m:bl=^G:bt=\E[Z:cd=\E[J:\
+	:ce=\E[K:ch=\E[%i%dG:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
+	:ct=\E[2g:cv=\E[%i%dd:dc=\E[P:dl=\E[1M:do=\E[B:ec=\E[%dX:\
+	:ei=:ho=\E[H:ic=\E[1@:im=:is=\E[0;10;39m:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:k9=\EOX:\
+	:k;=\EOY:kB=^]:kD=\E[P:kI=\E[@:kM=\E0:kN=\E[U:kP=\E[V:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:\
+	:md=\E[1m:me=\E[0;10m:mh=\E[2m:mk=\E[9m:mr=\E[7m:nd=\E[C:\
+	:nw=\r\E[S:rc=\E8:\
+	:..sa=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m:\
+	:sc=\E7:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:st=\EH:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[=1C:vi=\E[=C:\
+	:tc=klone+color:
+# (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
+pc6300plus|AT&T 6300 plus:\
+	:am:bs:xo:\
+	:co#80:li#24:\
+	:al=\E[1L:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[H:\
+	:cm=\E[%i%2;%2H:cr=^M:ct=\E[3g:dc=\E[1P:dl=\E[1M:do=\E[B:\
+	:ei=:ho=\E[H:ic=\E[1@:im=:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:\
+	:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:k9=\EOk:k;=\EOu:kb=^H:\
+	:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mh=\E[2m:mk=\E[9m:mr=\E[7m:nd=\E[C:nw=^M^J:\
+	:se=\E[m:sf=^J:so=\E[7m:st=\EH:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[=1C:vi=\E[=C:
+
+# From: Benjamin C. W. Sittler <bsittler@nmt.edu>
+#
+# I have a UNIX PC which I use as a terminal attached to my Linux PC.
+# Unfortunately, the UNIX PC terminfo entry that comes with ncurses
+# is broken. All the special key sequences are broken, making it unusable
+# with Emacs. The problem stems from the following:
+# 
+# The UNIX PC has a plethora of keys (103 of them, and there's no numeric
+# keypad!), loadable fonts, and strange highlighting modes ("dithered"
+# half-intensity, "smeared" bold, and real strike-out, for example.) It also
+# uses resizable terminal windows, but the bundled terminal program always
+# uses an 80x24 window (and doesn't support seem to support a 132-column
+# mode.) 
+# 
+# HISTORY: The UNIX PC was one of the first machines with a GUI, and used a
+# library which was a superset of SVr3.5 curses (called tam, for "terminal
+# access method".) tam includes support for real, overlapping windows,
+# onscreen function key labels, and bitmap graphics. But since the primary
+# user interface on the UNIX PC was a GUI program (ua, for "user
+# assistant",) and remote administration was considered important for the
+# machine, tam also supported VT100-compatible terminals attached to the
+# serial port or used across the StarLan network. To simulate the extra keys
+# not present on a VT100, users could press ESC and a two-letter sequence,
+# such as u d (Undo) or U D (Shift-Undo.) These two-letter sequences,
+# however, were not the same as those sent by the actual Undo key. The
+# actual Undo key sends ESC 0 s unshifted, and ESC 0 S shifted, for example.
+# (If you're interested in adding some of the tam calls to ncurses, btw, I
+# have the full documentation and several programs which use tam. It also
+# used an extended terminfo format to describe key sequences, special
+# highlighting modes, etc.) 
+# 
+# KEYS: This means that ncurses would quite painful on the UNIX PC, since
+# there are two sequences for every key-modifier combination (local keyboard
+# sequence and remote "VT100" sequence.) But I doubt many people are trying
+# to use ncurses on the UNIX PC, since ncurses doesn't properly handle the
+# GUI. Unfortunately, the terminfo entry (and the termcap, too, I presume) 
+# seem to have been built from the manual describing the VT100 sequences. 
+# This means it doesn't work for a real live UNIX PC. 
+# 
+# FONTS: The UNIX PC also has a strange interpretation of "alternate
+# character set". Rather than the VT100 graphics you might expect, it allows
+# up to 8 custom fonts to be loaded at any given time. This means that
+# programs expecting VT100 graphics will usually be disappointed. For this
+# reason I have disabled the smacs/rmacs sequences, but they could easily be
+# re-enabled. Here are the relevant control sequences (from the ESCAPE(7) 
+# manpage), should you wish to do so: 
+# 
+# SGR10 - Select font 0 - ESC [ 10 m or SO
+# SGR11 - Select font 1 - ESC [ 11 m or SI
+# SGR12 - Select font 2 - ESC [ 12 m
+# ... (etc.)
+# SGR17 - Select font 7 - ESC [ 17 m
+# 
+# Graphics for line drawing are not reliably found at *any* character
+# location because the UNIX PC has dynamically reloadable fonts. I use font
+# 0 for regular text and font 1 for italics, but this is by no means
+# universal. So ASCII line drawing is in order if smacs/rmacs are enabled.
+# 
+# MISC: The cursor visible/cursor invisible sequences were swapped in the
+# distributed terminfo.
+# 
+# To ameliorate these problems (and fix a few highlighting bugs) I rewrote
+# the UNIX PC terminfo entry. The modified version works great with Lynx,
+# Emacs, and XEmacs running on my Linux PC and displaying on the UNIX PC
+# attached by serial cable. In Emacs, even the Undo key works, and many
+# applications can now use the F1-F8 keys. 
+# 
+# esr's notes:
+#	Terminfo entry for the AT&T Unix PC 7300
+#	from escape(7) in Unix PC 7300 Manual.
+#	Somewhat similar to a vt100-am (but different enough
+#	to redo this from scratch.)
+#
+#	/***************************************************************
+#	*
+#	*           FONT LOADING PROGRAM FOR THE UNIX PC
+#	*
+#	*     This routine loads a font defined in the file ALTFONT
+#	*     into font memory slot #1.  Once the font has been loaded,
+#	*     it can be used as an alternative character set.
+#	*
+#	*     The call to ioctl with the argument WIOCLFONT is the key 
+#	*     to this routine.  For more information, see window(7) in 
+#	*     the PC 7300 documentation.
+#	***************************************************************/
+#	#include <string.h>		/* needed for strcpy call */
+#	#include <sys/window.h>         /* needed for ioctl call */
+#	#define FNSIZE	60		/* font name size */
+#	#define ALTFONT  "/usr/lib/wfont/special.8.ft"  /* font file */
+#	/*
+#	*     The file /usr/lib/wfont/special.8.ft comes with the
+#	*     standard PC software.  It defines a graphics character set
+#	*     similar to that of the Teletype 5425 terminal.  To view
+#	*     this or other fonts in /usr/lib/wfont, use the command
+#	*     cfont <filename>.  For further information on fonts see
+#	*     cfont(1) in the PC 7300 documentation.
+#	*/
+#	
+#	struct altfdata 	/* structure for alt font data */
+#	{
+#	short	altf_slot;		/* memory slot number */
+#	char	altf_name[FNSIZE];	/* font name (file name) */
+#	};
+#	ldfont()
+#	{
+#		int wd;		/* window in which altfont will be */
+#		struct altfdata altf;
+#		altf.altf_slot=1;
+#		strcpy(altf.altf_name,ALTFONT);
+#		for (wd =1; wd < 12; wd++) {
+#		     ioctl(wd, WIOCLFONT,&altf);
+#	        }
+#	}
+#
+# (att7300: added :vi:/:ve:/:ic:/<invis> from the BSDI entry,
+# they're confirmed by the man page for the System V display---esr)
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att7300|unixpc|pc7300|3b1|s4|AT&T UNIX PC Model 7300:\
+	:am:xo:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
+	:UP=\E[%dA:al=\E[L:bl=^G:bt=\E^I:cd=\E[0J:ce=\E[0K:\
+	:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=:ho=\E[H:i1=\017\E[=1w:ic=\E[@:im=:k1=\EOc:\
+	:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
+	:kD=\ENf:kI=\ENj:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[9m:md=\E[1m:\
+	:me=\E[0;10m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:se=\E[m:\
+	:sf=^J:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[=0C:\
+	:vi=\E[=1C:
+
+#### Hewlett-Packard consoles
+#
+# These are descriptions for the HP700 series, the workstations formerly
+# known as Apollos.  HP terminals are described elsewhere in the file
+#
+
+# From: Victor Duchovni <vic@fine.princeton.edu>
+# (hp700-wy: removed obsolete ":nl=^J:";
+# replaced /usr/share/tabset/hp700-wy with std because :it#8:,:st=\E1: -- esr)
+hp700-wy|HP700/41 emulating wyse30:\
+	:am:bs:bw:mi:ms:\
+	:co#80:it#8:li#24:sg#1:\
+	:al=0.7*\EE:bt=\EI:cd=\EY:ce=10\ET:cl=^Z:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E0:cv=\E[%+ :dc=\EW:dl=\ER:do=^V:ei=\Er:ho=^^:\
+	:i1=\E~"\EC\Er\E(\EG0\003\E`9\E`1:\
+	:if=/usr/share/tabset/stdcrt:im=\Eq:kB=\EI:kC=^Z:kE=\ET:\
+	:kI=\Eq:kM=\Er:kS=\EY:kT=\EI:kb=\177:kd=^V:kh=^^:kl=^H:kr=^L:\
+	:ku=^K:le=^H:ll=^^^K:me=10\EG0:nd=^L:se=10\EG0:so=10\EG4:\
+	:sr=\Ej:st=\E1:ta=^I:ue=10\EG0:up=^K:us=10\EG8:
+hp70092|hp70092a|hp70092A|HP 700/92:\
+	:am:da:db:xs:\
+	:Nl#8:co#80:lh#2:li#24:lm#0:lw#8:\
+	:LF=\E&j@:LO=\E&jB:ac=0cjgktlrmfn/q\054t5u6v8w7x.:ae=^O:\
+	:al=\EL:as=^N:bl=^G:bt=\Ei:ce=\EK:ch=\E&a%dC:\
+	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:cv=\E&a%dY:\
+	:dc=\EP:dl=\EM:do=\EB:ei=\ER:im=\EQ:k1=\Ep:k2=\Eq:k3=\Er:\
+	:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kA=\EL:kC=\EJ:kD=\EP:\
+	:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:kM=\ER:kN=\EU:kP=\EV:\
+	:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:ku=\EA:le=^H:mb=\E&dA:\
+	:md=\E&dB:me=\E&d@:mh=\E&dH:mr=\E&dB:nd=\EC:se=\E&d@:\
+	:so=\E&dJ:sr=\ET:st=\E1:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
+
+#  HP 700/44 Setup parameters:  
+# Terminal Mode		HP-PCterm
+# Inhibit Auto Wrap	NO
+# Status Line		Host Writable
+# PC Character Set	YES
+# Twenty-Five Line Mode	YES
+# XON/XOFF		@128 or 64 (sc)
+# Keycode Mode 		NO   or YES (sc)
+# Backspace Key		BS or BS/DEL
+#
+# :is: 	sets pcterm; autowrap; 25 lines; pc char set; prog DEL key; 
+# \E\\? does not turn off keycode mode
+# <smsc>	sets alternate start/stop; keycode on
+hpansi|hp700|hewlett packard 700/44 in HP-PCterm mode:\
+	:am:eo:xn:xo:\
+	:co#80:li#25:\
+	:@7=\E[4~:RA=\E[?7l:S4=\E[>11h\EPO**x0/65;1/67\E\:\
+	:S5=\E[>11l\EP1**x0/11;1/13\E[m\E\:SA=\E[?7h:XF=g:XN=e:\
+	:ac=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263:\
+	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:ic=\E[@:im=:\
+	:is=\E[44"p\E[?7h\E[>10h\E[>12h\EP1;1|3/7F\E\:\
+	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
+	:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[26~:k;=\E[28~:\
+	:kB=\E[Z:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[1~:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:me=\E[m:nd=\E[C:se=\E[m:sf=^J:\
+	:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:\
+	:vi=\E[?25l:
+
+#### Iris consoles
+#
+
+# Sent by Stefan Stapelberg <stefan@rent-a-guru.de>, 24 Feb 1997, this is
+# from SGI's terminfo database.  SGI's entry shows F9-F12 with the codes
+# for the application keypad mode.  We have added iris-ansi-ap rather than
+# change the original to keypad mode.
+#
+# (iris-ansi: added rmam/smam based on init string -- esr)
+#
+# This entry, and those derived from it, is used in xwsh (also known as
+# winterm).  Some capabilities that do not fit into the terminfo model
+# include the shift- and control-functionkeys:
+#
+# F1-F12 generate different codes when shift or control modifiers are used.
+# For example:
+#	F1      	\E[001q
+#	shift F1	\E[013q
+#	control-F1	\E[025q
+#
+# In application keypad mode, F9-F12 generate codes like vt100 PF1-PF4, i.e.,
+# \EOP to \EOS.  The shifted and control modifiers still do the same thing.
+#
+# The cursor keys also have different codes:
+#	control-up	\E[162q
+#	control-down	\E[165q
+#	control-left	\E[159q
+#	control-right	\E[168q
+#
+#	shift-up	\E[161q
+#	shift-down	\E[164q
+#	shift-left	\E[158q
+#	shift-right	\E[167q
+#
+#	control-tab	\[072q
+#
+# iris-ansi-net alias helps with IRIX does when you rsh to a remote system. 
+iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100):\
+	:am:\
+	:co#80:it#8:li#40:\
+	:!2=\E[218q:#2=\E[143q:#4=\E[158q:%9=\E[209q:%f=\E[210q:\
+	:%i=\E[167q:&7=\E[217q:*4=\E[P:*7=\E[147q:@7=\E[146q:\
+	:@8=^M:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:F1=\E[011q:\
+	:F2=\E[012q:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:\
+	:UP=\E[%dA:al=\E[L:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dl=\E[M:do=^J:\
+	:ho=\E[H:is=\E[?1l\E>\E[?7h\E[100g\E[0m\E7\E[r\E8:\
+	:k1=\E[001q:k2=\E[002q:k3=\E[003q:k4=\E[004q:k5=\E[005q:\
+	:k6=\E[006q:k7=\E[007q:k8=\E[008q:k9=\E[009q:k;=\E[010q:\
+	:kB=\E[Z:kD=\177:kI=\E[139q:kM=\E[146q:kN=\E[154q:\
+	:kP=\E[150q:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=\E[D:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:pk=\EP101;%d.y%s\E\:rc=\E8:sc=\E7:se=\E[m:sf=\ED:\
+	:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[9/y\E[12/y\E[=6l:vs=\E[10/y\E[=1h\E[=2l\E[=6h:
+iris-ansi-ap|IRIS ANSI in application-keypad mode:\
+	:@8=\EOM:F1=\E[011q:F2=\E[012q:is=\E[?1l\E=\E[?7h:\
+	:k9=\E[009q:k;=\E[010q:\
+	:tc=iris-ansi:
+
+# From the man-page, this is a quasi-vt100 emulator that runs on SGI's IRIX
+# (T.Dickey 98/1/24)
+iris-color|xwsh|IRIX ANSI with color:\
+	:NC#33:\
+	:DC=\E[%dP:IC=\E[%d@:ZH=\E[3m:ZR=\E[23m:cs=\E[%i%d;%dr:\
+	:ec=\E[%dX:ei=:im=:mh=\E[2m:r1=\Ec:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:sc=\E7:\
+	:u6=\E[%i%d;%dR:u7=\E[6n:u8=\E[?1;2c:u9=\E[c:ue=\E[24m:\
+	:tc=klone+color:tc=iris-ansi-ap:
+
+# (wsiris: this had extension capabilities
+#	:HS=\E7F2:HE=\E7F7:\
+#	:CT#2:CZ=*Bblack,red,green,yellow,blue,magenta,cyan,*Fwhite:
+# See the note on Iris extensions near the end of this file.  
+# Finally, removed suboptimal :cl:=\EH\EJ and added :do: & 
+# :vb: from BRL -- esr)
+wsiris|iris40|iris emulating a 40 line visual 50 (approximately):\
+	:am:bs:nc:pt:\
+	:co#80:it#8:kn#3:li#40:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\Ev:cm=\EY%+ %+ :dl=\EM:\
+	:do=\EB:ho=\EH:is=\E7B0\E7F7\E7C2\E7R3:k0=\E0:k1=\E1:\
+	:k2=\E2:k3=\E3:k4=\E4:k5=\E5:k6=\E6:k7=\E7:k8=\E8:k9=\E9:\
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:me=\E7F7:mh=\E7F2:nd=\EC:\
+	:nl=\EB:se=\E0@:sf=^J:so=\E9P:sr=\EI:ta=^I:ue=\E7R3\E0@:\
+	:up=\EA:us=\E7R2\E9P:vb=\E7F4\E7B1\013\E7F7\E7B0:ve=\E>:\
+	:vs=\E;:
+
+#### NeWS consoles
+#
+# Console terminal windows under the NeWS (Sun's Display Postscript windowing
+# environment).   Note: these have nothing to do with Sony's News workstation
+# line.
+#
+
+# Entry for NeWS's psterm from Eric Messick & Hugh Daniel
+# (psterm: unknown ":sl=\EOl:el=\ENl:" removed -- esr)
+psterm|psterm-basic|NeWS psterm-80x34:\
+	:am:bs:hs:km:ul:\
+	:co#80:it#8:li#34:\
+	:al=\EA:cd=\EB:ce=\EC:cl=^L:cm=\E%d;%d;:cs=\EE%d;%d;:\
+	:dc=\EF:dl=\EK:do=\EP:ei=\ENi:fs=\ENl:ho=\ER:i1=\EN*:\
+	:im=\EOi:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=\ET:ll=\EU:\
+	:mb=\EOb:md=\EOd:me=\EN*:mr=\EOr:nd=\EV:rc=^\:sc=^]:se=\ENo:\
+	:sf=\EW:so=\EOo:sr=\EX:ta=^I:te=\ENt:ti=\EOt:ts=\EOl:\
+	:ue=\ENu:up=\EY:us=\EOu:vb=\EZ:
+psterm-96x48|NeWS psterm 96x48:\
+	:co#96:li#48:tc=psterm:
+psterm-90x28|NeWS psterm 90x28:\
+	:co#90:li#28:tc=psterm:
+psterm-80x24|NeWS psterm 80x24:\
+	:co#80:li#24:tc=psterm:
+# This is a faster termcap for psterm.  Warning:  if you use this termcap,
+# some control characters you type will do strange things to the screen.
+# (psterm-fast: unknown ":sl=^Ol:el=^Nl:" -- esr)
+psterm-fast|NeWS psterm fast version (flaky ctrl chars):\
+	:am:bs:hs:km:ul:\
+	:co#80:it#8:li#34:\
+	:al=^A:cd=^B:ce=^C:cl=^L:cm=\004%d;%d;:cs=\005%d;%d;:dc=^F:\
+	:dl=^K:do=^P:ei=^Ni:fs=^Nl:ho=^R:i1=^N*:im=^Oi:kd=\E[B:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^T:ll=^U:mb=^Ob:md=^Od:me=^N*:\
+	:mr=^Or:nd=^V:rc=^\:sc=^]:se=^No:sf=^W:so=^Oo:sr=^X:ta=^I:\
+	:te=^Nt:ti=^Ot:ts=^Ol:ue=^Nu:up=^Y:us=^Ou:vb=^Z:
+
+#### NeXT consoles
+#
+# Use `glasstty' for the Workspace application
+#
+
+# From: Dave Wetzel <dave@turbocat.snafu.de> 22 Dec 1995
+next|NeXT console:\
+	:am:xt:\
+	:co#80:it#8:li#24:\
+	:bl=^G:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:cr=^M:do=^J:ho=\E[H:\
+	:kb=^H:kd=^J:kl=^H:le=^H:me=\E[m:nd=\E[C:nw=^M^J:se=\E[4;1m:\
+	:sf=^J:so=\E[4;2m:ta=^I:up=\E[A:
+nextshell|NeXT Shell application:\
+	:am:\
+	:co#80:\
+	:bl=^G:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:ta=^I:
+
+#### SCO consoles
+#
+
+# SCO console and SOS-Syscons console for 386bsd
+# (scoansi: had unknown capabilities
+#	:Gc=N:Gd=K:Gh=M:Gl=L:Gu=J:Gv=\072:\
+#	:GC=E:GD=B:GH=D:GL=\64:GU=A:GV=\63:GR=C:
+#	:G1=?:G2=Z:G3=@:G4=Y:G5=;:G6=I:G7=H:G8=<:\
+#	:CW=\E[M:NU=\E[N:RF=\E[O:RC=\E[P:\
+#	:WL=\E[S:WR=\E[T:CL=\E[U:CR=\E[V:\
+# I renamed GS/GE/HM/EN/PU/PD/RT and added klone+sgr-dumb, based
+# on the :as:=\E[12m  -- esr)
+# SCO function keys and <acsc> corrected by Thomas Dickey.
+# In this description based on SCO's keyboard(HW) manpage list of default function key
+# values:
+#	F13-F24 are shifted F1-F12
+#	F25-F36 are control F1-F12
+#	F37-F48 are shift+control F1-F12
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+scoansi|SCO Extended ANSI standard crt:\
+	:am:eo:xo:\
+	:Co#8:co#80:it#8:li#25:pa#64:\
+	:@1=\E[E:@7=\E[F:AB=\E[4%p1%dm:AF=\E[3%p1%dm:F1=\E[W:\
+	:F2=\E[X:F3=\E[Y:F5=\E[a:F6=\E[b:F7=\E[c:F8=\E[d:F9=\E[e:\
+	:FA=\E[f:FB=\E[g:FC=\E[h:FD=\E[i:FE=\E[j:FF=\E[k:FG=\E[l:\
+	:FH=\E[m:FI=\E[n:FJ=\E[o:FK=\E[p:FL=\E[q:FM=\E[r:FN=\E[s:\
+	:FO=\E[t:FP=\E[u:FQ=\E[v:FR=\E[w:FS=\E[x:FT=\E[y:FU=\E[z:\
+	:FV=\E[@:FW=\E[[:FX=\E[\:FY=\E[]:FZ=\E[\136:Fa=\E[_:\
+	:Fb=\E[`:Fc=\E[{:\
+	:ac=0[5566778899\072\072;;<<==>>FFGGHHIIJJKKLLMMNNOOPPQQRRSSTTUUVVWWXX`ja0fxgqh2jYk?lZm@nEqDtCu4vAwBx3~y:\
+	:ae=\E[10m:al=\E[L:as=\E[12m:bt=\E[Z:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
+	:ho=\E[H:ic=\E[@:im=:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:\
+	:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:k;=\E[V:kB=\E[Z:\
+	:kI=\E[L:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[0;10m:\
+	:mk=\E[8m:mr=\E[7m:nd=\E[C:op=\E[37;40m:se=\E[m:sf=\E[S:\
+	:so=\E[7m:sr=\E[T:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+
+#### Sun consoles
+#
+
+# :is1: resets scrolling region in case a previous user had used "tset vt100"
+oldsun|Sun Microsystems Workstation console:\
+	:am:bs:km:mi:ms:\
+	:co#80:it#8:li#34:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:al=\E[L:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=:i1=\E[1r:ic=\E[@:im=:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:ta=^I:up=\E[A:
+# From: Alexander Lukyanov <lav@video.yars.free.net>, 14 Nov 1995
+# :li: capability later corrected by J.T. Conklin <jtc@cygnus.com>
+# SGR 1, 4 aren't supported - removed bold/underline (T.Dickey 17 Jan 1998)
+sun-il|Sun Microsystems console with working insert-line:\
+	:am:km:ms:\
+	:co#80:li#34:\
+	:%7=\E[194z:&5=\E[193z:&8=\E[195z:@7=\E[220z:AL=\E[%dL:\
+	:DC=\E[%dP:DL=\E[%dM:F1=\E[234z:F2=\E[235z:IC=\E[%d@:\
+	:K2=\E[218z:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=^L:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=:ic=\E[@:im=:\
+	:k1=\E[224z:k2=\E[225z:k3=\E[226z:k4=\E[227z:k5=\E[228z:\
+	:k6=\E[229z:k7=\E[230z:k8=\E[231z:k9=\E[232z:k;=\E[233z:\
+	:kD=\177:kN=\E[222z:kP=\E[216z:kb=^H:kd=\E[B:kh=\E[214z:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:md@:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r2=\E[s:\
+	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m:\
+	:se=\E[m:sf=^J:so=\E[7m:ta=^I:u8=\E[1t:u9=\E[11t:ue@:\
+	:up=\E[A:us@:
+# On a SparcStation 5, :al:/:AL: flake out on the last line.
+# Unfortunately, without them the terminal has no way to scroll.
+sun-ss5|Sun SparcStation 5 console:\
+	:AL@:al@:tc=sun-il:
+# If you are using an SS5, change the sun definition to use sun-ss5.
+sun|sun1|sun2|Sun Microsystems Inc. workstation console:\
+	:tc=sun-il:
+
+# From: <john@ucbrenoir>  Tue Sep 24 13:14:44 1985
+sun-s|Sun Microsystems Workstation window with status line:\
+	:hs:\
+	:ds=\E]l\E\:fs=\E\:ts=\E]l:tc=sun:
+sun-e-s|sun-s-e|Sun Microsystems Workstation with status hacked for emacs:\
+	:hs:\
+	:ds=\E]l\E\:fs=\E\:ts=\E]l:tc=sun-e:
+sun-48|Sun 48-line window:\
+	:co#80:li#48:tc=sun:
+sun-34|Sun 34-line window:\
+	:co#80:li#34:tc=sun:
+sun-24|Sun 24-line window:\
+	:co#80:li#24:tc=sun:
+sun-17|Sun 17-line window:\
+	:co#80:li#17:tc=sun:
+sun-12|Sun 12-line window:\
+	:co#80:li#12:tc=sun:
+sun-1|Sun 1-line window for sysline:\
+	:es:hs:\
+	:co#80:li#1:\
+	:ds=^L:fs=\E[K:ts=^M:tc=sun:
+sun-e|sun-nic|sune|Sun Microsystems Workstation without insert character:\
+	:ei@:ic@:im@:\
+	:tc=sun:
+sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history:\
+	:li#35:\
+	:te=\E[>4h:ti=\E[>4l:tc=sun:
+
+#### Common Desktop Environment
+#
+
+# This ships with Sun's CDE in Solaris 2.5
+# Corrected Sun Aug 9 1998 by Alexander V. Lukyanov <lav@video.yars.free.net>
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+dtterm|CDE desktop terminal:\
+	:am:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:lm#0:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
+	:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E F\E>\E[?1l\E[?7h\E[?45l:k1=\E[11~:k2=\E[12~:\
+	:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:rc=\E8:sc=\E7:se=\E[22;27m:sf=\ED:so=\E[2;7m:sr=\EM:\
+	:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\
+	:ve=\E[?25h:vi=\E[?25l:
+
+#### Mach
+#
+
+# From: Matthew Vernon <mcv21@pick.sel.cam.ac.uk>
+mach|Mach Console:\
+	:am:km:\
+	:co#80:it#8:li#25:\
+	:@7=\E[Y:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\Ec:\
+	:cm=\E[%i%d;%dH:cr=^M:dl=\E[M:do=^J:ho=\E[H:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:\
+	:k9=\EOX:k;=\EOY:kD=\E[9:kH=\E[F:kI=\E[@:kN=\E[U:kP=\E[V:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[0m:mr=\E[7m:nd=\E[C:nw=^M^J:\
+	:se=\E[0m:sf=^J:so=\E[7m:ta=^I:up=\E[A:
+mach-bold|Mach Console with bold instead of underline:\
+	:ue=\E[0m:us=\E[1m:\
+	:tc=mach:
+
+#### OSF Unix
+#
+
+# OSF/1 1.1 Snapshot 2
+pmcons|pmconsole|PMAX console:\
+	:am:\
+	:co#128:li#57:\
+	:bl=^G:cl=^L:cr=^M:do=^J:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:sf=^J:ta=^I:up=^K:
+
+######## UNIX VIRTUAL TERMINALS AND TELNET CLIENTS
+#
+
+#### FSF virtual terminal types
+#
+
+# The codes supported by the term.el terminal emulation in GNU Emacs 19.30 
+eterm|gnu emacs term.el terminal emulation:\
+	:am:mi:xn:\
+	:co#80:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:cb=\E[1K:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
+	:im=\E[4h:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:se=\E[m:\
+	:sf=^J:so=\E[7m:ta=^I:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
+
+# Entries for use by the `screen' program by Juergen Weigert, 
+# Michael Schroeder, Oliver Laumann.  The screen and
+# screen-w entries came with version 3.7.1.  The screen2 and screen3 entries
+# come from University of Wisconsin and may be older.
+# (screen: added :ve: on ANSI model -- esr)
+# (screen: added <el1> -- TD)
+
+screen|VT 100/ANSI X3.64 virtual terminal:\
+	:am:km:mi:ms:xn:\
+	:Co#8:co#80:it#8:li#24:pa#64:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[23~:\
+	:F2=\E[24~:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
+	:ac=++\054\054--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:eA=\E(B\E)0:ei=\E[4l:\
+	:ho=\E[H:im=\E[4h:is=\E)0:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
+	:k;=\E[21~:kD=\E[3~:kH=\E[4~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:\
+	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:r2=\Ec:rc=\E8:sc=\E7:se=\E[23m:\
+	:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\EM:\
+	:us=\E[4m:vb=\Eg:ve=\E[34h\E[?25h:vi=\E[?25l:vs=\E[34l:\
+	:tc=ecma+color:
+
+screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\
+	:co#132:tc=screen:
+
+screen2|old VT 100/ANSI X3.64 virtual terminal:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bt=\E[Z:cd=\E[J:\
+	:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ic=:im=\E[4h:k0=\E~:\
+	:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:\
+	:k9=\E0I:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:\
+	:me=\E[m:nd=\E[C:nw=^M^J:r1=\Ec:rc=\E8:sc=\E7:se=\E[23m:\
+	:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:
+# (screen3: removed unknown ":xv:LP:G0:" -- esr)
+screen3|older VT 100/ANSI X3.64 virtual terminal:\
+	:km:mi:ms:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
+	:ho=\E[H:im=\E[4h:is=\E)0:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kb=^H:kd=\EOB:ke=\E>:kl=\EOD:kr=\EOC:ks=\E=:ku=\EOA:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:r1=\Ec:\
+	:rc=\E8:sc=\E7:se=\E[23m:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[24m:up=\EM:us=\E[4m:
+
+# Francesco Potorti <F.Potorti@cnuce.cnr.it>:
+# NCSA telnet is one of the most used telnet clients for the Macintosh.  It has
+# been maintained until recently by the National Center for Supercomputer
+# Applications, and it is feature rich, stable and free.  It can be downloaded
+# from www.ncsa.edu.  This terminfo description file is based on xterm-vt220,
+# xterm+sl, and the docs at NCSA.  It works well.
+#
+# NCSA Telnet 2.6 for Macintosh in vt220 8-bit emulation mode
+# The terminal options should be set as follows:
+#         Xterm sequences ON
+#         use VT wrap mode ON
+#         use Emacs arrow keys OFF
+#         CTRL-COMND is Emacs meta ON
+#         8 bit mode ON
+#         answerback string: "ncsa-vt220-8"
+#         setup keys: all disabled
+#
+# Application mode is not used.
+#
+# Other special mappings:
+#	Apple		VT220
+#	HELP 		Find
+#	HOME		Insert here
+#	PAGEUP		Remove
+#	DEL		Select
+#	END		Prev Screen
+#	PAGEDOWN	Next Screen
+#
+# Though it supports ANSI color, NCSA Telnet uses color to represent blinking
+# text.
+#
+# The status-line manipulation is a mapping of the xterm-compatible control
+# sequences for setting the window-title.  So you must use tsl and fsl in
+# pairs, since the latter ends the string that is loaded to the window-title.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in vt220-8 mode:\
+	:am:hs:km:mi:ms:xn:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E]0;\007:ei=\E[4l:fs=^G:ho=\E[H:\
+	:if=/usr/share/tabset/vt100:im=\E[4h:\
+	:is=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>:k1=\E[17~:\
+	:k2=\E[18:k3=\E[19~:k4=\E[20~:k5=\E[21~:k6=\E23~:\
+	:k7=\E[24~:k8=\E[25~:k9=\E[26~:kD=\E[4~:kN=\E[6~:kP=\E[3~:\
+	:kb=^H:kd=\E[B:kh=\E[2~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:\
+	:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:te=\E[2J\E8:ti=\E7:ts=\E]0;:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:
+ncsa|NCSA Telnet 2.7 for Macintosh in vt220-8 mode:\
+	:tc=ncsa-m:tc=klone+color:
+ncsa-ns|NCSA Telnet 2.7 for Macintosh in vt220-8 mode:\
+	:hs@:\
+	:ds@:fs@:ts@:tc=ncsa:
+ncsa-m-ns|NCSA Telnet 2.6 for Macintosh in vt220-8 mode:\
+	:hs@:\
+	:ds@:fs@:ts@:tc=ncsa-m:
+# alternate -TD:
+# The documented function-key mapping refers to the Apple Extended Keyboard
+# (e.g., NCSA Telnet's F1 corresponds to a VT220 F6).  We use the VT220-style
+# codes, however, since the numeric keypad (VT100) PF1-PF4 are available on
+# some keyboards and many applications require these as F1-F4.
+#
+ncsa-vt220|NCSA Telnet using vt220-compatible function keys:\
+	:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
+	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
+	:tc=ncsa:
+
+#### Pilot Pro Palm-Top
+#
+
+# From: Jason Downs <downsj@downsj.com>, 15 Jun 1997 (Top Gun Telnet's author)
+pilot|tgtelnet|Top Gun Telnet on the Palm Pilot Professional:\
+	:am:xn:\
+	:co#39:li#16:\
+	:bl=^G:cl=\Ec:cm=\Em%+ %+ :cr=^M:do=^J:ho=\Em  :kN=^L:kP=^K:\
+	:kb=^H:kd=^J:kl=^H:le=^H:nw=\Em~ :se=\EB:sf=^J:so=\Eb:ta=^I:
+
+######## NON-UNIX CONSOLES
+#
+
+#### MGR
+#
+# MGR is a Bell Labs window system lighter-weight than X.
+# These entries describe MGR's xterm-equivalent. 
+# They are courtesy of Vincent Broman <broman@nosc.mil> 14 Jan 1997 
+#
+
+mgr|Bellcore MGR (non X) window system terminal emulation:\
+	:am:km:\
+	:AL=\E%da:DC=\E%dE:DL=\E%dd:IC=\E%dA:RA=\E5S:SA=\E5s:\
+	:al=\Ea:bl=^G:cd=\EC:ce=\Ec:cl=^L:cm=\E%r%d;%dM:cr=^M:\
+	:cs=\E%d;%dt:dc=\EE:dl=\Ed:do=\Ef:ei=:hd=\E1;2f:hu=\E1;2u:\
+	:ic=\EA:im=:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:md=\E2n:me=\E0n:mr=\E1n:nd=\Er:nw=^M^J:se=\E0n:sf=^J:\
+	:so=\E1n:ta=^I:ue=\E0n:up=\Eu:us=\E4n:ve=\Eh:vi=\E9h:\
+	:vs=\E0h:
+mgr-sun|Mgr window with Sun keyboard:\
+	:%1=\E[207z:%6=\E[198z:&8=\E[195z:@0=\E[200z:@5=\E197z:\
+	:@7=\E[220z:@8=\E[250z:F1=\E[234z:F2=\E[235z:K1=\E[214z:\
+	:K2=\E[218z:K3=\E[216z:K4=\E[220z:K5=\E[222z:k1=\E[224z:\
+	:k2=\E[225z:k3=\E[226z:k4=\E[227z:k5=\E[228z:k6=\E[229z:\
+	:k7=\E[230z:k8=\E[231z:k9=\E[232z:k;=\E[233z:kN=\E[222z:\
+	:kP=\E[216z:kh=\E[214z:\
+	:tc=mgr:
+mgr-linux|Mgr window with Linux keyboard:\
+	:@7=\E[4~:F1=\E[23~:F2=\E[24~:K1=\E[H:K2=\E[G:K3=\E[5~:\
+	:K4=\E[Y:K5=\E[6~:k0=\E[[J:k1=\E[[A:k2=\E[[B:k3=\E[[C:\
+	:k4=\E[[D:k5=\E[[E:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
+	:k9=\E[20~:k;=\E[21~:kD=\E[3~:kN=\E[6~:kP=\E[5~:kh=\E[1~:tc=mgr:
+
+#### BeOS
+#
+# BeOS entry for Terminal program Seems to be almost ANSI
+beterm|BeOS Terminal:\
+	:am:eo:mi:ms:xn:xo:\
+	:Co#8:NC#5:co#80:it#8:li#25:pa#64:\
+	:&7=^Z:@7=\E[4~:AB=\E[4%p1%dm:AF=\E[3%p1%dm:AL=\E[%dL:\
+	:DC=\E[%dP:DL=\E[%dM:F1=\E[21~:F2=\E[22~:IC=\E[%d@:\
+	:Sb=\E[%+(m:Sf=\E[%+^^m:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
+	:ch=\E[%i%dG:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:cv=\E[%i%dd:dc=\E[P:dl=\E[M:do=^J:\
+	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:k1=\E[11~:k2=\E[12~:\
+	:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[16~:k7=\E[17~:\
+	:k8=\E[18~:k9=\E[19~:k;=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
+	:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:md=\E[1m:me=\E[0;10m:mr=\E[7m:nd=\E[C:nw=^M^J:\
+	:op=\E[m:r1=\Ec:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
+	:st=\EH:ta=^I:u6=\E[%i%d;%dR:u7=\E[6n:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:
+
+#### QNX
+#
+
+# QNX 4.0 Console
+# Michael's original version of this entry had <am@>, :ti=\Ei:,
+# :te=\Eh\ER:; this was so terminfo applications could write the lower
+# right corner without triggering a scroll.  The ncurses terminfo library can
+# handle this case with the :ic: capability, and prefers :am: for better
+# optimization.  Bug: The <op> capability resets attributes.
+# From: Michael Hunter <mphunter@qnx.com> 30 Jul 1996
+# (removed: :sa=%?%p1%t\E<%;%p2%t\E[%;%p3%t\E(%;%p4%t\E{%;%p6%t\E<%;,:)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+qnx|qnx4|qnx console:\
+	:km:mi:ms:xt:\
+	:co#80:it#4:li#25:\
+	:al=\EE:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
+	:dc=\Ef:dl=\EF:do=^J:ei=:ho=\EH:ic=\Ee:im=:k1=\377\201:\
+	:k2=\377\202:k3=\377\203:k4=\377\204:k5=\377\205:\
+	:k6=\377\206:k7=\377\207:k8=\377\210:k9=\377\211:\
+	:kD=\377\254:kI=\377\253:kN=\377\252:kP=\377\242:\
+	:kd=\377\251:kh=\377\240:kl=\377\244:kr=\377\246:\
+	:ku=\377\241:le=^H:mb=\E{:md=\E<:me=\E}\E]\E>\E):mr=\E(:\
+	:nd=\EC:rp=\Eg%r%+ %.:se=\E):sf=^J:so=\E(:sr=\EI:ta=^I:\
+	:te=\Eh\ER:ti=\Ei:ue=\E]:up=\EA:us=\E[:ve=\Ey1:vi=\Ey0:\
+	:vs=\Ey2:
+
+# From: Federico Bianchi <bianchi@pc-arte2.arte.unipi.it>, 1 Jul 1998
+# (esr: commented out <scp> and :te: to avoid warnings.)
+# (TD: derive from original qnx4 entry)
+qnxt2|qnx 2.15 serial terminal:\
+	:am:\
+	:!3@:%h@:%j@:&7@:Sb@:Sf@:dc@:ei=:ic@:im=:rp@:se=\E>:so=\E<:te@:ti@:\
+	:ve@:vi@:vs@:\
+	:tc=qnx4:
+
+#### DOS ANSI.SYS variants
+#
+# This completely describes the sequences specified in the DOS 2.1 ANSI.SYS
+# documentation (except for the keyboard key reassignment feature, which
+# doen't fit the <pfkey> model well).  The klone+acs sequences were valid
+# though undocumented.  The <pfkey> capability is untested but should work for
+# keys F1-F10 (%p1 values outside this range will yield unpredictable results).
+# From: Eric S. Raymond <esr@snark.thyrsus.com> Nov 7 1995
+ansi.sys-old|ANSI.SYS under PC-DOS 2.1:\
+	:am:bs:mi:ms:xo:\
+	:co#80:li#25:\
+	:RA=\E[?7l:SA=\E[?7h:ce=\E[k:cl=\E[2J:cm=\E[%i%d;%dH:\
+	:do=\E[B:ho=\E[H:is=\E[m\E[?7h:kd=^J:kh=^^:kl=^H:kr=^L:\
+	:ku=^K:le=^H:nd=\E[C:pk=\E[0;%+:;"%s":rc=\E[u:sc=\E[s:\
+	:u6=\E[%i%d;%dR:u7=\E[6n:up=\E[A:\
+	:tc=klone+color:tc=klone+sgr:
+ansi.sys|ANSI.SYS 3.1 and later versions:\
+	:ce=\E[K:tc=ansi.sys-old:
+
+#
+# Define IBM PC keypad keys for vi as per MS-Kermit while using ANSI.SYS.
+# This should only be used when the terminal emulator cannot redefine the keys.
+# Since redefining keys with ansi.sys also affects PC-DOS programs, the key
+# definitions must be restored.  If the terminal emulator is quit while in vi
+# or others using :ks:/:ke:, the keypad will not be defined as per PC-DOS.
+# The PgUp and PgDn are prefixed with ESC so that tn3270 can be used on Unix
+# (^U and ^D are already defined for tn3270).  The ESC is safe for vi but it
+# does "beep".  ESC ESC i is used for Ins to avoid tn3270 ESC i for coltab.
+# Note that :kl: is always BS, because PC-dos can tolerate this change.
+# Caution: vi is limited to 256 string bytes, longer crashes or weirds out vi.
+# Consequently the End keypad key could not be set (it is relatively safe and
+# actually useful because it sends ^@ O, which beeps and opens a line above).
+ansi.sysk|ansisysk|PC-DOS 3.1 ANSI.SYS with keypad redefined for vi:\
+	:is=U2 PC-DOS 3.1 ANSI.SYS with keypad redefined for vi 9-29-86\n\E[;75;8p:\
+	:ke=\E[;71;0;71p\E[;72;0;72p\E[;73;0;73p\E[;77;0;77p\E[;80;0;80p\E[;81;0;81p\E[;82;0;82p\E[;83;0;83p:\
+	:ks=\E[;71;30p\E[;72;11p\E[;73;27;21p\E[;77;12p\E[;80;10p\E[;81;27;4p\E[;82;27;27;105p\E[;83;127p:\
+	:tc=ansi.sys:
+#
+# Adds ins/del line/character, hence vi reverse scrolls/inserts/deletes nicer.
+nansi.sys|nansisys|PC-DOS Public Domain NANSI.SYS:\
+	:al=\E[1L:dc=\E[1P:dl=\E[1M:ei=:ic=\E[1@:im=:\
+	:is=U3 PC-DOS Public Domain NANSI.SYS 9-23-86\n:tc=ansi.sys:
+#
+# See ansi.sysk and nansi.sys above.
+nansi.sysk|nansisysk|PC-DOS Public Domain NANSI.SYS with keypad redefined for vi:\
+	:al=\E[1L:dc=\E[1P:dl=\E[1M:ei=:ic=\E[1@:im=:\
+	:is=U4 PC-DOS Public Domain NANSI.SYS with keypad redefined for vi 9-29-86\n\E[;75;8p:tc=ansi.sysk:
+
+#### OS/2
+#
+
+# Except for the "-emx" suffixes, these are as distributed with EMX 0.9b,
+# a Unix-style environment used on OS/2.  (Note that the suffix makes some
+# names longer than 14 characters, the nominal maximum).
+#
+# Removed: rmacs=\E[10m, smacs=\E[11m, because OS/2 does not implement acs.
+ansi-emx|ANSI.SYS color:\
+	:am:eo:mi:ms:ut:xn:xo:\
+	:Co#16:co#80:it#8:li#25:pa#64:\
+	:&7=^Z:AB=\E[4%p1%dm:AF=\E[3%p1%dm:DC=\E[%dp:IC=\E[%d@:\
+	:K2=\E[G:S2=\E[11m:S3=\E[10m:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[1;33;44m\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
+	:do=^J:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:k0=\0D:k1=\0;:\
+	:k2=\0<:k3=\0=:k4=\0>:k5=\0?:k6=\0@:k7=\0A:k8=\0B:k9=\0C:\
+	:kH=\0O:kI=\0R:kN=\0Q:kP=\0I:kb=^H:kd=\0P:kh=\0G:kl=\0K:\
+	:kr=\0M:ku=\0H:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[0m\E[1;33;44m:mr=\E[5;37;41m:nd=\E[C:nw=^M^J:\
+	:r1=\Ec:se=\E[0;44m\E[1;33m:sf=^J:so=\E[0;31;47m:st=\EH:\
+	:ta=^I:u8=\E[?6c:u9=\E[c:ue=\E[0;44m\E[1;33m:up=\E[A:\
+	:us=\E[1;31;44m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:
+ansi-color-2-emx|ANSI.SYS color 2:\
+	:am:eo:mi:ms:ut:xn:xo:\
+	:Co#16:co#80:it#8:li#25:pa#64:\
+	:&7=^Z:AB=\E[4%p1%dm:AF=\E[3%p1%dm:DC=\E[%dp:IC=\E[%d@:\
+	:K2=\E[G:S2=\E[11m:S3=\E[10m:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[0;37;44m\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
+	:do=^J:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:k0=\0D:k1=\0;:\
+	:k2=\0<:k3=\0=:k4=\0>:k5=\0?:k6=\0@:k7=\0A:k8=\0B:k9=\0C:\
+	:kH=\0O:kI=\0R:kN=\0Q:kP=\0I:kb=^H:kd=\0P:kh=\0G:kl=\0K:\
+	:kr=\0M:ku=\0H:le=^H:mb=\E[5m:md=\E[1m:me=\E[0;37;44m:\
+	:mr=\E[1;37;46m:nd=\E[C:nw=^M^J:r1=\Ec:se=\E[0;37;44m:\
+	:sf=^J:so=\E[1;37;46m:st=\EH:ta=^I:u8=\E[?6c:u9=\E[c:\
+	:ue=\E[0;37;44m:up=\E[A:us=\E[1;36;44m:vb=\E[?5h\E[?5l:\
+	:ve=\E[?25h:vi=\E[?25l:
+ansi-color-3-emx|ANSI.SYS color 3:\
+	:am:eo:mi:ms:ut:xn:xo:\
+	:Co#16:co#80:it#8:li#25:pa#64:\
+	:&7=^Z:AB=\E[4%p1%dm:AF=\E[3%p1%dm:DC=\E[%dp:IC=\E[%d@:\
+	:K2=\E[G:S2=\E[11m:S3=\E[10m:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[0;37;40m\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
+	:do=^J:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:k0=\0D:k1=\0;:\
+	:k2=\0<:k3=\0=:k4=\0>:k5=\0?:k6=\0@:k7=\0A:k8=\0B:k9=\0C:\
+	:kH=\0O:kI=\0R:kN=\0Q:kP=\0I:kb=^H:kd=\0P:kh=\0G:kl=\0K:\
+	:kr=\0M:ku=\0H:le=^H:mb=\E[5m:md=\E[1m:me=\E[0;10m:\
+	:mr=\E[1;37;46m:nd=\E[C:nw=^M^J:r1=\Ec:se=\E[0;37;40m:\
+	:sf=^J:so=\E[1;37;46m:st=\EH:ta=^I:u8=\E[?6c:u9=\E[c:\
+	:ue=\E[0;37;40m:up=\E[A:us=\E[0;36;40m:vb=\E[?5h\E[?5l:\
+	:ve=\E[?25h:vi=\E[?25l:
+mono-emx|stupid monochrome ansi terminal with only one kind of emphasis:\
+	:am:\
+	:co#80:it#8:li#24:\
+	:K2=\E[G:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:do=\E[B:\
+	:ho=\E[H:k0=\0D:k1=\0;:k2=\0<:k3=\0=:k4=\0>:k5=\0?:k6=\0@:\
+	:k7=\0A:k8=\0B:k9=\0C:kH=\0O:kI=\0R:kN=\0Q:kP=\0I:kb=^H:\
+	:kd=\0P:kh=\0G:kl=\0K:kr=\0M:ku=\0H:le=\E[D:me=\E[0m:\
+	:mr=\E[7m:nd=\E[C:nw=^M^J:ta=^I:up=\E[A:
+
+# Use this for cygwin32 (tested with beta 19.1)
+# underline is colored bright magenta
+# shifted kf1-kf12 are kf11-kf22
+cygwin|ansi emulation for cygwin32:\
+	:@7=\E[4~:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
+	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
+	:FA=\E[34~:RA@:SA@:k1=\E[[A:k2=\E[[B:k3=\E[[C:k4=\E[[D:\
+	:k5=\E[[E:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
+	:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kd=\E[B:\
+	:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:tc=ansi.sys:
+
+
+#### Windows NT
+#
+# This entry fits the Windows NT console when the _POSIX_TERM environment
+# variable is set to 'on'.  While the Windows NT POSIX console is seldom used,
+# the Telnet client supplied with both the Windows for WorkGroup 3.11 TCP/IP
+# stack and the Win32 (i.e., Windows 95 and Windows NT 3.1 or later) operating
+# systems is not, and (surprise!) they match very well.
+#
+# See:  MS Knowledge Base item Q108581, dated 13-MAY-1997, titled "Setting Up
+# VI POSIX Editor for Windows NT 3.1".  True to Microsoft form, not only
+# are the installation instructions a pile of mind-numbing bureaucratese,
+# but the termcap entry is actually broken and unusable as given; the :do:
+# capability is misspelled "d".
+#
+# To use this, you need to a bunch of environment variables: 
+#
+# SET _POSIX_TERM=on
+# SET TERM=ansi
+# SET TERMCAP=location of termcap file in POSIX file format
+# which is case-sensitive.
+# e.g. SET TERMCAP=//D/RESKIT35/posix/termcap
+# SET TMP=//C/TEMP
+#
+# Important note: setting the TMP environment variable in POSIX style renders
+# it incompatible with a lot of other applications, including Visual C++. So
+# you should have a separate command window just for vi. All the other
+# variables may be permanently set in the Control Panel\System applet. 
+#
+# You can find out more about the restrictions of this facility at
+# <http://www.nentug.org/unix-to-nt/ntposix.htm>.
+#
+# From: Federico Bianchi <bianchi@magna.cisid.unipi.it>, 15 Jan 1997
+ansi-nt|psx_ansi|Microsoft Windows NT console POSIX ANSI mode:\
+	:am:bw:ms:\
+	:co#80:it#8:li#25:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:cr=^M:do=^J:\
+	:ho=\E[H:kb=^H:kd=\E[V:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:me=\E[0m:mr=\E[7m:nd=\E[C:nw=\r\E[S:rc=\E[u:sc=\E[s:\
+	:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:up=\E[A:
+# From: jew@venus.sunquest.com
+# Date: 19 Feb 93 23:41:07 GMT
+# Here's  a  combination of  ansi and  vt100 termcap
+# entries   that  works  nearly   perfectly  for  me
+# (Gateway 2000 Handbook and Microsoft Works 3.0):
+pcmw|PC running Microsoft Works:\
+	:am:xn:\
+	:co#80:it#8:li#24:vt#3:\
+	:bl=^G:cd=50\E[J:ce=3\E[K:cl=50\E[;H\E[2J:\
+	:cm=5\E[%i%d;%dH:cr=^M:ct=2\E[3g:do=^J:ho=\E[H:\
+	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kb=^H:kd=\EOB:kl=\EOD:kr=\EOC:ku=\EOA:le=^H:mb=2\E[5m:\
+	:md=2\E[1m:me=2\E[m:mr=2\E[7m:nd=2\E[C:nw=5\r\ED:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:rf=/usr/share/lib/tabset/vt100:sc=\E7:se=2\E[m:sf=5\ED:\
+	:so=2\E[7m:sr=5\EM:st=2\EH:ta=^I:ue=2\E[m:up=2\E[A:\
+	:us=2\E[4m:
+
+######## COMMON TERMINAL TYPES
+#
+# This section describes terminal classes and maker brands that are still
+# quite common, but have proprietary command sets not blessed by ANSI.
+#
+
+#### Lear-Siegler (adm)
+#
+# These guys are long since out of the terminals business, but
+# in 1995 many current terminals still have an adm type as one of their
+# emulations (usually their stupidest, and usually labeled adm3, though
+# these `adm3' emulations normally have adm3a+ capabilities).
+#
+# WARNING: Some early ADM terminals (including the ADM3 and ADM5) had a 
+# `diagnostic feature' that sending them a ^G while pin 22 (`Ring Indicator')
+# was being held to ground would trigger a send of the top line on the screen.
+# A quick fix might be to drop back to a cheesy 4-wire cable with pin 22
+# hanging in the air. (Thanks to Eric Fischer, <eric@fudge.uchicago.edu>,
+# for clearing up this point.)
+#
+
+adm1a|adm1|lsi adm1a:\
+	:am:\
+	:co#80:li#24:\
+	:bl=^G:cl=\E;:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:le=^H:nd=^L:\
+	:sf=^J:up=^K:
+adm2|lsi adm2:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E;:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:kd=^J:kh=^^:kl=^H:\
+	:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:up=^K:
+# (adm3: removed obsolete ":ma=^K^P:" -- esr)
+adm3|lsi adm3:\
+	:am:bs:\
+	:co#80:li#24:\
+	:bl=^G:cl=^Z:cr=^M:do=^J:le=^H:sf=^J:
+# The following ADM-3A switch settings are assumed for normal operation:
+#	SPACE		U/L_DISP	CLR_SCRN	24_LINE
+#	CUR_CTL		LC_EN		AUTO_NL		FDX
+# Other switches may be set for operator convenience or communication
+# requirements.  I recommend
+#	DISABLE_KB_LOCK	LOCAL_OFF	103		202_OFF
+#	ETX_OFF		EOT_OFF
+# Most of these terminals required an option ROM to support lower case display.
+# Open the case and look at the motherboard; if you see an open 24-pin DIP
+# socket, you may be out of luck.
+#
+# (adm3a: some capabilities merged in from BRl entry -- esr)
+adm3a|lsi adm3a:\
+	:am:bs:\
+	:co#80:li#24:\
+	:bl=^G:cl=1\032:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:kd=^J:kl=^H:\
+	:kr=^L:ku=^K:le=^H:ma=^K^P:nd=^L:nl=^J:r1=^N:rs=^N:sf=^J:\
+	:up=^K:
+adm3a+|adm3a plus:\
+	:kb=^H:tc=adm3a:
+# (adm5: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" & duplicate ":do=^J:" -- esr)
+adm5|lsi adm5:\
+	:sg#1:\
+	:bl=^G:cd=\EY:ce=\ET:cr=^M:do=^J:kb=^H:kh=^^:se=\EG:so=\EG:tc=adm3a+:
+# A lot of terminals other than adm11s use these.  Wherever you see
+# use=adm+sgr with some of its capabilities disabled, try the
+# disabled ones.  They may well work but not have been documented or
+# expressed in the using entry.  We'd like to cook up an :sa: but the
+# :ae:/:as: sequences of the using entries vary too much.
+adm+sgr|adm style highlight capabilities:\
+	:me=\EG0:mk=\EG1:mr=\EG4:se=\EG0:so=\EG4:ue=\EG0:us=\EG8:
+# LSI ADM-11 from George William Hartwig, Jr. <geo@BRL-TGR.ARPA> via BRL
+# Status line additions from Stephen J. Muir <stephen%comp.lancs.ac.uk@ucl-cs>
+# :kh: from <stephen%comp.lancs.ac.uk@ucl-cs.arpa>.  :cl: could also
+# be ^Z, according to his entry.
+# (adm11: :us:=\EG4 was obviously erroneous because it also said
+# :mr:=\EG4.  Looking at other ADMs confirms this -- esr)
+adm11|LSI ADM-11:\
+	:am:bs:hs:\
+	:co#80:kn#8:li#24:\
+	:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:do=^J:ds=\Eh:\
+	:fs=\E(\r:ho=^^:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:kb=^H:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:mb=\EG2:nd=^L:nl=^J:nw=^M^J:ta=^I:\
+	:ts=\EF\E):up=^K:\
+	:tc=adm+sgr:
+# From: Andrew Scott Beals <bandy@lll-crg.ARPA>
+# Corrected by Olaf Siebert <rhialto@polder.ubc.kun.nl>, 11 May 1995
+# Supervisor mode info by Ari Wuolle, <awuolle@delta.hut.fi>, 27 Aug 1996
+# (adm12: removed obsolete ":kn:ma=j^Jk^P^K^Pl ^R^L^L :".  This formerly had
+# :is:=\Eq but that looked wrong; this :is: is from Dave Yost <esquire!yost>
+# via BRL.  That entry asserted :sg#1:, but I've left that out because 
+# neither earlier nor later ADMSs have it -- esr)
+#
+# You will need to get into the supervisor setup before you can set
+# baudrate etc. for your ADM-12+. Press Shift-Ctrl-Setup and you should
+# see a lot more setup options.
+# 
+# While in supervisor setup you can also use following codes:
+# 
+# Ctrl-P Personality character selections (configure for example what
+#        arrow keys send, if I recall correctly)
+# Ctrl-T tabs 1-80   use left&right to move and up to set and
+# Ctrl-V tabs 81-158 down to clear tab. Shift-Ctrl-M sets right margin at cursor
+# Ctrl-B Binary setup (probably not needed. I think that everything can
+#        be set using normal setup)
+# Ctrl-A Answerback mode (enter answerback message)
+# Ctrl-U User friendly mode (normal setup)
+# Ctrl-D Defaults entire setup and function keys from EPROM tables
+# Ctrl-S Save both setup and functions keys. Takes from 6 to 10 seconds.
+# Ctrl-R Reads both setup and functions keys from NVM.
+# Shift-Ctrl-X Unlock keyboard and cancel received X-OFF status
+# 
+# ADM-12+ supports hardware handshaking, but it is DTR/CTS as opposed to
+# RTS/CTS used nowadays with virtually every modem and computer. 19200
+# bps works fine with hardware flow control.
+# 
+# The following null-modem cable should fix this and enable you to use
+# RTS/CTS handshaking (which Linux supports, use CRTSCTS setting). Also
+# set ADM-12+ for DTR handshaking from supervisor setup.
+# 
+# PC Serial   ADM-12+
+#  --------   -------
+#         2 - 3
+#         3 - 2
+#         4 - 5
+#         5 - 20
+#       6,8 - 4
+#         7 - 7
+#        20 - 6,8
+#
+adm12|lsi adm12:\
+	:am:bs:mi:pt:\
+	:co#80:it#8:li#24:\
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E0:\
+	:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:ic=\EQ:im=\Eq:\
+	:is=\E0        \E1        \E1        \E1        \E1        \E1        \E1        \E1        \E1:\
+	:k0=^A0\r:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:k5=^A5\r:\
+	:k6=^A6\r:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^J:kl=^H:kr=^L:\
+	:ku=^K:le=^H:nd=^L:st=\E1:up=^K:\
+	:tc=adm+sgr:
+# (adm20: removed obsolete ":kn#7:" -- esr)
+adm20|lear siegler adm20:\
+	:am:bs:\
+	:co#80:it#8:li#24:\
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:\
+	:cm=\E=%i%r%+^_%+^_:cr=^M:dc=\EW:dl=\ER:ei=:ho=^^:ic=\EQ:\
+	:im=:k1=^A:k2=^B:k3=^W:k4=^D:k5=^E:k6=^X:k7=^Z:le=^H:me=\E(:\
+	:nd=^L:se=\E(:so=\E):ta=^I:up=^K:
+adm21|lear siegler adm21:\
+	:sg#1:\
+	:al=30*\EE:bl=^G:cd=\EY:ce=\ET:cr=^M:dc=\EW:dl=30*\ER:do=^J:\
+	:ei=:ic=\EQ:im=:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:mk@:sf=^J:\
+	:tc=adm+sgr:tc=adm3a:
+# (adm22: ":em=:" was an obvious typo for ":ei=:"; also,
+# removed obsolete ":kn#7:ma=j^Jk^P^K^Pl ^R^L^L :";
+# removed bogus-looking \200 from before :cm:. -- esr)
+adm22|lsi adm22:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:\
+	:is=\E%\014\014\014\016\003\0\003\002\003\002\0\0\0\0\0\0\0\0\0\0\0:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:l1=F1:l2=F2:\
+	:l3=F3:l4=F4:l5=F5:l6=F6:l7=F7:le=^H:me=\E(:nd=^L:se=\E(:\
+	:so=\E):ta=\Ei:up=^K:
+# ADM 31 DIP Switches
+#
+# This information comes from two versions of the manual for the
+# Lear-Siegler ADM 31.
+#
+# Main board:
+#                  rear of case
+#   +-||||-------------------------------------+
+#   + S1S2                              ||S    +
+#   +                                   ||3    +
+#   +                                          +
+#   +                                ||S       +
+#   +                                ||4       +
+#   +                                          +
+#   +                                          +
+#   +                                          +
+#   +                                          +
+#   +                                          +
+# +-+                                          +-+
+# +                                              +
+# +                               S5 S6 S7       +   
+# +                               == == ==       +
+# +----------------------------------------------+
+#            front of case (keyboard)
+#
+#  S1 - Data Rate - Modem
+#  S2 - Data Rate - Printer
+# ------------------------
+# Data Rate   Setting
+# -------------------
+# 50          0 0 0 0
+# 75          1 0 0 0
+# 110         0 1 0 0
+# 134.5       1 1 0 0
+# 150         0 0 1 0
+# 300         1 0 1 0
+# 600         0 1 1 0
+# 1200        1 1 1 0
+# 1800        0 0 0 1
+# 2000        1 0 0 1
+# 2400        0 1 0 1
+# 3600        1 1 0 1
+# 4800        0 0 1 1
+# 7200        1 0 1 1
+# 9600        0 1 1 1
+# x           1 1 1 1
+#
+# S3 - Interface/Printer/Attributes
+# ---------------------------------
+# Printer Busy Control
+# sw1   sw2   sw3
+# ---------------
+# off   off   off   Busy not active, CD disabled
+# off   off   on    Busy not active, CD enabled
+# off   on    off   Busy active on J5-20, CD disabled
+# on    off   off   Busy active on J5-19, CD disabled - Factory Set.
+# on    off   on    Busy active on J5-19, CD enabled
+#
+# sw4   Used in conjuction with S4 for comm interface control - Fact 0
+#
+# sw5   Secondary Channel Control (Hardware implementation only) - Fact 0
+#
+# sw6   ON enables printer BUSY active LOW - Factory Setting
+#       OFF enables printer BUSY active HIGH - If set to this, ADM31 senses
+#
+# sw7   ON - steady cursor - Factory Setting
+#       OFF - blinking cursor
+#
+# sw8   ON causes selected attribute character to be displayed
+#       OFF causes SPACE to be displayed instead - Factory Setting
+#
+# S4 - Interface
+# --------------
+# Modem Interface
+# S3    S4    S4    S4    S4
+# sw4   sw1   sw2   sw3   sw4
+# ---------------------------
+# OFF   ON    OFF   ON    OFF   Enable RS-232C interface, Direct Connect and
+#                               Current Loop disabled - Factory Setting
+# ON    ON    OFF   ON    OFF   Enable Current Loop interface, Direct Connect
+#                               disabled
+# OFF   OFF   ON    OFF   ON    Enable Direct Connect interface, RS-232C and
+#                               Current Loop Disabled
+#
+# sw5   ON disables dot stretching mode - Factory Setting
+#       OFF enables dot stretching mode
+# sw6   ON enables blanking function
+#       OFF enables underline function - Factory Setting
+# sw7   ON causes NULLS to be displayed as NULLS
+#       OFF causes NULLS to be displayed as SPACES - Factory Setting
+#
+# S5 - Word Structure
+# -------------------
+# sw1   ON enables BREAK key - Factory Setting
+#       OFF disables BREAK key
+# sw2   ON selects 50Hz monitor refresh rate
+#       OFF selects 60Hz monitor refresh rate - Factory Setting
+#
+# Modem Port Selection
+# sw3   sw4   sw5
+# ---------------
+# ON    ON    ON    Selects 7 DATA bits, even parity, 2 STOP bits
+# OFF   ON    ON    Selects 7 DATA bits, odd  parity, 2 STOP bits
+# ON    OFF   ON    Selects 7 DATA bits, even parity, 1 STOP bit - Factory Set.
+# OFF   OFF   ON    Selects 7 DATA bits, odd  parity, 1 STOP bit
+# ON    ON    OFF   Selects 8 DATA bits, no   parity, 2 STOP bits
+# OFF   ON    OFF   Selects 8 DATA bits, no   parity, 1 STOP bit
+# ON    OFF   OFF   Selects 8 DATA bits, even parity, 1 STOP bit
+# OFF   OFF   OFF   Selects 8 DATA bits, odd  parity, 1 STOP bit
+#
+# sw6   ON  sends bit 8 a 1 (mark)
+#       OFF sends bit 8 as 0 (space) - Factory Setting
+# sw7   ON  selects Block Mode
+#       OFF selects Conversation Mode - Factory Setting
+# sw8   ON  selects Full Duplex operation
+#       OFF selects Half Duplex operation - Factory Setting
+#
+# S6 - Printer
+# ------------
+# sw1, sw2, sw6, sw7   Reserved - Factory 0
+#
+# Printer Port Selection
+# same as Modem above, bit 8 (when 8 DATA bits) is always = 0
+#
+# sw8   ON   enables Printer Port
+#       OFF disables Printer Port - Factory Setting
+#
+# S7 - Polling Address
+# --------------------
+# sw1-7 Establish ASCII character which designates terminal polling address
+#       ON  = logic 0
+#       OFF = logic 1 - Factory Setting
+# sw8   ON   enables Polling Option
+#       OFF disables Polling Option - Factory Setting
+#
+#
+# On some older adm31s, S4 does not exist, and S5-sw6 is not defined.
+#
+# This adm31 entry uses underline as the standout mode.
+# If the adm31 gives you trouble with standout mode, check the DIP switch in
+# position 6, bank @c11, 25% from back end of the circuit board.  Should be
+# OFF.  If there is no such switch, you have an old adm31 and must use oadm31.
+# (adm31: removed obsolete ":ma=j^Jk^P^K^Pl ^R^L^L :" -- esr)
+adm31|lsi adm31 with sw6 set for underline mode:\
+	:am:bs:mi:\
+	:co#80:li#24:\
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:is=\Eu\E0:k0=^A0\r:\
+	:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:k5=^A5\r:k6=^A6\r:\
+	:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:\
+	:me=\EG0:nd=^L:se=\EG0:sf=^J:so=\EG1:ue=\EG0:up=^K:us=\EG1:
+adm31-old|o31|old adm31:\
+	:so=\EG4:ue@:us@:tc=adm31:
+# LSI ADM-36 from Col. George L. Sicherman <gloria!colonel> via BRL
+adm36|LSI ADM36:\
+	:bs:pt:\
+	:kn#4:\
+	:if=/usr/lib/tabset/vt100:\
+	:is=\E<\E>\E[6;?2;?7;?8h\E[4;20;?1;?3;?4;?5;?6;?18;?19l:tc=vt100:
+# (adm42: removed obsolete ":ma=^K^P:" -- esr)
+adm42|lsi adm42:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E;:cm=\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:im=\Eq:ip=:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:mk@:nd=^L:pc=\177:sf=^J:ta=^I:ue@:\
+	:up=^K:us@:vs=\EC\E3 \E3(:\
+	:tc=adm+sgr:
+# The following termcap for the Lear Siegler ADM-42 leaves the 
+# "system line" at the bottom of the screen blank (for those who 
+# find it distracting otherwise)
+adm42-ns|lsi adm-42 with no system line:\
+	:al=\EE\EF \011:bt=\EI\EF \011:cd=\EY\EF \011:\
+	:ce=\ET\EF \011:cl=\E;\EF \011:cm=\E=%+ %+ \EF \011:\
+	:dc=\EW\EF \011:dl=\ER\EF \011:ei=\Er\EF \011:\
+	:im=\Eq\EF \011:tc=adm42:
+# ADM 1178 terminal -- rather like an ADM-42.  Manual is dated March 1 1985.
+# The insert mode of this terminal is commented out because it's broken for our
+# purposes in that it will shift the position of every character on the page,
+# not just the cursor line!
+# From: Michael Driscoll <fenris@lightspeed.net> 10 July 1996
+adm1178|1178|lsi adm1178:\
+	:am:\
+	:co#80:li#24:sg#1:\
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=\ER:do=^J:ho=^^:ip=6*:kb=^H:kd=^J:kl=^H:\
+	:le=^H:md=\E(:me=\E):mr=\EG4:nd=^L:nw=^M^J:pc=\177:se=\EG0:\
+	:sf=^J:so=\EG4:ta=^I:ue=\EG0:up=^K:us=\EG1:vs=\EC\E3 \E3(:
+
+#### Qume (qvt)
+#
+#	Qume, Inc.
+#	3475-A North 1st Street
+#	San Jose CA 95134
+#	Vox: (800)-457-4447
+#	Fax: (408)-473-1510
+#	Net: josed@techsupp.wyse.com (Jose D'Oliveira)
+#
+# Qume was bought by Wyse, but still (as of early 1995) has its own support
+# group and production division.
+#
+# Discontinued Qume models:
+#
+# The qvt101 and qvt102 listed here are long obsolete; so is the qvt101+
+# built to replace them, and a qvt119+ which was a 101+ with available wide
+# mode (132 columns).  There was a qvt103 which added vt100/vt131 emulations
+# and an ANSI-compatible qvt203 that replaced it.  Qume started producing
+# ANSI-compatible terminals with the qvt323 and qvt61.
+#
+# Current Qume models (as of February 1995):
+#
+# All current Qume terminals have ANSI-compatible operation modes.
+# Qume is still producing the qvt62, which features emulations for other
+# popular lines such as ADDS, and dual-host capabilities.  The qvt82 is
+# designed for use as a SCO ANSI terminal.  The qvt70 is a color terminal
+# with many emulations including Wyse370, Wyse 325, etc.  Their newest
+# model is the qvt520, which is vt420-compatible.
+#
+# There are some ancient printing Qume terminals under `Daisy Wheel Printers'
+#
+# If you inherit a Qume without docs, try Ctrl-Shift-Setup to enter its
+# setup mode.  Shift-s should be a configuration save to NVRAM.
+
+qvt101|qvt108|qume qvt 101 and QVT 108:\
+	:sg#1:tc=qvt101+:
+
+# This used to have :vs=\E.2: but no :ve: or :vi:.  The BSD termcap
+# file had :vs=\EM4 \200\200\200:.  I've done the safe thing and yanked 
+# both. The :mr: is from BSD, which also claimed bold=\E( and dim=\E).
+# What seems to be going on here is that this entry was designed so that
+# the normal highlight is bold and standout is dim plus something else
+# (reverse-video maybe?  But then, are there two :mr: sequences?)  
+qvt101+|qvt101p|qume qvt 101 PLUS product:\
+	:am:bw:hs:ul:\
+	:co#80:li#24:sg#0:\
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
+	:ct=\E3:dc=\EW:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=:fs=^M:ho=^^:\
+	:ic=\EQ:im=:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kA=\EE:\
+	:kB=\EI:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^J:kh=^^:kl=^H:\
+	:kr=^L:ku=^K:le=^H:mk@:nd=^L:pf=\EA:po=\E@:se=\E(:sf=^J:\
+	:so=\E0P\E):st=\E1:ta=^I:ts=\Eg\Ef:up=^K:vb=\Eb\Ed:ve=\E.4:\
+	:tc=adm+sgr:
+qvt102|qume qvt 102:\
+	:ve=\E.:tc=qvt101:
+# (qvt103: added <rmam>/<smam> based on init string -- esr)
+qvt103|qume qvt 103:\
+	:am:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:DO=\E[%dB:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:\
+	:UP=\E[%dA:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:\
+	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:\
+	:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
+qvt103-w|qume qvt103 132 cols:\
+	:co#132:li#24:\
+	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?8h:tc=qvt103:
+qvt119+|qvt119p|qvt119|qume qvt 119 and 119PLUS terminals:\
+	:am:hs:mi:ms:\
+	:co#80:li#24:sg#0:\
+	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E*1:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:\
+	:ho=^^:im=\Eq:is=\EDF\EC\EG0\Er\E(\E%EX:k0=^AI\r:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:\
+	:ku=^K:le=^H:nd=^L:pf=\EA:po=\E@:sf=^J:sr=\EJ:st=\E1:ta=^I:\
+	:ts=\Eg\Ef:up=^K:us=\EG8:vb=\En0\En1:ve=\E.4:vs=\E.2:\
+	:tc=adm+sgr:
+qvt119+-25|qvt119p-25|QVT 119 PLUS with 25 data lines:\
+	:li#25:tc=qvt119+:
+qvt119+-w|qvt119p-w|qvt119-w|QVT 119 and 119 PLUS in 132 column mode:\
+	:co#132:\
+	:is=\EDF\EC\EG0\Er\E(\E%\EX\En4:tc=qvt119+:
+qvt119+-25-w|qvt119p-25-w|qvt119-25-w|QVT 119 and 119 PLUS 132 by 25:\
+	:li#25:tc=qvt119+:
+qvt203|qvt203+|qume qvt 203 Plus:\
+	:al=\E[L:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:ip=:k0=\E[29~:\
+	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
+	:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[28~:sf=\n:\
+	:tc=qvt103:
+qvt203-w|qvt203-w-am|qume qvt 203 PLUS in 132 cols (w/advanced video):\
+	:co#132:li#24:\
+	:r2=\E>\E[?3h\E[?4l\E[?5l\E[?8h:tc=qvt203:
+#
+#	Since a command is present for enabling 25 data lines,
+#	a specific terminfo entry may be generated for the 203.
+#	If one is desired for the QVT 119 PLUS then 25 lines must
+#	be selected in the status line (setup line 9).
+#
+qvt203-25|QVT 203 PLUS with 25 by 80 column mode:\
+	:co#80:li#25:\
+	:is=\E[=40h\E[?3l:tc=qvt203:
+qvt203-25-w|QVT 203 PLUS with 25 by 132 columns:\
+	:co#132:li#25:\
+	:r2=\E[?3h\E[=40h:tc=qvt203:
+
+#### Televideo (tvi)
+#
+#	TeleVideo
+#	550 East Brokaw Road
+#	PO Box 49048    95161
+#	San Jose CA 95112
+#	Vox: (408)-954-8333
+#	Fax: (408)-954-0623
+#
+#
+# There are some tvi terminals that require incredible amounts of padding and
+# some that don't.  I'm assuming tvi912 and tvi920 are the old slow ones, and
+# tvi912b, tvi912c, tvi920b, tvi920c are the new ones that don't need padding.
+#
+# All of these terminals (912 to 970 and the tvipt) are discontinued.  Newer
+# Televideo terminals are ANSI and PC-ANSI compatible.
+
+tvi803|televideo 803:\
+	:cl=\E*:tc=tvi950:
+
+# Vanilla tvi910 -- W. Gish <cswarren@violet> 10/29/86
+# Switch settings are:
+# 
+# S1  1 2 3 4
+#     D D D D  9600
+#     D D D U    50
+#     D D U D    75
+#     D D U U   110
+#     D U D D   135
+#     D U D U   150
+#     D U U D   300
+#     D U U U   600
+#     U D D D  1200
+#     U D D U  1800
+#     U D U D  2400
+#     U D U U  3600
+#     U U D D  4800
+#     U U D U  7200
+#     U U U D  9600
+#     U U U U 19200
+# 
+# S1  5 6 7 8
+#     U D X D  7N1 (data bits, parity, stop bits) (X means ignored)
+#     U D X U  7N2
+#     U U D D  7O1
+#     U U D U  7O2
+#     U U U D  7E1
+#     U U U U  7E2
+#     D D X D  8N1
+#     D D X U  8N2
+#     D U D D  8O1
+#     D U U U  8E2
+# 
+# S1  9  Autowrap
+#     U  on
+#     D  off
+# 
+# S1 10  CR/LF
+#     U  do CR/LF when CR received
+#     D  do CR when CR received
+# 
+# S2  1  Mode
+#     U  block
+#     D  conversational
+# 
+# S2  2  Duplex
+#     U  half
+#     D  full
+# 
+# S2  3  Hertz
+#     U  50
+#     D  60
+# 
+# S2  4  Edit mode
+#     U  local
+#     D  duplex
+# 
+# S2  5  Cursor type
+#     U  underline
+#     D  block
+# 
+# S2  6  Cursor down key
+#     U  send ^J
+#     D  send ^V
+# 
+# S2  7  Screen colour
+#     U  green on black
+#     D  black on green
+# 
+# S2  8  DSR status (pin 6)
+#     U  disconnected
+#     D  connected
+# 
+# S2  9  DCD status (pin 8)
+#     U  disconnected
+#     D  duplex
+# 
+# S2 10  DTR status (pin 20)
+#     U  disconnected
+#     D  duplex
+# (tvi910: removed obsolete ":ma=^Kk^Ll^R^L:"; added :kh:, :le:, :do:,
+# :sf:, <hpa>, <vpa>, :am:, :ms: from SCO entry -- esr)
+tvi910|televideo model 910:\
+	:am:bs:ms:\
+	:co#80:it#8:li#24:sg#1:\
+	:bl=^G:bt=\EI:cd=\EY:ce=\ET:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :\
+	:cr=^M:cv=\E[%+ :do=^J:ho=\E=\001\001:\
+	:if=/usr/share/tabset/stdcrt:k0=^AI\r:k1=^A@\r:k2=^AA\r:\
+	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:\
+	:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mk@:nd=^L:\
+	:sf=^J:ta=^I:up=^K:\
+	:tc=adm+sgr:
+# From: Alan R. Rogers <rogers%albany@csnet-relay>
+# as subsequently hacked over by someone at SCO
+# (tvi910+: removed obsolete ":ma=^K^P^L :" -- esr)
+#
+# Here are the 910+'s DIP switches (U = up, D = down, X = don't care):
+#
+# S1  1 2 3 4:
+#     D D D D  9600     D D D U    50     D D U D    75     D D U U   110
+#     D U D D   135     D U D U   150     D U U D   300     D U U U   600
+#     U D D D  1200     U D D U  1800     U D U D  2400     U D U U  3600
+#     U U D D  4800     U U D U  7200     U U U D  9600     U U U U 19200
+#
+# S1  5 6 7 8:
+#     U D X D  7N1     U D X U  7N2     U U D D  7O1     U U D U  7O2
+#     U U U D  7E1     U U U U  7E2     D D X D  8N1     D D X U  8N2
+#     D U D D  8O1     D U U U  8E2
+# 
+# S1  9  Autowrap            (U = on, D = off)
+# S1 10  CR/LF               (U = CR/LF on CR received, D = CR on CR received)
+# S2  1  Mode                (U = block, D = conversational)
+# S2  2  Duplex              (U =  half, D = full)
+# S2  3  Hertz               (U = 50, D = 60)
+# S2  4  Edit mode           (U = local, D = duplex)
+# S2  5  Cursor type         (U = underline, D = block)
+# S2  6  Cursor down key     (U = send ^J, D = send ^V)
+# S2  7  Screen colour       (U = green on black, D = black on green)
+# S2  8  DSR status (pin 6)  (U = disconnected, D = connected)
+# S2  9  DCD status (pin 8)  (U = disconnected, D = connected)
+# S2 10  DTR status (pin 20) (U = disconnected, D = connected)
+#
+tvi910+|televideo 910+:\
+	:al=\EE:dc=\EW:dl=\ER:ei=:ho=^^:ic=\EQ:im=:k0=^A@\r:k1=^AA\r:\
+	:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:\
+	:k8=^AH\r:k9=^AI\r:ll=\E=7 :\
+	:tc=tvi910:
+
+# (tvi912: removed obsolete ":ma=^K^P^L :", added  :vb: and
+# :kh: from BRL entry -- esr)
+tvi912|tvi914|tvi920|old televideo 912/914/920:\
+	:am:bs:ms:pt:\
+	:co#80:it#8:li#24:sg#1:\
+	:al=\EE:bl=^G:cd=\Ey:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E3:\
+	:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:\
+	:if=/usr/share/tabset/stdcrt:im=:k0=^AI\r:k1=^A@\r:\
+	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
+	:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
+	:nd=^L:se=\Ek:sf=^J:so=\Ej:st=\E1:ta=^I:ue=\Em:up=^K:us=\El:\
+	:vb=\Eb\Ed:
+# the 912 has a <funct> key that's like shift: <funct>8 xmits "^A8\r".
+# The 920 has this plus real function keys that xmit different things.
+# Terminfo makes you use the funct key on the 912 but the real keys on the 920.
+tvi912c|tvi912b|new televideo 912:\
+	:al=\EE:dl=\ER:tc=tvi912:
+# set to page 1 when entering curses application (\E-17 )
+# reset to page 0 when exiting curses application (\E-07 )
+tvi912-2p|tvi920-2p|tvi-2p|televideo w/2 pages:\
+	:te=\E-07 :ti=\E-17 :tc=tvi912:
+# We got some new tvi912c terminals that act really weird on the regular 
+# termcap, so one of our gurus worked this up. Seems that cursor 
+# addressing is broken.
+tvi912cc|tvi912 at cowell college:\
+	:cm@:tc=tvi912c:
+
+# Here are the switch settings for the tvi920c:
+#
+# S1 (Line), and S3 (Printer) baud rates -- put one, and only one, switch down:
+# 2: 9600	3: 4800		4: 2400		5: 1200
+# 6:  600	7:  300		8:  150		9:   75
+# 10: 110
+#
+# S2 UART/Terminal options:
+# 		Up			Down
+# 1:		Not used		Not allowed
+# 2:	Alternate character set	  Standard character set
+# 3:	    Full duplex		    Half duplex
+# 4:	    50 Hz refresh	    60 Hz refresh
+# 5:	      No parity		     Send parity
+# 6:	     2 stop bits	     1 stop bit
+# 7:	     8 data bits	     7 data bits
+# 8:		Not used		Not allowed on Rev E or lower
+# 9:	     Even parity	     Odd parity
+# 10:	    Steady cursor	    Blinking cursor
+# 	(On Rev E or lower, use W25 instead of switch 10.)
+# 
+# S5 UART/Terminal options:
+# 		Open			Closed
+# 1:	P3-6 Not connected	DSR received on P3-6
+# 2:	P3-8 Not connected	DCD received on P3-8
+#
+# 3 Open, 4 Open:		P3-20 Not connected
+# 3 Open, 4 Closed:	DTR on when terminal is on
+# 3 Closed, 4 Open:	DTR is connected to RTS
+# 3 Closed, 4 Closed:	Not allowed
+#
+# 5 Closed:	HDX printer (hardware control) Rev. K with extension port off,
+# 		all data transmitted out of the modem port (P3) will also be
+# 		transmitted out of the printer port (P4).
+#
+# 6 Open, 7 Open:		Not allowed
+# 6 Open, 7 Closed:	20ma current loop input
+# 6 Closed, 7 Open:	RS232 input
+# 6 Closed, 7 Closed:	Not allowed
+#
+# Jumper options:
+# If the jumper is installed, the effect will occur (the next time the terminal
+# is switched on).
+#
+# S4/W31:	Enables automatic LF upon receipt of CR from
+# 		remote or keyboard.
+# S4/W32:	Enables transmission of EOT at the end of Send.  If not 
+# 		installed, a carriage return is sent.
+# S4/W33:	Disables automatic carriage return in column 80.
+# S4/W34:	Selects Page Print Mode as initial condition.  If not 
+# 		installed, Extension Mode is selected.
+#
+tvi920b|tvi920c|new televideo 920:\
+	:al=\EE:dl=\ER:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
+	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
+	:tc=tvi912:
+
+# Televideo 921 and variants
+# From: Tim Theisen <tim@cs.wisc.edu> 22 Sept 1995
+# (tvi921: removed :ko=bt: before translation, I see no backtab cap;
+# also added empty <acsc> to suppress tic warning -- esr)
+tvi921|televideo model 921 with sysline same as page & real vi function:\
+	:am:bs:hs:pt:xn:xs:\
+	:co#80:li#24:sg#0:\
+	:ac=:ae=\E%:al=\EE:as=\E$:cd=\EY:ce=\ET:cl=^Z:cm=3\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=1*\ER:do=^V:ds=\Ef\r\Eg:ei=:fs=\Eg:ho=^^:\
+	:ic=\EQ:if=/usr/share/tabset/stdcrt:im=:\
+	:is=\El\E"\EF1\E.3\017\EA\E<:kA=\EE:kC=^Z:kD=\EW:kE=\ET:\
+	:kI=\EQ:kL=1*\ER:kS=\EY:kb=^H:kd=^V:kl=^H:kr=^L:ku=^K:le=^H:\
+	:mk@:nd=^L:nw=^M^J:sf=^J:ta=^I:ts=\Ef\EG0:up=^K:ve=\E.3:\
+	:vs=\E.2:\
+	:tc=adm+sgr:
+# without the beeper
+# (tvi92B: removed :ko=bt: before translation, I see no backtab cap;
+# also added empty <acsc> to suppress tic warning -- esr)
+tvi92B|televideo model 921 with sysline same as page & real vi function & no beeper:\
+	:am:hs:xn:xs:\
+	:co#80:li#24:sg#0:\
+	:ac=:ae=\E%:al=\EE:as=\E$:cd=\EY:ce=\ET:cl=^Z:cm=3\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=1*\ER:do=^V:ds=\Ef\r\Eg:ei=:fs=\Eg:ho=^^:\
+	:ic=\EQ:if=/usr/share/tabset/stdcrt:im=:\
+	:is=\El\E"\EF1\E.3\017\EA\E<:kA=\EE:kC=^Z:kD=\EW:kE=\ET:\
+	:kI=\EQ:kL=1*\ER:kS=\EY:kb=^H:kd=^V:kl=^H:kr=^L:ku=^K:le=^H:\
+	:mk@:nd=^L:nw=^M^J:sf=^J:ta=^I:ts=\Ef\EG0:up=^K:vb=\Eb\Ed:\
+	:ve=\E.3:vs=\E.2:\
+	:tc=adm+sgr:
+# (tvi92D: removed :ko=bt: before translation, I see no backtab cap -- esr)
+tvi92D|tvi92B with DTR instead of XON/XOFF & better padding:\
+	:al=2*\EE:dl=2*\ER:is=\El\E"\EF1\E.3\016\EA\E<:kA=2*\EE:\
+	:kL=2*\ER:\
+	:tc=tvi92B:
+
+# (tvi924: This used to have :ds=\Es0:, :fs=\031:.  I put the new strings
+# in from a BSD termcap file because it looks like they do something the
+# old ones skip -- esr)
+tvi924|televideo tvi924:\
+	:am:bw:hs:in:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:sg#0:ws#80:\
+	:F1=^AK\r:F2=^AL\r:F3=^AM\r:F4=^AN\r:F5=^AO\r:al=\EE:bl=^G:\
+	:bt=\EI:cd=\Ey:ce=\Et:cl=\E*0:cm=\E=%+ %+ :cr=^M:\
+	:cs=\E_%+ %+ :ct=\E3:dc=\EW:dl=\ER:do=^V:ds=\Es0\Ef\031:\
+	:ei=:fs=\031\Es1:ho=^^:\
+	:i1=\017\E%\E'\E(\EDF\EC\EG0\EN0\Es0\Ev0:ic=\EQ:\
+	:if=/usr/share/tabset/stdcrt:im=:k0=^A@\r:k1=^AA\r:\
+	:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:\
+	:k8=^AH\r:k9=^AI\r:k;=^AJ\r:kA=\EE:kC=\E*0:kD=\EW:kE=\Et:\
+	:kI=\EQ:kL=\ER:kS=\Ey:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:\
+	:l0=F1:l1=F2:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:l8=F9:l9=F10:\
+	:la=F11:le=^H:mb=\EG2:mk@:nd=^L:pk=\E|%+1%s\031:sf=^J:\
+	:sr=\Ej:st=\E1:ta=^I:ts=\Ef:up=^K:vb=\Eb\Ed:ve=\E.3:vi=\E.0:\
+	:vs=\E.1:\
+	:tc=adm+sgr:
+
+# TVI925 DIP switches.  In each of these, D = Down and U = Up,
+#
+# Here are the settings for the external (baud) switches (S1):
+#
+#             Position		Baud
+# 7	8	9	10		[Printer]
+# 1	2	3	4		[Main RS232]
+# -----------------------------------------------------
+# D	D	D	D	9600
+# D	D	D	U	  50
+# D	D	U	D	  75
+# D	D	U	U	 110
+# D	U	D	D	 135
+# D	U	D	U	 150
+# D	U	U	D	 300
+# D	U	U	U	 600
+# U	D	D	D	1200
+# U	D	D	U	1800
+# U	D	U	D	2400
+# U	D	U	U	3600
+# U	U	D	D	4800
+# U	U	D	U	7200
+# U	U	U	D	9600
+# U	U	U	U	19200
+# 
+# 
+# Settings for word length and stop-bits (S1)
+#
+#  Position	Description
+# 5	6	
+# ---------------------------
+# U	-	7-bit word
+# D	-	8-bit word
+# -	U	2 stop bits
+# -	D	1 stop bit
+# 
+# 
+# S2 (external) settings
+#
+# Position	Up	Dn	Description
+# --------------------------------------------
+# 1		X		Local edit
+# 			X	Duplex edit (transmit editing keys)
+# --------------------------------------------
+# 2		X		912/920 emulation
+# 			X	925
+# --------------------------------------------
+# 3			X
+# 4			X	No parity
+# 5			X	
+# --------------------------------------------
+# 3			X
+# 4			X	Odd parity
+# 5		X	
+# --------------------------------------------
+# 3			X
+# 4		X		Even parity
+# 5		X	
+# --------------------------------------------
+# 3		X	
+# 4			X	Mark parity
+# 5		X		
+# --------------------------------------------
+# 3		X
+# 4		X		Space parity
+# 5		X
+# --------------------------------------------
+# 6		X		White on black display
+# 			X	Black on white display
+# --------------------------------------------
+# 7			X	Half Duplex
+# 8			X
+# --------------------------------------------
+# 7		X		Full Duplex
+# 8			X	
+# --------------------------------------------
+# 7			X	Block mode
+# 8		X	
+# --------------------------------------------
+# 9			X	50 Hz
+# 		X		60 Hz
+# --------------------------------------------
+# 10		X		CR/LF (Auto LF)
+# 			X	CR only
+# 
+# S3 (internal switch) settings:
+# 
+# Position	Up	Dn	Description
+# --------------------------------------------
+# 1		X		Keyclick off 
+# 			X	Keyclick on
+# --------------------------------------------
+# 2			X	English
+# 3			X	
+# --------------------------------------------
+# 2			X	German
+# 3		X		
+# --------------------------------------------
+# 2		X		French
+# 3			X	
+# --------------------------------------------
+# 2		X		Spanish
+# 3		X	
+# --------------------------------------------
+# 4			X	Blinking block cursor
+# 5			X	
+# --------------------------------------------
+# 4			X	Blinking underline cursor
+# 5		X		
+# --------------------------------------------
+# 4		X		Steady block cursor
+# 5			X	
+# --------------------------------------------
+# 4		X		Steady underline cursor
+# 5		X	
+# --------------------------------------------
+# 6		X		Screen blanking timer (ON)
+# 			X	Screen blanking timer (OFF)
+# --------------------------------------------
+# 7		X		Page attributes
+# 			X	Line attributes
+# --------------------------------------------
+# 8		X		DCD disconnected
+# 			X	DCD connected
+# --------------------------------------------
+# 9		X		DSR disconnected
+# 			X	DSR connected
+# --------------------------------------------
+# 10		X		DTR Disconnected
+# 			X	DTR connected
+# --------------------------------------------
+#
+# (tvi925: BSD has :cl=\E*:.  I got :is: and :sr: from there -- esr)
+tvi925|televideo 925:\
+	:am:bs:bw:hs:ul:\
+	:co#80:li#24:sg#1:\
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
+	:ct=\E3:dc=\EW:dl=\ER:do=^V:ds=\Eh:ei=:fs=^M\Eg:ho=^^:ic=\EQ:\
+	:im=:is=\El\E":k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
+	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
+	:kA=\EE:kC=^Z:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^V:\
+	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mk@:nd=^L:sf=^J:sr=\Ej:st=\E1:\
+	:ta=^I:ts=\Eh\Ef:up=^K:vb=\Eb\Ed:ve=\E.4:vs=\E.2:\
+	:tc=adm+sgr:
+# TeleVideo 925 from Mitch Bradley <sun!wmb> via BRL
+# to avoid "magic cookie" standout glitch:
+tvi925-hi|TeleVideo Model 925 with half intensity standout mode:\
+	:sg@:\
+	:kb=^H:kd=^J:kl=^H:se=\E(:so=\E):tc=tvi925:
+
+# From: Todd Litwin <litwin@litwin.jpl.nasa.gov> 28 May 1993
+# Originally Tim Curry, Univ. of Central Fla., <duke!ucf-cs!tim> 5/21/82
+# for additional capabilities, 
+# The following tvi descriptions from B:pjphar and virus!mike
+# is for all 950s.  It sets the following attributes:
+# full duplex (\EDF)		write protect off (\E()
+# conversation mode (\EC)	graphics mode off (\E%)
+# white on black (\Ed)		auto page flip off (\Ew)
+# turn off status line (\Eg)	clear status line (\Ef\r)
+# normal video (\E0)		monitor mode off (\EX or \Eu)
+# edit mode (\Er)		load blank char to space (\Ee\040)
+# line edit mode (\EO)		enable buffer control (^O)
+# protect mode off (\E\047)	duplex edit keys (\El)
+# program unshifted send key to send line all (\E016)
+# program shifted send key to send line unprotected (\E004)
+# set the following to nulls:
+#	field delimiter (\Ex0\200\200)
+#	line delimiter (\Ex1\200\200)
+#	start-protected field delimiter (\Ex2\200\200)
+#	end-protected field delimiter (\Ex3\200\200)
+# set end of text delimiter to carriage return/null (\Ex4\r\200)
+# 
+#                     TVI 950 Switch Setting Reference Charts
+# 
+#                                     TABLE 1:
+# 
+#      S1     1     2     3     4     5     6     7     8     9    10
+#          +-----------------------+-----+-----+-----------------------+
+#          | Computer Baud Rate    |Data |Stop | Printer Baud Rate     |
+#          |                       |Bits |Bits |                       |
+#   +------+-----------------------+-----+-----+-----------------------+
+#   |  Up  |        See            |  7  |  2  |        See            |
+#   +------+-----------------------+-----+-----+-----------------------+
+#   | Down |      TABLE 2          |  8  |  1  |      TABLE 2          |
+#   +------+-----------------------+-----+-----+-----------------------+
+# 
+# 
+#      S2     1     2     3     4     5     6     7     8     9    10
+#          +-----+-----+-----------------+-----+-----------+-----+-----+
+#          |Edit |Cursr|    Parity       |Video|Transmiss'n| Hz  |Click|
+#   +------+-----+-----+-----------------+-----+-----------+-----+-----+
+#   |  Up  | Dplx|Blink|      See        |GonBk|   See     | 60  | Off |
+#   +------+-----+-----+-----------------+-----+-----------+-----+-----+
+#   | Down |Local|St'dy|    TABLE 3      |BkonG|  CHART    | 50  | On  |
+#   +------+-----+-----+-----------------+-----+-----------+-----+-----+
+#  
+#                                    TABLE 2:
+# 
+#             +-----------+-----+-----+-----+-----+-----------+
+#             | Display   |  1  |  2  |  3  |  4  |   Baud    |
+#             +-----------+-----+-----+-----+-----+           |
+#             | Printer   |  7  |  8  |  9  | 10  |   Rate    |
+#             +-----------+-----+-----+-----+-----+-----------+
+#                         |  D  |  D  |  D  |  D  |   9600    |
+#                         |  U  |  D  |  D  |  D  |     50    |
+#                         |  D  |  U  |  D  |  D  |     75    |
+#                         |  U  |  U  |  D  |  D  |    110    |
+#                         |  D  |  D  |  U  |  D  |    135    |
+#                         |  U  |  D  |  U  |  D  |    150    |
+#                         |  D  |  U  |  U  |  D  |    300    |
+#                         |  U  |  U  |  U  |  D  |    600    |
+#                         |  D  |  D  |  D  |  U  |   1200    |
+#                         |  U  |  D  |  D  |  U  |   1800    |
+#                         |  D  |  U  |  D  |  U  |   2400    |
+#                         |  U  |  U  |  D  |  U  |   3600    |
+#                         |  D  |  D  |  U  |  U  |   4800    |
+#                         |  U  |  D  |  U  |  U  |   7200    |
+#                         |  D  |  U  |  U  |  U  |   9600    |
+#                         |  U  |  U  |  U  |  U  |  19200    |
+#                         +-----+-----+-----+-----+-----------+
+# 
+#                                    TABLE 3:
+#                         +-----+-----+-----+-----------+
+#                         |  3  |  4  |  5  |   Parity  |
+#                         +-----+-----+-----+-----------+
+#                         |  X  |  X  |  D  |    None   |
+#                         |  D  |  D  |  U  |     Odd   |
+#                         |  D  |  U  |  U  |    Even   |
+#                         |  U  |  D  |  U  |    Mark   |
+#                         |  U  |  U  |  U  |   Space   |
+#                         +-----+-----+-----+-----------+
+#                                 X = don't care
+# 
+#                                     CHART:
+#                         +-----+-----+-----------------+
+#                         |  7  |  8  | Communication   |
+#                         +-----+-----+-----------------+
+#                         |  D  |  D  |  Half Duplex    |
+#                         |  D  |  U  |  Full Duplex    |
+#                         |  U  |  D  |     Block       |
+#                         |  U  |  U  |     Local       |
+#                         +-----+-----+-----------------+
+# 
+# (tvi950: early versions had obsolete ":ma=^Vj^Kk^Hh^Ll^^H:". 
+# I also inserted :ic: and :kI:; the :ko: string indicated that :IC: 
+# should be present and all tvi native modes use the same string for this.
+# Finally, note that BSD has cud1=^V. -- esr) 
+tvi950|televideo 950:\
+	:am:bs:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:sg#1:\
+	:ac=b\011c\014d\re\ni\013:ae=^X:al=\EE:as=^U:bl=^G:bt=\EI:\
+	:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:\
+	:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:ic=\EQ:im=\Eq:\
+	:is=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\El\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\Ef\r:\
+	:k0=^A0\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=\EE:kB=\EI:kC=\E*:\
+	:kD=\EW:kE=\Et:kI=\EQ:kL=\ER:kS=\Ey:kb=^H:kd=^V:kh=^^:kl=^H:\
+	:kr=^L:ku=^K:le=^H:mk@:nd=^L:pf=\Ea:po=\E`:sf=^J:sr=\Ej:\
+	:st=\E1:ta=^I:ts=\Eg\Ef:up=^K:vb=\Eb\Ed:\
+	:tc=adm+sgr:
+#
+# is for 950 with two pages adds the following:
+#	set 48 line page (\E\\2)
+#	place cursor at page 0, line 24, column 1 (\E-07 )
+#	set local (no send) edit keys (\Ek)
+#
+# two page 950 adds the following:
+#	when entering ex, set 24 line page (\E\\1)
+#	when exiting ex, reset 48 line page (\E\\2)
+#			 place cursor at 0,24,1 (\E-07 )
+#	set duplex (send) edit keys (\El) when entering vi
+#	set local (no send) edit keys (\Ek) when exiting vi
+#
+tvi950-2p|televideo950 w/2 pages:\
+	:is=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\E\2\E-07 \011:\
+	:ke=\Ek:ks=\El:te=\E\2\E-07 :ti=\E\1\E-07 :\
+	:tc=tvi950:
+#
+# is for 950 with four pages adds the following:
+#	set 96 line page (\E\\3)
+#	place cursor at page 0, line 24, column 1 (\E-07 )
+#
+# four page 950 adds the following:
+#	when entering ex, set 24 line page (\E\\1)
+#	when exiting ex, reset 96 line page (\E\\3)
+#			 place cursor at 0,24,1 (\E-07 )
+#
+tvi950-4p|televideo950 w/4 pages:\
+	:is=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\E\3\E-07 \011:\
+	:ke=\Ek:ks=\El:te=\E\3\E-07 :ti=\E\1\E-07 :\
+	:tc=tvi950:
+#
+# :is: for reverse video 950 changes the following:
+#	set reverse video (\Ed)
+#
+# set vb accordingly (\Ed ...delay... \Eb)
+#
+tvi950-rv|televideo950 rev video:\
+	:is=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\El\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0:\
+	:vb=\Ed\Eb:\
+	:tc=tvi950:
+
+# tvi950-rv-2p uses the appropriate entries from 950-2p and 950-rv
+tvi950-rv-2p|televideo950 rev video w/2 pages:\
+	:is=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\E\2\E-07 :\
+	:ke=\Ek:ks=\El:te=\E\2\E-07 :ti=\E\1\E-07 :vb=\Ed\Eb:\
+	:tc=tvi950:
+
+# tvi950-rv uses the appropriate entries from 950-4p and 950-rv
+tvi950-rv-4p|televideo950 rev video w/4 pages:\
+	:is=\EDF\EC\Eb\EG0\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0\011\Ex3\0\0\Ex4\r\0\E\3\E-07 :\
+	:ke=\Ek:ks=\El:te=\E\3\E-07 :ti=\E\1\E-07 :vb=\Ed\Eb:\
+	:tc=tvi950:
+# From: Andreas Stolcke <stolcke@icsi.berkeley.edu>
+# (tvi955: removed obsolete ":ma:=^Vj^Kk^Hh^Ll^^H";
+# removed incorrect (and overridden) ":do=^J:"; fixed broken continuations in
+# the :rs: string, inserted the :IC: implied by the termcap :ko: string.  Note
+# the :ko: string had :cl: in it, which means that one of the original
+# :cl=\E*:, <kclr=\EY> had to be wrong; set <kclr=\E*> because that's what
+# the 950 has.   Finally, corrected the <kel> string to match the 950 and what
+# ko implies -- esr)
+# If the BSD termcap file was right, :cm=\E=%p1%{32}%+%c%p2%{32}%+%c: would
+# also work.
+tvi955|televideo 955:\
+	:5i:bs:ms@:\
+	:it#8:sg@:\
+	:RA=\E[=7l:RX=^N:SA=\E[=7h:SX=^O:\
+	:ac=0_`RjHkGlFmEnIoPqKsQtMuLvOwNxJ:ae=\E%:as=\E$:\
+	:cm=\E[%i%d;%dH:do=^V:is=\E[=3l\EF1\Ed\EG0\E[=5l\E%\El:\
+	:kM=\EQ:kN=\EK:kP=\EJ:kT=\E1:ka=\E3:kt=\E2:mb=\EG2:\
+	:me=\EG0\E[=5l:mh=\E[=5h:mk=\EG1:ps=\EP:\
+	:r1=\EDF\EC\Eg\Er\EO\E'\E(\Ew\EX\Ee \017\E0P\E6\0\E0p\E4\0\Ef\r:\
+	:sf@:ve=\E.2:vi=\E.0:vs=\E.1:\
+	:tc=tvi950:
+tvi955-w|955-w|televideo955 w/132 cols:\
+	:co#132:\
+	:is=\E[=3h\EF1\Ed\EG0\E[=5l\E%\El:tc=tvi955:
+# use half-intensity as normal mode, full intensity as :md:
+tvi955-hb|955-hb|televideo955 half-bright:\
+	:is=\E[=3l\EF1\Ed\EG0\E[=5h\E%\El:md=\E[=5l:\
+	:me=\EG0\E[=5h:mh@:tc=tvi955:
+# From: Humberto Appleton <beto@cs.utexas.edu>, 880521 UT Austin
+# (tvi970: removed ":sg#0:"; removed :se:=\E[m, :ue:=\E[m;
+# added :am:/:cs:/:ho:/<hpa>/<vpa>/:ti:/:te: from BRL.
+# According to BRL we could have :ke:=\E>, :ks:=\E= but I'm not sure what
+# it does to the function keys.  I deduced <rmam>/<smam>.
+# also added empty <acsc> to suppress tic warning,  -- esr)
+tvi970|televideo 970:\
+	:am:bs:da:db:mi:ms:pt:\
+	:co#80:it#8:li#24:\
+	:RA=\E[?7h:SA=\E[?7l:ac=:ae=\E(B:al=\E[L:as=\E(B:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:ch=\E[%i%dG:cl=\E[H\E[2J:cm=\E[%i%d;%df:\
+	:cs=\E[%i%d;%dr:cv=\E[%i%dd:dc=\E[P:dl=\E[M:do=\ED:\
+	:ds=\Eg\Ef\r:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E<\E[?21l\E[19h\E[1Q\E[10l\E[7l\E[H\E[2J:k1=\E?a:\
+	:k2=\E?b:k3=\E?c:k4=\E?d:k5=\E?e:k6=\E?f:k7=\E?g:k8=\E?h:\
+	:k9=\E?i:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:sr=\EM:ta=^I:te=:\
+	:ti=\E[?20l\E[?7h\E[1Q:ue=\E[m:up=\EM:us=\E[4m:\
+	:vb=\E[5m\E[m:vs=\E[1Q:
+tvi970-vb|televideo 970 with visual bell:\
+	:vb=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l:tc=tvi970:
+tvi970-2p|televideo 970 with using 2 pages of memory:\
+	:te=\E[H\E[J\E[V:ti=\E[U\E[?20l\E[?7h\E[1Q:\
+	:tc=tvi970:
+# Works with vi and rogue.  NOTE: Esc v sets autowrap on, Esc u sets 80 chars
+# per line (rather than 40), Esc K chooses the normal character set.  Not sure
+# padding is needed, but adapted from the tvi920c termcap.  The :so: and 
+# :us: strings are klutzy, but at least use no screen space.
+# (tvipt: removed obsolete ":ma=^Kk^Ll^R^L:".  I wish we knew <rmam>,
+# its absence means <smam>=\Ev isn't safe to use. -- esr)
+# From: Gene Rochlin <armsis@amber.berkeley.edu> 9/19/84. 
+# The :cd:/:k0:/:k1:/:kh:/<mc4>, and <mc5> caps are from BRL, which says:
+# F1 and F2 should be programmed as ^A and ^B; required for UNIFY.
+tvipt|televideo personal terminal:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :dl=\ER:\
+	:ho=^^:if=/usr/share/tabset/stdcrt:is=\Ev\Eu\EK:k0=^A:\
+	:k1=^B:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:pf=^T:\
+	:po=^R:se=\EF:so=\EG1@A\EH:ue=\EF:up=^K:us=\EG1B@\EH:
+# From: Nathan Peterson <nathan@sco.com>, 03 Sep 1996
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+tvi9065|televideo 9065:\
+	:am:bw:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#25:lm#0:ma#4:vt#0:ws#30:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ae=\E%:\
+	:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:\
+	:cm=\E=%+ %+ :cr=^M:cs=\E[%i%d;%dr:ct=\E3:dc=\EW:dl=\ER:\
+	:dm=\Er:do=^V:ds=\E_30\r:ec=\E[%d@:ed=\0:ei=\Er:fs=^M:ho=^^:\
+	:i1=\E"\E%\E'\E(\EG@\EO\EX\E[=5l\E[=6l\E[=7h\Ed\Er:\
+	:i2=\E<\E[=4l\E[=8h:if=/usr/share/tabset/stdcrt:im=\Eq:\
+	:ip=:is=\EF2\EG0\E\L:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kb=^H:\
+	:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=\E[25;1H:mb=\EG2:\
+	:md=\EG\054:me=\EG0:mh=\EGp:mr=\EG4:nd=^L:nw=^M^J:\
+	:rp=\E[%r%db%.:se=\EG0:sf=^J:so=\EGt:sr=\Ej:st=\E1:ta=^I:\
+	:te=\E.3\Er\E[1;25r\E[25;0H:ti=\E.2:ts=\E[4;1v\E_30:\
+	:uc=\EG8\EG0:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:ve=\E.3:\
+	:vi=\E.0:vs=\E.2:
+
+#### Visual (vi)
+#
+# In September 1993, Visual Technology of Westboro, Massachusetts,
+# merged with White Pine Software of Nashua, New Hampshire.
+#
+# White Pine Software may be contacted at +1 603/886-9050.
+# Or visit White Pine on the World Wide Web at URL http://www.wpine.com.
+#
+
+# Visual 50 from Beau Shekita, BTL-Whippany <whuxlb!ejs>
+# Recently I hacked together the following termcap for Visual
+# Technology's Visual 50 terminal. It's a slight modification of
+# the vt52 termcap. 
+# It's intended to run when the Visual 50 is in vt52 emulation mode
+# (I know what you're thinking; if it's emulating a vt52, then why
+# another termcap? Well, it turns out that the Visual 50 can handle
+# :dl: and db(?) among other things, which the vt52 can't)
+# The termcap works OK for the most part. The only problem is on
+# character inserts. The whole line gets painfully redrawn for each
+# character typed. Any suggestions?
+# Beau's entry is combined with the vi50 entry from University of Wisconsin.
+# Note especially the :al: function.  :k4:-:k6: are really l4-l6 in
+# disguise; :k7:-:k9: are really l1-l3.
+vi50|visual 50:\
+	:am:bs:da:db:ms:pt:\
+	:co#80:it#8:li#24:\
+	:al=\EL:bl=^G:bt=4\Ez:cd=\EJ:ce=16\EK:cl=\EH\EJ:\
+	:cm=\EY%+ %+ :cr=^M:dl=3*\EM:do=\EB:ho=\EH:k1=\EP:k2=\EQ:\
+	:k3=\ER:k4=\EV:k5=\EE:k6=\E]:k7=\EL:k8=\Ev:k9=\EM:kb=^H:\
+	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:nl=^J:\
+	:nw=^M^J:se=\ET:sf=^J:so=\EU:sr=\EI:ta=^I:ue=\EW:up=\EA:\
+	:us=\ES:
+# this one was BSD & SCO's vi50
+vi50adm|visual 50 in adm3a mode:\
+	:am:ms:\
+	:co#80:it#8:li#24:\
+	:al=\EL:bl=^G:cd=\Ek:ce=\EK:cl=^Z:cm=\E=%+ %+ :cr=^M:dl=\EM:\
+	:do=^J:ho=\EH:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:\
+	:nd=^L:se=\ET:sf=^J:so=\EU:ta=^I:up=^K:
+# From: Jeff Siegal <jbs@quiotix.com>
+vi55|Visual 55:\
+	:am:bs:mi:ms:\
+	:co#80:it#8:li#24:\
+	:al=\EL:cd=\EJ:ce=\EK:cl=\Ev:cm=\EY%+ %+ :cs=\E_%+A%+A:\
+	:dc=\Ew:dl=\EM:do=^J:ei=\Eb:ho=\EH:im=\Ea:\
+	:is=\Ev\E_AX\Eb\EW\E9P\ET:kb=^H:kd=\EB:kl=\ED:kr=\EC:\
+	:ku=\EA:le=^H:nd=\EC:se=\ET:so=\EU:sr=\EI:ta=^I:up=\EA:
+
+# Visual 200 from BRL
+# The following switch settings are assumed for normal operation:
+#	FULL_DUPLEX		SCROLL			CR
+#	AUTO_NEW_LINE_ON	VISUAL_200_EMULATION_MODE
+# Other switches may be set for operator convenience or communication
+# requirements.
+# Character insertion is kludged in order to get around the "beep" misfeature.
+# (This cap is commented out because :im:/:ei: is more efficient -- esr)
+# Supposedly "4*" delays should be used for :al:, :cd:, :cl:, :dc:,
+# and :dl: strings, but we seem to get along fine without them.
+vi200|visual 200:\
+	:am:bs:mi:ms:pt:\
+	:co#80:it#8:kn#10:li#24:\
+	:ac=:ae=\EG:al=\EL:as=\EF:bl=^G:bt=\Ez:cd=\Ey:ce=\Ex:cl=\Ev:\
+	:cm=\EY%+ %+ :cr=^M:ct=\Eg:dc=\EO:dl=\EM:do=^J:ho=\EH:\
+	:k0=\E?p:k1=\E?q:k2=\E?r:k3=\E?s:k4=\E?t:k5=\E?u:k6=\E?v:\
+	:k7=\E?w:k8=\E?x:k9=\E?y:kA=\EL:kC=\Ev:kD=\EO:kE=\Et:kI=\Ei:\
+	:kL=\EM:kM=\Ej:kS=\EJ:kT=\E1:kb=^H:kd=\EB:ke=\E>:kh=\EH:\
+	:kl=\ED:kr=\EC:ks=\E=:kt=\E2:ku=\EA:le=^H:me=\E3\Eb:mh=\E4:\
+	:mk=\Ea:nd=\EC:pf=\EX:po=\EW:ps=\EH\E]:\
+	:r1=\E3\Eb\Ej\E\El\EG\Ec\Ek\EX:se=\E3:sf=^J:so=\E4:\
+	:sr=\EI:st=\E1:ta=^I:up=\EA:ve=\Ec:vs=\Ed:
+# The older Visuals didn't come with function keys. This entry uses
+# :ks: and :ke: so that the keypad keys can be used as function keys.
+# If your version of vi doesn't support function keys you may want
+# to use vi200-f.
+vi200-f|visual 200 no function keys:\
+	:is=\E3\Eb\Ej\E\\El\EG\Ed\Ek:k0=\E?p:k1=\E?q:k2=\E?r:\
+	:k3=\E?s:k4=\E?t:k5=\E?u:k6=\E?v:k7=\E?w:k8=\E?x:k9=\E?y:\
+	:ke=\E>:ks=\E=:se@:so@:\
+	:tc=vi200:
+vi200-rv|visual 200 reverse video:\
+	:se=\E3:so=\E4:sr@:ve@:vs@:tc=vi200:
+
+# the function keys are programmable but we don't reprogram them to their
+# default values with :is: because programming them is very verbose. maybe
+# an initialization file should be made for the 300 and they could be stuck
+# in it.
+# (vi300: added <rmam>/<smam> based on init string -- esr)
+vi300|visual 300 ansi x3.64:\
+	:am:bw:mi:xn:\
+	:co#80:li#24:\
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[1Q\E[0;1(D\E[8s:\
+	:k1=\E_A\E\:k2=\E_B\E\:k3=\E_C\E\:k4=\E_D\E\:k5=\E_E\E\:\
+	:k6=\E_F\E\:k7=\E_G\E\:k8=\E_H\E\:k9=\E_I\E\:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:nd=\E[C:\
+	:se=\E[m:sf=^J:so=\E[1m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+# some of the vi300s have older firmware that has the command
+# sequence for setting editing extent reversed.
+vi300-old|visual 300 with old firmware (set edit extent reversed):\
+	:is=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[2Q\E[0;1(D\E[8s:\
+	:tc=vi300:
+
+# Visual 500 prototype entry from University of Wisconsin.
+# The best place to look for the escape sequences is page A1-1 of the
+# Visual 500 manual.  The initialization sequence given here may be
+# overkill, but it does leave out some of the initializations which can
+# be done with the menus in set-up mode.
+# The :xp: line below is so that emacs can understand the padding requirements
+# of this slow terminal.  :xp: is 10 time the padding factor.
+# (vi500: removed unknown :xp#4: termcap;
+# also added empty <acsc> to suppress tic warning -- esr)
+vi500|visual 500:\
+	:am:mi:ms:\
+	:co#80:it#8:li#33:\
+	:ac=:ae=^O:al=3*\EL\Ex:as=^N:bt=4\Ez:cd=3*\Ey:ce=16\Ex:\
+	:cl=6*\Ev:cm=\EY%+ %+ :cr=^M:cs=\E(%+ %+ :dc=3*\EO:\
+	:dl=3*\EM:do=\EB:ei=\Ej:ho=\EH:im=\Ei:\
+	:is=\E3\E\001\E\007\E\003\Ek\EG\Ed\EX\El\E>\Eb\E\:\
+	:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
+	:nw=^M^J:se=\E^G:sf=^J:so=\E^H:ta=8\011:ue=\E^C:up=\EA:\
+	:us=\E^D:
+
+# The visual 550 is a visual 300 with tektronix graphics,
+# and with 33 lines. clear screen is modified here to
+# also clear the graphics.
+vi550|visual 550 ansi x3.64:\
+	:li#33:\
+	:cl=\030\E[H\E[2J:tc=vi300:
+
+vi603|visual603|visual 603:\
+	:hs:mi:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:ds=\EP2;1~\E\:ei=\E[4l:\
+	:fs=\E\:i1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r:\
+	:im=\E[4h:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:ts=\EP2~:ue=\E[24m:\
+	:up=\E[A:us=\E[4m:\
+	:tc=vt100:
+
+#### Wyse (wy)
+#
+#	Wyse Technology
+#	3471 North First Street
+#	San Jose, CA 95134
+#	Vox: (408)-473-1200
+#	Fax: (408) 473-1222
+#	Web: http://www.wyse.com
+#
+# Wyse sales can be reached by phone at 1-800-GET-WYSE.  Tech support is at
+# (800)-800-WYSE (option 5 gets you a human).  There's a Web page at the
+# obvious address, <http://www.wyse.com>.  They keep terminfo entries at
+# <http://www.wyse.co.uk/support/appnotes/idxappnt.htm>.
+#
+# Wyse bought out Link Technology, Inc. in 1990 and closed it down in 1995.
+# They now own the Qume and Amdek brands, too.  So these are the people to
+# talk with about all Link, Qume, and Amdek terminals.
+#
+# These entries include a few small fixes.
+# I canceled the bel capacities in the vb entries.
+# I made two trivial syntax fixes in the wyse30 entry.
+# I made some entries relative to adm+sgr.
+#
+#
+# Note: The wyse75, wyse85, and wyse99 have been discontinued.
+
+#	   Although the Wyse 30 can support more than one attribute
+#	it requires magic cookies to do so.  Many applications do not
+#	function well with magic cookies.  The following terminfo uses
+#	the protect mode to support one attribute (dim) without cookies.
+#	If more than one attribute is needed then the wy30-mc terminfo
+#	should be used.
+#
+wy30|wyse30|Wyse 30:\
+	:5i:am:bw:hs:mi:ms:xo:\
+	:Nl#8:co#80:lh#1:li#24:lw#8:ma#1:ws#45:\
+	:#2=\E{:&3=\Er:@8=\E7:LF=\EA11:LO=\EA10:\
+	:ac=0wa_h[jukslrmqnxqzttuyv]wpxv:ae=\EH^C:al=\EE:\
+	:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:ei=\Er:fs=^M:\
+	:ho=^^:im=\Eq:ip=:is=\E'\E(\E\1363\E`9\016\024:k1=^A@\r:\
+	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
+	:k8=^AG\r:kA=\EE:kB=\EI:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kN=\EK:\
+	:kP=\EJ:kS=\EY:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
+	:ll=^^^K:me=\E(\EH\003:mh=\E`7\E):mp=\E`7\E):nd=^L:\
+	:nw=^M^J:pf=^T:pn=\Ez%+/%s\r:po=^X:ps=\EP:px=\Ez%+?%s\177:\
+	:..sa=%?%p1%p5%p8%|%|%t\E`7\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
+	:se=\E(:sf=\n:so=\E`7\E):sr=\Ej:st=\E1:ta=\011:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
+#
+#	This terminal description uses the non-hidden attribute mode
+#	(with magic cookie).
+#
+# (wy30-mc: added :ti: to suppress tic warning --esr)
+wy30-mc|wyse30-mc|wyse 30 with magic cookies:\
+	:ms@:\
+	:ma@:sg#1:\
+	:ae=\EG0\EH\003:as=\EG0\EH\002:mb=\EG2:\
+	:me=\EG0\E(\EH\003:mh=\EGp:mp=\EG0\E):\
+	:..sa=\EG%{48}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
+	:se=\EG0:so=\EG4:te=\EG0:ti=:\
+	:tc=wy30:tc=adm+sgr:
+#	The mandatory pause used by :vb: does not work with
+#	older versions of terminfo.  If you see this effect then
+#	unset xon and delete the / from the delay.
+#	i.e. change $<100/> to $<100>
+wy30-vb|wyse30-vb|wyse 30 visible bell:\
+	:bl@:tc=wy30:
+#
+#	   The Wyse 50 can support one attribute (e.g. Dim, Inverse,
+#	Normal) without magic cookies by using the protect mode.
+#	The following description uses this feature, but when more
+#	than one attribute is put on the screen at once, all attributes
+#	will be changed to be the same as the last attribute given.
+#	   The Wyse 50 can support more attributes when used with magic
+#	cookies.  The wy50-mc terminal description uses magic cookies
+#	to correctly handle multiple attributes on a screen.
+#
+wy50|wyse50|Wyse 50:\
+	:5i:am:bw:hs:mi:ms:xo:\
+	:Nl#8:co#80:lh#1:li#24:lw#8:ma#1:ws#45:\
+	:#2=\E{:%9=\EP:&3=\Er:@8=\E7:F1=^AJ\r:F2=^AK\r:F3=^AL\r:\
+	:F4=^AM\r:F5=^AN\r:F6=^AO\r:LF=\EA11:LO=\EA10:\
+	:ac=0wa_h[jukslrmqnxqzttuyv]wpxv:ae=\EH^C:al=\EE:\
+	:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:ei=\Er:fs=^M:\
+	:ho=^^:i1=\E`\072\E`9:im=\Eq:ip=:is=\016\024\E'\E(:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kA=\EE:kB=\EI:kD=\EW:\
+	:kE=\ET:kI=\EQ:kL=\ER:kN=\EK:kP=\EJ:kS=\EY:kb=^H:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:me=\E(\EH\003:mh=\E`7\E):\
+	:mp=\E`7\E):mr=\E`6\E):nd=^L:nw=^M^J:pf=^T:pn=\Ez%+/%s\r:\
+	:po=^X:ps=\EP:px=\Ez%+?%s\177:\
+	:..sa=%?%p1%p3%|%t\E`6\E)%e%p5%p8%|%t\E`7\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
+	:se=\E(:sf=\n:so=\E`6\E):sr=\Ej:st=\E1:ta=^I:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
+#
+#	This terminal description uses the non-hidden attribute mode
+#	(with magic cookie).
+#
+#	The mandatory pause used by flash does not work with some
+#	older versions of terminfo.  If you see this effect then
+#	unset :xo: and delete the / from the delay.
+#	i.e. change $<100/> to $<100>
+# (wy50-mc: added :ti: to suppress tic warning --esr)
+wy50-mc|wyse50-mc|wyse 50 with magic cookies:\
+	:ms@:\
+	:ma@:sg#1:\
+	:ae=\EG0\EH\003:as=\EG0\EH\002:mb=\EG2:\
+	:me=\EG0\E(\EH\003:mh=\EGp:mp=\EG0\E):mr=\EG4:\
+	:..sa=\EG%{48}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
+	:se=\EG0:so=\EGt:te=\EG0:ti=:\
+	:tc=wy50:tc=adm+sgr:
+wy50-vb|wyse50-vb|wyse 50 visible bell:\
+	:bl@:tc=wy50:
+wy50-w|wyse50-w|wyse 50 132-column:\
+	:Nl#16:co#132:lw#7:ws#97:\
+	:cm=\Ea%i%dR%dC:dc=\EW:i1=\E`;\E`9:tc=wy50:
+wy50-wvb|wyse50-wvb|wyse 50 132-column visible bell:\
+	:bl@:\
+	:tc=wy50-w:
+#
+#	The Wyse 350 is a Wyse 50 with color.
+#	Unfortunately this means that it has magic cookies.
+#	The color attributes are designed to overlap the reverse, dim and
+#	underline attributes.  This is nice for monochrome applications
+#	because you can make underline stuff green (or any other color)
+#	but for true color applications it's not so hot because you cannot
+#	mix color with reverse, dim or underline.
+#	    To further complicate things one of the attributes must be
+#	black (either the foreground or the background).  In reverse video
+#	the background changes color with black letters.  In normal video
+#	the foreground changes colors on a black background.  
+#	    This terminfo uses some of the more advanced features of curses
+#	to display both color and blink.  In the final analysis I am not
+#	sure that the wy350 runs better with this terminfo than it does
+#	with the wy50 terminfo (with user adjusted colors).
+#
+#	The mandatory pause used by flash does not work with
+#	older versions of terminfo.  If you see this effect then
+#	unset xon and delete the / from the delay.
+#	i.e. change $<100/> to $<100>
+#
+# Bug: The <op> capability resets attributes.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+wy350|wyse350|Wyse 350:\
+	:5i:am:bw:hs:mi:xo:\
+	:Co#8:NC#55:Nl#8:co#80:lh#1:li#24:lw#8:pa#8:sg#1:ws#45:\
+	:#2=\E{:%9=\EP:&3=\Er:@8=\E7:F1=^AJ\r:F2=^AK\r:F3=^AL\r:\
+	:F4=^AM\r:F5=^AN\r:F6=^AO\r:LF=\EA11:LO=\EA10:Sb=:\
+	:ac=0wa_h[jukslrmqnxqzttuyv]wpxv:ae=\EG0\EH\003:al=\EE:\
+	:as=\EG0\EH\002:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
+	:ei=\Er:fs=^M:ho=^^:i1=\E`\072\E`9:i2=\E%?:im=\Eq:ip=:\
+	:is=\016\024\E'\E(:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:\
+	:kA=\EE:kB=\EI:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kN=\EK:kP=\EJ:\
+	:kS=\EY:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:\
+	:mb=\EG2:me=\EG0\E(\EH\003%{0}%PA%{0}%PC:mh=\EGp:\
+	:mp=\EG0\E):nd=^L:nw=^M^J:oc=\E%?:op=\EG0:pf=^T:\
+	:pn=\Ez%+/%s\r:po=^X:ps=\EP:px=\Ez%+?%s\177:sf=\n:sr=\Ej:\
+	:st=\E1:ta=^I:ts=\EF:up=^K:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
+wy350-vb|wyse350-vb|wyse 350 visible bell:\
+	:bl@:tc=wy350:
+wy350-w|wyse350-w|wyse 350 132-column:\
+	:Nl#16:co#132:lw#7:ws#97:\
+	:cm=\Ea%i%dR%dC:dc=\EW:i1=\E`;\E`9:tc=wy350:
+wy350-wvb|wyse350-wvb|wyse 350 132-column visible bell:\
+	:bl@:\
+	:tc=wy350-w:
+#
+#	This terminfo description is untested.
+#	The wyse100 emulates an adm31, so the adm31 entry should work.
+#
+wy100|wyse 100:\
+	:hs:mi:\
+	:co#80:li#24:sg#1:\
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E;:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ds=\EA31:ei=\Er:fs=^M:im=\Eq:is=\Eu\E0:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:kb=^H:kd=^J:kh=\E{:kl=^H:kr=^L:ku=^K:\
+	:le=^H:mk@:nd=^L:sf=^J:ts=\EF:up=^K:\
+	:tc=adm+sgr:
+#
+#	The Wyse 120/150 has most of the features of the Wyse 60.
+#	This terminal does not need padding up to 9600 baud!
+#	:ms: should be set but the clear screen fails when in
+#	alt-charset mode.  Try \EcE\s\s\E+\s if the screen is really clear
+#	then set :ms:.
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy120|wyse120|wy150|wyse150|Wyse 120/150:\
+	:am:bw:hs:km:mi:ms:xo:\
+	:co#80:it#8:li#24:pb#9601:ws#45:\
+	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
+	:ei=\Er:fs=^M:ho=^^:i1=\EcB0\EcC1:i2=\EwJ\Ew1:im=\Eq:ip=:\
+	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=\n:\
+	:so=\EGt:sr=\Ej:st=\E1:ta=\011:te=\Ew1:ti=\Ew0:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
+#
+wy120-w|wyse120-w|wy150-w|wyse150-w|wyse 120/150 132-column:\
+	:Nl#16:co#132:lw#7:ws#97:\
+	:cm=\Ea%i%dR%dC:dc=\EW:ip=:r2=\E`;:tc=wy120:
+#
+wy120-25|wyse120-25|wy150-25|wyse150-25|wyse 120/150 80-column 25-lines:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy120:
+#
+wy120-25-w|wyse120-25-w|wy150-25-w|wyse150-25-w|wyse 120/150 132-column 25-lines:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy120-w:
+#
+wy120-vb|wyse120-vb|wy150-vb|wyse150-vb|Wyse 120/150 visible bell:\
+	:bl@:\
+	:tc=wy120:
+#
+wy120-w-vb|wy120-wvb|wyse120-wvb|wy150-w-vb|wyse150-w-vb|Wyse 120/150 132-column visible bell:\
+	:bl@:\
+	:tc=wy120-w:
+#
+#	The Wyse 60 is like the Wyse 50 but with more padding.
+#	The reset strings are slow and the pad times very depending
+#	on other parameters such as font loading.  I have tried
+#	to follow the following outline:
+#
+#		<rs1> -> set personality
+#		<rs2> -> set number of columns
+#		<rs3> -> set number of lines
+#		:i1: -> select the proper font
+#		:is: -> do the initialization
+#		:i3: -> set up display memory (2 pages)
+#
+#	The Wyse 60's that have vt100 emulation are slower than the
+#	older Wyse 60's.  This change happened mid-1987.
+#	The capabilities effected are :dc: :dl: :al: :sf: :sr:
+#
+#	The meta key is only half right.  This terminal will return the
+#	high order bit set when you hit CTRL-function_key
+#
+#	It may be useful to assign two function keys with the
+#	values  \E=(\s  look at old data in page 1
+#	        \E=W,   look at bottom of page 1
+#	where \s is a space ( ).
+#
+#	Note:
+#	   The Wyse 60 runs faster when the XON/XOFF
+#	   handshake is turned off.
+#
+# (wy60: we use \E{ rather than ^^ for home (both are documented) to avoid
+# a bug reported by Robert Dunn, <rcdii@inlink.com> -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy60|wyse60|Wyse 60:\
+	:am:bw:hs:km:mi:ms:\
+	:co#80:li#24:ws#45:\
+	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
+	:ei=\Er:fs=^M:ho=\E{:i1=\EcB0\EcC1:i2=\EwJ\Ew1:im=\Eq:ip=:\
+	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=\E{^K:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=\n:\
+	:so=\EGt:sr=\Ej:st=\E1:ta=\011:te=\Ew1:ti=\Ew0:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
+#
+wy60-w|wyse60-w|wyse 60 132-column:\
+	:Nl#16:co#132:lw#7:ws#97:\
+	:cm=\Ea%i%dR%dC:dc=\EW:ip=:r2=\EeF\E`;:tc=wy60:
+#
+wy60-25|wyse60-25|wyse 60 80-column 25-lines:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy60:
+wy60-25-w|wyse60-25-w|wyse 60 132-column 25-lines:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy60-w:
+#
+wy60-42|wyse60-42|wyse 60 80-column 42-lines:\
+	:li#42:\
+	:al=\EE:cd=\Ey:cl=\E+:cm=\E=%+ %+ :dc=\EW:dl=\ER:\
+	:i1=\EcB2\EcC3:ip=:nw=\r\n:r3=\Ee*:sf=\n:sr=\Ej:tc=wy60:
+wy60-42-w|wyse60-42-w|wyse 60 132-column 42-lines:\
+	:Nl#16:co#132:lw#7:ws#97:\
+	:cd=\Ey:cl=\E+:cm=\Ea%i%dR%dC:dc=\EW:ho=\036:ip=:nw=\r\n:\
+	:r2=\EeF\E`;:\
+	:tc=wy60-42:
+#
+wy60-43|wyse60-43|wyse 60 80-column 43-lines:\
+	:Nl@:lh@:li#43:lw@:\
+	:pn@:r3=\Ee+:tc=wy60-42:
+wy60-43-w|wyse60-43-w|wyse 60 132-column 43-lines:\
+	:Nl@:lh@:li#43:lw@:\
+	:pn@:r3=\Ee+:tc=wy60-42-w:
+#
+wy60-vb|wyse60-vb|Wyse 60 visible bell:\
+	:bl@:tc=wy60:
+wy60-w-vb|wy60-wvb|wyse60-wvb|Wyse 60 132-column visible bell:\
+	:bl@:\
+	:tc=wy60-w:
+
+#	The Wyse-99GT looks at lot like the Wyse 60 except that it
+#	does not have the 42/43 line mode.  In the Wyse-60 the "lines"
+#	setup parameter controls the number of lines on the screen.
+#	For the Wyse 99GT the "lines" setup parameter controls the
+#	number of lines in a page.  The screen can display 25 lines max.
+#	    The Wyse-99GT also has personalities for the VT220 and
+#	Tektronix 4014.  But this has no bearing on the native mode.
+#
+#	(msgr) should be set but the clear screen fails when in
+#	alt-charset mode.  Try \EcE\s\s\E+\s if the screen is really clear
+#	then set msgr, else use msgr@.
+#
+#	u0 -> enter Tektronix mode
+#	u1 -> exit Tektronix mode
+#
+wy99gt|wyse99gt|Wyse 99gt:\
+	:ms@:\
+	:al=\EE:cd=\Ey:ce=\Et:cl=\E+:dc=\EW:dl=\ER:i2=\Ew0:ip=:nw@:\
+	:r2=\E`\072:sf=\n:sr=\Ej:ta=\011:te=\Ew0:ti=\Ew1:\
+	:u0=\E~>\E8:u1=\E[42h:vb=\E`8\E`9:tc=wy60:
+#
+wy99gt-w|wyse99gt-w|wyse 99gt 132-column:\
+	:Nl#16:co#132:lw#7:ws#97:\
+	:cd=\Ey:cl=\E+:cm=\Ea%i%dR%dC:dc=\EW:ip=:r2=\E`;:tc=wy99gt:
+#
+wy99gt-25|wyse99gt-25|wyse 99gt 80-column 25-lines:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r2=\E`\072:r3=\EwG\Ee):tc=wy99gt:
+#
+wy99gt-25-w|wyse99gt-25-w|wyse 99gt 132-column 25-lines:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r2=\E`;:tc=wy99gt-w:
+#
+wy99gt-vb|wyse99gt-vb|Wyse 99gt visible bell:\
+	:bl@:tc=wy99gt:
+#
+wy99gt-w-vb|wy99gt-wvb|wyse99gt-wvb|Wyse 99gt 132-column visible bell:\
+	:bl@:\
+	:tc=wy99gt-w:
+#
+#	The Wyse 160 is combination of the WY-60 and the WY-99gt.
+#	The reset strings are slow and the pad times very depending
+#	on other parameters such as font loading.  I have tried
+#	to follow the following outline:
+#
+#		<rs1> -> set personality
+#		<rs2> -> set number of columns
+#		<rs3> -> set number of lines
+#		:i1: -> select the proper font
+#		:is: -> do the initialization
+#		:i3: -> set up display memory (2 pages)
+#
+#	The display memory may be used for either text or graphics.
+#	When "Display Memory = Shared" the terminal will have more pages
+#	but garbage may be left on the screen when you switch from
+#	graphics to text.  If "Display Memory = Unshared" then the
+#	text area will be only one page long.
+#
+# (wy160: we use \E{ rather than ^^ for home (both are documented) to avoid
+# a bug reported by Robert Dunn, <rcdii@inlink.com> -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy160|wyse160|Wyse 160:\
+	:am:bw:hs:km:mi:ms:\
+	:co#80:li#24:ws#38:\
+	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
+	:ei=\Er:fs=^M:ho=\E{:i1=\EcB0\EcC1:i2=\Ew0:im=\Eq:ip=:\
+	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=\E{^K:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=\n:\
+	:so=\EGt:sr=\Ej:st=\E1:ta=^I:te=\Ew0:ti=\Ew1:ts=\EF:up=^K:\
+	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
+#
+wy160-w|wyse160-w|wyse 160 132-column:\
+	:Nl#16:co#132:lw#7:ws#90:\
+	:cm=\Ea%i%dR%dC:dc=\EW:r2=\EeF\E`;:tc=wy160:
+#
+wy160-25|wyse160-25|wyse 160 80-column 25-lines:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy160:
+wy160-25-w|wyse160-25-w|wyse 160 132-column 25-lines:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy160-w:
+#
+wy160-42|wyse160-42|wyse 160 80-column 42-lines:\
+	:li#42:\
+	:al=\EE:cd=\Ey:cl=\E+:dl=\ER:i1=\EcB2\EcC3:nw=\r\n:r3=\Ee*:\
+	:sf=\n:sr=\Ej:\
+	:tc=wy160:
+wy160-42-w|wyse160-42-w|wyse 160 132-column 42-lines:\
+	:Nl#16:co#132:lw#7:ws#90:\
+	:cm=\Ea%i%dR%dC:dc=\EW:ip=:r2=\EeF\E`;:tc=wy160-42:
+#
+wy160-43|wyse160-43|wyse 160 80-column 43-lines:\
+	:Nl@:lh@:li#43:lw@:\
+	:pn@:r3=\Ee+:tc=wy160-42:
+wy160-43-w|wyse160-43-w|wyse 160 132-column 43-lines:\
+	:Nl@:lh@:li#43:lw@:\
+	:pn@:r3=\Ee+:tc=wy160-42-w:
+#
+wy160-vb|wyse160-vb|Wyse 160 visible bell:\
+	:bl@:tc=wy160:
+wy160-w-vb|wy160-wvb|wyse160-wvb|Wyse 160 132-column visible bell:\
+	:bl@:\
+	:tc=wy160-w:
+#
+#	The Wyse 75 is a vt100 lookalike without advanced video.
+#
+#	   The Wyse 75 can support one attribute (e.g. Dim, Inverse,
+#	Underline) without magic cookies.  The following description
+#	uses this capability, but when more than one attribute is
+#	put on the screen at once, all attributes will be changed
+#	to be the same as the last attribute given.
+#	   The Wyse 75 can support more attributes when used with magic
+#	cookies.  The wy75-mc terminal description uses magic cookies
+#	to correctly handle multiple attributes on a screen.
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy75|wyse75|wyse 75:\
+	:am:hs:mi:ms:xn:xo:\
+	:co#80:li#24:ma#1:pb#1201:ws#78:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E[>\054\001\001\E[>-\001\001:ec=\E[%dX:ei=\E[4l:\
+	:fs=^A:ho=\E[H:\
+	:i1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h:i2=\E[m:\
+	:im=\E[4h:ip=:is=\E>\E(B\E)0\017:k1=\E[?5i:k2=\E[?3i:\
+	:k3=\E[2i:k4=\E[@:k5=\E[M:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
+	:k9=\E[20~:kI=\E[@:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E[?1l\E[?7h\E=:ku=\E[A:le=^H:\
+	:me=\E[m\017:mh=\E[0t\E[2m:mr=\E[1t\E[7m:nd=\E[C:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=\n:so=\E[1t\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[>\054\001:ue=\E[m:up=\E[A:us=\E[2t\E[4m:\
+	:vb=\E[30h\E\054\E[30l:ve=\E[?25h:vi=\E[?25l:
+#
+#	This terminal description uses the non-hidden attribute mode
+#	(with magic cookie).
+#
+wy75-mc|wyse75-mc|wyse 75 with magic cookies:\
+	:ms@:\
+	:ma@:sg#1:\
+	:ae=\E[0p\017:as=\E[0p\016:i2=\E[m\E[p:mb=\E[2p:\
+	:me=\E[0p\017:mh=\E[1p:mk=\E[4p:mr=\E[16p:\
+	:..sa=\E[%{0}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{16}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{1}%|%;%?%p7%t%{4}%|%;%dp%?%p9%t\016%e\017%;:\
+	:se=\E[0p:so=\E[17p:ue=\E[0p:us=\E[8p:\
+	:tc=wy75:
+wy75-vb|wyse75-vb|wyse 75 with visible bell:\
+	:pb@:\
+	:bl@:tc=wy75:
+wy75-w|wyse75-w|wyse 75 in 132 column mode:\
+	:co#132:ws#130:\
+	:r2=\E[35h\E[?3h:tc=wy75:
+wy75-wvb|wyse75-wvb|wyse 75 with visible bell 132 columns:\
+	:pb@:\
+	:bl@:tc=wy75-w:
+#
+#	Wyse 85 emulating a vt220 7 bit mode.
+#		24 line screen with status line.
+#
+#	The vt220 mode permits more function keys but it wipes out
+#	the escape key.  I strongly recommend that <f11> be set to
+#	escape (esc).
+#	The terminal may have to be set for 8 data bits and 2 stop
+#	bits for the arrow keys to work.
+#	The Wyse 85 runs faster with XON/XOFF enabled.  Also the
+#	:DC: and :IC: work best when XON/XOFF is set.  :IC: and
+#	:DC: leave trash on the screen when used without XON/XOFF.
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy85|wyse85|wyse 85:\
+	:am:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ds=\E[40l:\
+	:ec=\E[%dX:ei=\E[4l:fs=\E[1;24r\E8:ho=\E[H:\
+	:i1=\E[62;1"p\E[?5W:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:ip=:\
+	:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:kl=\E[D:kr=\E[C:\
+	:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=\n:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=\011:\
+	:ts=\E[40h\E7\E[25;%i%p1%dH:ue=\E[m:up=\E[A:us=\E[4m:\
+	:vb=\E[30h\E\054\E[30l:ve=\E[?25h:vi=\E[?25l:
+#
+#	Wyse 85 with visual bell.
+wy85-vb|wyse85-vb|wyse 85 with visible bell:\
+	:bl@:vb=\E[30h\E\054\E[30l:tc=wy85:
+#
+#	Wyse 85 in 132-column mode.
+wy85-w|wyse85-w|wyse 85 in 132-column mode:\
+	:co#132:ws#132:\
+	:r2=\E[35h\E[?3h:tc=wy85:
+#
+#	Wyse 85 in 132-column mode with visual bell.
+wy85-wvb|wyse85-wvb|wyse 85 with visible bell 132-columns:\
+	:bl@:\
+	:tc=wy85-w:
+#
+#	Wyse 185 emulating a vt320 7 bit mode.
+#
+#	This terminal always displays 25 lines.  These lines may be used
+#	as 24 data lines and a terminal status line (top or bottom) or
+#	25 data lines.  The 48 and 50 line modes change the page size
+#	and not the number of lines on the screen.
+#
+#	The Compose Character key can be used as a meta key if changed
+#	by set-up.
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy185|wyse185|wyse 185:\
+	:am:hs:km:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E7\E[99;0H\E[K\E8:ec=\E[%dX:ei=\E[4l:\
+	:fs=\E[1;24r\E8:ho=\E[H:i1=\E[?5W:\
+	:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:ip=:\
+	:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:kl=\E[D:kr=\E[C:\
+	:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:sf=\n:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:te=\E[ R:ti=\E[ Q:\
+	:ts=\E7\E[99;%i%p1%dH:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=\E[30h\E\054\E[30l:ve=\E[34h\E[?25h:vi=\E[?25l:\
+	:vs=\E[?25h\E[34l:
+#
+#	Wyse 185 with 24 data lines and top status (terminal status)
+wy185-24|wyse185-24|wyse 185 with 24 data lines:\
+	:hs@:\
+	:ds@:fs@:r3=\E[?5l\E[47h\E[40l\E[1;24r:ts@:tc=wy185:
+#
+#	Wyse 185 with visual bell.
+wy185-vb|wyse185-vb|wyse 185+flash:\
+	:bl@:tc=wy185:
+#
+#	Wyse 185 in 132-column mode.
+wy185-w|wyse185-w|wyse 185 in 132-column mode:\
+	:co#132:ws#132:\
+	:DC=\E[%dP:IC=\E[%d@:dc=\E[P:ei=:im=:ip=:r2=\E[35h\E[?3h:tc=wy185:
+#
+#	Wyse 185 in 132-column mode with visual bell.
+wy185-wvb|wyse185-wvb|wyse 185+flash+132 cols:\
+	:bl@:tc=wy185-w:
+
+# wy325 terminfo entries
+# Done by Joe H. Davis        3-9-92
+
+# lines 25  columns 80
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+wy325|wyse325|Wyse epc:\
+	:5i:am:bw:hs:mi:\
+	:Nl#8:co#80:lh#1:li#24:lw#8:pb#9601:ws#45:\
+	:#2=\E{:%9=\EP:&3=\Er:@8=\E7:F1=^AJ\r:F2=^AK\r:F3=^AL\r:\
+	:F4=^AM\r:F5=^AN\r:F6=^AO\r:LF=\EA11:LO=\EA10:RA=\Ed.:\
+	:SA=\Ed/:\
+	:ac=+/\054.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~:\
+	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
+	:ei=\Er:fs=^M:ho=^^:i1=\EcB0\EcC1:i2=\Ew0:im=\Eq:ip=:\
+	:is=\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kA=\EE:kB=\EI:kD=\EW:\
+	:kE=\ET:kI=\Eq:kL=\ER:kN=\EK:kP=\EJ:kS=\EY:kb=^H:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:mp=\E):nd=^L:pf=^T:\
+	:pl=\EZ2%+?%s\177:pn=\Ez%+/%s\r:po=\Ed#:ps=\EP:\
+	:px=\EZ1%+?%s\177:r1=\E~\041\E~4:r2=\EeF\E`\072:\
+	:r3=\EwG\Ee(:sf=\n:so=\EGt:sr=\Ej:st=\E1:ta=^I:te=\Ew0:\
+	:ti=\Ew1:ts=\EF:up=^K:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
+
+#
+# lines 24  columns 80  vb 
+#
+wy325-vb|wyse325-vb|wyse-325 with visual bell:\
+	:bl@:tc=wy325:
+
+#
+# lines 24  columns 132
+#
+wy325-w|wyse325-w|wy325w-24|wyse-325 in wide mode:\
+	:Nl#16:co#132:lw#7:ws#97:\
+	:cm=\Ea%i%dR%dC:dc=\EW:ip=:r2=\E`;:tc=wy325:
+#
+# lines 25  columns 80
+#
+wy325-25|wyse325-25|wy325-80|wyse-325|wyse-325 25 lines:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy325:
+#
+# lines 25  columns 132
+#
+wy325-25w|wyse325-25w|wy325 132 columns:\
+	:Nl@:lh@:li#25:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy325-w:
+#
+# lines 25  columns 132  vb 
+#
+wy325-w-vb|wy325-wvb|wyse325-wvb|wyse-325 wide mode reverse video:\
+	:bl@:\
+	:tc=wy325-w:
+
+#
+# lines 42  columns 80
+#
+wy325-42|wyse325-42|wyse-325 42 lines:\
+	:Nl@:lh@:li#42:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy325:
+#
+# lines 42  columns 132
+#
+wy325-42w|wyse325-42w|wyse-325 42 lines wide mode:\
+	:Nl@:lh@:li#42:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy325-w:
+#
+# lines 42  columns 132  vb 
+#
+wy325-42w-vb|wy325-42wvb|wyse-325 42 lines wide mode visual bell:\
+	:bl@:\
+	:tc=wy325-w:
+#
+# lines 43  columns 80
+#
+wy325-43|wyse325-43|wyse-325 43 lines:\
+	:Nl@:lh@:li#43:lw@:\
+	:pn@:tc=wy325:
+#
+# lines 43  columns 132
+#
+wy325-43w|wyse325-43w|wyse-325 43 lines wide mode:\
+	:Nl@:lh@:li#43:lw@:\
+	:pn@:r3=\EwG\Ee):tc=wy325-w:
+#
+# lines 43  columns 132  vb 
+#
+wy325-43w-vb|wy325-43wvb|wyse-325 43 lines wide mode visual bell:\
+	:bl@:\
+	:tc=wy325-w:
+
+#	Wyse 370 -- 24 line screen with status line.
+#
+#	The terminal may have to be set for 8 data bits and 2 stop
+#	bits for the arrow keys to work.
+#
+#	If you change keyboards the terminal will send different
+#	escape sequences.
+#	The following definition is for the basic terminal without
+#	function keys.
+#
+#	<u0> -> enter Tektronix 4010/4014 mode
+#	<u1> -> exit  Tektronix 4010/4014 mode
+#	<u2> -> enter ASCII mode (from any ANSI mode)
+#	<u3> -> exit  ASCII mode (goto native ANSI mode)
+#	<u4> -> enter Tek 4207 ANSI mode (from any ANSI mode)
+#	<u5> -> exit  Tek 4207 mode (goto native ANSI mode)
+#
+# Bug: The <op> capability resets attributes.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy370-nk|wyse 370 without function keys:\
+	:am:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ds=\E[40l:\
+	:ec=\E[%dX:ei=\E[4l:fs=\E[1;24r\E8:ho=\E[H:\
+	:i1=\E[90;1"p\E[?5W:i2=\E>\017\E)0\E(B\E[63;0w\E[m:\
+	:im=\E[4h:ip=:\
+	:is=\E[2;4;20;30;40l\E[?1;10;16l\E[12h\E[?7;8;25h:\
+	:ke=\E>:ks=\E[?1l\E=:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:sf=\n:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=\011:te=\E[ R:ti=\E[ Q:\
+	:ts=\E[40l\E[40h\E7\E[99;%i%p1%dH:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:vb=\E[30h\E\054\E[30l:ve=\E[34h\E[?25h:\
+	:vi=\E[?25l:vs=\E[?25h\E[34l:
+#
+#	Function key set for the ASCII (wy-50 compatible) keyboard
+#	This is the default 370.
+#
+wy370|wyse370|wy370-101k|Wyse 370 with 101 key keyboard:\
+	:@8=\EOM:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
+	:F5=\E[28~:F6=\E[29~:k1=\E[?4i:k2=\E[?3i:k3=\E[2i:k4=\E[@:\
+	:k5=\E[M:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
+	:k;=\E[21~:kA=\EOP:kB=\E[Z:kD=\EOQ:kI=\EOP:kL=\EOQ:kN=\E[U:\
+	:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:tc=wy370-nk:
+#
+#	Function key set for the VT-320 (and wy85) compatible keyboard
+#
+wy370-105k|Wyse 370 with 105 key keyboard:\
+	:%1=\E[28~:*6=\E[4~:@0=\E[1~:@8=\EOM:F1=\E[23~:F2=\E[24~:\
+	:F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:F7=\E[31~:\
+	:F8=\E[32~:F9=\E[33~:FA=\E[34~:K1=\EOw:K2=\EOu:K3=\EOy:\
+	:K4=\EOq:K5=\EOs:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kD=\E[3~:\
+	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[26~:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:l1=PF1:l2=PF2:l3=PF3:l4=PF4:\
+	:tc=wy370-nk:
+#
+#	Function key set for the PC compatible keyboard
+#
+wy370-EPC|Wyse 370 with 102 key keyboard:\
+	:@7=\E[1~:@8=\EOM:F1=\E[23~:F2=\E[24~:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\E[M:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
+	:k9=\E[20~:k;=\E[21~:kB=\E[Z:kI=\E[2~:kN=\E[U:kP=\E[V:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:tc=wy370-nk:
+#
+#	Wyse 370 with visual bell.
+wy370-vb|Wyse 370 with visible bell:\
+	:bl@:tc=wy370:
+#
+#	Wyse 370 in 132-column mode.
+wy370-w|Wyse 370 in 132-column mode:\
+	:co#132:ws#132:\
+	:r2=\E[35h\E[?3h:tc=wy370:
+#
+#	Wyse 370 in 132-column mode with visual bell.
+wy370-wvb|Wyse 370 with visible bell 132-columns:\
+	:vb=\E[30h\E\054\E[30l:tc=wy370-w:
+wy370-rv|Wyse 370 reverse video:\
+	:r3=\E[32h\E[?5h:tc=wy370:
+#
+#	Wyse 99gt Tektronix 4010/4014 emulator,
+#
+wy99gt-tek|Wyse 99gt Tektronix 4010/4014 emulator:\
+	:am:os:\
+	:co#74:li#35:\
+	:bl=^G:cl=\E^L:\
+	:..cm=\035%{3040}%{89}%p1%*%-%Py%p2%{55}%*%Px%gy%{128}%/%{31}%&%{32}%+%c%gy%{3}%&%{4}%*%gx%{3}%&%+%{96}%+%c%gy%{004}%/%{31}%&%{96}%+%c%gx%{128}%/%{31}%&%{32}%+%c%gx%{004}%/%{31}%&%{64}%+%c\037:\
+	:cr=^M:do=^J:ff=^L:\
+	:hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH\037:\
+	:ho=^]7`x @\037:\
+	:hu=\036DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\037:\
+	:is=\E8:le=^H:nd= :nw=^M^J:u0=\E~>\E8:u1=\E[42h:up=^K:
+#
+#	Wyse 160 Tektronix 4010/4014 emulator,
+#
+wy160-tek|Wyse 160 Tektronix 4010/4014 emulator:\
+	:..cm=\035%{3103}%{91}%p1%*%-%Py%p2%{55}%*%Px%gy%{128}%/%{31}%&%{32}%+%c%gy%{3}%&%{4}%*%gx%{3}%&%+%{96}%+%c%gy%{004}%/%{31}%&%{96}%+%c%gx%{128}%/%{31}%&%{32}%+%c%gx%{004}%/%{31}%&%{64}%+%c\037:\
+	:ho=^]8`g @\037:\
+	:tc=wy99gt-tek:
+#
+#	Wyse 370 Tektronix 4010/4014 emulator,
+#
+wy370-tek|Wyse 370 Tektronix 4010/4014 emulator:\
+	:am:os:\
+	:co#80:li#36:\
+	:bl=^G:cl=\E^L:\
+	:..cm=\035%{775}%{108}%p1%*%{5}%/%-%Py%p2%{64}%*%{4}%+%{5}%/%Px%gy%{32}%/%{31}%&%{32}%+%c%gy%{31}%&%{96}%+%c%gx%{32}%/%{31}%&%{32}%+%c%gx%{31}%&%{64}%+%c\037:\
+	:cr=^M:do=^J:ff=^L:\
+	:hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH\037:\
+	:ho=^]8g @\037:\
+	:hu=\036DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\037:\
+	:is=\E8:kb=^H:kd=^J:kl=^H:kr=^I:ku=^K:le=^H:nd= :nw=^M^J:\
+	:u0=\E[?38h\E8:u1=\E[?38l\E)0:up=^K:
+
+# Vendor-supplied Wyse entries end here.
+
+# Can't set tabs! Other bugs (ANSI mode only):
+# - can't redefine function keys (anyway, key redefinition in ANSI mode
+#   is too much complex to be described);
+# - meta key can't be described (the terminal forgets it when reset);
+# The xon-xoff handshaking can't be disabled while in ansi personality, so
+# emacs can't work at speed greater than 9600 baud.  No padding is needed at
+# this speed.
+#   dch1 has been commented out because it causes annoying glittering when
+# vi deletes one character at the beginning of a line with tabs in it.
+#   dch makes sysgen(1M) have a horrible behaviour when deleting
+# a screen and makes screen(1) behave badly, so it is disabled too. The nice
+# thing is that vi goes crazy if smir-rmir are present and both dch-dch1 are
+# not, so smir and rmir are commented out as well.
+# From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy99-ansi|Wyse WY-99GT in ansi mode (int'l PC keyboard):\
+	:am:km:mi:ms:xn:\
+	:co#80:it#8:li#25:vt#3:\
+	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:dl=\E[M:do=\ED:ec=\E[%dX:ei=\E[4l:ho=\E[H:\
+	:im=\E[4h:\
+	:is=\E7\E[1r\E8\E[2;3;4;13;20;34;39;36l\E[12;16;34h\E[?1;3;4;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[4i:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[M:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h:ku=\EOA:le=\010:ll=\E[24E:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\017\E["q:mh=\E[2m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:\
+	:sr=\EM:ta=^I:ue=\E[24m:up=\EM:us=\E[4m:vb=\E[?5h\E[?5l:\
+	:ve=\E[34h\E[?25h:vi=\E[?25l:vs=\E[34l\E[?25h:
+
+#   This is the american terminal. Here tabs work fine.
+# From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
+wy99a-ansi|Wyse WY-99GT in ansi mode (US PC keyboard):\
+	:ct=\E[3g:i2=\E[?5l:r3=\E[?5l:st=\EH:\
+	:tc=wy99-ansi:
+
+# This terminal (firmware version 02) has a lot of bugs:
+# - can't set tabs;
+# - other bugs in ANSI modes (see above).
+# This description disables handshaking when using cup. This is because
+# GNU emacs doesn't like Xon-Xoff handshaking. This means the terminal
+# cannot be used at speeds greater than 9600 baud, because at greater
+# speeds handshaking is needed even for character sending. If you use
+# DTR handshaking, you can use even greater speeds.
+# From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy99f|wy99fgt|wy-99fgt|Wyse WY-99GT (int'l PC keyboard):\
+	:am:bw:hs:km:mi:ms:xo:\
+	:co#80:it#8:li#25:ws#46:\
+	:K1=^^:K3=\EJ:K4=\ET:K5=\EK:ae=\EcD:al=\EE:as=\EcE:bl=^G:\
+	:bt=\EI:cd=\EY:ce=\ET:cl=\E'\E(\032:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=\Ej:ds=\EF\r:ei=\Er:fs=^M:ho=^^:im=\Eq:\
+	:is=\Eu\Ee6\EC\EDF\Ec21\Ec31\Ec62\Ec72\Ee;\016\E'\EeL\E`9\E\1360\E`1\E`4\Ee.\E`\072\Ee1\EG0\E(\Ed/\Ee4\Ed*\EO\E`I\Er\Ee"\EcD\024:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kl=^H:kr=^L:ku=^K:\
+	:le=^H:mb=\EG2:me=\E(\EG0:mh=\EGp:mr=\EG4:nd=^L:nw=^_:\
+	:se=\EG0:sf=^J:so=\EG4:sr=\Ej:ta=^I:te=\Ec21\Ec31:\
+	:ti=\Ec20\Ec30:ts=\EF:up=^K:vb=\E\1361\E\1360:\
+	:ve=\E`4\E`1:vi=\E`0:vs=\E`2\E`1:
+
+# This is the american terminal. Here tabs work.
+# From: Francesco Potorti` <F.Potorti@cnuce.cnr.it>, 24 Aug 1998
+wy99fa|wy99fgta|wy-99fgta|Wyse WY-99GT (US PC keyboard):\
+	:ct=\E0:st=\E1:\
+	:tc=wy99f:
+
+#
+#TITLE:  TERMINFO ENTRY WY520
+#DATE:   8/5/93
+# The WY520 terminfo is based on the WY285 entry published on the WYSE 
+# BBS with the addition of more function keys and special keys.
+#
+#               rs1 -> set personality
+#               rs2 -> set number of columns
+#               rs3 -> set number of lines
+#               is1 -> select the proper font
+#               is2 -> do the initialization
+#               is3 -> If this string is empty then rs3 gets sent.
+#
+#       Wyse 520 emulating a vt420 7 bit mode with default ANSI keyboard
+#       - The BS key is programmed to generate BS in smcup since
+#         is2 doesn't seem to work.
+#       - Remove and shift/Remove: delete a character
+#       - Insert : enter insert mode
+#       - Find   : delete to end of file
+#       - Select : clear a line
+#       - F11, F12, F13: send default sequences (not ESC, BS, LF)
+#       - F14 : Home key
+#       - Bottom status line (host writable line) is used.
+#       - smkx,rmkx are removed because this would put the numeric
+#         keypad in Dec application mode which doesn't seem to work
+#         with SCO applications.
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy520|wyse520|wyse 520:\
+	:am:hs:km:mi:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ds=\E[0$~:\
+	:ec=\E[%dX:ei=\E[4l:fs=\E[0$}:ho=\E[H:i1=\E[?5W:\
+	:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:ip=:\
+	:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:kh=\E[26~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:te=\E[ R:ti=\E[ Q\E[?67;8h:ts=\E[2$~\E[1$}\E[%i%p1%d`:\
+	:ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[34h\E[?25h:vi=\E[?25l:\
+	:vs=\E[?25h\E[34l:
+#
+#       Wyse 520 with 24 data lines and status (terminal status)
+wy520-24|wyse520-24|wyse 520 with 24 data lines:\
+	:hs@:\
+	:ds@:fs@:r3=\E[?5l\E[47h\E[40l\E[1;24r:ts@:tc=wy520:
+#
+#       Wyse 520 with visual bell.
+wy520-vb|wyse520-vb|wyse 520 with visible bell:\
+	:vb=\E[30h\E\054\E[30l:tc=wy520:
+#
+#       Wyse 520 in 132-column mode.
+wy520-w|wyse520-w|wyse 520 in 132-column mode:\
+	:co#132:ws#132:\
+	:DC=\E[%dP:IC=\E[%d@:dc=\E[P:ei=:im=:ip=:r2=\E[35h\E[?3h:tc=wy520:
+#
+#       Wyse 520 in 132-column mode with visual bell.
+wy520-wvb|wyse520-wvb|wyse 520 with visible bell 132-columns:\
+	:vb=\E[30h\E\054\E[30l:\
+	:tc=wy520-w:
+#
+#
+#       Wyse 520 emulating a vt420 7 bit mode.
+#       The DEL key is programmed to generate BS in is2.
+#       With EPC keyboard.
+#       - 'End' key will clear till end of line on EPC keyboard
+#       - Shift/End : ignored.
+#       - Insert : enter insert mode.
+#       - Delete : delete a character (have to change interrupt character
+#                  to CTRL-C: stty intr '^c') for it to work since the
+#                  Delete key sends 7FH.
+wy520-epc|wyse520-epc|wyse 520 with EPC keyboard:\
+	:@7=\E[4~:k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:\
+	:k4=\E[14~:k5=\E[15~:kD=\177:kE=\E[4~:kh=\E[H:\
+	:tc=wy520:
+#
+#       Wyse 520 with 24 data lines and status (terminal status)
+#       with EPC keyboard.
+wy520-epc-24|wyse520-pc-24|wyse 520 with 24 data lines and EPC keyboard:\
+	:hs@:\
+	:ds@:fs@:r3=\E[?5l\E[47h\E[40l\E[1;24r:ts@:tc=wy520-epc:
+#
+#       Wyse 520 with visual bell.
+wy520-epc-vb|wyse520-pc-vb|wyse 520 with visible bell and EPC keyboard:\
+	:vb=\E[30h\E\054\E[30l:\
+	:tc=wy520-epc:
+#
+#       Wyse 520 in 132-column mode.
+wy520-epc-w|wyse520-epc-w|wyse 520 in 132-column mode with EPC keyboard:\
+	:co#132:ws#132:\
+	:DC=\E[%dP:IC=\E[%d@:dc=\E[P:ei=:im=:ip=:r2=\E[35h\E[?3h:tc=wy520-epc:
+#
+#       Wyse 520 in 132-column mode with visual bell.
+wy520-epc-wvb|wyse520-p-wvb|wyse 520 with visible bell 132-columns and EPC keyboard:\
+	:vb=\E[30h\E\054\E[30l:\
+	:tc=wy520-epc-w:
+#
+#       Wyse 520 in 80-column, 36 lines
+wy520-36|wyse520-36|wyse 520 with 36 data lines:\
+	:hs@:\
+	:li#36:\
+	:ds@:fs@:r3=\E[?5l\E[36*|\E[36t\E[40l\E[1;36r:ts@:tc=wy520:
+#
+#       Wyse 520 in 80-column, 48 lines
+wy520-48|wyse520-48|wyse 520 with 48 data lines:\
+	:hs@:\
+	:li#48:\
+	:ds@:fs@:r3=\E[?5l\E[48*|\E[48t\E[40l\E[1;48r:ts@:tc=wy520:
+#
+#       Wyse 520 in 132-column, 36 lines
+wy520-36w|wyse520-36w|wyse 520 with 132 columns and 36 data lines:\
+	:co#132:ws#132:\
+	:r2=\E[?3h:\
+	:r3=\E[?5l\E[36*|\E[36t\E[40l\E[1;36r\E[132$|:tc=wy520-36:
+#
+#       Wyse 520 in 132-column, 48 lines
+wy520-48w|wyse520-48w|wyse 520 with 48 data lines:\
+	:co#132:ws#132:\
+	:r2=\E[?3h:\
+	:r3=\E[?5l\E[48*|\E[48t\E[40l\E[1;48r\E[132$|:tc=wy520-48:
+#
+#
+#       Wyse 520 in 80-column, 36 lines with EPC keyboard
+wy520-36pc|wyse520-36pc|wyse 520 with 36 data lines and EPC keyboard:\
+	:hs@:\
+	:li#36:\
+	:ds@:fs@:r3=\E[?5l\E[36*|\E[36t\E[40l\E[1;36r:ts@:tc=wy520-epc:
+#
+#       Wyse 520 in 80-column, 48 lines with EPC keyboard
+wy520-48pc|wyse520-48pc|wyse 520 with 48 data lines and EPC keyboard:\
+	:hs@:\
+	:li#48:\
+	:ds@:fs@:r3=\E[?5l\E[48*|\E[48t\E[40l\E[1;48r:ts@:tc=wy520-epc:
+#
+#       Wyse 520 in 132-column, 36 lines with EPC keyboard
+wy520-36wpc|wyse520-36wpc|wyse 520 with 36 data lines and EPC keyboard:\
+	:co#132:ws#132:\
+	:r2=\E[?3h:\
+	:r3=\E[?5l\E[36*|\E[36t\E[40l\E[1;36r\E[132$|:tc=wy520-36pc:
+#
+#       Wyse 520 in 132-column, 48 lines with EPC keyboard
+wy520-48wpc|wyse520-48wpc|wyse 520 with 48 data lines and EPC keyboard:\
+	:co#132:ws#132:\
+	:r2=\E[?3h:\
+	:r3=\E[?5l\E[48*|\E[48t\E[40l\E[1;48r\E[132$|:tc=wy520-48pc:
+
+# From: John Gilmore <hoptoad!gnu@lll-crg.arpa>
+# (wyse-vp: removed :if=/usr/share/tabset/wyse-adds:, there's no such
+# file and we don't know what :st: is -- esr)
+wyse-vp|Wyse 50 in ADDS Viewpoint emulation mode with "enhance" on:\
+	:am:bs:\
+	:co#80:it#8:li#24:\
+	:al=\EM:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:dc=\EW:\
+	:dl=\El:do=^J:ei=\Er:ho=^A:im=\Eq:is=\E`\072\E`9\017\Er:\
+	:kb=^H:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:le=^H:ll=^A^Z:me=^O:\
+	:nd=^F:nw=^M^J:r1=\E`\072\E`9\017\Er:se=^O:sf=^J:so=^N:\
+	:ta=^I:ue=^O:up=^Z:us=^N:
+
+wy75ap|wyse75ap|wy-75ap|wyse-75ap|Wyse WY-75 Applications and Cursor keypad:\
+	:is=\E[1;24r\E[?10;3l\E[?1;25h\E[4l\E[m\E(B\E=:kb=^H:\
+	:kd=\EOB:ke=10\E[?1l\E>:kh=\EOH:kl=\EOD:kr=\EOC:\
+	:ks=10\E[?1h\E=:ku=\EOA:tc=wy75:
+
+# From: Kevin Turner <kevint@aracnet.com>, 12 Jul 1998
+# This copes with an apparent firmware bug in the wy85.  He writes:
+# "What I did was change leave the terminal cursor keys set to Normal
+# (instead of application), and change \E[ to \233 for all the keys in
+# terminfo. At one point, I found some reference indicating that this
+# terminal bug (not sending \E[) was acknowledged by Wyse (so it's not just
+# me), but I can't find that and the server under my bookmark to "Wyse 
+# Technical" isn't responding.  So there's the question of wether the wy85
+# terminfo should reflect the manufactuer's intended behaviour of the terminal
+# or the actual."
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+wy85-8bit|wyse85-8bit|wyse 85 in 8-bit mode:\
+	:am:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ds=\E[40l:\
+	:ec=\E[%dX:ei=\E[4l:fs=\E[1;24r\E8:ho=\E[H:\
+	:i1=\E[62;1"p\E[?5W:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:ip=:\
+	:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\23317~:k7=\23318~:\
+	:k8=\23319~:k9=\23320~:kD=\2333~:kI=\2332~:kN=\2336~:\
+	:kP=\2335~:kb=^H:kd=\233B:ke=\E>:kh=\23326~:kl=\233D:\
+	:kr=\233C:ks=\E[?1l\E=:ku=\233A:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=\011:\
+	:ts=\E[40h\E7\E[25;%i%p1%dH:ue=\E[m:up=\E[A:us=\E[4m:\
+	:vb=\E[30h\E\054\E[30l:ve=\E[?25h:vi=\E[?25l:
+
+# From: Eric Freudenthal <freudent@eric.ultra.nyu.edu>
+wy100q|Wyse 100 for Quotron:\
+	:bs:\
+	:co#80:li#24:sg#1:\
+	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :dc=\EW:\
+	:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:\
+	:is=\E`\072\0\EC\EDF\E0\E'\E(\EA21:kd=^J:kl=^H:kr=^L:\
+	:ku=^K:le=^H:mk@:nd=^L:sr=\Ej:up=^K:\
+	:tc=adm+sgr:
+
+#### Kermit terminal emulations
+#
+# Obsolete Kermit versions may be listed in the section describing obsolete
+# non-ANSI terminal emulators later in the file.
+#
+
+# KERMIT standard all versions.
+# Straight ascii keyboard. :sr=\EI: not avail. many versions + bug prone in vi.
+# (kermit: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" -- esr)
+# From: greg small <gts@populi.berkeley.edu> 9-25-84
+kermit|standard kermit:\
+	:bs:\
+	:co#80:li#24:\
+	:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :ho=\EH:\
+	:is=K0 Standard Kermit  9-25-84\n:kd=^J:kh=^^:kl=^H:\
+	:kr=^L:ku=^K:le=^H:nd=\EC:up=\EA:
+kermit-am|standard kermit plus auto-margin:\
+	:am:\
+	:is=K1 Standard Kermit plus Automatic Margins\n:tc=kermit:
+# IBMPC Kermit 1.2.
+# Bugs: :cd:, :ce:: do not work except at beginning of line!  :cl: does
+# not work, but fake with :cl=\EH\EJ (since :cd=\EJ: works at beginning of
+# line).
+# From: greg small <gts@populi.berkeley.edu> 8-30-84
+pckermit|pckermit12|UCB IBMPC Kermit 1.2:\
+	:am:\
+	:li#25:\
+	:cd@:ce@:cl=\EH\EJ:\
+	:is=K2 UCB IBMPC Kermit 1.2  8-30-84\n:tc=kermit:
+# IBMPC Kermit 1.20
+# Cannot use line 25, now acts funny like ansi special scrolling region.
+# Initialization must escape from that region by cursor position to line 24.
+# Cannot use character insert because 1.20 goes crazy if insert at col 80.
+# Does not use :am: because autowrap is lost when kermit dropped and restarted.
+# From: greg small <gts@populi.berkeley.edu> 12-19-84
+pckermit120|UCB IBMPC Kermit 1.20:\
+	:it#8:li#24:\
+	:al=\EL:dc=\EN:dl=\EM:do=\EB:ei@:im@:\
+	:is=\EO\Eq\EJ\EY7 K3 UCB IBMPC Kermit 1.20  12-19-84\n:\
+	:se=\Eq:so=\Ep:ta=^I:vs=\EO\Eq\EEK3:\
+	:tc=kermit:
+# MS-DOS Kermit 2.27 for the IBMPC
+# Straight ascii keyboard. :sr=\EI: not avail. many versions + bug prone in vi.
+# Cannot use line 25, now acts funny like ansi special scrolling region.
+# Initialization must escape from that region by cursor position to line 24.
+# Does not use am: because autowrap is lost when kermit dropped and restarted.
+# Reverse video for standout like H19.
+# (msk227: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" -- esr)
+# From: greg small <gts@populi.berkeley.edu> 3-17-85
+msk227|mskermit227|MS-DOS Kermit 2.27 for the IBMPC:\
+	:am@:bs:\
+	:co#80:it#8:li#24:\
+	:al=\EL:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :dc=\EN:dl=\EM:\
+	:do=\EB:ei=\EO:ho=\EH:im=\E@:\
+	:is=\EO\Eq\EG\Ew\EJ\EY7 K4 MS Kermit 2.27 for the IBMPC 3-17-85\n:\
+	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=\EC:rc=\Ek:sc=\Ej:\
+	:se=\Eq:so=\Ep:ta=^I:up=\EA:vs=\EO\Eq\EG\EwK4:
+# MS-DOS Kermit 2.27 with automatic margins
+# From:	greg small <gts@populi.berkeley.edu> 3-17-85
+msk227am|mskermit227am|UCB MS-DOS Kermit 2.27 with automatic margins:\
+	:am:\
+	:is=\EO\Eq\EG\Ev\EJ\EY7 K5 MS Kermit 2.27 +automatic margins 3-17-85\n:\
+	:vs=\EO\Eq\EG\EvK5:\
+	:tc=msk227:
+# MS-DOS Kermit 2.27 UCB 227.14 for the IBM PC
+# Automatic margins now default.  Use ansi :sa: for highlights.
+# Define function keys.
+# (msk22714: removed obsolete ":kn#10:" -- esr)
+# From: greg small <gts@populi.berkeley.edu> 3-17-85
+msk22714|mskermit22714|UCB MS-DOS Kermit 2.27 UCB 227.14 IBM PC:\
+	:am:\
+	:is=\EO\Eq\EG\Ev\EJ\EY7 K6 MS Kermit 2.27 UCB 227.14 IBM PC 3-17-85\n:\
+	:k0=\E0:k1=\E1:k2=\E2:k3=\E3:k4=\E4:k5=\E5:k6=\E6:k7=\E7:\
+	:k8=\E8:k9=\E9:md=\E[1m:me=\E[m:mr=\E[7m:se=\E[m:so=\E[1m:\
+	:ue=\E[m:us=\E[4m:vs=\EO\Eq\EG\EvK6:\
+	:tc=mskermit227:
+# This was designed for a VT320 emulator, but it is probably a good start
+# at support for the VT320 itself.
+# Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
+# (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+vt320-k3|MS-Kermit 3.00's vt320 emulation:\
+	:am:es:hs:km:mi:ms:xn:\
+	:co#80:it#8:li#49:pb#9600:vt#3:\
+	:AL=\E[%dL:CC=\E:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SR=\E[%dL:UP=\E[%dA:ae=\E(B:al=\E[L:\
+	:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E[0$~:ec=\E[%dX:ei=\E[4l:fs=\E[0$}:ho=\E[H:im=\E[4h:\
+	:is=\E>\E F\E[?1l\E[?7h\E[r\E[2$~:k0=\E[21~:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
+	:k9=\E[20~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:\
+	:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:\
+	:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[1$}\r\E[K:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l:ve=\E[?25h:\
+	:vi=\E[?25l:
+# From: Joseph Gil <yogi@cs.ubc.ca> 13 Dec 1991
+# ACS capabilities from Philippe De Muyter  <phdm@info.ucl.ac.be> 30 May 1996
+# (I removed a bogus boolean :mo: and added :ms:, <smam>, <rmam> -- esr)
+vt320-k311|dec vt320 series as defined by kermit 3.11:\
+	:am:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=3\E[L:as=^N:bl=^G:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:\
+	:fs=\E[$}:ho=\E[H:im=\E[4h:\
+	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l1=pf1:l2=pf2:l3=pf3:l4=pf4:\
+	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M\ED:\
+	:r1=\E[?3l:rc=\E8:rf=/usr/share/tabset/vt100:sc=\E7:\
+	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
+
+#
+######## ---------------- TERMINFO FILE CAN BE SPLIT HERE -------------------
+# This cut mark helps make life less painful for people running ncurses tic
+# on machines with relatively little RAM.  The file can be broken in half here
+# cleanly and compiled in sections -- no `use' references cross this cut
+# going forward.
+#
+
+######## OLDER TERMINAL TYPES
+#
+# This section is devoted to older commercial terminal brands that are now
+# discontinued, but known to be still in use or represented by emulations.
+#
+
+#### AT&T (att, tty)
+#
+# This section also includes Teletype-branded VDTs.
+#
+# The AT&T/Teletype terminals group was sold to SunRiver Data Systems (now
+# Boundless Technologies); for details, see the header comment on the ADDS
+# section.
+#
+# These are AT&T's official terminfo entries.  All-caps aliases have been
+# removed.
+#
+att2300|sv80|AT&T 2300 Video Information Terminal 80 column mode:\
+	:am:eo:mi:ms:xo:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[11r:\
+	:F2=\E[12r:F3=\E[13r:F4=\E[14r:F5=\E[15r:F6=\E[16r:\
+	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:\
+	:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:k1=\E[1r:k2=\E[2r:k3=\E[3r:k4=\E[4r:k5=\E[5r:k6=\E[6r:\
+	:k7=\E[7r:k8=\E[8r:k9=\E[9r:k;=\E[10r:kA=\E[L:kB=\E[Z:\
+	:kC=\E[J:kD=\E[P:kI=\E[@:kL=\E[M:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:pf=\E[4i:po=\E[5i:ps=\E[0i:se=\E[m:sf=^J:so=\E[7m:ta=^I:\
+	:up=\E[A:
+att2350|AT&T 2350 Video Information Terminal 80 column mode:\
+	:pf@:po@:ps@:\
+	:tc=att2300:
+
+# Must setup RETURN KEY - CR, REC'VD LF - INDEX.
+# Seems upward compatible with vt100, plus ins/del line/char.
+# On sgr, the protection parameter is ignored.
+# No check is made to make sure that only 3 parameters are output.
+# 	standout= reverse + half-intensity = 3 | 5.
+# 	bold= reverse + underline = 2 | 3.
+# note that half-bright blinking doesn't look different from normal blinking.
+# NOTE:you must program the function keys first, label second!
+# (att4410: a BSD entry has been seen with the following capabilities: 
+# :is=\E[?6l:, :k1=\EOc:, :k2=\EOd:, :k3=\EOe:, :k4=\EOg:,
+# :k6=\EOh:, :k7=\EOi:, :k8=\EOj:, -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1:\
+	:am:hs:mi:ms:xo:\
+	:Nl#8:co#80:it#8:lh#2:li#24:lw#8:ws#80:\
+	:ac=++\054\054--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=:fs=\E8:ho=\E[H:i1=\E[?3l\E)0:\
+	:i2=\E[1;03q   f1           \EOP\E[2;03q   f2           \EOQ\E[3;03q   f3           \EOR\E[4;03q   f4           \EOS\E[5;03q   f5           \EOT\E[6;03q   f6           \EOU\E[7;03q   f7           \EOV\E[8;03q   f8           \EOW:\
+	:ic=\E[@:im=:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:\
+	:k6=\EOU:k7=\EOV:k8=\EOW:kC=\E[2J:kH=\E[24;1H:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mk=\E[8m:\
+	:mr=\E[7m:nd=\E[C:nw=^M^J:r2=\Ec\E[?3l\E[2;0y:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
+	:ts=\E7\E[25;%p1%{1}%+%dH:ue=\E[m:up=\E[A:us=\E[4m:
+
+att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1:\
+	:co#132:ws#132:\
+	:i1=\E[?3h\E)0:r2=\Ec\E[?3h\E[2;0y:tc=att5410v1:
+
+att4410|att5410|tty5410|AT&T 4410/5410 80 columns - version 2:\
+	:bs:\
+	:..px=\E[%p1%d;%p2%l%02dq   f%p1%d           %p2%s:tc=att5410v1:
+
+att5410-w|att4410-w|4410-w|tty5410-w|5410-w|AT&T 4410/5410 in 132 column mode:\
+	:co#132:ws#132:\
+	:i1=\E[?3h\E)0:r2=\Ec\E[?3h\E[2;0y:tc=att4410:
+
+# 5410 in terms of a vt100
+# (v5410: added <rmam>/<smam> based on init string -- esr)
+v5410|att5410 in terms of a vt100:\
+	:am:mi:ms:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:@8=\EOM:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:RA=\E[?7l:\
+	:SA=\E[?7h:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[L:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:eA=\E(B\E)0:ei=:ho=\E[H:\
+	:ic=\E[@:im=:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:kb=^H:\
+	:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\
+	:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
+
+# 
+# Teletype Model 5420 -- A souped up 5410, with multiple windows,
+# even! the 5420 has three modes: scroll, window or page mode
+# this terminfo should work in scroll or window mode, but doesn't
+# take advantage of any of the differences between them.
+#
+# Has memory below (2 lines!)
+# 3 pages of memory (plus some spare)
+# The 5410 sequences for :cm:, :vs:, :DC:, :DL:, :ec:, :vb:, :ho:,
+# <hpa>, :st: would work for these, but these work in both scroll and window
+# mode... Unset insert character so insert mode works
+# :i1: sets 80 column mode,
+# :is: escape sequence:
+# 1) turn off all fonts
+# 2) function keys off, keyboard lock off, control display off,
+#    insert mode off, erasure mode off,
+# 3) full duplex, monitor mode off, send graphics off, nl on lf off
+# 4) reset origin mode
+# 5) set line wraparound
+# 6) exit erasure mode, positional attribute mode, and erasure extent mode
+# 7) clear margins
+# 8) program ENTER to transmit ^J,
+# We use \212 to program the ^J because a bare ^J will get translated by
+# UNIX into a CR/LF. The enter key is needed for AT&T uOMS.
+#     1      2            3              4     5     6    7  8
+# :i3: set screen color to black,
+# No representation in terminfo for the delete word key: kdw1=\Ed
+# Key capabilities assume the power-up send sequence...
+# This :te: is not strictly necessary, but it helps maximize 
+# memory usefulness: :te=\Ez:,
+# Alternate sgr0:	:me=\E[m\EW^O:,
+# Alternate sgr:	:sa=\E[%?%p1%t2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t^N%e^O%;:,
+# smkx programs the SYS PF keys to send a set sequence.
+# It also sets up labels f1, f2, ..., f8, and sends edit keys.
+# This string causes them to send the strings :k1:-:k8:
+# when pressed in SYS PF mode.
+# (att4415: I added <rmam>/<smam> based on the init string -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+att4415|tty5420|att5420|AT&T 4415/5420 80 cols:\
+	:bs:db:mi:xo:\
+	:Nl#8:lh#2:lm#78:lw#8:ws#55:\
+	:@1=\Et:@7=\Ez:@8=\Eent:AL=\E[%dL:CM=\E[%i%p1%d;%p2%dt:\
+	:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:LF=\E|:\
+	:LO=\E~:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:SF=\E[%dE:SR=\E[%dF:\
+	:UP=\E[%dA:bt=\E[Z:ch=\E[%+^AG:cl=\E[x\E[J:\
+	:cm=\E[%i%d;%dx:ct=\E[3g:cv=\E[%+^Ad:ec=\E[%ds\E[%dD:\
+	:ei=\E[4l:ho=\E[x:i1=\E[?3l:i2=\E[?5l:ic@:im=\E[4h:\
+	:is=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[21;1j\212:\
+	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:\
+	:k8=\EOj:kA=\E[L:kB=\E[Z:kD=\E[P:kE=\E[2K:kF=\E[T:kH=\Eu:\
+	:kI=\E[4h:kL=\E[M:kN=\E[U:kP=\E[V:kR=\E[S:\
+	:ke=\E[19;0j\E[21;1j\212:ks=\E[19;1j\E[21;4j\Eent:\
+	:l1=F1:l2=F2:l3=F3:l4=F4:l5=F5:l6=F6:l7=F7:l8=F8:ll=\Ew:\
+	:me=\E[m\017:mp=\EV:pf=\E[?9i:po=\E[?4i:ps=\E[?2i:st=\EH:\
+	:ts=\E7\E[25;%p1%{8}%+%dH:vb=\E[?5h\E[?5l:ve=\E[11;0j:\
+	:vs=\E[11;1j:\
+	:tc=att4410:
+
+att4415-w|tty5420-w|att5420-w|AT&T 4415/5420 132 cols:\
+	:co#132:lm#54:ws#97:\
+	:i1=\E[?3h:tc=att4415:
+
+att4415-rv|tty5420-rv|att5420-rv|AT&T 4415/5420 80 cols/rv:\
+	:i2=\E[?5h:vb=\E[?5l\E[?5h:\
+	:tc=att4415:
+
+att4415-w-rv|tty5420-w-rv|att5420-w-rv|AT&T 4415/5420 132 cols/rv:\
+	:co#132:lm#54:ws#97:\
+	:i1=\E[?3h:i2=\E[?5h:vb=\E[?5l\E[?5h:tc=att4415:
+
+# Note that this mode permits programming USER PF KEYS and labels
+# However, when you program user pf labels you have to reselect
+# user pf keys to make them appear! 
+att4415+nl|tty5420+nl|att5420+nl|generic AT&T 4415/5420 changes for not changing labels:\
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:\
+	:..pn=\E[%p1%d;0;0;1q%p2%:-16.16s:\
+	:..px=\E[%p1%d;%p2%l%02d;0;1q   F%p1%d           %p2%s:
+
+att4415-nl|tty5420-nl|att5420-nl|AT&T 4415/5420 without changing labels:\
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:\
+	:tc=att4415+nl:tc=att4415:
+
+att4415-rv-nl|tty5420-rv-nl|att5420-rv-nl|AT&T 4415/5420 reverse video without changing labels:\
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:\
+	:tc=att4415+nl:tc=att4415-rv:
+
+att4415-w-nl|tty5420-w-nl|att5420-w-nl|AT&T 4415/5420 132 cols without changing labels:\
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:\
+	:tc=att4415+nl:tc=att4415-w:
+
+att4415-w-rv-n|tty5420-w-rv-n|att5420-w-rv-n|AT&T 4415/5420 132 cols reverse without changing labels:\
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:\
+	:tc=att4415+nl:tc=att4415-w-rv:
+
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att5420_2|AT&T 5420 model 2 80 cols:\
+	:am:db:hs:mi:ms:xo:\
+	:co#80:it#8:li#24:lm#78:ws#55:\
+	:AL=\E[%dL:CM=\E[%i%p1%d;%p2%dt:DC=\E[%dP:DL=\E[%dM:\
+	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:\
+	:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bt=\E[1Z:cd=\E[0J:ce=\E[0K:\
+	:cl=\EH\EJ:cm=\E[%i%d;%dH:cr=\EG:cs=\E[%i%d;%dr:ct=\E[3g:\
+	:dc=\E[P:dl=\E[M:do=\E[1B:ec=\E[%ds\E[%dD:ei=:fs=\E8:\
+	:ho=\E[H:\
+	:i1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;0j\E[6;0j\E[7;0j\E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j\E[29;0j\E[1;24r:\
+	:ic=\E[@:im=:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:\
+	:k6=\EOh:k7=\EOi:k8=\EOj:kD=\E[P:kH=\Eu:kI=\E[4h:kN=\E[U:\
+	:kP=\E[V:kb=^H:kd=\E[B:ke=\E[19;0j:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\E[19;1j:ku=\E[A:le=^H:ll=\Ew:mb=\E[5m:me=\E[m\017:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[1C:nw=^M^J:rc=\E8:sc=\E7:se=\E[m:\
+	:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E7\E[25;%p1%{8}%+%dH:ue=\E[m:us=\E[4m:\
+	:vb=\E[?5h\E[?5l:ve=\E[11;0j:vs=\E[11;1j:
+att5420_2-w|AT&T 5420 model 2 in 132 column mode:\
+	:co#132:\
+	:i1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;1j\E[6;0j\E[7;0j\E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j\E[29;0j\E[1;24r:tc=att5420_2:
+
+att4418|att5418|AT&T 5418 80 cols:\
+	:am:xo:\
+	:co#80:li#24:\
+	:@8=\E[:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[n:\
+	:F2=\E[o:F3=\E[H:F4=\E[I:F5=\E[J:F8=\E[K:F9=\E[L:FA=\E[E:\
+	:FB=\E[_:FC=\E[M:FD=\E[N:FE=\E[O:IC=\E[%d@:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[1L:as=^N:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[1P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:i1=\E[?3l:ic=\E[1@:im=:is=\E)0\E?6l\E?5l:k1=\E[h:k2=\E[i:\
+	:k3=\E[j:k6=\E[k:k7=\E[l:k8=\E[f:k9=\E[w:k;=\E[m:kC=\E[%:\
+	:kd=\EU:kh=\Ec:kl=\E@:kr=\EA:ku=\ES:le=\E[D:mb=\E[5m:\
+	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=^J:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:
+att4418-w|att5418-w|AT&T 5418 132 cols:\
+	:co#132:\
+	:i1=\E[?3h:tc=att5418:
+
+att4420|tty4420|teletype 4420:\
+	:bs:da:db:eo:ms:ul:xo:\
+	:co#80:li#24:lm#72:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\Ez:cl=\EH\EJ:cm=\EY%+ %+ :cr=\EG:\
+	:dc=\EP:dl=\EM:dm@:do=\EB:ed@:ho=\EH:k0=\EU:k3=\E@:kA=\EL:\
+	:kB=\EO:kC=\EJ:kD=\EP:kF=\ES:kI=\E\136:kL=\EM:kR=\ET:kd=\EB:\
+	:kh=\EH:kl=^H:kr=\EC:ku=\EA:l0=segment advance:\
+	:l3=cursor tab:le=\ED:nd=\EC:se=\E~:sf=\EH\EM\EY7 :so=\E}:\
+	:ue=\EZ:up=\EA:us=\E\:
+
+#  The following is a terminfo entry for the Teletype 4424
+#  asynchronous keyboard-display terminal.  It supports
+#  the vi editor.  The terminal must be set up as follows,
+# 	
+# 	HIGHLIGHT DEFINITION	3-TONE
+# 	DISPLAY FUNCTION	GROUP III
+# 	
+#  The second entry below provides limited (a la adm3a)
+#  operation under GROUP II.
+# 	
+#  This must be used with DISPLAY FUNCTION GROUP I or III
+# 	and HIGHLIGHT DEFINITION 3-TONE
+# The terminal has either bold or blink, depending on options
+#
+# (att4424: commented out :ti:=\E[1m, we don't need bright locked on -- esr)
+att4424|tty4424|teletype 4424:\
+	:am:bs:xo:\
+	:co#80:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E(B:al=\EL:as=\E(0:bl=^G:bt=\EO:cd=\EJ:ce=\Ez:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\EF:\
+	:dc=\EP:dl=\EM:do=\EB:ei=:ho=\E[H:ic=\E\136:im=:\
+	:is=\E[20l\E[?7h:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kC=\EJ:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E3:\
+	:md=\E3:me=\EX\E~\EZ\E4\E(B:mh=\EW:mr=\E}:nd=\EC:nw=\EE:\
+	:..sa=\E[%?%p1%t7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p6%p4%|%t;5%;%?%p5%t;0%;m:\
+	:se=\E~:sf=^J:so=\E}:sr=\ET:st=\EH:ta=^I:ue=\EZ:up=\EA:\
+	:us=\E\:
+
+att4424-1|tty4424-1|teletype 4424 in display function group I:\
+	:kC@:kd=\EB:kh@:kl=\ED:kr=\EC:ku=\EA:\
+	:tc=att4424:
+
+# This entry is not one of AT&T's official ones, it was translated from the
+# 4.4BSD termcap file.  The highlight strings are different from att4424.
+# I have no idea why this is -- older firmware version, maybe?
+# The following two lines are the comment originally attached to the entry:
+# This entry appears to avoid the top line - I have no idea why.
+# From: jwb Wed Mar 31 13:25:09 1982 remote from ihuxp
+att4424m|tty4424m|teletype 4424M:\
+	:am:da:db:mi:\
+	:co#80:it#8:li#23:\
+	:al=\EL:bl=^G:ce=\E[K:cl=\E[2;H\E[J:cm=\E[%i%2;%2H\E[B:\
+	:cr=^M:dc=\EP:dl=\EM:do=^J:ei=:ic=\E\136:im=:ip=2:\
+	:is=\E[m\E[2;24r:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:\
+	:nd=\E[C:nw=^M^J:se=\E[m:sf=^J:so=\E[7m:sr=\ET:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
+
+# The Teletype 5425 is really version 2 of the Teletype 5420. It 
+# is quite similar, except for some minor differences. No page 
+# mode, for example, so all of the :cm: sequences used above have 
+# to change back to what's being used for the 5410. Many of the 
+# option settings have changed their numbering as well.
+# 
+# This has been tested on a preliminary model.
+#
+# (att5425: added <rmam>/<smam> based on the init string -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att5425|tty5425|att4425|AT&T 4425/5425:\
+	:am:da:db:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:lm#78:ws#55:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:UP=\E[%dA:ae=^O:\
+	:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ec=\E[%ds\E[%dD:ei=\E[4l:fs=\E8:ho=\E[H:\
+	:i1=\E<\E[?3l:i2=\E[?5l:im=\E[4h:\
+	:is=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[25;1j\212:\
+	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:\
+	:k8=\EOj:kD=\E[P:kI=\E[4h:kb=^H:kd=\E[B:\
+	:ke=\E[21;0j\E[25;1j\212:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\E[21;1j\E[25;4j\Eent\E~:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:\
+	:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:\
+	:sr=\EM:st=\EH:ta=^I:ts=\E7\E[25;%p1%{8}%+%dH:ue=\E[m:\
+	:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[12;0j:\
+	:vs=\E[12;1j:
+
+att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels:\
+	:ks=\E[21;1j\E[25;4j\Eent:\
+	:tc=att4425:
+
+att5425-w|att4425-w|tty5425-w|teletype 4425/5425 in 132 column mode:\
+	:co#132:lm#54:ws#97:\
+	:i1=\E[?3h:tc=tty5425:
+
+# (att4426: his had bogus capabilities: :ri=\EM:, :ri=\E[1U:. 
+# I also added <rmam>/<smam> -- esr)
+att4426|tty4426|teletype 4426S:\
+	:am:da:db:xo:\
+	:co#80:li#24:lm#48:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:SF=\E[%dS:\
+	:SR=\E[%dT:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E(B:al=\EL:as=\E(0:bl=^G:cd=\E[J:ce=\E[0K:ch=\E[%dG:\
+	:cl=\E[H\E[2J\E[1U\E[H\E[2J\E[1V:cm=\E[%i%d;%dH:cr=^M:\
+	:ct=\E[3g:cv=\E[%dd:dc=\EP:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:i1=\Ec\E[?7h:ic=\E\136:im=:is=\E[m\E[1;24r:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:\
+	:kB=\EO:kC=\E[2J:kH=\E[24;1H:kb=^H:kd=\EB:kh=\E[H:kl=\ED:\
+	:kr=\EC:ku=\EA:le=\E[D:ll=\E[24H:md=\E[5m:me=\E[m\E(B:\
+	:mr=\E[7m:nd=\E[C:nw=^M^J:r2=\Ec\E[?3l\E[2;0y:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[5m:sr=\ET:st=\E1:ta=^I:ue=\E[m:\
+	:up=\EA:us=\E[4m:
+
+# Terminfo entry for the AT&T 510 A Personal Terminal
+# Function keys 9 - 16 are available only after the 
+# screen labeled (soft keys/action blocks) are labeled.  Function key
+# 9 corresponds to the leftmost touch target on the screen,
+# function key 16 corresponds to the rightmost.
+#
+# This entry is based on one done by Ernie Rice at Summit, NJ and
+# changed by Anne Gallup, Skokie, IL, ttrdc!anne
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+att510a|bct510a|AT&T 510A Personal Terminal:\
+	:am:mi:ms:xn:xo:\
+	:Nl#8:co#80:lh#2:li#24:lw#7:\
+	:#4=\E[u:%i=\E[v:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
+	:F1=\EOe:F2=\EOf:F3=\EOg:F4=\EOh:F5=\EOi:F6=\EOj:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:\
+	:ac=+g\054h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~:\
+	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[0J:\
+	:ce=\E[0K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
+	:dc=\E[P:dl=\E[M:do=\E[1B:eA=\E(B\E)1:ff=^L:ho=\E[H:\
+	:i1=\E(B\E)1\E[2l:i2=\E[21;1|\212:k1=\EOm:k2=\EOV:\
+	:k3=\EOu:k4=\ENj:k5=\ENe:k6=\ENf:k7=\ENh:k8=\E[H:k9=\EOc:\
+	:k;=\EOd:kB=\E[Z:kF=\E[S:kR=\E[T:kb=^H:kd=\E[B:ke=\E[19;0|:\
+	:kl=\E[D:kr=\E[C:ks=\E[19;1|:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:pf=\E[?8i:po=\E[?4i:ps=\E[0i:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[11;3|:vi=\E[11;0|:vs=\E[11;2|:
+
+# Terminfo entry for the AT&T 510 D Personal Terminal
+# Function keys 9 through 16 are accessed by bringing up the
+# system blocks.
+# Function key 9 corresponds to the leftmost touch target on the screen,
+# function key 16 corresponds to the rightmost.
+#
+# There are problems with soft key labeling.  These are due to 
+# strangenesses in the native terminal that are impossible to
+# describe in a terminfo.  
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att510d|bct510d|AT&T 510D Personal Terminal:\
+	:am:da:db:mi:ms:xn:xo:\
+	:co#80:li#24:lm#48:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ae=^O:\
+	:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[0J:ce=\E[0K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[1B:\
+	:ei=\E[4l:ff=^L:ho=\E[H:i1=\E(B\E)1\E[5;0|:\
+	:i2=\E[21;1|\212:im=\E[4h:k1=\EOm:k2=\EOV:k3=\EOu:k4=\ENj:\
+	:k5=\ENe:k6=\ENf:k7=\ENh:k8=\E[H:k9=\EOc:kb=^H:kd=\E[B:\
+	:ke=\E[19;0|:kl=\E[D:kr=\E[C:ks=\E[19;1|:ku=\E[A:le=^H:\
+	:ll=\E#2:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[11;3|:vs=\E[11;2|:
+
+# (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att500|att513|AT&T 513 using page mode:\
+	:am:mi:ms:xn:xo:\
+	:co#80:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:UP=\E[%dA:ae=^O:\
+	:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
+	:i1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l:\
+	:im=\E[4h:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:\
+	:k7=\EOi:k8=\EOj:kD=\ENf:kI=\ENj:kN=\E[U:kP=\E[V:kb=^H:\
+	:kd=\E[B:ke=\E[19;0|\E[21;1|\212:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\E[19;1|\E[21;4|\Eent:ku=\E[A:le=^H:ll=\E#2:mb=\E[5m:\
+	:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[11;0|:vs=\E[11;1|:
+
+# 01-07-88
+# printer must be set to EMUL ANSI to accept ESC codes
+# :up: stops at top margin
+# :i1: sets cpi 10,lpi 6,form 66,left 1,right 132,top 1,bottom 66,font
+#	and alt font ascii,wrap on,tabs cleared
+# :is: disables newline on LF,Emphasized off
+# The <u0> capability sets form length
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att5310|att5320|AT&T Model 53210 or 5320 matrix printer:\
+	:co#132:it#8:li#66:\
+	:DO=\E[%de:RI=\E[%da:cr=^M:do=^J:ff=^L:i1=\Ec:is=\E[20l\r:\
+	:nd= :ta=^I:up=\EM:
+
+# Teletype 5620, firmware version 1.1 (8;7;3) or earlier from BRL
+# The following SET-UP modes are assumed for normal operation:
+#	CR_DEF=CR	NL_DEF=INDEX	DUPLEX=FULL
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements.  This termcap description is for the Resident Terminal Mode.
+# No delays specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+# The BRL entry also said: UNSAFE :ll=\E[70H:
+att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs:\
+	:am:xo:\
+	:co#88:it#8:li#70:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:SF=\E[%dS:\
+	:SR=\E[%dT:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=:ho=\E[H:\
+	:ic=\E[@:im=:kC=\E[2J:kH=\E[70;1H:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:nw=^M^J:r1=\Ec:\
+	:rc=\E8:sc=\E7:sf=^J:sr=\E[T:ta=^I:up=\E[A:
+
+# 5620 terminfo  (2.0 or later ROMS with char attributes)
+# The following SET-UP modes are assumed for normal operation:
+#	DUPLEX=FULL	GEN_FLOW=ON	NEWLINE=INDEX	RETURN=CR
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements.  This termcap description is for Resident Terminal Mode.  No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+# assumptions: :sf: (scroll forward one line) is only done at screen bottom
+# Be aware that older versions of the dmd have a firmware bug that affects
+# parameter defaulting; for this terminal, the 0 in \E[0m is not optional.
+# :ms: is from an otherwise inferior BRL for this terminal.  That entry
+# also has :ll:=\E[70H commented out and marked unsafe.
+# For more, see the 5620 FAQ maintained by David Breneman <daveb@dgtl.com>.
+att5620|dmd|tty5620|ttydmd|5620|5620 terminal 88 columns:\
+	:NL:NP:am:bs:ms:xo:\
+	:co#88:it#8:li#70:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:SF=\E[%dS:\
+	:SR=\E[%dT:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:ic=\E[@:im=:kC=\E[2J:kH=\E[70;1H:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:md=\E[2m:me=\E[0m:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:nw=^J:..px=\E[%p1%d;%p2%l%dq%p2%s:\
+	:r1=\Ec:rc=\E8:sc=\E7:se=\E[0m:sf=\E[S:so=\E[7m:sr=\E[T:\
+	:ta=^I:ue=\E[0m:up=\E[A:us=\E[4m:
+att5620-24|tty5620-24|dmd-24|teletype dmd 5620 in a 24x80 layer:\
+	:li#24:tc=att5620:
+att5620-34|tty5620-34|dmd-34|teletype dmd 5620 in a 34x80 layer:\
+	:li#34:tc=att5620:
+# 5620 layer running the "S" system's downloaded graphics handler:
+att5620-s|tty5620-s|layer|vitty|5620 S layer:\
+	:am:bs:pt:\
+	:co#80:it#8:li#72:\
+	:al=\EI:bl=^G:ce=\EK:cl=^L:cm=\EY%r%+ %+ :cr=^M:dl=\ED:\
+	:do=^J:kC=\E[2J:kH=\E[70;1H:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:sf=^J:ta=^I:up=^K:vb=\E^G:
+
+# Entries for <kf15> thru <kf28> refer to the shifted system pf keys.
+#
+# Entries for <kf29> thru <kf46> refer to the alternate keypad mode
+# keys:  = * / + 7 8 9 - 4 5 6 , 1 2 3 0 . ENTER
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att605|AT&T 605 80 column 102key keyboard:\
+	:am:eo:xo:\
+	:co#80:li#24:ws#80:\
+	:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:ae=^O:al=\E[L:as=\E)0\016:\
+	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:fs=\E8:\
+	:i1=\E[8;0|\E[?\E[13;20l\E[?\E[12h:ic=\E[@:im=\E[4h:\
+	:is=\E[m\017:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:\
+	:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kD=\E[P:kI=\E[@:kN=\E[U:\
+	:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
+	:so=\E[7m:ta=^I:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+att605-pc|ATT 605 in pc term mode:\
+	:@7=\E[F:AL=\E[L:S4=250\E[?11l\E[50;1|:S5=400\E[50;0|:\
+	:XF=g:XN=e:\
+	:ac=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263:\
+	:al=\E[L:bt=\E[Z:dc=\E[P:dl=\E[M:do=\E[B:ei=:ic=\E[@:im=:\
+	:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:\
+	:k8=\E[T:k9=\E[U:k;=\E[V:kB=\E[Z:kD=\E[P:kI=\E[@:kL=\E[M:\
+	:kN=\E[G:kP=\E[I:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=\E[D:nd=\E[C:up=\E[A:\
+	:tc=att605:
+att605-w|AT&T 605-w 132 column 102 key keyboard:\
+	:co#132:ws#132:\
+	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h\E(B\E)0:tc=att605:
+# (att610: I added <rmam>/<smam> based on the init string.  I also
+# added :SF: and :SR: because the BSD file says the att615s have them,
+# and the 615 is like a 610 with a big keyboard, and most of their other
+# smart terminals support the same sequence -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att610|AT&T 610; 80 column; 98key keyboard:\
+	:am:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ae=^O:\
+	:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=\E[4l:fs=\E8:ho=\E[H:\
+	:i1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0:\
+	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:k3=\EOe:\
+	:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
+	:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:us=\E[4m:\
+	:vb=\E[?5h\E[?5l:ve=\E[?25h\E[?12l:vi=\E[?25l:\
+	:vs=\E[?12;25h:
+att610-w|AT&T 610; 132 column; 98key keyboard:\
+	:co#132:ws#132:\
+	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att610:
+
+att610-103k|AT&T 610; 80 column; 103key keyboard:\
+	:!1=\EOO:!2=\EOP:!3=\EOS:#1=\EOM:%0=\EOt:%1=\EOm:%2=\ENi:\
+	:%3=\EOl:%4=\ENc:%5=\ENh:%6=\EOv:%7=\EOr:%8=\ENg:%9=\EOz:\
+	:%a=\EOL:%b=\ENC:%c=\ENH:%d=\EOR:%e=\ENG:%f=\EOZ:%g=\EOT:\
+	:%h=\EOY:%j=\EOQ:&0=\EOW:&1=\EOb:&2=\ENa:&3=\EOy:&4=\EOB:\
+	:&5=\EOq:&6=\EOo:&7=\EOp:&8=\EOs:&9=\ENB:*0=\EOX:*1=\EOU:\
+	:*2=\END:*3=\EON:*4=\ENF:*5=\ENE:*6=\ENI:*7=\ENN:*8=\EOA:\
+	:*9=\EOK:@0=\EOx:@1=\E9:@2=\EOw:@3=\EOV:@4=\EOu:@5=\ENd:\
+	:@6=\EOn:@7=\E0:@8=^M:@9=\EOk:F1@:F2@:F3@:F4@:k9@:k;@:kD=\ENf:\
+	:kE=\EOa:kI=\ENj:kL=\ENe:kM=\ENj:kN=\E[U:kP=\E[V:\
+	:tc=att610:
+att610-103k-w|AT&T 610; 132 column; 103key keyboard:\
+	:co#132:ws#132:\
+	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att610-103k:
+att615|AT&T 615; 80 column; 98key keyboard:\
+	:#4=\E[ A:%i=\E[ @:F5=\EOC:F6=\EOD:F7=\EOE:F8=\EOF:F9=\EOG:\
+	:FA=\EOH:FB=\EOI:FC=\EOJ:FD=\ENO:FE=\ENP:FF=\ENQ:FG=\ENR:\
+	:FH=\ENS:FI=\ENT:FJ=\EOP:FK=\EOQ:FL=\EOR:FM=\EOS:FN=\EOw:\
+	:FO=\EOx:FP=\EOy:FQ=\EOm:FR=\EOt:FS=\EOu:FT=\EOv:FU=\EOl:\
+	:FV=\EOq:FW=\EOr:FX=\EOs:FY=\EOp:FZ=\EOn:Fa=\EOM:\
+	:tc=att610:
+att615-w|AT&T 615; 132 column; 98key keyboard:\
+	:#4=\E[ A:%i=\E[ @:F5=\EOC:F6=\EOD:F7=\EOE:F8=\EOF:F9=\EOG:\
+	:FA=\EOH:FB=\EOI:FC=\EOJ:FD=\ENO:FE=\ENP:FF=\ENQ:FG=\ENR:\
+	:FH=\ENS:FI=\ENT:FJ=\EOP:FK=\EOQ:FL=\EOR:FM=\EOS:FN=\EOw:\
+	:FO=\EOx:FP=\EOy:FQ=\EOm:FR=\EOt:FS=\EOu:FT=\EOv:FU=\EOl:\
+	:FV=\EOq:FW=\EOr:FX=\EOs:FY=\EOp:FZ=\EOn:Fa=\EOM:\
+	:tc=att610-w:
+att615-103k|AT&T 615; 80 column; 103key keyboard:\
+	:#4=\E[ A:%i=\E[ @:\
+	:tc=att610-103k:
+att615-103k-w|AT&T 615; 132 column; 103key keyboard:\
+	:#4=\E[ A:%i=\E[ @:\
+	:tc=att610-103k-w:
+# (att620: I added <rmam>/<smam> based on the init string and
+# :SR:/:SF: from a BSD termcap -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att620|AT&T 620; 80 column; 98key keyboard:\
+	:am:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:ae=\E(B\017:al=\E[L:as=\E)0\016:bl=^G:bt=\E[Z:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:fs=\E8:ho=\E[H:\
+	:i1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h:\
+	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:k3=\EOe:\
+	:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\E(B\017:mh=\E[2m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:\
+	:sr=\EM:ta=^I:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:\
+	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h\E[?12l:vi=\E[?25l:\
+	:vs=\E[?12;25h:
+att620-w|AT&T 620; 132 column; 98key keyboard:\
+	:co#132:ws#132:\
+	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att620:
+att620-103k|AT&T 620; 80 column; 103key keyboard:\
+	:!1=\EOO:!2=\EOP:!3=\EOS:#1=\EOM:%0=\EOt:%1=\EOm:%2=\ENi:\
+	:%3=\EOl:%4=\ENc:%5=\ENh:%6=\EOv:%7=\EOr:%8=\ENg:%9=\EOz:\
+	:%a=\EOL:%b=\ENC:%c=\ENH:%d=\EOR:%e=\ENG:%f=\EOZ:%g=\EOT:\
+	:%h=\EOY:%j=\EOQ:&0=\EOW:&1=\EOb:&2=\ENa:&3=\EOy:&4=\EOB:\
+	:&5=\EOq:&6=\EOo:&7=\EOp:&8=\EOs:&9=\ENB:*0=\EOX:*1=\EOU:\
+	:*2=\END:*3=\EON:*4=\ENF:*5=\ENE:*6=\ENI:*7=\ENN:*8=\EOA:\
+	:*9=\EOK:@0=\EOx:@1=\E9:@2=\EOw:@3=\EOV:@4=\EOu:@5=\ENd:\
+	:@6=\EOn:@7=\E0:@8=^M:@9=\EOk:F1@:F2@:F3@:F4@:F5@:F6@:F7@:F8@:\
+	:F9@:FA@:FB@:FC@:FD@:FE@:FF@:FG@:FH@:FI@:FJ@:FK@:FL@:FM@:FN@:FO@:FP@:\
+	:FQ@:FR@:FS@:FT@:FU@:FV@:FW@:FX@:FY@:FZ@:Fa@:k9@:k;@:kD=\ENf:\
+	:kE=\EOa:kI=\ENj:kL=\ENe:kM=\ENj:kN=\E[U:kP=\E[V:\
+	:tc=att620:
+
+att620-103k-w|AT&T 620; 132 column; 103key keyboard:\
+	:co#132:ws#132:\
+	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att620-103k:
+
+# AT&T (formerly Teletype) 630 Multi-Tasking Graphics terminal
+# The following SETUP modes are assumed for normal operation:
+#	Local_Echo=Off	Gen_Flow=On	Return=CR	Received_Newline=LF
+#	Font_Size=Large		Non-Layers_Window_Cols=80
+#				Non-Layers_Window_Rows=60
+# Other SETUP modes may be set for operator convenience or communication
+# requirements.  Some capabilities assume a printer attached to the Aux EIA
+# port.  This termcap description is for the Fixed Non-Layers Window.  No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+# (att630: added :ic:, :mb: and :mh: from a BSD termcap file -- esr)
+att630|AT&T 630 windowing terminal:\
+	:NP:am:bs:da:db:mi:ms:xo:\
+	:co#80:it#8:li#60:lm#0:\
+	:@8=^M:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\ENq:\
+	:F2=\ENr:F3=\ENs:F4=\ENt:F5=\ENu:F6=\ENv:F7=\ENw:F8=\ENx:\
+	:F9=\ENy:FA=\ENz:FB=\EN{:FC=\EN|:FD=\EN}:FE=\EN~:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:al=\E[L:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:\
+	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:is=\E[m:k9=\ENo:k;=\ENp:\
+	:kA=\E[L:kB=\E[Z:kC=\E[2J:kD=\E[P:kI=\E[@:kL=\E[M:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:me=\E[m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^M^J:pf=\E[?4i:\
+	:po=\E[?5i:..px=\E[%p1%d;%p2%l%dq%p2%s:r2=\Ec:rc=\E8:\
+	:..sa=\E[0%?%p2%t;4%;%?%p1%p3%|%p4%|%p5%|%t;7%;m:\
+	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
+att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines:\
+	:li#24:tc=att630:
+
+# This is the att700 entry for 700 native emulation of the AT&T 700
+# terminal.  Comments are relative to changes from the 605V2 entry and
+# att730 on which the entry is based.  Comments show the terminfo
+# capability name, termcap name, and description.
+#
+# Here is what's going onm in the init string:
+#	ESC [ 50;4|	set 700 native mode (really is 605)
+# x	ESC [ 56;ps| 	set lines to 24: ps=0; 40: ps=1 (plus status line)
+#	ESC [ 53;0|	set GenFlow to Xon/Xoff
+#	ESC [ 8 ;0|	set CR on NL 
+# x	ESC [ ? 3 l/h	set workspace: 80 col(l); 132 col(h)
+#	ESC [ ? 4 l	jump scroll 
+#	ESC [ ? 5 l/h	video: normal (l); reverse (h)
+#	ESC [ ?13 l	Labels on
+#	ESC [ ?15 l	parity check = no
+#	ESC [ 13 l	monitor mode off
+#	ESC [ 20 l	LF on NL (not CRLF on NL)
+#	ESC [ ? 7 h	autowrap on
+#	ESC [ 12 h	local echo off
+#	ESC ( B		GO = ASCII
+#	ESC ) 0		G1 = Special Char & Line Drawing
+#	ESC [ ? 31 l	Set 7 bit controls
+#
+# Note: Most terminals, especially the 600 family use Reverse Video for
+# standout mode.  DEC also uses reverse video.  The VT100 uses bold in addition
+# Assume we should stay with reverse video for 70..  However, the 605V2 exits
+# standout mode with \E[m (all normal attributes).  The 730 entry simply
+# exits reverse video which would leave other current attributes intact.  It
+# was assumed the 730 entry to be more correct so rmso has changed.  The
+# 605V2 has no sequences to turn individual attributes off, thus its setting
+# and the rmso/smso settings from the 730.
+#
+# Note: For the same reason as above in rmso I changed exit under-score mode
+# to specifically turn off underscore, rather than return to all normal 
+# attributes
+#
+# Note: The following pkey_xmit is taken from the 605V2 which contained the
+# capability as pfxl.  It was changed here to pfx since pfxl
+# will only compile successfully with Unix 4.0 tic.  Also note that pfx only
+# allows strings to be parameters and label values must be programmed as
+# constant strings.  Supposedly the pfxl of Version 4.0 allows both labels
+# and strings to be parameters.  The 605V2 pfx entry should be examined later
+# in this regard. For reference the 730 pfxl entry is shown here for comparison
+# 730 pfx entry:
+#     pfxl=\E[%?%p1%{25}%<%t%p1%e%p1%{24}%-%;%d;%p2%l%02d%?%p1%{25}%<%tq\s\s\s
+# SYS\s\s\s\s\sF%p1%:-2d\s\s%e;0;3q%;%p2%s,
+#
+# (for 4.0 tic)
+#     pfxl=\E[%p1%d;%p2%l%02dq%?%p1%{9}%<%t   F%p1%1d           %;%p2%s,
+#
+# (for <4.0 tic)
+#     pfx=\E[%p1%d;%p2%l%02dq%?%p1%{9}%<%t   F%p1%1d           %;%p2%s,
+#
+# From the AT&T 705 Multi-tasking terminal user's guide Page 8-8,8-9
+#
+# Port1 Interface
+#
+# modular 10 pin Connector
+# Left side       Right side
+# Pin 1 2 3 4 5 6 7 8 9 10
+#
+#        Key (notch) at bottom
+#
+# Pin    1 DSR
+#        3 DCD
+#        4 DTR
+#        5 Sig Ground
+#        6 RD
+#        7 SD
+#        8 CTS
+#        9 RTS
+#        10 Frame Ground
+#
+# The manual is 189 pages and is loaded with details about the escape codes,
+# etc..... Available from AT&T CIC 800-432-6600...
+# ask for Document number 999-300-660..
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att700|AT&T 700 24x80 column display w/102key keyboard:\
+	:am:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:\
+	:fs=\E8:ho=\E[H:i2=\E(B\E)0:im=\E[4h:\
+	:is=\E[50;4|\E[53;0|\E[8;0|\E[?4;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0\E[?31l\E[0m\017:\
+	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:\
+	:k8=\EOj:k9=\ENo:kD=\E[P:kI=\E[@:kN=\E[U:kP=\E[V:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\
+	:st=\EH:ta=^I:ts=\E7\E[99;%i%p1%dx:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h\E[?12l:vi=\E[?25l:\
+	:vs=\E[?12;25h:
+
+# This entry was modified 3/13/90 by JWE.
+# fixes include additions of <enacs>, correcting :rp:, and modification
+# of <kHOM>.  (See comments below)
+# att730 has status line of 80 chars
+# These were commented out: :SF=\E[%p1%dS:, :SR=\E[%p1%dT:,
+# the <kf25> and up keys are used for shifted system Fkeys
+# NOTE: JWE 3/13/90 The 98 key keyboard translation for shift/HOME is 
+# currently the same as :kh: (unshifted HOME or \E[H).  On the 102, 102+1
+# and 122 key keyboards, the 730's translation is \E[2J.  For consistency
+# <kHOM> has been commented out.  The user can uncomment <kHOM> if using the
+# 102, 102+1, or 122 key keyboards
+#       kHOM=\E[2J,
+# (att730: I added <rmam>/<smam> based on the init string -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+att730|AT&T 730 windowing terminal:\
+	:am:da:db:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#60:lm#0:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:fs=\E8:\
+	:ho=\E[H:\
+	:i1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)B:\
+	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:k3=\EOe:\
+	:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kI=\E[@:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\
+	:ta=^I:ts=\E7\E[;%i%p1%dx:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=\E[?5h\E[?5l:ve=\E[?25h\E[?12l:vi=\E[?25l:\
+	:vs=\E[?12;25h:
+att730-41|730MTG-41|AT&T 730-41 windowing terminal Version:\
+	:li#41:tc=att730:
+att730-24|730MTG-24|AT&T 730-24 windowing terminal Version:\
+	:li#24:tc=att730:
+att730r|730MTGr|AT&T 730 rev video windowing terminal Version:\
+	:i1=\E[8;0|\E[?3;4;13;15l\E[?5h\E[13;20l\E[?7h\E[12h\E(B\E)B:\
+	:vb=\E[?5l\E[?5h:\
+	:tc=att730:
+att730r-41|730MTG-41r|AT&T 730r-41 rev video windowing terminal Version:\
+	:li#41:tc=att730r:
+att730r-24|730MTGr-24|AT&T 730r-24 rev video windowing terminal Version:\
+	:li#24:tc=att730r:
+
+# The following represents the screen layout along with the associated
+# bezel buttons for the 5430/pt505 terminal. The "kf" designations do
+# not appear on the screen but are shown to reference the bezel buttons.
+# The "CMD", "MAIL", and "REDRAW" buttons are shown in their approximate
+# position relative to the screen.
+#
+#
+#
+#      +----------------------------------------------------------------+
+#      |                                                                |
+# XXXX | kf0                                                       kf24 | XXXX
+#      |                                                                |
+#      |                                                                |
+# XXXX | kf1                                                       kf23 | XXXX
+#      |                                                                |
+#      |                                                                |
+# XXXX | kf2                                                       kf22 | XXXX
+#      |                                                                |
+#      |                                                                |
+# XXXX | kf3                                                       kf21 | XXXX
+#      |                                                                |
+#      |                                                                |
+# XXXX | kf4                                                       kf20 | XXXX
+#      |                                                                |
+#      |                                                                |
+# XXXX | kf5                                                       kf19 | XXXX
+#      |                                                                |
+#      |                                                                |
+# XXXX | kf6                                                       kf18 | XXXX
+#      |                                                                |
+#      |                                                                |
+# XXXX |                                                                | XXXX
+#      |                                                                |
+#      |                                                                |
+#      +----------------------------------------------------------------+
+#
+#          XXXX  XXXX  XXXX  XXXX  XXXX  XXXX  XXXX  XXXX  XXXX  XXXX
+#
+# Note: XXXX represents the screen buttons
+#                                                          CMD   REDRAW
+#
+#                                                          MAIL
+#
+# version 1 note: 
+#	The character string sent by key 'kf26' may be user programmable
+#       to send either \E[16s, or \E[26s.
+#       The character string sent by key 'krfr' may be user programmable
+#       to send either \E[17s, or \E[27s.
+#
+# Depression of the "CMD" key sends    \E!    (kcmd)
+# Depression of the "MAIL" key sends   \E[26s (kf26)
+# "REDRAW" same as "REFRESH" (krfr)
+#
+# "kf" functions adds carriage return to output string if terminal is in
+# 'new line' mode.
+#
+# The following are functions not covered in the table above:
+#
+#       Set keyboard character (SKC): \EPn1;Pn2w
+#                       Pn1= 0 Back Space key
+#                       Pn1= 1 Break key
+#                       Pn2=   Program char (hex)
+#
+#       Screen Definition (SDF): \E[Pn1;Pn2;Pn3;Pn4;Pn5t
+#                       Pn1=     Window number (1-39)
+#                       Pn2-Pn5= Y;X;Y;X coordinates
+#
+#       Screen Selection (SSL): \E[Pnu
+#                       Pn= Window number
+#
+#       Set Terminal Modes (SM): \E[Pnh
+#                       Pn= 3 Graphics mode
+#                       Pn= > Cursor blink
+#                       Pn= < Enter new line mode
+#                       Pn= = Enter reverse insert/replace mode
+#                       Pn= ? Enter no scroll mode
+#
+#       Reset Terminal Mode (RM): \E[Pnl
+#                       Pn= 3 Exit graphics mode
+#                       Pn= > Exit cursor blink
+#                       Pn= < Exit new line mode
+#                       Pn= = Exit reverse insert/replace mode
+#                       Pn= ? Exit no scroll mode
+#
+#       Screen Status Report (SSR): \E[Pnp
+#                       Pn= 0 Request current window number
+#                       Pn= 1 Request current window dimensions
+#
+#       Device Status Report (DSR): \E[6n    Request cursor position
+#
+#       Call Status Report (CSR): \E[Pnv
+#                       Pn= 0 Call failed
+#                       Pn= 1 Call successful
+#
+#       Transparent Button String (TBS): \E[Pn1;Pn2;Pn3;{string
+#                       Pn1= Button number to be loaded
+#                       Pn2= Character count of "string"
+#                       Pn3= Key mode being loaded:
+#                               0= Unshifted
+#                               1= Shifted
+#                               2= Control
+#                       String= Text string (15 chars max)
+#
+#       Screen Number Report (SNR): \E[Pnp
+#                       Pn= Screen number
+#
+#       Screen Dimension Report (SDR): \E[Pn1;Pn2r
+#                       Pn1= Number of rows available in window
+#                       Pn2= Number of columns available in window
+#
+#       Cursor Position Report (CPR): \E[Pn1;Pn2R
+#                       Pn1= "Y" Position of cursor
+#                       Pn2= "X" Position of cursor
+#
+#       Request Answer Back (RAB): \E[c
+#
+#       Answer Back Response (ABR): \E[?;*;30;VSV
+#                       *=  0 No printer available
+#                       *=  2 Printer available
+#                       V=  Software version number
+#                       SV= Software sub version number
+#	(printer-available field not documented in v1)
+#
+#       Screen Alignment Aid: \En
+#
+#       Bell (lower pitch): \E[x
+#
+#       Dial Phone Number: \EPdstring\
+#                       string= Phone number to be dialed
+#
+#       Set Phone Labels: \EPpstring\
+#                       string= Label for phone buttons
+#
+#       Set Clock: \EPchour;minute;second\
+#
+#       Position Clock: \EPsY;X\
+#                       Y= "Y" coordinate
+#                       X= "X" coordinate
+#
+#       Delete Clock: \Epr\
+#
+#       Programming The Function Buttons: \EPfPn;string\
+#                       Pn= Button number (00-06, 18-24)
+#                                         (kf00-kf06, kf18-kf24)
+#                       string= Text to sent on button depression
+#
+# The following in version 2 only:
+#
+#       Request For Local Directory Data: \EPp12;\
+#
+#       Local Directory Data to host: \EPp11;LOCAL...DIRECTORY...DATA\
+#
+#	Request for Local Directory Data in print format: \EPp13;\
+#
+#	Enable 'Prt on Line' mode: \022 (DC2)
+#
+#	Disable 'Prt on Line' mode: \024 (DC4)
+#
+
+# 05-Aug-86:
+# The following Terminfo entry describes functions which are supported by
+# the AT&T 5430/pt505 terminal software version 2 and later.
+att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal:\
+	:am:xo:\
+	:co#80:it#8:li#24:\
+	:&2=\E[27s:@4=\E\041:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
+	:DO=\E[%dB:F8=\E[18s:F9=\E[19s:FA=\E[20s:FB=\E[21s:\
+	:FC=\E[22s:FD=\E[23s:FE=\E24s:FG=\E26s:LE=\E[%dD:\
+	:RA=\E[11;1j:RI=\E[%dC:SA=\E[11;0j:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E[10m:al=\E[L:as=\E[11m:bl=^G:cb=\E2K:cd=\E[0J:\
+	:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:i1=\EPr\E[0u\E[2J\E[0;0H\E[m\E[3l\E[<l\E[4l\E[>l\E[=l\E[?l:\
+	:im=\E[4h:k0=\E[00s:k1=\E[01s:k2=\E[02s:k3=\E[03s:\
+	:k4=\E[04s:k5=\E[05s:k6=\E[06s:kb=^H:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:r1=\Ec:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=^J:so=\E[1m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[>l:vs=\E[>h:
+
+# The following Terminfo entry describes functions which are supported by
+# the AT&T 5430/pt505 terminal software version 1.
+att505-24|pt505-24|gs5430-24|AT&T PT505 or 5430 GETSET version 1 24 lines:\
+	:li#24:\
+	:RA@:SA@:pf@:po@:rc@:sc@:tc=att505:
+tt505-22|pt505-22|gs5430-22|AT&T PT505 or 5430 GETSET version 1 22 lines:\
+	:li#22:tc=att505:
+
+#### Ampex (Dialogue)
+#
+# Yes, these are the same people who are better-known for making audio- and
+# videotape.  I'm told they are located in Redwood City, CA.
+#
+
+# From: <cbosg!ucbvax!SRC:george> Fri Sep 11 22:38:32 1981
+# (ampex80: some capabilities merged in from SCO's entry -- esr)
+ampex80|a80|d80|dialogue|dialogue80|ampex dialogue 80:\
+	:am:bs:bw:ul:\
+	:co#80:it#8:li#24:\
+	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :\
+	:cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:ei=:ic=\EQ:im=:is=\EA:le=^H:\
+	:nd=^L:se=\Ek:sf=^J:so=\Ej:st=\E1:ta=^I:ue=\Em:up=^K:us=\El:
+# This entry was from somebody anonymous, Tue Aug  9 20:11:37 1983, who wrote:
+ampex175|ampex d175:\
+	:am:\
+	:co#80:li#24:\
+	:al=\EE:bl=^G:cd=\Ey:ce=\Et:cl=\E+:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:is=\EX\EA\EF:\
+	:kA=\EE:kD=\EW:kI=\EQ:kL=\ER:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
+	:le=^H:ll=^^^K:nd=^L:se=\Ek:sf=^J:so=\Ej:te=\EF:ti=\EN:\
+	:ue=\Em:up=^K:us=\El:
+# No backspace key in the main QWERTY cluster. Fortunately, it has a
+# NEWLINE/PAGE key just above RETURN that sends a strange single-character
+# code.  Given a suitable Unix (one that lets you set an echo-erase-as-BS-SP-BS
+# mode), this key can be used as the erase key; I find I like this. Because
+# some people and some systems may not, there is another termcap ("ampex175")
+# that suppresses this little eccentricity by omitting the relevant capability.
+ampex175-b|ampex d175 using left arrow for erase:\
+	:kb=^_:\
+	:tc=ampex175:
+# From: Richard Bascove <atd!dsd!rcb@ucbvax.berkeley.edu>
+# (ampex210: removed obsolete ":kn#10:" -- esr)
+ampex210|a210|ampex a210:\
+	:am:bs:hs:xn:\
+	:co#80:it#8:li#24:sg#1:\
+	:al=\EE:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :dc=\EW:\
+	:dl=\ER:ei=:fs=\E.2:ho=^^:ic=\EQ:if=/usr/share/tabset/std:\
+	:im=:is=\EC\Eu\E'\E(\El\EA\E%\E{\E.2\EG0\Ed\En:\
+	:k0=^A0\r:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:k5=^A5\r:\
+	:k6=^A6\r:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^V:kh=^^:kl=^H:\
+	:kr=^L:ku=^K:le=^H:mk@:nd=^L:ta=^I:ts=\E.0\Eg\E}\Ef:up=^K:\
+	:vb=\EU\EX\EU\EX\EU\EX\EU\EX:\
+	:tc=adm+sgr:
+# (ampex219: I added <rmam>/<smam> based on the init string, added :vs:
+# from ampex219w, added :ve:=\E[?3l, irresistibly suggested by :vs:,
+# and moved the padding to be *after* the caps -- esr)
+ampex219|ampex-219|amp219|Ampex with Automargins:\
+	:hs:xn:\
+	:co#80:it#8:li#24:\
+	:RA=\E[?7l:SA=\E[?7h:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=%i\E[%2;%2r:\
+	:do=\E[B:ho=\E[H:\
+	:is=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k0=\E[21~:\
+	:k1=\E[7~:k2=\E[8~:k3=\E[9~:k4=\E[10~:k5=\E[11~:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kd=\E[B:ke=\E>:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mh=\E[1m:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:\
+	:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?3l:vs=\E[?3h:
+ampex219w|ampex-219w|amp219w|Ampex 132 cols:\
+	:co#132:li#24:\
+	:bl=^G:cr=^M:do=^J:is=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:sf=^J:\
+	:tc=ampex219:
+# (ampex232: removed :if=/usr/share/tabset/ampex:, no file and no :st: --esr) 
+ampex232|ampex-232|Ampex Model 232:\
+	:am:\
+	:co#80:li#24:sg#1:\
+	:al=5*\EE:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :dc=\EW:\
+	:dl=5*\ER:do=^V:ei=:ic=\EQ:im=:is=\Eg\El:k0=^A@\r:k1=^AA\r:\
+	:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:\
+	:k8=^AH\r:k9=^AI\r:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
+	:mk@:nd=^L:ta=^I:up=^K:vb=\Eb\Ed:ve=\E.4:vi=\E.0:\
+	:tc=adm+sgr:
+# (ampex: removed :if=/usr/share/tabset/amp-132:, no file and no :st: -- esr) 
+ampex232w|Ampex Model 232 / 132 columns:\
+	:co#132:li#24:\
+	:is=\E\034Eg\El:tc=ampex232:
+
+#### Ann Arbor (aa)
+#
+# Ann Arbor made dream terminals for hackers -- large screen sizes and huge
+# numbers of function keys.  At least some used monitors in portrait mode,
+# allowing up to 76-character screen heights!  They were reachable at:
+#
+#	Ann Arbor Terminals
+#	6175 Jackson Road
+#	Ann Arbor, MI 48103
+#	(313)-663-8000
+#
+# But in 1996 the phone number reaches some kitschy retail shop, and Ann Arbor
+# can't be found on the Web; I fear they're long dead.  R.I.P.
+#
+
+
+# Originally from Mike O'Brien@Rand and Howard Katseff at Bell Labs.
+# Highly modified 6/22 by Mike O'Brien.
+# split out into several for the various screen sizes by dave-yost@rand
+# Modifications made 3/82 by Mark Horton
+# Modified by Tom Quarles at UCB for greater efficiency and more diversity
+# status line moved to top of screen, :vb: removed 5/82
+# Some unknown person at SCO then hacked the init strings to make them more
+# efficient.
+#
+# assumes the following setup:
+#   A menu: 0000 1010  0001 0000
+#   B menu: 9600  0100 1000  0000 0000  1000 0000  17  19
+#   C menu: 56   66   0    0    9600  0110 1100
+#   D menu: 0110 1001   1   0
+#
+#	Briefly, the settings are for the following modes:
+#	   (values are for bit set/clear with * indicating our preference
+#	    and the value used to test these termcaps)
+#	Note that many of these settings are irrelevent to the terminfo
+#	and are just set to the default mode of the terminal as shipped
+#	by the factory.
+#
+# A menu: 0000 1010  0001 0000
+#	Block/underline cursor*
+#	blinking/nonblinking cursor*
+#	key click/no key click*
+#	bell/no bell at column 72*
+#
+#	key pad is cursor control*/key pad is numeric
+#	return and line feed/return for :cr: key *
+#	repeat after .5 sec*/no repeat
+#	repeat at 25/15 chars per sec. *
+#
+#	hold data until pause pressed/process data unless pause pressed*
+#	slow scroll/no slow scroll*
+#	Hold in area/don't hold in area*
+#	functions keys have default*/function keys disabled on powerup
+#
+#	show/don't show position of cursor during page transmit*
+#	unused
+#	unused
+#	unused
+#
+# B menu: 9600  0100 1000  0000 0000  1000 0000  17  19
+#	Baud rate (9600*)
+#
+#	2 bits of parity - 00=odd,01=even*,10=space,11=mark
+#	1 stop bit*/2 stop bits
+#	parity error detection off*/on
+#
+#	keyboard local/on line*
+#	half/full duplex*
+#	disable/do not disable keyboard after data transmission*
+#
+#	transmit entire page/stop transmission at cursor*
+#	transfer/do not transfer protected characters*
+#	transmit all characters/transmit only selected characters*
+#	transmit all selected areas/transmit only 1 selected area*
+#
+#	transmit/do not transmit line separators to host*
+#	transmit/do not transmit page tab stops tabs to host*
+#	transmit/do not transmit column tab stop tabs to host*
+#	transmit/do not transmit graphics control (underline,inverse..)*
+#
+#	enable*/disable auto XON/XOFF control
+#	require/do not require receipt of a DC1 from host after each LF*
+#	pause key acts as a meta key/pause key is pause*
+#	unused
+#
+#	unused
+#	unused
+#	unused
+#	unused
+#
+#	XON character (17*)
+#	XOFF character (19*)
+#
+# C menu: 56   66   0    0    9600  0110 1100
+#	number of lines to print data on (printer) (56*)
+#
+#	number of lines on a sheet of paper (printer) (66*)
+#
+#	left margin (printer) (0*)
+#
+#	number of pad chars on new line to printer (0*)
+#
+#	printer baud rate (9600*)
+#
+#	printer parity: 00=odd,01=even*,10=space,11=mark
+#	printer stop bits: 2*/1
+#	print/do not print guarded areas*
+#
+#	new line is: 01=LF,10=CR,11=CRLF*
+#	unused
+#	unused
+#
+# D menu: 0110 1001   1   0
+#	LF is newline/LF is down one line, same column*
+#	wrap to preceding line if move left from col 1*/don't wrap
+#	wrap to next line if move right from col 80*/don't wrap
+#	backspace is/is not destructive*
+#
+#	display*/ignore DEL character
+#	display will not/will scroll*
+#	page/column tab stops*
+#	erase everything*/erase unprotected only
+#
+#	editing extent: 0=display,1=line*,2=field,3=area
+#
+#	unused
+#
+
+annarbor4080|aa4080|ann arbor 4080:\
+	:am:bs:\
+	:co#80:li#40:\
+	:bl=^G:cl=\014:\
+	:..cm=\017%p2%{10}%/%{16}%*%p2%{10}%m%+%c%p1%?%p1%{19}%>%t%{12}%+%;%{64}%+%c:\
+	:cr=^M:ct=^^P^P:do=^J:ho=^K:kb=^^:kd=^J:kh=^K:kl=^H:kr=^_:\
+	:ku=^N:le=^H:nd=^_:sf=^J:st=^]^P1:ta=^I:up=^N:
+
+# Strange Ann Arbor terminal from BRL
+aas1901|Ann Arbor K4080 w/S1901 mod:\
+	:am:\
+	:co#80:li#40:\
+	:bl=^G:cl=^L:cr=^M:do=^J:ho=^K:kb=^H:kd=^J:kl=^H:le=^H:\
+	:ll=^O\0c:nd=^_:nw=^M^J:sf=^J:ta=^I:up=^N:
+
+# If you're using the GNU termcap library, add
+#	:cS=\E[%p1%d;%p2%d;%p3%d;%p4%dp:
+# to these capabilities.  This is the nonstandard GNU termcap scrolling
+# capability, arguments are:
+#   1. Total number of lines on the screen.
+#   2. Number of lines above desired scroll region.
+#   3. Number of lines below (outside of) desired scroll region.
+#   4. Total number of lines on the screen, the same as the first parameter.
+# The generic Ann Arbor entry is the only one that uses this.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+aaa+unk|aaa-unk|ann arbor ambassador (internal - don't use this directly):\
+	:am:bs:km:mi:xo:\
+	:co#80:it#8:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:ct=\E[2g:dc=\E[P:dl=\E[M:do=^K:ei=:ho=\E[H:\
+	:i1=\E[m\E7\E[H\E9\E8:i2=\E[1Q\E[>20;30l\EP`+x~M\E\:\
+	:ic=\E[@:im=:k1=\EOA:k2=\EOB:k3=\EOC:k4=\EOD:k5=\EOE:\
+	:k6=\EOF:k7=\EOG:k8=\EOH:k9=\EOI:kD=\E[P:kI=\E[@:kb=^H:\
+	:kd=\E[B:\
+	:ke=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E\:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mm=\E[>52h:\
+	:mo=\E[>52l:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=^K:\
+	:so=\E[7m:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+
+aaa+rv|ann arbor ambassador in reverse video:\
+	:i1=\E[7m\E7\E[H\E9\E8:mb=\E[5;7m:md=\E[1;7m:\
+	:me=\E[7m\016:mk=\E[7;8m:mr=\E[m:r1=\E[H\E[7m\E[J:\
+	:..sa=\E[%?%p1%p3%|%!%t7;%;%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m:\
+	:se=\E[7m:so=\E[m:ue=\E[7m:us=\E[4;7m:
+# Ambassador with the DEC option, for partial vt100 compatibility.
+aaa+dec|ann arbor ambassador in dec vt100 mode:\
+	:ac=aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}:\
+	:ae=^N:as=^O:cs=\E[%i%d;%dr:eA=\E(0:\
+	:..sa=\E[%?%p1%p3%|%!%t7;%;%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m%?%p9%t\017%e\016%;:
+aaa-18|ann arbor ambassador/18 lines:\
+	:li#18:\
+	:is=\E7\E[60;0;0;18p\E8:te=\E[60;0;0;18p\E[60;1H\E[K:\
+	:ti=\E[18;0;0;18p:\
+	:tc=aaa+unk:
+aaa-18-rv|ann arbor ambassador/18 lines+reverse video:\
+	:tc=aaa+rv:tc=aaa-18:
+aaa-20|ann arbor ambassador/20 lines:\
+	:li#20:\
+	:is=\E7\E[60;0;0;20p\E8:te=\E[60;0;0;20p\E[60;1H\E[K:\
+	:ti=\E[20;0;0;20p:\
+	:tc=aaa+unk:
+aaa-22|ann arbor ambassador/22 lines:\
+	:li#22:\
+	:is=\E7\E[60;0;0;22p\E8:te=\E[60;0;0;22p\E[60;1H\E[K:\
+	:ti=\E[22;0;0;22p:\
+	:tc=aaa+unk:
+aaa-24|ann arbor ambassador/24 lines:\
+	:li#24:\
+	:is=\E7\E[60;0;0;24p\E8:te=\E[60;0;0;24p\E[60;1H\E[K:\
+	:ti=\E[24;0;0;24p:\
+	:tc=aaa+unk:
+aaa-24-rv|ann arbor ambassador/24 lines+reverse video:\
+	:tc=aaa+rv:tc=aaa-24:
+aaa-26|ann arbor ambassador/26 lines:\
+	:li#26:\
+	:is=\E7\E[60;0;0;26p\E8:te=\E[60;0;0;26p\E[26;1H\E[K:\
+	:ti=\E[H\E[J\E[26;0;0;26p:\
+	:tc=aaa+unk:
+aaa-28|ann arbor ambassador/28 lines:\
+	:li#28:\
+	:is=\E7\E[60;0;0;28p\E8:te=\E[60;0;0;28p\E[28;1H\E[K:\
+	:ti=\E[H\E[J\E[28;0;0;28p:\
+	:tc=aaa+unk:
+aaa-30-s|aaa-s|ann arbor ambassador/30 lines w/status:\
+	:es:hs:\
+	:li#29:\
+	:ds=\E7\E[60;0;0;30p\E[1;1H\E[K\E[H\E8\r\n\E[K:\
+	:fs=\E[>51l:is=\r\n\E[A\E7\E[60;1;0;30p\E8:\
+	:te=\E[60;1;0;30p\E[29;1H\E[K:\
+	:ti=\E[H\E[J\E[30;1;0;30p\E[30;1H\E[K:\
+	:ts=\E[>51h\E[1;%p1%dH\E[2K:tc=aaa+unk:
+aaa-30-s-rv|aaa-s-rv|ann arbor ambassador/30 lines+status+reverse video:\
+	:tc=aaa+rv:tc=aaa-30-s:
+aaa-s-ctxt|aaa-30-s-ctxt|ann arbor ambassador/30 lines+status+save context:\
+	:te=\E[60;1;0;30p\E[59;1H\E[K:\
+	:ti=\E[30;1H\E[K\E[30;1;0;30p:tc=aaa-30-s:
+aaa-s-rv-ctxt|aaa-30-s-rv-ct|ann arbor ambassador/30 lines+status+save context+reverse video:\
+	:te=\E[60;1;0;30p\E[59;1H\E[K:\
+	:ti=\E[30;1H\E[K\E[30;1;0;30p:tc=aaa-30-s-rv:
+aaa|aaa-30|ambas|ambassador|ann arbor ambassador/30 lines:\
+	:li#30:\
+	:is=\E7\E[60;0;0;30p\E8:te=\E[60;0;0;30p\E[30;1H\E[K:\
+	:ti=\E[H\E[J\E[30;0;0;30p:\
+	:tc=aaa+unk:
+aaa-30-rv|aaa-rv|ann arbor ambassador/30 lines in reverse video:\
+	:tc=aaa+rv:tc=aaa-30:
+aaa-30-ctxt|aaa-ctxt|ann arbor ambassador/30 lines; saving context:\
+	:te=\E[60;0;0;30p\E[60;1H\E[K:ti=\E[30;0;0;30p:\
+	:tc=aaa-30:
+aaa-30-rv-ctxt|aaa-rv-ctxt|ann arbor ambassador/30 lines reverse video; saving context:\
+	:te=\E[60;0;0;30p\E[60;1H\E[K:ti=\E[30;0;0;30p:\
+	:tc=aaa+rv:tc=aaa-30:
+aaa-36|ann arbor ambassador/36 lines:\
+	:li#36:\
+	:is=\E7\E[60;0;0;36p\E8:te=\E[60;0;0;36p\E[36;1H\E[K:\
+	:ti=\E[H\E[J\E[36;0;0;36p:\
+	:tc=aaa+unk:
+aaa-36-rv|ann arbor ambassador/36 lines+reverse video:\
+	:tc=aaa+rv:tc=aaa-36:
+aaa-40|ann arbor ambassador/40 lines:\
+	:li#40:\
+	:is=\E7\E[60;0;0;40p\E8:te=\E[60;0;0;40p\E[40;1H\E[K:\
+	:ti=\E[H\E[J\E[40;0;0;40p:\
+	:tc=aaa+unk:
+aaa-40-rv|ann arbor ambassador/40 lines+reverse video:\
+	:tc=aaa+rv:tc=aaa-40:
+aaa-48|ann arbor ambassador/48 lines:\
+	:li#48:\
+	:is=\E7\E[60;0;0;48p\E8:te=\E[60;0;0;48p\E[48;1H\E[K:\
+	:ti=\E[H\E[J\E[48;0;0;48p:\
+	:tc=aaa+unk:
+aaa-48-rv|ann arbor ambassador/48 lines+reverse video:\
+	:tc=aaa+rv:tc=aaa-48:
+aaa-60-s|ann arbor ambassador/59 lines+status:\
+	:es:hs:\
+	:li#59:\
+	:ds=\E7\E[60;0;0;60p\E[1;1H\E[K\E[H\E8\r\n\E[K:\
+	:fs=\E[>51l:is=\r\n\E[A\E7\E[60;1;0;60p\E8:\
+	:ts=\E[>51h\E[1;%p1%dH\E[2K:tc=aaa+unk:
+aaa-60-s-rv|ann arbor ambassador/59 lines+status+reverse video:\
+	:tc=aaa+rv:tc=aaa-60-s:
+aaa-60-dec-rv|ann arbor ambassador/dec mode+59 lines+status+rev video:\
+	:tc=aaa+dec:tc=aaa+rv:tc=aaa-60-s:
+aaa-60|ann arbor ambassador/60 lines:\
+	:li#60:\
+	:is=\E7\E[60;0;0;60p\E[1Q\E[m\E[>20;30l\E8:tc=aaa+unk:
+aaa-60-rv|ann arbor ambassador/60 lines+reverse video:\
+	:tc=aaa+rv:tc=aaa-60:
+aaa-db|ann arbor ambassador 30/destructive backspace:\
+	:bs@:\
+	:i2=\E[1Q\E[m\E[>20l\E[>30h:le=\E[D:tc=aaa-30:
+
+guru|guru-33|guru+unk|ann arbor guru/33 lines 80 cols:\
+	:li#33:\
+	:i2=\E[>59l:is=\E7\E[255;0;0;33;80;80p\E8\E[J:\
+	:te=\E[255p\E[255;1H\E[K:ti=\E[33p:vb=\E[>59h\E[>59l:\
+	:tc=aaa+unk:
+guru+rv|guru changes for reverse video:\
+	:i2=\E[>59h:vb=\E[>59l\E[>59h:
+guru-rv|guru-33-rv|ann arbor guru/33 lines+reverse video:\
+	:tc=guru+rv:tc=guru-33:
+guru+s|guru status line:\
+	:es:hs:\
+	:ds=\E7\E[;0p\E[1;1H\E[K\E[H\E8\r\n\E[K:fs=\E[>51l:\
+	:te=\E[255;1p\E[255;1H\E[K:ti=:\
+	:ts=\E[>51h\E[1;%p1%dH\E[2K:
+guru-nctxt|guru with no saved context:\
+	:ti=\E[H\E[J\E[33p\E[255;1H\E[K:tc=guru:
+guru-s|guru-33-s|ann arbor guru/33 lines+status:\
+	:li#32:\
+	:is=\r\n\E[A\E7\E[255;1;0;33;80;80p\E8\E[J:\
+	:ti=\E[33;1p\E[255;1H\E[K:tc=guru+s:\
+	:tc=guru+unk:
+guru-24|ann arbor guru 24 lines:\
+	:co#80:li#24:\
+	:is=\E7\E[255;0;0;24;80;80p\E8\E[J:ti=\E[24p:tc=guru+unk:
+guru-44|ann arbor guru 44 lines:\
+	:co#97:li#44:\
+	:is=\E7\E[255;0;0;44;97;100p\E8\E[J:ti=\E[44p:tc=guru+unk:
+guru-44-s|ann arbor guru/44 lines+status:\
+	:li#43:\
+	:is=\r\n\E[A\E7\E[255;1;0;44;80;80p\E8\E[J:\
+	:ti=\E[44;1p\E[255;1H\E[K:tc=guru+s:\
+	:tc=guru+unk:
+guru-76|guru with 76 lines by 89 cols:\
+	:co#89:li#76:\
+	:is=\E7\E[255;0;0;76;89;100p\E8\E[J:ti=\E[76p:tc=guru+unk:
+guru-76-s|ann arbor guru/76 lines+status:\
+	:co#89:li#75:\
+	:is=\r\n\E[A\E7\E[255;1;0;76;89;100p\E8\E[J:\
+	:ti=\E[76;1p\E[255;1H\E[K:tc=guru+s:\
+	:tc=guru+unk:
+guru-76-lp|guru-lp|guru with page bigger than line printer:\
+	:co#134:li#76:\
+	:is=\E7\E[255;0;0;76;134;134p\E8\E[J:ti=\E[76p:tc=guru+unk:
+guru-76-w|guru 76 lines by 178 cols:\
+	:co#178:li#76:\
+	:is=\E7\E[255;0;0;76;178;178p\E8\E[J:ti=\E[76p:tc=guru+unk:
+guru-76-w-s|ann arbor guru/76 lines+status+wide:\
+	:co#178:li#75:\
+	:is=\r\n\E[A\E7\E[255;1;0;76;178;178p\E8\E[J:\
+	:ti=\E[76;1p\E[255;1H\E[K:\
+	:tc=guru+s:tc=guru+unk:
+guru-76-wm|guru 76 lines by 178 cols with 255 cols memory:\
+	:co#178:li#76:\
+	:is=\E7\E[255;0;0;76;178;255p\E8\E[J:ti=\E[76p:tc=guru+unk:
+aaa-rv-unk|ann arbor unknown type:\
+	:Nl#0:lh#0:lw#0:\
+	:ho=\E[H:i1=\E[7m\E7\E[H\E9\E8:mb=\E[5;7m:md=\E[1;7m:\
+	:me=\E[7m:mk=\E[7;8m:mr=\E[m:r1=\E[H\E[7m\E[J:\
+	:..sa=\E[%?%p1%!%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m:\
+	:se=\E[7m:so=\E[m:ue=\E[7m:us=\E[4;7m:
+
+#### Applied Digital Data Systems (adds)
+#
+# ADDS itself is long gone.  ADDS was bought by NCR, and the same group made
+# ADDS and NCR terminals.  When AT&T and NCR merged, the engineering for
+# terminals was merged again.  Then AT&T sold the terminal business to
+# SunRiver, which later changed its  name to Boundless Technologies.  The
+# engineers from Teletype, AT&T terminals, ADDS, and NCR (who are still there
+# as of early 1995) are at:
+#
+#	Boundless Technologies
+#	100 Marcus Boulevard
+#	Hauppauge, NY 11788-3762
+#	Vox: (800)-231-5445
+#	Fax: (516)-342-7378
+#	Web: http://boundless.com
+#
+# Their voice mail used to describe the place as "SunRiver (formerly ADDS)". 
+# In 1995 Boundless acquired DEC's terminals business.  
+#
+
+# Regent: lowest common denominator, works on all regents.
+# (regent: renamed ":bc:" to ":le:" -- esr)
+regent|Adds Regent Series:\
+	:am:bs:\
+	:co#80:li#24:\
+	:bl=^G:cl=^L:cr=^M:do=^J:ho=\EY  :le=^U:ll=^A:nd=^F:sf=^J:\
+	:up=^Z:
+# Regent 100 has a bug where if computer sends escape when user is holding
+# down shift key it gets confused, so we avoid escape.
+regent100|Adds Regent 100:\
+	:sg#1:\
+	:bl=^G:cm=\013%+ %B\020%.:k0=^B1\r:k1=^B2\r:k2=^B3\r:\
+	:k3=^B4\r:k4=^B5\r:k5=^B6\r:k6=^B7\r:k7=^B8\r:l0=F1:l1=F2:\
+	:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:me=\E0@:se=\E0@:so=\E0P:\
+	:ue=\E0@:us=\E0`:\
+	:tc=regent:
+regent20|Adds Regent 20:\
+	:bl=^G:cd=\Ek:ce=\EK:cm=\EY%+ %+ :tc=regent:
+regent25|Adds Regent 25:\
+	:bl=^G:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:tc=regent20:
+regent40|Adds Regent 40:\
+	:sg#1:\
+	:al=\EM:bl=^G:dl=\El:k0=^B1\r:k1=^B2\r:k2=^B3\r:k3=^B4\r:\
+	:k4=^B5\r:k5=^B6\r:k6=^B7\r:k7=^B8\r:l0=F1:l1=F2:l2=F3:\
+	:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:me=\E0@:se=\E0@:so=\E0P:\
+	:ue=\E0@:us=\E0`:\
+	:tc=regent25:
+regent40+|Adds Regent 40+:\
+	:is=\EB:tc=regent40:
+regent60|regent200|Adds Regent 60:\
+	:dc=\EE:ei=\EF:im=\EF:is=\EV\EB:kD=\EE:kI=\EF:kM=\EF:\
+	:se=\ER\E0@\EV:so=\ER\E0P\EV:\
+	:tc=regent40+:
+# From: <edward@onyx.berkeley.edu> Thu Jul  9 09:27:33 1981
+# (viewpoint: added :kr:, function key, and :dl: capabilities -- esr)
+viewpoint|addsviewpoint|adds viewpoint:\
+	:am:bs:\
+	:co#80:li#24:\
+	:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:dl=\El:do=^J:\
+	:is=\017\E0`:k0=^B1:k2=^B2:k3=^B\041:k4=^B":k5=^B#:kd=^J:\
+	:kh=^A:kl=^U:kr=^F:ku=^Z:le=^H:ll=^A:me=^O:nd=^F:se=^O:sf=^J:\
+	:so=^N:ue=^O:up=^Z:us=^N:ve=\017\E0`:vs=\017\E0P:
+# Some viewpoints have bad ROMs that foo up on ^O
+screwpoint|adds viewpoint with ^O bug:\
+	:se@:so@:ue@:us@:vs@:tc=viewpoint:
+
+# From: Jay S. Rouman <jsr@dexter.mi.org> 5 Jul 92
+# The :vi:/:ve:/:sa:/:me: strings were added by ESR from specs.  
+# Theory; the vp3a+ wants \E0%c to set highlights, where normal=01000000,
+# underline=01100000, rev=01010000, blink=01000010,dim=01000001,
+# invis=01000100 and %c is the logical or of desired attributes.
+# There is also a `tag bit' enabling attributes, set by \E) and unset by \E(.
+vp3a+|viewpoint3a+|adds viewpoint 3a+:\
+	:am:bw:\
+	:co#80:it#8:li#24:\
+	:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:kb=^H:\
+	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:me=\E(:nd=^L:nw=^M^J:\
+	:..sa=\E0%{64}%?%p1%tQ%|%;%?%p2%t%{96}%|%;%?%p3%tP%|%;%?%p4%t%{2}%|%;%?%p5%t%{1}%|%;%?%p7%tD%|%;%c\E):\
+	:se=\E(:sf=^J:so=\E0Q\E):ta=^I:up=^K:ve=^X:vi=^W:
+vp60|viewpoint60|addsvp60|adds viewpoint60:\
+	:tc=regent40:
+#
+# adds viewpoint 90 - from cornell
+# Note:  emacs sends ei occasionally to insure the terminal is out of
+#        insert mode. This unfortunately puts the viewpoint90 IN insert
+#        mode.  A hack to get around this is :ic=\EF\s\EF^U:.  (Also,
+#   -    :ei=:im=: must be present in the termcap translation.)
+#   -    :xs: indicates glitch that attributes stick to location
+#   -    :ms: means it's safe to move in standout mode
+#   -    :cl=\EG\Ek:: clears screen and visual attributes without affecting
+#               the status line
+# Function key and label capabilities merged in from SCO.
+vp90|viewpoint90|adds viewpoint 90:\
+	:bs:bw:ms:xs:\
+	:co#80:li#24:\
+	:cd=\Ek:ce=\EK:cl=\EG\Ek:cm=\EY%+ %+ :dc=\EE:dl=\El:do=^J:\
+	:ei=:ho=\EY  :ic=\EF \EF\025:im=:k0=^B1\r:k1=^B2\r:\
+	:k2=^B3\r:k3=^B4\r:k4=^B5\r:k5=^B6\r:k6=^B7\r:k7=^B8\r:\
+	:k8=^B9\r:k9=^B\072\r:k;=^B;\r:kb=^H:kd=^J:kh=^A:kl=^U:\
+	:kr=^F:ku=^Z:l0=F1:l1=F2:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:\
+	:l8=F9:l9=F10:la=F11:le=^H:ll=^A:me=\ER\E0@\EV:nd=^F:\
+	:se=\ER\E0@\EV:sf=^J:so=\ER\E0Q\EV:ta=^I:ue=\ER\E0@\EV:\
+	:up=^Z:us=\ER\E0`\EV:
+# Note: if return acts weird on a980, check internal switch #2
+# on the top chip on the CONTROL pc board.
+adds980|a980|adds consul 980:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\E\016:bl=^G:cl=\014\013@:cm=\013%+@\E\005%2:cr=^M:\
+	:dl=\E\017:do=^J:k0=\E0:k1=\E1:k2=\E2:k3=\E3:k4=\E4:k5=\E5:\
+	:k6=\E6:k7=\E7:k8=\E8:k9=\E9:le=^H:me=^O:nd=\E^E01:se=^O:\
+	:sf=^J:so=^Y^^^N:
+
+# Beehive documentation is undated and marked Preliminary and has no figures
+# so we must have early Superbee2 (Model 600, according to phone conversation
+# with mfr.). It has proved reliable except for some missing padding
+# (notably after \EK and <nl> at bottom of screen).
+# 
+# The key idea is that AEP mode is poison for :cm: & that US's in 
+# the local memory should be avoided like the plague. That means 
+# that the 2048 character local buffer is used as 25 lines of 80 
+# characters, period. No scrolling local memory, folks. It also 
+# appears that we cannot use naked INS LINE feature since it uses
+# US. The sbi fakes :al: with an 80-space insert that may be too 
+# slow at low speeds; also spaces get converted to \040 which is 
+# too long for some programs (not vi).  DEL LINE is ok but slow.
+# 
+# The <nl> string is designed for last line of screen ONLY; cup to 
+# 25th line corrects the motion inherent in scrolling to Page 1.
+# 
+# There is one understood bug. It is that the screen appears to
+# pop to a new (blank) page after a :nw:, or leave a half-line 
+# ellipsis to a quad that is the extra 48 memory locations. The 
+# data received is dumped into memory but not displayed.  Not to 
+# worry if :cm: is being used; the lines not displayed will be, 
+# whenever the cursor is moved up there. Since :cm: is addressed 
+# relative to MEMORY of window, nothing is lost; but beware of 
+# relative cursor motion (:up:,:do:,:nd:,:le:). Recommended,
+# therefore, is setenv MORE -c .
+# 
+# WARNING: Not all features tested.
+# 
+# Timings are assembled from 3 sources. Some timings may reflect 
+# SB2/Model 300 that were used if more conservative.
+# Tested on a Model 600 at 1200 and 9600 bd.
+# 
+# The BACKSPACEkb option is cute. The NEWLINE key, so cleverly 
+# placed on the keyboard and useless because of AEP, is made 
+# into a backspace key. In use ESC must be pressed twice (to send)
+# and sending ^C must be prefixed by ESC to avoid that weird 
+# transmit mode associated with ENTER key.
+# 
+# IF TERMINAL EVER GOES CATATONIC with the cursor buzzing across 
+# the screen, then it has dropped into ENTER mode; hit 
+# RESET--ONLINE--!tset.
+# 
+# As delivered this machine has a FATAL feature that will throw 
+# it into that strange transmit state (SPOW) if the space bar is 
+# hit after a CR is received, but before receiving a LF (or a 
+# few others).
+# 
+# The circuits MUST be modified to eliminate the SPOW latch. 
+# This is done by strapping on chip A46 of the I/O board; cut 
+# the p.c. connection to Pin 5 and strap Pin 5 to Pin 8 of that 
+# chip. This mod has been checked out on a Mod 600 of Superbee II.
+# With this modification absurdly high timings on cr are 
+# unnecessary.
+# 
+# NOTE WELL that the rear panel switch should be set to CR/LF, 
+# not AEP!
+#
+sb1|beehive superbee:\
+	:am:bs:bw:da:db:mi:ul:xb:\
+	:co#80:li#25:sg#1:\
+	:al=\EN\EL\EQ                                                                                \EP \EO\ER\EA:\
+	:bl=^G:bt=\E`:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EF%r%03%03:cr=\r:\
+	:ct=\E3:dc=\EP:dl=\EM:do=^J:ei=\ER:ho=\EH:im=\EQ\EO:\
+	:is=\EE\EX\EZ\EO\Eb\Eg\ER:k0=\E2:k1=\Ep:k2=\Eq:k3=\Er:\
+	:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:k9=\E1:kE=\EK:kI=\EQ\EO:\
+	:kL=\EM:kM=\ER:kS=\EJ:kb=^_:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
+	:ku=\EA:l0=TAB CLEAR:l9=TAB SET:le=^H:me=\E_3:nd=\EC:\
+	:se=\E_3:sf=^J:so=\E_1:st=\E1:ta=^I:te=:ti=\EO:ue=\E_3:\
+	:up=\EA:us=\E_0:
+sbi|superbee|beehive superbee at Indiana U.:\
+	:xb:\
+	:al=1\EN\EL\EQ \EP \EO\ER\EA:cr=\r:tc=sb1:
+# Alternate (older) description of Superbee - f1=escape, f2=^C.
+# Note: there are at least 3 kinds of superbees in the world.  The sb1
+# holds onto escapes and botches ^C's.  The sb2 is the best of the 3.
+# The sb3 puts garbage on the bottom of the screen when you scroll with
+# the switch in the back set to CRLF instead of AEP.  This description
+# is tested on the sb2 but should work on all with either switch setting.
+# The f1/f2 business is for the sb1 and the :xb: can be taken out for
+# the other two if you want to try to hit that tiny escape key.
+# This description is tricky: being able to use cup depends on there being
+# 2048 bytes of memory and the hairy <nl> string.
+superbee-xsb|beehive super bee:\
+	:am:da:db:xb:\
+	:co#80:it#8:li#25:\
+	:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EF%r%3%3:cr=\r:ct=\E3:dc=\EP:\
+	:dl=\EM:do=^J:ho=\EH:is=\EH\EJ:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:\
+	:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
+	:ku=\EA:le=^H:me=\E_3:nd=\EC:se=\E_3:\
+	:sf=\n\0\0\0\n\0\0\0\EA\EK\0\0\0\ET\ET:so=\E_1:st=\E1:\
+	:ta=^I:up=\EA:ve=^J:
+# This loses on lines > 80 chars long, use at your own risk
+superbeeic|super bee with insert char:\
+	:ei=\ER:ic=:im=\EQ:tc=superbee-xsb:
+sb2|sb3|fixed superbee:\
+	:xb@:tc=superbee:
+
+####  Beehive Medical Electronics
+#
+# Steve Seymour <srseymour@mindspring.com> writes (Wed, 03 Feb 1999):
+# Regarding your question though; Beehive terminals weren't made by Harris.
+# They were made by Beehive Medical Electronics in Utah. They went out of
+# business in the early '80s.
+#
+# (OK, then, I don't know why a couple of these say "harris beehive".)
+#
+
+# Reports are that most of these Beehive entries (except superbee) have not
+# been tested and do not work right.  :se: is a trouble spot.  Be warned.
+
+# (bee: :ic: was empty, which is obviously bogus -- esr)
+beehive|bee|harris beehive:\
+	:am:bs:mi:\
+	:co#80:li#24:\
+	:al=\EL:bt=\E>:cd=\EJ:ce=\EK:cl=\EE:cm=\EF%+ %+ :dc=\EP:\
+	:dl=\EM:do=\EB:ei=\E@:ho=\EH:im=\EQ:kA=\EL:kB=\E>:kC=\EE:\
+	:kD=\EP:kE=\EK:kI=\EQ:kL=\EM:kM=\E@:kb=^H:kd=\EB:kh=\EH:\
+	:kl=\ED:kr=\EC:ku=\EA:le=^H:me=\Ed@:nd=\EC:se=\Ed@:so=\EdP:\
+	:ue=\Ed@:up=\EA:us=\Ed`:
+# set tab is ^F, clear (one) tab is ^V, no way to clear all tabs.
+# good grief - does this entry make :sg:/:ug: when it doesn't have to?
+# look at those spaces in :se:/:so:.  Seems strange to me...
+# (beehive: :if=/usr/share/tabset/beehive: removed, no such file.  If you
+# really care, cook up one using ^F -- esr)
+beehive3|bh3m|beehiveIIIm|harris beehive 3m:\
+	:am:bs:\
+	:co#80:it#8:li#20:\
+	:al=\023:bl=^G:cd=^R:ce=^P:cl=^E^R:cr=^M:dl=\021:do=^J:ho=^E:\
+	:le=^H:ll=^E^K:nd=^L:se= ^_:sf=^J:so=^] :st=^F:ta=^I:up=^K:
+beehive4|bh4|beehive 4:\
+	:am:\
+	:co#80:li#24:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cr=^M:do=^J:ho=\EH:le=\ED:nd=\EC:\
+	:sf=^J:up=\EA:
+# There was an early Australian kit-built computer called a "Microbee".
+# It's not clear whether this is for one of those or for a relative
+# of the Beehive.
+microb|microbee|micro bee series:\
+	:am:bs:\
+	:co#80:it#8:li#24:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cm=\EF%+ %+ :cr=^M:do=^J:k1=\Ep:\
+	:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:k9=\Ex:\
+	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:me=\Ed@:nd=\EC:\
+	:se=\Ed@:sf=^J:so= \EdP:ta=^I:ue=\Ed@:up=\EA:us=\Ed`:
+
+#### C. Itoh Electronics
+#
+# As of 1995 these people no longer make terminals (they're still in the
+# printer business).  Their terminals were all clones of the DEC VT series.
+# They're located in Orange County, CA.
+#
+
+# CIT 80  - vt-52 emulator, the termcap has been modified to remove
+#           the delay times and do an auto tab set rather than the indirect
+#           file used in vt100.
+cit80|cit-80|citoh 80:\
+	:am:bs:\
+	:co#80:li#24:\
+	:cd=\EJ:ce=\EK:cl=\E[H\EJ:cm=\E[%i%2;%2H:cr=^M:ff=^L:\
+	:is=\E>:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:nd=\E[C:sf=^J:up=\E[A:
+# From: Tim Wood <mtxinu!sybase!tim> Fri Sep 27 09:39:12 PDT 1985
+# (cit101: added <rmam>/<smam> based on init string, merged this with c101 -- esr)
+cit101|citc|C.itoh fast vt100:\
+	:am:bs:xn:\
+	:co#80:li#24:\
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=:ic=\E[@:\
+	:im=:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[3g\E[>5g:\
+	:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:\
+	:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[V\E8:vs=\E7\E[U:
+# CIE Terminals CIT-101e from Geoff Kuenning <callan!geoff> via BRL
+# The following termcap entry was created from the Callan cd100 entry.  The
+# last two lines (with the capabilities in caps) are used by RM-cobol to allow
+# full selection of combinations of reverse video, underline, and blink.
+# (cit101e: removed unknown :f0=\EOp:f1=\EOq:f2=\EOr:f3=\EOs:f4=\EOt:f5=\EOu:\
+# f6=\EOv:f7=\EOw:f8=\EOx:f9=\EOy:AB=\E[0;5m:AL=\E[m:AR=\E[0;7m:AS=\E[0;5;7m:\
+# :NB=\E[0;1;5m:NM=\E[0;1m:NR=\E[0;1;7m:NS=\E[0;1;5;7m: -- esr)
+cit101e|C. Itoh CIT-101e:\
+	:am:bs:mi:ms:pt:\
+	:co#80:it#8:li#24:\
+	:ac=:ae=^O:al=\E[L:as=^N:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%2;%2H:cs=\E[%i%2;%2r:dc=\E[P:dl=\E[M:do=\E[B:\
+	:ei=\E[4l:if=/usr/share/tabset/vt100:im=\E[4h:k0=\EOT:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOm:k6=\EOl:k7=\EOM:\
+	:k8=\EOn:kd=\E[B:ke=\E>:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:\
+	:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:so=\E[7m:sr=\EM:ue=\E[m:\
+	:up=\E[A:us=\E[4m:ve=:vs=\E[?1l\E[?4l\E[?7h:
+# From: David S. Lawyer, June 1997:
+# The CIT 101-e was made in Japan in 1983-4 and imported by CIE
+# Terminals in Irvine, CA.  It was part of CITOH Electronics.  In the
+# late 1980's CIT Terminals went out of business.
+# There is no need to use the initialization string is=... (by invoking
+# tset or setterm etc.) provided that the terminal has been manually set
+# up (and the setup saved with ^S) to be compatible with this termcap.  To be
+# compatible it should be in ANSI mode (not VT52).   A set-up that
+# works is to set all the manually setable stuff to factory defaults
+# by pressing ^D in set-up mode.  Then increse the brighness with the
+# up-arrow key since the factory default will likely be dim on an old
+# terminal.  Then change any options you want (provided that they are
+# compatible with the termcap).  For my terminal I set: Screen
+# Background: light; Keyclicks: silent; Auto wraparound: on; CRT saver:
+# on.  I also set up mine for parity (but you may not need it).  Then 
+# save the setup with ^S.
+# (cit101e-rv: added empty :te: to suppress a tic warning. --esr)
+cit101e-rv|Citoh CIT-101e (sets reverse video):\
+	:am:eo:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%dG:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:ic=\E[@:\
+	:im=\E[4h:\
+	:is=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E(B\E[m\E[20l\E[1;24r\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=\177:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nl=\EM:nw=\EE:r1=\Ec\E[?7h\E[>5g:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:te=:\
+	:ti=\E[>5g\E[?7h\E[?5h:u6=\E[%i%d;%dR:u7=\E[6n:\
+	:u8=\E[?6c:u9=\E[c:ue=\E[m:up=\E[A:us=\E[4m:\
+	:vb=200\E[?5l\E[?5h:ve=\E[0;3;4v:vi=\E[1v:vs=\E[3;5v:
+cit101e-n|CIT-101e w/o am:\
+	:am@:\
+	:kb=^H:kd=^J:kl=^H:vs=\E[?1l\E[?4l\E[?7l:tc=cit101e:
+cit101e-132|CIT-101e with 132 cols:\
+	:co#132:\
+	:kb=^H:kd=^J:kl=^H:tc=cit101e:
+cit101e-n132|CIT-101e with 132 cols w/o am:\
+	:am@:\
+	:co#132:\
+	:kb=^H:kd=^J:kl=^H:vs=\E[?1l\E[?4l\E[?7l:tc=cit101e:
+# CIE Terminals CIT-500 from BRL
+# The following SET-UP modes are assumed for normal operation:
+#	GENERATE_XON/XOFF:YES	DUPLEX:FULL		NEWLINE:OFF
+#	AUTOWRAP:ON		MODE:ANSI		SCREEN_LENGTH:64_LINES
+#	DSPLY_CNTRL_CODES?NO	PAGE_WIDTH:80		EDIT_MODE:OFF
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements.
+# Hardware tabs are assumed to be set every 8 columns; they can be set up
+# by the "reset", "tset", or "tabs" utilities.  No delays are specified; use
+# "stty ixon -ixany" to enable DC3/DC1 flow control!
+# (cit500: I added <rmam>/<smam> based on the init string -- esr)
+cit500|CIE Terminals CIT-500:\
+	:bs:mi:ms:pt:xo:\
+	:co#80:it#8:kn#10:li#64:vt#3:\
+	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RA=\E[?7l:\
+	:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:ac=:ae=^O:al=\E[L:as=^N:\
+	:bl=^G:bt=\E[Z:cd=\EJ:ce=\EK:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ei=\E[4l:ho=\E[H:im=\E[4h:is=\E<\E)0:k0=\EOP:k1=\EOQ:\
+	:k2=\EOR:k3=\EOS:k4=\EOU:k5=\EOV:k6=\EOW:k7=\EOX:k8=\EOY:\
+	:k9=\EOZ:kA=\E[L:kB=\E[Z:kD=\E[P:kE=\EK:kI=\E[4h:kL=\E[M:\
+	:kM=\E[4l:kS=\EJ:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\E[H:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l0=PF1:l1=PF2:l2=PF3:\
+	:l3=PF4:l4=F15:l5=F16:l6=F17:l7=F18:l8=F19:l9=F20:le=^H:\
+	:ll=\E[64H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:\
+	:r1=\E<\E2\E[20l\E[?6l\E[r\E[m\E[q\E(B\017\E)0\E>:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\EM:us=\E[4m:
+
+# C. Itoh printers begin here
+citoh|ci8510|8510|c.itoh 8510a:\
+	:co#80:it#8:\
+	:is=\E(009\054017\054025\054033\054041\054049\054057\054065\054073.:\
+	:le@:md=\E\041:me=\E"\EY:rp=\ER%r%03%.:sr=\Er:ue=\EY:\
+	:us=\EX:\
+	:tc=lpr:
+citoh-pica|citoh in pica:\
+	:i1=\EN:tc=citoh:
+citoh-elite|citoh in elite:\
+	:co#96:\
+	:i1=\EE:\
+	:is=\E(009\054017\054025\054033\054041\054049\054057\054065\054073\054081\054089.:tc=citoh:
+citoh-comp|citoh in compressed:\
+	:co#136:\
+	:i1=\EQ:\
+	:is=\E(009\054017\054025\054033\054041\054049\054057\054065\054073\054081\054089\054097\054105\054113\054121\054129.:tc=citoh:
+# citoh has infinite cols because we don't want lp ever inserting \n\t**.
+citoh-prop|citoh-ps|ips|citoh in proportional spacing mode:\
+	:co#32767:\
+	:i1=\EP:tc=citoh:
+citoh-6lpi|citoh in 6 lines per inch mode:\
+	:i2=\EA:tc=citoh:
+citoh-8lpi|citoh in 8 lines per inch mode:\
+	:li#88:\
+	:i2=\EB:tc=citoh:
+
+#### Control Data (cdc)
+#
+
+cdc456|cdc 456 terminal:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\EL:bl=^G:cd=^X:ce=^V:cl=^Y^X:cm=\E1%+ %+ :cr=^M:dl=\EJ:\
+	:do=^J:ho=^Y:le=^H:nd=^L:sf=^J:up=^Z:
+
+# Assorted CDC terminals from BRL (improvements by DAG & Ferd Brundick)
+cdc721|CDC Viking:\
+	:am:bs:\
+	:co#80:li#24:\
+	:ce=^K:cl=^L:cm=\002%r%+ %+ :ho=^Y:kd=^J:kh=^Y:kl=^H:kr=^I:\
+	:ku=^W:nd=^X:up=^W:
+cdc721ll|CDC Vikingll:\
+	:am:bs:\
+	:co#132:li#24:\
+	:ce=^K:cl=^L:cm=\002%r%+ %+ :ho=^Y:kd=^J:kh=^Y:kl=^H:kr=^I:\
+	:ku=^W:nd=^X:up=^W:
+# (cdc752: the BRL entry had :ll=\E1  ^Z: commented out
+cdc752|CDC 752:\
+	:am:bs:bw:xs:\
+	:co#80:li#24:\
+	:bl=^G:ce=^V:cl=\030\E1  :cm=\E1%r%+ %+ :cr=^M:do=^J:\
+	:ho=\E1  :le=^H:ll=^Y:nd=^U:r1=\E1  \030\002\003\017:\
+	:sf=^J:up=^Z:
+# CDC 756
+# The following switch/key settings are assumed for normal operation:
+#	96 chars	SCROLL		FULL duplex	not BLOCK
+# Other switches may be set according to communication requirements.
+# Insert/delete-character cannot be used, as the whole display is affected.
+# "so" & "se" are commented out until jove handles "sg" correctly.
+cdc756|CDC 756:\
+	:am:bs:bw:\
+	:co#80:kn#10:li#24:\
+	:al=6*\EL:bl=^G:cd=^X:ce=^V:cl=^Y^X:cm=\E1%r%+ %+ :cr=^M:\
+	:dl=6*\EJ:do=^J:ho=^Y:k0=\EA:k1=\EB:k2=\EC:k3=\ED:k4=\EE:\
+	:k5=\EF:k6=\EG:k7=\EH:k8=\Ea:k9=\Eb:kA=\EL:kD=\EI:kE=^V:\
+	:kI=\EK:kL=\EL:kS=^X:kT=^O:kb=^H:kd=^J:kh=^Y:kl=^H:kr=^U:\
+	:ku=^Z:l0=F1:l1=F2:l2=F3:l3=F4:l4=F5:l5=F6:l6=F7:l7=F8:l8=F9:\
+	:l9=F10:le=^H:ll=^Y^Z:nd=^U:r1=\031\030\002\003\017:sf=^J:\
+	:up=^Z:
+#
+# CDC 721 from Robert Viduya, Ga. Tech. <ihnp4!gatech!gitpyr!robert> via BRL.
+#
+# Part of the long initialization string defines the "DOWN" key to the left
+# of the tab key to send an ESC.  The real ESC key is positioned way out 
+# in right field.
+#
+# The termcap won't work in 132 column mode due to the way it it moves the
+# cursor.  Termcap doesn't have the capability (as far as I could tell) to
+# handle the 721 in 132 column mode.
+#
+# (cdc721: changed :ri: to :sr: -- esr)
+cdc721-esc|Control Data 721:\
+	:am:bs:bw:ms:pt:xo:\
+	:co#80:it#8:kn#10:li#30:\
+	:al=^^R:bl=^G:bt=^^^K:cd=^^P:ce=^K:cl=^L:cm=\002%r%+ %+ :\
+	:ct=^^^RY:dc=^^N:dl=^^Q:do=^Z:ei=:ho=^Y:ic=^^O:im=:\
+	:is=\036\022B\003\036\035\017\022\025\035\036E\036\022H\036\022J\036\022L\036\022N\036\022P\036\022Q\036\022\036\022\136\036\022b\036\022i\036W =\036\022Z\036\011C1-` `\041k/o:\
+	:k0=^^q:k1=^^r:k2=^^s:k3=^^t:k4=^^u:k5=^^v:k6=^^w:k7=^^x:\
+	:k8=^^y:k9=^^z:kb=^H:kd=^Z:ke=^^^Rl:kh=^Y:kl=^H:kr=^X:\
+	:ks=^^^Rk:ku=^W:le=^H:ll=^B =:mb=^N:\
+	:me=\017\025\035\036E\036\022\:mh=^\:mk=^^^R[:mr=^^D:\
+	:nd=^X:se=^^E:sf=\036W =\036U:so=^^D:sr=\036W =\036V:\
+	:st=^^^RW:ue=^]:up=^W:us=^\:
+
+#### Getronics
+#
+# Getronics is a Dutch electronics company that at one time was called 
+# `Geveke' and made async terminals; but (according to the company itself!)
+# they've lost all their documentation on the command set.  The hardware
+# documentation suggests the terminals were actually manufactured by a
+# Taiwanese electronics company named Cal-Comp.  There are known
+# to have been at least two models, the 33 and the 50.
+#
+
+# The 50 seems to be a top end vt220 clone, with the addition of a higher
+# screen resolution, a larger screen, at least 1 page of memory above and
+# below the screen, apparently pages of memory right and left of the screen
+# which can be panned, and about 75 function keys (15 function keys x normal,
+# shift, control, func A, func B). It also has more setup possibilities than
+# the vt220. The monitor case is dated November 1978 and the keyboard case is
+# May 1982.
+#
+# The vt100 emulation works as is.  The entry below describes the rather
+# non-conformant (but more featureful) ANSI mode.
+#
+# From: Stephen Peterson <stv@utrecht.ow.nl>, 27 May 1995
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+visa50|geveke visa 50 terminal in ansi 80 character mode:\
+	:bw:mi:ms:\
+	:co#80:li#25:\
+	:AL=\E[%dL:DC=\E[%dX:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\E[f:K2=\EOP:K3=\EOQ:K4=\EOR:K5=\EOS:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=\E[3l:al=\E[L:as=\E3h:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[X:dl=\E[M:do=\E[B:\
+	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:\
+	:is=\E0;2m\E[1;25r\E[25;1H\E[?3l\E[?7h\E[?8h:k0=\E010:\
+	:k1=\E001:k2=\E002:k3=\E003:k4=\E004:k5=\E005:k6=\E006:\
+	:k7=\E007:k8=\E008:k9=\E009:kD=\177:kb=^H:kd=\E[A:ke=\E>:\
+	:kh=\E[f:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=\E[D:mb=\E[5m:\
+	:md=\E[1m:me=\E[0;2m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^M^J:\
+	:se=\E[0;2m:sf=^J:so=\E[2;7m:ta=^I:ue=\E[0m:up=\E[A:\
+	:us=\E[4m:vb=\E[?5h\E[?5l:
+
+#### Human Designed Systems (Concept)
+#
+#	Human Designed Systems
+#	400 Fehley Drive
+#	King of Prussia, PA 19406
+#	Vox: (610)-277-8300
+#	Fax: (610)-275-5739
+#	Net: support@hds.com
+# 
+# John Martin <john@hds.com> is their termcap expert.  They're mostly out of
+# the character-terminal business now (1995) and making X terminals.  In
+# particular, the whole `Concept' line described here was discontinued long
+# ago.
+#
+
+# From: <vax135!hpk>  Sat Jun 27 07:41:20 1981
+# Extensive changes to c108 by arpavax:eric Feb 1982
+# Some unknown person at SCO then translated it to terminfo.
+#
+# There seem to be a number of different versions of the C108 PROMS
+# (with bug fixes in its Z-80 program).
+# 
+# The first one that we had would lock out the keyboard of you
+# sent lots of short lines (like /usr/dict/words) at 9600 baud.
+# Try that on your C108 and see if it sends a ^S when you type it.
+# If so, you have an old version of the PROMs.
+# 
+# You should configure the C108 to send ^S/^Q before running this.
+# It is much faster (at 9600 baud) than the c100 because the delays
+# are not fixed.
+# new status line display entries for c108-8p:
+# :i3: - init str #3 - setup term for status display - 
+# set programmer mode, select window 2, define window at last 
+# line of memory, set bkgnd stat mesg there, select window 0.
+# 
+# :ts: - to status line - select window 2, home cursor, erase to 
+# end-of-window, 1/2 bright on, goto(line#0, col#?)
+# 
+# :fs: - from status line - 1/2 bright off, select window 0
+# 
+# :ds: - disable status display - set bkgnd status mesg with 
+# illegal window #
+# 
+# There are probably more function keys that should be added but 
+# I don't know what they are.
+#
+# No delays needed on c108 because of ^S/^Q handshaking
+#
+c108|concept108|c108-8p|concept108-8p|concept 108 w/8 pages:\
+	:i2=\EU\E z"\Ev\001\177 \041p\E ;"\E z \Ev  \001\177p\Ep\n:\
+	:te=\Ev  \001\177p\Ep\r\n:\
+	:tc=c108-4p:
+c108-4p|concept108-4p|concept 108 w/4 pages:\
+	:bs:es:hs:xo:\
+	:pb@:\
+	:ac=jEkTl\mMqLxU:ae=\Ej :as=\Ej\041:\
+	:..cm=\Ea%p1%?%p1%{95}%>%t\001%{96}%-%;%{32}%+%c%p2%?%p2%{95}%>%t\001%{96}%-%;%{32}%+%c:\
+	:cr=^M:dc=\E 1:ds=\E ;\177:fs=\Ee\E z :i1=\EK\E\041\E F:\
+	:i2=\EU\E z"\Ev\177 \041p\E ;"\E z \Ev  \001 p\Ep\n:\
+	:sf=^J:te=\Ev  \001 p\Ep\r\n:ti=\EU\Ev  8p\Ep\r\E\025:\
+	:ts=\E z"\E?\E\005\EE\Ea %+ :ve=\Ew:vs=\EW:\
+	:tc=c100:
+c108-rv|c108-rv-8p|concept 108 w/8 pages in reverse video:\
+	:te=\Ev  \002 p\Ep\r\n:ti=\EU\Ev  8p\Ep\r:\
+	:tc=c108-rv-4p:
+c108-rv-4p|concept108rv4p|concept 108 w/4 pages in reverse video:\
+	:i1=\Ek:se=\Ee:so=\EE:vb=\EK\Ek:\
+	:tc=c108-4p:
+c108-w|c108-w-8p|concept108-w-8|concept108-w8p|concept 108 w/8 pages in wide mode:\
+	:co#132:\
+	:i1=\E F\E":te=\Ev  ^A0\001D\Ep\r\n:\
+	:ti=\EU\Ev  8\001D\Ep\r:tc=c108-8p:
+
+# Concept 100:
+# These have only window relative cursor addressing, not screen 
+# relative. To get it to work right here, smcup/rmcup (which 
+# were invented for the concept) lock you into a one page 
+# window for screen style programs.
+# 
+# To get out of the one page window, we use a clever trick:
+# we set the window size to zero ("\Ev    " in rmcup) which the 
+# terminal recognizes as an error and resets the window to all 
+# of memory.
+# 
+# This trick works on c100 but does not on c108, sigh.
+# 
+# Some tty drivers use cr3 for concept, others use nl3, hence 
+# the delays on cr and ind below. This padding is only needed at 
+# 9600 baud and up.  One or the other is commented out depending on 
+# local conventions.
+# 
+# 2 ms padding on :te: isn't always enough. 6 works fine. Maybe 
+# less than 6 but more than 2 will work.
+# 
+# Note: can't use function keys f7-f10 because they are 
+# indistinguishable from arrow keys (!), also, del char and 
+# clear eol use xon/xoff so they probably won't work very well.
+# 
+# Also note that we don't define insrt/del char/delline/eop/send 
+# because they don't transmit unless we reset them - I figured 
+# it was a bad idea to clobber their definitions.
+# 
+# The <mc5> sequence changes the escape character to ^^ so that 
+# escapes will be passed through to the printer. Only trouble 
+# is that ^^ won't be - ^^ was chosen to be unlikely. 
+# Unfortunately, if you're sending raster bits through to be 
+# plotted, any character you choose will be likely, so we lose.
+#
+# \EQ"\EY(^W (send anything from printer to host, for xon/xoff) 
+# cannot be # in is2 because it will hang a c100 with no printer 
+# if sent twice.
+c100|concept100|concept|c104|c100-4p|hds concept 100:\
+	:am:bs:eo:mi:ul:xn:\
+	:co#80:li#24:pb#9600:vt#8:\
+	:al=\E\022:bl=^G:cd=\E\005:ce=\E\025:cl=\E?\E\005:\
+	:cm=\Ea%+ %+ :cr=\r:dc=\E\021:dl=\E\002:do=^J:ei=\E  :\
+	:i1=\EK:i2=\Ev    \Ep\n:im=\E^P:ip=:\
+	:is=\EU\Ef\E7\E5\E8\El\ENH\E\0\Eo&\0\Eo'\E\Eo\041\0\E\007\041\E\010A@ \E4#\072"\E\072a\E4#;"\E\072b\E4#<"\E\072c:\
+	:k1=\E5:k2=\E6:k3=\E7:k4=\E8:k5=\E9:k6=\E\072a:k7=\E\072b:\
+	:k8=\E\072c:kA=\E^R:kB=\E':kD=\E^Q:kE=\E^S:kF=\E[:kI=\E^P:\
+	:kL=\E^B:kM=\E\0:kN=\E-:kP=\E.:kR=\E\:kS=\E^C:kT=\E]:kb=^H:\
+	:kd=\E<:ke=\Ex:kh=\E?:kl=\E>:kr=\E=:ks=\EX:kt=\E_:ku=\E;:\
+	:le=^H:mb=\EC:me=\EN@:mh=\EE:mk=\EH:mp=\EI:mr=\ED:nd=\E=:\
+	:pf=\036o \E\EQ\041\EYP\027:\
+	:po=\EQ"\EY(\027\EYD\Eo \036:rp=\Er%.%+ :se=\Ed:sf=^J:\
+	:so=\ED:ta=\011:te=\Ev    \Ep\r\n:\
+	:ti=\EU\Ev  8p\Ep\r\E\025:ue=\Eg:up=\E;:us=\EG:vb=\Ek\EK:
+c100-rv|c100-rv-4p|concept100-rv|c100 rev video:\
+	:i1=\Ek:se=\Ee:so=\EE:vb=\EK\Ek:ve@:vs@:tc=c100:
+oc100|oconcept|c100-1p|old 1 page concept 100:\
+	:in:\
+	:i3@:tc=c100:
+
+# From: Walter Skorski <walt@genetics1.JMP.TJU.EDU>, 16-oct-1996.
+# Lots of notes, originally inline, but ncurses doesn't grok that.
+#
+# am: 	not available in power on mode, but turned on with \E[=107;207h in
+#	is2=.  Also, \E=124l in is2= could have been used to prevent needing
+#	to specify xenl:, but that would have rendered the last space on the
+#	last line useless.
+# bw:	Not available in power on mode, but turned on with \E[=107;207h in
+#	is2=.
+# clear: Could be done with \E[2J alone, except that vi (and probably most
+#	other programs) assume that this also homes the cursor.
+# dsl:	Go to window 2, go to the beginning of the line, use a line feed to
+#	scroll the window, and go back to window 1.
+# is2:	the string may cause a warning to be issued by tic that it
+#	found a very long line and that it suspects that a comma is missing
+#	somewhere.  This warning can be ignored (unless it comes up more than
+#	once).  The initialization string contains the following commands:
+#
+#	 [Setup mode items changed from factory defaults:]
+#		\E)0			set alternate character set to
+#						graphics
+#		^O			set character set to default
+#	 [In case it wasn't]
+#		\E[m			turn off all attributes
+#	 [In case they weren't off]
+#		\E[=107;		cursor wrap and
+#			207h			character wrap on
+#		\E[90;3u		set Fkey definitions to "transmit"
+#						defaults
+#		\E[92;3u		set cursor key definitions to
+#						"transmit" defaults
+#		\E[43;1u		set shift F13 to transmit...
+#		\177\E$P\177
+#		\E[44;1u		set shift F14 to transmit...
+#			\177\E$Q\177
+#		\E[45;1u		set shift F15 to transmit...
+#			\177\E$R\177
+#		\E[46;1u		set shift F16 to transmit...
+#			\177\E$S\177
+#		\E[200;1u		set shift up to transmit...
+#			\177\E$A\177
+#		\E[201;1u		set shift down to transmit...
+#			\177\E$B\177
+#		\E[202;1u		set shift right to transmit...
+#			\177\E$C\177
+#		\E[203;1u		set shift left to transmit...
+#			\177\E$D\177
+#		\E[204;1u		set shift home to transmit...
+#			\177\E$H\177
+#		\E[212;1u		set backtab to transmit...
+#			\177\E$I\177
+#		\E[213;1u		set shift backspace to transmit...
+#			\177\E$^H\177
+#		\E[214;1u		set shift del to transmit...
+#			"\E$\177"
+#	 [Necessary items not mentioned in setup mode:]
+#		\E[2!w			move to window 2
+#		\E[25;25w		define window as line 25 of memory
+#		\E[!w			move to window 1
+#		\E[2*w			show current line of window 2 as
+#						status line
+#		\E[2+x			set meta key to use high bit
+#		\E[;3+}			move underline to bottom of character
+#
+#	All Fkeys are set to their default transmit definitions with \E[90;3u
+#	in is2=.  IMPORTANT:  to use this terminal definition, the "quit" stty
+#	setting MUST be redefined or deactivated, because the default is
+#	contained in almost all of this terminal's Fkey strings!  If for some
+#	reason "quit" cannot be altered, the Fkeys can, but it would be
+#	necessary to change ^| to ^] in all of these definitions, and add
+#	\E[2;029!t to is2.
+# lines: is set to 24 because this terminal refuses to treat the 25th
+#	line normally.
+# ll:	Not available in power on mode, but turned on with \E[=107;207h in
+#	is2=.
+# lm:	Pointless, given that this definition locks a single screen of
+#	memory into view, but what the hey...
+# rmso: Could use \E[1;7!{ to turn off only bold and reverse (leaving any
+#	other attributes alone), but some programs expect this to turn off
+#	everything.
+# rmul: Could use \E[4!{ to turn off only underline (leaving any other
+#	attributes alone), but some programs expect this to turn off
+#	everything.
+# sgr:	Attributes are set on this terminal with the string \E[ followed by
+#	a list of attribute code numbers (in decimal, separated by
+#	semicolons), followed by the character m.  The attribute code
+#	numbers are:
+#		  1 for bold;
+#		  2 for dim (which is ignored in power on mode);
+#		  4 for underline;
+#		  5 for blinking;
+#		  7 for inverse;
+#		  8 for not displayable; and
+#		=99 for protected (except that there are strange side
+#		effects to protected characters which make them inadvisable).
+#	 The mapping of terminfo parameters to attributes is as follows:
+#		%p1 (standout) = bold and inverse together;
+#		%p2 (underline) = underline;
+#		%p3 (reverse) = inverse;
+#		%p4 (blink) = blinking;
+#		%p5 (dim) is ignored;
+#		%p6 (bold) = bold;
+#		%p7 (invisible) = not displayable;
+#		%p8 (protected) is ignored; and
+#		%p9 (alt char set) = alt char set.
+#	 The code to do this is:
+#		\E[0		OUTPUT	\E[0
+#		%?%p1%p6%O	IF	(standout; bold) OR
+#		%t;1		THEN	OUTPUT	;1
+#		%;		ENDIF
+#		%?%p2		IF	underline
+#		%t;4		THEN	OUTPUT	;4
+#		%;		ENDIF
+#		%?%p4		IF	blink
+#		%t;5		THEN	OUTPUT	;5
+#		%;		ENDIF
+#		%?%p1%p3%O	IF	(standout; reverse) OR
+#		%t;7		THEN	OUTPUT	;7
+#		%;		ENDIF
+#		%?%p7		IF	invisible
+#		%t;8		THEN	OUTPUT	;8
+#		%;		ENDIF
+#		m		OUTPUT	m
+#		%?%p9		IF	altcharset
+#		%t^N		THEN	OUTPUT	^N
+#		%e^O		ELSE	OUTPUT	^O
+#		%;		ENDIF
+# sgr0: Everything is turned off (including alternate character set), since
+#	there is no way of knowing what it is that the program wants turned
+#	off.
+# smul: The "underline" attribute is reconfigurable to an overline or
+#	strikethru, or (as done with \E[;3+} in is2=), to a line at the true
+#	bottom of the character cell.  This was done to allow for more readable
+#	underlined characters, and to be able to distinguish between an
+#	underlined space, an underscore, and an underlined underscore.
+# xenl: Terminal can be configured to not need this, but this "glitch"
+#	behavior is actually preferable with autowrap terminals.
+#
+# Parameters kf31= thru kf53= actually contain the strings sent by the shifted
+# Fkeys.  There are no parameters for shifted Fkeys in terminfo.  The is2
+# string modifies the 'O' in kf43 to kf46 to a '$'.
+#
+# kcbt was originally ^I but redefined in is2=.
+# kHOM was \E[H originally but redefined in is2=, as were a number of
+# other keys.
+# kDC was originally \177 but redefined in is2=.
+#
+# kbs:	Shift was also ^H originally but redefined as \E$^H in is2=.
+# tsl:	Go to window 2, then do an hpa=.
+#
+#------- flash=\E[8;3!}^G\E[3;3!}
+#------- flash=\E[?5h$<100>\E[?5l
+# There are two ways to flash the screen, both of which have their drawbacks. 
+# The first is to set the bell mode to video, transmit a bell character, and
+# set the bell mode back - but to what?  There is no way of knowing what the
+# user's old bell setting was before we messed with it.  Worse, the command to
+# set the bell mode also sets the key click volume, and there is no way to say
+# "leave that alone", or to know what it's set to, either.
+# The second way to do a flash is to set the screen to inverse video, pad for a
+# tenth of a second, and set it back - but like before, there's no way to know
+# that the screen wasn't ALREADY in inverse video, or that the user may prefer
+# it that way.  The point is moot anyway, since vi (and probably other
+# programs) assume that by defining flash=, you want the computer to use it
+# INSTEAD of bel=, rather than as a secondary type of signal.
+#
+#------- cvvis=\E[+{
+# The is the power on setting, which is also as visible as the cursor
+# gets.
+#-------  wind=\E[%i%p1%d;%p2%d;%p3%{1}%+%d;%p4%{1}%+%dw
+# Windowing is possible, but not defined here because it is also used to
+# emulate status line functions.  Allowing a program to set a window could
+# clobber the status line or render it unusable.  There is additional memory,
+# but screen scroll functions are destructive and do not make use of it.
+#
+#-------   dim=			Not available in power on mode.
+# You have a choice of defining low intensity characters as "half bright" and
+# high intensity as "normal", or defining low as "normal" and high as "bold". 
+# No matter which you choose, only one of either "half bright" or "bold" is
+# available at any time, so taking the time to override the default is
+# pointless.
+#
+#-------  prot=\E[=0;99m
+# Not defined, because it appears to have some strange side effects.
+#------- pfkey=%?%p1%{24}%<%p1%{30}%>%p1%{54}%<%A%O%t\E[%p1%du\177%p2%s\177%;
+#------- pfloc=%?%p1%{24}%<%p1%{30}%>%p1%{54}%<%A%O%t\E[%p1%du\177%p2%s\177%;
+#-------   pfx=%?%p1%{24}%<%p1%{30}%>%p1%{54}%<%A%O%t\E[%p1%d;1u\177%p2%s\177%;
+#	 Available, but making them available to programs is inadvisable.
+#	 The code to do this is:
+#		%?%p1%{24}%<	IF	((key; 24) <;
+#		%p1%{30}%>		 ((key; 30) >;
+#		%p1%{54}%<		  (key; 54) <
+#		%A			 ) AND
+#		%O		  	) OR
+#	 [that is, "IF key < 24 OR (key > 30 AND key < 54)",]
+#		%t\E[		THEN	OUTPUT	\E[
+#		%p1%d			OUTPUT	(key) as decimal
+#	 [next line applies to pfx only]
+#		;1			OUTPUT	;1
+#		u			OUTPUT	u
+#		\177			OUTPUT	\177
+#		%p2%s			OUTPUT	(string) as string
+#		\177			OUTPUT	\177
+#	 [DEL chosen as delimiter, but could be any character]
+#	 [implied:		ELSE	do nothing]
+#		%;		ENDIF
+#	
+#-------   rs2=
+# Not defined since anything it might do could be done faster and easier with
+# either Meta-Shift-Reset or the main power switch.
+#
+#-------  smkx=\E[1!z
+#-------  rmkx=\E[!z
+# These sequences apply to the cursor and setup keys only, not to the
+# numeric keypad.  But it doesn't matter anyway, since making these
+# available to programs is inadvisable.
+# For the key definitions below, all sequences beginning with \E$ are
+# custom and programmed into the terminal via is2.  \E$ also has no
+# meaning to any other terminal.
+#
+#------- cmdch=\E[;%p1%d!t
+# Available, but making it available to programs is inadvisable.
+#------- smxon=\E[1*q
+# Available, but making it available to programs is inadvisable.
+# Terminal will send XON/XOFF on buffer overflow.
+#------- rmxon=\E[*q
+# Available, but making it available to programs is inadvisable.
+# Terminal will not notify on buffer overflow.
+#-------   smm=\E[2+x
+#-------   rmm=\E[+x
+# Available, but making them available to programs is inadvisable.
+#
+# Printing:
+#	 It's not made clear in the manuals, but based on other ansi/vt type
+#	 terminals, it's a good guess that this terminal is capable of both
+#	 "transparent print" (which doesn't copy data to the screen, and
+#	 therefore needs mc5i: specified to say so) and "auxilliary print"
+#	 (which does duplicate printed data on the screen, in which case mc4=
+#	 and mc5= should use the \E[?4i and \E[?5i strings instead).
+#
+# (esr: I have commented out is2 in order to avoid overflowing termcap's
+# 1024-byte limit.)
+
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+hds200|Human Designed Systems HDS200:\
+	:am:bw:es:hs:km:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:lm#0:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:\
+	:ds=\E[2\041w\r\n\E[\041w:ei=\E[4l:fs=\E[\041w:ho=\E[H:\
+	:im=\E[4h:k1=^\001\r:k2=^\002\r:k3=^\003\r:k4=^\004\r:\
+	:k5=^\005\r:k6=^\006\r:k7=^\007\r:k8=^\008\r:k9=^\009\r:\
+	:kD=\177:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:ll=\E[H\E[A:mb=\E[0;5m:\
+	:md=\E[0;1m:me=\E[m\017:mr=\E[0;7m:nd=\E[C:nw=\E[E:rc=\E8:\
+	:sc=\E7:se=\E[m\017:sf=\ED:so=\E[0;1;7m:sr=\EM:st=\EH:\
+	:ta=^I:ts=\E[2\041w\E[%i%p1%dG:ue=\E[m\017:up=\E[A:\
+	:us=\E[0;4m:ve=\E[+{:vi=\E[6+{:
+
+# :ta: through :ce: included to specify padding needed in raw mode.
+# (avt-ns: added empty <acsc> to suppress a tic warning --esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+avt-ns|concept avt no status line:\
+	:am:bs:eo:mi:ul:xn:xo:\
+	:co#80:it#8:li#24:lm#192:\
+	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=\016:al=\E[L:as=\017:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[2g:dc=\E[P:dl=\E[M:do=^J:ei=\E4l:\
+	:ho=\E[H:i1=\E[=103l\E[=205l:ic=\E[@:im=\E1:ip=:\
+	:is=\E[1*q\E[2\041t\E[7\041t\E[=4;101;119;122l\E[=107;118;207h\E)1\E[1Q\EW\E[\041y\E[\041z\E>\E[0\0720\07232\041r\E[0*w\E[w\E2\r\n\E[2;27\041t:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kD=\E^B\r:kI=\E^A\r:kb=^H:\
+	:kd=\E[B:ke=\E[\041z\E[0;2u:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\E[1\041z\E[0;3u:ku=\E[A:le=^H:ll=\E[24H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mh=\E[1\041{:mr=\E[7m:nd=\E[C:rc=\E8:\
+	:sc=\E7:se=\E[7\041{:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=\011:\
+	:te=\E[w\E2\r\n:ti=\E[=4l\E[1;24w\E2\r:ue=\E[4\041{:\
+	:up=\E[A:us=\E[4m:ve=\E[=119l:vs=\E[=119h:
+avt-rv-ns|concept avt in reverse video mode/no status line:\
+	:i1=\E[=103l\E[=205h:vb=\E[=205l\E[=205h:\
+	:tc=avt-ns:
+avt-w-ns|concept avt in 132 column mode/no status line:\
+	:i1=\E[=103h\E[=205l:ti=\E[H\E[1;24;1;132w:\
+	:tc=avt-ns:
+avt-w-rv-ns|concept avt in 132 column mode/no status line/reverse video:\
+	:i1=\E[=103h\E[=205h:ti=\E[H\E[1;24;1;132w:\
+	:vb=\E[=205l\E[=205h:tc=avt-ns:
+
+# Concept AVT with status line. We get the status line using the
+# "Background status line" feature of the terminal. We swipe the
+# first line of memory in window 2 for the status line, keeping
+# 191 lines of memory and 24 screen lines for regular use.
+# The first line is used instead of the last so that this works
+# on both 4 and 8 page AVTs. (Note the lm#191 or 192 - this
+# assumes an 8 page AVT but lm isn't currently used anywhere.)
+#
+avt+s|concept avt status line changes:\
+	:es:hs:\
+	:lm#191:\
+	:ds=\E[0*w:fs=\E[1;1\041w:\
+	:i2=\E[2w\E[2\041w\E[1;1;1;80w\E[H\E[2*w\E[1\041w\E2\r\n:\
+	:te=\E[2w\E2\r\n:ti=\E[2;25w\E2\r:\
+	:ts=\E[2;1\041w\E[;%p1%dH\E[2K:
+avt|avt-s|concept-avt|avt w/80 columns:\
+	:tc=avt+s:tc=avt-ns:
+avt-rv|avt-rv-s|avt reverse video w/sl:\
+	:i1=\E[=103l\E[=205h:vb=\E[=205l\E[=205h:tc=avt+s:tc=avt-ns:
+avt-w|avt-w-s|concept avt 132 cols+status:\
+	:i1=\E[=103h\E[=205l:ti=\E[H\E[1;24;1;132w:tc=avt+s:tc=avt-ns:
+avt-w-rv|avt-w-rv-s|avt wide+status+rv:\
+	:i1=\E[=103h\E[=205h:ti=\E[H\E[1;24;1;132w:\
+	:vb=\E[=205l\E[=205h:tc=avt+s:\
+	:tc=avt-ns:
+
+#### Contel Business Systems. 
+#
+
+# Contel c300 and c320 terminals. 
+contel300|contel320|c300|Contel Business Systems C-300 or C-320:\
+	:am:in:xo:\
+	:co#80:li#24:sg#1:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :cr=^M:\
+	:ct=\E3:dc=\EO:dl=\EM:do=^J:ei=:ho=\EH:ic=\EN:im=:ip=:k0=\ERJ:\
+	:k1=\ERA:k2=\ERB:k3=\ERC:k4=\ERD:k5=\ERE:k6=\ERF:k7=\ERG:\
+	:k8=\ERH:k9=\ERI:kb=^H:le=^H:ll=\EH\EA:me=\E\041\0:nd=\EC:\
+	:se=\E\041\0:sf=^J:so=\E\041\r:st=\E1:up=\EA:\
+	:vb=\020\002\020\003:
+# Contel c301 and c321 terminals.
+contel301|contel321|c301|c321|Contel Business Systems C-301 or C-321:\
+	:ei=:ic@:im=:ip@:se=\E\041\0:so=\E\041\r:vb@:\
+	:tc=contel300:
+
+#### Data General (dg)
+#
+# According to James Carlson <carlson@xylogics.com> writing in January 1995,
+# the terminals group at Data General was shut down in 1991; all these
+# terminals have thus been discontinued.
+#
+# DG terminals have function keys that respond to the SHIFT and CTRL keys,
+# e.g., SHIFT-F1 generates a different code from F1.  To number the keys
+# sequentially, first the unmodified key codes are listed as F1 through F15. 
+# Then their SHIFT versions are listed as F16 through F30, their CTRL versions
+# are listed as F31 through F45, and their CTRL-SHIFT versions are listed as
+# F46 through F60.  This is done in the private "includes" below whose names
+# start with "dgkeys+".
+#
+# DG terminals generally support 8 bit characters.  For each of these terminals
+# two descriptions are supplied:
+#	1) A default description for 8 bits/character communications, which
+#	   uses the default DG international character set and keyboard codes.
+#	2) A description with suffix "-7b" for 7 bits/character communications.
+#	   This description must use the NON-DEFAULT native keyboard language.
+
+# Unmodified fkeys (kf1-kf11), Shift fkeys (kf12-kf22), Ctrl fkeys (kf23-kf33),
+# Ctrl/Shift fdkeys (kf34-kf44).
+
+# Most of these entries are `official' and came from DG.  Others are marked.
+
+dgkeys+8b|Private entry describing DG terminal 8-bit ANSI mode special keys:\
+	:%9=\233i:F1=\233011z:F2=\233012z:F3=\233013z:\
+	:F4=\233014z:F5=\233000z:F6=\233101z:F7=\233102z:\
+	:F8=\233103z:F9=\233104z:FA=\233105z:FB=\233106z:\
+	:FC=\233107z:FD=\233108z:FE=\233109z:FF=\233110z:\
+	:FG=\233111z:FH=\233112z:FI=\233113z:FJ=\233114z:\
+	:FK=\233100z:FL=\233201z:FM=\233202z:FN=\233203z:\
+	:FO=\233204z:FP=\233205z:FQ=\233206z:FR=\233207z:\
+	:FS=\233208z:FT=\233209z:FU=\233210z:FV=\233211z:\
+	:FW=\233212z:FX=\233213z:FY=\233214z:FZ=\233200z:\
+	:Fa=\233301z:Fb=\233302z:Fc=\233303z:Fd=\233304z:\
+	:Fe=\233305z:Ff=\233306z:Fg=\233307z:Fh=\233308z:\
+	:Fi=\233309z:Fj=\233310z:Fk=\233311z:Fl=\233312z:\
+	:Fm=\233313z:Fn=\233314z:Fo=\233300z:K1=\233020z:\
+	:K3=\233021z:K4=\233022z:K5=\233023z:k1=\233001z:\
+	:k2=\233002z:k3=\233003z:k4=\233004z:k5=\233005z:\
+	:k6=\233006z:k7=\233007z:k8=\233008z:k9=\233009z:\
+	:k;=\233010z:kC=\2332J:kE=\233K:kd=\233B:kh=\233H:\
+	:kl=\233D:kr=\233C:ku=\233A:
+
+dgkeys+7b|Private entry describing DG terminal 7-bit ANSI mode special keys:\
+	:%9=\E[i:F1=\E[011z:F2=\E[012z:F3=\E[013z:F4=\E[014z:\
+	:F5=\E[000z:F6=\E[101z:F7=\E[102z:F8=\E[103z:F9=\E[104z:\
+	:FA=\E[105z:FB=\E[106z:FC=\E[107z:FD=\E[108z:FE=\E[109z:\
+	:FF=\E[110z:FG=\E[111z:FH=\E[112z:FI=\E[113z:FJ=\E[114z:\
+	:FK=\E[100z:FL=\E[201z:FM=\E[202z:FN=\E[203z:FO=\E[204z:\
+	:FP=\E[205z:FQ=\E[206z:FR=\E[207z:FS=\E[208z:FT=\E[209z:\
+	:FU=\E[210z:FV=\E[211z:FW=\E[212z:FX=\E[213z:FY=\E[214z:\
+	:FZ=\E[200z:Fa=\E[301z:Fb=\E[302z:Fc=\E[303z:Fd=\E[304z:\
+	:Fe=\E[305z:Ff=\E[306z:Fg=\E[307z:Fh=\E[308z:Fi=\E[309z:\
+	:Fj=\E[310z:Fk=\E[311z:Fl=\E[312z:Fm=\E[313z:Fn=\E[314z:\
+	:Fo=\E[300z:K1=\E[020z:K3=\E[021z:K4=\E[022z:K5=\E[023z:\
+	:k1=\E[001z:k2=\E[002z:k3=\E[003z:k4=\E[004z:k5=\E[005z:\
+	:k6=\E[006z:k7=\E[007z:k8=\E[008z:k9=\E[009z:k;=\E[010z:\
+	:kC=\E[2J:kE=\E[K:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:
+
+dgkeys+11|Private entry describing 11 minimal-subset DG mode special keys:\
+	:F1=^^{:F2=^^a:F3=^^b:F4=^^c:F5=^^d:F6=^^e:F7=^^f:F8=^^g:\
+	:F9=^^h:FA=^^i:FB=^^j:FC=^^k:FD=^^1:FE=^^2:FF=^^3:FG=^^4:\
+	:FH=^^5:FI=^^6:FJ=^^7:FK=^^8:FL=^^9:FM=^^\072:FN=^^;:\
+	:FO=^^\041:FP=^^":FQ=^^#:FR=^^$:FS=^^%:FT=^^&:FU=^^':FV=^^(:\
+	:FW=^^):FX=^^*:FY=^^+:k1=^^q:k2=^^r:k3=^^s:k4=^^t:k5=^^u:\
+	:k6=^^v:k7=^^w:k8=^^x:k9=^^y:k;=^^z:kC=^L:kE=^K:kd=^Z:kh=^H:\
+	:kl=^Y:kr=^X:ku=^W:
+
+dgkeys+15|Private entry describing 15 DG mode special keys:\
+	:#2=^^^H:#4=^^^Y:%i=^^^X:F1=^^{:F2=^^|:F3=^^}:F4=^^~:F5=^^p:\
+	:F6=^^a:F7=^^b:F8=^^c:F9=^^d:FA=^^e:FB=^^f:FC=^^g:FD=^^h:\
+	:FE=^^i:FF=^^j:FG=^^k:FH=^^l:FI=^^m:FJ=^^n:FK=^^`:FL=^^1:\
+	:FM=^^2:FN=^^3:FO=^^4:FP=^^5:FQ=^^6:FR=^^7:FS=^^8:FT=^^9:\
+	:FU=^^\072:FV=^^;:FW=^^<:FX=^^=:FY=^^>:FZ=^^0:Fa=^^\041:\
+	:Fb=^^":Fc=^^#:Fd=^^$:Fe=^^%:Ff=^^&:Fg=^^':Fh=^^(:Fi=^^):\
+	:Fj=^^*:Fk=^^+:Fl=^^\054:Fm=^^-:Fn=^^.:Fo=^^ :K1=^^\:K3=^^]:\
+	:K4=^^\136:K5=^^_:k1=^^q:k2=^^r:k3=^^s:k4=^^t:k5=^^u:k6=^^v:\
+	:k7=^^w:k8=^^x:k9=^^y:k;=^^z:
+
+# Data General color terminals use the "Tektronix" color model.  The total
+# number of colors varies with the terminal model, as does support for
+# attributes used in conjunction with color.
+
+# Removed u7, u8 definitions since they conflict with tack:
+#		Preserve user-defined colors in at least some cases.
+#	u7=^^Fh,
+#		Default is ACM mode.
+#	u8=^^F}20^^Fi^^F}21,
+#
+dgunix+fixed|Fixed color info for DG D430C terminals in DG-UNIX mode:\
+	:ut:\
+	:Co#16:NC#53:pa#256:\
+	:AB=\036B%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%{48}%+%c:\
+	:AF=\036A%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%{48}%+%c:\
+	:Sb=\036B%+0:Sf=\036A%+0:op=\036Ad\036Bd:
+
+dg+fixed|Fixed color info for DG D430C terminals in DG mode:\
+	:tc=dgunix+fixed:
+
+# Video attributes are coordinated using static variables set by "sgr", then
+# checked by "op", "seta[bf]", and "set[bf]" to refresh the attribute settings. 
+# (D=dim, U=underline, B=blink, R=reverse.)
+dg+color8|Color info for Data General D220 and D230C terminals in ANSI mode:\
+	:ut:\
+	:Co#8:NC#16:pa#64:\
+	:AB=\E[4%p1%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m:\
+	:AF=\E[3%p1%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m:\
+	:..Sb=\E[4%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m:\
+	:..Sf=\E[3%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m:\
+	:op=\E[%?%gD%t2;%;%?%gU%t4;%;%?%gB%t5;%;%?%gR%t7;%;m:
+
+dg+color|Color info for Data General D470C terminals in ANSI mode:\
+	:Co#16:NC#53:pa#256:\
+	:AB=\E[%?%p1%{8}%<%t4%p1%e=%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m:\
+	:AF=\E[%?%p1%{8}%<%t3%p1%e<%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m:\
+	:..Sb=\E[%?%p1%{8}%<%t4%e=%;%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m:\
+	:..Sf=\E[%?%p1%{8}%<%t3%e<%;%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%d%?%gD%t;2%;%?%gU%t;4%;%?%gB%t;5%;%?%gR%t;7%;m:\
+	:tc=dg+color8:
+
+dgmode+color8|Color info for Data General D220/D230C terminals in DG mode:\
+	:ut:\
+	:Co#8:NC#16:pa#64:\
+	:AB=\036B%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%{48}%+%c:\
+	:AF=\036A%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%{48}%+%c:\
+	:Sb=\036B%+0:Sf=\036A%+0:op=\036Ad\036Bd:
+
+dgmode+color|Color info for Data General D470C terminals in DG mode:\
+	:Co#16:pa#256:\
+	:AB=\036B%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%{48}%+%c:\
+	:AF=\036A%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|%;%;%{48}%+%c:\
+	:tc=dgmode+color8:
+
+dgunix+ccc|Configurable color info for DG D430C terminals in DG-UNIX mode:\
+	:cc:ut:\
+	:Co#52:NC#53:pa#26:\
+	:..Ip=\036RG0%p1%02X%p2%{256}%*%{1001}%/%02X%p3%{256}%*%{1001}%/%02X%p4%{256}%*%{1001}%/%02X%p5%{256}%*%{1001}%/%02X%p6%{256}%*%{1001}%/%02X%p7%{256}%*%{1001}%/%02X:\
+	:oc=\036RG01A00FF00000000\036RG01B00000000FF00\036RG01C007F00000000\036RG01D000000007F00:\
+	:op=\036RF4831A\036RF2E31B\036RF1D31C\036RF3F31D:\
+	:..sp=\036RG2%p1%02X:
+
+# Colors are in the order:  normal, reverse, dim, dim + reverse.
+dg+ccc|Configurable color info for DG D430C terminals in DG mode:\
+	:cc:ut:\
+	:Co#52:NC#53:pa#26:\
+	:..Ip=\036RG0%p1%{16}%/%{48}%+%c%p1%{16}%m%{48}%+%c%p2%{256}%*%{1001}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p3%{256}%*%{1001}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p4%{256}%*%{1001}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p5%{256}%*%{1001}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p6%{256}%*%{1001}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c%p7%{256}%*%{1001}%/%Pa%ga%{16}%/%{48}%+%c%ga%{16}%m%{48}%+%c:\
+	:oc=\036RG01\07200??00000000\036RG01;00000000??00\036RG01<007?00000000\036RG01=000000007?00:\
+	:op=\036RF4831\072\036RF2>31;\036RF1=31<\036RF3?31=:\
+	:sp=\036RG2%+^P%+^P:
+
+# The generic DG terminal type (an 8-bit-clean subset of the 6053)
+# Initialization string 1 sets:
+#	^R		- vertical scrolling enabled
+#	^C		- blinking enabled
+dg-generic|Generic Data General terminal in DG mode:\
+	:NL:am:bw:ms:xo:\
+	:co#80:li#24:\
+	:bl=^G:ce=^K:cl=^L:cm=\020%r%.%.:cr=^M:do=^Z:i1=^R^C:le=^Y:\
+	:mb=^N:me=^O^U^]:mh=^\:nd=^X:nw=^J:ps=^Q:se=^]:sf=^J:so=^\:\
+	:ue=^U:up=^W:us=^T:\
+	:tc=dgkeys+11:
+
+# (Some performance can be gained over the generic DG terminal type)
+dg6053|6053|6053-dg|dg605x|605x|605x-dg|d2|d2-dg|Data General DASHER 6053:\
+	:xo@:\
+	:ho=^P\0\0:ll=^P\0^W:tc=dg-generic:
+
+# Like 6053, but adds reverse video and more keypad and function keys.
+d200|d200-dg|Data General DASHER D200:\
+	:ho@:ll@:md=^^D^T:me=\017\025\035\036E:mr=^^D:\
+	:..sa=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4%t\016%e\017%;%?%p1%p5%|%t\034%e\035%;:\
+	:se=^^E^]:so=^^D^\:\
+	:tc=dgkeys+15:tc=dg6053:
+
+# DASHER D210 series terminals in ANSI mode.
+#	Reverse video, no insert/delete character/line, 7 bits/character only.
+#
+# Initialization string 1 sets:
+#	<0		- scrolling enabled
+#	<1		- blink enabled
+#	<4		- print characters regardless of attributes
+d210|d214|Data General DASHER D210 series:\
+	:NL:am:bw:ms:xo:\
+	:co#80:li#24:\
+	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:bl=^G:cb=\E[1K:\
+	:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:cr=^M:do=\E[B:\
+	:ho=\E[H:i1=\E[<0;<1;<4l:le=^H:ll=\E[H\E[A:mb=\E[5m:\
+	:md=\E[4;7m:me=\E[m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^J:\
+	:..sa=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m:\
+	:se=\E[m:sf=^J:so=\E[2;7m:ue=\E[m:up=\E[A:us=\E[4m:\
+	:tc=dgkeys+7b:
+
+# DASHER D210 series terminals in DG mode.
+# Like D200, but adds clear to end-of-screen and needs XON/XOFF.
+d210-dg|d214-dg|Data General DASHER D210 series in DG mode:\
+	:xo:\
+	:cd=^^FF:tc=d200:
+
+# DASHER D211 series terminals in ANSI mode.
+# Like the D210, but with 8-bit characters and local printer support.
+#
+# Initialization string 2 sets:
+#	\E[2;1;1;1v
+#		2;1	- 8 bit operations
+#		1;1	- 8 bit (international) keyboard language
+#	\E(B		- default primary character set (U.S. ASCII)
+#	\E)4		- default secondary character set (international)
+#	^O		- primary character set
+#
+d211|d215|Data General DASHER D211 series:\
+	:km:\
+	:is=\E[2;1;1;1v\E(B\E)4\017:ps=\E[i:tc=dgkeys+8b:tc=d210:
+
+# Initialization string 2 sets:
+#	\E[2;0;1;0v
+#		2;0	- 7 bit operations
+#		1;0	- 7 bit (native) keyboard language
+#	\E(0		- default character set (the keyboard native language)
+#	^O		- primary character set
+d211-7b|d215-7b|Data General DASHER D211 series in 7 bit mode:\
+	:km@:\
+	:is=\E[2;0;1;0v\E(0\017:tc=dgkeys+7b:tc=d211:
+
+# Like the D210 series, but adds support for 8-bit characters.
+#
+# Reset string 2 sets:
+#	^^N	- secondary character set
+#	^^FS0>	- 8 bit international character set
+#	^^O	- primary character set
+#	^^FS00	- default character set (matching the native keyboard language)
+#
+d211-dg|d215-dg|Data General DASHER D211 series in DG mode:\
+	:km:\
+	:r2=\036N\036FS0>\036O\036FS00:tc=d210-dg:
+
+d216-dg|d216e-dg|d216+dg|d216e+dg|d217-dg|Data General DASHER D216 series in DG mode:\
+	:tc=d211-dg:
+
+# Enhanced DG mode with changes to be more UNIX compatible.
+d216-unix|d216e-unix|d216+|d216e+|Data General DASHER D216+ in DG-UNIX mode:\
+	:5i:\
+	:it#8:\
+	:#2=^^Pf:#4=^^Pd:%9=^^P0:%f=^^P1:%i=^^Pc:\
+	:ac=a\177j$k"l\041m#n)q+t'u&v(w%x*:ae=\036FS00:\
+	:as=\036FS11:ce=^^PE:ch=\020%.\177:cl=^^PH:cv=\020\177%.:\
+	:do=^^PB:ho=^^PF:i1=\022\003\036P@1:i2=\036Fz0:kC=^^PH:\
+	:kE=^^PE:kd=^^PB:kh=^^PF:kl=^^PD:kr=^^PC:ku=^^PA:le=^^PD:\
+	:mb=^^PI:me=\036PJ\025\035\036E\036FS00:nd=^^PC:pf=^^Fa:\
+	:po=^^F`:ps=\036F?9:r2=\036N\036FS0E\036O\036FS00:\
+	:..sa=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;\036P%?%p4%tI%eJ%;%?%p1%p5%|%t\034%e\035%;\036FS%?%p9%t11%e00%;:\
+	:sf=^J:ta=^I:up=^^PA:\
+	:tc=dgkeys+15:tc=d216-dg:
+d216-unix-25|d216+25|Data General DASHER D216+ in DG-UNIX mode with 25 lines:\
+	:li#25:\
+	:i2=\036Fz2:tc=d216+:
+
+d217-unix|Data General DASHER D217 in DG-UNIX mode:\
+	:tc=d216-unix:
+d217-unix-25|Data General DASHER D217 in DG-UNIX mode with 25 lines:\
+	:tc=d216-unix-25:
+
+# DASHER D220 color terminal in ANSI mode.
+# Like the D470C but with fewer colors and screen editing features.
+#
+# Initialization string 1 sets:
+#	\E[<0;<1;<4l
+#		<0	- scrolling enabled
+#		<1	- blink enabled
+#		<4	- print characters regardless of attributes
+#	\E[m		- all attributes off
+# Reset string 1 sets:
+#	\Ec		- initial mode defaults (RIS)
+#
+d220|Data General DASHER D220:\
+	:5i@:\
+	:AL@:DL@:al@:dl@:i1=\E[<0;<1;<4l\E[m:pf@:po@:r1=\Ec:tc=dg+color8:tc=d470c:
+
+d220-7b|Data General DASHER D220 in 7 bit mode:\
+	:5i@:\
+	:AL@:DL@:al@:dl@:i1=\E[<0;<1;<4l\E[m:pf@:po@:r1=\Ec:tc=dg+color8:tc=d470c-7b:
+
+# Initialization string 3 sets:
+#	- default cursor (solid rectangle)
+# Reset string 2 sets:
+#	^^N     - secondary character set
+#	^^FS0>  - 8 bit international character set
+#	^^O     - primary character set
+#       ^^FS00  - default character set (matching the native keyboard language)
+#
+d220-dg|Data General DASHER D220 color terminal in DG mode:\
+	:5i@:\
+	:al@:dl@:ho@:i2=\036FQ2:is@:ll@:pf@:po@:r1@:\
+	:r2=\036N\036FS0>\036O\036FS00:tc=dgmode+color8:\
+	:tc=d470c-dg:
+
+# DASHER D230C color terminal in ANSI mode.
+# Like the D220 but with minor ANSI compatibility improvements.
+#
+d230c|d230|Data General DASHER D230C:\
+	:ke=\E[2;1v:ks=\E[2;0v:mb=\E[5;50m:md=\E[4;7;50m:\
+	:me=\E[50m\E)4\017:mh=\E[2;50m:mr=\E[7;50m:nw=^M^J:\
+	:..sa=\E[50%?%p1%p3%|%p6%|%t;7%{1}%e%{0}%;%PR%?%p4%t;5%{1}%e%{0}%;%PB%?%p2%p6%|%t;4%{1}%e%{0}%;%PU%?%p1%p5%|%t;2%{1}%e%{0}%;%PDm\E)%?%p9%t6\016%e4\017%;:\
+	:se=\E[50m:so=\E[2;7;50m:ue=\E[50m:us=\E[4;50m:\
+	:tc=dgkeys+7b:tc=d220:
+
+d230c-dg|d230-dg|Data General DASHER D230C in DG mode:\
+	:tc=d220-dg:
+
+# DASHER D400/D450 series terminals.
+# These add intelligent features like insert/delete to the D200 series.
+#
+# Initialization string 2 sets:
+#	^^FQ2		- default cursor (solid rectangle)
+#	^^FW		- character protection disabled
+#	^^FJ		- normal (80 column) mode
+#	^^F\^		- horizontal scrolling enabled (for alignment)
+#	^^FX004?	- margins at columns 0 and 79
+#	^^F]		- horizontal scrolling disabled
+#	^^O		- primary character set
+#	^^FS00		- default character set (the keyboard native language)
+#	- (should reset scrolling regions, but that glitches the screen)
+# Reset string 1 sets:
+#	^^FA		- all terminal defaults except scroll rate
+# Reset string 2 sets:
+#	^^F]		- horizontal scrolling disabled
+#	^^FT0		- jump scrolling
+#
+d400|d400-dg|d450|d450-dg|Data General DASHER D400/D450 series:\
+	:5i:\
+	:ac=j$k"l\041m#n)q+t'u&v(w%x*:ae=^^O:al=^^FH:as=^^N:\
+	:ch=\020%.\177:cv=\020\177%.:dc=^^K:dl=^^FI:\
+	:eA=\036N\036FS11\036O:ei=:ho=^^FG:ic=^^J:im=:\
+	:is=\036FQ2\036FW\036FJ\036F\136\036FX004?\036F]\036O\036FS00:\
+	:ll=\036FG\027:me=\017\025\035\036E\036O:pf=^^Fa:\
+	:po=^^F`:r1=^^FA:r2=\036F]\036FT0:\
+	:..sa=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4%t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036%?%p9%tN%eO%;:\
+	:sr=^^I:ve=\036FQ2:vi=\036FQ0:\
+	:tc=d210-dg:
+
+# DASHER D410/D460 series terminals in ANSI mode.
+# These add a large number of intelligent terminal features.
+#
+# Initialization string 1 sets:
+#	\E[<0;<1;<2;<4l
+#		<0	- scrolling enabled
+#		<1	- blink enabled
+#		<2	- horizontal scrolling enabled (for alignment)
+#		<4	- print characters regardless of attributes
+#	\E[5;0v		- normal (80 column) mode
+#	\E[1;1;80w	- margins at columns 1 and 80
+#	\E[1;6;<2h
+#		1	- print all characters even if protected
+#		6	- character protection disabled
+#		<2	- horizontal scrolling disabled
+#	- (should reset scrolling regions, but that glitches the screen)
+#
+# Initialization string 2 sets:
+#	\E[3;2;2;1;1;1v
+#		3;2	- default cursor (solid rectangle)
+#		2;1	- 8 bit operations
+#		1;1	- international keyboard language
+#	\E(B		- default primary character set (U.S. ASCII)
+#	\E)4		- default secondary character set (international)
+#	^O		- primary character set
+#
+#	Reset string 1 sets:
+#	\Ec		- initial mode defaults (RIS)
+#	\E[<2h		- horizontal scrolling disabled
+#
+# Reset string 2 sets:
+#	\E[4;0;2;1;1;1v
+#		4;0	- jump scrolling
+#		2;1	- 8 bit operations
+#		1;1	- 8 bit (international) keyboard language
+#	\E(B		- default primary character set (U.S. ASCII)
+#	\E)4		- default secondary character set (international)
+#
+d410|d411|d460|d461|Data General DASHER D410/D460 series:\
+	:5i:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:\
+	:ac=j$k"l\041m#n)q+t'u&v(w%x*:ae=\E)4\017:al=\E[L:\
+	:as=\E)6\016:dc=\E[P:dl=\E[M:ei=:\
+	:i1=\E[<0;<1;<2;<4l\E[5;0v\E[1;1;80w\E[1;6;<2h:\
+	:ic=\E[@:im=:is=\E[3;2;2;1;1;1v\E(B\E)4\017:\
+	:me=\E[m\E)4\017:pf=\E[4i:po=\E[5i:r1=\Ec\E[<2h:\
+	:r2=\E[4;0;2;1;1;1v\E(B\E)4:\
+	:..sa=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m\E)%?%p9%t6\016%e4\017%;:\
+	:sr=\EM:ve=\E[3;2v:vi=\E[3;0v:\
+	:tc=d211:
+
+# Initialization string 2 sets:
+#	\E[3;2;2;0;1;0v
+#		3;2	- default cursor (solid rectangle)
+#		2;0	- 7 bit operations
+#		1;0	- 7 bit (native) keyboard language
+#	\E(0		- default character set (the keyboard native language)
+#	^O		- primary character set
+#
+# Reset string 2 sets:
+#	\E[4;0;2;0;1;0v
+#		4;0	- jump scrolling
+#		2;0	- 7 bit operations
+#		1;0	- 7 bit (native) keyboard language
+#	\E(0		- default character set (the keyboard native language)
+#
+d410-7b|d411-7b|d460-7b|d461-7b|Data General DASHER D410/D460 series in 7 bit mode:\
+	:km@:\
+	:ae=^O:as=^N:eA=\E)6:is=\E[3;2;2;0;1;0v\E(0\017:\
+	:me=\E[m\017:r2=\E[4;0;2;0;1;0v\E(0:\
+	:..sa=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m%?%p9%t\016%e\017%;:tc=dgkeys+7b:\
+	:tc=d410:
+
+d410-dg|d460-dg|d411-dg|d461-dg|Data General DASHER D410/D460 series in DG mode:\
+	:km:\
+	:ae=\036FS00:as=\036FS11:eA@:\
+	:me=\017\025\035\036E\036FS00:\
+	:..sa=\036%?%p1%p3%|%p6%|%tD%eE%;%?%p2%p6%|%t\024%e\025%;%?%p4%t\016%e\017%;%?%p1%p5%|%t\034%e\035%;\036FS%?%p9%t11%e00%;:tc=d400-dg:
+
+# DASHER D410/D460 series terminals in wide (126 columns) ANSI mode.
+#
+# Initialization string 1 sets:
+#	\E[<0;<1;<2;<4l
+#		<0	- scrolling enabled
+#		<1	- blink enabled
+#		<2	- horizontal scrolling enabled (for alignment)
+#		<4	- print characters regardless of attributes
+#	\E[5;1v		- compressed (135 column) mode
+#	\E[1;1;126	- margins at columns 1 and 126
+#	\E[1;6;<2h
+#		1	- print all characters even if protected
+#		6	- character protection disabled
+#		<2	- horizontal scrolling disabled
+#	- (should reset scrolling regions, but that glitches the screen)
+#
+# Reset string 1 sets:
+#	\Ec		- initial mode defaults (RIS)
+#	\E[5;1v		- compressed (135 column) mode
+#	\E[1;1;126w	- margins at columns 1 and 126
+#	\E[<2h		- horizontal scrolling disabled
+#
+d410-w|d411-w|d460-w|d461-w|Data General DASHER D410/D460 series in wide mode:\
+	:co#126:\
+	:i1=\E[<0;<1;<2;<4l\E[5;1v\E[1;1;126w\E[1;6;<2h:\
+	:r1=\Ec\E[5;1v\E[1;1;126w\E[<2h:\
+	:tc=d410:
+
+d410-7b-w|d411-7b-w|d460-7b-w|d461-7b-w|Data General DASHER D410/D460 series in wide 7 bit mode:\
+	:co#126:\
+	:i1=\E[<0;<1;<2;<4l\E[5;1v\E[1;1;126w\E[1;6;<2h:\
+	:r1=\Ec\E[5;1v\E[1;1;126w\E[<2h:\
+	:tc=d410-7b:
+
+d412-dg|d462-dg|d462e-dg|d412+dg|d462+dg|d413-dg|d463-dg|Data General DASHER D412/D462 series in DG mode:\
+	:tc=d410-dg:
+
+# These add intelligent features like scrolling regions.
+d412-unix|d462-unix|d412+|d462+|Data General DASHER D412+/D462+ series in Unix mode:\
+	:al=^^FH:ch=\036FP%2.2XFF:cl=^^FE:cm=\036FP%r%2.2X%2.2X:\
+	:cv=\036FPFF%2.2X:dc=^^K:dl=^^FI:ei=:ho=^^FG:ic=^^J:im=:\
+	:is=\036FQ5\036FW\036FJ\036F\136\036FX004F\036O\036FS00:\
+	:ll=\036FG\036PA:ps=^A:r1=\036FA\036FT0:r2=\036P@1:\
+	:rc=\036F}11:sc=\036F}10:sr=^^I:ve=\036FQ5:vi=\036FQ0:\
+	:..wi=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2%>%t000%;\036FX%p3%2.2X%p4%2.2X:\
+	:tc=d216+:
+d412-unix-w|d462-unix-w|d412+w|d462+w|Data General DASHER D412+/D462+ series in wide Unix mode:\
+	:co#132:\
+	:is=\036FQ5\036FW\036FK\036F\136\036FX0083\036O\036FS00:\
+	:r2=\036P@1\036FK\036FX0083:\
+	:..wi=\036FB%?%p1%t%p1%2.2X1%;%p2%p1%-%{1}%+%2.2X1%?%{23}%p2%>%t001%;\036FX%p3%2.2X%p4%2.2X:tc=d412-unix:
+d412-unix-25|d462-unix-25|d412+25|d462+25|Data General DASHER D412+/D462+ series in Unix mode with 25 lines:\
+	:li#25:\
+	:i2=\036Fz2:\
+	:..wi=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{24}%p2%>%t000%;\036FX%p3%2.2X%p4%2.2X:tc=d462+:
+d412-unix-s|d462-unix-s|d412+s|d462+s|Data General DASHER D412+/D462+ in Unix mode with status line:\
+	:es:hs:\
+	:cl=\036FG\036PH:fs=\036F}01\022:\
+	:i2=\036Fz2\036F}00\036FB180000\036F}01:ll@:\
+	:ts=\036F}00\036FP%p1%2.2X18\036PG:\
+	:..wi=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2%>%t%{23}%p2%-%2.2X0%;000\036FX%p3%2.2X%p4%2.2X:tc=d462+:
+
+#	Relative cursor motions are confined to the current window,
+#	which is not what the scrolling region specification expects.
+#	Thus, relative vertical cursor positioning must be deleted.
+d412-unix-sr|d462-unix-sr|d412+sr|d462+sr|Data General DASHER D412+/D462+ in Unix mode with scrolling region:\
+	:..cs=\036FB%?%p1%t%p1%2.2X0%;%p2%p1%-%{1}%+%2.2X0%?%{23}%p2%>%t000%;:\
+	:do@:ll@:up@:\
+	:tc=d462+:
+
+d413-unix|d463-unix|Data General DASHER D413/D463 series in DG-UNIX mode:\
+	:tc=d412-unix:
+d413-unix-w|d463-unix-w|Data General DASHER D413/D463 series in wide DG-UNIX mode:\
+	:tc=d412-unix-w:
+d413-unix-25|d463-unix-25|Data General DASHER D413/D463 series in DG-UNIX mode with 25 lines:\
+	:tc=d412-unix-25:
+d413-unix-s|d463-unix-s|Data General DASHER D413/D463 in DG-UNIX mode with status line:\
+	:tc=d412-unix-s:
+d413-unix-sr|d463-unix-sr|Data General DASHER D413/D463 in DG-UNIX mode with scrolling region:\
+	:tc=d412-unix-sr:
+
+d414-unix|d464-unix|Data General D414/D464 in DG-UNIX mode:\
+	:tc=d413-unix:
+d414-unix-w|d464-unix-w|Data General D414/D464 in wide DG-UNIX mode:\
+	:tc=d413-unix-w:
+d414-unix-25|d464-unix-25|Data General D414/D464 in DG-UNIX mode with 25 lines:\
+	:tc=d413-unix-25:
+d414-unix-s|d464-unix-s|Data General D414/D464 in DG-UNIX mode with status line:\
+	:tc=d413-unix-s:
+d414-unix-sr|d464-unix-sr|Data General D414/D464 in DG-UNIX mode with scrolling region:\
+	:tc=d413-unix-sr:
+
+d430c-dg|d430-dg|Data General D430C in DG mode:\
+	:tc=d413-dg:tc=dg+fixed:
+d430c-dg-ccc|d430-dg-ccc|Data General D430C in DG mode with configurable colors:\
+	:tc=d413-dg:tc=dg+ccc:
+
+d430c-unix|d430-unix|Data General D430C in DG-UNIX mode:\
+	:tc=d413-unix:tc=dgunix+fixed:
+d430c-unix-w|d430-unix-w|Data General D430C in wide DG-UNIX mode:\
+	:tc=d413-unix-w:tc=dgunix+fixed:
+d430c-unix-25|d430-unix-25|Data General D430C in DG-UNIX mode with 25 lines:\
+	:tc=d413-unix-25:tc=dgunix+fixed:
+d430c-unix-s|d430-unix-s|Data General D430C in DG-UNIX mode with status line:\
+	:tc=d413-unix-s:tc=dgunix+fixed:
+d430c-unix-sr|d430-unix-sr|Data General D430C in DG-UNIX mode with scrolling region:\
+	:tc=d413-unix-sr:tc=dgunix+fixed:
+d430c-unix-ccc|d430-unix-ccc|Data General D430C in DG-UNIX mode with configurable colors:\
+	:tc=d413-unix:tc=dgunix+ccc:
+d430c-unix-w-ccc|d430-unix-w-ccc|Data General D430C in wide DG-UNIX mode with configurable colors:\
+	:tc=d413-unix-w:tc=dgunix+ccc:
+d430c-unix-25-ccc|d430-unix-25-ccc|Data General D430C in DG-UNIX mode with 25 lines and configurable colors:\
+	:tc=d413-unix-25:tc=dgunix+ccc:
+d430c-unix-s-ccc|d430-unix-s-ccc|Data General D430C in DG-UNIX mode with status line and configurable colors:\
+	:tc=d413-unix-s:tc=dgunix+ccc:
+d430c-unix-sr-ccc|d430-unix-sr-ccc|Data General D430C in DG-UNIX mode with scrolling region and configurable colors:\
+	:tc=d413-unix-sr:tc=dgunix+ccc:
+
+# dg450 from Cornell (not official)
+dg450|dg6134|data general 6134:\
+	:le@:nd=^X:tc=dg200:
+
+# Not official...
+# Note: lesser Dasher terminals will not work with vi because vi insists upon
+# having a command to move straight down from any position on the bottom line
+# and scroll the screen up, or a direct vertical scroll command.  The 460 and
+# above have both, the D210/211, for instance, has neither.  We must use ANSI
+# mode rather than DG mode because standard UNIX tty drivers assume that ^H is
+# backspace on all terminals.  This is not so in DG mode.
+# (dg460-ansi: removed obsolete ":kn#6:"; also removed ":mu=\EW:", on the
+# grounds that there is no matching ":ml:"
+# fixed garbled ":k9=\E[00\:z:" capability -- esr)
+dg460-ansi|Data General Dasher 460 in ANSI-mode:\
+	:am:bs:ms:ul:\
+	:co#80:it#8:li#24:\
+	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%2;%2H:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:is=^^F@:k0=\E[001z:\
+	:k1=\E[002z:k2=\E[003z:k3=\E[004z:k4=\E[005z:k5=\E[006z:\
+	:k6=\E[007z:k7=\E[008z:k8=\E[009z:k9=\E[010z:kb=\E[D:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:l0=f1:l1=f2:l2=f3:\
+	:l3=f4:l4=f5:l5=f6:l6=f7:l7=f8:l9=f10:le=^H:mb=\E[5m:me=\E[m:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:nl=\ED:se=\E[m:sf=\E[S:so=\E[7m:\
+	:sr=\E[T:ta=^I:ue=\E[05:up=\E[A:us=\E[4m:
+
+# DASHER D470C color terminal in ANSI mode.
+# Like the D460 but with 16 colors and without a compressed mode.
+#
+# Initialization string 1 sets:
+#	\E[<0;<1;<2;<4l
+#		<0	- scrolling enabled
+#		<1	- blink enabled
+#		<2	- horizontal scrolling enabled (for alignment)
+#		<4	- print characters regardless of attributes
+#	\E[1;1;80w	- margins at columns 1 and 80
+#	\E[1;6;<2h
+#		1	- print all characters even if protected
+#		6	- character protection disabled
+#		<2	- horizontal scrolling disabled
+#	- (should reset scrolling regions, but that glitches the screen)
+#
+d470c|d470|Data General DASHER D470C:\
+	:i1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h:\
+	:..sa=\E[%?%p1%p3%|%p6%|%t7;%{1}%e%{0}%;%PR%?%p4%t5;%{1}%e%{0}%;%PB%?%p2%p6%|%t4;%{1}%e%{0}%;%PU%?%p1%p5%|%t2;%{1}%e%{0}%;%PDm\E)%?%p9%t6\016%e4\017%;:tc=dg+color:\
+	:tc=d460:
+
+d470c-7b|d470-7b|Data General DASHER D470C in 7 bit mode:\
+	:i1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h:\
+	:..sa=\E[%?%p1%p3%|%p6%|%t7;%{1}%e%{0}%;%PR%?%p4%t5;%{1}%e%{0}%;%PB%?%p2%p6%|%t4;%{1}%e%{0}%;%PU%?%p1%p5%|%t2;%{1}%e%{0}%;%PDm%?%p9%t\016%e\017%;:tc=dg+color:\
+	:tc=d460-7b:
+
+# Initialization string 2 sets:
+#	^^FQ2		- default cursor (solid rectangle)
+#	^^FW		- character protection disabled
+#	^^F\^		- horizontal scrolling enabled (for alignment)
+#	^^FX004?	- margins at columns 0 and 79
+#	^^F]		- horizontal scrolling disabled
+#	^^O		- primary character set
+#	^^FS00		- default character set (the keyboard native language)
+#	- (should reset scrolling regions, but that glitches the screen)
+#
+d470c-dg|d470-dg|Data General DASHER D470C in DG mode:\
+	:is=\036FQ2\036FW\036F\136\036FX004?\036F]\036O\036FS00:\
+	:tc=dgmode+color:tc=d460-dg:
+
+# DASHER D555 terminal in ANSI mode.
+# Like a D411, but has an integrated phone.
+d555|Data General DASHER D555:\
+	:tc=d411:
+d555-7b|Data General DASHER D555 in 7-bit mode:\
+	:tc=d411-7b:
+d555-w|Data General DASHER D555 in wide mode:\
+	:tc=d411-w:
+d555-7b-w|Data General DASHER D555 in wide 7-bit mode:\
+	:tc=d411-7b-w:
+d555-dg|Data General DASHER D555 series in DG mode:\
+	:tc=d411-dg:
+
+# DASHER D577 terminal in ANSI mode.
+# Like a D411, but acts as a keyboard for serial printers ("KSR" modes).
+d577|Data General DASHER D577:\
+	:tc=d411:
+d577-7b|Data General DASHER D577 in 7-bit mode:\
+	:tc=d411-7b:
+d577-w|Data General DASHER D577 in wide mode:\
+	:tc=d411-w:
+d577-7b-w|Data General DASHER D577 in wide 7-bit mode:\
+	:tc=d411-7b-w:
+
+d577-dg|d578-dg|Data General DASHER D577/D578 series in DG mode:\
+	:tc=d411-dg:
+
+# DASHER D578 terminal.
+# Like a D577, but without compressed mode; like a D470C in this respect.
+#
+# Initialization string 1 sets:
+#	\E[<0;<1;<2;<4l
+#		<0	- scrolling enabled
+#		<1	- blink enabled
+#		<2	- horizontal scrolling enabled (for alignment)
+#		<4	- print characters regardless of attributes
+#	\E[1;1;80w	- margins at columns 1 and 80
+#	\E[1;6;<2h
+#		1	- print all characters even if protected
+#		6	- character protection disabled
+#		<2	- horizontal scrolling disabled
+#	- (should reset scrolling regions, but that glitches the screen)
+#
+d578|Data General DASHER D578:\
+	:i1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h:tc=d577:
+d578-7b|Data General DASHER D578 in 7-bit mode:\
+	:i1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h:tc=d577-7b:
+
+# Here are some older Dasher entries from the Berkeley termcap file.
+
+# According to the 4.4BSD termcap file, the dg200 :cm: should be the
+# termcap equivalent of \020%p2%{128}%+%c%p1%{128}%+%c (in termcap
+# notation that's "^P%r%+\200%+\200").  Those \200s are suspicious,
+# maybe they were originally nuls (which would fit).
+dg200|data general dasher 200:\
+	:NL:am:bs:bw:\
+	:co#80:li#24:\
+	:bl=^G:ce=^K:cl=^L:cm=\020%r%.%.:cr=^M:do=^Z:ho=^H:k0=^^z:\
+	:k1=^^q:k2=^^r:k3=^^s:k4=^^t:k5=^^u:k6=^^v:k7=^^w:k8=^^x:\
+	:k9=^^y:kd=^Z:kh=^H:kl=^Y:kr=^X:ku=^W:l0=f10:le=^Y:nd=^X:\
+	:nw=^J:se=^^E:sf=^J:so=^^D:ue=^U:up=^W:us=^T:
+# Data General 210/211 (and 410?)	from Lee Pearson (umich!lp) via BRL
+dg210|dg-ansi|Data General 210/211:\
+	:am:\
+	:co#80:li#24:\
+	:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:do=\E[B:ho=\E[H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:nl=\E[B:\
+	:nw=\r\E[H\E[A\n:se=\E[0;m:so=\E[7;m:ue=\E[0;m:up=\E[A:\
+	:us=\E[4;m:
+# From: Peter N. Wan <ihnp4!gatech!gacsr!wan>
+# courtesy of Carlos Rucalde of Vantage Software, Inc.
+# (dg211: this had :cm=\020%r%.%:., which was an ancient termcap hangover.
+# I suspect the d200 function keys actually work on the dg211, check it out.)
+dg211|Data General d211:\
+	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb=^Y:l0@:nw=^M^Z:\
+	:se=\036E\0/>:sf@:so=5\036D:ta=^I:te=^L:ti=^L^R:ve=^L:\
+	:vs=^L^R:\
+	:tc=dg200:
+
+# From: Wayne Throop <mcnc!rti-sel!rtp47!throopw> (not official)
+# Data General 605x     
+# Ought to work for a Model 6242, Type D210 as well as a 605x.
+# Note that the cursor-down key transmits ^Z.  Job control users, beware!
+# This also matches a posted description of something called a `Dasher 100'
+# so there's a dg100 alias here. 
+# (dg6053: the 4.4BSD file had :le=^H:, :do=^J:, :nd=^S:. -- esr) 
+dg6053-old|dg100|data general 6053:\
+	:am:bs:bw:ul:\
+	:co#80:li#24:\
+	:bc=^Y:bl=^G:ce=^K:cl=^L:cm=\020%r%.%.:cr=^M:do=^Z:ho=^H:\
+	:is=^R:k0=^^q:k1=^^r:k2=^^s:k3=^^t:k4=^^u:k5=^^v:k6=^^w:\
+	:k7=^^x:k8=^^y:k9=^^z:kb=^Y:kd=^Z:kh=^H:kl=^Y:kr=^X:ku=^W:\
+	:le=^Y:nd=^X:se=\0^^E:so=\0\0\0\0\0\036D:ta=^I:te=^L:\
+	:ti=^L^R:ue=^U:up=^W:us=^T:ve=^L:vs=^L^R:
+
+#### Datamedia (dm)
+#
+# Datamedia was headquartered in Nashua, New Hampshire until it went 
+# out of business in 1993, but the ID plates on the terminals referred
+# to the factory in Pennsauken, NJ.  The factory was sold to a PCB board
+# manufacturer which threw out all information about the terminals.
+#
+
+cs10|colorscan|Datamedia Color Scan 10:\
+	:ms:\
+	:co#80:li#24:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%02;%02H:cr=^M:\
+	:do=^J:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=^J:\
+	:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:
+cs10-w|Datamedia Color Scan 10 with 132 columns:\
+	:co#132:\
+	:cm=\E[%i%02;%03H:tc=cs10:
+
+# (dm1520: removed obsolete ":ma=^\ ^_^P^YH:" -- esr)
+dm1520|dm1521|datamedia 1520:\
+	:am:bs:xn:\
+	:co#80:it#8:li#24:\
+	:bl=^G:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :cr=^M:do=^J:ho=^Y:\
+	:kd=^J:kh=^Y:kl=^H:kr=^\:ku=^_:le=^H:nd=^\:sf=^J:ta=^I:up=^_:
+# dm2500: this terminal has both :IC: and :im:. Applications using 
+# termcap/terminfo directly (rather than through ncurses) might be confused.
+dm2500|datamedia2500|datamedia 2500:\
+	:bs:nc:\
+	:co#80:li#24:\
+	:al=\020\n\030\035\030\035:bl=^G:ce=^W:cl=^^^^\177:\
+	:cm=\014%r%n%.%.:dc=\020\010\030\035:\
+	:dl=\020\032\030\035:dm=^P:do=^J:ed=^X^]:\
+	:ei=\377\377\030\035:ho=^B:ic=\020\034\030\035:im=^P:\
+	:le=^H:nd=^\:pc=\377:se=^X^]:sf=^J:so=^N:up=^Z:
+# dmchat is like DM2500, but DOES need "all that padding" (jcm 1/31/82)
+# also, has a meta-key.
+# From: <goldberger@su-csli.arpa>
+# (dmchat: ":MT:" changed to ":km:" -- esr)
+dmchat|dmchat version of datamedia 2500:\
+	:km:\
+	:al=1*\020\n\030\035\030\035:dl=2\020\032\030\035:tc=dm2500:
+# (dm3025: ":MT:" changed to ":km:" -- esr)
+dm3025|datamedia 3025a:\
+	:bs:km:\
+	:co#80:it#8:li#24:\
+	:al=\EP\n\EQ:bl=^G:cd=\EJ:ce=\EK:cl=\EM:cm=\EY%r%+ %+ :\
+	:cr=^M:dc=\010:dl=\EP\EA\EQ:dm=\EP:do=^J:ed=\EQ:ei=\EQ:\
+	:ho=\EH:im=\EP:ip=:is=\EQ\EU\EV:le=^H:nd=\EC:se=\EO0:sf=^J:\
+	:so=\EO1:ta=^I:up=\EA:
+dm3045|datamedia 3045a:\
+	:am:bs:eo:km@:ul:xn:\
+	:al@:dc=\EB:dl@:dm@:ed@:ei=\EP:is=\EU\EV:k0=\Ey\r:k1=\Ep\r:\
+	:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:\
+	:k8=\Ew\r:k9=\Ex\r:kh=\EH:kr=\EC:ku=\EA:pc=\177:se@:so@:\
+	:tc=dm3025:
+# Datamedia DT80 soft switches:
+# 1	0=Jump  1=Smooth
+# 	Autorepeat 	0=off  1=on
+# 	Screen		0=Dark 1=light
+# 	Cursor		0=u/l  1=block
+# 
+# 2	Margin Bell	0=off  1=on
+# 	Keyclick	0=off  1=on
+# 	Ansi/VT52	0=VT52 1=Ansi
+# 	Xon/Xoff	0=Off  1=On
+# 
+# 3	Shift3		0=Hash 1=UK Pound
+# 	Wrap		0=Off  1=On
+# 	Newline		0=Off  1=On
+# 	Interlace	0=Off  1=On
+# 	
+# 4	Parity		0=Odd  1=Even
+# 	Parity		0=Off  1=On
+# 	Bits/Char	0=7    1=8
+# 	Power		0=60Hz 1=50Hz
+# 
+# 5	Line Interface  0=EIA  1=Loop
+# 	Aux Interface   0=EIA  1=Loop
+# 	Local Copy    	0=Off  1=On	
+# 	Spare
+# 
+# 6	Aux Parity	0=Odd  1=Even
+# 	Aux Parity	0=Off  1=On
+# 	Aux Bits/Char   0=7    1=8
+# 	CRT Saver	0=Off  1=On
+# dm80/1 is a vt100 lookalike, but it doesn't seem to need any padding.
+dm80|dmdt80|dt80|datamedia dt80/1:\
+	:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:cm=%i\E[%d;%dH:do=^J:\
+	:ho=\E[H:me=\E[m:nd=\E[C:pf=\E[4i:po=\E[5i:ps=\E[0i:\
+	:se=\E[m:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:\
+	:tc=vt100:
+# except in 132 column mode, where it needs a little padding.
+# This is still less padding than the vt100, and you can always turn on
+# the ^S/^Q handshaking, so you can use vt100 flavors for things like
+# reverse video.
+dm80w|dmdt80w|dt80w|datamedia dt80/1 in 132 char mode:\
+	:co#132:\
+	:cd=20\E[0J:ce=20\E[0K:cl=50\E[H\E[2J:cm=5\E[%i%d;%dH:\
+	:do=^J:up=5\E[A:\
+	:tc=dm80:
+# From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
+dt80-sas|Datamedia DT803/DTX for SAS usage:\
+	:am:bw:\
+	:co#80:li#24:\
+	:ac=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~:\
+	:ae=\EG:al=\EL:as=\EF:bl=^G:cd=^K:ce=^]:cl=^L:\
+	:cm=\E=%r%+ %+ :cr=^M:\
+	:..cs=\E=%p1%{32}%+%c%{32}%c\E#1\E=%p2%{32}%+%c%{32}%c\E#2:\
+	:ct=\E'0:dl=\EM:do=\EB:ff=^L:ho=^Y:is=\E)0\E<\EP\E'0\E$2:\
+	:kC=^L:kE=^]:kS=^K:kd=^J:kh=^Y:kl=^H:kr=^\:ku=^_:le=^H:me=^X:\
+	:mr=\E$2\004:nd=^\:pf=^O:po=^N:se=^X:sf=\EB:so=\E$2\004:\
+	:sr=\EI:st=\E'1:ta=^I:up=^_:
+
+# Datamedia Excel 62, 64 from Gould/SEL UTX/32 via BRL
+# These aren't end-all Excel termcaps; but do insert/delete char/line
+# and name some of the extra function keys.  (Mike Feldman ccvaxa!feldman)
+# The naming convention has been bent somewhat, with the use of E? (where
+# E is for 'Excel') as # a name.  This was done to distinguish the entries
+# from the other Datamedias in use here, and yet to associate a model of
+# the Excel terminals with the regular datamedia terminals that share
+# major characteristics.
+excel62|excel64|datamedia Excel 62:\
+	:dc=\E[P:ei=\E[4l:im=\E[4h:k5=\EOu:k6=\EOv:k7=\EOw:k8=\EOx:\
+	:k9=\EOy:kb=^H:kd=^J:kl=^H:\
+	:tc=dt80:
+excel62-w|excel64-w|datamedia Excel 62 in 132 char mode:\
+	:dc=\E[P:ei=\E[4l:im=\E[4h:k5=\EOu:k6=\EOv:k7=\EOw:k8=\EOx:\
+	:k9=\EOy:kb=^H:kd=^J:kl=^H:\
+	:tc=dt80w:
+excel62-rv|excel64-rv|datamedia Excel 62 in reverse video mode:\
+	:dc=\E[P:ei=\E[4l:im=\E[4h:k5=\EOu:k6=\EOv:k7=\EOw:k8=\EOx:\
+	:k9=\EOy:kb=^H:kd=^J:kl=^H:vb=\E[?5l\E[?5h:\
+	:tc=dt80:
+
+#### Falco
+#
+#	Falco Data Products
+#	440 Potrero Avenue
+#	Sunnyvale, CA 940864-196
+#	Vox: (800)-325-2648
+#	Fax: (408)-745-7860
+#	Net: techsup@charm.sys.falco.com
+#
+# Current Falco models as of 1995 are generally ANSI-compatible and support
+# emulations of DEC VT-series, Wyse, and Televideo types.
+#
+
+# Test version for Falco ts-1. See <arpavax.hickman@ucb> for info
+# This terminal was released around 1983 and was discontinued long ago.
+# The standout and underline highlights are the same.
+falco|ts1|ts-1|falco ts-1:\
+	:am:bs:\
+	:co#80:it#8:li#24:\
+	:al=\EE:bl=^G:cd=\EY:ce=\ET\EG0\010:cl=\E*:cm=\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:is=\Eu\E3:\
+	:k0=^A0\r:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:me=\Eg0:nd=^L:\
+	:se=\Eg0:sf=^J:so=\Eg1:ta=^I:ue=\Eg0:up=^K:us=\Eg1:
+falco-p|ts1p|ts-1p|falco ts-1 with paging option:\
+	:am:bs:da:db:mi:ms:ul:\
+	:co#80:it#8:li#24:\
+	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET\EG0\010\Eg0:cl=\E*:\
+	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=\E[B:ei=\Er:im=\Eq:\
+	:is=\EZ\E3\E_c:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:me=\Eg0:nd=\E[C:se=\Eg0:sf=^J:so=\Eg4:ta=^I:te=\E_b:\
+	:ti=\E_d:ue=\Eg0:up=\E[A:us=\Eg1:
+# (ts100: I added <rmam>/<smam> based on the init string -- esr)
+ts100|ts100-sp|falco ts100-sp:\
+	:am:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E~E:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E~W:dl=\E~R:do=^J:eA=\E(B\E)0:ei=:ho=\E[H:\
+	:i1=\E~)\E~ea:ic=\E~Q:im=:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\
+	:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
+ts100-ctxt|falco ts-100 saving context:\
+	:te=\E~_b:ti=\E~_d\E[2J:tc=ts100:
+
+#### Florida Computer Graphics
+#
+
+# Florida Computer Graphics Beacon System, using terminal emulator program
+# "host.com", as provided by FCG.  This description is for an early release
+# of the "host" program.  Known bug: :cd: clears the whole screen, so it's
+# commented out.
+
+# From: David Bryant <cbosg!djb> 1/7/83
+beacon|FCG Beacon System:\
+	:am:da:db:\
+	:co#80:li#32:\
+	:al=\EE:bl=\ESTART\r\E37\r\EEND\r:ce=\ET:cl=\EZ:\
+	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=\EH:ic=\EQ:\
+	:im=:le=^H:mb=\ESTART\r\E61\0541\r\EEND\r:\
+	:me=\ESTART\r\E78\r\E70\0540\r\EEND\r:\
+	:mr=\ESTART\r\E59\0541\r\EEND\r:nd=\EV:\
+	:se=\ESTART\r\E70\0540\r\EEND\r:sf=^J:\
+	:so=\ESTART\r\E70\0546\r\EEND\r:te=:\
+	:ti=\ESTART\r\E2\0540\r\E12\r\EEND\r:\
+	:ue=\ESTART\r\E60\0540\r\EEND\r:up=\EU:\
+	:us=\ESTART\r\E60\0541\r\EEND\r:
+
+#### Fluke
+#
+
+# The f1720a differences from ANSI: no auto margin, destructive 
+# tabs, # of lines, funny highlighting and underlining
+f1720|f1720a|fluke 1720A:\
+	:xt:\
+	:co#80:li#16:sg#1:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:do=\E[B:is=\E[H\E[2J:kd=^]:kl=^_:kr=^^:ku=^\:le=^H:me=\E[m:\
+	:nd=\E[C:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+
+#### Liberty Electronics (Freedom)
+#
+#	Liberty Electronics
+#	48089 Fremont Blvd
+#	Fremont CA 94538
+#	Vox: (510)-623-6000
+#	Fax: (510)-623-7021
+
+# From: <faletti@berkeley.edu>
+# (f100: added empty <acsc> to suppress a tic warning;
+# made this relative to adm+sgr -- note that <invis> isn't
+# known to work for f100 but does on the f110. --esr)
+f100|freedom|freedom100|freedom model 100:\
+	:am:bs:bw:hs:mi:ms:xo:\
+	:co#80:li#24:\
+	:ac=:ae=\E$:al=\EE:as=\E%:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
+	:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E3:cv=\E[%+ :\
+	:dc=\EW:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:im=\Eq:\
+	:ip=:is=\Eg\Ef\r\Ed:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:\
+	:kB=\EI:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:\
+	:sr=\Ej:st=\E1:ta=^I:ts=\Eg\Ef:up=^K:vb=\Eb\Ed:\
+	:tc=adm+sgr:
+f100-rv|freedom-rv|freedom 100 in reverse video:\
+	:is=\Eg\Ef\r\Eb:vb=\Ed\Eb:tc=f100:
+# The f110 and f200 have problems with vi(1).  They use the ^V
+# code for the down cursor key. When kcud1 is defined in terminfo
+# as ^V, the Control Character Quoting capability (^V in insert mode)
+# is lost! It cannot be remapped in vi because it is necessary to enter
+# a ^V to to quote the ^V that is being remapped!!!
+# 
+# f110/f200 users will have to decide whether
+# to lose the down cursor key or the quoting capability. We will opt
+# initially for leaving the quoting capability out, since use of VI
+# is not generally applicable to most interactive applications
+# (f110: added :ta:, :kh: & <kcbt> from f100 -- esr)
+f110|freedom110|Liberty Freedom 110:\
+	:bw@:es:\
+	:it#8:ws#80:\
+	:ae=\E%%:al=\EE:as=\E$:dl=\ER:do=^V:ds=\Ef\r:ei=\Er\EO:\
+	:im=\EO\Eq:ip@:is@:k0=^AI\r:k;@:kA=\EE:kC=^^:kD=\EW:kE=\ET:\
+	:kI=\EQ:kL=\ER:kS=\EY:mb=\EG2:md=\EG0:mh=\EG@:pf=\Ea:po=\E`:\
+	:so=\EG<:sr=\EJ:ts=\Ef:vb=\Eb\Ed:ve=\E.2:vi=\E.1:vs=\E.2:\
+	:tc=f100:
+f110-14|Liberty Freedom 110 14inch:\
+	:dc@:tc=f110:
+f110-w|Liberty Freedom 110 - 132 cols:\
+	:co#132:tc=f110:
+f110-14w|Liberty Freedom 110 14in/132 cols:\
+	:co#132:\
+	:dc@:tc=f110:
+# (f200: added <acsc> to suppress tic warnings re :as:/:ae: --esr)
+f200|freedom200|Liberty Freedom 200:\
+	:am:bs:es:hs:mi:ms:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:ac=:ae=\E%%:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
+	:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :cr=^M:cs=\Em0%+ %+ :ct=\E3:\
+	:cv=\E[%+ :dc=\EW:dl=\ER:do=^V:ds=\Ef\r:ei=\Er:fs=^M:ho=^^:\
+	:im=\Eq:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=\EE:kC=^^:\
+	:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^V:kl=^H:kr=^L:\
+	:ku=^K:le=^H:mb=\EG2:md=\EG0:mh=\EG@:nd=^L:pf=\Ea:po=\E`:\
+	:sf=^J:so=\EG<:sr=\EJ:st=\E1:ts=\Ef:up=^K:vb=\Eo\En:ve=\E.1:\
+	:vi=\E.0:vs=\E.1:\
+	:tc=adm+sgr:
+f200-w|Liberty Freedom 200 - 132 cols:\
+	:co#132:tc=f200:
+# The f200 has the ability to reprogram the down cursor key. The key is
+# reprogrammed to ^J (linefeed). This value is remembered in non-volatile RAM,
+# so powering the terminal off and on will not cause the change to be lost.
+f200vi|Liberty Freedom 200 for vi:\
+	:kd=^J:vb=\Eb\Ed:tc=f200:
+f200vi-w|Liberty Freedom 200 - 132 cols for vi:\
+	:co#132:tc=f200vi:
+
+#### GraphOn (go)
+#
+#	Graphon Corporation
+#	544 Division Street
+#	Campbell, CA 95008
+#	Vox: (408)-370-4080
+#	Fax: (408)-370-5047
+#	Net: troy@graphon.com (Troy Morrison)
+#
+#
+# The go140 and go225 have been discontinued.  GraphOn now makes X terminals,
+# including one odd hybrid that starts out life on power-up as a character
+# terminal, than can be switched to X graphics mode (driven over the serial
+# line) by an escape sequence.  No info on this beast yet.
+# (go140: I added <rmam>/<smam> based on the init string -- esr)
+go140|graphon go-140:\
+	:bs:\
+	:co#80:it#8:li#24:\
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=10\E[J:ce=\E[K:\
+	:cl=10\E[H\E[2J:cm=\E[%i%2;%2H:dc=\E[P:dl=\E[M:ei=\E[4l:\
+	:if=/usr/share/tabset/vt100:im=\E[4h:\
+	:is=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\EOB:ke=\E[?1l\E>:\
+	:kh=\E[H:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
+	:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
+go140w|graphon go-140 in 132 column mode:\
+	:am:\
+	:co#132:\
+	:is=\E<\E=\E[?3h\E[?7h\E(B\E[J\E7\E[;r\E8\E[m\E[q:tc=go140:
+# Hacked up vt200 termcap to handle GO-225/VT220
+# From: <edm@nwnexus.WA.COM>
+# (go225: I added <rmam>/<smam> based on the init string -- esr)
+go225|go-225|Graphon 225:\
+	:am:bs:mi:xn:\
+	:co#80:it#8:li#25:vt#3:\
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:\
+	:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:r1=\E[\041p\E[?7h\E[2;1;1#w:rc=\E8:\
+	:rf=/usr/share/tabset/vt100:sc=\E7:se=\E[27m:sf=\ED:\
+	:so=\E[7m:sr=\EM:ta=^I:te=\E[\041p\E[?7h\E[2;1;1#w:\
+	:ti=\E[2;0#w\E[1;25r:ue=\E[24m:up=\E[A:us=\E[4m:
+
+#### Harris
+#
+# Bletch.  These guys shared the Terminal Brain Damage laurels with Hazeltine.
+# Their terminal group is ancient history now (1995) though the parent
+# company is still in business.
+#
+
+# 8675, 8686, and bee from Cyrus Rahman
+# (8675: changed k10, k11...k16 to k;, F1...F6 -- esr)
+ha8675|harris 8675:\
+	:F1=^W:F2=\ER:F3=\EE:F4=\EI:F5=\Ei:F6=\Eg:\
+	:is=\ES\E#\E*\Eh\Em\E?\E1\E9\E@\EX\EU:k1=^F:k2=^P:k3=^N:\
+	:k4=^V:k5=^J:k6=^T:k7=^H:k8=\177:k9=\Ee:k;=\Ed:\
+	:tc=bee:
+# (8686: changed k10, k11...k16 to k;, F1...F6; fixed broken continuation
+# in :is: -- esr)
+ha8686|harris 8686:\
+	:F1=\EW:F2=\002\E{\003:F3=\002\E|\003:F4=\002\E}\003:\
+	:F5=\002\E~\003:F6=\002\E\177\003:\
+	:is=\ES\E#\E*\Eh\Em\E?\E1\E9\E@\EX\EU\E"*Z01\E"8F35021B7C83#\E"8F45021B7D83#\E"8F55021B7E83#\E"8F65021B7F83#\E"8F75021B7383#\E"8F851BD7#\E"8F95021B7083#\E"8FA5021B7183#\E"8FB5021B7283#:\
+	:k1=\002\Ep\003:k2=\002\Eq\003:k3=\002\Er\003:\
+	:k4=\002\Es\003:k5=\E3:k6=\EI:k7=\ER:k8=\EJ:k9=\E(:k;=\Ej:tc=bee:
+
+#### Hazeltine
+#
+# Hazeltine appears to be out of the terminal business as of 1995.  These
+# guys were co-owners of the Terminal Brain Damage Hall Of Fame along with
+# Harris. They have a hazeltine.com domain (but no web page there ) and can
+# be reached at:
+#
+#	Hazeltine
+#	450 East Pulaski Road
+#	Greenlawn, New York 11740
+#
+# As late as 1993, manuals for the terminal product line could still be
+# purchased from:
+#
+#	TRW Customer Service Division
+#	15 Law Drive
+#	P.O. Box 2076
+#	Fairfield, NJ 07007-2078
+#
+# They're now (1998) a subsidiary of General Electric, operating under the
+# marque "GEC-Marconi Hazeltine" and doing military avionics.  Web page
+# at <http://www.gec.com/cpd/1ncpd.htm#1.55>.
+#
+
+# Since :nd: is blank, when you want to erase something you
+# are out of luck.  You will have to do ^L's a lot to
+# redraw the screen.  h1000 is untested.  It doesn't work in
+# vi - this terminal is too dumb for even vi.  (The code is
+# there but it isn't debugged for this case.)
+hz1000|hazeltine 1000:\
+	:bs:\
+	:co#80:li#12:\
+	:bl=^G:cl=^L:cr=^M:do=^J:ho=^K:le=^H:nd= :sf=^J:
+# From: <cbosg!ucbvax!pur-ee!cincy!chris> Thu Aug 20 09:09:18 1981
+hz1420|hazeltine 1420:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\E^Z:bl=^G:cd=\E^X:ce=\E^O:cl=\E^\:cm=\E\021%r%.%+ :\
+	:cr=^M:dl=\E^S:do=^J:le=^H:nd=^P:se=\E^Y:sf=^J:so=\E^_:ta=^N:\
+	:up=\E^L:
+# New "safe" cursor movement (11/87) from <cgs@umd5.umd.edu>.  Prevents
+# freakout with out-of-range args and tn3270.  No hz since it needs to
+# receive tildes.
+hz1500|hazeltine 1500:\
+	:am:bs:hz:\
+	:co#80:li#24:\
+	:al=~\032:bl=^G:cd=~\030:ce=~^O:cl=~^\:\
+	:cm=~\021%r%>^^ %+`%+`:cr=^M:dl=~\023:do=~^K:ho=~^R:kd=^J:\
+	:kh=~^R:kl=^H:kr=^P:ku=~^L:le=^H:nd=^P:se=~^Y:sf=^J:so=~^_:\
+	:up=~^L:
+# h1510 assumed to be in sane escape mode.  Else use h1500.
+# (h1510: early versions of this entry apparently had ":se=\E^_:, 
+# :so=\E^Y:, but these caps were commented out in 8.3; also,
+# removed incorrect and overridden ":do=^J:" -- esr)
+hz1510|hazeltine 1510:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\E^Z:bl=^G:cd=\E^X:ce=\E^O:cl=\E^\:cm=\E\021%r%.%.:\
+	:cr=^M:dl=\E^S:do=\E^K:le=^H:nd=^P:sf=^J:up=\E^L:
+# Hazeltine 1520
+# The following switch settings are assumed for normal operation:
+#	FULL		CR		U/L_CASE	ESCAPE
+#	FORMAT_OFF	EOM_A_OFF	EOM_B_OFF	WRAPAROUND_ON
+# Other switches may be set for operator convenience or communication
+# requirements.
+hz1520|Hazeltine 1520:\
+	:am:bs:bw:ms:\
+	:co#80:li#24:\
+	:al=\E^Z:bl=^G:cd=\E^X:ce=\E^O:cl=\E^\:cm=\E\021%r%.%.:\
+	:cr=^M:dl=\E^S:do=^J:ho=\E^R:kA=\E^Z:kC=\E^\:kE=\E^O:\
+	:kL=\E^S:kS=\E^X:kb=^H:kd=\E^K:kh=\E^R:kl=^H:kr=^P:ku=\E^L:\
+	:le=^H:md=\E^_:me=\E^Y:nd=^P:r1=\E$\E\005\E?\E\031:\
+	:se=\E^Y:sf=^J:so=\E^_:up=\E^L:
+# This version works with the escape switch off
+# (h1520: removed incorrect and overridden ":do=^J:" -- esr)
+hz1520-noesc|hazeltine 1520:\
+	:am:hz:\
+	:co#80:li#24:\
+	:al=~^Z:bl=^G:cd=~^X:ce=~^O:cl=~^\:cm=~\021%r%.%.:cr=^M:\
+	:dl=~^S:do=~^K:ho=~^R:le=^H:nd=^P:se=~^Y:sf=^J:so=~^_:up=~^L:
+# Note: the h1552 appears to be the first Hazeltine terminal which
+# is not braindamaged.  It has tildes and backprimes and everything!
+# Be sure the auto lf/cr switch is set to cr.
+hz1552|hazeltine 1552:\
+	:bs:\
+	:al=\EE:dl=\EO:do=^J:k1=\EP:k2=\EQ:k3=\ER:l1=blue:l2=red:\
+	:l3=green:\
+	:tc=vt52:
+hz1552-rv|hazeltine 1552 reverse video:\
+	:do=^J:se=\ET:so=\ES:tc=hz1552:
+# Note: h2000 won't work well because of a clash between upper case and ~'s.
+hz2000|hazeltine 2000:\
+	:am:bs:nc:\
+	:co#74:li#27:\
+	:al=~\032:bl=^G:cl=~\034:cm=~\021%r%.%.:dl=~\023:do=^J:\
+	:ho=~^R:le=^H:pc=\177:sf=^J:
+# Date: Fri Jul 23 10:27:53 1982.  Some unknown person wrote:
+# I tested this termcap entry for the Hazeltine Esprit with vi. It seems
+# to work ok. There is one problem though if one types a lot of garbage
+# characters very fast vi seems not able to keep up and hangs while trying
+# to insert. That's in insert mode while trying to insert in the middle of
+# a line. It might be because the Esprit doesn't have insert char and delete
+# char as a built in function. Vi has to delete to end of line and then 
+# redraw the rest of the line.
+esprit|Hazeltine Esprit I:\
+	:am:bs:bw:\
+	:co#80:li#24:\
+	:al=\E^Z:bl=^G:bt=\E^T:cd=\E^W:ce=\E^O:cl=\E^\:\
+	:cm=\E\021%r%.%.:cr=^M:dl=\E^S:do=\E^K:ho=\E^R:is=\E?:\
+	:k0=^B0^J:k1=^B1^J:k2=^B2^J:k3=^B3^J:k4=^B4^J:k5=^B5^J:\
+	:k6=^B6^J:k7=^B7^J:k8=^B8^J:k9=^B9^J:kb=^H:kd=\E^K:ke=\E>:\
+	:kh=\E^R:kl=^H:kr=^P:ks=\E<:ku=\E^L:l0=0:l1=1:l2=2:l3=3:l4=4:\
+	:l5=5:l6=6:l7=7:l8=8:l9=9:le=^H:nd=^P:se=\E^Y:sf=^J:so=\E^_:\
+	:up=\E^L:
+esprit-am|hazeltine esprit auto-margin:\
+	:am:tc=esprit:
+# Hazeltine Modular-1 from Cliff Shackelton <ittvax!ittral!shackelt> via BRL
+# Vi it seems always wants to send a control J for "do" and it turned out
+# that the terminal would work somewhat if the auto LF/CR was turned off.
+# (hmod1: removed :dn=~^K: -- esr)
+hmod1|Hazeltine Modular 1:\
+	:am:bs:hz:\
+	:co#80:li#24:\
+	:al=~^Z:bl=^G:bt=~^T:cl=~^\:cm=~\021%r%.%.:cr=^M:dl=~^S:\
+	:do=~^K:ho=~^R:kd=~^K:kh=~^R:kl=^H:kr=^P:ku=~^L:le=^H:me=~^Y:\
+	:nd=^P:rc=~^Q:sc=~^E:se=~^Y:sf=^J:so=~^_:up=~^L:
+#
+# Hazeltine Executive 80 Model 30 (1554?)
+#	from  Will Martin <control@ALMSA-1.ARPA> via BRL
+# Like VT100, except for different "am" behavior.
+hazel|exec80|h80|he80|Hazeltine Executive 80:\
+	:am:bs:pt:\
+	:co#80:it#8:li#24:vt#3:\
+	:bl=^G:cd=50\E[J:ce=3\E[K:cl=50\E[;H\E[2J:\
+	:cm=5\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:do=^J:ho=\E[H:\
+	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=2\E[5m:md=2\E[1m:me=2\E[m:mr=2\E[7m:\
+	:nd=2\E[C:nl=^J:r1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:rc=\E8:rf=/usr/share/tabset/vt100:sc=\E7:se=2\E[m:\
+	:so=2\E[7m:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:us=2\E[4m:
+
+#### Hewlett-Packard (hp)
+#
+#	Hewlett-Packard
+#	8000 Foothills Blvd 
+#	Roseville, CA 95747
+#	Vox: 1-(916)-785-4363	(Technical response line for VDTs)
+#	     1-(800)-633-3600	(General customer support)
+#
+#
+# As of March 1998, HP no longer has any terminals in production.
+# The 700 series (22, 32, 41, 44, 92, 94, 96, 98) is still being 
+# supported (they still have parts). So are the 2392a and 2394a.
+# See the WORKSTATION CONSOLES section for the 700s.
+#
+
+# Generic HP terminal - this should (hopefully) work on any HP terminal.
+hpgeneric|hp|hewlett-packard generic terminal:\
+	:am:bs:da:db:mi:pt:xs:\
+	:co#80:li#24:lm#0:vt#6:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:\
+	:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:dl=\EM:\
+	:do=^J:ei=\ER:im=\EQ:kB=\Ei:kb=^H:le=^H:me=\E&d@:nd=\EC:\
+	:se=\E&d@:sf=^J:so=\E&dJ:st=\E1:ta=^I:ue=\E&d@:up=\EA:\
+	:us=\E&dD:
+
+hp110|hewlett-packard model 110 portable:\
+	:li#16:tc=hpgeneric:
+
+hp+pfk+cr|hp function keys with CR:\
+	:k1=\Ep\r:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:\
+	:k7=\Ev\r:k8=\Ew\r:
+
+hp+pfk-cr|hp function keys w/o CR:\
+	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:
+
+# The hp2621s use the same keys for the arrows and function keys, 
+# but not separate escape sequences. These definitions allow the 
+# user to use those keys as arrow keys rather than as function 
+# keys.
+hp+pfk+arrows|hp alternate arrow definitions:\
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:kF=\Er\r:kH=\Eq\r:kR=\Es\r:\
+	:kd=\Ew\r:kh=\Ep\r:kl=\Eu\r:kr=\Ev\r:ku=\Et\r:
+
+hp+arrows|hp arrow definitions:\
+	:kF=\ES:kH=\EF:kR=\ET:kd=\EB:kh=\Eh:kl=\ED:kr=\EC:ku=\EA:
+
+# Generic stuff from the HP 262x series
+#
+hp262x|HP 262x terminals:\
+	:xs:\
+	:cd=\EJ:dc=\EP:ip=:kA=\EL:kD=\EP:kE=\EK:kF=\ES:kI=\EQ:kL=\EM:\
+	:kM=\ER:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:mb=\E&dA:me=\E&d@:mk=\E&dS:\
+	:mr=\E&dB:\
+	:..sa=\E&d%{64}%?%p1%t%{66}%|%;%?%p2%t%{68}%|%;%?%p3%t%{66}%|%;%?%p4%t%{65}%|%;%c:\
+	:se=\E&d@:sf=\ES:so=\E&dB:ta=\011:ue=\E&d@:us=\E&dD:
+
+# Note: no :ho: on HPs since that homes to top of memory, not screen.
+# Due to severe 2621 braindamage, the only way to get the arrow keys to
+# transmit anything at all is to turn on the function key labels
+# with :ks:, and even then the user has to hold down shift!
+# The default 2621 turns off the labels except when it has to to 
+# enable the function keys. If your installation prefers labels 
+# on all the time, or off all the time (at the "expense" of the 
+# function keys), use 2621-nl or 2621-wl.
+# 
+# Note: there are newer ROMs for 2621's that allow you to set 
+# strap A so the regular arrow keys xmit \EA, etc, as with the 
+# 2645. However, even with this strap set, the terminal stops 
+# xmitting if you reset it, until you unset and reset the strap!
+# Since there is no way to set/unset the strap with an escape 
+# sequence, we don't use it in the default.
+# If you like, you can use 2621-ba (brain-damaged arrow keys).
+hp2621-ba|2621 w/new rom and strap A set:\
+	:ke@:ks@:tc=hp+arrows:\
+	:tc=hp2621:
+
+# hp2621 with function labels. Most of the time they are off,
+# but inside vi, the function key labels appear. You have to
+# hold down shift to get them to xmit.
+hp2621|hp2621a|hp2621A|2621|2621a|2621A|hp2621-wl|2621-wl|hp 2621 w/labels:\
+	:is=\E&jA\r:ke=\E&jA:\
+	:tc=hp2621-fl:
+hp2621-fl|hp 2621:\
+	:xo:xs@:\
+	:pb#19200:\
+	:bt=\Ei:cm=\E&a%r%dc%dY:dc=\EP:ip=:is=\E&j@\r:ke=\E&j@:\
+	:ks=\E&jB:me=\E&d@:se=\E&d@:so=\E&dD:ta=\011:ue=\E&d@:\
+	:us=\E&dD:\
+	:tc=hp+pfk+cr:tc=hpgeneric:
+
+# To use hp2621p printer, setenv TERM=2621p, PRINTER=2612p
+hp2621p|hp 2621 with printer:\
+	:pf=\E&p13C:po=\E&p11C:tc=hp2621:
+
+hp2621p-a|hp2621p with fn as arrows:\
+	:tc=hp+pfk+arrows:tc=hp2621p:
+
+# hp2621 with k45 keyboard
+hp2621-k45|hp2621k45|k45|hp 2621 with 45 keyboard:\
+	:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:\
+	:ku=\EA:\
+	:tc=hp2621:
+
+# 2621 using all 48 lines of memory, only 24 visible at any time.  
+hp2621-48|48 line 2621:\
+	:li#48:\
+	:cm=\E&a%r%dc%dR:cv=\E&a%dR:ho=\EH:tc=hp2621:
+
+# 2621 with no labels ever. Also prevents vi delays on escape.
+hp2621-nl|hp 2621 with no labels:\
+	:kd@:ke@:kh@:kl@:kr@:ks@:ku@:tc=hp2621-fl:
+
+# Needed for UCB ARPAVAX console, since lsi-11 expands tabs 
+# (wrong).
+#
+hp2621-nt|hp 2621 w/no tabs:\
+	:ta@:tc=hp2621:
+
+# Hp 2624 B with 4 or 10 pages of memory.
+# 
+# Some assumptions are made with this entry. These settings are 
+# NOT set up by the initialization strings.
+# 
+# Port Configuration
+# 	RecvPace=Xon/Xoff
+# 	XmitPace=Xon/Xoff
+# 	StripNulDel=Yes
+# 
+# Terminal Configuration
+# 	InhHndShk=Yes
+# 	InhDC2=Yes
+# 	XmitFnctn(A)=No
+# 	InhEolWrp=No
+# 
+# Note: the 2624 DOES have a true :ho:, believe it or not!
+# 
+# The 2624 has an "error line" to which messages can be sent. 
+# This is CLOSE to what is expected for a "status line". However,
+# after a message is sent to the "error line", the next carriage 
+# return is EATEN and the "error line" is turned back off again! 
+# So I guess we can't define :hs:, :es:, :ws:, :ds:, :fs:, :ts:.
+# 
+# This entry supports emacs (and any other program that uses raw 
+# mode) at 4800 baud and less. I couldn't get the padding right 
+# for 9600.
+#
+# (hp2624: replaced NUL sequences in flash with mandatory pauses -- esr)
+hp2624|hp2624a|hp2624b|hp2624b-4p|Hewlett Packard 2624 B:\
+	:da:db:\
+	:lm#96:\
+	:vb=\E&w13F\E&w12F\E&w13F\E&w12F:tc=hp+labels:tc=scrhp:
+
+# This hp2626 entry does not use any of the fancy windowing stuff 
+# of the 2626.
+# 
+# Indeed, terminfo does not yet handle such stuff. Since changing 
+# any window clears memory, it is probably not possible to use 
+# this for screen opt.
+# 
+# ed is incredibly slow most of the time - I am guessing at the 
+# exact padding. Since the terminal uses xoff/xon this is intended 
+# only for cost computation, so that the terminal will prefer el 
+# or even dl1 which is probably faster!
+# 
+# \ED\EJ\EC hack for ed from Ed Bradford - apparently ed is only 
+# extra slow on the last line of the window. 
+# 
+# The padding probably should be changed.
+#
+hp2626|hp2626a|hp2626p|hp 2626:\
+	:da:db:\
+	:lm#0:pb#19200:\
+	:SF=\E&r%dD:SR=\E&r%dU:cd=\ED\EJ\EC:ip=:is=\E&j@\r:tc=hp+pfk+cr:tc=hp+labels:tc=scrhp:
+
+# This entry is for sysline. It allocates a 23 line window with 
+# a 115 line workspace for regular use, and a 1 line window for 
+# the status line.
+# 
+# This assumes port 2 is being used.
+# Turn off horizontal line, Create ws #1 with 115 lines,
+# Create ws #2 with 1 line, Create window #1 lines 1-23,
+# Create window #2 lines 24-24, Attach cursor to workspace #1.
+# Note that this clears the tabs so it must be done by tset before
+# it sets the tabs.
+#
+hp2626-s|hp 2626 using only 23 lines:\
+	:es:hs:\
+	:li#23:\
+	:fs=\E&d@\E&w7f2p1I\E&w4f1I:\
+	:i1=\E&q3t0{0H \E&w0f115n1I \E&w0f1n2I \E&w2f1i0d0u22l0S \E&w2f2i0d23u23l0S \E&w7f2p1I \r:\
+	:ts=\E&w7f2p2I\E&w4f2I\r\EK\E&a%p1%dC:\
+	:tc=hp2626:
+# Force terminal back to 24 lines after being 23.
+hp2626-ns|hp 2626 using all 24 lines:\
+	:i1=\E&q3t0{0H \E&w0f118n1I \E&w0f1n2I \E&w2f1i0d0u23l0S \E&w3f2I \E&w7f2p1I \r:tc=hp2626:
+# Various entries useful for small windows on 2626.
+hp2626-12|hewlett-packard 2626 12 lines:\
+	:li#12:tc=hp2626:
+hp2626-12x40|hewlett-packard 2626 12 lines 40 columns:\
+	:co#40:li#12:tc=hp2626:
+hp2626-x40|hewlett-packard 2626 40 columns:\
+	:co#40:tc=hp2626:
+hp2626-12-s|hewlett-packard 2626 11 lines plus status:\
+	:li#11:tc=hp2626-s:
+
+#
+# hp2627 color tubes from University of Wisconsin
+#
+hp2627a-rev|hp 2627 with reverse video colors:\
+	:cr=^M:do=^J:\
+	:is=\E&v0m1a0b0c1x1y1z1i0a0b1c1x1y1z0i0S\E&j@\r\E3\r:\
+	:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:ue=\E&v0S\E&d@:\
+	:us=\E&dD\E&v1S:\
+	:tc=hp2621-nl:
+hp2627a|hp 2627 color terminal with no labels:\
+	:cr=^M:do=^J:\
+	:is=\E&v0m1a1b0c1i0a1b1c2i1a0b0c0i0S\E&j@\r\E3\r:\
+	:kb=^H:kd=^J:kl=^H:nw=^M^J:se=\E&v0S:sf=^J:so=\E&v2S:ta=^I:\
+	:ue=\E&v0S\E&d@:us=\E&dD\E&v1S:\
+	:tc=hp2621-nl:
+hp2627c|hp 2627 color (cyan) terminal with no labels:\
+	:cr=^M:do=^J:\
+	:is=\E&v0m1a0b0c2i1a1b0c1i0a1b1c0i0S\E&j@\r\E3\r:\
+	:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:\
+	:tc=hp2627a:
+
+# hp2640a doesn't have the Y cursor addressing feature, and C is 
+# memory relative instead of screen relative, as we need.
+#
+hp2640a|hp 2640a:\
+	:cm@:ke@:ks@:tc=hp2645:
+
+hp2640b|hp2644a|hp 264x series:\
+	:ke@:ks@:tc=hp2645:
+
+# (hp2641a: removed unknown :gu: -- esr)
+hp2641a|hp2645a|hp2647a|HP 264?A series BRL entry:\
+	:am:da:db:mi:xs:\
+	:co#80:li#24:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%2C:cl=\EH\EJ:\
+	:cm=\E&a%r%2c%2Y:cr=^M:cv=\E&a%2Y:dc=\EP:dl=\EM:do=^J:\
+	:ei=\ER:if=/usr/share/tabset/std:im=\EQ:is=500\EE:kb=^H:\
+	:kd=^J:kl=^H:le=^H:nd=\EC:nw=^M^J:se=\E&d@:sf=^J:so=\E&dB:\
+	:ta=^I:up=\EA:
+
+# This terminal should be used at 4800 baud or less. It needs padding for
+# plain characters at 9600, I guessed at an appropriate cr delay.  It really
+# wants ^E/^F handshaking, but that doesn't work well even if you write
+# software to support it.
+hp2645|hp45|HP 2645 series:\
+	:pb#9600:\
+	:cr=\r:kA=\EL:kD=\EP:kE=\EK:kF=\ES:kI=\EQ:kL=\EM:kM=\ER:\
+	:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kT=\E1:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:ku=\EA:mb=\E&dA:me=\E&d@:\
+	:mh=\E&dH:mr=\E&dB:\
+	:..sa=\E&d%{64}%?%p1%t%{66}%|%;%?%p2%t%{68}%|%;%?%p3%t%{66}%|%;%?%p4%t%{65}%|%;%?%p5%t%{72}%|%;%?%p6%t%{66}%|%;%c:\
+	:us=\E&dD:\
+	:tc=hpgeneric:
+# You should use this terminal at 4800 baud or less.
+hp2648|hp2648a|HP 2648a graphics terminal:\
+	:cl=\EH\EJ:cm=\E&a%r%dc%dY:dc=\EP:ip=:tc=hp2645:
+
+# The HP 150 terminal is a fairly vanilla HP terminal, with the 
+# clreol standout problem. It also has graphics capabilities and 
+# a touch screen, which we don't describe here.
+hp150|hewlett packard Model 150:\
+	:bs:tc=hp2622:
+
+# HP 2382a terminals, "the little ones." They don't have any 
+# alternate character set support and sending out ^N/^O will 
+# leave the screen blank.
+hp2382a|hp2382|hewlett packard 2382a:\
+	:da:db:\
+	:lh#1:lm#48:\
+	:ac@:ae@:as@:me=\E&d@:\
+	:..pn=\E&f0a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d0L%?%ga%!%t %;%p2%s:\
+	:..sa=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga%+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+%Pa%;%?%p7%t%?%ga%ts%ga%{64}%+%e%{83}%;%e%?%ga%t%ga%{64}%+%e%{64}%;%;%c:\
+	:tc=hp+labels:tc=scrhp:
+
+hp2621-a|hp2621a-a|hp2621 with fn as arrows:\
+	:tc=hp+pfk+arrows:tc=hp2621-fl:
+
+# newer hewlett packard terminals
+
+newhpkeyboard|generic entry for HP extended keyboard:\
+	:kA=\EL:kB=\Ei:kC=\EJ:kD=\EP:kE=\EK:kF=\ET:kH=\EF:kI=\EQ:\
+	:kL=\EM:kM=\ER:kN=\EU:kP=\EV:kR=\ES:kS=\EJ:kb=^H:kd=\EB:\
+	:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:\
+	:tc=hp+pfk-cr:
+
+newhp|generic entry for new hewlett packard terminals:\
+	:am:bw:mi:xo:xs:\
+	:co#80:li#24:pb#4800:\
+	:ac=2[3@4>5I9(\072'JSKWLQMAO#P$Q;R\041S"T1U2V4W3X\072Y+Z*dHjGkTlRmFn/q\054t5u6v8w7x.:\
+	:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:cr=^M:ct=\E3:\
+	:dc=\EP:dl=\EM:do=^J:ei=\ER:i1=\E&jB:im=\EQ:ip=:le=^H:\
+	:mb=\E&dA:md=\E&dF:me=\E&d@\017:mh=\E&dH:mk=\E&dS:\
+	:mr=\E&dB:nd=\EC:nw=^M^J:\
+	:..pk=\E&f0a%p1%dk0d%p2%l%dL%p2%s:\
+	:..pl=\E&f1a%p1%dk0d%p2%l%dL%p2%s:\
+	:..px=\E&f2a%p1%dk0d%p2%l%dL%p2%s:r1=\Eg:\
+	:..sa=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga%+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+%Pa%;%?%p7%t%?%ga%ts%ga%{64}%+%e%{83}%;%e%?%ga%t%ga%{64}%+%e%{64}%;%;%c%?%p9%t\016%e\017%;:\
+	:se=\E&d@:sf=^J:so=\E&dJ:sr=\ET:st=\E1:ta=\011:ue=\E&d@:\
+	:up=\EA:us=\E&dD:\
+	:tc=newhpkeyboard:
+
+memhp|memory relative addressing for new HP ttys:\
+	:vt#6:\
+	:CM=\E&a%p1%dr%p2%dC:DO=\E&a+%dR:LE=\E&a-%dC:\
+	:RI=\E&a+%dC:UP=\E&a-%dR:ch=\E&a%dC:cl=\EH\EJ:\
+	:cm=\E&a%dr%dC:cv=\E&a%dR:ho=\EH:ll=\E&a23R\r:tc=newhp:
+
+scrhp|screen relative addressing for new HP ttys:\
+	:CM=\E&a%p1%dr%p2%dC:DO=\E&a+%dR:LE=\E&a-%dC:\
+	:RI=\E&a+%dC:UP=\E&a-%dR:ch=\E&a%dC:cl=\E&a0c0Y\EJ:\
+	:cm=\E&a%dy%dC:cv=\E&a%dY:ho=\E&a0y0C:ll=\E&a0y0C\EA:\
+	:tc=newhp:
+
+# (hp+labels: added label values from a BRL termcap -- esr)
+hp+labels|"standard" label info for new HP ttys:\
+	:Nl#8:lh#2:lw#8:\
+	:LF=\E&j@:LO=\E&jB:l0=f1:l1=f2:l2=f3:l3=f4:l4=f5:l5=f6:l6=f7:\
+	:l7=f8:\
+	:..pn=\E&f2a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d0L%?%ga%!%t %;%p2%s:
+
+hp+printer|"standard" printer info for HP ttys:\
+	:ff=\E&p4u0C:pf=\E&p13C:po=\E&p11C:ps=\EH\E&p4dF:
+
+
+# The new hp2621b is kind of a cross between the old 2621 and the
+# new 262x series of machines. It has dip-switched options. 
+# The firmware has a bug in it such that if you give it a null 
+# length label, the following character is eaten!
+hp2621b|hp 2621b with old style keyboard:\
+	:Nl#8:lh#1:lm#48:lw#8:\
+	:LO=\E&jB:kF=\ET:kH=\EF:kR=\ES:kd=\EB:kh=\Eh:kl=\ED:kr=\EC:\
+	:ku=\EA:\
+	:..pn=\E&f0a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d3L%?%ga%!%t%{32}%c%;%p2%s\E%{111}%p1%+%c\r:tc=hp2621:
+
+hp2621b-p|hp 2621b with printer:\
+	:tc=hp+printer:tc=hp2621b:
+
+# hp2621b - new 2621b with new extended keyboard
+# these are closer to the new 26xx series than the other 2621b
+hp2621b-kx|hp 2621b with extended keyboard:\
+	:tc=newhpkeyboard:tc=hp2621b:
+
+hp2621b-kx-p|hp 2621b with new keyboard & printer:\
+	:tc=hp+printer:tc=hp2621b-kx:
+
+# Some assumptions are made in the following entries.
+# These settings are NOT set up by the initialization strings.
+# 
+#    Port Configuration
+# RecvPace=Xon/Xoff	XmitPace=Xon/Xoff	StripNulDel=Yes
+# 
+#    Terminal Configuration
+# InhHndShk(G)=Yes	InhDC2(H)=Yes
+# XmitFnctn(A)=No		InhEolWrp=No
+#
+# 
+# Hp 2622a & hp2623a display and graphics terminals
+#
+hp2622|hp2622a|hp 2622:\
+	:da:db:\
+	:lm#0:pb#19200:\
+	:is=\E&dj@\r:tc=hp+pfk+cr:tc=hp+labels:tc=scrhp:
+
+# The 2623 is a 2622 with extra graphics hardware.
+hp2623|hp2623a|hp 2623:\
+	:tc=hp2622:
+
+hp2624b-p|hp2624b-4p-p|hewlett packard 2624 B with printer:\
+	:tc=hp+printer:tc=hp2624:
+
+# The hewlett packard B can have an optional extra 6 pages of memory.
+hp2624-10p|hp2624a-10p|hp2624b-10p|hewlett packard 2624 B w/ 10 pages of memory:\
+	:lm#240:tc=hp2624:
+
+hp2624b-10p-p|hewlett packard 2624 B w/ extra memory & printer:\
+	:lm#240:tc=hp2624b-p:
+
+# Color manipulations for HP terminals
+hp+color|hp with colors:\
+	:cc:\
+	:Co#16:NC#17:pa#7:\
+	:..Ip=\E&v%?%p2%{1000}%=%t1%e.%p2%d%;a%?%p3%{1000}%=%t1%e.%p3%d%;b%?%p4%{1000}%=%t1%e.%p4%d%;c%?%p5%{1000}%=%t1%e.%p5%d%;x%?%p6%{1000}%=%t1%e.%p6%d%;y%?%p7%{1000}%=%t1%e.%p7%d%;z%p1%dI:\
+	:oc=\E&v0m1a1b1c0I\E&v1a1I\E&v1b2I\E&v1a1b3I\E&v1c4I\E&v1a1c5I\E&v1b1c6I\E&v1x1y7I:\
+	:op=\E&v0S:sp=\E&v%dS:
+
+# :is: sets the screen to be 80 columns wide
+hp2397a|hp2397|hewlett packard 2397A color terminal:\
+	:is=\E&w6f80X:\
+	:tc=memhp:tc=hp+labels:tc=hp+color:
+
+#
+# (hp2392: copied :ei: here from hpex -- esr)
+hp2392|239x series:\
+	:co#80:\
+	:bt=\Ei:cm=\E&a%dy%dC:cv=\E&a%dY:ei=\ER:im=\EQ:k1=\Ep\r:\
+	:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:\
+	:k8=\Ew\r:kF=\EU:kN=\Eu:kP=\Ev:kR=\EV:kh=\Eh:ue=\E&d@:\
+	:us=\E&dD:\
+	:tc=hpsub:
+
+hpsub|hp terminals -- capability subset:\
+	:am:da:db:mi:xo:xs:\
+	:li#24:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:cr=^M:\
+	:dc=\EP:dl=\EM:do=\EB:if=/usr/share/tabset/stdcrt:\
+	:is=\E&s1A\E<\E&k0\:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:\
+	:kr=\EC:ks=\E&s1A:ku=\EA:le=^H:me=\E&d@:nd=\EC:se=\E&d@:\
+	:sf=^J:so=\E&dB:ta=^I:up=\EA:
+
+# hpex:
+#	May be used for most 24 x 80 hp terminals,
+# but has no padding added, so may allow runover in some terminals at high 
+# baud rates.  Will not work for hp2640a or hp2640b terminals, hp98x6 and 
+# hp98x5 terminal emulators or hp98x6 consoles.  
+# 	Adds xy-cursor addressing, vertical cursor addressing, home, 
+# last line, and underline capabilities.
+#
+# (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:",
+# moved :ei: here from hpsub -- esr)
+hpex|hp extended capabilites:\
+	:cm=\E&a%dy%dC:cr=^M:cv=\E&a%dY:do=^J:ei=\ER:im=\EQ:kb=^H:\
+	:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:ue=\E&d@:us=\E&dD:\
+	:tc=hpsub:
+
+# From: Ville Sulko <Ville.Sulko@bip.atk.tpo.fi>, 05 Aug 1996
+hp2|hpex2|hewlett-packard extended capabilities newer version:\
+	:am:da:db:mi:xs:\
+	:Nl#8:co#80:lh#2:li#24:lm#0:lw#8:sg#0:\
+	:LF=\E&j@:LO=\E&jB:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%dC:\
+	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:cv=\E&a%dY:\
+	:dc=\EP:dl=\EM:do=\EB:ei=\ER:im=\EQ:k1=\Ep:k2=\Eq:k3=\Er:\
+	:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kA=\EL:kC=\EJ:kD=\EP:\
+	:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:kM=\ER:kN=\EU:kP=\EV:\
+	:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:ku=\EA:le=^H:me=\E&d@:\
+	:ml=\El:mu=\Em:nd=\EC:..pk=\E&f%p1%dk%p2%l%dL%p2%s:\
+	:..pl=\E&f1a%p1%dk%p2%l%dL%p2%s:\
+	:..pn=\E&f%p1%dk%p2%l%dd0L%p2%s:\
+	:..px=\E&f2a%p1%dk%p2%l%dL%p2%s:\
+	:..sa=\E&d%?%p7%t%{115}%c%;%p1%p3%|%p6%|%{2}%*%p2%{4}%*%+%p4%+%p5%{8}%*%+%{64}%+%c%?%p9%t%'\016'%c%e%'\017'%c%;:\
+	:se=\E&d@:sf=^J:so=\E&dB:st=\E1:ta=^I:ue=\E&d@:up=\EA:\
+	:us=\E&dD:
+
+# HP 236 console
+# From: <ddavis@ic.berkeley.edu>
+hp236|hp236 internal terminal emulator:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\EG:ce=\EK:cl=\EF:cm=\EE%+ %+ :dc=\EJ:dl=\EH:ei=:ic=\EI:\
+	:im=:le=^H:me=\ECI:se=\ECI:so=\EBI:up=^K:ve=\EDE:vs=\EDB:
+
+# This works on a hp300 console running Utah 4.3 BSD
+# From: Craig Leres <leres@okeeffe.berkeley.edu>
+hp300h|HP Catseye console:\
+	:am:bs:da:db:mi:xs:\
+	:co#128:li#51:lm#0:sg#0:\
+	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:\
+	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:cv=\E&a%dY:\
+	:dc=\EP:dl=\EM:do=\EB:ei=\ER:if=/usr/share/tabset/stdcrt:\
+	:im=\EQ:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
+	:ks=\E&s1A:ku=\EA:le=^H:me=\E&d@:nd=\EC:se=\E&d@:sf=^J:\
+	:so=\E&dB:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
+# From: Greg Couch <gregc@ernie.berkeley.edu>
+hp9837|hp98720|hp98721|HP 9000/300 workstations:\
+	:am:bs:da:db:mi:xs:\
+	:co#128:it#8:li#46:lm#0:\
+	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:\
+	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:ct=\E3:cv=\E&a%dY:dc=\EP:\
+	:dl=\EM:do=\EB:ei=\ER:im=\EQ:is=\E&v0m1b0i&j@:kA=\EL:\
+	:kD=\EP:kE=\EK:kI=\EQ:kL=\EM:kN=\EU:kP=\EV:kS=\EJ:kb=^H:\
+	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:\
+	:le=^H:me=\E&d@:nd=\EC:se=\E&v0S:sf=^J:so=\E&v5S:st=\E1:\
+	:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
+# HP 9845 desktop computer from BRL
+# (hp9845: removed unknown capability :gu: -- esr)
+hp9845|HP 9845:\
+	:am:bs:da:db:eo:mi:xs:\
+	:co#80:li#21:\
+	:al=\EL:bc=\ED:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\E&a%r%2c%2Y:\
+	:dc=\EP:dl=\EM:ei=\ER:if=/usr/share/tabset/std:im=\EQ:\
+	:nd=\EC:se=\E&d@:so=\E&dB:up=\EA:
+# From: Charles A. Finnell of MITRE <finnell@mitre.org>, developed 07SEP90
+# (hp98550: replaced /usr/share/tabset/9837 with std because :it#8:,:st=\E1:;
+# added empty <acsc> to avoid warnings re :as:/:ae: --esr)
+hp98550|hp98550a|HP 9000 Series 300 color console:\
+	:am:bs:da:db:mi:xs:\
+	:co#128:it#8:li#49:lm#0:\
+	:ac=:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:\
+	:ch=\E&a%dC:cl=\EH\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:\
+	:cv=\E&a%dY:dc=\EP:dl=\EM:do=^J:ei=\ER:\
+	:if=/usr/share/tabset/std:im=\EQ:k1=\Ep:k2=\Eq:k3=\Er:\
+	:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kA=\EL:kC=\EJ:kD=\EP:\
+	:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:kM=\ER:kN=\EU:kP=\EV:\
+	:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:ku=\EA:le=^H:mb=\E&dA:\
+	:md=\E&dJ:me=\E&d@:mh=\E&dH:mk=\E&ds:mr=\E&dJ:nd=\EC:\
+	:se=\E&d@:sf=^J:so=\E&dJ:st=\E1:ta=^I:ue=\E&d@:up=\EA:\
+	:us=\E&dD:ve=\E*dQ:vi=\E*dR:
+
+bobcat|sbobcat|HP 9000 model 300 console:\
+	:am:da:db:mi:xs:\
+	:co#128:it#8:li#47:sg#0:\
+	:al=10*\EL:bt=\Ei:cd=\EJ:ce=\EK:ch=6\E&a%dC:cl=\EH\EJ:\
+	:cm=6\E&a%dy%dC:cr=^M:cv=6\E&a%dY:dc=\EP:dl=10*\EM:do=\EB:\
+	:ei=\ER:im=\EQ:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
+	:ks=\E&s1A:ku=\EA:le=^H:me=\E&d@:nd=\EC:nw=^M^J:se=\E&d@:\
+	:sf=^J:so=\E&dB:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
+gator-t|HP 9000 model 237 emulating extra-tall AAA:\
+	:li#94:tc=gator:
+gator|HP 9000 model 237 emulating AAA:\
+	:bw:km:mi:ul:\
+	:co#128:it#8:li#47:\
+	:AL=1*\E[%dL:DC=4\E[%dP:DL=1*\E[%dM:IC=4\E[%d@:al=\E[L:\
+	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%d`:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=:ho=\E[H:\
+	:ic=\E[@:im=:kb=^H:kd=^J:kl=^H:le=^H:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nw=^M^J:rp=1*%.\E[%db:se=\E[m:so=\E[7m:ta=^I:\
+	:ue=\E[m:up=\EM:us=\E[4m:
+gator-52|HP 9000 model 237 emulating VT52:\
+	:co#128:li#47:tc=vt52:
+gator-52t|HP 9000 model 237 emulating extra-tall VT52:\
+	:li#94:tc=gator-52:
+
+#### Honeywell-Bull
+#
+# From: Michael Haardt <michael@gandalf.moria> 11 Jan 93
+#
+
+# Honeywell Bull terminal.  Its cursor and function keys send single
+# control characters and it has standout/underline glitch.  Most programs
+# do not like these features/bugs.  Visual bell is realized by flashing the
+# "keyboard locked" LED.
+dku7003-dumb|Honeywell Bull DKU 7003 dumb mode:\
+	:co#80:li#25:\
+	:cd=^_:ce=\E[K:cl=^]^_:cm=\E[%i%d;%dH:cr=^M:do=^K:ho=^]:\
+	:kb=^H:kd=^K:kh=^]:kl=^Y:kr=^X:ku=^Z:le=^Y:nd=^X:nw=^M^J:\
+	:sf=^J:ta=^I:up=^Z:vb=\E[2h\E[2l:
+dku7003|Honeywell Bull DKU 7003 all features described:\
+	:ms:\
+	:sg#1:\
+	:mb=\E[5m:md=\E[7m:me=\E[m:mh=\E[2m:mr=\E[7m:se=\E[m:\
+	:so=\E[7m:ue=\E[m:us=\E[4m:\
+	:tc=dku7003-dumb:
+
+#### IBM
+#
+
+ibm327x|line mode IBM 3270 style:\
+	:gn:\
+	:ce=^M:cl=^M^J:ho=^M:
+
+# Beware! The 3101 entry IBM shipped with AIX 3 is *wrong*.  Losers...
+# From: J.B. Nicholson-Owens <jeffo@uiuc.edu> 8 Mar 94
+# (ibm3101: :if=/usr/share/tabset/ibm3101: removed, no such file -- esr)
+# Some versions of this that have :ct=\EH:; they may ort may not be broken.
+ibm3101|i3101|IBM 3101-10:\
+	:am:bs:xo:\
+	:co#80:li#24:\
+	:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EY%+ %+ :cr=^M:ct=\E1:do=^J:\
+	:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
+	:nw=^M^J:sf=^J:st=\E0:ta=^I:up=\EA:
+ibm3151|IBM 3151 display:\
+	:ae=\E>B:as=\E>A:is=\E S:me=\E4@\E>B:r2=\E S:s0=\E>B:\
+	:..sa=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E>B%;:\
+	:te=\E>B:ti=\E>B:\
+	:tc=ibm3163:
+# From: Mark Easter <marke@fsi-ssd.csg.ssd.fsi.com> 29 Oct 1992 
+# I've commented out or translated some IBM extensions.
+# <kend>, :kN:, :kP:, <mc4>, <mc5> merged in from AIX 3.2.5  
+ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display:\
+	:am:bs:mi:ms:\
+	:co#80:it#8:li#24:\
+	:@7=\E2:F1=\Ek\r:F2=\El\r:F3=\E\041a\r:F4=\E\041b\r:\
+	:F5=\E\041c\r:F6=\E\041d\r:F7=\E\041e\r:F8=\E\041f\r:\
+	:F9=\E\041g\r:FA=\E\041h\r:FB=\E\041i\r:FC=\E\041j\r:\
+	:FD=\E\041k\r:FE=\E\041l\r:\
+	:ac=j\352k\353l\354m\355n\356q\361t\364u\365v\366w\367x\370:\
+	:bl=^G:cd=\EJ:ce=\EI:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:dc=\EQ:\
+	:dl=\EO:do=\EB:ho=\EH:k1=\Ea\r:k2=\Eb\r:k3=\Ec\r:k4=\Ed\r:\
+	:k5=\Ee\r:k6=\Ef\r:k7=\Eg\r:k8=\Eh\r:k9=\Ei\r:k;=\Ej\r:\
+	:kA=\EN:kB=\E2:kC=\EL\r:kD=\EQ:kE=\EI:kI=\EP \010:kL=\EO:\
+	:kN=\EI:kP=\EL:kS=\EJ:kT=\E0:ka=\E 1:kb=^H:kd=\EB:kh=\EH:\
+	:kl=\ED:kr=\EC:kt=\E1:ku=\EA:le=\ED:mb=\E4D:md=\E4H:\
+	:me=\E4@\E<@:mk=\E4P:mr=\E4A:nd=\EC:pf=^P^T:po=^P^R:\
+	:..sa=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E<@%;:\
+	:se=\E4@:sf=^J:so=\E4A:te=\E>A:ti=\E>A:ue=\E4@:up=\EA:\
+	:us=\E4B:
+
+ibm3161-C|IBM 3161-C NLS terminal using cartridge:\
+	:s0=\E>B:s1=\E>A:te=\E>B:ti=\E>B:\
+	:tc=ibm3161:
+ibm3162|IBM 3162 display:\
+	:al=\EN:mb=\E4$a:md=\E4(a:me=\E4@:mk=\E40a:mr=\E4\041a:\
+	:se=\E4>b:so=\E4\041a:ue=\E4=b:us=\E4"a:\
+	:tc=ibm3161-C:
+
+# How the 3164 sgr string works:
+#	%{32}	        # push space for no special video characteristics
+#	%?%p2%t%{1}%|%; # if p2 set, then OR the 1 bit for reverse
+#	%?%p3%t%{4}%|%; # if p3 set, then OR the 4 bit for blink
+#	%?%p4%t%{2}%|%; # if p4 set, then OR the 2 bit for underline
+#	%c              # pop Pa1
+#	%{39}%p1%-	# calculate 32 + (7 - p1) for foreground
+#	%c		# pop Pa2 
+#	%{64}		# use only black background for now
+#	%c		# pop Pa3
+# (ibm3164: merged :ms:,<colors>,<pairs>,<setb>,<setf> from AIX 3.2.5 -- esr)
+ibm3164|i3164|IBM 3164:\
+	:ms:\
+	:Co#8:pa#64:\
+	:Sb=\E4  %+@:..Sf=\E4%?%p1%t %p1%{32}%+%c%e\041'%;@:\
+	:mb=\E4D:md=\E4H:me=\E4@:\
+	:..sa=\E4%{32}%?%p2%t%{1}%|%;%?%p3%t%{4}%|%;%?%p4%t%{2}%|%;%c%{39}%p1%-%c%{64}%c:tc=ibm3163:
+
+# From: <pryor@math.berkeley.edu>
+# (ibm5081: merged acsc, s0ds, s1ds, sgr0 into ibm5081 from AIX 3.2.5. -- esr)
+ibm5081|ibmmpel|IBM 5081 1024x1024 256/4096 Megapel color display:\
+	:es:hs:\
+	:li#33:\
+	:ac=jjkkllmmnnqqttuuvvwwxx:ds=\Ej\EYA \EI\Ek:fs=\Ek:\
+	:me=\E[0m\E(B:s0=\E(B:s1=\E(0:ts=\Ej\EYA%+ \Eo:\
+	:tc=ibmmono:
+ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display:\
+	:es:hs:\
+	:li#33:\
+	:ds=\Ej\EYA \EI\Ek:fs=\Ek:ts=\Ej\EYA%+ \Eo:tc=ibmega-c:
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ibm5151|wy60-AT|wyse60-AT|IBM 5151 Monochrome display:\
+	:am:bw:ms:xo:\
+	:co#80:it#8:li#25:\
+	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
+	:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:\
+	:dl=\E[M:do=^J:ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:is=\Ec:\
+	:k0=\E[010q:k1=\E[001q:k2=\E[002q:k3=\E[003q:k4=\E[004q:\
+	:k5=\E[005q:k6=\E[006q:k7=\E[007q:k8=\E[008q:k9=\E[009q:\
+	:kD=\E[P:kI=\E[139q:kN=\E[154q:kP=\E[150q:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[0m:mr=\E[7m:nd=\E[C:rc=\E[u:sc=\E[s:se=\E[m:sf=\E[S:\
+	:so=\E[7m:sr=\E[T:ue=\E[m:up=\E[A:us=\E[4m:
+ibm5154|IBM 5154 Color display:\
+	:Co#8:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:md@:tc=ibm5151:
+ibm6153|IBM 6153 Black & White display:\
+	:mb@:md=\E[12m:me=\E[0;10m:s0=\E[10m:s1=\E[11m:s2=\E[12m:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;12%;m:\
+	:tc=ibm5151:
+ibm6153-90|IBM 6153 Black & White display:\
+	:co#90:li#36:\
+	:mb@:md@:tc=ibm5151:
+ibm6153-40|IBM 6153 Black & White display:\
+	:co#40:li#12:tc=ibm6153-90:
+ibm6154|IBM 6154 Color displays:\
+	:mb@:md=\E[12m:me=\E[0;10m:s0=\E[10m:s1=\E[11m:s2=\E[12m:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;12%;m:\
+	:tc=ibm5154:
+ibm6155|IBM 6155 Black & White display:\
+	:mb@:md@:tc=ibm5151:
+ibm8503|ibm8507|ibm8604|IBM 8503 B & W VGA display:\
+	:tc=hft-c:
+ibm8512|ibm8513|IBM color VGA Terminal:\
+	:am:mi:ms:\
+	:co#80:it#8:li#25:\
+	:AL=\E[%dL:DL=\E[%dM:RA=\E[?7l:SA=\E[?7h:\
+	:ac=jjkkllmmnnqqttuuvvwwxx:ae=^O:al=\E[L:as=^N:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dl=\E[M:dm=\E[4h:\
+	:do=^J:ec=\E[%dX:ed=\E[4l:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\Eb\E[m\017\E[?7h:k0=\E[010q:k1=\E[001q:k2=\E[002q:\
+	:k3=\E[003q:k4=\E[004q:k5=\E[005q:k6=\E[006q:k7=\E[007q:\
+	:k8=\E[008q:k9=\E[009q:kd=\E[B:kh=\E[H:ku=\E[A:le=\E[D:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r1=\Eb\E[m\017\E[?7h\E[H\E[J:rc=\E[u:sc=\E[s:se=\E[m:\
+	:so=\E[7m:te=\E[20h:ti=\E[20;4l\E[?7h\Eb:ue=\E[m:up=\E[A:\
+	:us=\E[4m:\
+	:tc=ibm8503:
+ibm8514|IBM 8514 color display:\
+	:es:hs:\
+	:li#41:\
+	:cr=^M:do=^J:ds=\Ej\EYI \EI\Ek:fs=\Ek:kb=^H:kd=^J:kl=^H:\
+	:nw=^M^J:sf=^J:ta=^I:ts=\Ej\EYI%+ \Eo:\
+	:tc=ibmega:
+ibm8514-c|IBM 8514 color display with standout and underline:\
+	:es:hs:\
+	:li#41:\
+	:cr=^M:do=^J:ds=\Ej\EYI \EI\Ek:fs=\Ek:kb=^H:kd=^J:kl=^H:\
+	:nw=^M^J:sf=^J:ta=^I:ts=\Ej\EYI%+ \Eo:\
+	:tc=ibmega-c:
+
+ibmaed|IBM Experimental display:\
+	:am:bs:eo:ms:\
+	:co#80:it#8:li#52:\
+	:al=\EN:cd=\EJ:ce=\EI:cl=\EH\EK:cm=\EY%+ %+ :dc=\EQ:dl=\EO:\
+	:do=\EB:ei=:ho=\EH:ic=\EP:im=:kb=^H:kd=\EB:kl=\ED:kr=\EC:\
+	:ku=\EA:le=^H:me=\E0:nd=\EC:se=\E0:so=\E0:ta=^I:up=\EA:\
+	:vb=\EG:
+ibm-apl|apl|IBM apl terminal simulator:\
+	:li#25:tc=dm1520:
+# (ibmmono: this had an unknown `sb' boolean, I changed it to `bs'.  
+# Also it had ":I0=f10:" which pretty obviously should be "l0=f10" -- esr)
+ibmmono|IBM workstation monochrome:\
+	:es:hs:\
+	:al=\EL:dl=\EM:ds=\Ej\EY8 \EI\Ek:fs=\Ek:k0=\E<:k1=\ES:\
+	:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:k9=\EY:\
+	:kF=\EE:kI=\0:kN=\EE:kP=\Eg:kR=\EG:kb=^H:kh=\EH:l0=f10:\
+	:md=\EZ:me=\Ew\Eq\Ez\EB:mk=\EF\Ef0;\Eb0;:mr=\Ep:se=\Ez:\
+	:so=\EZ:sr=\EA:ts=\Ej\EY8%+ \Eo:ue=\Ew:us=\EW:\
+	:tc=ibm3101:
+ibmega|IBM Enhanced Color Display:\
+	:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=ibmmono:
+ibmega-c|ibm5154-c|IBM Enhanced Color Display with standout and underline:\
+	:se=\EB:so=\EF\Ef3;:ue=\EB:us=\EF\Ef2;:\
+	:tc=ibmmono:
+ibmvga-c|IBM VGA display color termcap:\
+	:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=ibmega-c:
+ibmvga|IBM VGA display:\
+	:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=ibmega:
+# ibmapa* and ibmmono entries come from ACIS 4.3 distribution
+rtpc|ibmapa16|IBM 6155 Extended Monochrome Graphics Display:\
+	:li#32:\
+	:ds=\Ej\EY@ \EI\Ek:ts=\Ej\EY@%+ \Eo:tc=ibmmono:
+# Advanced Monochrome (6153) and Color (6154) Graphics Display:
+ibmapa8c|ibmapa8|IBM 6153/4 Advanced Graphics Display:\
+	:li#31:\
+	:ds=\Ej\EY? \EI\Ek:ts=\Ej\EY?%+ \Eo:tc=ibmmono:
+ibmapa8c-c|ibm6154-c|IBM 6154 Advanced Color Graphics Display:\
+	:li#31:\
+	:ds=\Ej\EY? \EI\Ek:mh=\EF\Ef7;:ts=\Ej\EY?%+ \Eo:tc=ibmega-c:
+hft-c-old|HFT with Color PC850:\
+	:Co#8:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:tc=ibm5151:
+# From: Marc Pawliger <marc@ibminet.awdpa.ibm.com>
+# also in /usr/lpp/bos/bsdsysadmin.
+# (hft-c: this entry had :kb=\E[D:kf=\E[C: on the line with ku/kd/kh; this was
+# pretty obviously mislabeled for :le: and :nd:; also ":ul=\E[4m:" was clearly
+# a typo for ":us=\E[4m:"; also ":el=\E[K:" was a typo for ":ce=\E[K:".
+# I also added <rmam>/<smam> based on the terminal reset string.
+# There was an unknown boolean ":ht:" which I assume was meant to set hardware
+# tabs, so I have inserted it#8. Finally, :ac=^N: paired with the :ae: looked
+# like a typo for :as=^N:; finally, added empty <acsc> to quiet tic -- esr)
+hft-c|IBM High Function Terminal:\
+	:am:mi:ms:\
+	:co#80:it#8:li#25:\
+	:AL=\E[%dL:DL=\E[%dM:RA=\E[?7l:SA=\E[?7h:\
+	:ac=jjkkllmmnnqqttuuvvwwxx:ae=^O:al=\E[L:as=^N:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:dl=\E[M:dm=\E[4h:\
+	:do=^J:ec=\E[%dX:ed=\E[4l:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\Eb\E[m\017\E[?7h:k0=\E[010q:k1=\E[001q:k2=\E[002q:\
+	:k3=\E[003q:k4=\E[004q:k5=\E[005q:k6=\E[006q:k7=\E[007q:\
+	:k8=\E[008q:k9=\E[009q:kd=\E[B:kh=\E[H:ku=\E[A:le=\E[D:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r1=\Eb\E[m\017\E[?7h\E[H\E[J:rc=\E[u:sc=\E[s:se=\E[m:\
+	:so=\E[7m:te=\E[20h:ti=\E[20;4l\E[?7h\Eb:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+hft|AIWS High Function Terminal:\
+	:am:xo:\
+	:co#80:li#25:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=\E6:ho=\E[H:\
+	:ic=\E[@:im=\E6:k1=\E[001q:k2=\E[002q:k3=\E[003q:\
+	:k4=\E[004q:k5=\E[005q:k6=\E[006q:k7=\E[007q:k8=\E[008q:\
+	:k9=\E[009q:kN=\E[153q:kP=\E[159q:ka=\E[010q:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mk=\E[8m:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:\
+	:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+ibm-system1|system1|ibm system/1 computer:\
+	:am:xt:\
+	:co#80:li#24:\
+	:bl=^G:cl=^Z:cm=\005%+ %+ :ho=^K:le=^H:nd=^\:sf=^J:up=^^:
+#       lft-pc850 : IBM Low Function Terminal Device
+#    lft "supports" underline, bold, and blink in the sense that the lft code
+#    sets all the right bits.  HOWEVER, depending upon the adapter, these
+#    attributes may or may not be supported by the device driver.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device:\
+	:am:bw:ms:xo:\
+	:co#80:it#8:li#25:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:bt=\E[Z:cd=\E[2J:ce=\E[0K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:is=\Ec:\
+	:k1=\E[001q:k2=\E[002q:k3=\E[003q:k4=\E[004q:k5=\E[005q:\
+	:k6=\E[006q:k7=\E[007q:k8=\E[008q:k9=\E[009q:kD=\E[P:\
+	:kI=\E[139q:kN=\E[154q:kP=\E[150q:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[0m:\
+	:mr=\E[7m:nd=\E[C:se=\E[0m:sf=\ED:so=\E[7m:sr=\EL:ue=\E[0m:\
+	:up=\E[A:us=\E[4m:
+
+#
+# AIX entries.  IBM ships these with AIX 3.2.5. 
+# AIX extension caps are commented out,
+# except for box1 which has been translated to an <acsc> string.
+#
+aixterm|IBM Aixterm Terminal Eemulator:\
+	:es:hs:\
+	:ac=jjkkllmmnnqqttuuvvwwxx:ds=\E[?E:fs=\E[?F:md=\E[1m:\
+	:me=\E[0;10m\E(B:s0=\E(B:s1=\E(0:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m:\
+	:sr@:ts=\E[?%p1%dT:\
+	:tc=ibm6154:
+aixterm-m|IBM AIXterm Monochrome Terminal Emulator:\
+	:es:hs:\
+	:ac=jjkkllmmnnqqttuuvvwwxx:ds=\E[?E:fs=\E[?F:md=\E[1m:\
+	:me=\E[0;10m\E(B:s0=\E(B:s1=\E(0:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
+	:sr@:ts=\E[?%p1%dT:\
+	:tc=ibm6153:
+aixterm-m-old|old IBM AIXterm Monochrome Terminal Emulator:\
+	:es:hs:\
+	:ds=\E[?E:fs=\E[?F:md=\E[1m:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
+	:sr@:ts=\E[?%p1%dT:\
+	:tc=ibm6153:
+jaixterm|IBM Kanji Aixterm Terminal Eemulator:\
+	:ac@:tc=aixterm:
+jaixterm-m|IBM Kanji AIXterm Monochrome Terminal Emulator:\
+	:ac@:\
+	:tc=aixterm-m:
+
+#### Infoton/General Terminal Corp.
+#
+
+# gt100 sounds like something DEC would come out with.  Let's hope they don't.
+i100|gt100|gt100a|General Terminal 100A (formerly Infoton 100):\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=^L:cm=\Ef%r%+ %+ :cr=^M:\
+	:dl=\EM:do=^J:ho=\EH:le=^H:nd=\EC:se=\Ea:sf=^J:so=\Eb:up=\EA:\
+	:vb=\Eb\Ea:
+i400|infoton 400:\
+	:am:bs:\
+	:co#80:li#25:\
+	:al=\E[L:bl=^G:ce=\E[N:cl=\E[2J:cm=%i\E[%3;%3H:cr=^M:\
+	:dc=\E[4h\E[2Q\E[P\E[4l\E[0Q:dl=\E[M:do=^J:\
+	:ei=\E[4l\E[0Q:im=\E[4h\E[2Q:le=^H:nd=\E[C:sf=^J:up=\E[A:
+# (addrinfo: removed obsolete ":bc=^Z:" -- esr)
+addrinfo:\
+	:am:\
+	:co#80:li#24:\
+	:bl=^G:cd=^K:cl=^L:..cm=\037%p1%{1}%-%c%p2%{1}%-%c:cr=^M:\
+	:do=^J:ho=^H:le=^Z:ll=^H^\:nd=^Y:sf=^J:up=^\:
+# (infoton: used to have the no-ops <lh#0>, <lw#0>, <nlab#0> -- esr)
+infoton:\
+	:am:\
+	:co#80:li#24:\
+	:bl=^G:cd=^K:cl=^L:cr=^M:do=^J:le=^Z:ll=^H^\:nd=^Y:sf=^J:\
+	:up=^\:
+
+# The ICL6402 was actually the Kokusai Display System 6402.
+# The 6404 was the KDS7372 (color version of the 6402).
+# 
+# ICL6404 control codes follow:
+#
+#code            function
+#~~~~~~~~~~~     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#ctrl-A          set SOM position at cursor position
+#ctrl-G          Bell
+#ctrl-H          Backspace
+#ctrl-I          Horiz tab
+#ctrl-J          Linefeed
+#ctrl-K          Cursor up
+#ctrl-L          Cursor right
+#ctrl-M          Carriage return
+#ctrl-N          Disable xon/xoff to host
+#ctrl-O          Enable xon/xoff to host
+#ctrl-R          Enable bidirectional mode
+#ctrl-T          Disable bidirectional mode
+#ctrl-V          Cursor down
+#ctrl-Z          Clear unprotected data to insert char
+#ctrl-^          Cursor home
+#ctrl-_          Newline
+#
+#ESC             lead-in char for multiple character command
+#
+#ESC space R     execute power on sequence
+#ESC ! p1 p2     define scroll region:
+#                p1 = scroll top    line:  20h - 37h
+#                p1 = scroll bottom line:  20h - 37h
+#ESC "           unlock keyboard
+#ESC #           lock keyboard
+#ESC $           Semi-graphics mode on
+#ESC %           Semi-graphics mode off
+#ESC &           protect mode on
+#ESC '           protect mode off
+#ESC (           write protect mode off (full intensity)
+#ESC )           write protect mode on (half intensity)
+#
+#ESC *           clear screen
+#ESC +           clear unprotected data to insert char
+#ESC ,           clear unprotected data to half intensity spaces
+#ESC - p1 p2 p3 p4     address cursor to page, row, column:
+#                      p1 = page number  0 - 3
+#                      p2 = row          20h - 7fh
+#                      p3 = column (lo)  20h - 7fh
+#                      p4 = column (hi)  20h - 21h (only 132 col)
+#ESC . p1        set cursor style:
+#                p1 = 0  invisible cursor
+#                p1 = 1  block blinking cursor
+#                p1 = 2  block steady cursor
+#                p1 = 3  underline blinking cursor
+#                p1 = 4  underline steady cursor
+#ESC /           transmit cursor location (page, row, column)
+#ESC 0 p1 p2 p3 p4     program edit key:
+#                      p1 = edit key code: '@'-'S', '`'-'s'
+#                      p2 p3 p4 = program data (3 bytes)
+#
+#ESC 1           set tab
+#ESC 2           clear tab at cursor
+#ESC 3           clear all tabs
+#ESC 4           send unprotect line to cursor
+#ESC 5           send unprotect page to cursor
+#ESC 6           send line to cursor
+#ESC 7           send page to cursor
+#ESC 8 n         set scroll mode:
+#                n = 0   set jump scroll
+#                n = 1   set smooth scroll
+#ESC 9 n         control display:
+#                n = 0   display off
+#                n = 1   display on
+#ESC :           clear unprotected data to null
+#ESC ;           clear unprotected data to insert char
+#
+#ESC <           keyclick on
+#ESC = p1 p2     address cursor to row, column
+#                p1 = row          20h - 7fh
+#                p2 = column (lo)  20h - 7fh
+#                p3 = column (hi)  20h - 21h (only 132 col)
+#ESC >           keyclick off
+#ESC ?           transmit cursor location (row, column)
+#
+#ESC @           copy print mode on
+#ESC A           copy print mode off
+#ESC B           block mode on
+#ESC C           block mode off (conversation mode)
+#ESC D F         set full duplex
+#ESC D H         set half duplex
+#ESC E           line insert
+#ESC F p1 p2     set page colour (p1 = f/grnd, p2 = b/grnd)
+#                0 = black, 1 = red,     2 = green, 3 = yellow
+#                4 = blue,  5 = magenta, 6 = cyan,  7 = white
+#ESC G n         set serial field attribute (n = 30h - 3Fh)
+#ESC H n         full graphics mode:
+#                n = 0  exit full graphics mode
+#                n = 1  enter full graphics mode
+#ESC I           back tab
+#ESC J           back page
+#ESC K           forward page
+#
+#ESC L           unformatted page print
+#ESC M L         move window left  (132 col mode only)
+#ESC M R         move window right (132 col mode only)
+#ESC N           set page edit (clear line edit)
+#ESC O           set line edit (clear page edit)
+#ESC P           formatted page print
+#ESC Q           character insert
+#ESC R           line delete
+#ESC S           send message unprotected only
+#ESC T           erase line to insert char
+#ESC U           set monitor mode   (see ESC X, ESC u)
+#
+#ESC V n         select video attribute mode:
+#                n = 0   serial field attribute mode
+#                n = 1   parallel character attribute mode
+#ESC V 2 n       define line attribute:
+#                n = 0   single width single height
+#                n = 1   single width double height
+#                n = 2   double width single height
+#                n = 3   double width double height
+#ESC V 3 n       select character font:
+#                n = 0   system font
+#                n = 1   user defined font
+#ESC V 4 n       select screen mode:
+#                n = 0   page screen mode
+#                n = 1   virtual screen mode
+#ESC V 5 n       control mouse mode:
+#                n = 0   disable mouse
+#                n = 1   enable sample mode
+#                n = 2   send mouse information
+#                n = 3   enable request mode
+#ESC W           character delete
+#ESC X           clear monitor mode (see ESC U, ESC u)
+#ESC Y           erase page to insert char
+#
+#ESC Z n         send user/status line:
+#                n = 0   send user line
+#                n = 1   send status line
+#                n = 2   send terminal ID
+#ESC [ p1 p2 p3  set character attribute (parallel char mode):
+#                p1: 0 = normal
+#                    1 = blank
+#                    2 = blink
+#                    3 = blink blank (= blank)
+#                    4 = reverse
+#                    5 = reverse blank
+#                    6 = reverse blink
+#                    7 = reverse blink blank (= reverse blank)
+#                    8 = underline
+#                    9 = underline blank
+#                    : = underline blink
+#                    ; = underline blink blank
+#                    < = reverse underline
+#                    = = reverse underline blank
+#                    > = reverse underline blink
+#                    ? = reverse underline blink blank
+#                p2, p3: f/grnd, b/grnd colour
+#                (see ESC F for colours)
+#                use ZZ for mono, eg.
+#                    ESC [ 0 Z Z for normal
+#                    ESC [ 4 Z Z for inverse etc.
+#
+#ESC \ n         set page size:
+#                n = 1   24 lines/page
+#                n = 2   48 lines/page
+#                n = 3   72 lines/page
+#                n = 4   96 lines/page
+#ESC ] n         set Wordstar mode:
+#                n = 0   normal (KDS7372) mode
+#                n = 1   Wordstar mode
+#
+#ESC b           set foreground colour screen
+#
+#ESC c n         enter self-test mode:
+#                n = 0   exit self test mode
+#                n = 1   ROM test
+#                n = 2   RAM test
+#                n = 3   NVRAM test
+#                n = 4   screen display test
+#                n = 5   main/printer port test
+#                n = 6   mouse port test
+#                n = 7   graphics board test
+#                n = 8   graphics memory test
+#                n = 9   display all 'E'
+#                n = :   display all 'H'
+#ESC d           set background colour screen
+#
+#ESC e n         program insert char (n = insert char)
+#ESC f text CR   load user status line with 'text'
+#
+#ESC g           display user status line on 25th line
+#ESC h           display system status line on 25th line
+#ESC i           tab
+#ESC j           reverse linefeed
+#ESC k n         duplex/local edit mode:
+#                n = 0   duplex edit mode
+#                n = 1   local edit mode
+#ESC l n         select virtual screen:
+#                n = 0   screen 1
+#                n = 1   screen 2
+#ESC m           save current config to NVRAM
+#ESC n p1        select display screen:
+#                p1 = 0  screen 1
+#                p1 = 1  screen 2
+#                p1 = 2  screen 3
+#                p1 = 3  screen 4
+#ESC o p1 p2     set characters/line and attribute:
+#                p1 = 0  80 chars/line
+#
+#ESC o p1 p2     set characters/line and attribute:
+#                p1 = 0  80 chars/line
+#                p1 = 1  132 chars/line
+#                p2 = 0  single width single height
+#                p2 = 1  single width double height
+#                p2 = 2  double width single height
+#                p2 = 3  double width double height
+#
+#ESC q           insert mode on
+#ESC r           edit mode on
+#ESC s           send message all
+#ESC t           erase line to null
+#ESC u           clear monitor mode (see ESC U, ESC X)
+#ESC v           autopage mode on
+#ESC w           autopage mode off
+#ESC x p1 p2 p3  define delimiter code...
+#ESC y           erase page to null
+#
+#ESC z 2 p1 p2 p3 p4   draw quadrangle:
+#                      p1 = starting row
+#                      p2 = starting column
+#                      p3 = end row
+#                      p4 = end column
+#
+#ESC { p1 p2 p3 p4     configure main port
+#                      (baud, stop bits, parity, word length)
+#
+#ESC | p1 p2 text Ctrl-Y    program function key with 'text':
+#                        p1 = function key code:
+#                             '1' - ';'  normal f1- f11
+#                             '<' - 'F'  shifted f1 - f11
+#                        p2 = program mode:
+#                             1 = FDX
+#                             2 = LOC
+#                             3 = HDX
+#                        Ctrl-Y = terminator
+#                        (use Ctrl-P to escape ^P, ^Y )
+#
+#ESC } p1 p2 p3 p4     configure printer port
+#                      (baud, stop bits, parity, word length)
+#ESC ~           send system status
+#
+# Codes and info from Peter Disdale <pete@pdlmail.demon.co.uk> 12 May 1997
+#
+# Entry is by esr going solely on above information and is UNTESTED.
+# This actually looks a lot like a Televideo 9xx.
+# This entry uses page 0 and is monochrome; I'm not brave enough to try
+# to make color work without a test terminal.  The :am: capability is a guess.
+# The initialization string sets conversation mode, blinking underline cursor,
+# full duplex, parallel attribute mode, display user status line, white
+# foreground, black background, normal highlight.
+#
+icl6404|kds7372|icl6402|kds6402|ICL 6404 aka Kokusai Display Systems 7372:\
+	:am:bs:hs:\
+	:co#80:li#24:\
+	:DC=\EW:al=\EE:bl=^G:bt=\EI:cl=\E*:cm=\E=%+ %+P%+P:cr=^M:\
+	:..cs=\E\041%+%p1%{32}%+%p2%{32} cud1=\026:ct=\E3:\
+	:dl=\ER:ei=\Er:ho=^^:i1=\EC\E.3\EDF\EV1\Eg\E[0ZZ:im=\Eq:\
+	:mb=\E[2ZZ:me=\E[0ZZ:mk=\E[1ZZ:mr=\E[4ZZ:nd=^L:nw=^_:\
+	:r2=\Eo1:\
+	:..sa=\E[%{0}%?%p1%t%{4}%|%;%?%p2%t%{8}%|%;%?%p3%t%{4}%|%;%?%p4%t%{2}%|%;%?%p7%t%{1}%|%;ZZ:\
+	:se=\E[%gh%{4}%^%Ph%gh%dZZ:so=\E[8ZZ:st=\E1:ta=^I:\
+	:ue=\E[%gh%{8}%^%Ph%gh%dZZ:up=^K:us=\E[8ZZ:ve=\E.3:\
+	:vi=\E.0:vs=\E.1:
+icl6404-w|kds7372-w|ICL 6404 aka Kokusai Display Systems 7372 132 cols:\
+	:r2=\Eo1:\
+	:tc=icl6404:
+
+#### Interactive Systems Corp
+#
+# ISC used to sell OEMed and customized hardware to support ISC UNIX.
+# ISC UNIX still exists in 1995, but ISC itself is no more; they got
+# bought out by Sun.
+#
+
+# From: <cithep!eric>  Wed Sep 16 08:06:44 1981
+# (intext: removed obsolete ":ma=^K^P^R^L^L ::bc=^_:", also the
+# ":le=^_:" later overridden -- esr)
+intext|Interactive Systems Corporation modified owl 1200:\
+	:am:bs:\
+	:co#80:it#8:li#24:sg#1:\
+	:al=\020:bl=^G:bt=^Y:cd=\026J:ce=^Kp^R:cl=\014:\
+	:cm=\017%+ %+ :cr=^M:dc=\022:dl=\021:do=^J:ei=^V<:im=^V;:\
+	:ip=:k0=^VJ\r:k1=^VA\r:k2=^VB\r:k3=^VC\r:k4=^VD\r:k5=^VE\r:\
+	:k6=^VF\r:k7=^VG\r:k8=^VH\r:k9=^VI\r:kb=^H:kd=^J:ke=^V9:\
+	:kh=^Z:kl=^_:kr=^^:ks=\036\072\264\026%:ku=^\:le=^H:nd=^^:\
+	:se=^V# :sf=^J:so=^V$\054:ta=^I:up=^\:
+intext2|intextii|INTERACTIVE modified owl 1251:\
+	:am:bw:ul:\
+	:co#80:li#24:sg#0:\
+	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%+^AG:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=:ic=\E[@:im=:k0=\E@\r:k1=\EP\r:k2=\EQ\r:\
+	:k3=\ES\r:k4=\ET\r:k5=\EU\r:k6=\EV\r:k7=\EW\r:k8=\EX\r:\
+	:k9=\EY\r:kb=^H:kd=\EB\r:kh=\ER\r:kl=\ED\r:kr=\EC\r:\
+	:ku=\EA\r:l0=REFRSH:l1=DEL CH:l2=TABSET:l3=GOTO:l4=+PAGE:\
+	:l5=+SRCH:l6=-PAGE:l7=-SRCH:l8=LEFT:l9=RIGHT:nd=\E[C:\
+	:se=\E[2 D:sf=\E[S:so=\E[6 D:sr=\E[T:ta=^I:ue=\E[2 D:\
+	:up=\E[A:us=\E[18 D:\
+	:vb=\E[;;;;;;;;;2;;u\E[;;;;;;;;;1;;u:
+
+#### Kimtron (abm, kt)
+#
+# Kimtron seems to be history, but as March 1998 these people are still 
+# offering repair services for Kimtron equipment:
+#
+#    Com/Pair Monitor Service
+#    1105 N. Cliff Ave.
+#    Sioux Falls, South Dakota 57103
+#     
+#    WATS voice:  1-800/398-4946
+#    POTS   fax: +1 605/338-8709
+#    POTS voice: +1 605/338-9650
+#         Email: <compair@sd.cybernex.net>
+#  Internet/Web: <http://www.com-pair.com>
+#
+# Kimtron entries include (undocumented) codes for: enter dim mode,
+# enter bold mode, enter reverse mode, turn off all attributes.
+#
+
+# Kimtron ABM 85 added by Dual Systems
+# (abm85: removed duplicated ":kd=^J:" -- esr)
+abm85|Kimtron ABM 85:\
+	:am:bs:bw:ms:\
+	:co#80:it#8:li#24:sg#1:\
+	:al=\EE:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :dc=\EW:\
+	:dl=\ER:do=^J:ei=\Er:if=/usr/share/tabset/stdcrt:im=\EQ:\
+	:is=\EC\EX\Eg\En\E%\Er\E(\Ek\Em\Eq:kb=^H:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\Ek:so=\Ej:ta=^I:ue=\Em:\
+	:up=^K:us=\El:
+# Kimtron ABM 85H added by Dual Systems.
+# Some notes about the abm85h entries:
+# 1) there are several firmware revs of 85H in the world. Use abm85h-old for
+#    firmware revs prior to SP51
+# 2) Make sure to use abm85h entry if the terminal is in 85h mode and the
+#    abm85e entry if it is in tvi920 emulation mode. They are incompatible
+#    in some places and NOT software settable i.e., :is: can't fix it)
+# 3) In 85h mode, the arrow keys and special functions transmit when
+#    the terminal is in dup-edit, and work only locally in local-edit.
+#    Vi won't swallow `del char' for instance, but :ti: turns on
+#    dup-edit anyway so that the arrow keys will work right. If the
+#    arrow keys don't work the way you like, change :ti:, :te:, and
+#    :is:.  Note that 920E mode does not have software commands to toggle
+#    between dup and local edit, so you get whatever was set last on the
+#    terminal.
+# 4) :vb: attribute is nice, but seems too slow to work correctly
+#    (\Eb:pc:\Ed)
+# 5) Make sure `hidden' attributes are selected. If `embedded' attributes
+#    are selected, the <xmc@> entry should be removed.
+# 6) auto new-line should be on (selectable from setup mode only)
+#
+# From: Erik Fair <fair@ucbarpa>  Sun Oct 27 07:21:05 1985
+abm85h|Kimtron ABM 85H native mode:\
+	:hs:\
+	:sg@:\
+	:bl=^G:ds=\Ee:fs=^M:im=\EZ:\
+	:is=\EC\EN\EX\024\016\EA\Ea\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r\EG0\Ed\E.4\El:\
+	:kd=^V:me=\E(\EG0:mh=\E):mk@:ts=\Eg\Ef:vb@:ve=\E.4:vs=\E.2:\
+	:tc=adm+sgr:tc=abm85:
+abm85e|Kimtron ABM 85H in 920E mode:\
+	:sg@:\
+	:bl=^G:im=\EZ:\
+	:is=\EC\EX\EA\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r\Ek\Eq\Em:\
+	:me=\E(\Ek:mh=\E):mr=\Ej:vb@:\
+	:tc=abm85:
+abm85h-old|oabm85h|o85h|Kimtron ABM 85H with old firmware rev.:\
+	:sg@:\
+	:bl=^G:im=\EZ:\
+	:is=\E}\EC\EX\Ee\En\E%\Er\E(\Ek\Em\Eq\Ed\ET\EC\E9\EF:\
+	:me=\E(\Ek:mh=\E):mr=\Ej:\
+	:tc=abm85:
+# From: <malman@bbn-vax.arpa>
+# (kt7: removed obsolete :ma=^V^J^L :" -- esr)
+kt7|kimtron model kt-7:\
+	:am:bs:\
+	:co#80:it#8:li#24:\
+	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :dc=\EW:\
+	:dl=\ER:do=^V:ei=:fs=\Eg:ho=^^:ic=\EQ:\
+	:if=/usr/share/tabset/stdcrt:im=:is=\El\E":k0=^AI\r:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=\EE:kB=\EI:kC=^Z:kD=\EW:\
+	:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:\
+	:ku=^K:le=^H:mk@:nd=^L:ta=^I:ts=\Ef:up=^K:\
+	:tc=adm+sgr:
+# Renamed TB=^I to :ta:, BE=^G to :bl:, BS=^H to :kb:, N to :kS: (based on the
+# other kt7 entry and the adjacent key capabilities).  Removed EE which is
+# identical to :mh:.  Removed :ES=\EGD: which is some kind of highlight
+# but we can't figure out what.
+kt7ix|kimtron model kt-7 or 70 in IX mode:\
+	:am:bw:\
+	:co#80:it#8:li#25:\
+	:@7=\EY:PU=\EK:ac=jYk?lZm@nEqDt4uCvAwBx3:ae=\E%:al=\EE:\
+	:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :\
+	:cr=^M:dc=\EW:dl=\ER:do=^V:ds=\Ef\r:ei=:fs=^M:ho=^^:ic=\EQ:\
+	:im=:is=\EG0\E s\017\E~:k0=^AI\r:k1=^A@\r:k2=^AA\r:\
+	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:\
+	:k9=^AH\r:kA=\EE:kB=\EI:kC=\E*:kE=\ET:kI=\EQ:kL=\ER:kN=\EJ:\
+	:kS=\EY:kb=^H:kd=\E[B:kh=^^:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\EG2:me=\EG0:mh=\EG@:nd=^L:nw=^M^J:se=\EG0:sf=^J:\
+	:so=\EG4:ta=^I:ts=\Ef:ue=\EG0:up=^K:us=\EG8:ve=\E.3:vi=\E.0:
+
+#### Microdata/MDIS
+#
+# This was a line of terminals made by McDonnell-Douglas Information Systems.
+# These entries come direct from MDIS documentation.  I have edited them only
+# to move primary names of the form p[0-9] * to aliases, and to comment out
+# :ae:/:as: in a couple of entries without <acsc> strings.  I have 
+# also removed the change history; the last version indicates this is
+# version 4.3 by A.Barkus, September 1990 (earliest entry is October 1989).
+#
+
+# McDonnell Information Systems Terminal Family History
+# =========================================
+#
+# Prism-1, Prism-2 and P99:
+#       Ancient Microdata and CMC terminals, vaguely like Adds Regent 25.
+#
+# Prism-4 and Prism-5:
+#       Slightly less ancient range of Microdata terminals. Follow-on from
+#       Prism-2, but with many enhancements. P5 has eight display pages.
+#
+# Prism-6:
+#       A special terminal for use with library systems, primarily in Germany.
+#       Limited numbers. Similar functionality to P5 (except attributes?).
+#
+# Prism-7, Prism-8 and Prism-9:
+#       More recent range of MDIS terminals, in which P7 and P8
+#       replace the P4 & P5, with added functionality, and P9 is the flagship.
+#       The P9 has two emulation modes - P8 and ANSI - and includes a
+#       large number of the DEC VT220 control sequences. Both
+#       P8 and P9 support 80c/24ln/8pg and 132cl/24li/4pg formats.
+#
+# Prism-12 and Prism-14:
+#       Latest range, functionally very similar to the P9.  The P14 has a
+#       black-on-white overscanning screen.
+#
+# The terminfo definitions given here are:
+#
+# p2      - Prism-2 (or Prism-1 or P99).
+#
+# p4      - Prism-4 (and older P7s & P8s).
+# p5      - Prism-5 (or Prism-6).
+#
+# p7      - Prism-7.
+# p8      - Prism-8 (in national or multinational mode).
+# p8-w    - 132 column version of p8.
+# p9      - Prism-9 in ANSI mode.
+# p9-w    - 132 column version of p9.
+# p9-8    - Prism-9 in Prism-8 emulation mode.
+# p9-8-w  - As p9-8, but with 132 columns.
+#
+# p12     - Prism-12 in ANSI mode.
+# p12-w   - 132 column version of p12.
+# p12-m   - Prism-12 in MDC emulation mode.
+# p12-m-w - As p12-m, but with 132 columns.
+# p14     - Prism-14 in ANSI mode.
+# p14-w   - 132 column version of p14.
+# p14-m   - Prism-14 in MDC emulation mode.
+# p14-m-w - As p14-m, but with 132 columns.
+#
+# p2: Prism-2
+# -----------
+#
+# Includes Prism-1 and basic P99 without SP or MP loaded.
+# The simplest form of Prism-type terminal.
+# Basic cursor movement and clearing operations only.
+# No video attributes.
+# Notes:
+#  Horizontal cursor qualifiers of NUL, XON and XOFF are mapped to the next
+#  value up, followed by backspace.
+#
+prism2|MDC Prism-2:\
+	:am:bw:ms:\
+	:co#80:li#24:\
+	:bl=^G:cd=\EJ:ce=\EK:\
+	:..ch=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c:\
+	:cl=\014:\
+	:..cm=\013%p1%{32}%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c:\
+	:cr=^M:cv=\013%+ :do=^J:ho=^A:kb=^H:kh=^A:le=^H:nd=^F:sf=^J:\
+	:up=^Z:
+
+# p4: Prism-4
+# -----------
+#
+# Includes early versions of P7 & P8.
+# Basic family definition for most Prisms (except P2 and P9 ANSI).
+# Notes:
+#  Horizontal cursor qualifiers of NUL, XON and XOFF are mapped to the next
+#  value up, followed by backspace.
+#  Cursor key definitions removed because they interfere with vi and csh keys.
+#
+prism4|p4|P4|MDC Prism-4:\
+	:5i:am:bw:hs:ms:\
+	:co#80:li#24:sg#1:ws#72:\
+	:bl=^G:cd=\EJ:ce=\EK:\
+	:..ch=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c:\
+	:cl=\014:\
+	:..cm=\013%p1%{32}%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c:\
+	:cr=^M:cv=\013%+ :do=^J:ds=\035\343\035\345:fs=^]\345:\
+	:ho=^A:kb=^H:kh=^A:le=^H:mb=^CB:me=^C :mh=^CA:mk=^CH:mr=^CD:\
+	:nd=^F:pf=\ET:po=\ER:ps=\EU:\
+	:..sa=\003%{64}%?%p1%p3%|%t%{4}%+%;%?%p2%t%{16}%+%;%?%p4%t%{2}%+%;%?%p5%t%{1}%+%;%?%p7%t%{8}%+%;%c%?%p9%t\016%e\017%;:\
+	:se=^C :sf=^J:so=^CD:ts=^]\343:ue=^C :up=^Z:us=^CP:\
+	:ve=^]\342:vi=^]\344:
+
+# p5: Prism-5
+# -----------
+#
+# Same definition as p4. Includes Prism-6 (not tested!).
+# Does not use any multi-page features.
+#
+prism5|p5|P5|MDC Prism-5:\
+	:tc=p4:
+
+# p7: Prism-7
+# -----------
+#
+# Similar definition to p4. Uses ANSI cursor motion to avoid network problems.
+# Notes:
+#  Use p4 for very early models of P7.
+#  Rev-index removed; can't send nulls to terminal in 8-bit modes.
+#
+prism7|p7|P7|MDC Prism-7:\
+	:ch@:cm=\E[%i%d;%dH:cv@:tc=p4:
+
+# p8: Prism-8
+# -----------
+#
+# Similar definition to p7. Uses ANSI cursor motion to avoid network problems.
+# Supports national and multinational character sets.
+# Notes:
+#  Alternate char set operations only work in multinational mode.
+#  Use p4 for very early models of P8.
+#  Rev-index removed; can't send nulls to terminal in 8-bit modes.
+# (esr: commented out :as:/:ae: because there's no <acsc>)
+#
+prism8|p8|P8|MDC Prism-8:\
+	:ch=\E[%i%d`:cm=\E[%i%d;%dH:cv=\E[%i%dd:is=\E[<12h:tc=p4:
+
+# p8-w: Prism-8 in 132 column mode
+# --------------------------------
+#
+# 'Wide' version of p8.
+# Notes:
+#  Rev-index removed; can't send nulls to terminal in 8-bit modes.
+#
+prism8-w|p8-w|P8-W|MDC Prism-8 in 132 column mode:\
+	:co#132:\
+	:is=\E[<12h\E[<14h:tc=p8:
+
+# p9: Prism-9 in ANSI mode
+# -------------------------
+#
+# The "flagship" model of this generation of terminals.
+# ANSI X3.64 (ISO 6429) standard sequences, plus many DEC VT220 ones.
+# Notes:
+#  Tabs only reset by "reset". Otherwise assumes default (8 cols).
+#  Fixes to deal with terminal firmware bugs:
+#  . 'ri' uses insert-line since rev index doesn't always
+#  . 'sgr0' has extra '0' since esc[m fails
+#  . 'fsl' & 'dsl' use illegal char since cr is actioned wrong on line 25
+#  Not covered in the current definition:
+#  . Labels
+#  . Programming Fn keys
+#  . Graphic characters (defaults correctly to vt100)
+#  . Padding values (sets xon)
+# (esr: commented out :as:/:ae: because there's no <acsc>)
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+prism9|p9|P9|MDC Prism-9 in ANSII mode:\
+	:5i:am:bw:hs:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:ws#72:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[23~:\
+	:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:\
+	:F7=\E[31~:F8=\E[32~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
+	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%d`:cl=^L:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%d%v:ct=\E[2g:\
+	:cv=\E[%i%dd:dc=\E[P:dl=\E[M:do=^J:ds=\E[%}\024:ec=\E[%dX:\
+	:ei=\E[4l:fs=^T:ho=\E[H:im=\E[4h:is=\E[&p\E[<12l\E F:\
+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kC=^L:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[0m:mp=\E[32%{:mr=\E[7m:nd=\E[C:\
+	:nw=^M^J:pf=\E[4i:po=\E[5i:ps=\E[i:\
+	:r2=\E[&p\E[<12l\E F\E[3g\E[9;17;25;33;41;49;57;65;73 N:\
+	:rc=\E[%z:rp=\E[%r%db%.:sc=\E[%y:se=\E[27m:sf=^J:so=\E[7m:\
+	:sr=\E[L:st=\EH:ta=^I:ts=\E[%i%p1%d%%}:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:ve=\E[<4h:vi=\E[<4l:
+
+# p9-w: Prism-9 in 132 column mode
+# --------------------------------
+#
+# 'Wide' version of p9.
+#
+prism9-w|p9-w|P9-W|MDC Prism-9 in 132 column mode:\
+	:co#132:\
+	:is=\E[&p\E[<12l\E F\E[<14h:\
+	:r2=\E[&p\E[<12l\E F\E[<14h:tc=p9:
+
+# p9-8: Prism-9 in P8 mode
+# ------------------------
+#
+# P9 terminal in P8 emulation mode.
+# Similar to p8 definition.
+# Insertion and deletion operations possible.
+#
+prism9-8|p9-8|P9-8|MDC Prism-9 in P8 mode:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:al=\E[L:dc=\E[P:\
+	:dl=\E[M:ei=:ic=\E[@:im=:\
+	:tc=p8:
+
+# p9-8-w: Prism-9 in P8 and 132 column modes
+# ------------------------------------------
+#
+# P9 terminal in P8 emulation mode and 132 column mode.
+#
+prism9-8-w|p9-8-w|P9-8-W|MDC Prism-9 in Prism 8 emulation and 132 column mode:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:al=\E[L:dc=\E[P:\
+	:dl=\E[M:ei=:ic=\E[@:im=:\
+	:tc=p8-w:
+
+# p12: Prism-12 in ANSI mode
+# ---------------------------
+#
+# See p9 definition.
+#
+prism12|p12|P12|MDC Prism-12 in ANSI mode:\
+	:tc=p9:
+
+# p12-w: Prism-12 in 132 column mode
+# ----------------------------------
+#
+# 'Wide' version of p12.
+#
+prism12-w|p12-w|P12-W|MDC Prism-12 in 132 column mode:\
+	:tc=p9-w:
+
+# p12-m: Prism-12 in MDC emulation mode
+# -------------------------------------
+#
+# P12 terminal in MDC emulation mode.
+# Similar to p8 definition.
+# Insertion and deletion operations possible.
+#
+prism12-m|p12-m|P12-M|MDC Prism-12 in MDC emulation mode:\
+	:tc=p9-8:
+
+# p12-m-w: Prism-12 in MDC emulation and 132 column modes
+# -------------------------------------------------------
+#
+# P12 terminal in MDC emulation mode and 132 column mode.
+#
+prism12-m-w|p12-m-w|P12-M-W|MDC Prism-12 in MDC emulation and 132 column mode:\
+	:tc=p9-8-w:
+
+# p14: Prism-14 in ANSII mode
+# ---------------------------
+#
+# See p9 definition.
+#
+prism14|p14|P14|MDC Prism-14 in ANSII mode:\
+	:tc=p9:
+
+# p14-w: Prism-14 in 132 column mode
+# ----------------------------------
+#
+# 'Wide' version of p14.
+#
+prism14-w|p14-w|P14-W|MDC Prism-14 in 132 column mode:\
+	:tc=p9-w:
+
+# p14-m: Prism-14 in MDC emulation mode
+# -------------------------------------
+#
+# P14 terminal in MDC emulation mode.
+# Similar to p8 definition.
+# Insertion and deletion operations possible.
+#
+prism14-m|p14-m|P14-M|MDC Prism-14 in MDC emulation mode:\
+	:tc=p9-8:
+
+# p14-m-w: Prism-14 in MDC emulation and 132 column modes
+# -------------------------------------------------------
+#
+# P14 terminal in MDC emulation mode and 132 column mode.
+#
+prism14-m-w|p14-m-w|P14-M-W|MDC Prism-14 in MDC emulation and 132 column mode:\
+	:tc=p9-8-w:
+
+# End of McDonnell Information Systems Prism definitions
+
+# These things were popular in the Pick database community at one time
+# From: George Land <georgeland@aol.com> 24 Sep 1996
+p8gl|prism8gl|McDonnell-Douglas Prism-8 alternate definition:\
+	:am:bw:hs:mi:\
+	:co#80:li#24:ma#1:sg#1:ws#78:\
+	:F2=^AJ\r:F3=^AK\r:F4=^AL\r:F5=^AM\r:F6=^AN\r:F7=^AO\r:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=^L:cm=\E[%i%d;%dH:cr=^M:dc= ^H:\
+	:dl=^P:do=^J:ho=^A:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:\
+	:kD= ^H:kE=\EK:kL=^P:kS=\EJ:kb=^H:kd=^J:kh=^A:kl=^U:kr=^F:\
+	:ku=^Z:l1=F1:l2=F2:l3=F3:l4=F4:l5=F5:l6=F6:l7=F7:l8=F8:l9=F9:\
+	:la=F10:le=^U:mb=^CB:me=^C :mh=^CA:mk=^CH:mr=^CD:nd=^F:\
+	:nw=^J^M:pc=\0:se=^C :sf=^J:so=^CE:ue=^C :up=^Z:us=^C0:
+
+#### Microterm (act, mime)
+#
+# The mime1 entries refer to the Microterm Mime I or Mime II.
+# The default mime is assumed to be in enhanced act iv mode.
+#
+
+# New "safe" cursor movement (5/87) from <reuss@umd5.umd.edu>.  Prevents
+# freakout with out-of-range args on Sytek multiplexors.  No :so=^N: and
+# :se=^N: since  it gets confused and it's too dim anyway.  No :ic:
+# since Sytek insists ^S means xoff.
+# (act4: found ":ic=2^S:ei=:im=:ip=.1*^V:" commented out in 8.3 -- esr)
+act4|microterm|microterm act iv:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=2.3*\001<2.3*/>:bl=^G:cd=2.2*\037:ce=.1*\036:\
+	:cl=12\014:cm=\024%+^X%>/0%+P:cr=^M:dc=.1*\004:\
+	:dl=2.3*\027:do=^K:ho=^]:kd=^K:kl=^H:kr=^X:ku=^Z:le=^H:nd=^X:\
+	:sf=^J:up=^Z:
+# The padding on :sr: and :ta: for act5 and mime is a guess and not final.
+# The act 5 has hardware tabs, but they are in columns 8, 16, 24, 32, 41 (!)...
+# (microterm5: removed obsolete ":ma==^Z^P^Xl^Kj:" -- esr)
+act5|microterm5|microterm act v:\
+	:kd=^K:kl=^H:kr=^X:ku=^Z:sr=\EH:uc=^H\EA:tc=act4:
+# Mimes using brightness for standout.  Half bright is really dim unless
+# you turn up the brightness so far that lines show up on the screen.
+mime-fb|full bright mime1:\
+	:is=^S\E:se=^S:so=^Y:tc=mime:
+mime-hb|half bright mime1:\
+	:is=^Y\E:se=^Y:so=^S:tc=mime:
+# (mime: removed obsolete ":ma=^X ^K^J^Z^P:"; removed ":do=^K:" that overrode
+# the more plausible ":do=^J:" -- esr)
+# uc was at one time disabled to get around a curses bug, be wary of it
+mime|mime1|mime2|mimei|mimeii|microterm mime1:\
+	:am:bs:\
+	:co#80:it#8:li#24:vt#9:\
+	:al=\001:bl=^G:cd=^_:ce=^^:cl=^]^C:cm=\024%+^X%> 0%+P:\
+	:cr=^M:dl=\027:do=^J:ho=^]:is=^S\E^Q:kd=^K:kl=^H:kr=^X:ku=^Z:\
+	:le=^H:nd=^X:sf=^J:sr=\022:ta=\011:uc=^U:up=^Z:
+# These termcaps (for mime2a) put the terminal in low intensity mode
+# since high intensity mode is so obnoxious.
+mime2a-s|microterm mime2a (emulating an enhanced soroc iq120):\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\001:bl=^G:cd=\EJ:ce=\EK:cl=\EL:cm=\E=%+ %+ :cr=^M:\
+	:dc=\ED:dl=\027:do=^J:ei=^Z:ho=^^:im=\EE:ip=:is=\E):kd=^J:\
+	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\E;:sf=^J:so=\E\072:sr=\EI:\
+	:ue=\E7:up=\EI:us=\E6:
+# This is the preferred mode (but ^X can't be used as a kill character)
+mime2a|mime2a-v|microterm mime2a (emulating an enhanced vt52):\
+	:bs:\
+	:co#80:it#8:li#24:\
+	:al=\001:bl=^G:cd=\EQ:ce=\EP:cl=\EL:cm=\EY%+ %+ :cr=^M:\
+	:dc=^N:dl=\027:do=^J:ei=^Z:ho=\EH:im=^O:ip=:is=^Y:kd=\EB:\
+	:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\E9:sf=^J:so=\E8:\
+	:sr=\EA:ta=^I:ue=\E5:up=\EA:us=\E4:
+# (mime3a: removed obsolete ":ma=^X ^K^J^Z^P:" -- esr)
+mime3a|mime1 emulating 3a:\
+	:am@:\
+	:kd=^K:kl=^H:kr=^X:ku=^Z:tc=adm3a:
+mime3ax|mime-3ax|mime1 emulating enhanced 3a:\
+	:it#8:\
+	:al=\001:cd=^_:ce=^X:dl=\027:ta=\011:tc=mime3a:
+# Wed Mar  9 18:53:21 1983
+# We run our terminals at 2400 baud, so there might be some timing problems at
+# higher speeds. The major improvements in this model are the terminal now 
+# scrolls down and insert mode works without redrawing the rest of the line
+# to the right of the cursor. This is done with a bit of a kludge using the
+# exit graphics mode to get out of insert, but it does not appear to hurt
+# anything when using vi at least. If you have some users using act4s with
+# programs that use curses and graphics mode this could be a problem.
+mime314|mm314|mime 314:\
+	:am:\
+	:co#80:li#24:\
+	:al=^A:cd=^_:ce=^^:cl=^L:cm=\024%.%.:dc=^D:dl=^W:ei=^V:ho=^]:\
+	:im=^S:kd=^K:kl=^H:kr=^X:ku=^Z:le=^H:nd=^X:ta=^I:up=^Z:
+# Microterm mime 340 from University of Wisconsin
+mm340|mime340|mime 340:\
+	:co#80:li#24:\
+	:al=46\EU:cd=2*\037:ce=2.1\EL:cl=12\032:cm=\E=%+ %+ :\
+	:cr=^M:dc=2.1*\E#:dl=49.6\EV:do=^J:is=\E\054:kb=^H:kd=^J:\
+	:kl=^H:ku=^K:le=^H:nd=^L:nw=^M^J:sf=^J:ta=^I:up=^K:
+# This came from University of Wisconsin marked "astro termcap for jooss".
+# (mt4520-rv: removed obsolete ":kn#4:" and incorrect ":ri=\E[C:";
+# also added <rmam>/<smam> based  on the init string -- esr)
+mt4520-rv|micro-term 4520 reverse video:\
+	:am:hs:ms:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[g:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
+	:fs=\E[?5l\E[?5h:ho=\E[H:ic=\E[@:im=:\
+	:is=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[1;24r\E[24;1H\E[H\E[J:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:ll=\E[24;1H:me=\E[m:\
+	:nd=\E[C:nw=\EE:\
+	:r1=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[H\E[J:\
+	:rc=\E8:rf=/usr/share/tabset/vt100:sc=\E7:se=\E[0m:\
+	:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:ts=\E[25;1H:ue=\E[24m:\
+	:up=\E[A:us=\E[4m:vb=\E[?5l\E[?5h:ve=\E[0V\E8:\
+	:vs=\E7\E[0U:
+
+# Fri Aug  5 08:11:57 1983
+# This entry works for the ergo 4000 with the following setups:
+# ansi,wraparound,newline disabled, xon/xoff disabled in both
+# setup a & c.
+#	
+# WARNING!!! There are multiple versions of ERGO 4000 microcode
+# Be advised that very early versions DO NOT WORK RIGHT !!  
+# Microterm does have a ROM exchange program- use it or lose big
+# (ergo400: added <rmam>/<smam> based on the init string -- esr)
+ergo4000|microterm ergo 4000:\
+	:da:db:ms:\
+	:co#80:li#66:\
+	:AL=\E[1L:RA=\E[?7l:SA=\E[?7m:bl=^G:cd=\E[0J:ce=\E[0K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[1P:dl=\E[1M:\
+	:do=\E[B:ei=\E[4l:im=\E[4h:\
+	:is=\E<\E=\E[?1l\E[?4l\E[?5l\E[?7h\E[?8h:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:ke=\E=:kl=\E[D:kr=\E[C:\
+	:ks=\E=:ku=\E[A:l1=pf1:l2=pf2:l3=pf3:l4=pf4:le=^H:me=\E[m:\
+	:nd=\E[C:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:up=\E[A:
+
+#### NCR 
+#
+# NCR's terminal group was merged with AT&T's when AT&T bought the company.
+# For what happened to that group, see the ADDS section.
+#
+# There is an NCR4103 terminal that's just a re-badged Wyse-50.
+#
+
+# The following vendor-supplied termcaps were captured from the Boundless
+# Technologies site, 8 March 1998.  I removed all-upper-case names that were
+# identical, except for case, to lower-case ones.  I also uncommented the acsc
+# capabilities.X
+#
+# The Intecolor emulation of the NCR 2900/260C color terminal is basically a
+# DEC vt200/300 with color capabilities added.
+ncr260intan|NCR Intecolor emulation of the 2900_260C with an ANSI keyboard:\
+	:Co#8:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:op=\E[0m:tc=ncr260vt300an:
+# The Intecolor emulation of the NCR 2900/260C color terminal is basically a
+# DEC vt200/300 with color capabilities added.
+ncr260intwan|NCR Intecolor emulation of the 2900_260C with an ANSI keyboard:\
+	:Co#8:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:op=\E[0m:tc=ncr260vt300wan:
+# The Intecolor emulation of the NCR 2900/260C color terminal is basically a
+# DEC vt200/300 with color capabilities added.
+ncr260intpp|NCR Intecolor emulation of the 2900_260C with a PC+ keyboard:\
+	:Co#8:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:op=\E[0m:tc=ncr260vt300pp:
+# The Intecolor emulation of the NCR 2900/260C color terminal is basicly a
+# DEC vt200/300 with color capabilities added.
+ncr260intwpp|NCR Intecolor emulation of the 2900_260C with a PC+ keyboard in 132 column mode:\
+	:Co#8:pa#64:\
+	:AB=\E[4%p1%dm:AF=\E[3%p1%dm:op=\E[0m:tc=ncr260vt300wpp:
+# This definition for ViewPoint supports several attributes.  This means
+# that it has magic cookies (extra spaces where the attributes begin).
+# Some applications do not function well with magic cookies.  The System
+# Administrator's Shell in NCR Unix SVR4 1.03 is one such application. 
+# If supporting various attributes is not vital, 'xmc#1' and the extra
+# attributes can be removed. 
+# Mapping to ASCII character set ('acsc' capability) can also be 
+# restored if needed.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ncr260vppp|NCR 2900_260 viewpoint:\
+	:am:bw:hs:km:mi:ms:xo:\
+	:co#80:li#24:sg#1:\
+	:CM=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c:K1=^A:\
+	:K3=\EJ:K4=\ET:K5=\EJ:ae=\EcB0\EH\003:al=\EM:\
+	:as=\EcB1\EH\002:bl=^G:bt=\EI:cd=\Ek:ce=\EK:cl=\014:\
+	:cm=\EY%+ %+ :cr=\r:dc=\EW:dl=\El:do=\n:ds=\E`c:ei=\Er:\
+	:fs=^M:ho=\036:im=\Eq:\
+	:is=\Ee6\E~%\E+\E`\072\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0\EcC1\Ee7:\
+	:k1=^B1\r:k2=^B2\r:k3=^B3\r:k4=^B4\r:k5=^B5\r:k6=^B6\r:\
+	:k7=^B7\r:k8=^B8\r:k9=^B9\r:kD=\EW:kI=\Eq:kN=\EJ:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:le=\010:ll=\001:mb=\EG2:\
+	:me=\EG0\EH\003:mh=\EGp:mr=\EG4:nd=\006:nw=\037:se=\EG0:\
+	:sf=\n:so=\EG4:sr=\Ej:st=\E1:ta=^I:ts=\EF:ue=\EG0:up=\032:\
+	:us=\EG8:ve=\E`5:vi=\E`0:vs=\E`5:
+ncr260vpwpp|NCR 2900_260 viewpoint wide mode:\
+	:co#132:\
+	:cm=\Ea%i%dR%dC:\
+	:is=\Ee6\E~%\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0\EcC1\Ee7:\
+	:r2=\Ee6\E~%\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0\EcC1\Ee7:\
+	:tc=ncr260vppp:
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ncr260vt100an|NCR 2900_260 vt100 with ansi kybd:\
+	:am:hs:mi:ms:xn:xo:\
+	:co#80:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:SF=\E[%dE:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[1;1H:cm=\E[%i%d;%dH:cr=\r:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[1P:dl=\E[M:do=\E[B:\
+	:ds=\E[0$~\E[1$~:ec=\E[%dX:ei=\E[4l:fs=\E[0$}:ho=\E[H:\
+	:im=\E[4h:\
+	:is=\E[\041p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kD=\E[3~:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=\E[D:mb=\E[5m:md=\E[1m:\
+	:me=\E[0m\017:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:\
+	:se=\E[0m:sf=\ED:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[2$~\E[1$}:ue=\E[0m:up=\E[A:us=\E[4m:ve=\E[?25h:\
+	:vi=\E[?25l:
+ncr260vt100wan|NCR 2900_260 vt100 wide mode ansi kybd:\
+	:co#132:\
+	:cm=\E[%i%d;%dH:\
+	:is=\E[\041p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:r2=\E[\041p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:tc=ncr260vt100an:
+ncr260vt100pp|NCR 2900_260 vt100 with PC+ kybd:\
+	:@7=\E[5~:K1=\E[H:K2=\E[V:K3=\EOu:K5=\E[U:\
+	:is=\E[\041p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:kD=\E[4~:kI=\E[1~:kN=\E[6~:kP=\E[3~:kd=\E[B:ke=\E>:\
+	:kh=\E[2~:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:l1=pf1:l2=pf2:\
+	:l3=pf3:l4=pf4:\
+	:r2=\E[\041p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>:tc=ncr260vt100an:
+ncr260vt100wpp|NCR 2900_260 vt100 wide mode pc+  kybd:\
+	:co#132:\
+	:cm=\E[%i%d;%dH:\
+	:is=\E[\041p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:r2=\E[\041p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:tc=ncr260vt100pp:
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ncr260vt200an|NCR 2900_260 vt200 with ansi kybd:\
+	:am:hs:mi:ms:xn:xo:\
+	:co#80:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:SF=\E[%dE:UP=\E[%dA:ae=\017:al=\E[L:as=\016:\
+	:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[1;1H:cm=\E[%i%d;%dH:\
+	:cr=\r:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[1P:dl=\E[M:do=\E[B:\
+	:ds=\E[0$~\E[1$~:ec=\E[%dX:ei=\E[4l:fs=\E[0$}:ho=\E[H:\
+	:im=\E[4h:\
+	:is=\E[\041p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[M:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
+	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
+	:ks=\E[?1h\E=:ku=\EOA:le=\E[D:mb=\E[5m:md=\E[1m:\
+	:me=\E[0m\017:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:\
+	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[2$~\E[1$}:ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?25h:\
+	:vi=\E[?25l:
+ncr260vt200wan|NCR 2900_260 vt200 wide mode ansi kybd:\
+	:co#132:\
+	:cm=\E[%i%d;%dH:\
+	:is=\E[\041p\E[?3;7;19;67h\E[?4l\E(B\E)0\017\E[2J\E[1;1H:\
+	:r2=\E[\041p\E[?3;7;19;67h\E[?4l\E(B\E)0\017\E[2J\E[1;1H:\
+	:tc=ncr260vt200an:
+ncr260vt200pp|NCR 2900_260 vt200 with pc+ kybd:\
+	:@7=\E[1~:K1=\E[H:K2=\E[V:K3=\EOu:K5=\E[U:kD=\E[4~:\
+	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ks=\E=:ku=\E[A:l1=pf1:l2=pf2:l3=pf3:l4=pf4:\
+	:tc=ncr260vt200an:
+ncr260vt200wpp|NCR 2900_260 vt200 wide mode pc+  kybd:\
+	:co#132:\
+	:cm=\E[%i%d;%dH:\
+	:is=\E[\041p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:r2=\E[\041p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:tc=ncr260vt200pp:
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ncr260vt300an|NCR 2900_260 vt300 with ansi kybd:\
+	:am:hs:mi:ms:xn:xo:\
+	:co#80:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:SF=\E[%dE:UP=\E[%dA:ae=\017:al=\E[L:as=\016:\
+	:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[1;1H:cm=\E[%i%d;%dH:\
+	:cr=\r:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[1P:dl=\E[M:do=\E[B:\
+	:ds=\E[0$~\E[1$~:ec=\E[%dX:ei=\E[4l:fs=\E[0$}:ho=\E[H:\
+	:im=\E[4h:\
+	:is=\E[\041p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[M:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
+	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
+	:ks=\E[?1h\E=:ku=\EOA:le=\E[D:mb=\E[5m:md=\E[1m:\
+	:me=\E[0m\017:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:\
+	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[2$~\E[1$}:ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?25h:\
+	:vi=\E[?25l:
+ncr260vt300wan|NCR 2900_260 vt300 wide mode ansi kybd:\
+	:co#132:\
+	:cm=\E[%i%d;%dH:\
+	:is=\E[\041p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H:\
+	:r2=\E[\041p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H:\
+	:tc=ncr260vt300an:
+ncr260vt300pp|NCR 2900_260 vt300 with pc+ kybd:\
+	:@7=\E[1~:K1=\E[H:K2=\E[V:K3=\EOu:K5=\E[U:kD=\E[4~:\
+	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ks=\E=:ku=\E[A:l1=pf1:l2=pf2:l3=pf3:l4=pf4:\
+	:tc=ncr260vt300an:
+NCR260VT300WPP|ncr260vt300wpp|NCR 2900_260 vt300 wide mode pc+  kybd:\
+	:co#132:\
+	:cm=\E[%i%d;%dH:\
+	:is=\E[\041p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:r2=\E[\041p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>:\
+	:tc=ncr260vt300pp:
+# This terminfo file contains color capabilities for the Wyse325 emulation of 
+# the NCR 2900/260C color terminal.  Because of the structure of the command
+# (escape sequence) used to set color attributes, one of the fore/background
+# colors must be preset to a given value. I have set the background color to
+# black.  The user can change this setup by altering the last section of the
+# 'setf' definition.  The escape sequence to set color attributes is 
+#		ESC d y <foreground_color> <background_color> 1  
+# In addition, the background color can be changed through the desk accessories.
+# The capablitiy 'op' sets colors to green on black (default combination).  
+#
+# NOTE:  The NCR Unix System Administrator's Shell will not function properly
+# 	    if the 'pairs' capability is defined. Un-Comment the 'pairs'
+#	    capability and recompile if you wish to have it included. 
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ncr260wy325pp|NCR 2900_260 wyse 325:\
+	:am:bw:hs:km:mi:ms:xo:\
+	:co#80:li#24:\
+	:CM=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c:K1=^^:\
+	:K2=\EJ:K4=\ET:K5=\EK:ae=\EH\003\EcB0:al=\EE:\
+	:as=\EH\002\EcB1:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=\n:ds=\E`c:\
+	:ei=\Er:fs=^M:ho=\036:im=\Eq:\
+	:is=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\072\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\Eq:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=\010:mb=\EG2:\
+	:me=\EG0\EcB0\EcD:mr=\EG4:nd=\014:nw=\037:se=\EG0:sf=\n:\
+	:so=\EGt:sr=\Ej:st=\E1:ta=^I:ts=\EF:ue=\EG0:up=\013:us=\EG8:\
+	:ve=\E`1:vi=\E`0:vs=\E`5:
+ncr260wy325wpp|NCR 2900_260 wyse 325 wide mode:\
+	:co#132:\
+	:cm=\Ea%i%dR%dC:\
+	:is=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:r2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:tc=ncr260wy325pp:
+# This definition for Wyse 350 supports several attributes.  This means
+# that it has magic cookies (extra spaces where the attributes begin).
+# Some applications do not function well with magic cookies.  The System
+# Administrator's Shell in NCR Unix SVR4 1.03 is one such application. 
+# If supporting various attributes is not vital, 'xmc#1' and the extra
+# attributes can be removed. 
+# Mapping to ASCII character set ('acsc' capability) can also be 
+# restored if needed.
+# In addition, color capabilities have been added to this file.  The drawback,
+# however, is that the background color has to be black.  The foreground colors
+# are numbered 0 through 15.  
+#
+# NOTE:  The NCR Unix System Administrator's Shell does not function properly
+# 	    with the 'pairs' capability defined as below.  If you wish to
+#	    have it included, Un-comment it and recompile (using 'tic'). 
+#
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ncr260wy350pp|NCR 2900_260 wyse 350:\
+	:am:bw:hs:km:mi:ms:xo:\
+	:co#80:li#24:sg#1:\
+	:CM=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c:K1=^^:\
+	:K4=\ET:K5=\EK:ae=\EH\003\EcB0:al=\EE:as=\EH\002\EcB1:\
+	:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E+:cm=\E=%+ %+ :cr=^M:\
+	:ct=\E0:dc=\EW:dl=\ER:do=\n:ds=\E`c:ei=\Er:fs=^M:ho=\036:\
+	:im=\Eq:\
+	:is=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`\072\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\Eq:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=\010:mb=\EG2:\
+	:me=\EG0\EH\003\EcD:mh=\EGp:mr=\EG4:nd=\014:nw=\037:\
+	:se=\EG0:sf=\n:so=\EGt:sr=\Ej:st=\E1:ta=^I:ts=\EF:ue=\EG0:\
+	:up=\013:us=\EG8:ve=\E`1:vi=\E`0:vs=\E`5:
+ncr260wy350wpp|NCR 2900_260 wyse 350 wide mode:\
+	:co#132:\
+	:cm=\Ea%i%dR%dC:\
+	:is=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:r2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:tc=ncr260wy350pp:
+# This definition for Wyse 50+ supports several attributes.  This means
+# that it has magic cookies (extra spaces where the attributes begin).
+# Some applications do not function well with magic cookies.  The System
+# Administrator's Shell in NCR Unix SVR4 1.03 is one such application. 
+# If supporting various attributes is not vital, 'xmc#1' and the extra
+# attributes can be removed. 
+# Mapping to ASCII character set ('acsc' capability) can also be 
+# restored if needed.
+# (ncr260wy50+pp: originally contained commented-out 
+# <acsc=j5k3l2m1n8q:t4u9v=w0x6>, as well as the commented-out one there -- esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ncr260wy50+pp|NCR 2900_260 wyse 50+:\
+	:am:bw:hs:km:mi:ms:xo:\
+	:co#80:li#24:sg#1:\
+	:CM=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c:K1=^^:\
+	:K4=\ET:K5=\EK:ae=\EH^C:al=\EE:as=\EH^B:bl=^G:bt=\EI:cd=\EY:\
+	:ce=\ET:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:\
+	:do=\n:ds=\E`c:ei=\Er:fs=^M:ho=\036:im=\Eq:\
+	:is=\Ee6\E~"\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\072\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\Eq:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=\010:mb=\EG2:\
+	:me=\EG0\EH\003:mh=\EGp:mr=\EG4:nd=\014:nw=\037:se=\EG0:\
+	:sf=\n:so=\EGt:sr=\Ej:st=\E1:ta=\011:ts=\EF:ue=\EG0:up=\013:\
+	:us=\EG8:ve=\E`1:vi=\E`0:vs=\E`5:
+ncr260wy50+wpp|NCR 2900_260 wyse 50+ wide mode:\
+	:co#132:\
+	:cm=\Ea%i%dR%dC:\
+	:is=\Ee6\E~"\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:r2=\Ee6\E~"\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:tc=ncr260wy50+pp:
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+ncr260wy60pp|NCR 2900_260 wyse 60:\
+	:am:bw:hs:km:mi:ms:xo:\
+	:co#80:li#24:\
+	:CM=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c:K1=^^:\
+	:K2=\EJ:K4=\ET:K5=\EK:ae=\EH^C:al=\EE:as=\EH^B:bl=^G:bt=\EI:\
+	:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:\
+	:dl=\ER:do=\n:ds=\E`c:ei=\Er:fs=^M:ho=\036:im=\Eq:\
+	:is=\Ee6\E~4\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`\072\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\Eq:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=\010:mb=\EG2:\
+	:me=\EG0\EcB0\EcD:mr=\EG4:nd=\014:nw=\037:se=\EG0:sf=\n:\
+	:so=\EGt:sr=\Ej:st=\E1:ta=\011:ts=\EF:ue=\EG0:up=\013:\
+	:us=\EG8:ve=\E`1:vi=\E`0:vs=\E`5:
+ncr260wy60wpp|NCR 2900_260 wyse 60 wide mode:\
+	:co#132:\
+	:cm=\Ea%i%dR%dC:\
+	:is=\Ee6\E~4\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:r2=\Ee6\E~4\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~\041\E"\Ee4\Ex@\E`9\Ee7:\
+	:tc=ncr260wy60pp:
+ncr160vppp|NCR 2900_160 viewpoint:\
+	:tc=ncr260vppp:
+ncr160vpwpp|NCR 2900_160 viewpoint wide mode:\
+	:tc=ncr260vpwpp:
+ncr160vt100an|NCR 2900_160 vt100 with ansi kybd:\
+	:tc=ncr260vt100an:
+ncr160vt100pp|NCR 2900_160 vt100 with PC+ kybd:\
+	:tc=ncr260vt100pp:
+ncr160vt100wan|NCR 2900_160 vt100 wide mode ansi kybd:\
+	:tc=ncr260vt100wan:
+ncr160vt100wpp|NCR 2900_160 vt100 wide mode pc+  kybd:\
+	:tc=ncr260vt100wpp:
+ncr160vt200an|NCR 2900_160 vt200 with ansi kybd:\
+	:tc=ncr260vt200an:
+ncr160vt200pp|NCR 2900_160 vt200 with pc+ kybd:\
+	:tc=ncr260vt200pp:
+ncr160vt200wan|NCR 2900_160 vt200 wide mode ansi kybd:\
+	:tc=ncr260vt200wan:
+ncr160vt200wpp|NCR 2900_160 vt200 wide mode pc+  kybd:\
+	:tc=ncr260vt200wpp:
+ncr160vt300an|NCR 2900_160 vt300 with ansi kybd:\
+	:tc=ncr260vt300an:
+ncr160vt300pp|NCR 2900_160 vt300 with pc+ kybd:\
+	:tc=ncr260vt300pp:
+ncr160vt300wan|NCR 2900_160 vt300 wide mode ansi kybd:\
+	:tc=ncr260vt300wan:
+ncr160vt300wpp|NCR 2900_160 vt300 wide mode pc+  kybd:\
+	:tc=ncr260vt300wpp:
+ncr160wy50+pp|NCR 2900_160 wyse 50+:\
+	:tc=ncr260wy50+pp:
+ncr160wy50+wpp|NCR 2900_160 wyse 50+ wide mode:\
+	:tc=ncr260wy50+wpp:
+ncr160wy60pp|NCR 2900_160 wyse 60:\
+	:tc=ncr260wy60pp:
+ncr160wy60wpp|NCR 2900_160 wyse 60 wide mode:\
+	:tc=ncr260wy60wpp:
+ncrvt100an|ncrvt100pp|NCR vt100 for the 2900 terminal:\
+	:5i:am:hs:mi:ms:xo:\
+	:Nl#32:co#80:it#8:li#24:\
+	:#4=\E[D:%i=\E[C:@8=^M:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
+	:DO=\E[%dB:K1=\E[H:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
+	:ac=``aaffgghhiijjkkllmmnnqqttuuvvwwxxyyzz~~:ae=\017:\
+	:al=\E[B\E[L:as=\016:bl=^G:cb=\E[1K:cd=\E[0J:ce=\E[0K:\
+	:cl=\E[2J\E[1;1H:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[1P:dl=\E[M:do=\E[B:ds=\E[31l:eA=\E(B\E)0:\
+	:ei=\E[4l:fs=1:ho=\E[H:im=\E[4h:\
+	:is=\E[12h\E[?10l\E%/0n\E[P\031\E[?3l\E(B\E)0:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\017\E[0m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:ps=\E[i:\
+	:r2=\Ec\E[12;31h\E[?3;4;5;10l\E[?6;7;19;25h\E[33;34l\E[0m\E(B\E)0\E%/0n\E[P\031:\
+	:rc=\E8:\
+	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<100>:\
+	:sc=\E7:se=\E[0m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[>+1:ue=\E[0m:up=\E[A:us=\E[4m:
+ncrvt100wan|NCRVT100WPP|ncrvt100wpp|NCR VT100 emulation of the 2900 terminal:\
+	:co#132:\
+	:is=\E[12h\E[?10l\E%/0n\E[P\031\E[?3h\E(B\E)0:\
+	:r2=\Ec\E[12;31h\E[?4;5;10l\E?3;6;7;19;25h\E[33;34l\E[0m\E(B\E)0\E%/0n\E[P\031:\
+	:tc=ncrvt100an:
+#
+# Vendor-supplied NCR termcaps end here
+
+# NCR7900 DIP switches:
+#
+# Switch A:
+# 1-4 - Baud Rate
+# 5   - Parity (Odd/Even)
+# 6   - Don't Send or Do Send Spaces
+# 7   - Parity Enable
+# 8   - Stop Bits (One/Two)
+# 
+# Switch B:
+# 1   - Upper/Lower Shift
+# 2   - Typewriter Shift
+# 3   - Half Duplex / Full Duplex
+# 4   - Light/Dark Background
+# 5-6 - Carriage Return Without / With Line Feed
+# 7   - Extended Mode
+# 8   - Suppress Keyboard Display
+# 
+# Switch C:
+# 1   - End of line entry disabled/enabled
+# 2   - Conversational mode / (Local?) Mode
+# 3   - Control characters displayed / not displayed
+# 4   - (2-wire?) / 4-wire communications
+# 5   - RTS on and off for each character
+# 6   - (50Hz?) / 60 Hz
+# 7   - Exit after level zero diagnostics
+# 8   - RS-232 interface
+# 
+# Switch D:
+# 1   - Reverse Channel (yes / no)
+# 2   - Manual answer (no / yes)
+# 3-4 - Cursor appearance
+# 5   - Communication Rate
+# 6   - Enable / Disable EXT turnoff
+# 7   - Enable / Disable CR turnoff
+# 8   - Enable / Disable backspace
+#
+# Since each attribute parameter is 0 or 1, we shift each attribute (standout,
+# reverse, blink, dim, and underline) the appropriate number of bits (by
+# multiplying the 0 or 1 by a correct factor to shift) so the bias character,
+# '@' is (effectively) "or"ed with each attribute to generate the proper third
+# character in the <ESC>0 sequence.  The :sa: string implements the following
+# equation:
+#
+# ((((('@' + P5) | (P4 << 1)) | (P3 << 3)) | (P2 << 4)) | (p1 * 17))    =>
+# ((((('@' + P5) + (P4 << 1)) + (P3 << 3)) + (P2 << 4)) + (p1 * 17))
+#
+#	Where:  P1 <==> Standout attribute parameter
+#		P2 <==> Underline attribute parameter
+#		P3 <==> Reverse attribute parameter
+#		P4 <==> Blink attribute parameter
+#		P5 <==> Dim attribute parameter
+# From <root@goliath.un.atlantaga.NCR.COM>, init string hacked by SCO.
+ncr7900i|ncr7900|ncr 7900 model 1:\
+	:am:bw:ul:\
+	:co#80:li#24:sg#1:\
+	:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\E1%r%.%.:cr=^M:do=^J:\
+	:is=\E0@\010\E3\E4\E7:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:le=^H:\
+	:ll=^A:mb=\E0B:me=\E0@:mh=\E0A:mr=\E0P:nd=^F:pf=^T:po=^R:\
+	:..sa=\E0%p5%{64}%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}%*%+%c:\
+	:se=\E0@:sf=^J:so=\E0Q:ue=\E0@:up=^Z:us=\E0`:
+ncr7900iv|ncr 7900 model 4:\
+	:am:bw:es:hs:\
+	:co#80:li#24:\
+	:al=\E^N:bl=^G:cl=^L:cm=\013%+@\E\005%02:cr=^M:dl=\E^O:\
+	:do=^J:ds=\Ey1:fs=\Ek\Ey5:ho=\013@\E^E00:k1=\ES:k2=\ET:\
+	:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:kb=^H:kd=\EB:\
+	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:l6=blue:l7=red:l8=white:le=^H:\
+	:nw=^M^J:sf=^J:ts=\Ej\Ex5\Ex1\EY8%p1%{32}%+%c\Eo:
+# Warning: This terminal will lock out the keyboard when it receives a CTRL-D.
+#	   The user can enter a CTRL-B to get out of this locked state.
+# In <hpa>, we want to output the character given by the formula:
+#		((col / 10) * 16) + (col % 10)		where "col" is "p1"
+ncr7901|ncr 7901 model:\
+	:am:bw:ul:\
+	:co#80:li#24:\
+	:bl=^G:cd=\Ek:ce=\EK:ch=\020%+^J:cl=^L:cm=\EY%+ %+ :cr=^M:\
+	:cv=\013%+@:do=^J:is=\E4^O:kC=^L:kd=^J:kh=^H:kl=^U:kr=^F:\
+	:ku=^Z:le=^H:ll=^A:mb=\E0B:me=^O:mh=\E0A:mr=\E0P:nd=^F:pf=^T:\
+	:po=^R:\
+	:..sa=\E0%p5%{64}%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}%*%+%c\016:\
+	:se=^O:sf=^J:so=\E0Q\016:ue=^O:up=^Z:us=\E0`\016:ve=^X:\
+	:vi=^W:
+
+#### Perkin-Elmer (Owl)
+#
+# These are official terminfo entries from within Perkin-Elmer.
+#
+
+bantam|pe550|pe6100|perkin elmer 550:\
+	:bs:\
+	:co#80:li#24:\
+	:bl=^G:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :cr=^M:do=^J:ho=\EH:\
+	:le=^H:ll=\EH\EA:nd=\EC:sf=^J:up=\EA:
+fox|pe1100|perkin elmer 1100:\
+	:am:bs:\
+	:co#80:li#24:\
+	:bl=^G:cd=\EJ:ce=\EI:cl=\EH\EJ:cm=\EX%+ \EY%+ :cr=^M:\
+	:ct=\E3:do=^J:ho=\EH:le=^H:ll=\EH\EA:nd=\EC:sf=^J:st=\E1:\
+	:up=\EA:vb=\020\002\020\003:
+owl|pe1200|perkin elmer 1200:\
+	:am:bs:in:\
+	:co#80:li#24:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EI:cl=\EH\EJ:cm=\EX%+ \EY%+ :\
+	:cr=^M:ct=\E3:dc=\EO:dl=\EM:do=^J:ei=:ho=\EH:ic=\EN:im=:ip=:\
+	:k0=\ERJ:k1=\ERA:k2=\ERB:k3=\ERC:k4=\ERD:k5=\ERE:k6=\ERF:\
+	:k7=\ERG:k8=\ERH:k9=\ERI:kb=^H:le=^H:ll=\EH\EA:me=\E\041\0:\
+	:nd=\EC:se=\E\041\0:sf=^J:so=\E\041^H:st=\E1:up=\EA:\
+	:vb=\020\002\020\003:
+pe1251|pe6300|pe6312|perkin elmer 1251:\
+	:am:\
+	:co#80:it#8:li#24:pb#300:sg#1:vt#8:\
+	:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :cr=^M:ct=\E3:\
+	:do=\EB:ho=\EH:k0=\ERA:k1=\ERB:k2=\ERC:k3=\ERD:k4=\ERE:\
+	:k5=\ERF:k6=\ERG:k7=\ERH:k8=\ERI:k9=\ERJ:k;=\ERK:le=\ED:\
+	:nd=\EC:sf=^J:st=\E1:up=\EA:
+# (pe7000m: this had
+# 	rmul=\E!\0, smul=\E!\040, 
+# which is probably wrong, it collides with kf0
+pe7000m|perkin elmer 7000 series monochrome monitor:\
+	:am:\
+	:co#80:li#24:\
+	:bl=^G:bt=\E\041Y:cd=\EJ:ce=\EI:cl=\EK:cm=\ES%+ %+ :cr=^M:\
+	:do=\EB:ho=\EH:i1=\E\041\0\EW  7o\Egf\ES7 :k0=\E\041\0:\
+	:k1=\E\041^A:k2=\E\041^B:k3=\E\041^C:k4=\E\041^D:\
+	:k5=\E\041^E:k6=\E\041^F:k7=\E\041^G:k8=\E\041^H:\
+	:k9=\E\041^I:k;=\E\041^J:kb=^H:kd=\E\041U:kh=\E\041S:\
+	:kl=\E\041V:kr=\E\041W:ku=\E\041T:le=\ED:ll=\ES7 :nd=\EC:\
+	:sf=^J:sr=\ER:up=\EA:
+pe7000c|perkin elmer 7000 series colour monitor:\
+	:i1=\E\041\0\EW  7o\Egf\Eb0\Ec7\ES7 :se=\Eb0:so=\Eb2:\
+	:ue=\E\041\0:us=\E\041 :\
+	:tc=pe7000m:
+
+#### Prime
+#
+# Yes, Prime made terminals.  These entries were posted by Kevin J. Cummings
+# <cummings@primerd.prime.com> on 14 Dec 1992 and lightly edited by esr.
+# Prime merged with ComputerVision in the late 1980s; you can reach them at:
+#
+#	ComputerVision Services
+#	500 Old Connecticut Path
+#	Framingham, Mass.
+#
+
+# Standout mode is dim reverse-video.
+pt100|pt200|wren|fenix|prime pt100/pt200:\
+	:am:bw:mi:ms:\
+	:co#80:it#8:li#24:\
+	:DC=\E[%dP:DL=\E[M:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
+	:UP=\E[%dA:al=\E[L\E[t:bt=\E[Z:cd=\E[J\E[r:ce=\E[K\E[t:\
+	:cl=\E?:cm=\E0%+!%+!:cr=^M:dc=\E[P:do=\ED:ei=\E[4l:ho=\E$B:\
+	:im=\E[4h:kb=^H:kd=\E[B:ke=\E[>13l:kh=\E$A:kl=\E[D:kr=\E[C:\
+	:ks=\E[>13h:ku=\E[A:le=^H:me=\E[m:mh=\E[2m:nd=\E[C:nw=^M^J:\
+	:se=\E[m:sf=^J:so=\E[2;7m:ta=^I:te=:\
+	:ti=\E[>1l\E[>2l\E[>16l\E[4l\E[>9l\E[20l\E[>3l\E[>7h\E[>12l\E[1Q:\
+	:ue=\E[m:up=\EM:us=\E[4m:vb=\E$\E$P:
+pt100w|pt200w|wrenw|fenixw|prime pt100/pt200 in 132-column mode:\
+	:co#132:\
+	:cm=\E[%i%d;%dH:tc=pt100:
+pt250|Prime PT250:\
+	:se@:so@:tc=pt100:
+pt250w|Prime PT250 in 132-column mode:\
+	:se@:so@:tc=pt100w:
+
+#### Sperry Univac
+#
+# Sperry Univac has merged with Burroughs to form Unisys.
+#
+
+# This entry is for the Sperry UTS30 terminal running the TTY 
+# utility under control of CP/M Plus 1R1. The functionality 
+# provided is comparable to the DEC vt100.
+# (uts30: I added <rmam>/<smam> based on the init string -- esr)
+uts30|sperry uts30 with cp/m@1R1:\
+	:am:bw:hs:\
+	:co#80:li#24:ws#40:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7m:SF=\E[%dB:\
+	:SR=\E[%dA:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\Ed:al=\EN:as=\EF:bl=^G:cd=\E[J:ce=\E[K:cl=^L:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\EU%+ %+ :dc=\EM:dl=\EL:do=\EB:\
+	:ei=:fs=^M:ho=\E[H:ic=\EO:im=:is=\E[U 7\E[24;1H:kb=^H:\
+	:kd=\EOB:kh=\E[H:kl=\EOD:kr=\EOC:ku=\EOA:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\EC:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\EX:\
+	:rf=/usr/share/tabset/vt100:sc=\EW:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EI:ta=^I:ts=\E]:uc=\EPB:ue=\E[m:up=\E[A:\
+	:us=\E[4m:ve=\ES:vi=\ER:
+
+#### Tandem
+#
+# Tandem builds these things for use with its line of fault-tolerant
+# transaction-processing computers.  They aren't generally available
+# on the merchant market, and so are fairly uncommon.
+#
+
+tandem6510|adm3a repackaged by Tandem:\
+	:tc=adm3a:
+
+# A funny series of terminal that TANDEM uses.  The actual model numbers
+# have a fourth digit after 653 that designates minor variants.  These are
+# natively block-mode and rather ugly, but they have a character mode which
+# this doubtless(?) exploits.  There is a 6520 that is slightly dumber.
+# (tandem653: had ":sb=\ES:", probably someone's mistake for sf; also,
+# removed :if=/usr/share/tabset/tandem653:, no such file -- esr)
+tandem653|t653x|Tandem 653x multipage terminal:\
+	:am:bs:da:db:hs:\
+	:co#80:li#24:sg#1:ws#64:\
+	:cd=\EJ:ce=\EK:cl=\EI:cm=\023%+ %+ :do=^J:ds=\Eo\r:fs=^M:\
+	:ho=\EH:le=^H:me=\E6 :nd=\EC:se=\E6 :sf=\ES:so=\E6$:sr=\ET:\
+	:ts=\Eo:ue=\E6 :up=\EA:us=\E60:
+
+#### Tandy/Radio Shack
+#
+# Tandy has a line of VDTs distinct from its microcomputers.
+#
+
+dmterm|deskmate terminal:\
+	:am:bw:\
+	:co#80:li#24:\
+	:al=\EP:bl=^G:cd=\EJ:ce=\EK:cl=\Ej:cm=\EY%+ %+ :cr=^M:\
+	:dc=\ES:dl=\ER:do=\EB:ei=:ho=\EH:ic=\EQ:im=:k0=\E1:k1=\E2:\
+	:k2=\E3:k3=\E4:k4=\E5:k5=\E6:k6=\E7:k7=\E8:k8=\E9:k9=\E0:\
+	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:l0=f1:l1=f2:l2=f3:l3=f4:\
+	:l4=f5:l5=f6:l6=f7:l7=f8:l8=f9:l9=f10:le=^H:ll=\EE:mk@:nd=\EC:\
+	:sf=\EX:ta=^I:ue@:up=\EA:us@:ve=\EG6:vi=\EG5:\
+	:tc=adm+sgr:
+dt100|dt-100|Tandy DT-100 terminal:\
+	:xo:\
+	:co#80:li#24:sg#1:\
+	:ac=jjkkllmmnnqqttuuvvwwxx:ae=^O:al=\E[L:as=^N:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\010\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%2;%2r:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:\
+	:im=:is=\E[?3l\E)0\E(B:k1=\E[?3i:k2=\E[2i:k3=\E[@:k4=\E[M:\
+	:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:k9=\E[21~:\
+	:k;=\E[?5i:kN=\E[29~:kP=\E[28~:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:l1=f1:l2=f2:l3=f3:l4=f4:l5=f5:l6=f6:l7=f7:\
+	:l8=f8:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
+	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
+dt100w|dt-100w|Tandy DT-100 terminal (wide mode):\
+	:co#132:tc=dt100:
+dt110|Tandy DT-110 emulating ansi:\
+	:xo:\
+	:co#80:li#24:\
+	:@7=\E[K:ac=jjkkllmmnnqqttuuvvwwxx:ae=^O:al=\E[0L:as=^N:\
+	:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:cm=\010\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:dc=\E[0P:dl=\E[0M:do=\E[0B:\
+	:eA=\E(B\E)0:ei=:ho=\E[H:ic=\E[0@:im=:is=\E[?3l\E)0\E(B:\
+	:k1=\E[1~:k2=\E[2~:k3=\E[3~:k4=\E[4~:k5=\E[5~:k6=\E[6~:\
+	:k7=\E[7~:k8=\E[8~:k9=\E[9~:k;=\E[10~:kI=\E[@:kN=\E[26~:\
+	:kP=\E[25~:kd=\E[B:kh=\E[G:kl=\E[D:kr=\E[C:ku=\E[A:l0=f1:\
+	:l1=f2:l2=f3:l3=f4:l4=f5:l5=f6:l6=f7:l7=f8:l8=f9:l9=f10:le=^H:\
+	:me=\E[m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
+	:ue=\E[m:up=\E[0A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
+pt210|TRS-80 PT-210 printing terminal:\
+	:hc:os:\
+	:co#80:\
+	:bl=^G:cr=^M:do=^J:sf=^J:
+
+#### Tektronix (tek)
+#
+# Tektronix tubes are graphics terminals.  Most of them use modified 
+# oscilloscope technology incorporating a long-persistence green phosphor,
+# and support vector graphics on a main screen with an attached "dialogue
+# area" for interactive text.
+#
+
+tek|tek4012|tektronix 4012:\
+	:bs:os:\
+	:co#75:li#35:\
+	:bl=^G:cl=\E\014:cr=^M:do=^J:ff=\014:is=\E^O:le=^H:
+# (tek4013: added <acsc> to suppress tic warnings re :as:/:ae: --esr)
+tek4013|tektronix 4013:\
+	:ac=:ae=\E^O:as=\E^N:tc=tek4012:
+tek4014|tektronix 4014:\
+	:co#81:li#38:\
+	:is=\E\017\E9:tc=tek4012:
+# (tek4015: added <acsc> to suppress tic warnings re :as:/:ae: --esr)
+tek4015|tektronix 4015:\
+	:ac=:ae=\E^O:as=\E^N:tc=tek4014:
+tek4014-sm|tektronix 4014 in small font:\
+	:co#121:li#58:\
+	:is=\E\017\E\072:tc=tek4014:
+# (tek4015-sm: added <acsc> to suppress tic warnings re :as:/:ae: --esr)
+tek4015-sm|tektronix 4015 in small font:\
+	:ac=:ae=\E^O:as=\E^N:tc=tek4014-sm:
+# Tektronix 4023 from Andrew Klossner <orca!andrew.tektronix@csnet-relay>
+#
+# You need to have "stty nl2" in effect.  Some versions of tset(1) know
+# how to set it for you.
+#
+# It's got the Magic Cookie problem around stand-out mode.  If you can't
+# live with Magic Cookie, remove the :so: and :se: fields and do without
+# reverse video.  If you like reverse video stand-out mode but don't want
+# it to flash, change the letter 'H' to 'P' in the :so: field.
+tek4023|tektronix 4023:\
+	:am:bs:\
+	:co#80:dN#4:li#24:sg#1:vt#4:\
+	:bl=^G:cl=4\E\014:cm=\034%r%+ %+ :cr=^M:do=^J:kb=^H:le=^H:\
+	:nd=^I:nl=^J:se=^_@:so=^_P:
+# It is recommended that you run the 4025 at 4800 baud or less;
+# various bugs in the terminal appear at 9600.  It wedges at the
+# bottom of memory (try "cat /usr/dict/words"); ^S and ^Q typed
+# on keyboard don't work.  You have to hit BREAK twice to get
+# one break at any speed - this is a documented feature.
+# Can't use cursor motion because it's memory relative, and 
+# because it only works in the workspace, not the monitor.  
+# Same for home. Likewise, standout only works in the workspace.
+# 
+# :ce: was commented out since vi and rogue seem to work better 
+# simulating it with lots of spaces!
+# 
+# :al: and :AL: had 145ms of padding, but that slowed down vi's ^U 
+# and didn't seem necessary.
+#
+tek4024|tek4025|tek4027|tektronix 4024/4025/4027:\
+	:am:bs:da:db:\
+	:co#80:it#8:li#34:lm#0:\
+	:AL=\037up\r\037ili %d\r:CC=^_:DL=\037dli %d\r\006:\
+	:DO=\037dow %d\r:LE=\037lef %d\r:RI=\037rig %d\r:\
+	:UP=\037up %d\r:al=\037up\r\037ili\r:bl=^G:\
+	:cd=\037dli 50\r:cl=\037era\r\n\n:cr=^M:dc=\037dch\r:\
+	:dl=\037dli\r\006:do=^F^J:ei=:ic=\037ich\r \010:im=:\
+	:is=\041com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r:\
+	:ke=\037lea p2\r\037lea p4\r\037lea p6\r\037lea p8\r\037lea f5\r:\
+	:ks=\037lea p4 /h/\r\037lea p8 /k/\r\037lea p6 / /\r\037lea p2 /j/\r\037lea f5 /H/\r:\
+	:le=^H:nd=\037rig\r:sf=^F^J:ta=^I:up=^K:
+tek4025-17|tek 4025 17 line window:\
+	:li#17:tc=tek4025:
+tek4025-17-ws|tek 4025 17 line window in workspace:\
+	:is=\041com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r\037wor 17\r\037mon 17\r:\
+	:se=\037att s\r:so=\037att e\r:te=\037mon h\r:\
+	:ti=\037wor h\r:\
+	:tc=tek4025-17:
+tek4025-ex|tek4027-ex|tek 4025/4027 w/!:\
+	:is=\037com 33\r\n\041sto 9 17 25 33 41 49 57 65 73\r:\
+	:te=\037com 33\r:ti=\041com 31\r:\
+	:tc=tek4025:
+# Tektronix 4025a
+# From: Doug Gwyn <gwyn@brl-smoke.ARPA>
+# The following status modes are assumed for normal operation (replace the
+# initial "!" by whatever the current command character is):
+#	!COM 29			# NOTE: changes command character to GS (^])
+#	^]DUP
+#	^]ECH R
+#	^]EOL
+#	^]RSS T
+#	^]SNO N
+#	^]STO 9 17 25 33 41 49 57 65 73
+# Other modes may be set according to communication requirements.
+# If the command character is inadvertently changed, termcap can't restore it.
+# Insert-character cannot be made to work on both top and bottom rows.
+# Clear-to-end-of-display emulation via !DLI 988 is too grotty to use, alas.
+# There also seems to be a problem with vertical motion, perhaps involving
+# delete/insert-line, following a typed carriage return.  This terminal sucks.
+# Delays not specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+# (tek4025a: removed obsolete ":xx:". This may mean the tek4025a entry won't
+# work any more. -- esr)
+tek4025a|Tektronix 4025A:\
+	:am:bs:bw:da:db:pt:xo:\
+	:co#80:it#8:li#34:\
+	:CC=^]:DC=\035dch %d;:DL=\035dli %d;:DO=\035dow %d;:\
+	:LE=\035lef %d;:RI=\035rig %d;:SF=\035dow %d;:\
+	:UP=\035up %d;:al=\013\035ili;:bl=^G:bt=\035bac;:\
+	:ce=\035dch 80;:ch=\r\035rig %d;:cl=\035era;\n\035rup;:\
+	:cr=^M:ct=\035sto;:dc=\035dch;:dl=\035dli;:do=^J:le=^H:\
+	:nd=\035rig;:\
+	:rs=\041com 29\035del 0\035rss t\035buf\035buf n\035cle\035dis\035dup\035ech r\035eol\035era g\035for n\035pad 203\035pad 209\035sno n\035sto 9 17 25 33 41 49 57 65 73\035wor 0;:\
+	:sf=^J:ta=^I:up=^K:
+# From: cbosg!teklabs!davem Wed Sep 16 21:11:41 1981
+# Here's the command file that I use to get rogue to work on the 4025.
+# It should work with any program using the old curses (e.g. it better
+# not try to scroll, or cursor addressing won't work.  Also, you can't
+# see the cursor.)
+# (This "learns" the arrow keys for rogue. I have adapted it for termcap - mrh)
+tek4025-cr|tek 4025 for curses and rogue:\
+	:am:bs:\
+	:co#80:it#8:li#33:\
+	:cl=\037era;:cm=\037jum%i%d\054%d;:do=^F^J:\
+	:is=\041com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r:\
+	:le=^H:nd=\037rig;:sf=^F^J:ta=^I:te=\037wor 0:\
+	:ti=\037wor 33h:up=^K:
+# next two lines commented out since curses only allows 128 chars, sigh.
+#	:ti=\037lea p1/b/\037lea p2/j/\037lea p3/n/\037lea p4/h/\037lea p5/ /\037lea p6/l/\037lea p7/y/\037lea p8/k/\037lea p9/u/\037lea p./f/\037lea pt/`era w/13\037lea p0/s/\037wor 33h:\
+#	:te=\037lea p1\037lea p2\037lea p3\037lea p4\037lea pt\037lea p5\037lea p6\037lea p7\037lea p8\037lea p9/la/13\037lea p.\037lea p0\037wor 0:
+tek4025ex|4025ex|4027ex|tek 4025 w/!:\
+	:is=\037com 33\r\n\041sto 9\05417\05425\05433\05441\05449\05457\05465\05473\r:\
+	:te=\037com 33\r:ti=\041com 31\r:\
+	:tc=tek4025:
+tek4105|tektronix 4105:\
+	:am:bs:mi:ms:ul:xn:xt:\
+	:co#79:it#8:li#29:\
+	:ac=:ae=\E[m:al=\E[1L:as=\E[1m:bl=^G:bt=\E[Z:cd=\E[J:\
+	:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%2;%2H:cr=^M:ct=\E[1g:\
+	:dc=\E[1P:dl=\E[1M:do=\E[1B:ei=\E[4l:ho=\E[H:i1=\E%!1\E[m:\
+	:im=\E[4h:is=\E%!1\E[?6141\E[m:kb=^H:kd=\E[1B:kl=\E[1D:\
+	:kr=\E[1C:ku=\E[1A:mb=\E[=3;<7m:md=\E[=7;<4m:\
+	:me=\E[=0;<1m:mh=\E[=1;<6m:mk=\E[=6;<5:mr=\E[=1;<3m:\
+	:nd=\E[1C:se=\E[=0;<1m:sf=\E[S:so=\E[=2;<3m:sr=\E[T:ta=^I:\
+	:te=:ti=\E%!1\E[?6l\E[2J:ue=\E[=0;<1m:up=\E[1A:\
+	:us=\E[=5;<2m:
+
+# (tek4105-30: I added <rmam>/<smam> based on the init string -- esr)
+tek4105-30|4015 emulating 30 line vt100:\
+	:am:mi:ms:xn:xo:\
+	:co#80:it#8:li#30:vt#3:\
+	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:\
+	:eA=\E(B\E)0:ho=\E[H:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\
+	:nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
+
+# Tektronix 4105 from BRL
+# The following setup modes are assumed for normal operation:
+#	CODE ansi		CRLF no			DABUFFER 141
+#	DAENABLE yes		DALINES 30		DAMODE replace
+#	DAVISIBILITY yes	ECHO no			EDITMARGINS 1 30
+#	FLAGGING input		INSERTREPLACE replace	LFCR no
+#	ORIGINMODE relative	PROMPTMODE no		SELECTCHARSET G0 B
+#	SELECTCHARSET G1 0	TABS -2
+# Other setup modes may be set for operator convenience or communication
+# requirements; I recommend
+#	ACURSOR 1 0		AUTOREPEAT yes		AUTOWRAP yes
+#	BYPASSCANCEL <LF>	CURSORKEYMODE no	DAINDEX 1 0 0
+#	EOFSTRING ''		EOLSTRING <CR>		EOMCHARS <CR> <NU>
+#	GAMODE overstrike	GCURSOR 0 100 0		GSPEED 10 1
+#	IGNOREDEL no		KEYEXCHAR <DL>		NVDEFINE -53 "<NU>"
+#	PROMPTSTRING ''		QUEUESIZE 2460		WINDOW 0 0 4095 3132
+#	XMTDELAY 0
+# and factory color maps.  After setting these modes, save them with NVSAVE. No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+# "IC" cannot be used in combination with "im" & "ei".
+# "tek4105a" is just a guess:
+tek4105a|Tektronix 4105:\
+	:bs:ms:pt:xo:\
+	:co#80:it#8:kn#8:li#30:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ac=:ae=^O:al=\E[L:\
+	:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E%!1:k0=\EOA:k1=\EOB:k2=\EOC:k3=\EOD:k4=\EOP:k5=\EOQ:\
+	:k6=\EOR:k7=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l0=F1:l1=F2:l2=F3:l3=F4:l4=F5:\
+	:l5=F6:l6=F8:le=^H:ll=\E[30;H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
+	:rs=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40\ELI100\ELLA>\ELM0\EKE0\ENF1\EKS0\END0\E%!1\Ec\E[?3;5l\E[?7;8h\E[r\E[m\E>:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:te=\E%!0\ELBH=\E%!1:ti=\E[?6l:ue=\E[m:up=\EM:us=\E[4m:\
+	:ve=\E%!0\ETD10\E%!1:vi=\E%!0\ETD00\E%!1:\
+	:vs=\E%!0\ETD70\E%!1:
+
+#
+# Tektronix 4106/4107/4109 from BRL
+# The following setup modes are assumed for normal operation:
+#	CODE ansi		COLUMNMODE 80		CRLF no
+#	DABUFFER 141		DAENABLE yes		DALINES 32
+#	DAMODE replace		DAVISIBILITY yes	ECHO no
+#	EDITMARGINS 1 32	FLAGGING input		INSERTREPLACE replace
+#	LFCR no			LOCKKEYBOARD no		ORIGINMODE relative
+#	PROMPTMODE no		SELECTCHARSET G0 B	SELECTCHARSET G1 0
+#	TABS -2
+# Other setup modes may be set for operator convenience or communication
+# requirements; I recommend
+#	ACURSOR 1 0		AUTOREPEAT yes		AUTOWRAP yes
+#	BYPASSCANCEL <LF>	CURSORKEYMODE no	DAINDEX 1 0 0
+#	EOFSTRING ''		EOLSTRING <CR>		EOMCHARS <CR> <NU>
+#	GAMODE overstrike	GCURSOR 0 100 0		GSPEED 9 3
+#	IGNOREDEL no		KEYEXCHAR <DL>		NVDEFINE -53 "<NU>"
+#	PROMPTSTRING ''		QUEUESIZE 2620		WINDOW 0 0 4095 3132
+#	XMTDELAY 0
+# and factory color maps.  After setting these modes, save them with NVSAVE.  No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+# "IC" cannot be used in combination with "im" & "ei".
+tek4106brl|tek4107brl|tek4109brl|Tektronix 4106 4107 or 4109:\
+	:ms:xo:\
+	:co#80:it#8:li#32:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ac=:ae=^O:al=\E[L:\
+	:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=^J:ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E%!1:k0=\EOA:k1=\EOB:k2=\EOC:k3=\EOD:k4=\EOP:k5=\EOQ:\
+	:k6=\EOR:k7=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l0=F1:l1=F2:l2=F3:l3=F4:l4=F5:\
+	:l5=F6:l6=F8:le=^H:ll=\E[32;H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:r1=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40\ELI100\ELLB0\ELM0\EKE0\ENF1\EKS0\END0\ERE0\E%!1\Ec\E[?3;5l\E[?7;8h\E[r\E[m\E>:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7;42m:sr=\EM:st=\EH:\
+	:ta=^I:te=\E%!0\ELBH=\E%!1:ti=\E[?6l:ue=\E[m:up=\EM:\
+	:us=\E[4m:ve=\E%!0\ETD10\E%!1:vi=\E%!0\ETD00\E%!1:\
+	:vs=\E%!0\ETD70\E%!1:
+
+tek4107|tek4109|tektronix terminals 4107 4109:\
+	:am:bs:mi:ms:ul:xn:xt:\
+	:co#79:it#8:li#29:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=\ELZ:cm=\EY%+ %+ :cr=^M:do=^J:kb=^H:\
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:mb=\E%!1\E[5m\E%!0:\
+	:md=\E%!1\E[1m\E%!0:me=\E%!1\E[m\E%!0:\
+	:mh=\E%!1\E[<0m\E%!0:mr=\E%!1\E[7m\E%0:nd=\EC:\
+	:..sa=\E%%\0411\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m\E%%\0410:\
+	:se=\E%!1\E[m\E%!0:sf=^J:so=\E%!1\E[7;5m\E%!0:sr=\EI:\
+	:ta=^I:ue=\E%!1\E[m\E%!0:up=\EA:us=\E%!1\E[4m\E%!0:\
+	:ve=\E%!0:vs=\E%!3:
+# Tektronix 4207 with sysline.  In the ancestral termcap file this was 4107-s;
+# see the note attached to tek4207.
+tek4207-s|Tektronix 4207 with sysline but no memory:\
+	:es:hs:\
+	:ds=\E7\E[?6l\E[2K\E[?6h\E8:fs=\E[?6h\E8:\
+	:i1=\E%!1\E[2;32r\E[132D\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J:\
+	:is=\E7\E[?6l\E[2K\E[?6h\E8:\
+	:ts=\E7\E[?6l\E[2K\E[;%i%df:tc=tek4107:
+
+# The 4110 series may be a wonderful graphics series, but they make the 4025
+# look good for screen editing.  In the dialog area, you can't move the cursor
+# off the bottom line.  Out of the dialog area, ^K moves it up, but there
+# is no way to scroll.
+# 
+# Note that there is a floppy for free from Tek that makes the 
+# 4112 emulate the vt52 (use the vt52 termcap). There is also
+# an expected enhancement that will use ANSI standard sequences.
+# 
+# 4112 in non-dialog area pretending to scroll. It really wraps 
+# but vi is said to work (more or less) in this mode.
+# 
+# 'vi' works reasonably well with this entry.
+#
+otek4112|o4112-nd|otek4113|otek4114|old tektronix 4110 series:\
+	:am:\
+	:co#80:li#34:\
+	:bl=^G:cl=\E^L:cr=^M:do=^J:le=^H:sf=^J:te=\EKA1\ELV1:\
+	:ti=\EKA0\ELV0\EMG0:up=^K:
+# The 4112 with the ANSI compatibility enhancement
+tek4112|tek4114|tektronix 4110 series:\
+	:am:bs:db:\
+	:co#80:li#34:\
+	:al=\E[L:bt=\E[Z:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[0;0H:\
+	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=:ic=\E[@:im=:\
+	:is=\E3\0411:le=^H:me=\E[m:nd=\E[C:se=\E[m:\
+	:sf=\E7\E[0;0H\E[M\E8:so=\E[7m:sr=\E7\E[0;0H\E[L\E8:\
+	:ue=\E[m:up=\EM:us=\E[4m:
+tek4112-nd|4112 not in dialog area:\
+	:ns:\
+	:up=^K:tc=tek4112:
+tek4112-5|4112 in 5 line dialog area:\
+	:li#5:tc=tek4112:
+# (tek4113: this used to have ":nd=\LM1\s\LM0:", someone's mistake;
+# removed ":as=\E^N:, :ae=\E^O:", which had been commented out in 8.3.
+# Note, the !0 and !1 sequences in :te:/:ti:/:ve:/:vi: were
+# previously \0410 and \0411 sequences...I don't *think* they were supposed
+# to be 4-digit octal -- esr)
+tek4113|tektronix 4113 color graphics with 5 line dialog area:\
+	:am:bs:da:eo:\
+	:co#80:li#5:\
+	:cl=\ELZ:do=^J:is=\EKA1\ELL5\ELV0\ELV1:le=^H:\
+	:nd=\ELM1 \ELM0:uc=\010\ELM1_\ELM0:\
+	:vb=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERB0:
+tek4113-34|tektronix 4113 color graphics with 34 line dialog area:\
+	:li#34:\
+	:is=\EKA1\ELLB2\ELV0\ELV1:tc=tek4113:
+# :ns: left off to allow vi visual mode. APL font (:as=\E^N:/:ae=\E^O:) not 
+# supported here. :uc: is slow, but looks nice. Suggest setenv MORE -up .
+# :vb: needs enough delay to let you see the background color being toggled.
+tek4113-nd|tektronix 4113 color graphics with no dialog area:\
+	:am:bs:eo:\
+	:co#80:it#8:li#34:\
+	:cl=\E^L:do=^J:ho=\ELF7l\177 @:is=\ELZ\EKA0\ELF7l\177 @:\
+	:le=^H:ll=\ELF hl @:nd=^I:se=\EMT1:so=\EMT2:ta=^I:\
+	:uc=\010\EMG1_\EMG0:up=^K:\
+	:vb=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERB0:\
+	:vs=\ELZ\EKA0:
+# This entry is from Tek. Inc.  (Brian Biehl)
+# (tek4115: :bc: renamed to :le:, <rmam>/<smam> added based on init string -- esr)
+otek4115|Tektronix 4115:\
+	:am:bs:da:db:eo:\
+	:co#80:it#8:li#34:\
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:bt=\E[Z:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:\
+	:ei=\E[4l:ho=\E[H:if=/usr/share/tabset/vt100:im=\E[4h:\
+	:is=\E%!0\E%\014\ELV0\EKA1\ELBB2\ENU@=\ELLB2\ELM0\ELV1\EKYA?\E%!1\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[m:\
+	:kb=^H:ke=\E>:ks=\E=:le=\E[D:me=\E[m:nd=\E[C:se=\E[m:\
+	:so=\E[7m:sr=\EM:ta=^I:te=\E%!0\ELBG8\E%!1\E[34;1H\E[J:\
+	:ti=\E%!0\ELBB2\E%!1:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E%!0\ELBG8\E%!1\E[34;1H:vs=\E%!0\ELBB2\E%!1:
+tek4115|newer tektronix 4115 entry with more ANSI capabilities:\
+	:am:xo:\
+	:co#80:li#34:\
+	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
+	:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:al=\E[L:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%+^AG:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:cv=\E[%+^Ad:dc=\E[P:\
+	:dl=\E[M:do=^J:ei=:ho=\E[H:ic=\E[@:im=:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mk=\E[8m:mr=\E[7m:nd=\E[C:..rp=%p1%c\E[%p2%{1}%-%db:\
+	:..sa=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m:\
+	:se=\E[m:sf=^J:so=\E[7m:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+# The tek4125 emulates a vt100 incorrectly - the scrolling region
+# command is ignored.  The following entry replaces :cs: with the needed
+# :AL:, :AL:, and :im:; removes some cursor pad commands that the tek4125
+# chokes on; and adds a lot of initialization for the tek dialog area.
+# Note that this entry uses all 34 lines and sets the cursor color to green.
+# Steve Jacobson 8/85
+# (tek4125: there were two "\!"s in the is that I replaced with "\E!";
+# commented out, :im:=\E1 because there's no :ei:  -- esr)
+tek4125|tektronix 4125:\
+	:li#34:\
+	:al=\E[1L:cs@:dl=\E[1M:\
+	:is=\E%\E\0410\EQD1\EUX03\EKA\ELBB2\ELCE0\ELI100\ELJ2\ELLB2\ELM0\ELS1\ELX00\ELV1\E%\E\0411\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:ks=\E=:rc@:sc@:\
+	:tc=vt100:
+
+# From: <jcoker@ucbic>
+# (tek4207: This was the termcap file's entry for the 4107/4207, but SCO
+# supplied another, less capable 4107 entry.  So we'll use that for 4107 and
+# note that if jcoker wasn't confused you may be able to use this one.
+# I merged in :ms:,:sf:,:sr:,<invis>,:ct: from a BRL entry -- esr)
+tek4207|Tektronix 4207 graphics terminal with memory:\
+	:am:bw:mi:ms:ul:xn:\
+	:co#80:it#8:li#32:\
+	:al=3\E[L:bt=\E[Z:cd=\E[J:ce=5\E[K:cl=156\E[H\E[J:\
+	:cm=\E[%i%d;%dH:ct=\E[1g:dc=4\E[P:dl=3\E[M:do=^J:ei=:\
+	:ho=\E[H:ic=4\E[@:im=:\
+	:is=\E%!0\ELBP0\E%!1\E[H\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J:\
+	:kd=\ED:kh=\E[H:kl=\E[D:kr=\E[C:ku=\EM:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mk=\E[=6;<5:mr=\E[7m:nd=\E[C:se=\E[m:\
+	:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:\
+	:te=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f:ti=\E[?6l\E[H\E[J:\
+	:ue=\E[m:up=\EM:us=\E[4m:
+
+# From: <carolyn@dali.berkeley.edu>  Thu Oct 31 12:54:27 1985
+# (tek4404: There was a "\!" in :ti: that I replaced with "\E!".
+# Tab had been given as \E2I,that must be the tab-set capability -- esr)
+tek4404|tektronix 4404:\
+	:bs:\
+	:co#80:it#8:li#32:\
+	:al=\E[1L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
+	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[1M:do=^J:ei=\E[4l:ho=\E[H:\
+	:im=\E[4h:kd=\E[B:ke=\E[?1h:kl=\E[D:kr=\E[C:ks=\E[?1l:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:nd=\E[C:rc=\E8:\
+	:sc=\E7:se=\E[27m:so=\E[7m:st=\E[2I:ta=^I:\
+	:te=\E[1;1H\E[0J\E[?6h\E[?1l:\
+	:ti=\E%\E\0411\E[1;32r\E[?6l\E>:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+# Some unknown person wrote:
+# I added the is string - straight Unix has ESC ; in the login 
+# string which sets a ct8500 into monitor mode (aka 4025 snoopy 
+# mode). The is string here cleans up a few things (but not 
+# everything).
+ct8500|tektronix ct8500:\
+	:am:bw:da:db:\
+	:co#80:li#25:\
+	:al=\E^L:bl=^G:bt=\E^I:cd=\E^U:ce=\E^T:cl=\E^E:\
+	:cm=\E|%+ %+ :cr=^M:dc=\E^]:dl=\E^M:do=^J:ei=:ic=\E^\:im=:\
+	:is=\037\EZ\Ek:le=^H:me=\E :nd=\ES:se=\E :sf=^J:so=\E$:\
+	:sr=\E^A:ta=^I:ue=\E :up=\ER:us=\E\041:
+
+# Tektronix 4205 terminal.
+#
+# am is not defined because the wrap around occurs not when the char.
+# is placed in the 80'th column, but when we are attempting to type
+# the 81'st character on the line.  (esr: hmm, this is like the vt100
+# version of xenl, perhaps am + xenl would work!)
+#
+# Bold, dim, and standout are simulated by colors and thus not allowed
+# with colors.  The tektronix color table is mapped into the RGB color
+# table by setf/setb. All colors are reset to factory specifications by oc.
+# The <initc> cap uses RGB notation to define colors.  for arguments 1-3 the 
+# interval (0-1000) is broken into 8 smaller sub-intervals (125).  Each sub-
+# interval then maps into pre-defined value.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+tek4205|tektronix 4205:\
+	:cc:mi:ms:\
+	:Co#8:NC#49:co#80:it#8:li#30:pa#63:\
+	:AL=\E[%dL:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:\
+	:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[1L:as=^N:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[J:\
+	:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:ct=\E[1g:\
+	:dc=\E[1P:dl=\E[1M:do=\E[B:eA=\E)0:ec=\E%dX:ei=\E[4l:\
+	:ho=\E[H:i1=\E%!0\ETM1\E%!1\E[m:im=\E[4h:k0=\EOA:k1=\EOB:\
+	:k2=\EOC:k3=\EOD:k4=\EP:k5=\EQ:k6=\ER:k7=\ES:kb=^H:kd=\E[B:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[=7;<4m:\
+	:me=\E[=0;<1m\E[24;25;27m\017:mh=\E[=1;<6m:mk=\E[=6;<5:\
+	:mr=\E[7m:nd=\E[C:\
+	:oc=\E%!0\ETFB000001F4F4F42F40030F404A4C<F450F4F46F40F47F4F40\E%!1:\
+	:op=\E[39;40m:se=\E[=0;<1m:sf=\ED:so=\E[=2;<3m:sr=\EM:\
+	:ta=^I:te=:ti=\E%%\0411\E[?6l\E[2J:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:
+
+#### Teletype (tty)
+#
+# These are the hardcopy Teletypes from before AT&T bought the company,
+# clattering electromechanical dinosaurs in Bakelite cases that printed on
+# pulpy yellow roll paper.  If you remember these you go back a ways.
+# Teletype-branded VDTs are listed in the AT&T section.
+#
+# The earliest UNIXes were designed to use these clunkers; nroff and a few
+# other programs still default to emitting codes for the Model 37.
+#
+
+tty33|tty35|model 33 or 35 teletype:\
+	:hc:os:xo:\
+	:co#72:\
+	:bl=^G:cr=^M:do=^J:sf=^J:
+tty37|model 37 teletype:\
+	:bs:hc:os:xo:\
+	:bl=^G:cr=^M:do=^J:hd=\E9:hu=\E8:le=^H:sf=^J:up=\E7:
+
+# There are known to be at least three flavors of the tty40, all seem more
+# like IBM half duplex forms fillers than ASCII terminals.  They have lots of
+# awful braindamage, such as printing a visible newline indicator after each
+# newline.  The 40-1 is a half duplex terminal and is hopeless.  The 40-2 is
+# braindamaged but has hope and is described here.  The 40-4 is a 3270
+# lookalike and beyond hope.  The terminal has visible bell but I don't know
+# it - it's null here to prevent it from showing the BL character.
+# There is an \EG in <nl> because of a bug in old vi (if stty says you have
+# a "newline" style terminal (-crmode) vi figures all it needs is nl
+# to get crlf, even if :cr: is not ^M.)
+# (tty40: removed obsolete ":nl=\EG\EB:", it's just do+cr -- esr)
+tty40|ds40|ds40-2|dataspeed40|teletype dataspeed 40/2:\
+	:bs:xo:\
+	:co#80:li#24:\
+	:al=\EL:cd=\EJ:cl=\EH\EJ:cr=\EG:ct=\EH\E2:dc=\EP:dl=\EM:\
+	:do=\EB:ei=:ho=\EH:ic=\E\136:im=:kb=^]:kl=^H:le=^H:nd=\EC:\
+	:pf=^T:po=\022:r2=\023\ER:se=\E4:sf=\ES:so=\E3:sr=\ET:\
+	:st=\E1:ta=\E@:up=\E7:
+tty43|model 43 teletype:\
+	:am:bs:hc:os:xo:\
+	:co#132:\
+	:bl=^G:cr=^M:do=^J:kb=^H:le=^H:sf=^J:
+
+#### Tymshare
+#
+
+# You can add :is=\E<: to put this 40-column mode, though I can't
+# for the life of me think why anyone would want to.
+scanset|sc410|sc415|Tymshare Scan Set:\
+	:am:bw:ms:\
+	:co#80:li#24:\
+	:ac=j%k4l<m-q\054x5:ae=^O:as=^N:bl=^G:cd=\EJ:ce=\EK:\
+	:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:do=^J:ho=\EH:kd=\EB:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:nd=^I:pf=\E;0:po=\E;0:ps=\E;3:r1=\E>:\
+	:rc=^C:sc=^B:sf=^J:up=^K:
+
+#### Volker-Craig (vc)
+#
+# If you saw a Byte Magazine cover with a terminal on it during the early
+# 1980s, it was probably one of these.  Carl Helmers liked them because
+# they could crank 19.2 and were cheap (that is, he liked them until he tried
+# to program one...)
+#
+
+# Missing in vc303a and vc303 descriptions:  they scroll 2 lines at a time
+# every other linefeed.
+vc303|vc103|vc203|volker-craig 303:\
+	:am:bs:ns:\
+	:co#80:li#24:\
+	:bl=^G:cl=\014:cr=^M:do=^J:ho=\013:kd=^J:kl=^H:kr=^I:ku=^N:\
+	:le=^H:ll=\017W:nd=^I:up=^N:
+vc303a|vc403a|volker-craig 303a:\
+	:ce=\026:cl=\030:ho=\031:kr=^U:ku=^Z:ll=^P:nd=^U:up=^Z:tc=vc303:
+# (vc404: removed obsolete ":ma=^Z^P^U :" -- esr)
+vc404|volker-craig 404:\
+	:am:bs:\
+	:co#80:li#24:\
+	:bl=^G:cd=\027:ce=\026:cl=\030:cm=\020%+ %+ :cr=^M:do=^J:\
+	:ho=\031:kd=^J:kl=^H:kr=^U:ku=^Z:le=^H:nd=^U:sf=^J:up=^Z:
+vc404-s|volker-craig 404 w/standout mode:\
+	:do=^J:se=^O:so=^N:tc=vc404:
+# From: <wolfgang@cs.sfu.ca>
+# (vc414: merged in cup/dl1/home from an old vc414h-noxon)
+vc414|vc414h|Volker-Craig 414H in sane escape mode.:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\E\032:cd=\E^X:ce=10\E\017:cl=\E\034:cm=\E\021%r%.%.:\
+	:dc=\E3:dl=\E\023:do=\E^K:ei=:ho=\E^R:ic=\E\072:im=:k0=\EA:\
+	:k1=\EB:k2=\EC:k3=\ED:k4=\EE:k5=\EF:k6=\EG:k7=\EH:kd=\E^K:\
+	:kh=\E^R:kl=^H:kr=^P:ku=\E^L:l0=PF1:l1=PF2:l2=PF3:l3=PF4:\
+	:l4=PF5:l5=PF6:l6=PF7:l7=PF8:nd=^P:se=\E^_:so=\E^Y:up=\E^L:
+vc415|volker-craig 415:\
+	:cl=^L:tc=vc404:
+
+######## OBSOLETE PERSONAL-MICRO CONSOLES AND EMULATIONS
+#
+
+#### IBM PC and clones
+#
+
+# The pcplot IBM-PC terminal emulation program is really messed up. It is
+# supposed to emulate a vt-100, but emulates the wraparound bug incorrectly,
+# doesn't support scrolling regions, ignores add line commands, and ignores
+# delete line commands. Consequently, the resulting behavior looks like a
+# crude adm3a-type terminal.
+# Steve Jacobson 8/85
+pcplot|pc-plot terminal emulation program:\
+	:xn@:\
+	:AL@:DL@:al@:cs@:dl@:rc@:sc@:tc=vt100:
+# KayPro II from Richard G Turner <rturner at Darcom-Hq.ARPA>
+# I've found that my KayPro II, running MDM730, continues to emulate an
+# ADM-3A terminal, just like I was running TERM.COM. On our 4.2 UNIX
+# system the following termcap entry works well:
+# I have noticed a couple of minor glitches, but nothing I can't work
+# around. (I added two capabilities from the BRL entry -- esr)
+kaypro|kaypro2|kaypro II:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\EE:bl=^G:cd=^W:ce=^X:cl=1\032:cm=\E=%+ %+ :cr=^M:\
+	:dl=\ER:do=^J:ho=^^:kd=^J:kr=^L:ku=^K:nd=^L:sf=^J:up=^K:
+
+# From IBM, Thu May  5 19:35:27 1983
+# (ibmpc: commented out :im:=\200R because we don't know :ei: -- esr)
+ibm-pc|ibm5051|5051|IBM Personal Computer (no ANSI.SYS):\
+	:am:bs:\
+	:co#80:li#24:\
+	:bl=^G:cl=^L^K:cr=^M^^:do=^J:ho=^K:kd=^_:le=^]:nd=^\:sf=\n:\
+	:up=^^:
+
+ibmpc|wy60-PC|wyse60-PC|IBM PC/XT running PC/IX:\
+	:am:bw:eo:hs:km:ms:ul:\
+	:co#80:it#8:li#24:\
+	:@7=\E[Y:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS\E[%dB:\
+	:SR=\E[%dT\E[%dA:UP=\E[%dA:\
+	:ac=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x\263:\
+	:bl=^G:cd=\E[J:ce=\E[K:ch=\E[%i%dG:cl=\Ec:cm=\E[%i%d;%dH:\
+	:cr=^M:do=\E[B:ec=\E[%dX:ho=\E[H:k1=\240:k2=\241:k3=\242:\
+	:k4=\243:k5=\244:k6=\245:k7=\246:k8=\247:k9=\250:k;=\251:\
+	:kB=^]:kD=\177:kI=\E[^H:kN=\E[U:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:ll=\E[24;1H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mk=\E[30;40m:mr=\E[7m:nd=\E[C:nw=^M:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
+	:se=\E[m:sf=\E[S\E[B:so=\E[7m:sr=\E[T\E[A:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+
+#### Apple II
+#
+# Apple II firmware console first, then various 80-column cards and 
+# terminal emulators.  For two cents I'd toss all these in the UFO file
+# along with the 40-column apple entries.
+#
+
+# From: brsmith@umn-cs.cs.umn.edu (Brian R. Smith) via BRL
+#	'it#8' tells UNIX that you have tabs every 8 columns.  This is a
+#		function of TIC, not the firmware.
+#	The clear key on a IIgs will do something like clear-screen, 
+#		depending on what you're in.
+appleIIgs|appleIIe|appleIIc|Apple 80 column firmware interface:\
+	:am:bs:bw:eo:ms:\
+	:co#80:it#8:li#24:\
+	:bl=^G:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :cr=^M:do=^J:ho=^Y:\
+	:kC=^X:kD=\177:kb=^H:kd=^J:kl=^H:kr=^U:ku=^K:le=^H:nd=^\:\
+	:nw=^M^W:se=^N:sf=^W:so=^O:sr=^V:ta=^I:up=^_:
+# Apple //e with 80-column card, entry from BRL
+# The modem interface is permitted to discard LF (maybe DC1), otherwise
+# passing characters to the 80-column firmware via COUT (PR#3 assumed).
+# Auto-wrap does not work right due to newline scrolling delay, which also
+# requires that you set "stty cr2".
+# Note: Cursor addressing is only available via the Pascal V1.1 entry,
+# not via the BASIC PR#3 hook.  All this nonsense can be avoided only by
+# using a terminal emulation program instead of the built-in firmware.
+apple2e|Apple //e:\
+	:bw:ms:\
+	:co#80:li#24:\
+	:bl=^G:cd=4*\013:ce=4\035:cl=100\014:do=^J:ho=^Y:is=^R^N:\
+	:kb=^H:kd=^J:kl=^H:kr=^U:ku=^K:le=^H:me=^N:mr=^O:nw=100\r:\
+	:r1=^R^N:se=^N:sf=^W:so=^O:sr=^V:ta=^I:up=^_:
+# mcvax!vu44!vu45!wilcke uses the "ap" entry together with Ascii Express Pro
+# 4.20, with incoming and outgoing terminals both on 0, emulation On.
+apple2e-p|Apple //e via Pascal:\
+	:cm=\036%r%+ %+ :kb=^H:kd=^J:kl=^H:tc=apple2e:
+# (ASCII Express) MouseTalk "Standard Apple //" emulation from BRL
+# Enable DC3/DC1 flow control with "stty ixon -ixany".
+apple-ae|ASCII Express:\
+	:am:bs:bw:ms:nx:xo:\
+	:co#80:it#8:li#24:\
+	:bl=500\007:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :cr=^M:do=^J:\
+	:ho=^Y:is=^R^N:kC=^X:kd=^J:kl=^H:kr=^U:ku=^K:le=^H:me=^N:\
+	:mr=^O:nd=^U:r1=^R^N:se=^N:sf=^W:so=^O:sr=^V:up=^_:
+appleII|apple ii plus:\
+	:am:bs:\
+	:co#80:it#8:li#24:\
+	:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :do=^J:ho=\E^Y:\
+	:is=\024T1\016:kd=^J:kr=^U:le=^H:me=^N:nd=^\:se=^N:so=^O:\
+	:ta=^I:up=^_:vb=\024G1\024T1:ve=^TC2:vs=^TC6:
+# Originally by Gary Ford 21NOV83
+# From: <ee178aci%sdcc7@SDCSVAX.ARPA>  Fri Oct 11 21:27:00 1985
+apple-80|apple II with smarterm 80 col:\
+	:am:bs:bw:\
+	:co#80:li#24:\
+	:bt=^R:cd=10*\013:ce=10\035:cl=10*\014:cm=\036%r%+ %+ :\
+	:cr=10*\r:do=^J:ho=^Y:le=^H:nd=^\:up=^_:
+apple-soroc|apple emulating soroc 120:\
+	:am:\
+	:co#80:li#24:\
+	:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:\
+	:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:up=^K:
+# From Peter Harrison, Computer Graphics Lab, San Francisco
+#   ucbvax!ucsfmis!harrison  .....uucp
+#   ucbvax!ucsfmis!harrison@BERKELEY   .......ARPA
+# "These two work.  If you don't have the inverse video chip for the
+# Apple with videx then remove the :so: and :se: fields."
+# (apple-videx: this used to be called DaleApple -- esr)
+apple-videx|Apple with videx videoterm 80 column board with inverse video:\
+	:am:bs:xn:\
+	:co#80:it#8:li#24:\
+	:cd=^K:ce=^]:cl=300\014:cm=\036%r%+ %+ :do=^J:ho=^Y:kd=^J:\
+	:kh=^Y:kl=^H:kr=^U:le=^H:me=^Z2:nd=^\:se=^Z2:so=^Z3:ta=^I:\
+	:up=^_:
+# My system [for reference] : Apple ][+, 64K, Ultraterm display card,
+#			      Apple Cat ][ 212 modem, + more all
+#			      controlled by ASCII Express: Pro.
+# From Dave Shaver <isucs1!shaver>
+apple-uterm-vb|Videx Ultraterm for Apple micros with Visible Bell:\
+	:am:bs:eo:xt:\
+	:co#80:li#24:\
+	:ac=:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :ho=^Y:\
+	:is=^V4^W06\017\rVisible Bell Installed.\016\r\n:\
+	:nd=^\:se=^N:so=^O:up=^_:vb=^W35^W06:
+apple-uterm|Ultraterm for Apple micros:\
+	:am:bs:eo:xt:\
+	:co#80:li#24:\
+	:ac=:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :ho=^Y:\
+	:is=^V4^W06\016:nd=^\:se=^N:so=^O:up=^_:
+# from trwrba!bwong (Bradley W. Wong):
+#
+# This entry assumes that you are using an apple with the UCSD Pascal
+# language card.  SYSTEM.MISCINFO is assumed to be the same as that
+# supplied with the standard apple except that screenwidth should be set
+# using SETUP to 80 columns.  Note that the right arrow in not mapped in
+# this termcap entry.  This is because that key, on the Apple, transmits
+# a ^U and would thus preempt the more useful "up" function of vi.
+#
+# HMH 2/23/81
+apple80p|80-column apple with Pascal card:\
+	:am:bw:\
+	:co#80:li#24:\
+	:cd=^K:ce=^]:cl=^Y^L:cm=\036%r%+ %+ :ho=^Y:kl=^H:nd=^\\072:\
+	:up=^_:
+#
+# Apple II+ equipped with Videx 80 column card
+#
+# Terminfo from ihnp4!ihu1g!djc1 (Dave Christensen) via BRL;
+# manually converted by D A Gwyn
+#
+# DO NOT use any terminal emulation with this data base, it works directly
+# with the Videx card.  This has been tested with vi 1200 baud and works fine.
+#
+# This works great for vi, except I've noticed in pre-R2, ^U will scroll back
+# 1 screen, while in R2 ^U doesn't.
+# For inverse alternate character set add:
+#	:as:=^O::ae:=^N:
+# (apple-v: added it#8 -- esr)
+apple-videx2|Apple II+ w/ Videx card (similar to Datamedia h1520):\
+	:am:xn:\
+	:co#80:it#8:li#24:\
+	:bl=100\007:cd=16*\013:ce=^]:cl=16*\014:cm=\036%r%+ %+ :\
+	:cr=^M:do=^J:ho=^Y:kb=^H:kd=^J:kh=^Y:kl=^H:kr=^\:ku=^_:le=^H:\
+	:nd=^\:se=^Z2:sf=^J:so=^Z3:ta=8\011:up=^_:
+apple-videx3|vapple|Apple II with 80 col card:\
+	:am:bs:\
+	:co#80:li#24:\
+	:ce=\Ex:cl=\Ev:cm=\EY%+ %+ :ho=\EH:k0=\EP:k1=\EQ:k2=\ER:\
+	:k3=\E :k4=\E\041:k5=\E":k6=\E#:k7=\E$:k8=\E%:k9=\E&:kd=\EB:\
+	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:nd=\EC:up=\EA:
+#From: decvax!cbosgd!cbdkc1!mww Mike Warren via BRL
+aepro|Apple II+ running ASCII Express Pro--vt52:\
+	:bs:\
+	:co#80:li#24:\
+	:cd=\EJ:ce=\EK:cl=300\014:cm=\EY%+ %+ :ho=\EH:nd=\EC:\
+	:up=\EA:
+# UCSD addition: Yet another termcap from Brian Kantor's Micro Munger Factory
+apple-vm80|ap-vm80|apple with viewmax-80:\
+	:bs:\
+	:co#80:li#24:\
+	:cd=300\013:ce=^]:cl=300\014:cm=100\036%+ %+ :ho=200\031:\
+	:nd=^\\072:up=^_:
+
+#### Apple Lisa & Macintosh
+#
+
+# (lisa: changed :vs: to :ve: -- esr)
+lisa|apple lisa console display (black on white):\
+	:am:bs:eo:ms:\
+	:co#88:it#8:li#32:\
+	:ac=jdkclfmenbqattuvvuwsx`:ae=\E[10m:al=\E[L:as=\E[11m:\
+	:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:is=\E>\E[m\014:kb=^H:\
+	:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:nd=\E[C:\
+	:se=\E[m:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[5l:\
+	:vi=\E[5h:
+liswb|apple lisa console display (white on black):\
+	:is=\E>\E[0;7m\014:se=\E[0;7m:so=\E[m:ue=\E[0;7m:\
+	:us=\E[4m:tc=lisa:
+
+# lisaterm from ulysses!gamma!epsilon!mb2c!jed (John E. Duncan III) via BRL;
+# :is: revised by Ferd Brundick <fsbrn@BRL.ARPA>
+#
+# These entries assume that the 'Auto Wraparound' is enabled.
+# Xon-Xoff flow control should also be enabled.
+#
+# The vt100 uses :rs2: and :rf: rather than :is2:/:tbc:/:hts: because the tab
+# settings are in non-volatile memory and don't need to be reset upon login.
+# Also setting the number of columns glitches the screen annoyingly.
+# You can type "reset" to get them set.
+#
+lisaterm|Apple Lisa or Lisa/2 running LisaTerm vt100 emulation:\
+	:am:bs:pt:xn:xo:\
+	:co#80:it#8:kn#4:li#24:vt#3:\
+	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:ho=\E[H:k0=\EOP:k1=\EOQ:\
+	:k2=\EOR:k3=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l0=F1:l1=F2:l2=F3:l3=F4:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:r1=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
+# Lisaterm in 132 column ("wide") mode.
+lisaterm-w|Apple Lisa with Lisaterm in 132 column mode:\
+	:co#132:\
+	:kb=^H:kd=^J:kl=^H:tc=lisaterm:
+# Although MacTerminal has insert/delete line, it is commented out here
+# since it is much faster and cleaner to use the "lock scrolling region"
+# method of inserting and deleting lines due to the MacTerminal implementation.
+# Also, the "Insert/delete ch" strings have an extra character appended to them
+# due to a bug in MacTerminal V1.1.  Blink is disabled since it is not
+# supported by MacTerminal.
+mac|macintosh|Macintosh with MacTerminal:\
+	:xn:\
+	:dN#30:\
+	:dc=7\E[P:ei=:ic=9\E[@:im=:ip=7:mb@:tc=lisa:
+# Lisaterm in 132 column ("wide") mode.
+mac-w|macterminal-w|Apple Macintosh with Macterminal in 132 column mode:\
+	:co#132:tc=mac:
+
+#### Radio Shack/Tandy
+#
+
+# (coco3: This had "ta" used incorrectly as a boolean and bl given as "bl#7".
+# I read these as mistakes for ":it#8:" and ":bl=\007:" respectively -- esr)
+# From: <{pbrown,ctl}@ocf.berkeley.edu> 12 Mar 90
+coco3|os9LII|Tandy CoCo3 24*80 OS9 Level II:\
+	:am:bs:\
+	:co#80:it#8:li#24:\
+	:al=^_0:bl=^G:cd=^K:ce=^D:cl=5*\014:cm=2\002%r%+ %+ :\
+	:dl=^_1:do=^J:ho=^A:kd=^J:kl=^H:kr=^I:ku=^L:le=^H:mb=^_":\
+	:md=\E\072^A:me=\037\041\E\072\0:mr=^_ :nd=^F:se=^_\041:\
+	:so=^_ :ue=^_#:up=^I:us=^_":ve=^E\041:vi=^E :
+# (trs2: removed obsolete ":nl=^_:" -- esr)
+trs2|trsII|trs80II|Radio Shack Model II using P&T CP/M:\
+	:am:bs:ms:\
+	:co#80:it#8:li#24:\
+	:al=^D:bl=^G:cd=^B:ce=^A:cl=^L:cm=\EY%+ %+ :cr=^M:dl=^K:\
+	:do=^_:ho=^F:kb=^H:kd=^_:kl=^\:kr=^]:ku=^^:le=^H:me=^O:nd=^]:\
+	:se=^O:sf=^J:so=^N:ta=^I:up=^^:
+# From: Kevin Braunsdorf <ksb@mentor.cc.purdue.edu>
+# (This had extension capabilities
+#	:BN=\E[?33h:BF=\E[?33l:UC=\E[_ q:BC=\E[\177 q:\
+#	:CN=\ERC:CF=\ERc:NR=\ERD:NM=\ER@:
+# I also deleted the unnecessary ":kn#2:", ":sg#0:" -- esr)
+trs16|trs-80 model 16 console:\
+	:am:bs:\
+	:co#80:it#8:li#24:\
+	:ac=jak`l_mbquvewcxs:ae=\ERg:al=\EL:as=\ERG:bl=^G:cd=\EJ:\
+	:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:dc=\EQ:dl=\EM:do=\EB:ei=:\
+	:ho=\EH:ic=\EP:im=:k0=^A:k1=^B:k2=^D:k3=^L:k4=^U:k5=^P:k6=^N:\
+	:k7=^S:kb=^H:kd=\EB:kh=^W:kl=\ED:kr=\EC:ku=\EA:l0=f1:l1=f2:\
+	:l2=f3:l3=f4:l4=f5:l5=f6:l6=f7:l7=f8:le=^H:me=\ER@:nd=\EC:\
+	:pf=\E]+:po=\E]=:se=\ER@:sf=^J:so=\ERD:ta=^I:up=\EA:ve=\ERC:\
+	:vi=\ERc:
+
+#### Atari ST
+#
+
+# From: Simson L. Garfinkel <simsong@media-lab.mit.edu>
+atari|atari st:\
+	:am:bs:\
+	:co#80:it#8:li#25:\
+	:al=\EL:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :dl=\EM:do=\EB:\
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:me=\Eq:nd=\EC:se=\Eq:\
+	:so=\Ep:sr=\EI:ta=^I:up=\EA:
+# UniTerm terminal program for the Atari ST:  49-line VT220 emulation mode
+# From: Paul M. Aoki <aoki@ucbvax.berkeley.edu>
+uniterm|uniterm49|UniTerm VT220 emulator with 49 lines:\
+	:li#49:\
+	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;49r\E[49;1H:tc=vt220:
+# MiNT VT52 emulation. 80 columns, 25 rows.
+# MiNT is Now TOS, the operating system which comes with all Ataris now
+# (mainly Atari Falcon). This termcap is for the VT52 emulation you get
+# under tcsh/zsh/bash/sh/ksh/ash/csh when you run MiNT in `console' mode
+# From: Per Persson <pp@gnu.ai.mit.edu>, 27 Feb 1996
+st52|Atari ST with VT52 emulation:\
+	:am:km:\
+	:co#80:li#25:\
+	:K1=\E#7:K2=\E#9:K3=\E#5:K4=\E#1:K5=\E#3:al=\EL:bl=^G:\
+	:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:dl=\EM:do=\EB:\
+	:ho=\EH:k0=\E#D:k1=\E#;:k2=\E#<:k3=\E#=:k4=\E#>:k5=\E#?:\
+	:k6=\E#@:k7=\E#A:k8=\E#B:k9=\E#C:kA=\E#R:kC=\E#7:kF=\E#2:\
+	:kR=\E#8:kb=^H:kd=\E#P:kh=\E#G:kl=\E#K:kr=\E#M:ku=\E#H:\
+	:l0=f10:le=\ED:me=\Eq:nd=\EC:nw=^M^J:r1=\Ez_\Eb@\EcA:\
+	:rc=\Ek:sc=\Ej:se=\Eq:sf=^J:so=\Ep:sr=\EI:ta=^I:te=:ti=\Ee:\
+	:up=\EA:ve=\Ee:vi=\Ef:
+ 
+#### Commodore Business Machines
+#
+# Formerly located in West Chester, PA; went spectacularly bust in 1994
+# after years of shaky engineering and egregious mismanagement.  Made one
+# really nice machine (the Amiga) and boatloads of nasty ones (PET, C-64,
+# C-128, VIC-20).  The C-64 is said to have been the most popular machine
+# ever (most units sold); they can still be found gathering dust in closets
+# everywhere.
+#
+
+# From: Kent Polk <kent@swrinde.nde.swri.edu>, 30 May 90
+# Added a few more entries, converted caret-type control sequence (^x) entries
+# to '\0xx' entries since a couple of people mentioned losing '^x' sequences.
+# Corrections by Ty Sarna <tsarna@endicor.com>, Sat Feb 28 18:55:15 1998
+#
+# :as:, :ae:			Support for alternate character sets.
+# :ve=\E[\040p:vi=\E[\060\040p:	cursor visible/invisible.
+# :xn:  vt100 kludginess at column 80/NEWLINE ignore after 80 cols(Concept)
+#     This one appears to fix a problem I always had with a line ending
+#     at 'width+1' (I think) followed by a blank line in vi. The blank
+#     line tended to disappear and reappear depending on how the screen
+#     was refreshed. Note that this is probably needed only if you use
+#     something like a Dnet Fterm with the window sized to some peculiar
+#     dimension larger than 80 columns.
+# :k0=\E9~:	map F10 to k0 - could have F0-9 -> k0-9, but ... F10 was 'k;'
+# (amiga: removed obsolete :kn#10:,
+# also added empty <acsc> to suppress a warning --esr)
+amiga|Amiga ANSI:\
+	:am:bs:bw:xn:\
+	:co#80:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ac=:\
+	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
+	:ho=\E[H:ic=\E[@:im=:is=\E[20l:k0=\E[9~:k1=\E[0~:k2=\E[1~:\
+	:k3=\E[2~:k4=\E[3~:k5=\E[4~:k6=\E[5~:k7=\E[6~:k8=\E[7~:\
+	:k9=\E[8~:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:\
+	:mb=\E[7;2m:md=\E[1m:me=\E[m:mh=\E[2m:mk=\E[8m:mr=\E[7m:\
+	:nd=\E[C:r1=\Ec:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:ue=\E[m:\
+	:up=\E[A:us=\E[4m:ve=\E[ p:vi=\E[0 p:
+
+# From: Hans Verkuil <hans@wyst.hobby.nl>, 4 Dec 1995
+# (amiga: added empty <acsc> to suppress a warning.
+# I'm told this entry screws up badly with AS225, the Amiga
+# TCP/IP package once from Commodore, and now sold by InterWorks.--esr)
+amiga-h|Hans Verkuil's Amiga ANSI:\
+	:bs:bw:ms:\
+	:co#80:li#24:\
+	:DC=\233%dP:DO=\233%dB:IC=\233%d@:LE=\233%dD:RI=\233%dC:\
+	:SF=\233%dS:SR=\233%dT:UP=\233%dA:ac=:ae=^O:as=^N:bl=^G:\
+	:bt=\233Z:cd=\233J:ce=\233K:cl=\233H\233J:\
+	:cm=\233%i%d;%dH:cr=^M:dc=\233P:do=\233B:ec=\233%dP:ei=:\
+	:ho=\233H:ic=\233@:im=:is=\23320l:k0=\2339~:k1=\2330~:\
+	:k2=\2331~:k3=\2332~:k4=\2333~:k5=\2334~:k6=\2335~:\
+	:k7=\2336~:k8=\2337~:k9=\2338~:kD=\177:kb=^H:kd=\233B:\
+	:kl=\233D:kr=\233C:ku=\233A:le=\233D:mb=\2337;2m:\
+	:md=\2331m:me=\2330m:mh=\2332m:mk=\2338m:mr=\2337m:\
+	:nd=\233C:nw=\233B\r:r1=\Ec:se=\2330m:sf=\233S:so=\2337m:\
+	:sr=\233T:ta=^I:te=\233?7h:ti=\233?7l:ue=\2330m:up=\233A:\
+	:us=\2334m:vb=^G:ve=\233 p:vi=\2330 p:
+
+# From: Henning 'Faroul' Peters <Faroul@beyond.kn-bremen.de>, 25 Sep 1999
+amiga-8bit|Amiga ANSI using 8-bit controls:\
+	:AL=\233%dL:DL=\233%dM:SF@:SR@:ac=:al=\233L:dl=\233M:\
+	:sf=\204:sr=\215:\
+	:tc=amiga-h:
+
+# Commodore B-128 microcomputer from Doug Tyrol <det@HEL-ACE.ARPA>
+# 	I'm trying to write a termcap for a commodore b-128, and I'm
+# having a little trouble. I've had to map most of my control characters
+# to something that unix will accept (my delete-char is a ctrl-t, etc),
+# and create some functions (like cm), but thats life.
+# 	The problem is with the arrow keys - right, and up work fine, but
+# left deletes the previous character and down I just can't figure out.
+# Jove knows what I want, but I don't know what it's sending to me (it
+# isn't thats bound to next-line in jove).
+# 	Anybody got any ideas? Here's my termcap.
+# DAG -- I changed his "^n" entries to "\n"; see if that works.
+#
+commodore|b-128|Commodore B-128 micro:\
+	:am:bw:\
+	:co#80:dN#20:li#24:pb#150:\
+	:al=10\Ei:bc=^H:ce=10\Eq:cl=10\E\006:\
+	:cm=20\E\013%2\054%2\054:cr=^M:dc=10*\177:dl=10*\Ed:\
+	:do=^J:ei=:ho=\E^E:ic=5\E\n:im=:kd=^J:kh=\E^E:kl=^B:kr=^F:\
+	:ku=^P:nd=^F:nl=^M:ta=5\011:up=^P:
+
+#### North Star
+#
+# North Star Advantage from Lt. Fickie <brl-ibd!fickie> via BRL
+northstar|North Star Advantage:\
+	:bs:\
+	:co#80:li#24:\
+	:cd=200\017:ce=200\016:cl=200\004:cm=1\E=%+ %+ :\
+	:ho=200\034\032:
+
+#### Osborne
+#
+# Thu Jul  7 03:55:16 1983
+#	
+# As an aside, be careful; it may sound like an anomaly on the 
+# Osborne, but with the 80-column upgrade, it's too easy to 
+# enter lines >80 columns!
+#	
+# I've already had several comments...
+# The Osborne-1 with the 80-col option is capable of being 
+# 52, 80, or 104 characters wide; default to 80 for compatibility 
+# with most systems.
+#	
+# The tab is destructive on the Ozzie; make sure to 'stty -tabs'.
+osborne-w|osborne1-w|osborne I in 104-column mode:\
+	:ms:ul:xt:\
+	:co#104:li#24:\
+	:al=\EE:bl=^G:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:\
+	:do=^J:ei=:ic=\EQ:im=:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:\
+	:se=\E(:sf=^J:so=\E):ue=\Em:up=^K:us=\El:
+# Osborne I	from ptsfa!rhc (Robert Cohen) via BRL
+osborne|osborne1|osborne I in 80-column mode:\
+	:am:bs:mi:ms:ul:xs:\
+	:co#80:dB#4:li#24:\
+	:al=\EE:ce=\ET:cl=^Z:cm=\E=%+ %+ :dc=4\EW:dl=\ER:do=^J:ei=:\
+	:im=\EQ:is=^Z:kb=^H:kd=^J:kl=^H:kr=^L:ku=^K:le=\010:nd=^L:\
+	:se=\E):so=\E(:ue=\Em:up=^K:us=\El:
+#
+# Osborne Executive definition from BRL
+# Similar to tvi920
+# Added by David Milligan and Tom Smith (SMU)
+osexec|Osborne executive:\
+	:am:bs:\
+	:co#80:li#24:sg#1:\
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E3:\
+	:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:\
+	:is=\Eq\Ek\Em\EA\Ex0:k0=^A@\r:k1=^AA\r:k2=^AB\r:k3=^AC\r:\
+	:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:k8=^AH\r:k9=^AI\r:\
+	:kb=^H:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:nl=^J:se=\Ek:\
+	:so=\Ej:st=\E1:ue=\Em:up=^K:us=\El:
+
+#### Console types for obsolete UNIX clones
+#
+# Coherent, Minix, Venix, and several lesser-known kin were OSs for 8088
+# machines that tried to emulate the UNIX look'n'feel.  Coherent and Venix
+# were commercial, Minix an educational tool sold in conjunction with a book.
+# Memory-segmentation limits and a strong tendency to look like V7 long after
+# it was obsolete made all three pretty lame.  Venix croaked early.  Coherent
+# and Minix were ported to 32-bit Intel boxes, only to be run over by a
+# steamroller named `Linux' (which, to be fair, traces some lineage to Minix). 
+# Coherent's vendor, the Mark Williams Company, went belly-up in 1994.  There
+# are also, I'm told, Minix ports that ran on Amiga and Atari machines and
+# even as single processes under SunOS and the Macintosh OS.
+#
+
+# This is the entry provided with minix 1.7.4, with bogus :ri: removed.
+minix|minix console (v1.7):\
+	:am:xn:\
+	:co#80:it#8:li#25:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[0J:\
+	:ce=\E[K:cl=\E[H\E[0J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:is=\E[0m:k0=\E[Y:\
+	:k1=\E[V:k2=\E[U:k3=\E[T:k4=\E[S:k5=\E[G:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:l0=End:l1=PgUp:l2=PgDn:\
+	:l3=Num +:l4=Num -:l5=Num 5:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[0m:mr=\E[7m:nd=\E[C:nw=^M^J:se=\E[0m:sf=^J:so=\E[7m:\
+	:sr=\EM:ta=^I:ue=\E[0m:up=\E[A:us=\E[4m:
+# Corrected Jan 14, 1997 by Vincent Broman <broman@nosc.mil>
+minix-old|minix console (v1.5):\
+	:xo:\
+	:co#80:it#8:li#25:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[0J:\
+	:ce=\E[K:cl=\E[H\E[0J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k0=\E[Y:k1=\E[V:\
+	:k2=\E[U:k3=\E[T:k4=\E[S:k5=\E[G:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[0m:\
+	:mr=\E[7m:nd=\E[C:nw=^M^J:se=\E[0m:sf=^J:so=\E[7m:sr=\EM:\
+	:ta=^I:ue=\E[0m:up=\E[A:us=\E[4m:
+# The linewrap option can be specified by editing /usr/include/minix/config.h
+# before recompiling the minix 1.5 kernel.
+minix-old-am|minix console with linewrap:\
+	:am:tc=minix-old:
+
+pc-minix|minix console on an Intel box:\
+	:tc=klone+acs:tc=minix:
+
+# According to the Coherent 2.3 manual, the PC console is similar
+# to a z19. The differences seem to be (1) 25 lines, (2) no status
+# line, (3) standout is broken, (4) ins/del line is broken, (5)
+# has blinking and bold.
+pc-coherent|pcz19|coherent|IBM PC console running Coherent:\
+	:am:mi:\
+	:co#80:it#8:li#25:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :cr=^M:dc=\EN:\
+	:do=\EB:ei=\EO:ho=\EH:im=\E@:kb=^H:kd=\EB:kh=\EH:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:me=\Eq:nd=\EC:se=\Eq:sf=^J:so=\Ep:\
+	:sr=\EI:ta=^I:up=\EA:
+
+# According to the Venix 1.1 manual, the PC console is similar
+# to a DEC vt52.  Differences seem to be (1) arrow keys send 
+# different strings, (2) enhanced standout, (3) added insert/delete line.
+# Note in particular that it doesn't have automatic margins.
+# There are other keys (f1-f10, kpp, knp, kcbt, kich1, kdch1) but they
+# not described here because this derives from an old termcap entry.
+pc-venix|venix|IBM PC console running Venix:\
+	:co#80:it#8:li#25:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
+	:dl=\EM:do=^J:kb=^H:kd=\EP:kh=\EG:kl=\EK:kr=\EM:ku=\EH:le=^H:\
+	:nd=\EC:sf=^J:sr=\EI:ta=^I:up=\EA:
+
+#### Miscellaneous microcomputer consoles
+#
+# If you know anything more about any of these, please tell me.
+#
+
+# The MAI Basic Four computer was obsolete at the end of the 1980s.
+# It may be used as a terminal by putting it in "line" mode as seen on 
+# one of the status lines.
+# Initialization is similar to CIT80. :is: will set ANSI mode for you.  
+# Hardware tabs set by :if: at 8-spacing.  Auto line wrap causes glitches so
+# wrap mode is reset by :vs:.  Using :sf:=\E[S caused errors so I 
+# used \ED instead.
+# From: bf347@lafn.org (David Lawyer), 28 Jun 1997
+mai|basic4|MAI Basic Four in ansi mode:\
+	:am:da:db:mi:ms:\
+	:co#82:it#8:li#25:\
+	:al=\E[L:bl=^G:cd=^_:ce=^^:cl=^]^_:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:dc=\E[1P:dl=\E[M:do=^J:ei=\E[4l:ho=^]:\
+	:if=/usr/lib/tabset/vt100:im=\E[4h:\
+	:is=\E>\E[?1h\E[?7h\E[?5l\017\E(B\E[m\E[20l\E[1;24r\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:\
+	:k8=\EOW:kb=^H:kd=\EOB:kl=\EOD:kr=\EOC:ku=\EOA:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=^X:nw=^M\ED:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\E[T:ta=^I:ue=\E[m:up=^Z:\
+	:us=\E[4m:ve=\E[?7h:vs=\E[?7l:
+# basis from Peter Harrison, Computer Graphics Lab, San Francisco
+#   ucbvax!ucsfmis!harrison ...uucp / ucbvax!ucsfmis!harrison@BERKELEY ...ARPA
+#
+# On Sat, 7 Aug 1999, Torsten Jerzembeck <toje@nightingale.ms.sub.org> wrote:
+# The Basis 108 was a Apple II clone, manufactured by the "Basis
+# Mikrocomputer GmbH" in Munster, Germany (the company still exists today,  
+# about 1,5 km from where I live, but doesn't build own computers any
+# more). A Basis 108 featured a really heavy (cast aluminium?) case, was
+# equipped with one or two 5.25" disk drives, had a monochrome and colour
+# video output for a TV set or a dedicated monitor and several slots for
+# Apple II cards. Basis 108 were quite popular at german schools before
+# the advent of the IBM PC. They run, for example, the UCSD Pascal
+# development system (which I used even in 1993 to program the steering
+# and data recording for our school's experimental solar panel :), Apple DOS
+# or CP/M.
+# (basis: removed obsolete ":ma=^K^P^R^L^L :nl=5000*^J:" -- esr)
+basis|BASIS108 computer with terminal translation table active:\
+	:cd=\EY:ce=\ET:cl=300\E*:do=5000\n:kb=^H:kd=^J:kl=^H:kr=^L:\
+	:ku=^K:me=\E):se=\E):so=\E(:\
+	:tc=adm3a:
+# luna's BMC terminal emulator
+luna|luna68k|LUNA68K Bitmap console:\
+	:co#88:li#46:tc=ansi-mini:
+megatek|pegasus workstation terminal emulator:\
+	:am:os:\
+	:co#83:li#60:
+# The Xerox 820 was a Z80 micro with a snazzy XEROX PARC-derived 
+# interface (pre-Macintosh by several years) that went nowhere.
+xerox820|x820|Xerox 820:\
+	:am:\
+	:co#80:li#24:\
+	:bl=^G:cd=^Q:ce=^X:cl=1^Z:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:\
+	:le=^H:nd=^L:sf=^J:up=^K:
+
+#### Videotex and teletext
+#
+
+# From: Alexandre Montaron <canal@mygale.org>, 18 Jun 1998
+#
+minitel1|minitel 1:\
+	:am:bw:es:hs:hz:ms:\
+	:Co#8:co#40:li#24:pa#8:\
+	:..Sf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%{64}%+%c%;:\
+	:ac=+.\054\054./f0g1:bl=^G:ce=^X:cl=^L:cm=\037%+A%+A:\
+	:cr=^M:do=^J:eA=^Y:fs=^J:ho=^^:\
+	:is=\E;`ZQ\E\072iC\E\072iE\021:le=^H:mb=\EH:me=\EI\E\:\
+	:mr=\E]:nd=^I:nw=^M^J:op=\EG:rp=%.\022%+?:\
+	:..sa=%?%p1%t\E]%;%?%p3%t\E]%;%?%p4%t\EH%;:se=\E\:\
+	:sf=^J:so=\E]:sr=^K:ts=\037@%p1%{65}%+%c:up=^K:ve=^Q:vi=^T:
+# is2=Fnct TE, Fnct MR, Fnct CM et pour finir: curseur ON.
+minitel1b|minitel 1-bistandard (in 40cols mode):\
+	:mi:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:al=\E[L:cb=\E[1K:cd=\E[J:dc=\E[P:\
+	:dl=\E[M:ei=\E[4l:i1=\E;iYA\E;jYC:im=\E[4h:kA=\E[L:\
+	:kC=\E[2J:kD=\E[P:kE=^X:kI=\E[4h:kL=\E[M:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ks=\E;iYA\E;jYC:kt=^I:ku=\E[A:\
+	:tc=minitel1:
+# :ke: posait des problemes (logout en sortant de vi).
+minitel1b-80|minitel 1-bistandard (standard teleinformatique):\
+	:am@:bw@:hz@:\
+	:Co@:co#80:it#8:pa@:\
+	:@8=\EOM:Sf@:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:ho=\E[H:\
+	:i1@:is@:k0=\EOp:k1=\EOq:k2=\EOr:k3=\EOs:k4=\EOt:k5=\EOu:\
+	:k6=\EOv:k7=\EOw:k8=\EOx:k9=\EOy:ke@:ks@:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:op@:rc=\E8:rp@:\
+	:..sa=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m:\
+	:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[24m:\
+	:up=\E[A:us=\E[4m:ve=\037@A\021\n:vi=\037@A\024\n:\
+	:tc=minitel1b:
+# \E\:1}	switch to te'le'informatique mode (ascii terminal/ISO 6429)
+# \E[?3l	80 columns
+# \E[?4l	scrolling on
+# \E[12h	local echo off
+# \Ec		reset: G0 U.S. charset (to get #,@,{,},...), 80 cols, clear screen
+# \E)0		G1 DEC set (line graphics)
+#
+# From: Igor Tamitegama <igor@ppp1493-ft.teaser.fr>, 18 Jan 1997
+m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel 2 mode te'le'informatique:\
+	:bs:es:hs:xn:\
+	:co#80:it#8:li#24:sg#0:ws#72:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:SF=^J:SR=\EM:UP=\E[%dA:\
+	:ac=aaffggjjkkllmmnnooqqssttuuvvwwxx:ae=^O:al=\E[L:\
+	:as=^N:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:\
+	:fs=^J:ho=\E[H:i1=\E\0721}\Ec\E[?4l\E[12h:\
+	:i2=\E[?3l kbs=\010:im=\E[4h:ip=7:is=\Ec\E[12h\E)0:\
+	:k0=\EOp:k1=\EOq:k2=\EOr:k3=\EOs:k4=\EOt:k5=\EOu:k6=\EOv:\
+	:k7=\EOw:k8=\EOx:k9=\EOy:k;=\EOp:kA=\E[4l:kC=\E[2J:kD=\E[P:\
+	:kI=\E[4h:kL=\E[M:kN=\EOn:kP=\EOR:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:ll=\E[24;80H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:ps=\E[i:\
+	:r1=\Ec\E[?4l\E[12h:r2=\Ec\E)0:rc=\E8:sc=\E7:se=\E[27m:\
+	:sf=^J:so=\E[7m:sr=\EM:ta=^I:ts=^_@A:u6=\E[%i%d;%dR:\
+	:u7=\E[6n:ue=\E[24m:up=\E[A:us=\E[4m:vb=^G:ve=\E[<1l:\
+	:vi=\E[<1h:
+
+######## OBSOLETE VDT TYPES
+#
+# These terminals are *long* dead -- these entries are retained for
+# historical interest only.
+
+#### Amtek Business Machines
+#
+
+# (abm80: early versions of this entry apparently had ":se=\E^_:so=\E^Y",
+# but these caps were commented out in 8.3; also, removed overridden
+# ":do=^J:" -- esr)
+abm80|amtek business machines 80:\
+	:am:bs:bw:\
+	:co#80:li#24:\
+	:al=\E^Z:bt=^T:cd=\E^X:ce=\E^O:cl=\E^\:cm=\E\021%r%+ %+ :\
+	:dl=\E^S:do=\E^K:ho=\E^R:le=^H:nd=^P:up=\E^L:
+
+#### Bell Labs blit terminals
+#
+# These were AT&T's official entries.  The 5620 FAQ maintained by 
+# David Breneman <daveb@dgtl.com> has this to say:
+#
+#  Actually, in the beginning was the Jerq, and the Jerq was white with a
+#  green face, and Locanthi and Pike looked upon the Jerq and said the Jerq
+#  was good.  But lo, upon the horizon loomed a mighty management-type person
+#  (known now only by the initials VP) who said, the mighty Jerq must stay
+#  alone, and could not go forth into the world. So Locanthi and Pike put the
+#  Jerq to sleep, cloned its parts, and the Blit was brought forth unto the
+#  world. And the Jerq lived the rest of its days in research, but never
+#  strayed from those paths.
+#
+#  In all seriousness, the Blit was originally known as the Jerq, but when
+#  it started to be shown outside of the halls of the Bell Labs Research
+#  organization, the management powers that be decided that the name could
+#  not remain. So it was renamed to be Blit. This was in late 1981.
+#
+# (The AT&T 5620 was the commercialized Blit.  Its successors were the 630,
+# 730, and 730+.)
+#
+
+blit|jerq|blit running teletype rom:\
+	:am:eo:ul:xo:\
+	:co#87:it#8:li#72:\
+	:AL=\EF%+ :DC=\Ee%+ :DL=\EE%+ :IC=\Ef%+ :al=\EF\041:bl=^G:\
+	:ce=\EK:cl=^L:cm=\EY%r%+ %+ :cr=^M:dc=\Ee\041:dl=\EE\041:\
+	:do=^J:ei=:ic=\Ef\041:im=:k1=\Ex:k2=\Ey:k3=\Ez:kb=^H:kd=\EB:\
+	:kl=\ED:kr=\EC:ku=\EA:le=\ED:nd=\EC:sf=^J:ta=^I:up=\EA:
+
+# (cbblit: here's a BSD termcap that says :do=\EG: -- esr)
+cbblit|fixterm|blit running columbus code:\
+	:co#88:\
+	:cd=\EJ:ei=\ER:ic@:im=\EQ:pO=\EP%03:pf=^T:po=^R:se=\EV\041:\
+	:so=\EU\041:ue=\EV":us=\EU":vb=\E^G:\
+	:tc=blit:
+
+oblit|ojerq|first version of blit rom:\
+	:am:da:db:eo:mi:ul:xo:\
+	:co#88:it#8:li#72:\
+	:AL=\Ef%+ :DL=\Ee%+ :al=\EF:bl=^G:cd=\EJ:ce=\EK:cl=^L:\
+	:cm=\EY%r%+ %+ :cr=^M:dc=\EO:dl=\EE:do=^J:ei=\ER:im=\EQ:\
+	:kb=^H:le=\ED:nd=\EC:sf=^J:ta=^I:up=\EA:vb=\E^G:
+
+#### Bolt, Beranek & Newman (bbn)
+#
+# The BitGraph was a product of the now-defunct BBN Computer Corporation.
+# The parent company, best known as the architects of the Internet, is
+# still around.
+#
+# Jeff DelPapa <dp@world.std.com> writes:
+# The bitgraph was a large white box that contained a monochrome bitmap
+# display, and a 68000 to run it.  You could download code and run it on
+# the cpu, it had 128kb (I think) of memory.  I used one in the late
+# 70's, sure beat a vt100.  It had one strange feature tho -- it used
+# the cpu to bitblt pixels to scroll, it took longer than the refresh
+# rate, and looked like a rubber sheet stretching, then snapping
+# upwards.  It had everything the early mac had, except a floppy drive a
+# small screen (it had a 17" crisp beauty) and a real OS. They (Bolt
+# Beranek and Neuman) sold at most a few hundred of them to the real
+# world.  DOD may have bought more...
+# 
+
+# Entries for the BitGraph terminals.  The problem 
+# with scrolling in vi can only be fixed by getting BBN to put 
+# smarter scroll logic in the terminal or changing vi or padding 
+# scrolls with about 500 ms delay.
+#	
+# I always thought the problem was related to the terminal 
+# counting newlines in its input buffer before scrolling and 
+# then moving the screen that much. Then vi comes along and 
+# paints lines in on the bottom line of the screen, so you get 
+# this big white gap.
+
+bitgraph|bg2.0nv|bg3.10nv|bbn bitgraph 2.0 or later (normal video):\
+	:is=\E>\E[?5l\E[?7h:vb=\E[?5h\E[?5l:\
+	:tc=bg2.0:
+bg2.0rv|bg3.10rv|bbn bitgraph 2.0 (reverse video):\
+	:is=\E>\E[?5h\E[?7h:vb=\E[?5l\E[?5h:tc=bg2.0:
+bg2.0|bg3.10|bbn bitgraph 2.0 or later (no init):\
+	:bs:xn:\
+	:co#85:li#64:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=%i\E[%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:dl=\E[M:do=\E[B:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kd=\E[B:ke=\E>:kl=\E[D:kr=\E[C:ks=\E=:\
+	:ku=\E[A:l1=PF1:l2=PF2:l3=PF3:l4=PF4:le=^H:me=\E[m:nd=\E[C:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=\n:so=\E[7m:ta=^I:up=\E[A:
+
+bg1.25rv|bbn bitgraph 1.25 (reverse video):\
+	:is=\E>\E[?5h\E[?7h:vb=\E[?5l\E[?5h:tc=bg1.25:
+bg1.25nv|bbn bitgraph 1.25 (normal video):\
+	:is=\E>\E[?5l\E[?7h:vb=\E[?5h\E[?5l:tc=bg1.25:
+# (bg1.25: I added <rmam>/<smam> based on the init string -- esr)
+bg1.25|bbn bitgraph 1.25:\
+	:co#85:li#64:\
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=%i\E[%d;%dH:cr=^M:dl=\E[M:do=\E[B:k1=\EP:\
+	:k2=\EQ:k3=\ER:k4=\ES:kd=\EB:ke=\E>:kl=\ED:kr=\EC:ks=\E=:\
+	:ku=\EA:l1=PF1:l2=PF2:l3=PF3:l4=PF4:le=^H:ll=\E[64;1H:\
+	:me=\E[m:nd=\E[C:se=\E[m:sf=\n:so=\E[7m:ta=^I:up=\E[A:
+
+#### Bull (bq, dku, vip)
+#
+# (Adapted for terminfo; AIX extension capabilities translated -- esr)
+
+#============================================#
+# BULL QUESTAR 210 `SDP' terminals emulation #
+#============================================#
+#
+# Description written by R.K.Saunders (Bull Transac)
+#
+# Modifications written by F. Girard (Bull MTS)
+#		19-05-87 V02.00.01
+#		17-12-87 V02.00.02
+#		15-09-89 V02.00.05
+#
+#	Typical technical selections F1 (modes SDP/ROLL):
+# -------------------------------------------------------
+# |   01   02   03   04   05   06   07   08   09   10   |
+# |  1010 0011 1010 0110 0110 0001 0100 0000 0000 0000  |
+# |                                                     |
+# |   11   12   13   14   15   16   17   18   19   20   |
+# |  0000 0110 100? 0000 0000 0000 0001 0000 0000 0001  |
+# |                                                     |
+# |   21   22   23   24   25   26   27   28   29   30   |
+# |  0011 0000 0001 1000 0000 0000 0000 0000 0000 0000  |
+# |                                                     |
+# |   31   32   33   34   35   36   37   38   39   40   |
+# |  1010 0011 0000 0000 0000 0000 0000 0000 0000 0000  |
+# -------------------------------------------------------
+#	Typical firmware identification F5 "etat 6":
+#  P287.02.04b	(AZERTY)
+#  P297.11.04	(24-pin: 2732)	or P798.11.04	(28-pin: 2764)
+#  P298.03.03	(monochrome)	or P374.03.02	(colour)
+#
+#	SM SDP mode (VIP command):	^[[?=h
+#	RIS (erases screen):		^[c
+#	DMI disable keyboard:		^[`
+#	SM double rendition mode:	^[[?>h
+#	RM solicited status mode:	^[[5l
+#	RM character mode:		^[[>l
+#	RM echoplex mode:		^[[12l
+#	RM column tab mode:		^[[18l
+#	RM forbid SS2 keyboard mode:	^[[?<l
+#	SM scroll mode:			^[[=h
+#	FCF enable XON/XOFF:		^[P1s^[\
+#	MTL select end msg character:	^[[^Wp
+#	EMI enable keyboard:		^[b
+#	RIS retour etat initial:	^[c
+#	enable FC keypad:		^[[?<h,
+#	MPW map status line window:	^[PY99:98^[\
+#	SCP select status line:		^[[0;98v
+#	ED erase entire partition:	^[[2J
+#	SCP select main partition:	^[[v
+#	SM character insertion mode:	^[[4h
+#	RM character replacement mode:	^[[4l
+#	COO cursor on:			^[[r
+#	COO cursor off:			^[[1r
+#	SGR dim (turquoise) rev attr:	^[[2;7m
+#	SGR Data normal attr:		^[[m
+#	SO Line-graphic mode ON:	^N
+#	SI Line-graphic mode OFF:	^O
+#	MC start routing to printer:	^[[5i
+#	MC stop routing to printer:	^M^[[4i
+#
+
+# This entry covers the following terminals:
+# dku7102, tws2102, and tws models 2105 to 2112
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+tws-generic|dku7102|Bull Questar tws terminals:\
+	:am:es:hs:mi:ms:xn:xo:xs@:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%df:cr=^M:ct=\E[2g:\
+	:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\EPY99\07298\E\\E[0;98v\E[2J\E[v:ei=\E[4l:fs=\E[v:\
+	:ho=\E[H:i1=\E[?=h\Ec\E`\E[?>h\EPY99\07298\E\:\
+	:i2=\Eb\E[?<h:im=\E[4h:\
+	:is=\E[5;>;12;18;?<l\E[=h\EP1s\E\\E[\027p:\
+	:k1=\E[1u\027:k2=\E[2u\027:k3=\E[3u\027:k4=\E[4u\027:\
+	:k5=\E[5u\027:k6=\E[6u\027:k7=\E[7u\027:k8=\E[8u\027:\
+	:kD=\E[P:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:ll=\E[H\E[A:mb=\E[0;5m:me=\E[m\017:mh=\E[0;2m:\
+	:mr=\E[0;7m:nd=\E[C:se=\E[m:sf=^J:so=\E[0;7m:st=\EH:\
+	:ta=\E[I:te=\E[0;98v\E[2J\E[v:ti=\E[?>h\EPY99\07298\E\:\
+	:ts=\EPY99\07298\E\\E[0;98v\E[2;7m:ue=\E[m:up=\E[A:\
+	:us=\E[0;4m:ve=\E[r:vi=\E[1r:
+tws2102-sna|dku7102-sna|BULL Questar tws2102 for SNA:\
+	:ds=\E[0;98v\E[2J\E[v:fs=\E[v:i2=\Eb:ts=\E[0;98v:\
+	:tc=tws-generic:
+tws2103|xdku|BULL Questar tws2103:\
+	:ta=^I:tc=tws-generic:
+tws2103-sna|dku7103-sna|BULL Questar tws2103 for SNA:\
+	:ta=^I:\
+	:tc=tws2102-sna:
+dku7102-old|BULL Questar 200 DKU7102 (microcode version < 6):\
+	:AL@:DL@:al@:ce=\E[K\E[m:cl=\E[2J\E[H:cm@:dl@:\
+	:ds=\EPY99\07298\E\\E[0;98v\E[2J\E[H\E[v:\
+	:ts=\EPY99\07298\E\\E[0;98v\E[H\E[2;7m:\
+	:tc=tws-generic:
+dku7202|BULL Questar 200 DKU7202 (colour/character attributes):\
+	:i2=\E[?3h\Eb:mb=\E[0;2;4m:mh=\E[0;5m:so=\E[0;4;5;7m:\
+	:ta=^I:us=\E[0;2m:\
+	:tc=tws-generic:
+
+#=========================================================#
+# BULL QUESTAR 303 & 310 `DEC VT 320' terminals emulation #
+#=========================================================#
+#
+# Description written by J. Staerck (BULL SA)
+#       Copyright (c) 1989 BULL SA
+#---------------------------------------------------------------------------
+#  This entry is used for terminals with vt320 emulation mode
+#  and following set-up : 
+#    8 bit ISO Latin Character Set (ISO 8859-1),
+#    7 bit Control Characters, 
+#    80 columns screen.    
+#  Hereafter are some DEC vt terminals' commands. (valid on vt200 and 300)
+#  They are used in string capabilities with vt220-320 emulation mode.
+#  In the following DEC definitions, two kinds of terminfo databases are
+#    provided :
+#    1. the first with Command Sequence Introducer starting with escape 
+#       sequence in 7 bits characters ex. ESC [ : 2 chars. in 7-bit mode.
+#    2. the second with Command Sequence Introducer starting with escape 
+#       sequence in 8 bits characters ex. ESC [ : 1 char. 'CSI' =x9B.
+#	Soft Terminal Reset		esc [ ! p
+#	RIS (erases screen):		esc c
+#	DECKPNM numeric keypad mode:	esc >
+#	DECKPAM applic. keypad mode:	esc =
+#	DECSTBM Scrolling region:	esc [ r
+#	SCS select G0 = US:		esc ( B
+#	SCS select G1 = line-graphic:	esc ) 0
+#	Select 7-bit C1 controls:	esc sp F
+#	Select 8-bit C1 controls:	esc sp G
+#	Select cursor home:		esc [  H
+#	Select erase screen:		esc [  J
+#	SM KAM lock keyboard:		esc [ 2 h
+#	RM KAM unlock keyboard:		esc [ 2 l
+#	SM SRM local echo off:		esc [ 1 2 h
+#	RM SRM local echo on:		esc [ 1 2 l
+#	SM LNM New line :		esc [ 2 0 h
+#	RM LNM return = CR only:	esc [ 2 0 l
+#	SM DECCKM cursor keys mode:	esc [ ? 1 h
+#	RM DECCKM appli. keys mode:	esc [ ? 1 l
+#	SM DECANM ANSI mode on:		esc [ ? 2 h
+#	RM DECANM ANSI mode off:	esc [ ? 2 l
+#	SM DECCOLM 132-column screen:	esc [ ? 3 h
+#	RM DECCOLM 80-column screen:	esc [ ? 3 l
+#	SM DECSCLM Smooth scroll:	esc [ ? 4 h
+#	RM DECSCLM Jump scroll:		esc [ ? 4 l
+#	SM DECSCNM screen light backgr.	esc [ ? 5 h
+#	RM DECSCNM screen dark backgr.	esc [ ? 5 l
+#	SM DECOM move within margins:	esc [ ? 6 h
+#	RM DECOM move outside margins:	esc [ ? 6 l
+#	SM DECAWM auto right margin:	esc [ ? 7 h
+#	RM DECAWM auto right margin:	esc [ ? 7 l
+#	SM DECARM auto repeat:		esc [ ? 8 h
+#	RM DECARM auto repeat:		esc [ ? 8 l
+#	DECSASD Select active main:	esc [ 0 $ } 
+#	DECSASD Select active status:	esc [ 1 $ } 
+#	DECSSDT Select status none:	esc [ 0 $ ~ 
+#	DECSSDT Select status indic.:	esc [ 1 $ ~ 
+#	DECSSDT Select status host-wr:	esc [ 2 $ ~ 
+#	SM DECTCEM Visible cursor:	esc [ ? 2 5 h
+#	RM DECTCEM Invisible cursor:	esc [ ? 2 5 l
+#	SM DECNCRM 7 bits NCR set:	esc [ ? 4 2 h
+#	RM DECNCRM Multi or ISO latin:	esc [ ? 4 2 l
+#	SM DECNKM numeric keypad mode:	esc [ ? 6 6 h
+#	RM DECNKM numeric keypad appl.:	esc [ ? 6 6 l
+#	SM DECKBUM clavier informatique	esc [ ? 6 8 h
+#	RM DECKBUM clavier bureautique:	esc [ ? 6 8 l
+#	DECSCL vt300 mode 8-bit ctrl:	esc [ 6 3 " p
+# or	DECSCL vt300 mode 8-bit ctrl:	esc [ 6 3 ; 0 " p
+# or	DECSCL vt300 mode 8-bit ctrl:	esc [ 6 3 ; 2 " p
+#	DECSCL vt300 mode 7-bit ctrl:	esc [ 6 3 ; 1 " p
+#	Char. and Line attributes:	esc [ Ps ... Ps m
+# with:  0 All off, 1 Bold, 4 Underline, 5 Blinking, 7 Reverse
+# and : 22 Bold off, 24 Underline off, 25 Blinking off, 27 Reverse off
+#
+
+# This entry covers BQ303, BQ306, BQ310, Q303, Q306, Q310
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+bq300|Bull vt320 ISO Latin 1 80 columns terminal:\
+	:am:eo:es:hs:km:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:\
+	:ds=\E[1$}\E[2$~\n\E[0$}:ec=\E[%dX:ei=\E[4l:fs=\E[0$}:\
+	:ho=\E[H:i1=\E[63;1"p\E[2h:\
+	:i2=\E[0$}\E[?25h\E[2l\E[H\E[J:im=\E[4h:\
+	:is=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[0m\E(B:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\
+	:st=\EH:ta=^I:te=\E[?7h:ti=\E[?7l\E[?1l\E(B:\
+	:ts=\E[1$}\E[2$~:ue=\E[24m:up=\E[A:us=\E[4m:\
+	:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
+bg300-rv|Bull vt320 reverse 80 columns:\
+	:is=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l:\
+	:vb=\E[?5l\E[?5h:\
+	:tc=bq300:
+bq300-w|Bull vt320 132 columns:\
+	:co#132:ws#132:\
+	:is=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l:\
+	:r2=\E[?3h:\
+	:tc=bq300:
+bq300-w-rv|Bull vt320 reverse mode 132 columns:\
+	:co#132:ws#132:\
+	:is=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l:\
+	:r2=\E[?3h:vb=\E[?5l\E[?5h:\
+	:tc=bq300:
+
+#  This entry is used for terminals with vt320 emulation mode
+#  and following set-up : 
+#    8 bit ISO Latin Character Set (ISO 8859-1),
+#    8 bit Control Characters, (CSI coded as x9B for ESC [)
+#    80 columns screen.    
+#	Soft Terminal Reset		csi ! p
+#	RIS (erases screen):		esc c
+#	DECKPNM numeric keypad mode:	esc >
+#	DECKPAM applic. keypad mode:	esc =
+#	DECSTBM Scrolling region:	esc [ r
+#	SCS select G0 = US:		esc ( B
+#	SCS select G1 = line-graphic:	esc ) 0
+#	Select 7-bit C1 controls:	esc sp F
+#	Select 8-bit C1 controls:	esc sp G
+#	Select cursor home:		csi H
+#	Select erase screen:		csi J
+#	SM KAM lock keyboard:		csi 2 h
+#	RM KAM unlock keyboard:		csi 2 l
+#	SM SRM local echo off:		csi 1 2 h
+#	RM SRM local echo on:		csi 1 2 l
+#	SM LNM New line :		csi 2 0 h
+#	RM LNM return = CR only:	csi 2 0 l
+#	SM DECCKM cursor keys mode:	csi ? 1 h
+#	RM DECCKM appli. keys mode:	csi ? 1 l
+#	SM DECANM ANSI mode on:		csi ? 2 h
+#	RM DECANM ANSI mode off:	csi ? 2 l
+#	SM DECCOLM 132-column screen:	csi ? 3 h
+#	RM DECCOLM 80-column screen:	csi ? 3 l
+#	SM DECSCLM Smooth scroll:	csi ? 4 h
+#	RM DECSCLM Jump scroll:		csi ? 4 l
+#	SM DECSCNM screen light backgr.	csi ? 5 h
+#	RM DECSCNM screen dark backgr.	csi ? 5 l
+#	SM DECOM move within margins:	csi ? 6 h
+#	RM DECOM move outside margins:	csi ? 6 l
+#	SM DECAWM auto right margin:	csi ? 7 h
+#	RM DECAWM auto right margin:	csi ? 7 l
+#	SM DECARM auto repeat:		csi ? 8 h
+#	RM DECARM auto repeat:		csi ? 8 l
+#	DECSASD Select active main:	csi 0 $ } 
+#	DECSASD Select active status:	csi 1 $ } 
+#	DECSSDT Select status none:	csi 0 $ ~ 
+#	DECSSDT Select status indic.:	csi 1 $ ~ 
+#	DECSSDT Select status host-wr:	csi 2 $ ~ 
+#	SM DECTCEM Visible cursor:	csi ? 2 5 h
+#	RM DECTCEM Invisible cursor:	csi ? 2 5 l
+#	SM DECNCRM 7 bits NCR set:	csi ? 4 2 h
+#	RM DECNCRM Multi or ISO latin:	csi ? 4 2 l
+#	DECSCL vt300 mode 8-bit ctrl:	csi 6 3 " p
+# or	DECSCL vt300 mode 8-bit ctrl:	csi 6 3 ; 0 " p
+#	DECSCL vt300 mode 7-bit ctrl:	csi 6 3 ; 1 " p
+#	Char. and Line attributes:	csi Ps ... Ps m
+# with:  0 All off, 1 Bold, 4 Underline, 5 Blinking, 7 Reverse
+# and : 22 Bold off, 24 Underline off, 25 Blinking off, 27 Reverse off
+# (bq300-8: :le:,:nd:,:up:,:do:,:dl:,:al: to get under 1024 --esr)
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+bq300-8|Bull vt320 full 8 bits 80 columns:\
+	:am:eo:es:hs:km:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:ws#80:\
+	:AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:\
+	:K1=\217w:K2=\217u:K3=\217y:K4=\217q:K5=\217s:LE=\233%dD:\
+	:RI=\233%dC:UP=\233%dA:ae=^O:as=^N:bl=^G:cd=\233J:ce=\233K:\
+	:cl=\233H\233J:cm=\233%i%d;%dH:cr=^M:cs=\233%i%d;%dr:\
+	:ct=\2333g:dc=\233P:ds=\2331$}\2332$~\n\2330$}:\
+	:ec=\233%dX:ei=\2334l:fs=\2330$}:ho=\233H:\
+	:i1=\E[63;2"p\E[2h:i2=\2330$}\233?25h\2332l\233H\233J:\
+	:im=\2334h:\
+	:is=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l:\
+	:k1=\217P:k2=\217Q:k3=\217R:k4=\217S:k6=\23317~:\
+	:k7=\23318~:k8=\23319~:k9=\23320~:kD=\2333~:kI=\2332~:\
+	:kN=\2336~:kP=\2335~:kb=^H:kd=\233B:ke=\233?1l\E>:\
+	:kl=\233D:kr=\233C:ku=\233A:mb=\2335m:md=\2331m:\
+	:me=\2330m\E(B:mr=\2337m:nw=\EE:rc=\E8:sc=\E7:se=\23327m:\
+	:sf=\ED:so=\2337m:sr=\EM:st=\EH:ta=^I:te=\233?7h:\
+	:ti=\233?7l\233?1l\E(B:ts=\2331$}\2332$~:ue=\23324m:\
+	:us=\2334m:vb=\233?5h\233?5l:ve=\233?25h:vi=\233?25l:\
+	:vs=\233?25h:
+bq300-8rv|Bull vt320 8-bit reverse mode 80 columns:\
+	:is=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l:\
+	:vb=\233?5l\233?5h:\
+	:tc=bq300-8:
+bq300-8w|Bull vt320 8-bit 132 columns:\
+	:co#132:ws#132:\
+	:is=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l:\
+	:r2=\233?3h:\
+	:tc=bq300-8:
+bq300-w-8rv|Bull vt320 8-bit reverse mode 132 columns:\
+	:co#132:ws#132:\
+	:is=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l:\
+	:r2=\233?3h:vb=\233?5l\233?5h:\
+	:tc=bq300-8:
+
+#  This entry is used for terminals with vt320 emulation mode
+#  a 102 keys keyboard (PC scancode !) and following set-up : 
+#    8 bit ISO Latin Character Set (ISO 8859-1),
+#    7 bit Control Characters, 
+#    80 columns screen.    
+bq300-pc|Questar 303 with PC keyboard ISO Latin 1 80 columns:\
+	:%0@:%1@:*6@:@0@:@7=\E[4~:F1=\E[29~:F2=\E[31~:F3@:F4@:F5@:F6@:\
+	:F7@:F8@:F9@:FA@:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
+	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[26~:\
+	:k;=\E[28~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:\
+	:kh=\E[1~:l1@:l2@:l3@:l4@:\
+	:tc=bq300:
+bq300-pc-rv|Questar 303 with PC keyboard reverse mode 80 columns:\
+	:is=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l:\
+	:vb=\E[?5l\E[?5h:\
+	:tc=bq300-pc:
+bq300-pc-w|Questar 303 with PC keyboard 132 columns terminal:\
+	:co#132:ws#132:\
+	:is=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l:\
+	:r2=\E[?3h:\
+	:tc=bq300-pc:
+bq300-pc-w-rv|Questar 303 with PC keyboard reverse mode 132 columns:\
+	:co#132:ws#132:\
+	:is=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l:\
+	:r2=\E[?3h:vb=\E[?5l\E[?5h:\
+	:tc=bq300-pc:
+#    8 bit ISO Latin Character Set (ISO 8859-1),
+#    8 bit Control Characters, 
+#    80 columns screen.    
+bq300-8-pc|Q306-8-pc|Questar 303 with PC keyboard in full 8 bits 80 columns:\
+	:%0@:%1@:*6@:@0@:@7=\2334~:F1=\23329~:F2=\23331~:F3@:F4@:F5@:\
+	:F6@:F7@:F8@:F9@:FA@:k1=\23317~:k2=\23318~:k3=\23319~:\
+	:k4=\23320~:k5=\23321~:k6=\23323~:k7=\23324~:k8=\23325~:\
+	:k9=\23326~:k;=\23328~:kD=\2333~:kI=\2332~:kN=\2336~:\
+	:kP=\2335~:kb=^H:kh=\2331~:l1@:l2@:l3@:l4@:\
+	:tc=bq300-8:
+bq300-8-pc-rv|Questar 303 with PC keyboard full 8 bits reverse mode 80 columns:\
+	:is=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l:\
+	:vb=\E[?5l\E[?5h:\
+	:tc=bq300-8-pc:
+bq300-8-pc-w|Questar 303 with PC keyboard full 8 bits 132 columns:\
+	:co#132:ws#132:\
+	:is=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l:\
+	:r2=\E[?3h:\
+	:tc=bq300-8-pc:
+bq300-8-pc-w-rv|Questar 303 with PC keyboard full 8 bits reverse 132 columns:\
+	:co#132:ws#132:\
+	:is=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l:\
+	:r2=\E[?3h:vb=\E[?5l\E[?5h:\
+	:tc=bq300-8-pc:
+
+#======================================================#
+# BULL QUESTAR 310 `VIP 7800/8800' terminals emulation #
+#======================================================#
+
+# normal mode, 8 bits, 80 columns terminal.
+#	RES reset :			^[e
+#	RIS reset initial state:	^[c
+#	BLE bell enable			^[h
+#	BLD bell disable		^[g
+#	CAMS char. attr. mode set	^[[D
+#	CAMR char. attr. mode reset	^[[G
+#	CLR clear			^[`
+#	KBU keyboard unlock (set)	^[[W
+#	KBL keyboard lock (reset)	^[[X
+#	CM  character mode (async.) 	^[k
+#	NEP non echoplex mode (by host)	^[l
+#	EP  echoplex mode (by host) 	^[m
+#	IM  insert mode set		^[[I
+#	IM  insert mode reset 		^[[J
+#	RMS roll mode set 		^[r
+#	RMR roll mode reset 		^[q
+#	SM78 set mode vip7800	 	^[[1q
+#	SD  scroll up  	(72 lines) 	^[[0s
+#	SD  scroll down	(72 lines) 	^[[1s
+#	RBM block mode reset		^[[E
+#	SLS status line set 		^[w
+#	SLR status line reset 		^[v
+#	SLL status line lock 		^[O
+#	LGS Line-graphic mode set 	^[G
+#	LGR Line-graphic mode reset 	^[F
+#	TBC tab clear (at cursor pos.)	^[[g
+#	TBI tab initialize 		^[[N
+#	TBS tab set (at cursor pos.)	^[p
+#	PDS  print data space		^[[0p
+#	PHD  print host data 		^[[3p
+#	PDT  print data terminator	^[[<p
+#	PRES print adapter reset	^[[2p
+#	SSPR multi-part. reset		^[[<>u
+#	SSP0 partition 0 set		^[[00u
+#	SSP1 partition n format 1 	^[[PnPnSTRINGu
+#	SSP2 partition n format 2 	^[[PnPnSTRINGu
+#	SSP3 partition n format 3 	^[[PnPnu
+#	ATR attribute (visual)
+#	    blink :			^[sB
+#	    dim :			^[sL
+#	    hide (blank) :		^[sH
+#	    restore :			^[sR
+#	    inverse video :		^[sI
+#	    prot. :			^[sP
+#	    underline :			^[s_
+#	    reset :			^{
+#
+# This covers the vip7800 and BQ3155-vip7800
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+vip|Bull Questar 3155-7800:\
+	:am:es:hs:km:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:ws#80:\
+	:ae=\EF:as=\EG:bl=^G:bt=\E[Z:cd=\EJ:ce=\EK:cl=\E`:\
+	:cm=\E[%i%03%03f:cr=^M:ct=\E[N:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\Ev:ei=\E[J:fs=\EO:ho=\EH:i2=\Er\E[W\E`:ic=\E[I:\
+	:im=\E[I:is=\E[00u\E[<>001001024080024080u\E[01u:\
+	:k1=\E0:k2=\E2:k3=\E6:k4=\E8:k5=\E\072:k6=\E<:k7=\E>:k8=\EP:\
+	:k9=\ER:kD=\E[P:kH=\EH\EA:kI=\E[I:kb=^H:kd=\EB:kh=\EH:\
+	:kl=\ED:kr=\EC:ku=\EA:le=^H:ll=\EH\EA:mb=\EsB:\
+	:me=\EsR\EsU\EF:mh=\EsL:mr=\EsI:nd=\EC:nw=^M:se=\EsR:sf=^J:\
+	:so=\EsI:sr=\EA\EJ\EH\E[L:st=\Ep:ta=^I:ts=\Ew:ue=\EsR:\
+	:up=\EA:us=\Es_:vb=\007\007\007:
+# normal screen, 8 bits, 132 columns terminal.
+vip-w|vip7800-w|Q310-vip-w|Q310-vip-w-am|Questar 3155-vip7800 wide:\
+	:co#132:ws#132:\
+	:is=\E[00u\E[<>001001024132024132u\E[01u:tc=vip:
+vip-H|vip7800-H|Q310-vip-H|Q310-vip-H-am|Questar 3155-vip7800 72 lines:\
+	:li#72:\
+	:is=\E[00u\E[<>001001024080072080u\E[01u:tc=vip:
+vip-Hw|vip7800-Hw|Q310-vip-Hw|Questar 3155-vip7800 wide 72 lines:\
+	:co#132:li#72:ws#132:\
+	:is=\E[00u\E[<>001001024132072132u\E[01u:tc=vip:
+#### Chromatics
+#
+
+# I have put the long strings in :ti:/:te:. Ti sets up a window 
+# that is smaller than the screen, and puts up a warning message 
+# outside the window. Te erases the warning message, puts the 
+# window back to be the whole screen, and puts the cursor at just
+# below the small window. I defined :ve: and :vi: to really turn 
+# the cursor on and off, but I have taken this out since I don't 
+# like the cursor being turned off when vi exits.   
+cg7900|chromatics|chromatics 7900:\
+	:am:\
+	:co#80:li#40:\
+	:al=^A>2:bl=^G:cd=^Al:ce=^A`:cl=^L:cm=\001M%r%d\054%d\054:\
+	:cr=^M:dc=^A<1:dl=^A<2:do=^J:ei=:ho=^\:ic=^A>1:im=:le=^H:\
+	:ll=^A|:nd=^]:se=\001C1\054\001c2\054:sf=^J:\
+	:so=\001C4\054\001c7\054:\
+	:te=\001W0\05440\05485\05448\054\014\001W0\0540\05485\05448\054\001M0\05440\054:\
+	:ti=\001P0\001O1\001R1\001C4\054\001c0\054\014\001M0\05442\054WARNING DOUBLE ENTER ESCAPE and \025\001C1\054\001c2\054\001W0\0540\05479\05439\054:\
+	:uc=\001\001_\001\0:up=^K:
+
+#### Computer Automation
+#
+
+ca22851|computer automation 22851:\
+	:am:\
+	:co#80:li#24:\
+	:bl=^G:cd=^\:ce=^]:cl=\014:cm=\002%i%.%.:cr=^M:do=^J:ho=^^:\
+	:kd=^W:kh=^^:kl=^U:ku=^V:le=^U:nd=^I:sf=^J:up=^V:
+
+#### Cybernex
+#
+
+# This entry has correct padding and the undocumented "ri" capability
+cyb83|xl83|cybernex xl-83:\
+	:am:bs:\
+	:co#80:li#24:\
+	:bl=^G:cd=\020:ce=\017:cl=\014:cm=\027%+ %+ :cr=^M:do=^J:\
+	:ho=^K:kd=^J:kl=^H:kr=^I:ku=^N:le=^H:nd=^I:sf=^J:sr=^N:up=^N:
+# (mdl110: removed obsolete ":ma=^Z^P:" and overridden ":cd=145^NA^W:" -- esr)
+cyb110|mdl110|cybernex mdl-110:\
+	:am:bs:\
+	:co#80:li#24:\
+	:al=\016A\016\035:bl=^G:cd=\016@\026:ce=\016@\026:\
+	:cl=\030:cm=\020%+ %+ :cr=^M:dc=\016A\036:\
+	:dl=\016A\016\036:do=^J:ei=:ho=^Y:ic=\016A\035:im=:le=^H:\
+	:nd=^U:se=^NG:sf=^J:so=^NF:ta=\011:up=^Z:
+
+#### Datapoint
+#
+# Datapoint is gone.  They used to be headquartered in Texas.
+# They created ARCnet, an Ethernet competitor that flourished for a while
+# in the early 1980s before 3COM got wise and cut its prices.  The service
+# side of Datapoint still lives (1995) in the form of Intelogic Trace.
+#
+
+dp3360|datapoint|datapoint 3360:\
+	:am:bs:\
+	:co#82:li#25:\
+	:bl=^G:cd=^_:ce=^^:cl=^]^_:cr=^M:do=^J:ho=^]:le=^H:nd=^X:\
+	:sf=^J:up=^Z:
+
+# From: Jan Willem Stumpel <jw.stumpel@inter.nl.net>, 11 May 1997
+# The Datapoint 8242 Workstation was sold at least between 1985 
+# and 1989. To make the terminal work with this entry, press 
+# CONTROL-INT-INT to take the terminal off-line, and type (opt). 
+# Set the options AUTO ROLL, ROLL DN, and ESC KBD on, and AUTO 
+# CR/LF off. Use control-shift-[] as escape key, control-I as tab, 
+# shift-F1 to shift-F5 as F6 to F10 (unshifted F1 to F5 are in
+# fact unusable because the strings sent by the terminal conflict
+# with other keys).
+# The terminal is capable of displaying "box draw" characters.
+# For each graphic character you must send 2 ESC's (\E\E) followed 
+# by a control character as follows: 
+#         character        meaning
+#         =========        =======
+#         ctrl-E           top tee
+#         ctrl-F           right tee
+#         ctrl-G           bottom tee
+#         ctrl-H           left tee
+#         ctrl-I           cross
+#         ctrl-J           top left corner
+#         ctrl-K           top right corner
+#         ctrl-L           bottom left corner
+#         ctrl-M           bottom right corner
+#         ctrl-N           horizontal line
+#         ctrl-O           vertical line
+# Unfortunately this cannot be fitted into the termcap/terminfo 
+# description scheme. 
+dp8242|datapoint 8242:\
+	:ms:\
+	:co#80:li#25:\
+	:al=\E^T:bl=^G:cd=^W:ce=^V:cl=\025\E\004\027\030:\
+	:cm=\011%r%+\%+\:cr=^M:dl=\E^Z:do=^J:ho=^U:\
+	:i1=\E\014\E\016\0\230\0\317\025\027\030\E\004:\
+	:k1=^G\Ee:k2=^I\Ed:k3=^J\Ec:k4=^J\Eb:k5=^S\Ea:k6=\EO\Ee:\
+	:k7=\EN\Ed:k8=\EM\Ec:k9=\EL\Eb:k;=\EK\Ea:kb=^H:kd=^B:kl=^D:\
+	:kr=^F:ku=^E:le=^H:nw=^M^J:\
+	:r1=\E\014\E\016\0\230\0\317\025\027\030\E\004:\
+	:rp=\E\023%.%.:se=\E^D:sf=^C:so=\E^E:sr=^K:ta=^I:ue=\E^D:\
+	:us=\E^F:ve=^X:vi=^Y:\
+	:..wi=\E\014\E\016%p1%'\0'%+%c%p2%'\0'%+%c%p3%'\0'%+%c%p4%'\0'%+%c\025:
+
+#### DEC terminals (Obsolete types: DECwriter and vt40/42/50)
+#
+# These entries are DEC's official terminfos for its older terminals.
+# Contact Bill Hedberg <hedberg@hannah.enet.dec.com> of Terminal Support
+# Engineering for more information.  Updated terminfos and termcaps 
+# are kept available at ftp://gatekeeper.dec.com/pub/DEC/termcaps.
+#
+
+gt40|dec gt40:\
+	:bs:os:\
+	:co#72:li#30:\
+	:bl=^G:cr=^M:do=^J:le=^H:
+gt42|dec gt42:\
+	:bs:os:\
+	:co#72:li#40:\
+	:bl=^G:cr=^M:do=^J:le=^H:
+
+vt50|dec vt50:\
+	:bs:\
+	:co#80:li#12:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cr=^M:do=^J:le=^H:nd=\EC:\
+	:sf=^J:ta=^I:up=\EA:
+vt50h|dec vt50h:\
+	:bs:\
+	:co#80:li#12:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:do=^J:\
+	:le=^H:nd=\EC:sf=^J:sr=\EI:ta=^I:up=\EA:
+# (<acsc>/:ae:/:as: capabilities aren't in DEC's official entry -- esr)
+vt52|dec vt52:\
+	:bs:\
+	:co#80:it#8:li#24:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
+	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
+	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
+
+# (vt61: there's a BSD termcap that claims :dl=\EPd:, :al=\EPf.: :kb=^H:)
+vt61|vt-61|vt61.5|dec vt61:\
+	:co#80:li#24:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=\r:do=^J:\
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:sf=\n:sr=\EI:ta=^I:\
+	:up=\EA:
+
+# The gigi does standout with red!
+# (gigi: I added <rmam>/<smam> based on the init string, corrected cub1 -- esr)
+gigi|vk100|dec gigi graphics terminal:\
+	:am:bs:xn:\
+	:co#84:li#24:\
+	:DO=\E[%dB:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:\
+	:UP=\E[%dA:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:do=^J:\
+	:is=\E>\E[?3l\E[?4l\E[?5l\E[?20l\E[?7h\E[?8h:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\EOB:ke=\E[?1l\E>:kh=\E[H:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:me=\E[m:\
+	:nd=\E[C:se=\E[m:sf=^J:so=\E[7;31m:sr=\EM:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
+
+# DEC PRO-350 console (VT220-style).  The 350 was DEC's attempt to produce
+# a PC differentiated from the IBM clones.  It was a total, ludicrous,
+# grossly-overpriced failure (among other things, DEC's OS didn't include
+# a format program, so you had to buy pre-formatted floppies from DEC at
+# a hefty premium!).
+pro350|decpro|dec pro console:\
+	:bs:\
+	:co#80:it#8:li#24:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\EG:as=\EF:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :do=\EB:\
+	:ho=\EH:k0=\EE:k1=\EF:k2=\EG:k3=\EH:k4=\EI:k5=\EJ:k6=\Ei:\
+	:k7=\Ej:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
+	:se=\E^N:so=\E^H:sr=\EI:ta=^I:ue=\E^C:up=\EA:us=\E^D:
+
+dw1|decwriter I:\
+	:bs:hc:os:\
+	:co#72:\
+	:bl=^G:cr=^M:do=^J:le=^H:sf=^J:
+dw2|decwriter|dw|decwriter II:\
+	:bs:hc:os:\
+	:co#132:\
+	:bl=^G:cr=^M:do=^J:kb=^H:le=^H:sf=^J:
+# \E(B		Use U.S. character set (otherwise # => british pound !)
+# \E[20l	Disable "linefeed newline" mode (else puts \r after \n,\f,\v)
+# \E[w   	10 char/in pitch
+# \E[1;132	full width horizontal margins
+# \E[2g		clear all tab stops
+# \E[z		6 lines/in
+# \E[66t	66 lines/page (for \f)
+# \E[1;66r	full vertical page can be printed
+# \E[4g		clear vertical tab stops
+# \E>		disable alternate keypad mode (so it transmits numbers!)
+# \E[%i%p1%du	set tab stop at column %d (origin == 1)
+#		(Full syntax is \E[n;n;n;n;n;...;nu where each 'n' is 
+#		a tab stop)
+#
+#       The dw3 does standout with wide characters.
+#
+dw3|la120|decwriter III:\
+	:bs:hc:os:\
+	:co#132:\
+	:bl=^G:cr=^M:do=^J:\
+	:i1=\E(B\E[20l\E[w\E[0;132s\E[2g\E[z\E[66t\E[1;66r\E[4g\E>:\
+	:is=\E[9;17;25;33;41;49;57;65;73;81;89;97;105;113;121;129u\r:\
+	:kb=^H:le=^H:me=\E[w:se=\E[w:sf=^J:so=\E[6w:ta=^I:
+dw4|decwriter IV:\
+	:am:bs:hc:os:\
+	:co#132:\
+	:bl=^G:cr=^M:do=^J:is=\Ec:k0=\EOP:k1=\EOQ:k2=\EOR:k3=\EOS:\
+	:kb=^H:le=^H:sf=^J:ta=^I:
+
+# These aren't official
+ln03|dec ln03 laser printer:\
+	:hc:\
+	:co#80:li#66:\
+	:bl=^G:cr=^M:do=^J:hd=\EK:hu=\EL:me=\E[m:nw=^M^J:se=\E[22m:\
+	:sf=^J:so=\E[1m:ta=^I:ue=\E[24m:us=\E[4m:
+ln03-w|dec ln03 laser printer 132 cols:\
+	:co#132:\
+	:bl=^G:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=ln03:
+
+#### Delta Data (dd)
+#
+
+# Untested. The cup sequence is hairy enough that it probably needs work.
+# The idea is ctrl(O), dd(row), dd(col), where dd(x) is x - 2*(x%16) + '9'.
+# There are BSD-derived termcap entries floating around for this puppy
+# that are *certainly* wrong.
+delta|dd5000|delta data 5000:\
+	:am:bs:\
+	:co#80:li#27:\
+	:bl=^G:ce=^NU:cl=^NR:cm=\017%+^P%+^P:dc=^NV:do=^J:ho=^NQ:\
+	:le=^H:nd=^Y:sf=^J:up=^Z:
+
+#### Digital Data Research (ddr)
+#
+
+# (ddr: I added <rmam>/<smam> based on the init string -- esr)
+ddr|rebus3180|ddr3180|Rebus/DDR 3180 vt100 emulator:\
+	:am:bs:xn:\
+	:co#80:it#8:li#24:vt#3:\
+	:RA=\E[7l:SA=\E[7l:cd=50\E[J:ce=3\E[K:cl=50\E[H\E[2J:\
+	:cm=5\E[%i%d;%dH:cs=\E[%i%d;%dr:do=^J:ho=\E[H:\
+	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kb=^H:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kr=\E[C:ks=\E[?1h\E=:\
+	:ku=\E[A:le=^H:mb=2\E[5m:md=2\E[1m:me=2\E[m:mr=2\E[7m:\
+	:nd=2\E[C:r1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\
+	:rf=/usr/share/tabset/vt100:sc=\E7:se=\E[m:sf=5\ED:\
+	:so=\E[7m:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:us=2\E[4m:
+
+#### Evans & Sutherland
+#
+
+# Jon Leech <leech@cs.unc.edu> tells us:
+# The ps300 was the Evans & Sutherland Picture System 300, a high
+# performance 3D vector graphics system with a bunch of specialized hardware.
+# Approximate date of release was 1982 (early 80s, anyway), and it had several
+# evolutions including (limited) color versions such as the PS330C. PS300s
+# were effectively obsolete by the late 80s, replaced by raster graphics
+# systems, although specialized applications like molecular modelling
+# hung onto them for a while longer.  AFAIK all E&S vector graphics systems
+# are out of production, though of course E&S is very much alive (in 1996).
+# (ps300: changed ":pt@:" to "it@" -- esr)
+#
+ps300|Picture System 300:\
+	:xt:\
+	:it@:\
+	:se@:so@:ue@:us@:tc=vt100:
+
+#### General Electric (ge)
+#
+
+terminet1200|terminet300|tn1200|tn300|terminet|GE terminet 1200:\
+	:bs:hc:os:\
+	:co#120:\
+	:bl=^G:cr=^M:do=^J:sf=^J:
+
+#### Heathkit/Zenith
+#
+
+# Here is a description of the H19 DIP switches:
+#
+# S401
+# 0-3 = baud rate as follows:
+# 
+#         3       2       1       0
+#	---	---	---	--- 
+#         0       0       1       1       300 baud
+#         0       1       0       1       1200 baud
+#         1       0       0       0       2400 baud
+#         1       0       1       0       4800 baud
+#         1       1       0       0       9600 baud
+#         1       1       0       1       19.2K baud
+# 
+# 4 = parity (0 = no parity)
+# 5 = even parity (0 = odd parity)
+# 6 = stick parity (0 = normal parity)
+# 7 = full duplex (0 = half duplex)
+# 
+# S402 
+# 0 = block cursor (0 = underscore cursor)
+# 1 = no key click (0 = keyclick)
+# 2 = wrap at end of line (0 = no wrap)
+# 3 = auto LF on CR (0 = no LF on CR)
+# 4 = auto CR on LF (0 = no CR on LF)
+# 5 = ANSI mode (0 = VT52 mode)
+# 6 = keypad shifted (0 = keypad unshifted)
+# 7 = 50Hz refresh (1 = 60Hz refresh)
+# 
+# Factory Default settings are as follows:
+#          7 6 5 4 3 2 1 0
+# S401     1 0 0 0 1 1 0 0
+# S402     0 0 0 0 0 0 0 0
+# (h19: I added <rmam>/<smam> based on the init string;
+# also added empty <acsc> to suppress a tic warning -- esr)
+h19-a|h19a|heath-ansi|heathkit-a|heathkit h19 ansi mode:\
+	:am:bs:mi:ms:\
+	:co#80:it#8:li#24:\
+	:RA=\E[?7l:SA=\E[?7h:ac=:ae=\E[11m:al=\E[1L:as=\E[10m:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:dc=\E[1P:dl=\E[1M:do=\E[1B:ei=\E[4l:ho=\E[H:im=\E[4h:\
+	:is=\E<\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m\E[?7h:k1=\EOS:\
+	:k2=\EOT:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:\
+	:kb=^H:kd=\E[1B:kh=\E[H:kl=\E[1D:kr=\E[1C:ku=\E[1A:l6=blue:\
+	:l7=red:l8=white:le=^H:nd=\E[1C:se=\E[m:sf=^J:so=\E[7m:\
+	:sr=\EM:ta=^I:up=\E[1A:ve=\E[>4l:vs=\E[>4h:
+h19-bs|heathkit w/keypad shifted:\
+	:ke=\Eu:ks=\Et:tc=h19-b:
+h19-us|h19us|h19-smul|heathkit w/keypad shifted/underscore cursor:\
+	:ke=\Eu:ks=\Et:\
+	:tc=h19-u:
+# (h19: merged in :ip: from BSDI hp19-e entry>;
+# also added empty <acsc> to suppress a tic warning --esr)
+# From: Tim Pierce <twp@skepsis.com>, 23 Feb 1998 
+# Tim tells us that:
+# I have an old Zenith-19 terminal at home that still gets a lot of use.
+# This terminal suffers from the same famous insert-mode padding lossage
+# that has been acknowledged for the Z29 terminal.  Emacs is nearly
+# unusable on this box, since even a half-scroll up or down the window
+# causes flaming terminal death.
+#   
+# On the Z19, the only way I have found around this problem is to remove
+# the :al: and :dl: entries entirely.  No amount of extra padding will
+# help (I have tried up to 20000).  Removing :al=\EL$: and :dl=\EM$:
+# makes Emacs a little slower, but it remains in the land of the living.
+# Big win.
+h19|heath|h19-b|heathkit|heath-19|z19|zenith|heathkit h19:\
+	:am:bs:es:hs:mi:ms:\
+	:co#80:it#8:li#24:\
+	:ac=:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :\
+	:cr=^M:dc=\EN:do=\EB:ei=\EO:fs=\Ek\Ey5:ho=\EH:im=\E@:\
+	:ip=1.5<1.5/>:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:\
+	:k7=\EQ:k8=\ER:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:\
+	:l6=blue:l7=red:l8=white:le=^H:nd=\EC:se=\Eq:sf=^J:so=\Ep:\
+	:sr=\EI:ta=^I:ts=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo:up=\EA:\
+	:ve=\Ey4:vs=\Ex4:
+h19-u|heathkit with underscore cursor:\
+	:ve@:vs@:tc=h19-b:
+h19-g|h19g|heathkit w/block cursor:\
+	:ve=\Ex4:tc=h19-b:
+alto-h19|altoh19|altoheath|alto-heath|alto emulating heathkit h19:\
+	:li#60:\
+	:al=\EL:dl=\EM:tc=h19:
+
+# The major problem with the Z29 is that it requires more padding than the Z19.
+#
+# The problem with declaring an H19 to be synonymous with a Z29 is that
+# it needs more padding. It especially loses if a program attempts
+# to put the Z29 into insert mode and insert text at 9600 baud. It
+# even loses worse if the program attempts to insert tabs at 9600
+# baud. Adding padding to text that is inserted loses because in 
+# order to make the Z29 not die, one must add so much padding that
+# whenever the program tries to use insert mode, the effective 
+# rate is about 110 baud.
+# 
+# What program would want to put the terminal into insert mode 
+# and shove stuff at it at 9600 baud you ask?  
+# 
+# Emacs. Emacs seems to want to do the mathematically optimal 
+# thing in doing a redisplay rather than the practical thing.
+# When it is about to output a line on top of a line that is 
+# already on the screen, instead of just killing to the end of 
+# the line and outputting the new line, it compares the old line 
+# and the new line and if there are any similarities, it 
+# constructs the new line by deleting the text on the old line 
+# on the terminal that is already there and then inserting new
+# text into the line to transform it into the new line that is 
+# to be displayed. The Z29 does not react kindly to this.
+# 
+# But don't cry for too long.... There is a solution. You can make
+# a termcap entry for the Z29 that says the Z29 has no insert mode.
+# Then Emacs cannot use it. "Oh, no, but now inserting into a 
+# line will be really slow", you say. Well there is a sort of a
+# solution to that too. There is an insert character option on 
+# the Z29 that will insert one character. Unfortunately, it 
+# involves putting the terminal into ansi mode, inserting the 
+# character, and changing it back to H19 mode. All this takes 12 
+# characters. Pretty expensive to insert one character, but it 
+# works. Either Emacs doesn't try to use its inserting hack when 
+# it's only given an insert character ability or the Z29 doesn't 
+# require padding with this (the former is probably more likely, 
+# but I haven't checked it out).
+# (z29: added empty <acsc> to suppress a tic warning, merged in
+# status line capabilities from BRL entry --esr)
+z29|zenith29|z29b|zenith z29b:\
+	:am:bs:es:hs:mi:ms:pt:\
+	:co#80:kn#10:li#24:\
+	:ac=:ae=\EF:al=1\EL:as=\EG:bc=\ED:bl=^G:bt=\E-:cd=\EJ:ce=\EK:\
+	:cl=\EE:cm=\EY%+ %+ :cr=^M:dc=\EN:dl=1\EM:do=\EB:ds=\Ey1:\
+	:ei=\EO:fs=\Ek\Ey5:ho=\EH:ic=\E<\E[1@\E[?2h:im=\E@:\
+	:is=\E<\E[?2h\Ev:k0=\E~:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:\
+	:k6=\EP:k7=\EQ:k8=\ER:k9=\E0I:kb=^H:kd=\EB:kh=\EH:kl=\ED:\
+	:kr=\EC:ku=\EA:l0=home:le=^H:nd=\EC:se=\Eq:sf=\n:so=\Ep:\
+	:sr=2\EI:ta=^I:ts=\Ej\Ex5\Ex1\EY8%+ \Eo:ue=\Es0:up=\EA:\
+	:us=\Es8:ve=\Ey4:vs=\Ex4:
+# z29 in ansi mode. Assumes that the cursor is in the correct state, and that
+# the world is stable. <rs1> causes the terminal to be reset to the state
+# indicated by the name. kc -> key click, nkc -> no key click, uc -> underscore
+# cursor, bc -> block cursor.
+# From: Mike Meyers
+# (z29a: replaced nonexistent :if=/usr/share/tabset/zenith29: befause :st:
+# looks vt100-compatible -- esr)
+z29a|z29a-kc-bc|h29a-kc-bc|heath/zenith 29 in ansi mode:\
+	:am:bs:es:hs:mi:ms:pt:\
+	:co#80:it#8:kn#10:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:bc=\ED:bl=^G:cd=\E[J:ce=\E[K:cl=\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[1P:\
+	:do=^J:ds=\E[>1l:fs=\E[u\E[>5l:ho=\E[H:\
+	:if=/usr/share/tabset/vt100:k0=\E[~:k1=\EOS:k2=\EOT:\
+	:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:k9=\EOX:\
+	:kC=\E[J:kS=\E[J:kb=^H:kd=\EOB:kh=\E[H:kl=\EOD:kr=\EOC:\
+	:ku=\EOA:l0=help:le=^H:mb=\E[5m:md=\E[2m:me=\E[m:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:nw=^M\ED:ps=\E#7:\
+	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m\E[11m:\
+	:rc=\E[r:sc=\E[s:se=\E[m:sf=\ED:so=\E[7;2m:sr=\EM:st=\EH:\
+	:ta=^I:te=\E[?7h:ti=\E[?7l:\
+	:ts=\E[s\E[>5;1h\E[25;%i%dH\E[1K:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+z29a-kc-uc|h29a-kc-uc|z29 ansi mode with keyckick and underscore cursor:\
+	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m:\
+	:tc=z29a:
+z29a-nkc-bc|h29a-nkc-bc|z29 ansi mode with block cursor and no keyclick:\
+	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2;4h\E[>1;3;5;6;7;8;9l\E[m\E[11m:\
+	:tc=z29a:
+z29a-nkc-uc|h29a-nkc-uc|z29 ansi mode with underscore cursor and no keyclick:\
+	:r1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2h\E[>1;3;4;5;6;7;8;9l\E[m\E[11m:\
+	:tc=z29a:
+# From: Jeff Bartig <jeffb@dont.doit.wisc.edu> 31 Mar 1995
+z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode:\
+	:5i:am:es:hs:mi:ms:xo:\
+	:co#80:li#24:\
+	:%1=\E[~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:K1=\EOw:\
+	:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:RI=\E[%dC:\
+	:UP=\E[%dA:ac=0a``aaffggjjkkllmmnnooqqssttuuvvwwxx~~:\
+	:ae=\E(B:al=\E[1L:as=\E(0:bl=^G:bt=\E[1Z:cb=\E[1K:cd=\E[0J:\
+	:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[1P:dl=\E[1M:do=\E[B:\
+	:ds=\E[>1l:ei=\E[4l:fs=\E[u:ho=\E[H:im=\E[4h:\
+	:is=\E<\E[>1;3;5;6;7l\E[0m\E[2J:k1=\EOS:k2=\EOT:k3=\EOU:\
+	:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:k9=\EOX:kS=\E[J:\
+	:kb=^H:kd=\E[B:ke=\E[>7l:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E[>7h:\
+	:ku=\E[A:le=^H:ll=\E[24;1H:mb=\E[5m:md=\E[1m:me=\E[0m:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:\
+	:ps=\E[?19h\E[i:r2=\E<\Ec\0:rc=\E[u:sc=\E[s:se=\E[0m:\
+	:sf=^J:so=\E[7m:st=\EH:ta=^I:ts=\E[s\E[>1h\E[25;%i%p1%dH:\
+	:ue=\E[0m:up=\E[A:us=\E[4m:ve=\E[>5l:vi=\E[>5h:
+
+# From: Brad Brahms <Brahms@USC-ECLC>
+z100|h100|z110|z-100|h-100|heath/zenith z-100 pc with color monitor:\
+	:ve=\Ey4\Em70:vs=\Ex4\Em71:\
+	:tc=z100bw:
+# (z100bw: removed obsolete ":kn#10:", added empty <acsc> -- esr)
+z100bw|h100bw|z110bw|z-100bw|h-100bw|heath/zenith z-100 pc:\
+	:bs:mi:ms:pt:\
+	:co#80:it#8:kn#10:li#24:\
+	:ac=:ae=\EG:al=5*\EL:as=\EF:cd=\EJ:ce=\EK:cl=5*\EE:\
+	:cm=1*\EY%+ %+ :dc=1*\EN:dl=5*\EM:do=\EB:ei=\EO:ho=\EH:\
+	:im=\E@:k0=\EJ:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:\
+	:k7=\EQ:k8=\ER:k9=\EOI:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
+	:ku=\EA:le=^H:nd=\EC:se=\Eq:so=\Ep:sr=\EI:ta=^I:up=\EA:\
+	:ve=\Ey4:vs=\Ex4:
+p19|h19-b with il1/dl1:\
+	:al=2*\EL:dl=2*\EM:tc=h19-b:
+# From: <ucscc!B.fiatlux@ucbvax.berkeley.edu>
+# (ztx: removed duplicate :sr: -- esr)
+ztx|ztx11|zt-1|htx11|ztx-1-a|ztx-10 or 11:\
+	:am:bs:es:hs:\
+	:co#80:it#8:li#24:\
+	:al=\EL:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :dl=\EM:do=^J:\
+	:ds=\Ey1:fs=\Ek\Ey5:ho=\EH:\
+	:is=\Ej\EH\Eq\Ek\Ev\Ey1\Ey5\EG\Ey8\Ey9\Ey>:k0=\ES:\
+	:k1=\EB:k2=\EU:k3=\EV:k4=\EW:k5=\EP:k6=\EQ:k7=\ER:kb=^H:\
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\Eq:so=\Es5:\
+	:sr=\EI:ta=^I:ts=\Ej\Ex5\Ex1\EY8%+ \Eo:ue=\Eq:up=\EA:\
+	:us=\Es2:
+
+#### IMS International (ims)
+#
+# There was a company called IMS International located in Carson City, 
+# Nevada, that flourished from the mid-70s to mid-80s.  They made S-100
+# bus/Z80 hardware and a line of terminals called Ultimas.  
+#
+
+# From: Erik Fair <fair@ucbarpa.berkeley.edu>  Sun Oct 27 07:21:05 1985
+ims950-b|bare ims950 no init string:\
+	:is@:tc=ims950:
+# (ims950: removed obsolete ":ko@:" -- esr)
+ims950|ims televideo 950 emulation:\
+	:xn@:\
+	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb@:kd@:kh@:kl@:kr@:ku@:vb@:tc=tvi950:
+# (ims950-rv: removed obsolete ":ko@:" -- esr)
+ims950-rv|ims tvi950 rev video:\
+	:xn@:\
+	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb@:kd@:kh@:kl@:kr@:ku@:vb@:tc=tvi950-rv:
+ims-ansi|ultima2|ultimaII|IMS Ultima II:\
+	:am:bs:\
+	:co#80:it#8:li#24:\
+	:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:cm=\E[%i%2;%2H:do=\ED:\
+	:if=/usr/share/tabset/vt100:\
+	:is=\E[m\E[>14l\E[?1;?5;20l\E>\E[1m\r:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:se=\E[m\E[1m:\
+	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m\E[1m:up=\EM:us=\E[4m:
+
+#### Intertec Data Systems
+#
+# I think this company is long dead as of 1995.  They made an early CP/M
+# micro called the "Intertec Superbrain" that was moderately popular,
+# then sank out of sight.
+#
+
+superbrain|intertec superbrain:\
+	:am:bs:bw:\
+	:co#80:li#24:\
+	:bc=^U:bl=^G:cd=\E~k<10*>:ce=\E~K:cl=\014:cm=\EY%+ %+ :\
+	:cr=^M:do=^J:kd=^J:kl=^U:kr=^F:ku=^K:le=^H:nd=^F:sf=^J:ta=^I:\
+	:te=^L:ti=^L:up=^K:
+# (intertube: a Gould entry via BRL asserted smul=\E0@$<200/>, 
+# rmul=\E0A$<200/>; my guess is the highlight letter is bit-coded like an ADM,
+# and the reverse is actually true.  Try it. -- esr)
+intertube|intertec|Intertec InterTube:\
+	:am:bs:\
+	:co#80:li#25:\
+	:bl=^G:cl=^L:cm=\EY%+ %+ :cr=^M:do=^J:ho=^A:le=^H:nd=^F:\
+	:se=\E0@:sf=^J:so=\E0P:up=^Z:
+# The intertube 2 has the "full duplex" problem like the tek 4025: if you
+# are typing and a command comes in, the keystrokes you type get interspersed
+# with the command and it messes up
+intertube2|intertec data systems intertube 2:\
+	:bs:\
+	:ce=\EK:ch=\020%+^J:cm=\016%.\020%+^J:cv=\013%.:\
+	:ll=^K^X\r:\
+	:tc=intertube:
+
+#### Ithaca Intersystems
+#
+# This company made S100-bus personal computers long ago in the pre-IBM-PC
+# past.  They used to be reachable at:
+#
+#	Ithaca Intersystems
+#	1650 Hanshaw Road
+#	Ithaca, New York 14850
+#
+# However, the outfit went bankrupt years ago.
+#
+
+# The Graphos III was a color graphics terminal from Ithaca Intersystems.
+# These entries were written (originally in termcap syntax) by Brian Yandell 
+# <yandell@stat.wisc.edu> and Mike Meyer <mikem@stat.wisc.edu> at the 
+# University of Wisconsin.
+
+# (graphos: removed obsolete and syntactically incorrect :kn=4:, 
+# removed :if=/usr/share/tabset/init.graphos: and 
+# <rf=/usr/share/tabset/init.graphos> no such file & no :st: -- esr)
+graphos|graphos III:\
+	:am:mi:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
+	:UP=\E[%dA:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:dm=\E[4h:do=\E[B:\
+	:ed=\E[4l:ei=\E[4l:ho=\E[H:im=\E[4h:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=^H:me=\E[m:nd=\E[C:nw=^M\ED:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:up=\E[A:\
+	:ve=\Ez56;2;0;0z\Ez73z\Ez4;1;1z:\
+	:vs=\Ez4;2;1z\Ez56;2;80;24z:
+graphos-30|graphos III with 30 lines:\
+	:li#30:\
+	:vs=\Ez4;2;1z\Ez56;2;80;30z:tc=graphos:
+
+#### Modgraph
+#
+# These people used to be reachable at:
+#
+#	Modgraph, Inc
+#	1393 Main Street,
+#	Waltham, MA 02154
+#	Vox: (617)-890-5796.
+#
+# However, if you call that number today you'll get an insurance company.
+# I have mail from "Michael Berman, V.P. Sales, Modgraph" dated 
+# 26 Feb 1997 that says:
+#
+# Modgraph GX-1000, replaced by GX-2000.  Both are out of production, have been
+# for ~7 years.  Modgraph still in business.  Products are rugged laptop and
+# portable PC's and specialized CRT and LCD monitors (rugged, rack-mount
+# panel-mount etc).  I can be emailed at sonfour@aol.com
+#
+# Peter D. Smith <pdsmith@nbbn.com> notes that his modgraph manual was
+# dated 1984.  According to the manual, it featured Tek 4010/4014
+# graphics and DEC VT100/VT52 + ADM-3A emulation with a VT220-style keyboard.
+#
+
+modgraph|mod24|modgraph terminal emulating vt100:\
+	:xn@:\
+	:co#80:li#24:\
+	:is=\E\1369;0s\E\1367;1s\E[3g\E\13611;9s\E\13611;17s\E\13611;25s\E\13611;33s\E\13611;41s\E\13611;49s\E\13611;57s\E\13611;65s\E\13611;73s\E\13611;81s\E\13611;89s:\
+	:rf@:sr=5\EM\E[K:vs=\E\1369;0s\E\1367;1s:\
+	:tc=vt100:
+# The GX-1000 manual is dated 1984.  This looks rather like a VT-52.
+modgraph2|modgraph gx-1000 80x24 with keypad not enabled:\
+	:am:da:db:\
+	:co#80:it#8:li#24:\
+	:cd=50\EJ:ce=3\EK:cl=50\EH\EJ:cm=5\EY%+ %+ :\
+	:is=\E<\E\1365;2s\E\1367;1s\E[3g\E\13611;9s\E\13611;17s\E\13611;25s\E\13611;33s\E\13611;41s\E\13611;49s\E\13611;57s\E\13611;65s\E\13611;73s\E\13611;81s\E\13611;89s\E\13612;0s\E\13614;2s\E\13615;9s\E\13625;1s\E\1369;1s\E\13627;1:\
+	:le=^H:nd=2\EC:sr=5\EI:ta=^I:up=2\EA:
+#
+# Modgraph from Nancy L. Cider <nancyc@brl-tbd>
+# BUG NOTE from Barbara E. Ringers <barb@brl-tbd>:
+# If we set TERM=vt100, and set the Modgraph screen to 24 lines, setting a
+# mark and using delete-to-killbuffer work correctly.  However, we would
+# like normal mode of operation to be using a Modgraph with 48 line setting.
+# If we set TERM=mod (which is a valid entry in termcap with 48 lines)
+# the setting mark and delete-to-killbuffer results in the deletion of only
+# the line the mark is set on.
+# We've discovered that the delete-to-killbuffer works correctly
+# with TERM=mod and screen set to 80x48 but it's not obvious.  Only
+# the first line disappears but a ctrl-l shows that it did work
+# correctly.
+modgraph48|mod|Modgraph w/48 lines:\
+	:am:bs:pt:xn:\
+	:co#80:it#8:li#48:vt#3:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:do=^J:ho=\E[H:\
+	:is=\E<\E[1;48r\E[0q\E[3;4q\E=\E[?1h:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:nl=^J:r1=\E=\E[0q\E>:rc=\E8:\
+	:sc=\E7:se=\E[m:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:vb=\E[?5h\E[0q\E[1;2q\E[?5l\E[0q\E[4;3q:
+
+#### Morrow Designs
+# 
+# This was George Morrow's company.  They started in the late 1970s making
+# S100-bus machines.  They used to be reachable at:
+#
+#        Morrow
+#        600 McCormick St.
+#        San Leandro, CA 94577
+#
+# but they're long gone now (1995).
+#
+
+# The mt70 terminal was shipped with the Morrow MD-3 microcomputer. 
+# Jeff's specimen was dated June 1984.
+# From: Jeff Wieland <wieland@acn.purdue.edu> 24 Feb 1995
+mt70|mt-70|Morrow MD-70; native Morrow mode:\
+	:am:mi:ms:xo:\
+	:co#80:it#8:li#24:\
+	:%1=^AO\r:F1=^A`\r:F2=^Aa\r:F3=^Ab\r:F4=^Ac\r:F5=^Ad\r:\
+	:F6=^Ae\r:F7=^Af\r:F8=^Ag\r:F9=^Ah\r:FA=^Ai\r:\
+	:ac=+z\054{-x.yOi`|jGkFlEmDnHqJtLuKvNwMxI:ae=\E%:\
+	:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:\
+	:i1=\E"2\EG0\E]:ic=\EQ:im=:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
+	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
+	:k;=^AI\r:kB=^A^Z\r:kC=^An\r:kD=\177:kb=^H:kd=^AK\r:\
+	:kh=^AN\r:kl=^AL\r:kr=^AM\r:ku=^AJ\r:le=^H:mh=\EG2:mk@:\
+	:nd=^L:nw=^_:sf=^J:ta=^I:te=:ti=\E"2\EG0\E]:up=^K:us=\EG1:\
+	:vb=\EK1\EK0:ve=\E"2:vi=\E"0:\
+	:tc=adm+sgr:
+
+#### Motorola
+#
+
+# Motorola EXORterm 155	from {decvax, ihnp4}!philabs!sbcs!megad!seth via BRL
+# (Seth H Zirin)
+ex155|Motorola Exorterm 155:\
+	:am:bs:bw:\
+	:co#80:kn#5:li#24:\
+	:bt=\E[:cd=\ET:ce=\EU:cl=\EX:cm=\EE%+ %+ :do=\EB:ho=\E@:\
+	:kB=\E[:kC=\EX:kE=\EU:kS=\ET:kb=^H:kd=^J:kh=\E@:kl=^H:kr=^L:\
+	:ku=^K:nd=\ED:se=\Ec\ED:so=\Eb\ED:ta=\EZ:ue=\Eg\ED:\
+	:us=\Ef\ED:
+
+#### Omron
+#
+# This company is still around in 1995, manufacturing point-of-sale systems.
+
+omron|Omron 8025AG:\
+	:am:bs:da:db:\
+	:co#80:li#24:\
+	:al=\EL:bl=^G:cd=\ER:ce=\EK:cl=\EJ:cr=^M:dc=\EP:dl=\EM:do=^J:\
+	:ho=\EH:le=^H:nd=\EC:se=\E4:sf=\ES:so=\Ef:sr=\ET:up=\EA:\
+	:vs=\EN:
+
+#### Ramtek
+#
+# Ramtek was a vendor of high-end graphics terminals around 1979-1983; they
+# were competition for things like the Tektronics 4025.
+#
+
+# Ramtek 6221 from BRL, probably by Doug Gwyn
+# The following SET-UP modes are assumed for normal operation:
+#	UNDERLINE_CURSOR	ANSI_MODE	AUTO_XON/XOFF_ON
+#	NEWLINE_OFF		80_COLUMNS
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements; I recommend
+#	SMOOTH_SCROLL	AUTO_REPEAT_ON	3_#_SHIFTED	WRAP_AROUND_ON
+# Hardware tabs are assumed to be every 8 columns; they can be set up by the
+# "reset", "tset", or "tabs" utilities (use rt6221-w, 160 columns, for this).
+# Note that the Control-E key is useless on this brain-damaged terminal.  No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+rt6221|Ramtek 6221 80x24:\
+	:bs:ms:pt:xo:\
+	:co#80:it#8:kn#4:li#24:vt#3:\
+	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ac=:ae=^O:as=^N:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[1;1H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^K:ho=\E[1;1H:is=\E)0:\
+	:k0=\EOP:k1=\EOQ:k2=\EOR:k3=\EOS:kb=^H:kd=\E[B:ke=\E>:\
+	:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:l0=PF1:l1=PF2:l2=PF3:l3=PF4:\
+	:le=^H:ll=\E[24;1H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:\
+	:r1=\E[1w\E[>37m\E[>39m\E[1v\E[20l\E[?3l\E[?6l\E[>5h\E[>6h\E[>7h\E[>8l\E[>9h\E[>10l\E[1;24r\E[m\E[q\E(B\017\E)0\E#5\E>:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\EM:us=\E[4m:ve=\E[>5h\E[>9h:vi=\E[>5l:\
+	:vs=\E[>7h\E[>9l:
+# [TO DO: Check out: short forms of ho/cl and ll; reset (\Ec)].
+rt6221-w|Ramtek 6221 160x48:\
+	:co#160:li#48:\
+	:ll=\E[48;1H:tc=rt6221:
+
+#### RCA
+#
+
+# RCA VP3301 or VP3501
+rca|rca vp3301/vp3501:\
+	:bs:\
+	:co#40:li#24:\
+	:cl=^L:cm=\EY%+ %+ :ho=^Z:nd=^U:se=\E\ES0:so=\E\ES1:up=^K:
+
+
+#### Selanar
+#
+
+# Selanar HiREZ-100 from BRL, probably by Doug Gwyn
+# The following SET-UP modes are assumed for normal operation:
+#	SET_DEFAULT_TABS	48_LINES		80_COLUMNS
+#	ONLINE			ANSI			CURSOR_VISIBLE
+#	VT102_AUTO_WRAP_ON	VT102_NEWLINE_OFF	VT102_MONITOR_MODE_OFF
+#	LOCAL_ECHO_OFF		US_CHAR_SET		WPS_TERMINAL_DISABLED
+#	CPU_AUTO_XON/XOFF_ENABLED			PRINT_FULL_SCREEN
+# For use with graphics software, all graphics modes should be set to factory
+# default.  Other SET-UP modes may be set for operator convenience or
+# communication requirements.  No delays are specified; use "stty ixon -ixany"
+# to enable DC3/DC1 flow control!
+# I commented out the scrolling capabilities since they are too slow.
+hirez100|Selanar HiREZ-100:\
+	:bs:mi:ms:pt:xo:\
+	:co#80:it#8:kn#4:li#48:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ac=:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:\
+	:dc=\E[P:dl=\E[M:do=^J:ho=\E[H:is=\E<\E)0:k0=\EOP:k1=\EOQ:\
+	:k2=\EOR:k3=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:l0=PF1:l1=PF2:l2=PF3:l3=PF4:\
+	:le=^H:ll=\E[48H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:pf=\E[4i\E[?4i:po=\E[?5i\E[5i:ps=\E[i:\
+	:r1=\030\E2\E<\E[4i\E[?4i\E[12h\E[2;4;20l\E[?0;7h\E[?1;3;6;19l\E[r\E[m\E(B\017\E)0\E>:\
+	:rc=\E8:sc=\E7:se=\E[m:so=\E[7m:st=\EH:ta=^I:ue=\E[m:up=\EM:\
+	:us=\E[4m:
+hirez100-w|Selanar HiREZ-100 in 132-column mode:\
+	:co#132:tc=hirez100:
+
+#### Signetics
+#
+
+# From University of Wisconsin
+vsc|Signetics Vsc Video driver by RMC:\
+	:am:ms:\
+	:co#80:it#8:li#26:\
+	:ce=\E[K:cl=50\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:do=^J:\
+	:ho=\E[H:kb=^H:kd=^J:kl=^H:le=^H:me=^_\041:mr=^_ :nd=\E[C:\
+	:nw=^M^J:se=^_\041:sf=^J:so=^_ :ta=^I:ue=^_#:up=\E[A:us=^_":
+
+#### Soroc
+#
+# Alan Frisbie <frisbie@flying-disk.com> writes:
+#
+# As you may recall, the Soroc logo consisted of their name,
+# with the letter "S" superimposed over an odd design.   This
+# consisted of a circle with a slightly smaller 15 degree (approx.)
+# wedge with rounded corners inside it.   The color was sort of
+# a metallic gold/yellow.
+# 
+# If I had been more of a beer drinker it might have been obvious
+# to me, but it took a clue from their service department to make
+# me exclaim, "Of course!"   The circular object was the top of
+# a beer can (the old removable pop-top style) and "Soroc" was an
+# anagram for "Coors".
+# 
+# I can just imagine the founders of the company sitting around
+# one evening, tossing back a few and trying to decide what to
+# call their new company and what to use for a logo.
+# 
+
+# (soroc120: removed obsolete ":ma=^K^P^R^L^L :" -- esr)
+soroc120|iq120|soroc|soroc iq120:\
+	:cd=\EY:ce=\ET:cl=\E*:do=^J:kd=^J:kl=^H:kr=^L:ku=^K:tc=adm3a:
+soroc140|iq140|soroc iq140:\
+	:am:bs:mi:\
+	:co#80:li#24:\
+	:al=\Ee:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E+:cm=\E=%+ %+ :\
+	:cr=^M:dc=\Ew:dl=\Er:do=^J:ei=\E8:ho=^^:im=\E9:k0=^A0\r:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kh=^^:kr=^L:ku=^K:le=^H:\
+	:ll=^^^K:nd=^L:se=\E\177:sf=^J:so=\E\177:ue=\E^A:up=^K:\
+	:us=\E^A:
+
+#### Synertek
+#
+# Bob Manson <manson@pattyr.acs.ohio-state.edu> writes (28 Apr 1995):
+#
+# Synertek used to make ICs, various 6502-based single-board process
+# control and hobbyist computers, and assorted peripherals including a
+# series of small inexpensive terminals (I think they were one of the
+# first to have a "terminal-on-a-keyboard", where the terminal itself
+# was only slightly larger than the keyboard).
+#
+# They apparently had a KTM-1 model, which I've never seen. The KTM-2/40
+# was a 40x24 terminal that could connect to a standard TV through a
+# video modulator.  The KTM-2/80 was the 80-column version (the 2/40
+# could be upgraded to the 2/80 by adding 2 2114 SRAMs and a new ROM).
+# I have a KTM-2/80 still in working order.  The KTM-2s had fully
+# socketed parts, used 2 6507s, a 6532 as keyboard scanner, a program
+# ROM and 2 ROMs as character generators. They were incredibly simple,
+# and I've never had any problems with mine (witness the fact that mine
+# was made in 1981 and is still working great... I've blown the video
+# output transistor a couple of times, but it's a 2N2222 :-)
+#
+# The KTM-3 (which is what is listed in the terminfo file) was their
+# attempt at putting a KTM-2 in a box (and some models came with a
+# CRT). It wasn't much different from the KTM-2 hardware-wise, but the
+# control and escape sequences are very different. The KTM-3 was always
+# real broken, at least according to the folks I've talked to about it.
+# 
+# The padding in the entry is probably off--these terminals were very
+# slow (it takes like 100ms for the KTM-2 to clear the screen...) And
+# anyone with any sanity replaced the ROMs with something that provided
+# a reasonable subset of VT100 functionality, since the usual ROMs were
+# obviously very primitive... oh, you could get an upgraded ROM from
+# Synertek for some incredible amount of money, but what hacker with an
+# EPROM burner would do that? :)
+# 
+# Sorry I don't have any contact info; I believe they were located in
+# Sunnyvale, and I'm fairly sure they are still manufacturing ICs
+# (they've gone to ASICs and FPGAs), but I doubt they're in the computer
+# business these days.
+#
+
+# Tested, seems to work fine with vi.
+synertek|ktm|synertek380|synertek ktm 3/80 tubeless terminal:\
+	:am:\
+	:co#80:li#24:\
+	:cd=\EJ:ce=\EK:cl=^Z:cm=\E=%+ %+ :le=^H:nd=^L:up=^K:
+
+#### Tab Office Products
+#
+#	TAB Products Co. - Palo Alto, California
+#	Electronic Office Products,
+#	1451 California Avenue 94304
+#
+# I think they're out of business.
+#
+
+# The tab 132 uses xon/xoff, so no padding needed.
+# :ks:/:ke: have nothing to do with arrow keys.
+# :is: sets 80 col mode, normal video, autowrap on (for :am:).
+# Seems to be no way to get rid of status line.
+# The manual for this puppy was dated June 1981.  It claims to be VT52-
+# compatible but looks more vt100-like.
+tab132|tab|tab132-15|tab 132/15:\
+	:da:db:\
+	:co#80:dN@:li#24:lm#96:\
+	:al=\E[L:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
+	:im=\E[4h:is=\E[?7h\E[?3l\E[?5l:kd=\E[B:ke@:kl=\E[D:ks@:\
+	:ku=\E[A:\
+	:tc=vt100:
+tab132-w|tab132 in wide mode:\
+	:co#132:\
+	:is=\E[?7h\E[?3h\E[?5l:tc=tab132:
+tab132-rv|tab132 in reverse-video mode:\
+	:is=\E[?7h\E[?3l\E[?5h:tc=tab132:
+tab132-w-rv|tab132 in reverse-video/wide mode:\
+	:is=\E[?7h\E[?3h\E[?5h:tc=tab132-w:
+
+
+#### Teleray
+#
+#	Research Incorporated
+#	6425 Flying Cloud Drive
+#	Eden Prairie, MN 55344
+#	Vox: (612)-941-3300
+#
+# The Teleray terminals were all discontinued in 1992-93.  RI still services
+# and repairs these beasts, but no longer manufactures them.  The Teleray
+# people believe that all the types listed below are very rare now (1995).
+# There was a newer line of Telerays (Model 7, Model 20, Model 30, and
+# Model 100) that were ANSI-compatible.
+#
+# Note two things called "teleray".  Reorder should move the common one
+# to the front if you have either.  A dumb teleray with the cursor stuck
+# on the bottom and no obvious model number is probably a 3700.
+#
+
+t3700|dumb teleray 3700:\
+	:bs:\
+	:co#80:li#24:\
+	:bl=^G:cl=^L:cr=^M:do=^J:le=^H:sf=^J:
+t3800|teleray 3800 series:\
+	:bs:\
+	:co#80:it#8:li#24:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:do=^J:ho=\EH:\
+	:le=^H:ll=\EY7 :nd=\EC:sf=^J:ta=^I:up=^K:
+t1061|teleray|teleray 1061:\
+	:am:bs:km:xs:xt:\
+	:co#80:it#8:li#24:sg#1:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\014:cm=\EY%+ %+ :cr=^M:\
+	:ct=\EG:dc=\EQ:dl=\EM:do=^J:ei=:ho=\EH:ic=\EP:im=:ip=:\
+	:is=\Ee\EU01^Z1\EV\EU02^Z2\EV\EU03^Z3\EV\EU04^Z4\EV\EU05^Z5\EV\EU06^Z6\EV\EU07^Z7\EV\EU08^Z8\EV\Ef:\
+	:k1=^Z1:k2=^Z2:k3=^Z3:k4=^Z4:k5=^Z5:k6=^Z6:k7=^Z7:k8=^Z8:\
+	:le=^H:nd=\EC:se=\ER@:sf=^J:so= \ERD:st=\EF:ta=^I:ue=\ER@:\
+	:up=\EA:us=\ERH:
+t1061f|teleray 1061 with fast PROMs:\
+	:al=\EL:dl=\EM:ip@:tc=t1061:
+# "Teleray Arpa Special", officially designated as
+# "Teleray Arpa network model 10" with "Special feature 720".
+# This is the new (1981) fast microcode updating the older "arpa" proms
+# (which gave meta-key and programmable-fxn keys).  720 is much much faster,
+# converts the keypad to programmable function keys, and has other goodies.
+# Standout mode is still broken (magic cookie, etc) so is suppressed as no
+# programs handle such lossage properly.
+# Note: this is NOT the old termcap's "t1061f with fast proms."
+# From: J. Lepreau <lepreau@utah-cs> Tue Feb  1 06:39:37 1983, Univ of Utah
+# (t10: removed overridden ":so@:se@:us@:ue@:" -- esr)
+t10|teleray 10 special:\
+	:bs:km:xs:xt:\
+	:co#80:it#8:li#24:sg#2:\
+	:al=\EL:cd=\EJ:ce=\EK:cl=30\Ej:cm=\EY%+ %+ :dc=\EQ:dl=\EM:\
+	:ei=:ho=\EH:ic=\EP:im=:le=^H:nd=\EC:pc=\0:se=\ER@:sf=\Eq:\
+	:so=\ERD:sr=\Ep:ta=^I:ue=\ER@:up=\EA:us=\ERH:
+# teleray 16 - map the arrow keys for vi/rogue, shifted to up/down page, and
+# back/forth words. Put the function keys (f1-f10) where they can be
+# found, and turn off the other magic keys along the top row, except
+# for line/local. Do the magic appropriate to make the page shifts work.
+# Also toggle ^S/^Q for those of us who use Emacs.
+t16|teleray 16:\
+	:am:da:db:mi:xs:xt:\
+	:co#80:li#24:\
+	:al=\E[L:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:\
+	:cm=%i\E[%d;%df:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:\
+	:ho=\E[H:im=\E[4h:k1=^Z1:k2=^Z2:k3=^Z3:k4=^Z4:k5=^Z5:k6=^Z6:\
+	:k7=^Z7:k8=^Z8:k9=^Z9:k;=^Z0:le=^H:me=\E[m:nd=\E[C:se=\E[m:\
+	:sf=^J:so=\E[7m:sr=\E[T:ta=^I:te=\E[V\E[24;1f\E[?38h:\
+	:ti=\E[U\E[?38l:ue=\E[m:up=\E[A:us=\E[4m:
+
+#### Texas Instruments (ti)
+#
+
+# The Silent 700 was so called because it was built around a quiet thermal
+# printer.  It was portable, equipped with an acoustic coupler, and pretty
+# neat for its day.
+ti700|ti733|ti735|ti745|ti800|ti silent 700/733/735/745 or omni 800:\
+	:bs:hc:os:\
+	:co#80:\
+	:bl=^G:cr=\r:do=^J:le=^H:sf=^J:
+
+#
+# Texas Instruments 916 VDT 7 bit control mode
+#
+ti916|ti916-220-7|Texas Instruments 916 VDT 8859/1 vt220 mode 7 bit CTRL:\
+	:da:db:in:ms:\
+	:%9=^X:@4=\E[29~:@8=^J:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
+	:DO=\E[%dB:F1=\E[29~:F2=\E[31~:IC=\E[%d@:LE=\E[%dD:\
+	:RI=\E[%dC:UP=\E[%dA:ae=\017:as=\016:bt=\E[Z:cb=\E[1K:\
+	:cd=\E[J:ce=\E[0K:ch=\E[%+^AG:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:ct=\E[3g:cv=\E[%+^Ad:dc=\E[P:eA=\E(B\E)0:\
+	:ec=\E[%dX:ei=:ff=^L:im=:ip=:is=\E[1;24r\E[24;1H:k1=\E[17~:\
+	:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:k6=\E[23~:\
+	:k7=\E[24~:k8=\E[25~:k9=\E[26~:k;=\E[28~:kD=\E[P:kI=\E[@:\
+	:kN=\E[S:kP=\E[T:kh=\E[H:mp=\E&:r2=\E[\041p:st=\E[0W:\
+	:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:\
+	:tc=vt220:
+#
+# Texas Instruments 916 VDT 8 bit control mode
+#
+ti916-8|ti916-220-8|Texas Instruments 916 VDT 8859/1 8 vt220 mode bit CTRL:\
+	:%9=^X:@4=\23329~:@8=^J:F1=\23329~:F2=\23331~:k1=\23317~:\
+	:k2=\23318~:k3=\23319~:k4=\23320~:k5=\23321~:k6=\23323~:\
+	:k7=\23324~:k8=\23325~:k9=\23326~:k;=\23328~:kD=\233P:\
+	:kI=\233@:kN=\233S:kP=\233T:kd=\233B:kh=\233H:kl=\233D:\
+	:kr=\233C:ku=\233A:\
+	:tc=ti916:
+#
+# Texas Instruments 916 VDT 8859/1 7 bit control 132 column mode
+#
+ti916-132|Texas Instruments 916 VDT vt220 132 column:\
+	:co#132:tc=ti916:
+#
+# Texas Instruments 916 VDT 8859/1 8 bit control 132 column mode
+#
+ti916-8-132|Texas Instruments 916 VDT 8-bit vt220 132 column:\
+	:co#132:tc=ti916-8:
+ti924|Texas Instruments 924 VDT 8859/1 7 bit CTRL:\
+	:am:bs:xo:\
+	:co#80:it#8:li#24:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:\
+	:cm=%i\E[%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:dl=\E[M:\
+	:do=\E[B:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[16~:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[P:kI=\E[@:\
+	:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:\
+	:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:ve=\E[?25h:vi=\E[?25l:vs=\E[?31h:
+ti924-8|Texas Instruments 924 VDT 8859/1 8 bit CTRL:\
+	:am:xo:\
+	:co#80:it#8:li#24:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:\
+	:cm=%i\E[%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:dl=\E[M:\
+	:do=\E[B:ho=\E[H:k1=P\217>:k2=Q\217>:k3=R\217>:k4=S\217>:\
+	:k5=~\23316>:k6=~\23317>:k7=~\23318>:k8=~\23319>:\
+	:k9=~\23320>:kD=P\233>:kI=@\233>:kb=^H:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:\
+	:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:\
+	:vi=\E[?25l:vs=\E[?31h:
+ti924w|Texas Instruments 924 VDT 7 bit - 132 column mode:\
+	:co#132:tc=ti924:
+ti924-8w|Texas Instruments 924 VDT 8 bit - 132 column mode:\
+	:co#132:tc=ti924-8:
+ti931|Texas Instruments 931 VDT:\
+	:am:bs:xo:\
+	:co#80:li#24:\
+	:al=\EN:bl=^G:cd=\EJ:ce=\EI:cl=\EL:cm=\EY%+ %+ :cr=^M:\
+	:dc=\EQ:dl=\EO:do=\EB:ei=:ho=\EH:ic=\ER\EP\EM:im=:\
+	:is=\EGB\E(@B@@\E):k1=\Ei1:k2=\Ei2:k3=\Ei3:k4=\Ei4:\
+	:k5=\Ei5:k6=\Ei6:k7=\Ei7:k8=\Ei8:k9=\Ei9:kA=\EN:kD=\EQ:\
+	:kI=\EP:kL=\EO:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:mb=\E4P:\
+	:me=\E4@:mk=\E4H:mr=\E4B:nd=\EC:se=\E4@:sf=\Ea:so=\E4A:\
+	:sr=\Eb:ue=\E4@:up=\EA:us=\E4D:ve=\E4@:
+ti926|Texas Instruments 926 VDT 8859/1 7 bit CTRL:\
+	:cs@:sf=\E[1S:sr=\E[1T:tc=ti924:
+# (ti926-8: I corrected this from the broken SCO entry -- esr)
+ti926-8|Texas Instruments 926 VDT 8859/1 8 bit CTRL:\
+	:cs@:sf=\2331S:sr=\2331T:\
+	:tc=ti924-8:
+ti_ansi|basic entry for ti928:\
+	:am:eo:ut:xn:xo:\
+	:Co#8:co#80:it#8:li#25:pa#64:\
+	:@7=\E[F:AB=\E[4%p1%dm:AF=\E[3%p1%dm:al=\E[L:bl=^G:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:ic=\E[@:im=:k0=\E[V:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:\
+	:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:kN=\E[G:kP=\E[I:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:nd=\E[C:op=\E[37;40m:se=\E[m:\
+	:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+#
+#       928 VDT 7 bit control mode
+#
+ti928|Texas Instruments 928 VDT 8859/1 7 bit CTRL:\
+	:%9=\E[35~:@7=\E_1\E\:@8=\E[8~:F1=\E[29~:F2=\E[31~:\
+	:F3=\E[32~:F5=\E[34~:k1=\E[17~:k2=\E[18~:k3=\E[19~:\
+	:k4=\E[20~:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:\
+	:k9=\E[26~:k;=\E[28~:kD=\E[P:kI=\E[@:kN=\E[S:kP=\E[T:\
+	:tc=ti_ansi:
+#
+#       928 VDT 8 bit control mode
+#
+ti928-8|Texas Instruments 928 VDT 8859/1 8 bit CTRL:\
+	:%9=\23335~:@7=\2371\234:@8=\2338~:F1=\23329~:F2=\23331~:\
+	:F3=\23332~:F5=\23334~:k1=\23317~:k2=\23318~:k3=\23319~:\
+	:k4=\23320~:k5=\23321~:k6=\23323~:k7=\23324~:k8=\23325~:\
+	:k9=\23326~:k;=\23328~:kD=\233P:kI=\233@:kN=\233S:\
+	:kP=\233T:kh=\233H:\
+	:tc=ti_ansi:
+
+#### Zentec (zen)
+#
+
+# (zen30: removed obsolete :ma=^L ^R^L^K^P:.  This entry originally
+# had just :so:=\EG6 which I think means standout was supposed to be 
+# dim-reverse using ADM12-style attributes. ADM12 :us:/:ue: and
+# <invis> might work-- esr)
+zen30|z30|zentec 30:\
+	:am:bs:mi:ul:\
+	:co#80:li#24:\
+	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :cr=^M:\
+	:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:le=^H:mh=\EG2:nd=^L:\
+	:sf=^J:so=\EG6:ue@:up=^K:us@:\
+	:tc=adm+sgr:
+# (zen50: this had extension capabilities
+#	:BS=^U:CL=^V:CR=^B:
+# UK/DK/RK/LK/HM were someone's aliases for ku/kd/kl/kr/kh,
+# which were also in the original entry -- esr)
+# (zen50: removed obsolete ":ma=^Hh^Ll^Jj^Kk:" -- esr)
+zen50|z50|zentec zephyr:\
+	:am:bs:\
+	:co#80:li#24:sg#1:\
+	:al=\EE:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :dc=\EW:dl=\ER:ei=:\
+	:ic=\EQ:im=:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mk@:ue@:up=^K:\
+	:us@:\
+	:tc=adm+sgr:
+
+# CCI 4574 (Office Power) from Will Martin <wmartin@BRL.ARPA> via BRL
+cci|cci1|z8001|zen8001|CCI Custom Zentec 8001:\
+	:am:bs:bw:\
+	:co#80:li#24:\
+	:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cs=\ER%+ %+ :do=^J:\
+	:ho=\EH:is=\EM \EF\ET\EP\ER 7:kb=^H:kd=\EB:kh=\EH:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:mb=\EM":me=\EM :mh=\EM\041:mk=\EM(:\
+	:mr=\EM$:nd=\EC:pf=^T:po=^R:se=\EM :so=\EM$:sr=\EI:ue=\EM :\
+	:up=\EA:us=\EM0:ve=\EP:vs=\EF\EQ\EM \ER 7:
+
+######## OBSOLETE UNIX CONSOLES
+#
+
+#### Altos
+#
+# Altos made a moderately successful line of UNIX boxes.  In 1990 they were
+# bought out by Acer, a major Taiwanese manufacturer of PC-clones.
+# Acer has a web site at http://www.acer.com.
+#
+# Altos descriptions from Ted Mittelstaedt <tedm@agora.rain.com> 4 Sep 1993
+# His comments suggest they were shipped with the system.
+#
+
+# (altos2: had extension capabilities
+#	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
+#	:c4=^Ad\r:c5=^Ae\r:c6=^Af\r:c7=^Ag\r:\
+#	:c8=^Ah\r:c9=^Ai\r:cA=^Aj\r:cB=^Ak\r:\
+#	:cC=^Al\r:cD=^Am\r:cE=^An\r:cF=^Ao\r:
+#	:XU=^Aq\r:XD=^Ar\r:XR=^As\r:XL=^At\r:\
+#	:YU=^AQ\r:YD=^AR\r:YR=^AS\r:YL=^AT\r:\
+#	:HL=^AP\r:SP=\E[i:\
+#	:IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T:\
+#	:LO=\E[0q:LC=\E[5q:LL=\E[6q:\
+# Comparison with the k* capabilities makes it obvious that the c* things are
+# shift keys.  I have renamed them to keys 32 and up accordingly.  Also,
+# :sr: was given as a boolean-- esr)
+altos2|alt2|altos-2|altos II:\
+	:co#80:it#8:li#24:sg#0:\
+	:*5=^Am\r:*8=^An\r:DL=\E[M:FM=^A`\r:FN=^Aa\r:FO=^Ab\r:\
+	:FP=^Ac\r:FQ=^Ad\r:FR=^Ae\r:FS=^Af\r:FT=^Ag\r:FU=^Ah\r:\
+	:FV=^Ai\r:FW=^Aj\r:FX=^Ak\r:RA=\E[?7l:SA=\E[?7h:al=\E[L:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:dc=\E[P:do=\E[1B:ei=:ho=\E[H:ic=\E[@:\
+	:if=/usr/share/tabset/vt100:im=:\
+	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k0=^AI\r:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=^AJ\r:kB=^AK\r:kC=^AL\r:\
+	:kD=^AM\r:kE=^AN\r:kF=^AO\r:kb=^H:kd=\E[B:kh=\E[f:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:me=\E[m:nd=\E[1C:nw=^M^J:se=\E[m:\
+	:sf=^J:so=\E[7m:ta=^I:ue=\E[m:up=\E[1A:us=\E[4m:
+# (altos3: had extension capabilities
+#	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
+#	:c4=^Ad\r:c5=^Ae\r:c6=^Af\r:c7=^Ag\r:\
+#	:c8=^Ah\r:c9=^Ai\r:cA=^Aj\r:cB=^Ak\r:\
+#	:cC=^Al\r:cD=^Am\r:cE=^An\r:cF=^Ao\r:
+#	:XU=^Aq\r:XD=^Ar\r:XR=^As\r:XL=^At\r:\
+#	:HL=^AP\r:SP=\E[i:\
+#	:IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T:\
+altos3|altos5|alt3|alt5|altos-3|altos-5|altos III or V:\
+	:mb=\E[5p:me=\E[p:sr=\EM:\
+	:tc=altos2:
+altos4|alt4|altos-4|altos IV:\
+	:tc=wy50:
+# (altos7: had extension capabilities:
+#	:GG#0:GI=\EH8:GF=\EH7:\
+#	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
+#	:c4=^Ad\r:c5=^Ae\r:c6=^Af\r:c7=^Ag\r:\
+#	:c8=^Ah\r:c9=^Ai\r:cA=^Aj\r:cB=^Ak\r:\
+#	:cC=^Al\r:cD=^Am\r:cE=^An\r:cF=^Ao\r:
+# Comparison with the k* capabilities makes it obvious that the c* things are
+# shift keys.  I have renamed them to keys 32 and up accordingly.  I have
+# also made this entry relative to adm12 in order to give it an :sa:. The
+# <invis> imported by use=adm+sgr may work, let me know. -- esr)
+altos7|alt7|altos VII:\
+	:am:mi:\
+	:co#80:li#24:sg#0:\
+	:*5=^Am\r:*8=^An\r:DL=\ER:FM=^A`\r:FN=^Aa\r:FO=^Ab\r:\
+	:FP=^Ac\r:FQ=^Ad\r:FR=^Ae\r:FS=^Af\r:FT=^Ag\r:FU=^Ah\r:\
+	:FV=^Ai\r:FW=^Aj\r:FX=^Ak\r:\
+	:ac=j5k3l2m1n8q\072t4u9v=w0x6:al=\EE:cd=\EY:ce=\ET:\
+	:cl=\E+^^:cm=\E=%+ %+ :cr=^M:dc=\EW:do=^J:ei=\Er:ho=^^:\
+	:im=\Eq:is=\E`\072\Ee(\EO\Ee6\Ec41\E~4\Ec21\Eu\E~2:\
+	:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kA=^AJ\r:kB=^AK\r:\
+	:kC=^AL\r:kD=^AM\r:kE=^AN\r:kF=^AO\r:kN=\EK:kP=\EJ:kb=^H:\
+	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mb=\EG2:md=\EGt:mh=\EGp:\
+	:mk=\EG1:nd=^L:nw=^M^J:pf=\EJ:po=\Ed#:sf=^J:sr=\Ej:ta=^I:\
+	:up=^K:\
+	:tc=adm+sgr:
+altos7pc|alt7pc|altos PC VII:\
+	:@7=\ET:tc=altos7:
+
+#### Apollo consoles
+#
+# Apollo got bought by Hewlett-Packard.  The Apollo workstations are 
+# labeled HP700s now.
+#
+
+# From: Gary Darland <goodmanc@garnet.berkeley.edu>
+apollo|apollo console:\
+	:am:bs:mi:\
+	:co#88:li#53:\
+	:al=\EI:cd=\EJ:ce=\EK:ch=\EN%d:cl=^L:cm=\EM%+ %d):cv=\EO+ :\
+	:dc=\EP:dl=\EL:do=\EB:ei=\ER:im=\EQ:le=^H:nd=\EC:se=\ET:\
+	:sf=\EE:so=\ES:sr=\ED:te=\EX:ti=\EW:ue=\EV:up=\EA:us=\EU:
+
+# We don't know whether or not the apollo guys replicated DEC's firmware bug
+# in the VT132 that reversed :ei:/:im:.  To be on the safe side, disable
+# both these capabilities.
+apollo_15P|apollo 15 inch display:\
+	:ei@:im@:tc=vt132:
+apollo_19L|apollo 19 inch display:\
+	:ei@:im@:tc=vt132:
+apollo_color|apollo color display:\
+	:ei@:im@:tc=vt132:
+
+#### Convergent Technology
+#
+# Burroughs bought Convergent shortly before it merged with Univac.
+# CTOS is (I believe) dead.  Probably the aws is too (this entry dates
+# from 1991 or earlier).
+#
+
+# Convergent AWS workstation from Gould/SEL UTX/32 via BRL
+# (aws: removed unknown :dn=^K: -- esr)
+aws|Convergent Technologies AWS workstation under UTX and Xenix:\
+	:am:\
+	:co#80:li#28:sg#0:\
+	:ac=:ae=\EAAF:al=\EIL:as=\EAAN:bc=^H:cd=\EEF:ce=\EEL:\
+	:ch=\EH%.:cl=^L:cm=\EC%r%.%.:cv=\EV%.:dc=\EDC:dl=\EDL:\
+	:do=^K:ei=:ic=\EIC:im=:kb=^H:kd=^K:kl=^N:kr=^R:ku=^A:\
+	:ma=\016h\013j\001k\022l\002m:nd=^R:nl=^J:se=\EARF:\
+	:sf=\ESU:so=\EARN:sr=\ESD:ue=\EAUF:up=^A:us=\EAUN:
+awsc|Convergent Technologies AWS workstation under CTOS:\
+	:am:\
+	:co#80:li#24:sg#0:\
+	:ac=:ae=\EAAF:as=\EAAN:bc=^N:cd=\EEF:ce=\EEL:cl=^L:\
+	:cm=\EC%r%.%.:do=^K:kb=^H:kd=^K:kl=^N:kr=^R:ku=^A:\
+	:ma=\016h\013j\001k\022l\002m:nd=^R:se=\EAA:so=\EAE:\
+	:ue=\EAA:up=^A:us=\EAC:
+
+#### DEC consoles
+#
+
+# The MicroVax console.  Tim Theisen <tim@cs.wisc.edu> writes:
+# The digital uVax II's had a graphic display called a qdss.  It was
+# supposed to be a high performance graphic accelerator, but it was
+# late to market and barely appeared before faster dumb frame buffers
+# appeared.  I have only used this display while running X11.  However,
+# during bootup, it was in text mode, and probably had a terminal emulator
+# within it.  And that is what your termcap entry is for.  In graphics
+# mode the screen size is 1024x864 pixels.
+qdss|qdcons|qdss glass tty:\
+	:am:bs:\
+	:co#128:li#57:\
+	:cl=1\032:cm=\E=%.%.:do=^J:le=^H:nd=^L:up=^K:
+
+#### Fortune Systems consoles
+#
+# Fortune made a line of 68K-based UNIX boxes that were pretty nifty
+# in their day; I (esr) used one myself for a year or so around 1984.
+# They had no graphics, though, and couldn't compete against Suns and
+# the like.  R.I.P.
+#
+
+# From: Robert Nathanson <c160-3bp@Coral> via tut   Wed Oct 5, 1983
+# (This had extension capabilities
+#	:rv=\EH:re=\EI:rg=0:GG=0:\
+#	:CO=\E\\:WL=^Aa\r:WR=^Ab\r:CL=^Ac\r:CR=^Ad\r:DL=^Ae\r:RF=^Af\r:\
+#	:RC=^Ag\r:CW=^Ah\r:NU=^Aj\r:EN=^Ak\r:HM=^Al:PL=^Am\r:\
+#	:PU=^An\r:PD=^Ao\r:PR=^Ap\r:HP=^A@\r:RT=^Aq\r:TB=\r:CN=\177:MP=\E+F:
+# It had both ":bs:" and ":bs=^H:"; I removed the latter.  Also, it had
+# ":sg=0:" and ":ug=0:"; evidently the composer was trying (unnecessarily)
+# to force both magic cookie glitches off.  Once upon a time, I
+# used a Fortune myself, so I know the capabilities of the form ^A[a-z]\r are
+# function keys; thus the "Al" value for HM was certainly an error.  I renamed
+# EN/PD/PU/CO/CF/RT according to the XENIX/TC mappings, but not HM/DL/RF/RC.  
+# I think :rv: and :re: are start/end reverse video and :rg: is a nonexistent
+# "reverse-video-glitch" capability; I have put :rv: and :re: in with standard
+# names below.  I've removed obsolete ":nl=5^J:" as there is a :do: -- esr)
+fos|fortune|Fortune system:\
+	:am:bs:bw:\
+	:co#80:li#25:\
+	:@7=^Ak\r:@8=^Aq:ac=j*k(l m"q&v%w#x-:ae=^O:al=\034E:\
+	:as=\Eo:bl=^G:cd=\034Y:ce=^\Z:cl=\014:cm=\034C%+ %+ :cr=^M:\
+	:dc=\034W:dl=\034R:do=\n:ei=:ho=\036:ic=\034Q:im=:is=^_..:\
+	:k1=^Aa\r:k2=^Ab\r:k3=^Ac\r:k4=^Ad\r:k5=^Ae\r:k6=^Af\r:\
+	:k7=^Ag\r:k8=^Ah\r:kN=^Ao\r:kP=^An\r:kb=^H:kd=^Ay\r:\
+	:kh=^A?\r:kl=^Aw\r:kr=^Az\r:ku=^Ax\r:le=^H:mb=\EN:me=\EI:\
+	:mr=\EH:nw=^M^J:se=^\I`:sf=^J:so=^\H`:ta=^Z:ue=^\IP:up=\013:\
+	:us=^\HP:ve=\E\:vi=\E]:vs=\E\072:
+
+#### IBM Unix consoles
+#
+
+# The following is a version of the ibm-pc entry distributed with PC/IX,
+# (Interactive Systems' System 3 for the Big Blue), modified by Richard
+# McIntosh at UCB/CSM.  The :pt: and :uc: have been removed from the original,
+# (the former is untrue, and the latter failed under UCB/man); standout and
+# underline modes have been added.  Note: this entry describes the "native"
+# capabilities of the PC monochrome display, without ANY emulation; most
+# communications packages (but NOT PC/IX connect) do some kind of emulation.
+pcix|PC/IX console:\
+	:am:bw:eo:\
+	:co#80:li#24:\
+	:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:ho=\E[H:\
+	:le=^H:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+
+# (ibmpcx: this entry used to be known as ibmx.
+# It formerly included the following extension capabilities:
+#	:GC=b:GL=v:GR=t:RT=^J:\
+#	:GH=\E[196g:GV=\E[179g:\
+#	:GU=\E[193g:GD=\E[194g:\
+#	:G1=\E[191g:G2=\E[218g:G3=\E[192g:G4=\E[217g:\
+#	:CW=\E[E:NU=\E[F:RF=\E[G:RC=\E[H:\
+#	:WL=\E[K:WR=\E[L:CL=\E[M:CR=\E[N:\
+# I renamed GS/GE/WL/WR/CL/CR/PU/PD/HM/EN; also, removed a duplicate
+# ":kh=\E[Y:".  Added IBM-PC forms characters and highlights, they match
+# what was there before. -- esr)
+ibmpcx|xenix|ibmx|IBM PC xenix console display:\
+	:am:bs:ms:\
+	:co#80:li#25:\
+	:@7=\E[d:al=\E[L:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%d;%dH:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k1=\E[K:\
+	:k2=\E[L:k3=\E[M:k4=\E[N:kN=\E[e:kP=\E[Z:kb=^H:kd=\E[B:\
+	:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:up=\E[A:\
+	:tc=klone+acs:tc=klone+sgr:
+
+
+#### Masscomp consoles
+#
+# Masscomp has gone out of business.  Their product line was purchased by
+# comany in Georgia (US) called "XS International", parts and service may
+# still be available through them.
+#
+
+# (masscomp: ":MT:" changed to ":km:";  -- esr)
+masscomp|masscomp workstation console:\
+	:bs:km:mi:\
+	:co#80:it#8:li#24:\
+	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=\E[4l:im=\E[4h:is=\EGc\EGb\EGw:kb=^H:\
+	:kd=\EOB:kl=\EOD:kr=\EOC:ku=\EOA:le=^H:nd=\E[C:se=\E[m:\
+	:so=\E[7m:ta=^I:ue=\EGau:up=\E[A:us=\EGu:
+masscomp1|masscomp large screen version 1:\
+	:co#104:li#36:tc=masscomp:
+masscomp2|masscomp large screen version 2:\
+	:co#64:li#21:tc=masscomp:
+
+#### Sony NEWS workstations
+#
+
+# (news-unk: this had :KB=news: -- esr)
+news-unk|SONY NEWS vt100 emulator old common entry:\
+	:am:bs:pt:xn:\
+	:co#80:\
+	:AL=\E[%dL:DL=\E[%dM:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:dl=\E[M:do=^J:ho=\E[H:if=/usr/lib/tabset/vt100:\
+	:is=\E[?7h\E[?1l\E[?3l\E7\E8:k0=\EOY:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:k9=\EOX:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:nl=^J:rc=\E8:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[r:\
+	:sc=\E7:se=\E[m:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
+#
+# (news-29: this had :TY=ascii: --esr)
+news-29:\
+	:li#29:tc=news-unk:
+# (news-29-euc: this had :TY=euc: --esr)
+news-29-euc:\
+	:tc=news-29:
+# (news-29-sjis: this had :TY=sjis: --esr)
+news-29-sjis:\
+	:tc=news-29:
+#
+# (news-33: this had :TY=ascii: --esr)
+news-33:\
+	:li#33:tc=news-unk:
+# (news-33-euc: this had :TY=euc: --esr)
+news-33-euc:\
+	:tc=news-33:
+# (news-33-sjis: this had :TY=sjis: --esr)
+news-33-sjis:\
+	:tc=news-33:
+#
+# (news-42: this had :TY=ascii: --esr)
+news-42:\
+	:li#42:tc=news-unk:
+# (news-42-euc: this had :TY=euc: --esr)
+news-42-euc:\
+	:tc=news-42:
+# (news-42-sjis: this had :TY=sjis: --esr)
+news-42-sjis:\
+	:tc=news-42:
+#
+#	NEWS-OS old termcap entry 
+#
+# (news-old-unk: this had :KB=news:TY=sjis: --esr)
+news-old-unk|SONY NEWS vt100 emulator common entry:\
+	:am:bs:pt:xn:\
+	:co#80:vt#3:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:do=^J:ho=\E[H:if=/usr/lib/tabset/vt100:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:\
+	:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nl=^J:rc=\E8:\
+	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:sc=\E7:se=\E[m:\
+	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+#
+# (nwp512: this had :DE=^H:, which I think means :bs: --esr)
+nwp512|news|nwp514|news40|vt100-bm|old sony vt100 emulator 40 lines:\
+	:bs:\
+	:li#40:\
+	:is=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40r\E8:tc=news-old-unk:
+#
+# (nwp512-a: this had :TY=ascii: and the alias vt100-bm --esr)
+nwp512-a|nwp514-a|news-a|news42|news40-a|sony vt100 emulator 42 line:\
+	:li#42:\
+	:is=\E[?7h\E[?1l\E[?3l\E7\E[1;42r\E8:tc=news-old-unk:
+#
+# (nwp-512-o: this had :KB=nwp410:DE=^H:  I interpret the latter as :bs:. --esr)
+nwp512-o|nwp514-o|news-o|news40-o|vt100-bm-o|sony vt100 emulator 40 lines:\
+	:bs:\
+	:li#40:\
+	:is=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40r\E8:tc=news-old-unk:
+#
+# (nwp513: this had :DE=^H: and the alias vt100-bm --esr)
+nwp513|nwp518|nwe501|newscbm|news31|sony vt100 emulator 33 lines:\
+	:bs:\
+	:li#31:\
+	:is=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31r\E8:tc=news-old-unk:
+#
+# (nwp513-a: this had :TY=ascii: and :DE=^H:, which I interpret as :bs:; --esr)
+# also the alias vt100-bm.
+nwp513-a|nwp518-a|nwe501-a|nwp251-a|newscbm-a|news31-a|newscbm33|news33|old sony vt100 emulator 33 lines:\
+	:bs:\
+	:li#33:\
+	:is=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;33r\E8:tc=news-old-unk:
+#
+# (nwp513-o: had :DE=^H:, I think that's :bs:; also the alias vt100-bm --esr)
+nwp513-o|nwp518-o|nwe501-o|nwp251-o|newscbm-o|news31-o|old sony vt100 emulator 33 lines:\
+	:bs:\
+	:li#31:\
+	:is=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31r\E8:tc=news-old-unk:
+#
+# (news28: this had :DE=^H:, I think that's :bs:, and :KB=nws1200: --esr)
+news28|sony vt100 emulator 28 lines:\
+	:bs:\
+	:li#28:\
+	:is=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;28r\E8:tc=news-old-unk:
+#
+# (news29: this had :TY=ascii:KB=nws1200:\ --esr)
+news29|news28-a|sony vt100 emulator 29 lines:\
+	:li#29:\
+	:is=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;29r\E8:tc=news-old-unk:
+#
+# (news511: this had :TY=sjis: --esr)
+nwp511|nwp-511|nwp-511 vt100:\
+	:am:bs:pt:xn:\
+	:co#80:li#24:\
+	:al=\E[L:cd=30\E[J:ce=3\E[K:cl=20\E[;H\E[2J:\
+	:cm=\E[%i%d;%dH:dl=\E[M:is=\E[?5l\E[?1l\E>\E[?7h\E[?8h:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\E#W:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:nd=\E[C:\
+	:rs=\E7\E[r\E8\E[?5l\E[?1l\E>\E[?7h\E[?8h:se=2\E[m:\
+	:so=2\E[7m:sr=5\EM:ue=2\E[m:up=2\E[A:us=2\E[4m:\
+	:vb=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l:
+# (news517: this had :TY=sjis:. --esr)
+nwp517|nwp-517|nwp-517 vt200 80 cols 30 rows:\
+	:es:hs:\
+	:co#80:li#30:\
+	:ds=\E[1$~:fs=\E[0$}:i2=\E[2$~\n:\
+	:is=\E7\E[r\E8\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:ts=\E[1$}\E[;%df:\
+	:tc=vt200:
+# (news517-w: this had :TY=sjis:. --esr)
+nwp517-w|nwp-517-w|nwp-517 vt200 132 cols 50 rows:\
+	:es:hs:\
+	:co#132:li#50:\
+	:ds=\E[1$~:fs=\E[0$}:i2=\E[2$~\n:\
+	:is=\E7\E[r\E8\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:rs=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:ts=\E[1$}\E[;%df:tc=vt200:
+
+#### Obsolete virtual-terminal types.
+#
+
+# Columbus UNIX virtual terminal. This terminal also appears in 
+# UNIX 4.0 and successors as line discipline 1 (?), but is 
+# undocumented and does not really work quite right.
+cbunix|cb unix virtual terminal:\
+	:am:bs:da:db:\
+	:co#80:li#24:lm#0:\
+	:al=\EP:bl=^G:cd=\EL:ce=\EK:cl=\EL:cm=\EG%r%.%.:cr=^M:\
+	:dc=\EM:dl=\EN:do=^J:ei=:ic=\EO:im=:kd=\EB:kh=\EE:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\Eb^D:sf=^J:so=\Ea^D:\
+	:ue=\Eb^A:up=\EA:us=\Ea^A:
+# (vremote: removed obsolete ":nl@:" -- esr)
+vremote|virtual remote terminal:\
+	:am@:\
+	:co#79:tc=cbunix:
+
+pty|4bsd pseudo teletype:\
+	:cm=\EG%+ %+ :se=\Eb$:so=\Ea$:ue=\Eb\041:us=\Ea\041:tc=cbunix:
+
+######## OTHER OBSOLETE TYPES
+#
+# These terminals are *long* dead -- these entries are retained for
+# historical interest only.
+#
+
+#### Obsolete non-ANSI software emulations
+#
+
+#### Avatar
+#
+# These entries attempt to describe Avatar, a terminal emulation used with
+# MS-DOS bulletin-board systems.  It was designed to give ANSI-like
+# capabilities, but with cheaper (shorter) control sequences.  Messy design,
+# excessively dependent on PC idiosyncracies, but apparently rather popular
+# in the BBS world.
+#
+# No color support.  Avatar doesn't fit either of the Tektronix or HP color
+# models that terminfo knows about.  An Avatar color attribute is the
+# low 7 bits of the IBM-PC display-memory attribute.  Bletch.
+#
+# I wrote these entries while looking at the Avatar spec.  I don't have
+# the facilities to test them.  Let me know if they work, or don't.
+#
+# Avatar escapes not used by these entries (because maybe you're smarter
+# and more motivated than I am and can figure out how to wrap terminfo
+# around some of them, and because they are weird enough to be funny):
+#				level 0:
+# ^L		-- clear window/reset current attribute to default
+# ^V^A%p1%c	-- set current color attribute, parameter decodes as follows:
+# 
+#      bit:         6   5   4   3   2   1   0
+#                   |       |   |   |       |
+#                   +---+---+   |   +---+---+
+#                       |       |       |
+#                       |       |  foreground color
+#                       |  foreground intensity
+#                  background color
+#				level 0+:
+# ^V^J%p1%c%p2%c%p3%c%p4%c%p5%c	-- scroll (p2,p3) to (p4,p5) up by p1 lines
+# ^V^K%p1%c%p2%c%p3%c%p4%c%p5%c	-- scroll (p2,p3) to (p4,p5) down by p1 lines
+# ^V^L%p1%c%p2%c%p3%c		-- clear p2 lines and p3 cols w/attr %p1 
+# ^V^M%p1%c%p2%c%p3%c%p4%c	-- fill p3 lines & p4 cols w/char p2+attr %p1 
+# (^V^L and ^V^M set the current attribute as a side-effect.)
+# ^V ^Y <a> [...] <c>	-- repeat pattern. <a> specifies the number of bytes
+#			   in the pattern, <c> the number of times the pattern
+#		  	   should be repeated. If either value is 0, no-op.
+#			   The pattern can contain Avatar console codes,
+#			   including other ^V ^Y patterns.
+#				level 1:
+# ^V^O		-- clockwise mode on; turn print direction right each time you
+#		   hit a window edge (yes, really).  Turned off by CR
+# ^V^P		-- no-op
+# ^V^Q%c	-- query the driver
+# ^V^R		-- driver reset
+# ^V^S		-- Sound tone (PC-specific)
+# ^V^T			-- change highlight at current cursor poition to %c
+# ^V^U%p1%c%p2%c	-- highlight window <a> with attribute <b>
+# ^V^V%p1%c%p2%c%p3%c%p4%c%p5%c
+#			-- define window 
+#
+# From: Eric S. Raymond <esr@snark.thyrsus.com> 1 Nov 1995
+# (The :mb:/:md:/:mr:/:as:/:us:/:so: capabilities exist only to
+# tell ncurses that the corresponding highlights exist; it should use :sa:,
+# which is the only method that will actually work for multiple highlights.)
+avatar0|avatar terminal emulator level 0:\
+	:am:ms:ut:\
+	:co#80:it#8:li#25:\
+	:as=:ce=^V^G:cm=\026\010%.%.:cr=^M:do=^V^D:le=^V^E:\
+	:mb=^A^V\177:md=^V^A^P:me=^V^A^G:mk=^V^A\0:mr=^A^Vp:\
+	:nd=^V^F:r2=^L:rp=\031%.%d:\
+	:..sa=\026\001%{0}%?%p1%t%{112}%|%;%?%p2%t%{1}%|%;%?%p3%t%{112}%|%;%?%p4%t{128}%|%;%?%p6%t%{16}%|%;:\
+	:sf=^J:so=^A^Vp:up=^V^C:us=^V^A:\
+	:tc=klone+acs:
+# From: Eric S. Raymond <esr@snark.thyrsus.com> 1 Nov 1995
+avatar0+|avatar terminal emulator level 0+:\
+	:dc=^V^N:ei=\026\n\0\0\0\0:im=^V^I:tc=avatar0:
+# From: Eric S. Raymond <esr@snark.thyrsus.com> 1 Nov 1995
+avatar|avatar1|avatar terminal emulator level 1:\
+	:RA=^V":SA=^V$:al=^V+:dl=^V-:ei=^V^P:ve=^V'^A:vi=^V'^B:\
+	:vs=^V^C:\
+	:tc=avatar0+:
+
+#### RBcomm
+#
+# RBComm is a lean and mean terminal emulator written by the Interrupt List
+# maintainer, Ralf Brown. It was fairly popular in the late DOS years (early
+# '90s), especially in the BBS world, and still has some loyal users due to
+# its very small memory footprint and to a cute macro language.
+rbcomm|IBM PC with RBcomm and EMACS keybindings:\
+	:am:bw:mi:ms:xn:\
+	:co#80:it#8:li#25:\
+	:AL=\E[%dL:DL=\E[%dM:al=^K:bl=^G:bt=\E[Z:cd=^F5:ce=^P^P:\
+	:cl=^L:cm=\037%r%+ %+ :cr=^M:cs=\E[%i%d;%dr:dc=^W:dl=^Z:\
+	:dm=:do=^C:ec=\E[%dX:ed=:ei=^]:im=^\:\
+	:is=\017\035\E(B\E)0\E[?7h\E[?3l\E[>8g:kb=^H:kd=^N:\
+	:ke=\E>:kh=^A:kl=^B:kr=^F:ks=\E=:ku=^P:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mk=\E[8m:mr=^R:nd=^B:nw=^M\ED:\
+	:r1=\017\E(B\E)0\025\E[?3l\E[>8g:rc=\E8:rp=\030%.%.:\
+	:sc=\E7:se=^U:sf=\ED:so=^R:sr=\EM:ta=^I:te=:ti=:ue=^U:up=^^:\
+	:us=^T:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
+rbcomm-nam|IBM PC with RBcomm without autowrap:\
+	:am@:\
+	:bl=^G:cr=^M:do=^J:\
+	:is=\017\035\E(B\E)0\E[?7l\E[?3l\E[>8g:kb=^H:kd=^J:\
+	:kl=^H:nw=^M^J:sf=^J:ta=^I:\
+	:tc=rbcomm:
+rbcomm-w|IBM PC with RBcomm in 132 column mode:\
+	:co#132:\
+	:bl=^G:cr=^M:do=^J:\
+	:is=\017\035\E(B\E)0\E[?7h\E[?3h\E[>8g:kb=^H:kd=^J:\
+	:kl=^H:nw=^M^J:sf=^J:ta=^I:\
+	:tc=rbcomm:
+
+# CTRM terminal emulator
+# 1. underlining is not allowed with colors: first, is is simulated by 
+# black on white, second, it disables background color manipulations.
+# 2. BLINKING, REVERSE and BOLD are allowed with colors,
+# so we have to save their status in the static registers A, B and H
+# respectively, to be able to restore them when color changes
+# (because any color change turns off ALL attributes)
+# 3. :md: and :mr: sequences alternate modes,
+# rather then simply  entering them.  Thus we have to check the
+# static register B and H to determine the status, before sending the 
+# escape sequence.
+# 4. :me: now must set the status of all 3 register (A,B,H) to zero
+# and then reset colors
+# 5. implementation of the protect mode would badly penalize the performance.
+# we would have to use \E&bn sequence to turn off colors (as well as all
+# other attributes), and keep the status of protect mode in yet another
+# static variable.  If someone really needs this mode, they would have to
+# create another terminfo entry.
+# 6. original color-pair is white on black.
+# store the information about colors into static registers
+# 7. set foreground color.  it performs the following steps.
+#   1) turn off all attributes
+#   2) turn on the background and video attributes that have been turned
+#      on before (this information is stored in static registers X,Y,Z,A,B,H,D).
+#   3) turn on foreground attributes
+#   4) store information about foreground into U,V,W static registers
+# 8. turn on background: similar to turn on foreground above
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+ctrm|C terminal emulator:\
+	:am:ut:xo:\
+	:Co#8:NC#2:Nl#0:co#80:lh#0:li#24:lm#0:lw#0:pa#63:pb#19200:vt#6:\
+	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:\
+	:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:dl=\EM:\
+	:do=^J:ei=\ER:im=\EQ:ip=:is=\E&jA\r:k1=\Ep\r:k2=\Eq\r:\
+	:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:\
+	:kb=^H:kd=\Ew\r:ke=\E&jA:kh=\Ep\r:kl=\Eu\r:kr=\Ev\r:\
+	:ks=\E&jB:ku=\Et\r:le=^H:mb=\E&dA%{1}%PA:\
+	:md=%?%gH%{0}%=%t\E&dH%{1}%PH%;:\
+	:me=\E&d@%{0}%PA%{0}%PB%{0}%PH:\
+	:mr=%?%gB%{0}%=%t\E&dB%{1}%PB%;:nd=\EC:\
+	:op=\E&bn\E&bB\E&bG\E&bR%{0}%PX%{0}%PY%{0}%PZ%{1}%PW%{1}%PV%{1}%PU:\
+	:sf=^J:so=\E&dD:st=\E1:ta=\011:up=\EA:us=\E&dD:
+
+# gs6300 - can't use blue foreground, it clashes with underline;
+# it's simulated with cyan
+# Bug: The <op> capability probably resets attributes.
+# (gs6300: commented out <rmln> (no <smln>) --esr)
+gs6300|emots|AT&T PC6300 with EMOTS terminal emulator:\
+	:am:ms:ut:xo:\
+	:Co#8:co#80:it#8:li#24:pa#63:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:Sb=\E[?;%dm:\
+	:..Sf=\E[?%?%p1%{0}%=%t0%e%p1%{1}%=%t2%e%p1%{1}%-%d%;m:\
+	:UP=\E[%dA:\
+	:ac=++\054\054--..``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=\E[10m:al=\E[L:as=\E[11m:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:\
+	:ei=:ho=\E[H:ic=\E[@:im=:is=\E[m:k1=\E[0s:k2=\E[24s:\
+	:k3=\E[1s:k4=\E[23s:k5=\E[2s:k6=\E[22s:k7=\E[3s:k8=\E[21s:\
+	:kB=^R^I:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\E[10m:mr=\E[7m:nd=\E[C:\
+	:op=\E[?;m:pf=\E[4i:po=\E[5i:r1=\Ec:sf=^J:so=\E[1m:sr=\E[L:\
+	:ta=^I:up=\E[A:us=\E[4m:
+
+# From: <earle@smeagol.UUCP> 29 Oct 85 05:40:18 GMT
+# MS-Kermit with Heath-19 emulation mode enabled
+# (h19k: changed ":pt@:" to ":it@"
+h19k|h19kermit|heathkit emulation provided by Kermit (no auto margin):\
+	:am@:da:db:xt:\
+	:it@:\
+	:ta@:tc=h19-u:
+
+# Apple Macintosh with Versaterm, a terminal emulator distributed by Synergy
+# Software (formerly Peripherals Computers & Supplies, Inc) of
+# 2457 Perkiomen Ave., Reading, PA 19606, 1-800-876-8376.  They can
+# also be reached at support@synergy.com.
+versaterm|versaterm vt100 emulator for the macintosh:\
+	:am:xn:\
+	:co#80:it#8:li#24:\
+	:al=9\E[1L:bl=^G:cd=50\E[J:ce=3\E[K:cl=50\E[;H\E[2J:\
+	:cm=5\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=7\E[1P:\
+	:dl=9\E[1M:do=^J:ei=:ho=\E[H:ic=7\E[1@:im=:\
+	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kb=^H:kd=\EOB:ke=\E>\E[?1l:kl=\EOD:kr=\EOC:ks=\E=\E[?1h:\
+	:ku=\EOA:le=^H:mb=2\E[5m:md=2\E[1m:me=2\E[m:mr=2\E[7m:\
+	:nd=2\E[C:nw=^M^J:r1=\E>:rc=\E8:\
+	:rf=/usr/share/tabset/vt100:sc=\E7:se=2\E[m:so=2\E[7m:\
+	:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:us=2\E[4m:
+
+# From: Rick Thomas <ihnp4!btlunix!rbt>
+# (xtalk: I added <rmam>/<smam> based on the init string.
+xtalk|IBM PC with xtalk communication program (versions up to 3.4):\
+	:am:mi:ms:xo:\
+	:co#80:it#8:li#24:sg#1:vt#3:\
+	:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
+	:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
+	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
+	:ae=^O:al=\E[L:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dl=\E[M:do=^J:\
+	:eA=\E(B\E)0:ho=\E[H:k0=\EOy:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:k9=\EOw:k;=\EOx:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:me=\E[m:nd=\E[C:\
+	:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:se=\E[m :sf=^J:\
+	:so=\E[7m :sr=\EM:st=\EH:ta=^I:up=\E[A:
+
+# The official PC terminal emulator program of the AT&T Product Centers.
+# Note - insert mode commented out - doesn't seem to work on AT&T PC.
+simterm|attpc running simterm:\
+	:am:\
+	:co#80:li#24:\
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\E=%+ %+ :cr=^M:\
+	:dc=\ER:dl=\EM:do=\EB:ho=\EH:le=^H:me=\E&d@:nd=\EC:se=\E&d@:\
+	:sf=^J:so=\E&dB:te=\EVE:ti=\EVS:up=\EA:
+
+#### Miscellaneous obsolete terminals, manufacturers unknown
+#
+# If you have any information about these (like, a manufacturer's name, 
+# and a date on the serial-number plate) please send it!
+
+cad68-3|cgc3|cad68 basic monitor transparent mode size 3 chars:\
+	:am:bs:\
+	:co#73:li#36:\
+	:cl=^Z:ho=^^:le=^H:nd=^L:up=^K:
+cad68-2|cgc2|cad68 basic monitor transparent mode size 2 chars:\
+	:am:bs:\
+	:co#85:li#39:\
+	:cl=^Z:ho=^^:k1=\E5:k2=\E6:k3=\E7:k4=\E8:kd=\E2:kl=\E3:\
+	:kr=\E4:ku=\E1:le=^H:nd=^L:se=\Em^C:so=\Em^L:up=^K:
+cops10|cops|cops-10|cops 10:\
+	:am:bw:\
+	:co#80:li#24:\
+	:bl=^G:cd=^W:ce=^V:cl=30\030:cm=\020%+ %+ :cr=^M:do=^J:\
+	:kb=^H:kd=^J:kh=^Y:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:sf=^J:up=^K:
+# (d132: removed duplicate :ic=\E5:,
+# merged in capabilities from a BRL entry -- esr)
+d132|datagraphix|datagraphix 132a:\
+	:da:db:in:\
+	:co#80:li#30:\
+	:al=\E3:bl=^G:cl=^L:cm=\E8%i%3%3:cr=^M:dc=\E6:do=^J:ei=:\
+	:ho=\ET:ic=\E5:im=:kb=^H:kd=^J:kl=^H:le=^H:nd=\EL:nw=^M^J:\
+	:sf=^J:sr=\Ew:ta=^I:up=\EK:ve=\Em\En:vs=\Ex:
+# The d800 was an early portable terminal from c.1984-85 that looked a lot
+# like the original Compaq `lunchbox' portable (but no handle).  It had a vt220
+# mode (which is what this entry looks like) and several other lesser-known
+# emulations.
+d800|Direct 800/A:\
+	:am:bs:da:db:ms:xs:\
+	:co#80:it#8:li#24:\
+	:ac=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~:\
+	:ae=\E[m:as=\E[1m:bl=^G:cd=\E[J:ce=\E[K:cl=\E[1;1H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:do=^J:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=\ED:\
+	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[>12h:\
+	:vs=\E[>12l:
+digilog|digilog 333:\
+	:bs:\
+	:co#80:li#16:\
+	:bl=^G:ce=^X:cr=^M:do=^J:ho=^N:le=^H:nd=^I:sf=^J:up=^O:
+# The DWK was a terminal manufactured in the Soviet Union c.1986
+dwk|dwk-vt|dwk terminal:\
+	:am:\
+	:co#80:it#8:li#24:\
+	:ac=+\136\054Q-S.M0\177`+a\072f'g#h#i#jXkClJmFnNo~qUs_tEuPv\wKxW~_:\
+	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
+	:cr=^M:dc=\EP:do=^J:ei=:ho=\EH:ic=\EQ:im=:k1=\Ef1:k2=\Ef2:\
+	:k3=\Ef3:k4=\Ef4:k5=\Ef5:k6=\Ef6:k7=\Ef7:k8=\Ef8:k9=\Ef9:\
+	:k;=\Ef0:kD=\Ee:kI=\Ed:kN=\Eh:kP=\Eg:kb=\177:kd=\EB:kl=\ED:\
+	:kr=\EC:ku=\EA:le=^H:me=\EX:mr=\ET:nd=\EC:nw=^M^J:se=\EX:\
+	:sf=^J:so=\ET:sr=\ES:ta=^I:up=\EA:
+env230|envision230|envision 230 graphics terminal:\
+	:xn@:\
+	:pf=\E[4i:po=\E[5i:ps=\E[0i:\
+	:..sa=\E[%?%p1%t;1%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:tc=vt100:
+# These execuports were impact-printer ttys with a 30- or maybe 15-cps acoustic
+# coupler attached, the whole rig fitting in a suitcase and more or less
+# portable.  Hot stuff for c.1977 :-) -- esr
+ep48|ep4080|execuport 4080:\
+	:am:bs:os:\
+	:co#80:\
+	:bl=^G:cr=^M:do=^J:hd=^\:hu=^^:le=^H:sf=^J:
+ep40|ep4000|execuport 4000:\
+	:co#136:tc=ep4080:
+# Adam Thompson <athompso@pangea.ca> tells us:
+# Informer series - these are all portable units, resembling older
+# automatic bread-baking machines.  The terminal looks like a `clamshell'
+# design, but isn't.  The structure is similar to the Direct terminals,
+# but only half the width.  The entire unit is only about 10" wide.
+# It features an 8" screen (6" or 7" if you have color!), and an 9"x6"
+# keyboard.  All the keys are crammed together, much like some laptop
+# PCs today, but perhaps less well organized...all these units have a
+# bewildering array of plugs on the back, including a built-in modem.
+# The 305 was a color version of the 304; the 306 and 307 were mono and
+# color terminals built for IBM bisync protocols.
+# From: Paul Leondis <unllab@amber.berkeley.edu>
+ifmr|Informer D304:\
+	:am:bs:\
+	:co#80:li#24:\
+	:cd=\E/:ce=\EQ:cl=\EZ:cm=\EY%r%+ %+ :dc=\E\:do=^J:ei=:\
+	:ho=\EH:ic=\E[:im=:le=^H:me=\EK:nd=\EC:se=\EK:so=\EJ:sr=\En:\
+	:up=\EA:
+# Entry largely based on wy60 and has the features of wy60ak.
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# (sgr removed to fit entry within 1023 bytes)
+# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
+opus3n1+|Esprit Opus3n1+ in wy60 mode with ANSI arrow keys:\
+	:am:bw:hs:km:mi:ms:ul:xo:\
+	:co#80:li#24:ws#80:\
+	:ae=\EH^C:al=\EE:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E*:\
+	:cm=\Ea%i%dR%dC:cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\Ez(\r:\
+	:ei=\Er:fs=^M:ho=\036:if=/usr/share/tabset/std:im=\Eq:ip=:\
+	:is=\E`\072\Ee(\EO\Ee6\Ec41\E~4\Ec21\Ed/\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177\Ezz`\E[F\177\EA1*\EZH12:\
+	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
+	:kb=^H:kd=\E[B:kh=^^:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\EG2:\
+	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=^J:sr=\Ej:\
+	:st=\E1:ta=\011:te=:\
+	:ti=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177:\
+	:ts=\Ez(:uc=\EG8%p1%c\EG0:up=^K:ve=\E`1:vi=\E`0:\
+	:tc=adm+sgr:
+teletec|Teletec Datascreen:\
+	:am:bs:\
+	:co#80:li#24:\
+	:bl=^G:cl=^L:cr=^M:do=^J:ho=^^:le=^H:nd=^_:sf=^J:up=^K:
+# From: Mark Dornfeld <romwa@ucbvax.berkeley.edu>
+# This description is for the LANPAR Technologies VISION 3220
+# terminal from 1984/85.  The function key definitions k0-k5 represent the
+# edit keypad: FIND, INSERT HERE, REMOVE, SELECT, PREV SCREEN,
+# NEXT SCREEN. The key definitions k6-k9 represent the PF1 to PF4 keys.
+#
+# Kenneth Randell <kenr@datametrics.com> writes on 31 Dec 1998:
+# I had a couple of scopes (3221) like this once where I used to work, around
+# the 1987 time frame if memory serves me correctly.  These scopes were made  
+# by an outfit called LANPAR Technologies, and were meant to me DEC VT 220
+# compatible.  The 3220 was a plain text terminal like the VT-220, the 3221
+# was a like the VT-240 (monochrome with Regis + Sixel graphics), and the 3222
+# was like the VT-241 (color with Regis + Sixel Graphics).  These terminals
+# (3221) cost about $1500 each, and one was always broken -- had to be sent
+# back to the shop for repairs.
+# The only real advantage these scopes had over the VT-240's were:
+# 1) They were faster in the Regis display, or at least the ones I did
+# 2) They had a handy debugging feature where you could split-screen the
+# scope, the graphics would appear on the top, and the REGIS commands would
+# appear on the bottom.  I don't remember the VT-240s being able to do that.
+# I would swear that LANPAR Technologies was in MA someplace, but since I
+# don't work at the same place anymore, and those terminals and manuals were
+# long since junked, I cannot be any more sure than that.
+#
+# (v3220: removed obsolete ":kn#10:",
+# I added <rmam>/<smam> based on the init string -- esr)
+v3220|LANPAR Vision II model 3220/3221/3222:\
+	:am:bs:mi:xn:\
+	:co#80:it#8:li#24:\
+	:RA=\E[?7l:SA=\E[?7h:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:\
+	:is=\E>\E[?3l\E[?7h\E[?8h\E[p:k0=\E[1~:k1=\E[2~:\
+	:k2=\E[3~:k3=\E[4~:k4=\E[5~:k5=\E[6~:k6=\E[OP:k7=\E[OQ:\
+	:k8=\E[OR:k9=\E[OS:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\E=:ku=\E[A:le=^H:me=\E[m:nd=\E[C:se=\E[m:so=\E[7m:\
+	:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+######## ICH/ICH1 VERSUS RMIR/SMIR
+#
+# Some non-curses applications get confused if both ich/ich1 and rmir/smir
+# are present; the symptom is doubled characters in an update using insert.
+# These applications are technically correct; in both 4.3BSD termcap and
+# terminfo, you're not actually supposed to specify both ich/ich1 and rmir/smir
+# unless the terminal needs both.  To my knowledge, no terminal still in this
+# file requires both other than the very obsolete dm2500.
+#
+# For ncurses-based applications this is not a problem, as ncurses uses
+# one or the other as appropriate but never mixes the two.  Therefore we
+# have not corrected entries like `linux' and `xterm' that specify both.
+# If you see doubled characters from these, use the linux-nic and xterm-nic
+# entries that suppress ich/ich1.  And upgrade to ncurses!
+#
+
+######## VT100/ANSI/ISO 6429/ECMA-48/PC-TERM TERMINAL STANDARDS
+#
+# ANSI X3.64 has been withdrawn and replaced by ECMA-48.  The ISO 6429 and
+# ECMA-48 standards are said to be almost identical, but are not the same
+# as X3.64 (though for practical purposes they are close supersets of it).
+#
+# You can obtain ECMA-48 for free by sending email to helpdesk@ecma.ch
+# requesting the standard(s) you want (i.e. ECMA-48, "Control Functions for
+# Coded Character Sets"), include your snail-mail address, and you should
+# receive the document in due course.  Don't expect an email acknowledgement.
+#
+# Related standards include "X3.4-1977: American National Standard Code for
+# Information Interchange" (the ASCII standard) and "X3.41.1974: 
+# Code-Extension Techniques for Use with the 7-Bit Coded Character Set of
+# American National Standard for Information Interchange."  I believe (but
+# am not certain) that these are effectively identical to ECMA-6 and ECMA-35
+# respectively. 
+#
+
+#### VT100/ANSI/ECMA-48
+#
+# ANSI Standard (X3.64) Control Sequences for Video Terminals and Peripherals
+# and ECMA-48 Control Functions for Coded Character Sets.
+# 
+# Much of the content of this comment is adapted from a table prepared by
+# Richard Shuford, based on a 1984 Byte article.  Terminfo correspondences,
+# discussion of some terminfo-related issues, and updates to capture ECMA-48
+# have been added.  Control functions described in ECMA-48 only are tagged
+# with * after their names.
+#
+# The table is a complete list of the defined ANSI X3.64/ECMA-48 control
+# sequences.  In the main table, \E stands for an escape (\033) character,
+# SPC for space.  Pn stands for a single numeric parameter to be inserted
+# in decimal ASCII.  Ps stands for a list of such parameters separated by
+# semicolons.  Parameter meanings for most parametrized sequences are
+# decribed in the notes.
+#
+# Sequence     Sequence                             Parameter   or
+# Mnemonic     Name              Sequence           Value      Mode   terminfo
+# -----------------------------------------------------------------------------
+# APC  Applicatn Program Command \E _                -         Delim  -
+# BEL  Bell *                    ^G                  -         -      bel
+# BPH  Break Permitted Here *    \E B                -         *      -
+# BS   Backpace *                ^H                  -         EF     -
+# CAN  Cancel *                  ^X                  -         -      -   (A)
+# CBT  Cursor Backward Tab       \E [ Pn Z           1         eF     cbt
+# CCH  Cancel Previous Character \E T                -         -      -
+# CHA  Cursor Horizntal Absolute \E [ Pn G           1         eF     hpa (B)
+# CHT  Cursor Horizontal Tab     \E [ Pn I           1         eF     tab (C)
+# CMD  Coding Method Delimiter * \E
+# CNL  Cursor Next Line          \E [ Pn E           1         eF     nel (D)
+# CPL  Cursor Preceding Line     \E [ Pn F           1         eF     -
+# CPR  Cursor Position Report    \E [ Pn ; Pn R      1, 1      -      -   (E)
+# CSI  Control Sequence Intro    \E [                -         Intro  -
+# CTC  Cursor Tabulation Control \E [ Ps W           0         eF     -   (F)
+# CUB  Cursor Backward           \E [ Pn D           1         eF     cub
+# CUD  Cursor Down               \E [ Pn B           1         eF     cud
+# CUF  Cursor Forward            \E [ Pn C           1         eF     cuf
+# CUP  Cursor Position           \E [ Pn ; Pn H      1, 1      eF     cup (G)
+# CUU  Cursor Up                 \E [ Pn A           1         eF     cuu
+# CVT  Cursor Vertical Tab       \E [ Pn Y           -         eF     -   (H)
+# DA   Device Attributes         \E [ Pn c           0         -      -
+# DAQ  Define Area Qualification \E [ Ps o           0         -      -
+# DCH  Delete Character          \E [ Pn P           1         eF     dch
+# DCS  Device Control String     \E P                -         Delim  -
+# DL   Delete Line               \E [ Pn M           1         eF     dl
+# DLE  Data Link Escape *        ^P                  -         -      -
+# DMI  Disable Manual Input      \E \                -         Fs     -
+# DSR  Device Status Report      \E [ Ps n           0         -      -   (I)
+# DTA  Dimension Text Area *     \E [ Pn ; Pn SPC T  -         PC     -
+# EA   Erase in Area             \E [ Ps O           0         eF     -   (J)
+# ECH  Erase Character           \E [ Pn X           1         eF     ech
+# ED   Erase in Display          \E [ Ps J           0         eF     ed  (J)
+# EF   Erase in Field            \E [ Ps N           0         eF     -
+# EL   Erase in Line             \E [ Ps K           0         eF     el  (J)
+# EM   End of Medium *           ^Y                  -         -      -
+# EMI  Enable Manual Input       \E b                          Fs     -
+# ENQ  Enquire                   ^E                  -         -      -
+# EOT  End Of Transmission       ^D                  -         *      -
+# EPA  End of Protected Area     \E W                -         -      -   (K)
+# ESA  End of Selected Area      \E G                -         -      -
+# ESC  Escape                    ^[                  -         -      -
+# ETB  End Transmission Block    ^W                  -         -      -
+# ETX  End of Text               ^C                  -         -      -
+# FF   Form Feed                 ^L                  -         -      -
+# FNK  Function Key *            \E [ Pn SPC W       -         -      -
+# GCC  Graphic Char Combination* \E [ Pn ; Pn SPC B  -         -      -
+# FNT  Font Selection            \E [ Pn ; Pn SPC D  0, 0      FE     -
+# GSM  Graphic Size Modify       \E [ Pn ; Pn SPC B  100, 100  FE     -   (L)
+# GSS  Graphic Size Selection    \E [ Pn SPC C       none      FE     -
+# HPA  Horz Position Absolute    \E [ Pn `           1         FE     -   (B)
+# HPB  Char Position Backward    \E [ j              1         FE     -
+# HPR  Horz Position Relative    \E [ Pn a           1         FE     -   (M)
+# HT   Horizontal Tab *          ^I                  -         FE     -   (N)
+# HTJ  Horz Tab w/Justification  \E I                -         FE     -
+# HTS  Horizontal Tab Set        \E H                -         FE     hts
+# HVP  Horz & Vertical Position  \E [ Pn ; Pn f      1, 1      FE     -   (G)
+# ICH  Insert Character          \E [ Pn @           1         eF     ich
+# IDCS ID Device Control String  \E [ SPC O          -         *      -
+# IGS  ID Graphic Subrepertoire  \E [ SPC M          -         *      -
+# IL   Insert Line               \E [ Pn L           1         eF     il
+# IND  Index                     \E D                -         FE     -
+# INT  Interrupt                 \E a                -         Fs     -
+# JFY  Justify                   \E [ Ps SPC F       0         FE     -
+# IS1  Info Separator #1 *       ^_                  -         *      -
+# IS2  Info Separator #1 *       ^^                  -         *      -
+# IS3  Info Separator #1 *       ^]                  -         *      -
+# IS4  Info Separator #1 *       ^\                  -         *      -
+# LF   Line Feed                 ^J                  -         -      -
+# LS1R Locking Shift Right 1 *   \E ~                -         -      -
+# LS2  Locking Shift 2 *         \E n                -         -      -
+# LS2R Locking Shift Right 2 *   \E }                -         -      -
+# LS3  Locking Shift 3 *         \E o                -         -      -
+# LS3R Locking Shift Right 3 *   \E |                -         -      -
+# MC   Media Copy                \E [ Ps i           0         -      -   (S)
+# MW   Message Waiting           \E U                -         -      -
+# NAK  Negative Acknowledge *    ^U                  -         *      -
+# NBH  No Break Here *           \E C                -         -      -
+# NEL  Next Line                 \E E                -         FE     nel (D)
+# NP   Next Page                 \E [ Pn U           1         eF     -
+# NUL  Null *                    ^@                  -         -      -
+# OSC  Operating System Command  \E ]                -         Delim  -
+# PEC  Pres. Expand/Contract *   \E Pn SPC Z         0         -      -
+# PFS  Page Format Selection *   \E Pn SPC J         0         -      -
+# PLD  Partial Line Down         \E K                -         FE     -   (T)
+# PLU  Partial Line Up           \E L                -         FE     -   (U)
+# PM   Privacy Message           \E ^                -         Delim  -
+# PP   Preceding Page            \E [ Pn V           1         eF     -
+# PPA  Page Position Absolute *  \E [ Pn SPC P       1         FE     -
+# PPB  Page Position Backward *  \E [ Pn SPC R       1         FE     -
+# PPR  Page Position Forward *   \E [ Pn SPC Q       1         FE     -
+# PTX  Parallel Texts *          \E [ \              -         -      -
+# PU1  Private Use 1             \E Q                -         -      -
+# PU2  Private Use 2             \E R                -         -      -
+# QUAD Typographic Quadding      \E [ Ps SPC H       0         FE     -
+# REP  Repeat Char or Control    \E [ Pn b           1         -      rep
+# RI   Reverse Index             \E M                -         FE     -   (V)
+# RIS  Reset to Initial State    \E c                -         Fs     -
+# RM   Reset Mode *              \E [ Ps l           -         -      -   (W)
+# SACS Set Add. Char. Sep. *     \E [ Pn SPC /       0         -      -
+# SAPV Sel. Alt. Present. Var. * \E [ Ps SPC ]       0         -      -   (X)
+# SCI  Single-Char Introducer    \E Z                -         -      -
+# SCO  Sel. Char. Orientation *  \E [ Pn ; Pn SPC k  -         -      -
+# SCS  Set Char. Spacing *       \E [ Pn SPC g       -         -      -
+# SD   Scroll Down               \E [ Pn T           1         eF     rin
+# SDS  Start Directed String *   \E [ Pn ]           1         -      -
+# SEE  Select Editing Extent     \E [ Ps Q           0         -      -   (Y)
+# SEF  Sheet Eject & Feed *      \E [ Ps ; Ps SPC Y  0,0       -      -
+# SGR  Select Graphic Rendition  \E [ Ps m           0         FE     sgr (O)
+# SHS  Select Char. Spacing *    \E [ Ps SPC K       0         -      -
+# SI   Shift In                  ^O                  -         -      -   (P)
+# SIMD Sel. Imp. Move Direct. *  \E [ Ps ^           -         -      -
+# SL   Scroll Left               \E [ Pn SPC @       1         eF     -
+# SLH  Set Line Home *           \E [ Pn SPC U       -         -      -
+# SLL  Set Line Limit *          \E [ Pn SPC V       -         -      -
+# SLS  Set Line Spacing *        \E [ Pn SPC h       -         -      -
+# SM   Select Mode               \E [ Ps h           none      -      -   (W)
+# SO   Shift Out                 ^N                  -         -      -   (Q)
+# SOH  Start Of Heading *        ^A                  -         -      -
+# SOS  Start of String *         \E X                -         -      -
+# SPA  Start of Protected Area   \E V                -         -      -   (Z)
+# SPD  Select Pres. Direction *  \E [ Ps ; Ps SPC S  0,0       -      -
+# SPH  Set Page Home *           \E [ Ps SPC G       -         -      -
+# SPI  Spacing Increment         \E [ Pn ; Pn SPC G  none      FE     -
+# SPL  Set Page Limit *          \E [ Ps SPC j       -         -      -
+# SPQR Set Pr. Qual. & Rapid. *  \E [ Ps SPC X       0         -      -
+# SR   Scroll Right              \E [ Pn SPC A       1         eF     -
+# SRCS Set Reduced Char. Sep. *  \E [ Pn SPC f       0         -      -
+# SRS  Start Reversed String *   \E [ Ps [           0         -      -
+# SSA  Start of Selected Area    \E F                -         -      -
+# SSU  Select Size Unit *        \E [ Pn SPC I       0         -      -
+# SSW  Set Space Width *         \E [ Pn SPC [       none      -      -
+# SS2  Single Shift 2 (G2 set)   \E N                -         Intro  -
+# SS3  Single Shift 3 (G3 set)   \E O                -         Intro  -
+# ST   String Terminator         \E \                -         Delim  -
+# STAB Selective Tabulation *    \E [ Pn SPC ^       -         -      -
+# STS  Set Transmit State        \E S                -         -      -
+# STX  Start pf Text *           ^B                  -         -      -
+# SU   Scroll Up                 \E [ Pn S           1         eF     indn
+# SUB  Substitute *              ^Z                  -         -      -
+# SVS  Select Line Spacing *     \E [ Pn SPC \       1         -      -
+# SYN  Synchronous Idle *        ^F                  -         -      -
+# TAC  Tabul. Aligned Centered * \E [ Pn SPC b       -         -      -
+# TALE Tabul. Al. Leading Edge * \E [ Pn SPC a       -         -      -
+# TATE Tabul. Al. Trailing Edge* \E [ Pn SPC `       -         -      -
+# TBC  Tab Clear                 \E [ Ps g           0         FE     tbc
+# TCC  Tabul. Centered on Char * \E [ Pn SPC c       -         -      -
+# TSR  Tabulation Stop Remove  * \E [ Pn SPC d       -         FE     -
+# TSS  Thin Space Specification  \E [ Pn SC E        none      FE     -
+# VPA  Vert. Position Absolute   \E [ Pn d           1         FE     vpa
+# VPB  Line Position Backward *  \E [ Pn k           1         FE     -
+# VPR  Vert. Position Relative   \E [ Pn e           1         FE     -   (R)
+# VT   Vertical Tabulation *     ^K                  -         FE     -
+# VTS  Vertical Tabulation Set   \E J                -         FE     -
+# 
+# ---------------------------------------------------------------------------
+#
+# Notes:
+#
+# Some control characters are listed in the ECMA-48 standard without 
+# being assigned functions relevant to terminal control there (they 
+# referred to other standards such as ISO 1745 or ECMA-35).  They are listed
+# here anyway for completeness.
+#
+# (A) ECMA-48 calls this "CancelCharacter" but retains the CCH abbreviation.
+#
+# (B) There seems to be some confusion abroad between CHA and HPA.  Most
+# `ANSI' terminals accept the CHA sequence, not the HPA. but terminfo calls
+# the capability (hpa).  ECMA-48 calls this "Cursor Character Absolute" but
+# preserved the CHA abbreviation.
+#
+# (C) CHT corresponds to terminfo (tab).  Usually it has the value ^I.
+# Occasionally (as on, for example, certain HP terminals) this has the HTJ
+# value.  ECMA-48 calls this "Cursor Forward Tabulation" but preserved the
+# CHT abbreviation.
+#
+# (D) terminfo (nel) is usually \r\n rather than ANSI \EE.
+#
+# (E) ECMA-48 calls this "Active Position Report" but preserves the CPR 
+# abbreviation.
+# 
+# (F) CTC parameter values: 0 = set char tab, 1 = set line tab, 2 = clear
+# char tab, 3 = clear line tab, 4 = clear all char tabs on current line, 
+# 5 = clear all char tabs, 6 = clear all line tabs.
+#
+# (G) CUP and HVP are identical in effect.  Some ANSI.SYS versions accept
+# HVP, but always allow CUP as an alternate.  ECMA-48 calls HVP "Character
+# Position Absolute" but retains the HVP abbreviation.
+#
+# (H) ECMA calls this "Cursor Line Tabulation" but preserves the CVT
+# abbreviation.
+#
+# (I) DSR parameter values: 0 = ready, 1 = busy, 2 = busy, will send DSR
+# later, 3 = malfunction, 4 = malfunction, will send DSR later, 5 = request
+# DSR, 6 = request CPR response.
+#
+# (J) ECMA calls ED "Erase In Page". EA/ED/EL parameters: 0 = clear to end,
+# 1 = clear from beginning, 2 = clear.
+# 
+# (K) ECMA calls this "End of Guarded Area" but preserves the EPA abbreviation.
+#
+# (L) The GSM parameters are vertical and horizontal parameters to scale by.
+#
+# (M) Some ANSI.SYS versions accept HPR, but more commonly `ANSI' terminals
+# use CUF for this function and ignore HPR.  ECMA-48 calls this "Character
+# Position Relative" but retains the HPR abbreviation.
+#
+# (N) ECMA-48 calls this "Character Tabulation" but retains the HT
+# abbreviation.
+#
+# (O) SGR parameter values: 0 = default mode (attributes off), 1 = bold,
+# 2 = dim, 3 = italicized, 4 = underlined, 5 = slow blink, 6 = fast blink,
+# 7 = reverse video, 8 = invisible, 9 = crossed-out (marked for deletion),
+# 10 = primary font, 10 + n (n in 1..9) = nth alternative font, 20 = Fraktur,
+# 21 = double underline, 22 = turn off 2, 23 = turn off 3, 24 = turn off 4,
+# 25 = turn off 5, 26 = proportional spacing, 27 = turn off 7, 28 = turn off
+# 8, 29 = turn off 9, 30 = black fg, 31 = red fg, 32 = green fg, 33 = yellow
+# fg, 34 = blue fg, 35 = magenta fg, 36 = cyan fg, 37 = white fg, 38 = set
+# fg color as in CCIT T.416, 39 = set default fg color, 40 = black bg
+# 41 = red bg, 42 = green bg, 43 = yellow bg, 44 = blue bg, 45 = magenta bg,
+# 46 = cyan bg, 47 = white bg, 48 = set bg color as in CCIT T.416, 39 = set
+# default bg color, 50 = turn off 26, 51 = framed, 52 = encircled, 53 =
+# overlined, 54 = turn off 51 & 52, 55 = not overlined, 56-59 = reserved,
+# 61-65 = variable highlights for ideograms.
+#
+# (P) SI is also called LSO, Locking Shift Zero.
+#
+# (Q) SI is also called LS1, Locking Shift One.
+#
+# (R) Some ANSI.SYS versions accept VPR, but more commonly `ANSI' terminals
+# use CUD for this function and ignore VPR.  ECMA calls it `Line Position
+# Absolute' but retains the VPA abbreviation.
+#
+# (S) MC parameters: 0 = start xfer to primary aux device, 1 = start xfer from
+# primary aux device, 2 = start xfer to secondary aux device, 3 = start xfer
+# from secondary aux device, 4 = stop relay to primary aux device, 5 = 
+# start relay to primary aux device, 6 = stop relay to secondary aux device,
+# 7 = start relay to secondary aux device.
+#
+# (T) ECMA-48 calls this "Partial Line Forward" but retains the PLD
+# abbreviation.
+#
+# (U) ECMA-48 calls this "Partial Line Backward" but retains the PLD
+# abbreviation.
+#
+# (V) ECMA-48 calls this "Reverse Line Feed" but retains the RI abbreviation.
+#
+# (W) RM/SM modes are as follows: 1 = Guarder Area Transfer Mode (GATM), 
+# 2 = Keyboard Action Mode (KAM), 3 = Control Representation Mode (CRM), 
+# 4 = Insertion Replacement Mode, 5 = Status Report Transfer Mode (SRTM),
+# 6 = Erasure Mode (ERM), 7 = Line Editing Mode (LEM), 8 = Bi-Directional
+# Support Mode (BDSM), 9 = Device Component Select Mode (DCSM), 
+# 10 = Character Editing Mode (HEM), 11 = Positioning Unit Mode (PUM),
+# 12 = Send/Receive Mode, 13 = Format Effector Action Mode (FEAM), 
+# 14 = Format Effector Transfer Mode (FETM), 15 = Multiple Area Transfer
+# Mode (MATM), 16 = Transfer Termination Mode, 17 = Selected Area Transfer
+# Mode, 18 = Tabulation Stop Mode, 19 = Editing Boundary Mode, 20 = Line Feed
+# New Line Mode (LF/NL), Graphic Rendition Combination Mode (GRCM), 22 =
+# Zero Default Mode (ZDM).  The EBM and LF/NL modes have actually been removed
+# from ECMA-48's 5th edition but are listed here for reference.
+#
+# (X) Select Alternate Presentation Variants is used only for non-Latin
+# alphabets.
+#
+# (Y) "Select Editing Extent" (SEE) was ANSI "Select Edit Extent Mode" (SEM).
+#
+# (Z) ECMA-48 calls this "Start of Guarded Area" but retains the SPA
+# abbreviation.
+#
+# ---------------------------------------------------------------------------
+# 
+# Abbreviations:
+#
+# Intro  an Introducer of some kind of defined sequence; the normal 7-bit
+#        X3.64 Control Sequence Introducer is the two characters "Escape ["
+# 
+# Delim  a Delimiter
+# 
+# x/y    identifies a character by position in the ASCII table (column/row)
+# 
+# eF     editor function (see explanation)
+# 
+# FE     format effector (see explanation)
+#
+# F      is a Final character in
+#             an Escape sequence (F from 3/0 to 7/14 in the ASCII table)
+#             a control sequence (F from 4/0 to 7/14)
+# 
+# Gs     is a graphic character appearing in strings (Gs ranges from
+#        2/0 to 7/14) in the ASCII table
+# 
+# Ce     is a control represented as a single bit combination in the C1 set
+#        of controls in an 8-bit character set
+# 
+# C0     the familiar set of 7-bit ASCII control characters
+# 
+# C1     roughly, the set of control chars available only in 8-bit systems.
+#        This is too complicated to explain fully here, so read Jim Fleming's
+#        article in the February 1983 BYTE, especially pages 214 through 224.
+# 
+# Fe     is a Final character of a 2-character Escape sequence that has an
+#        equivalent representation in an 8-bit environment as a Ce-type
+#        (Fe ranges from 4/0 to 5/15)
+# 
+# Fs     is a Final character of a 2-character Escape sequence that is
+#        standardized internationally with identical representation in 7-bit
+#        and 8-bit environments and is independent of the currently
+#        designated C0 and C1 control sets (Fs ranges from 6/0 to 7/14)
+# 
+# I      is an Intermediate character from 2/0 to 2/15 (inclusive) in the
+#        ASCII table
+# 
+# P      is a parameter character from 3/0 to 3/15 (inclusive) in the ASCII
+#        table
+# 
+# Pn     is a numeric parameter in a control sequence, a string of zero or
+#        more characters ranging from 3/0 to 3/9 in the ASCII table
+# 
+# Ps     is a variable number of selective parameters in a control sequence
+#        with each selective parameter separated from the other by the code
+#        3/11 (which usually represents a semicolon); Ps ranges from
+#        3/0 to 3/9 and includes 3/11
+#
+# *      Not relevant to terminal control, listed for completeness only.
+# 
+# Format Effectors versus Editor Functions
+# 
+# A format effector specifies how following output is to be displayed.
+# An editor function allows you to modify the display.  Informally
+# format effectors may be destructive; format effectors should not be.
+# 
+# For instance, a format effector that moves the "active position" (the 
+# cursor or equivalent) one space to the left would be useful when you want to
+# create an overstrike, a compound character made of two standard characters
+# overlaid. Control-H, the Backspace character, is actually supposed to be a
+# format effector, so you can do this. But many systems use it in a
+# nonstandard fashion, as an editor function, deleting the character to the
+# left of the cursor and moving the cursor left. When Control-H is assumed to
+# be an editor function, you cannot predict whether its use will create an
+# overstrike unless you also know whether the output device is in an "insert
+# mode" or an "overwrite mode". When Control-H is used as a format effector,
+# its effect can always be predicted. The familiar characters carriage
+# return, linefeed, formfeed, etc., are defined as format effectors.
+#
+# NOTES ON THE DEC VT100 IMPLEMENTATION
+# 
+# Control sequences implemented in the VT100 are as follows:
+# 
+#      CPR, CUB, CUD, CUF, CUP, CUU, DA, DSR, ED, EL, HTS, HVP, IND,
+#      LNM, NEL, RI, RIS, RM, SGR, SM, TBC
+# 
+# plus several private DEC commands.
+# 
+# Erasing parts of the display (EL and ED) in the VT100 is performed thus:
+# 
+#      Erase from cursor to end of line           Esc [ 0 K    or Esc [ K
+#      Erase from beginning of line to cursor     Esc [ 1 K
+#      Erase line containing cursor               Esc [ 2 K
+#      Erase from cursor to end of screen         Esc [ 0 J    or Esc [ J
+#      Erase from beginning of screen to cursor   Esc [ 1 J
+#      Erase entire screen                        Esc [ 2 J
+#
+# Some brain-damaged terminal/emulators respond to Esc [ J as if it were
+# Esc [ 2 J, but this is wrong; the default is 0.
+# 
+# The VT100 responds to receiving the DA (Device Attributes) control
+# 
+#      Esc [ c    (or Esc [ 0 c)
+# 
+# by transmitting the sequence
+# 
+#      Esc [ ? l ; Ps c
+# 
+# where Ps is a character that describes installed options.
+# 
+# The VT100's cursor location can be read with the DSR (Device Status
+# Report) control
+# 
+#      Esc [ 6 n
+# 
+# The VT100 reports by transmitting the CPR sequence
+# 
+#      Esc [ Pl ; Pc R
+# 
+# where Pl is the line number and Pc is the column number (in decimal).
+# 
+# The specification for the DEC VT100 is document EK-VT100-UG-003.
+
+#### ANSI.SYS
+# 
+# Here is a description of the color and attribute controls supported in the
+# the ANSI.SYS driver under MS-DOS.  Most console drivers and ANSI
+# terminal emulators for Intel boxes obey these.  They are a proper subset
+# of the ECMA-48 escapes.
+#
+# 0	all attributes off
+# 1	foreground bright
+# 4	underscore on
+# 5	blink on/background bright (not reliable with brown)
+# 7	reverse-video
+# 8	set blank (non-display)
+# 10	set primary font
+# 11	set first alternate font (on PCs, display ROM characters 1-31)
+# 12	set second alternate font (on PCs, display IBM high-half chars)
+#
+#			Color attribute sets
+# 3n	set foreground color       / 0=black, 1=red,     2=green, 3=brown,
+# 4n	set background color       \ 4=blue,  5=magenta, 6=cyan,  7=white
+# Bright black becomes gray.  Bright brown becomes yellow,
+# These coincide with the prescriptions of the ISO 6429/ECMA-48 standard.
+#
+# * If the 5 attribute is on and you set a background color (40-47) it is
+#   supposed to enable bright background.
+#
+# * Many VGA cards (such as the Paradise and compatibles) do the wrong thing
+#   when you try to set a "bright brown" (yellow) background with attribute
+#   5 (you get a blinking yellow foreground instead).  A few displays
+#   (including the System V console) support an attribute 6 that undoes this
+#   braindamage (this is required by iBCS2).
+#
+# * Some older versions of ANSI.SYS have a bug that causes thems to require
+#   ESC [ Pn k as EL rather than the ANSI ESC [ Pn K.  (This is not ECMA-48
+#   compatible.)
+
+#### Intel Binary Compatibility Standard
+#
+# For comparison, here are the capabilities implied by the Intel Binary 
+# Compatibility Standard for UNIX systems (Intel order number 468366-001).
+# These recommendations are optional.  IBCS2 allows the leading escape to
+# be either the 7-bit \E[ or 8-bit \0233 introducer, in accordance with
+# the ANSI X.364/ISO 6429/ECMA-48 standard.  Here are the iBCS2 capabilities
+# (as described in figure 9-3 of the standard).  Those expressed in the ibcs2
+# terminfo entry are followed with the corresponding capability in parens:
+#
+#	CSI <n>k		disable (n=0) or enable (n=1) keyclick
+#	CSI 2h   		lock keyboard
+#	CSI 2i  		send screen as input
+#	CSI 2l  		unlock keyboard
+#	CSI 6m  		enable background color intensity
+#	CSI <0-2>c		reserved
+#	CSI <0-59>m		select graphic rendition
+#	CSI <n>;<m>H	(cup)	cursor to line n and column m
+#	CSI <n>;<m>f		cursor to line n and column m
+#	CSI <n>@	(ich)	insert characters
+#	CSI <n>A	(cuu)	cursor up n lines
+#	CSI <n>B	(cud)	cursor down n lines
+#	CSI <n>C	(cuu)	cursor right n characters
+#	CSI <n>D	(cud)	cursor left n characters
+#	CSI <n>E		cursor down n lines and in first column
+#	CSI <n>F		cursor up n lines and in first column
+#	CSI <n>G	(hpa)	position cursor at column n-1
+#	CSI <n>J	(ed)	erase in display
+#	CSI <n>K	(el)	erase in line
+#	CSI <n>L	(il)	insert line(s)
+#	CSI <n>P	(dch)	delete characters
+#	CSI <n>S	(indn)	scroll up n lines
+#	CSI <n>T	(rin)	scroll down n lines
+#	CSI <n>X	(ech)	erase characters
+#	CSI <n>Z	(cbt)	back up n tab stops
+#	CSI <n>`		cursor to column n on line
+#	CSI <n>a	(cuu)	cursor right n characters
+#	CSI <n>d	(vpa)	cursor to line n
+#	CSI <n>e		cursor down n lines and in first column
+#	CSI <n>g	(cbt)	clear all tabs
+#	CSI <n>z		make virtual terminal n active
+#	CSI ?7h 	(smam)	turn automargin on
+#	CSI ?7l 	(rmam)	turn automargin off
+#	CSI s     		save cursor position
+#	CSI u   		restore cursor position to saved value
+#	CSI =<c>A		set overscan color
+#	CSI =<c>F		set normal foreground color
+#	CSI =<c>G		set normal background color
+#	CSI =<c>H		set reverse foreground color
+#	CSI =<c>I		set reverse foreground color
+#	CSI =<c>J		set graphic foreground color
+#	CSI =<c>K		set graphic foreground color
+#	CSI =<n>g	(dispc) display n from alternate graphics character set
+#	CSI =<p>;<d>B		set bell parameters
+#	CSI =<s>;<e>C		set cursor parameters
+#	CSI =<x>D		enable/disable intensity of background color
+#	CSI =<x>E		set/clear blink vs. bold background
+#	CSI 7     	(sc)	(sc) save cursor position
+#	CSI 8   	(rc)	(rc) restore cursor position to saved value
+#	CSI H		(hts)	(hts) set tab stop
+#	CSI Q<n><string>	define function key string
+#				(string must begin and end with delimiter char)
+#	CSI c   	(clear) clear screen
+#
+# The lack of any specification for attributes in SGR (among other things)
+# makes this a wretchedly weak standard. The table above is literally 
+# everything iBSC2 has to say about terminal escape sequences; there is
+# no further discussion of their meaning or how to set the parameters
+# in these sequences at all.
+#
+
+######## NONSTANDARD CAPABILITY TRANSLATIONS USED IN THIS FILE
+#
+# The historical termcap file entries were written primarily in 4.4BSD termcap.
+# The 4.4BSD termcap set was substantially larger than the original 4.1BSD set,
+# with the extension names chosen for compatibility with the termcap names
+# assigned in System V terminfo.  There are some variant extension sets out
+# there.  We try to describe them here.
+#
+# XENIX extensions:
+#
+# The XENIX extensions include a set of function-key capabilities as follows:
+#
+#       code	XENIX variable name	terminfo name	name clashes?
+#	----	-------------------	-------------	-----------------------
+#	CL	key_char_left
+#	CR	key_char_right
+#	CW	key_change_window			create_window
+#	EN	key_end          	kend
+#	HM	key_home		khome
+#	HP	??
+#	LD	key_delete_line  	kdl1
+#	LF	key_linefeed     			label_off
+#	NU	key_next_unlocked_cell
+#	PD	key_page_down   	knp
+#	PL	??
+#	PN	start_print		mc5
+#	PR	??
+#	PS	stop_print		mc4
+#	PU	key_page_up     	kpp		pulse
+#	RC	key_recalc				remove_clock
+#	RF	key_toggle_ref				req_for_input
+#	RT	key_return      	kent
+#	UP	key_up_arrow           	kcuu1   	parm_up_cursor
+#	WL	key_word_left
+#	WR	key_word_right
+#
+# The XENIX extensions also include the following character-set and highlight
+# capabilities:
+#
+#	XENIX	terminfo	function
+#	-----	--------	------------------------------
+#	GS	smacs		start alternate character set
+#	GE	rmacs		end alternate character set
+#	GG			:as:/:ae: glitch (analogous to :sg:/:ug:)
+#	bo	blink		begin blink (not used in /etc/termcap)
+#	be			end blink (not used in /etc/termcap)
+#	bb			blink glitch  (not used in /etc/termcap)
+#	it	dim		begin dim (not used in /etc/termcap)
+#	ie			end dim (not used in /etc/termcap)
+#	ig			dim glitch  (not used in /etc/termcap)
+#
+# Finally, XENIX also used the following forms-drawing capabilities:
+#
+#	single	double  type             ASCII approximation 
+#	------	------	-------------    -------------------
+#	GV	Gv	vertical line             |
+#	GH	Gv	horizontal line       -   _
+#	G1	G5	top right corner       _   |
+#	G2	G6	top left corner       | 
+#	G3	G7	bottom left corner         |_
+#	G4	G8	bottom right corner   _|
+#	GD	Gd	down-tick character        T
+#	GL	Gl	left-tick character   -|
+#	GR	Gr	right-tick character       |-
+#	GC	Gc	middle intersection   -|-
+#	GU	Gu	up-tick character          _|_
+#
+# These were invented to take advantage of the IBM PC ROM character set.  One
+# can compose an acsc string from the single-width characters as follows
+#	"j{G4}k{G1}l{G2}m{G3}q{GH}x{GV}t{GR}u{GL}v{GU}w{GD}n{GC}"
+# When translating a termcap file, ncurses tic will do this automatically.
+# The double forms characters don't fit the SVr4 terminfo model.
+#
+# AT&T Extensions:
+#
+# The old AT&T 5410, 5420, 5425, pc6300plus, 610, and s4 entries used a set of
+# nonstandard capabilities.  Its signature is the KM capability, used to name
+# some sort of keymap file.  EE, BO, CI, CV, XS, DS, FL and FE are in this
+# set.  Comments in the original, and a little cross-checking with other AT&T
+# documentation, seem to establish that BO=:mr: (start reverse video), DS=:mh:
+# (start dim), XS=:mk: (secure/invisible mode), EE=:me: (end highlights),
+# FL=:LO: (enable soft labels), FE=:LF: (disable soft labels), CI=:vi: (make
+# cursor invisible), and CV=:ve: (make cursor normal).
+#
+# HP Extensions
+#
+# The HP library (as of mid-1995, their term.h file version 70.1) appears to
+# have the System V capabilities up to SVr1 level.  After that, it supports
+# two nonstandard caps meml and memu corresponding to the old termcap :ml:,
+# :mu: capabilities.  After that, it supports caps plab_norm, label_on,
+# label_off, and key_f11..key_f63 capabilities like SVr4's.  This makes the
+# HP binary format incompatible with SVr4's.
+#
+# IBM Extensions
+#
+# There is a set of nonstandard terminfos used by IBM's AIX operating system.
+# The AIX terminfo library diverged from SVr1 terminfo, and replaces all
+# capabilities following prtr_non with the following special capabilties:
+# box[12], batt[12], colb[0123456789], colf[0123456789], f[01234567], kbtab,
+# kdo, kcmd, kcpn, kend, khlp, knl, knpn, kppn, kppn, kquit, ksel, kscl, kscr,
+# ktab, kmpf[123456789], apstr, ksf1..ksf10, kf11...kf63, kact, topl, btml,
+# rvert, lvert.   Some of these are identical to XPG4/SVr4 equivalents:
+# kcmd, kend, khlp, and kf11...kf63.  Two others (kbtab and ksel) can be
+# renamed (to kcbt and kslt).  The places in the box[12] capabilities
+# correspond to acsc chars, here is the mapping:
+#
+#	box1[0]  = ACS_ULCORNER
+#	box1[1]  = ACS_HLINE	
+#	box1[2]  = ACS_URCORNER
+#	box1[3]  = ACS_VLINE
+#	box1[4]  = ACS_LRCORNER
+#	box1[5]  = ACS_LLCORNER
+#	box1[6]  = ACS_TTEE
+#	box1[7]  = ACS_RTEE
+#	box1[8]  = ACS_BTEE
+#	box1[9]  = ACS_LTEE
+#	box1[10] = ACS_PLUS
+#
+# The box2 characters are the double-line versions of these forms graphics.
+# The AIX binary terminfo format is incompatible with SVr4's.
+#
+# Iris console extensions:
+#
+# HS is half-intensity start; HE is half-intensity end
+# CT is color terminal type (for Curses & rogue)
+# CP is color change escape sequence
+# CZ are color names (for Curses & rogue)
+#
+# The ncurses tic utility recognizes HS as an alias for mh <dim>.
+#
+# TC Extensions:
+#
+# There is a set of extended termcaps associated with something
+# called the "Terminal Control" or TC package created by MainStream Systems,
+# Winfield Kansas.  This one also uses GS/GE for as/ae, and also uses
+# CF for civis and CO for cvvis.  Finally, they define a boolean :ct:
+# that flags color terminals.
+#
+######## CHANGE HISTORY
+#
+# The last /etc/termcap version maintained by John Kunze was 8.3, dated 8/5/94.
+# Releases 9 and up are maintained by Eric S. Raymond as part of the ncurses
+# project.
+#
+# This file contains all the capability information present in John Kunze's
+# last version of the termcap master file, except as noted in the change 
+# comments at end of file.  Some information about very ancient obsolete
+# capabilities has been moved to comments.  Some all-numeric names of older
+# terminals have been retired.
+#
+# I changed :MT: to :km: (the 4.4BSD name) everywhere.  I commented out some
+# capabilities (EP, dF, dT, dV, kn, ma, ml, mu, xr, xx) that are no longer
+# used by BSD curses.
+#
+# The 9.1.0 version of this file was translated from my lightly-edited copy of
+# 8.3, then mechanically checked against 8.3 using Emacs Lisp code written for
+# the purpose.  Unless the ncurses tic implementation and the Lisp code were
+# making perfectly synchronized mistakes which I then failed to catch by
+# eyeball, the translation was correct and perfectly information-preserving.
+#
+# Major version number bumps correspond to major version changes in ncurses.
+#
+# Here is a log of the changes since then:
+#
+# 9.1.0 (Wed Feb  1 04:50:32 EST 1995):
+#	* First terminfo master translated from 8.3.
+# 9.2.0 (Wed Feb  1 12:21:45 EST 1995):
+#	* Replaced Wyse entries with updated entries supplied by vendor.
+#
+# 9.3.0 (Mon Feb  6 19:14:40 EST 1995):
+#	* Added contact & status info from G. Clark Brown <clark@sssi.com>.
+# 9.3.1 (Tue Feb  7 12:00:24 EST 1995):
+#	* Better XENIX keycap translation.  Describe TC termcaps.
+#	* Contact and history info supplied by Qume.
+# 9.3.2 (Sat Feb 11 23:40:02 EST 1995):
+#	* Raided the Shuford FTP site for recent termcaps/terminfos.
+#	* Added information on X3.64 and VT100 standard escape sequences.
+# 9.3.3 (Mon Feb 13 12:26:15 EST 1995):
+#	* Added a correct X11R6 xterm entry.
+#	* Fixed terminfo translations of padding.
+# 9.3.4 (Wed Feb 22 19:27:34 EST 1995):
+#	* Added correct acsc/smacs/rmacs strings for vt100 and xterm.
+#	* Added u6/u7/u8/u9 capabilities.
+#	* Added PCVT entry.
+# 9.3.5 (Thu Feb 23 09:37:12 EST 1995):
+#	* Emacs uses :so:, not :mr:, for its mode line.  Fix linux entry
+#	  to use reverse-video standout so Emacs will look right.
+#	* Added el1 capability to ansi.
+#	* Added smacs/rmacs to ansi.sys.
+#
+# 9.4.0 (Sat Feb 25 16:43:25 EST 1995):
+#	* New mt70 entry.
+#	* Added COPYRIGHTS AND OTHER DELUSIONS.
+#	* Added AT&T 23xx & 500/513, vt220 and vt420, opus3n1+, netronics
+#	  smartvid & smarterm, ampex 175 & 219 & 232,
+#	  env230, falco ts100, fluke, intertube, superbrain, ncr7901, vic20,
+#	  ozzie, trs200, tr600, Tandy & Texas Instruments VDTs, intext2,
+#	  screwpoint, fviewpoint, Contel Business Systems, Datamedia Colorscan,
+#	  adm36, mime314, ergo4000, ca22851.  Replaced att7300, esprit, dd5500.
+#	* Replaced the Perkin-Elmer entries with vendor's official ones.
+#	* Restored the old minimal-ansi entry, luna needs it.
+#	* Fixed some incorrect ip and proportional-padding translations.
+# 9.4.1 (Mon Feb 27 14:18:33 EST 1995):
+#	* Fix linux & AT386 sgr strings to do A_ALTCHARSET turnoff correctly.
+#	* Make the xterm entry 65 lines again; create xterm25 and xterm24
+#	  to force a particular height.
+#	* Added beehive4 and reorganized other Harris entries.
+# 9.4.2 (Thu Mar  9 01:45:44 EST 1995):
+#	* Merged in DEC's official entries for its terminals.  The only old
+#	  entry I kept was Doug Gwyn's alternate vt100 (as vt100-avo).
+#	* Replaced the translated BBN Bitgraph entries with purpose-built
+#	  ones from AT&T's SVr3.
+#	* Replaced the AT&T entries with AT&T's official terminfos.
+#	* Added teleray 16, vc415, cops10. 
+#	* Merged in many individual capabilities from SCO terminfo files.
+# 9.4.3 (Mon Mar 13 02:37:53 EST 1995):
+#	* Typo fixes.
+#	* Change linux entry so A_PROTECT enables IBM-PC ROM characters.
+# 9.4.4 (Mon Mar 27 12:32:35 EST 1995):
+#	* Added tty35, Ann Arbor Guru series. vi300 and 550, cg7900, tvi803,
+#	  pt210, ibm3164, IBM System 1, ctrm, Tymshare scanset, dt200, adm21,
+#	  simterm, citoh and variants.
+#	* Replaced sol entry with sol1 and sol2.
+#	* Replaced Qume QVT and Freedom-series entries with purpose-built
+#	  terminfo entries.
+#	* Enhanced vt220, tvi910, tvi924, hpterm, hp2645, adm42, tek
+#	  and dg200 entries using caps from from SCO.
+#	* Added the usual set of function-key mappings to ANSI entry.
+#	* Corrected xterm's function-key capabilities.
+# 9.4.5 (Tue Mar 28 14:27:49 EST 1995):
+#	* Fix in xterm entry, cub and cud are not reliable under X11R6.
+# 9.4.6 (Thu Mar 30 14:52:15 EST 1995):
+#	* Fix in xterm entry, get the arrow keys right.
+#	* Change some \0 escapes to \200.
+# 9.4.7 (Tue Apr  4 11:27:11 EDT 1995)
+#	* Added apple (Videx card), adm1a, oadm31.
+#	* Fixed malformed ampex csr.
+#	* Fixed act4, cyb110; they had old-style prefix padding left in. 
+#	* Changed mandatory to advisory padding in many entries.
+#	* Replaced HP entries up to hpsub with purpose-built ones.
+#	* Blank rmir/smir/rmdc/smdc capabilities removed.
+#	* Small fixes merged in from SCO entries for lpr, fos, tvi910+, tvi924.
+# 9.4.8 (Fri Apr  7 09:36:34 EDT 199):
+#	* Replaced the Ann Arbor entries with SCO's, the init strings are
+#	  more efficient (but the entries otherwise identical).
+#	* Added dg211 from Shuford archive.
+#	* Added synertek, apple-soroc, ibmpc, pc-venix, pc-coherent, xtalk,
+#	  adm42-nl, pc52, gs6300, xerox820, uts30.
+#	* Pull SCO's padding into vi200 entry.
+#	* Improved capabilities for tvi4107 and other Televideo and Viewpoint
+#	  entries merged in from SCO's descriptions.
+#	* Fixed old-style prefix padding on zen50, h1500.
+#	* Moved old superbee entry to superbee-xsb, pulled in new superbee
+#	  entry from SCO's description.
+#	* Reorganized the special entries.
+#	* Added lm#0 to cbunix and virtual entries.
+#
+# 9.5.0 (Mon Apr 10 11:30:00 EDT 1995):
+#	* Restored cdc456tst.
+#	* Fixed sb1 entry, SCO erroneously left out the xsb glitch.
+#	* Added megatek, beacon, microkit.
+#	* Freeze for ncurses-1.9 release.
+# 9.5.1 (Fri Apr 21 12:46:42 EDT 1995):
+#	* Added historical data for TAB.
+#	* Comment fixes from David MacKenzie.
+#	* Added the new BSDI pc3 entry.
+# 9.5.2 (Tue Apr 25 17:27:52 EDT 1995)
+#	* A change in the tic -C logic now ensures that all entries in 
+#	  the termcap translation will fit in < 1024 bytes.
+#	* Added `bobcat' and `gator' HP consoles and the Nu machine entries
+#	  from GNU termcap file.  This merges in all their local information.
+# 9.5.3 (Tue Apr 25 22:28:13 EDT 1995)
+#	* Changed tic -C logic to dump all capabilities used by GNU termcap.
+#	* Added warnings about entries with long translations (restoring
+#	  all the GNU termcaps pushes a few over the edge).
+# 9.5.4 (Wed Apr 26 15:35:09 EDT 1995)
+#	* Yet another tic change, and a couple of entry tweaks, to reduce the
+#	  number of long (> 1024) termcap translations back to 0.
+#
+# 9.6.0 (Mon May  1 10:35:54 EDT 1995)
+#	* Added kf13-kf20 to Linux entry.
+#	* Regularize Prime terminal names.
+#	* Historical data on Synertek.
+#	* Freeze for ncurses-1.9.1.
+# 9.6.1 (Sat May  6 02:00:52 EDT 1995):
+#	* Added true xterm-color entry, renamed djm's pseudo-color entry.
+#	* Eliminate whitespace in short name fields, this tanks some scripts.
+#	* Name field changes to shorten some long entries.
+#	* Termcap translation now automatically generates empty rmir/smir
+#	  when ich1/ich is present (copes with an ancient vi bug).
+#	* Added `screen' entries from FSF's screen-3.6.2.
+#	* Added linux-nic and xterm-nic entries.
+# 9.6.2 (Sat May  6 17:00:55 EDT 1995):
+#	* Change linux entry to use smacs=\E[11m and have an explicit acsc,
+#	  eliminating some special-case code in ncurses.
+#
+# 9.7.0 (Tue May  9 18:03:12 EDT 1995):
+#	* Added vt320-k3, rsvidtx from the Emacs termcap.dat file.  I think
+#	  that captures everything unique from it.
+#	* Added reorder script generator.
+#	* Freeze for ncurses 1.9.2 release.
+# 9.7.1 (Thu Jun 29 09:35:22 EDT 1995):
+#	* Added Sean Farley's kspd, flash, rs1 capabilities for linux.
+#	* Added Olaf Siebert's corrections for adm12.
+#	* ansi-pc-color now includes the colors and pairs caps, so that
+#	  entries which use it will inherit them automatically.
+#	* The linux entry can now recognize the center (keypad 5) key.
+#	* Removed some junk that found its way into Linux acsc.
+#
+# 9.8.0 (Fri Jul  7 04:46:57 EDT 1995):
+#	* Add 50% cut mark as a desperate hack to reduce tic's core usage.
+#	* xterm doesn't try to use application keypad mode any more.
+#	* Freeze for ncurses-1.9.3 release.
+# 9.8.1 (Thu Jul 19 17:02:12 EDT 1995):
+#	* Added corrected sun entry from vendor.
+#	* Added csr capability to linux entry.
+#	* Peter Wemm says the at386 hpa should be \E[%i%p1%dG, not \E[%p1%dG.
+#	* Added vt102-nsgr to cope with stupid IBM PC `VT100' emulators.
+#	* Some commented-out caps in long entries come back in, my code 
+#	  for computing string-table lengths had a bug in it.
+#	* pcansi series modified to fit comm-program reality better.
+# 9.8.2 (Sat Sep  9 23:35:00 EDT 1995):
+#	* BSD/OS actually ships the ibmpc3 bold entry as its console.
+#	* Correct some bad aliases in the pcansi series
+#	* Added entry for QNX console.
+#	* Clean up duplicate long names for use with 4.4 library.
+#	* Change vt100 standout to be normal reverse vide, not bright reverse;
+#	  this makes the Emacs status line look better.
+# 9.8.3 (Sun Sep 10 13:07:34 EDT 1995):
+#	* Added Adam Thompson's VT320 entries, also his dtx-sas and z340.
+#	* Minor surgery, mostly on name strings, to shorten termcap version.
+#
+# 9.9.0 (Sat Sep 16 23:03:48 EDT 1995):
+#	* Added dec-vt100 for use with the EWAN emulator.
+#	* Added kmous to xterm for use with xterm's mouse-tracking facility.
+#	* Freeze for 1.9.5 alpha release.
+# 9.9.1 (Wed Sep 20 13:46:09 EDT 1995):
+#	* Changed xterm lines to 24, the X11R6 default.
+# 9.9.2 (Sat Sep 23 21:29:21 EDT 1995):
+#	* Added 7 newly discovered, undocumented acsc characters to linux
+#	  entry (the pryz{|} characters).
+#	* ncurses no longer steals A_PROTECT.  Simplify linux sgr accordingly.
+#	* Correct two typos in the xterm entries introduced in 9.9.1.
+#	* I finally figured out how to translate ko capabilities.  Done.
+#	* Added tvi921 entries from Tim Theisen.
+#	* Cleanup: dgd211 -> dg211, adm42-nl -> adm42-nsl.
+#	* Removed mystery tec entry, it was neither interesting nor useful.
+#	* shortened altos3, qvt203, tvi910+, tvi92D, tvi921-g, tvi955, vi200-f,
+#	  vi300-ss, att505-24, contel301, dm3045, f200vi, pe7000c, vc303a,
+#	  trs200, wind26, wind40, wind50, cdc456tst, dku7003, f110, dg211,
+#	  by making them relative to use capabilities
+#	* Added cuf1=^L to tvi925 from deleted variant tvi925a.
+#	* fixed cup in adm22 entry and parametrized strings in vt320-k3.
+#	* added it#8 to entries that used to have :pt: -- tvi912, vi200,
+#	  ampex80,
+#	* Translate all home=\E[;H capabilities to home=\E[H, they're 
+#	  equivalent.
+#	* Translate \E[0m -> \E[m in [rs]mso, [rs]mul, and init strings of
+#	  vt100 and ANSI-like terminals.
+# 9.9.3 (Tue Sep 26 20:11:15 EDT 1995):
+#	* Added it#8 and ht=\t to *all* entries with :pt:; the ncurses tic
+#	  does this now, too.
+#	* fviewpoint is gone, it duplicated screwpoint.
+#	* Added hp2627, graphos, graphos-30, hpex, ibmega, ibm8514, ibm8514-c,
+#	  ibmvga, ibmvga-c, minix, mm340, mt4520-rv, screen2, screen3, 
+#	  versaterm, vi500, vsc, vt131, vt340, vt400 entries from UW.
+#	  The UW vi50 replaces the old one, which becomes vi50adm,
+#	* No more embedded commas in name fields.
+#
+# 9.10.0 (Wed Oct  4 15:39:37 EDT 1995):
+#	* XENIX forms characters in fos, trs16, scoansi become acsc strings,
+#	* Introduced klone+* entries for describing Intel-console behavior.
+#	* Linux kbs is default-mapped to delete for some brain-dead reason.
+#	* -nsl -> -ns.  The -pp syntax is obsolete.
+#	* Eliminate [A-Z]* primaries in accordance with SVr4 terminfo docs.
+#	* Make xterm entry do application-keypad mode again.  I got complaints
+#	  that it was messing up someone's 3270 emulator.
+#	* Added some longname fields in order to avoid warning messages from
+#	  older tic implementations.
+#	* According to ctrlseqs.ms, xterm has a full vt100 graphics set.  Use
+#	  it! (This gives us pi, greater than, less than, and a few more.)
+#	* Freeze for ncurses-1.9.6 release.
+# 9.10.1 (Sat Oct 21 22:18:09 EDT 1995):
+#	* Add xon to a number of console entries, they're memory-mapped and
+#	  don't need padding.
+#	* Correct the use dependencies in the ansi series.
+#	* Hand-translate more XENIX capabilities.
+#	* Added hpterm entry for HP's X terminal emulator.
+#	* Added aixterm entries.
+#	* Shortened four names so everything fits in 14 chars.  
+#
+# 9.11.0 (Thu Nov  2 17:29:35 EST 1995):
+#	* Added ibcs2 entry and info on iBCS2 standard.
+#	* Corrected hpa/vpa in linux entry.  They still fail the worm test.
+#	* We can handle the HP meml/memu capability now.
+#	* Added smacs to klone entries, just as documentation.
+#	* Carrected ansi.sys and cit-500 entries.
+#	* Added z39, vt320-k311, v220c, and avatar entries.
+#	* Make pcansi use the ansi.sys invis capability.
+#	* Added DIP switch descriptions for vt100, adm31, tvi910, tvi920c,
+#	  tvi925, tvi950, dt80, ncr7900i, h19.
+#	* X3.64 has been withdrawn, change some references.
+#	* Removed function keys from ansi-m entry.
+#	* Corrected ansi.sys entry.
+#	* Freeze for ncurses-1.9.7 release.
+# 9.11.1 (Tue Nov  6 18:18:38 EST 1995):
+#	* Added rmam/smam capabilities to many entries based on init strings.
+#	* Added correct hpa/vpa to linux.
+#	* Reduced several entries relative to vt52.
+# 9.11.2 (Tue Nov  7 00:21:06 EST 1995):
+#	* Exiled some utterly unidentifiable custom and homebrew types to the
+#	  UFO file; also, obsolete small-screen hardware; also, entries which
+#	  look flat-out incorrect, garbled, or redundant.  These include the
+#	  following entries: carlock, cdc456tst, microkit, qdss, ramtek, tec, 
+#	  tec400, tec500, ubell, wind, wind16, wind40, wind50, plasma, agile,
+#	  apple, bch, daleblit, nucterm, ttywilliams, nuterminal, nu24, bnu,
+#	  fnu, nunix-30, nunix-61, exidy, ex3000, sexidy, pc52, sanyo55, 
+#	  yterm10, yterm11, yterm10nat, aed, aed-ucb, compucolor, compucolor2, 
+#	  vic20, dg1, act5s, netx, smartvid, smarterm, sol, sol2, dt200, 
+#	  trs80, trs100, trs200, trs600, xitex, rsvidtx, vid, att2300-x40, 
+#	  att2350-x40, att4410-nfk, att5410-ns, otty5410, att5425-nl-w, 
+#	  tty5425-fk, tty5425-w-fk, cita, c108-na, c108-rv-na, c100-rv-na, 
+#	  c108-na-acs, c108-rv-na-acs, ims950-ns, infotonKAS, ncr7900i-na, 
+#	  regent60na, scanset-n, tvi921-g, tvi925n, tvi925vbn, tvi925vb, 
+#	  vc404-na, vc404-s-na, vt420nam, vt420f-nam, vt420pc-nam, vt510nam, 
+#	  vt510pc-nam, vt520nam, vt525nam, xterm25, xterm50, xterm65, xterms.
+#	* Corrected pcvt25h as suggested by Brian C. Grayson
+#	  <bgrayson@pine.ece.utexas.edu>.
+# 9.11.3 (Thu Nov  9 12:14:40 EST 1995):
+#	* Added kspd=\E[P, kcbt=\E[Z, to linux entry, changed kbs back to ^H. 
+#	* Added kent=\EOM to xterm entry.
+#
+# 9.11.4 (Fri Nov 10 08:31:35 EST 1995):
+#	* Corrected gigi entry.
+#	* Restored cuf/cud1 to xterm, their apparent bugginess was due to
+#	  bad hpa/vpa capabilities.
+#	* Corrected flash strings to have a uniform delay of .2 sec.  No
+#	  more speed-dependent NUL-padding!
+#	* terminfo capabilities in comments bracketed with <>.
+# 9.11.5 (Fri Nov 10 15:35:02 EST 1995):
+#	* Replaced pcvt with the 3.31 pcvt entries.
+#	* Freeze for 1.9.7a.
+# 9.11.6 (Mon Nov 13 10:20:24 EST 1995):
+#	* Added emu entry from the X11R6 contrib tape sources.
+#
+# 9.12.0 (Wed Nov 29 04:22:25 EST 1995):
+#	* Improved iris-ansi and sun entries.
+#	* More flash string improvements.
+#	* Corrected wy160 & wy160 as suggested by Robert Dunn
+#	* Added dim to at386.  
+#	* Reconciled pc3 and ibmpc3 with the BSDI termcap file.  Keith says
+#	  he's ready to start using the termcap generated from this one.
+#	* Added vt102-w, vt220-w, xterm-bold, wyse-vp, wy75ap, att4424m,
+#	  ln03, lno3-w, h19-g, z29a*, qdss.  Made vt200 an alias of vt220.
+#	* Improved hpterm, apollo consoles, fos, qvt101, tvi924. tvi925,
+#	  att610, att620, att630, 
+#	* Changed hazeltine name prefix from h to hz.
+#	* Sent t500 to the UFI file.
+#	* I think we've sucked all the juice out of BSDI's termcap file now.
+#	* Freeze for ncurses 1.9.8 release
+# 9.12.1 (Thu Nov 30 03:14:06 EST 1995)
+#	* Unfreeze, linux kbs needed to be fixed.
+#	* Tim Theisen pinned down a bug in the DMD firmware.
+# 9.12.2 (Thu Nov 30 19:08:55 EST 1995):
+#	* Fixes to ansi and klone capabilities (thank you, Aaron Ucko).
+#	  (The broken ones had been shadowed by sgr.)
+# 9.12.3 (Thu Dec  7 17:47:22 EST 1995):
+#	* Added documentation on ECMA-48 standard.
+#	* New Amiga entry.
+# 9.12.4 (Thu Dec 14 04:16:39 EST 1995):
+#	* More ECMA-48 stuff
+#	* Corrected typo in minix entry, added pc-minix.
+#	* Corrected khome/kend in xterm (thank you again, Aaron Ucko).
+#	* Added rxvt entry.
+#	* Added 1.3.x color-change capabilities to linux entry.
+# 9.12.5 (Tue Dec 19 00:22:10 EST 1995):
+#	* Corrected rxvt entry khome/kend.
+#	* Corrected linux color change capabilities.
+#	* NeXT entries from Dave Wetzel.
+#	* Cleaned up if and rf file names (all in /usr/share now).
+#	* Changed linux op capability to avoid screwing up a background color
+#	  pair set by setterm.
+# 9.12.6 (Wed Feb  7 16:14:35 EST 1996):
+#	* Added xterm-sun.
+# 9.12.7 (Fri Feb  9 13:27:35 EST 1996):
+#	* Added visa50.
+#
+# 9.13.0 (Sun Mar 10 00:13:08 EST 1996):
+#	* Another sweep through the Shuford archive looking for new info.
+#	* Added dg100 alias to dg6053 based on a comp.terminals posting.
+# 	* Added st52 from Per Persson.
+#	* Added eterm from the GNU Emacs 19.30 distribution.
+#	* Freeze for 1.9.9.
+# 9.13.1 (Fri Mar 29 14:06:46 EST 1996):
+#	* FreeBSD console entries from Andrew Chernov.
+#	* Removed duplicate Atari st52 name.
+# 9.13.2 (Tue May  7 16:10:06 EDT 1996)
+#	* xterm doesn't actually have ACS_BLOCK.
+#	* Change klone+color setf/setb to simpler forms that can be
+#	  translated into termcap.
+#	* Added xterm1.
+#	* Removed mechanically-generated junk capabilities from cons* entries.
+#	* Added color support to bsdos.
+# 9.13.3 (Thu May  9 10:35:51 EDT 1996):
+#	* Added Wyse 520 entries from Wm. Randolph Franklin <wrf@ecse.rpi.edu>.
+#	* Created ecma+color, linux can use it.  Also added ech to linux.
+#	* Teach xterm about more keys. Add Thomas Dickey's 3.1.2E updates.
+#	* Add descriptions to FreeBSD console entries.  Also shorten
+#	  some aliases to <= 14 chars for portability.
+#	* Added x68k console
+#	* Added OTbs to several VT-series entries.
+# 9.13.4 (Wed May 22 10:54:09 EDT 1996):
+#	* screen entry update for 3.7.1 from Michael Alan Dorfman.
+# 9.13.5 (Wed Jun  5 11:22:41 EDT 1996):
+#	* kterm correction due to Kenji Rikitake.
+#	* ACS correction in vt320-kll due to Phillippe De Muyter.
+# 9.13.6 (Sun Jun 16 15:01:07 EDT 1996):
+#	* Sun console entry correction from J.T. Conklin.
+#	* Changed all DEC VT300 and up terminals to use VT300 tab set
+# 9.13.7 (Mon Jul  8 20:14:32 EDT 1996):
+#	* Added smul to linux entry (we never noticed it was missing 
+#	  because of sgr!).
+#	* Added rmln to hp+labels (deduced from other HP entries).
+#	* Added vt100 acsc capability to vt220, vt340, vt400, d800, dt80-sas,
+#	  pro350, att7300, 5420_2, att4418, att4424, att4426, att505, vt320-k3.
+#	* Corrected vt220 acsc.
+#	* The klone+sgr and klone+sgr-dumb entries now use klone+acs;
+#	  this corresponds to reality and helps prevent some tic warnings.
+#	* Added sgr0 to c101, pcix, vt100-nav, screen2, oldsun, next, altos2,
+#	  hpgeneric, hpansi, hpsub, hp236, hp700-wy, bobcat, dku7003, adm11,
+#	  adm12, adm20, adm21, adm22, adm31, adm36, adm42, pt100, pt200,
+#	  qvt101, tvi910, tvi921, tvi92B, tvi925, tvi950, tvi970, wy30-mc,
+#	  wy50-mc, wy100, wyse-vp, ampex232, regent100, viewpoint, vp90,
+#	  adds980, cit101, cit500, contel300, cs10, dm80, falco, falco-p, 
+#	  f1720a, go140, sb1, superbeeic, microb, ibm8512, kt7, ergo4000,
+#	  owl, uts30, dmterm, dt100, dt100, dt110, appleII, apple-videx,
+#	  lisa, trsII, atari, st52, pc-coherent, basis, m2-man, bg2.0, bg1.25,
+#	  dw3, ln03, ims-ansi, graphos, t16, zen30, xtalk, simterm, d800,
+#	  ifmr, v3220, wy100q, tandem653, ibmaed.
+#	* Added DWK terminal description.
+# 9.13.8 (Wed Jul 10 11:45:21 EDT 1996):
+#	* Many entries now have highlights inherited from adm+sgr.
+#	* xterm entry now corresponds to XFree86 3.1.2E, with color.
+#	* xtitle and xtitle-twm enable access to the X status line.
+#	* Added linux-1.3.6 color palette caps in conventional format.
+#	* Added adm1178 terminal.
+#	* Move fos and apollo terminals to obsolete category.
+#	* Aha! The BRL terminals file told us what the Iris extensions mean.
+#	* Added, from the BRL termcap file: rt6221, rt6221-w, northstar,
+#	  commodore, cdc721-esc, excel62, osexec.  Replaced from the BRL file:
+#	  cit500, adm11. 
+# 9.13.9 (Mon Jul 15 00:32:51 EDT 1996):
+#	* Added, from the BRL termcap file: cdc721, cdc721l, cdc752, cdc756,
+#	  aws, awsc, zentec8001, modgraph48, rca vp3301/vp3501, ex155.
+#	* Corrected, from BRL termcap file: vi50.
+#	* Better rxvt entry & corrected xterm entries from Thomas Dickey.
+# 9.13.10 (Mon Jul 15 12:20:13 EDT 1996):
+#	* Added from BRL: cit101e & variants, hmod1, vi200, ansi77, att5620-1,
+#	  att5620-s, att5620-s, dg210, aas1901, hz1520, hp9845, osborne
+#	  (old osborne moved to osborne-w), tvi970-vb, tvi970-2p, tvi925-hi,
+#	  tek4105brl, tek4106brl, tek4107brl,tek4109brl, hazel, aepro,
+#	  apple40p, apple80p, appleIIgs, apple2e, apple2e-p, apple-ae.
+#	* Paired-attribute fixes to various terminals.
+#	* Sun entry corrections from A. Lukyanov & Gert-Jan Vons.
+#	* xterm entry corrections from Thomas Dickey.
+# 9.13.11 (Tue Jul 30 16:42:58 EDT 1996):
+#	* Added t916 entry, translated from a termcap in SCO's support area.
+#	* New qnx entry from Michael Hunter.
+# 9.13.12 (Mon Aug  5 14:31:11 EDT 1996):
+#	* Added hpex2 from Ville Sulko.
+#	* Fixed a bug that ran the qnx and pcvtXX together.
+# 9.13.13 (Fri Aug  9 01:16:17 EDT 1996):
+#	* Added dtterm entry from Solaris CDE.
+# 9.13.14 (Tue Sep 10 15:31:56 EDT 1996):
+#	* corrected pairs#8 typo in dtterm entry.
+#	* added tvi9065.
+# 9.13.15 (Sun Sep 15 02:47:05 EDT 1996):
+#	* updated xterm entry to cover 3.1.2E's new features.  
+# 9.13.16 (Tue Sep 24 12:47:43 EDT 1996):
+#	* Added new minix entry
+#	* Removed aliases of the form ^[0-9]* for obsolete terminals.
+#	* Commented out linux-old, nobody's using pre-1.2 kernels now.
+# 9.13.17 (Fri Sep 27 13:25:38 EDT 1996):
+#	* Added Prism entries and kt7ix.
+#	* Caution notes about EWAN and tabset files.
+#	* Changed /usr/lib/tabset -> /usr/share/tabset.
+#	* Added acsc/rmacs/smacs to vt52.
+# 9.13.18 (Mon Oct 28 13:24:59 EST 1996):
+#	* Merged in Thomas Dickey's reorganization of the xterm entries;
+#	  added technical corrections to avoid warning messages.
+# 9.13.19 (Sat Nov 16 16:05:49 EST 1996):
+#	* Added rmso=\E[27m in Linux entry.
+#	* Added koi8-r support for Linux console.
+#	* Replace xterm entries with canonical ones from XFree86 3.2.
+# 9.13.20 (Sun Nov 17 23:02:51 EST 1996):
+#	* Added color_xterm from Jacob Mandelson
+# 9.13.21 (Mon Nov 18 12:43:42 EST 1996):
+#	* Back off the xterm entry to use r6 as a base.
+# 9.13.22 (Sat Nov 30 11:51:31 EST 1996):
+#	* Added dec-vt220 at Adrian Garside's request.
+# 9.13.23 (Fri Feb 21 16:36:06 EST 1997):
+#	* Replaced minitel-2 entry.
+#	* Added MGR, ansi-nt.
+#	* Minor corrections to xterm entries.
+#	* Replaced EWAN telnet entry.
+#	* Dropped the reorder script generator.  It was a fossil.
+# 9.13.24 (Sun Feb 23 20:55:23 EST 1997):
+#	* Thorsten Lockert added termcap `bs' to a lot of types, working from
+#	  the 4.4BSD Lite2 file.
+# 9.13.25 (Fri Jun 20 12:33:36 EDT 1997):
+#	* Added Datapoint 8242, pilot, ansi_psx, rbcomm, vt220js.
+#	* Updated iris-ansi; corrected vt102-w.
+#	* Switch base xterm entry to 3.3 level.
+# 9.13.26 (Mon Jun 30 22:45:45 EDT 1997)
+#	* Added basic4.
+#	* Removed rmir/smir from tv92B.
+#
+# 10.2.0 (Sat Feb 28 12:47:36 EST 1998):
+#	* add hds200 description (Walter Skorski)
+#	* add beterm entry (Fred Fish)
+#	* add Thomas Dickey's xterm-xf86-v40, xterm-8bit, xterm-16color,
+#	  iris-color entries.
+#	* add emx entries.
+#	* Replaced unixpc entry with Benjamin Sittler's corrected version.
+#	* Replaced xterm/rxvt/emu/syscons entries with Thomas Dickey's
+#	  versions.
+#	* remove sgr string from qnx based on report by Xiaodan Tang
+#	* Added u8/u9, removed rmul/smul from sun-il.
+#	* 4.2 tic displays \0 rather than \200.
+#	* add linux-koi8r to replace linux-koi8 (which uses a corrupt acsc,
+#	  apparently based on cp-866).
+#	* Merged in Pavel Roskin's acsc for linux-koi8
+#	* Corrected some erroneous \\\s to \.
+#	* 4.2 ncurses has been changed to use setaf/setab, consistent w/SysV.
+#	* II -> ii in pcvtXX, screen, xterm.
+#	* Removed \n chars following ANSI escapes in sgr & friends.
+#	* Updated Wyse entries.
+#	* h19 corrections from Tim Pierce.
+#	* Noted that the dm2500 has both ich and smir.
+#	* added pccons for the Alpha under OSF/1.
+#	* Added Sony NEWS workstation entries and cit101e-rv.
+#	* Reverted `amiga'; to Kent Polk's version, as I'm told
+#	  the Verkuil entry messes up with Amiga Telnet.
+# 10.2.1 (Sun Mar  8 18:32:04 EST 1998):
+#	* Corrected attributions in 10.2.0 release notes.
+#	* Scanned the Shuford archive for new terminfos and information.
+#	* Removed sgr from qnx entry (Thomas Dickey).
+#	* Added entries for ICL and Kokusai Data Systems terminals.
+#	* Incorporated NCR terminfos from the Boundless Technology FTP site.
+#	* Incorporated att700 from the Boundless Technology FTP site.
+#	* Miscellaneous contact-address and Web-page updates.
+# 10.2.2 (Thu May  7 12:18:04 EDT 1998):
+#	* Moved Altos to OBSOLETE UNIX CONSOLES
+#	* Moved Hewlett-Packard terminals to OLDER TERMINAL TYPES, except for
+#	  the 700s which go to WORKSTATION CONSOLES.
+#	* Major reorganization of ANSI/console/VT types.  Moved vt52 to the
+#	  obsolete section.
+#	* Daisy-wheel printers moved to UFO file.
+# 10.2.3 (Tue May 12 22:59:11 EDT 1998):
+#	* Commented out hds200 is2 to avoid overflowing terminfo length limit.
+#	* Restored OT capabilities to UFO file.
+#	* add nxterm and xterm-color terminfo description (request by Cristian
+#	  Gafton <gafton@redhat.com>).
+#	* Modify rxvt terminfo description to clear alternate screen before
+#	  switching back to normal screen, for compatibility with applications
+#	  which use xterm (reported by Manoj Kasichainula <manojk@io.com>).
+#	* Modify linux terminfo description to reset color palette (reported
+#	  by Telford Tendys <telford@eng.uts.edu.au>).
+# 10.2.4 (Thu Jul  2 18:13:26 EDT 1998):
+#	* Added minitel1 entries from Alexander Montaron.
+#	* Added qnxt2 from Federico Bianchi.
+# 10.2.5: (Mon Aug 24 07:32:34 EDT 1998):
+#	* Resolve NetBSD Problem Report #4583 by adding civis/cnorm to pcvtXX.
+#	* dtterm enacs correction from Alexander V. Lukyanov.
+#	* Added ncsa-telnet, resolving Debian bug report 25341.
+#	* Added Francesco Potorti's tuned Wyse 99 entries.
+# 10.2.6: (Mon Dec 21 00:49:43 EST 1998):
+#	* Home site has changed.
+# 10.2.7: (Wed Mar  3 15:53:04 EST 1999):
+#	* Documentation fixes, mainly from David J. Mackenzie.
+#
+# 11.0.0: (Wed Mar  1 22:02:03 EST 2000)
+#	* BSD/OS console fixes from Jeffrey Honig at BSDI.
+#       ** TD's branch changes up to his 1999/10/23 version begin here 
+#	* Added arm100 terminfo entries from Dave Millen.
+#	* Added Data General entries from Hasufin.
+#	* NCSA telnet entry from Francesco Potorti as modified by TD.
+#	* Added teraterm, crt, ms-vt100, mach, mach-bold, linux-lat,
+#	  ofcons, wsvt25, wsvt25m, rcons, rcons-color, cygwin, amiga-8bit,
+#	  ibm3161-C, ibm3162.
+#	* Updated xterm entries, BSD/OS entries, AIX entries.
+#	* Updated linux, iris-ansi, screen, beterm entries.
+#	* Added full function keys for scoansi.
+#	* Typo fixes for icl6404, osborne, eterm. att6386
+#	* Corrected hp70092 acsc.
+#	* Added ibmpc from AIX 3.2.5; ibm-pc is no longer a synonym.
+#	* Added ibm5151 from AIX 3.2.5; ibmmono is no longer a synonym.
+#	* Added ibm5154 from AIX 3.2.5; ibmega is no longer a synonym.
+#	* Merged acsc, s0ds, s1ds, sgr0 into ibm5081 from AIX 3.2.5.
+#	* Merged kend, knp, kpp, mc4, mc5 into ibm3161 in from AIX 3.2.5.
+#	* Merged acsc into hft-c from AIX 3.2.5.
+#	* Updated ibm3151 from AIX 3.2.5.
+#	* Errors in TD's branch not accepted: ibm3101, ibm3151, ibm8514
+#	* Merged msgr,colors,pairs,setb,setf into ibm3164 from AIX 3.2.5.
+#	** TD's branch changes end here
+#	* Address updates from various contributors.
+#	* Historical info on basis console.
+#	* Ty Sarna's corrections to the amiga entry.
+#	* Add Kevin Turner's entry for the Wyse 85 in 8-bit mode.
+#	* Added 22 Bull-Questar terminal variants from AIX 4.1.5
+#	* Added OSF/1 console and lft from AIX 4.1.5.
+#	* Move vt2220 to vt220-old, vt220-8 to vt220, introduce vt220-8bit
+#	  from AIX 4.1.5.
+#	* swtp moved to UFO file (only 20 lines).
+#	* Added pcmw.
+# 11.0.1: (Thu Mar  2 10:49:21 EST 2000):
+#	* Disabled hpa, vpa, in rxvt.
+#	* Incorporated ansi components and generic-ansi.
+#
+# The following sets edit modes for GNU EMACS.
+# Local Variables:
+# fill-prefix:"\t"
+# fill-column:75
+# comment-column:0
+# comment-start-skip:"^#+"
+# comment-start:"# "
+# compile-command:"tic -c termtypes.master"
+# End:
+######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/source/a/file/file.SlackBuild b/source/a/file/file.SlackBuild
new file mode 100755
index 000000000..aaa0ca41f
--- /dev/null
+++ b/source/a/file/file.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# Copyright 2005-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=5.03
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+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"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-file
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf file-$VERSION
+tar xvf $CWD/file-$VERSION.tar.?z* || exit 1
+cd file-$VERSION || exit 1
+
+# Make the default data directory /etc/file like it has always been:
+zcat $CWD/file.etc.file.diff.gz | patch -p1 --verbose || exit 1
+# This is needed after the patch above:
+autoreconf || 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 {} \;
+
+# Don't spew warnings about using the flat text files
+zcat $CWD/file.quiet.diff.gz | patch -p1 -E --verbose || exit 1
+# I don't know what this one does
+zcat $CWD/file.short.diff.gz | patch -p1 -E --verbose || exit 1
+
+# Add zisofs and crda regulatory bin detection
+zcat $CWD/file.zisofs.magic.gz >> magic/Magdir/compress
+zcat $CWD/file.crdaregbin.magic.gz >> magic/Magdir/crdaregbin
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --datadir=/etc \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/file-$VERSION \
+  --enable-fsect-man5 \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Is file really this much of a processing bottleneck?  Doubtful.
+#
+# NOTE:  Benchmarked flat files vs. .mgc June 2009, found no measurable
+# difference on 3000+ files.
+#
+# If you really need these (let's say you're doing virus scanning
+# and this *would* speed things up quite a bit) you can create
+# the pre-parsed file yourself using file's -C option.
+rm -f $PKG/etc/file/magic.mgc
+mkdir -p $PKG/etc/file/magic
+cp -a magic/Magdir/* $PKG/etc/file/magic
+# After building, this works fine.  /etc/file/magic/ takes up 1.2M,
+# while the magic.mgc file is 1.7M.  Considering a difference of 500k,
+# and the potential speedup, I'm not sure it's worth the effort...
+# but it does make it easier for an admin to add a small chunk of
+# new magic.
+
+# IMHO, moving this sort of thing does not make sense.
+# We'll support both the traditional and new locations.
+# I hate to squat on a name as generic as "/etc/misc/",
+# but it wasn't my idea.
+( cd $PKG/etc ; ln -sf file misc )
+
+# Strip everything for good measure:
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+( cd $PKG/usr/man || exit 1
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/usr/doc/file-$VERSION
+cp -a \
+  AUTHORS COPYING INSTALL MAINT NEWS README TODO \
+    $PKG/usr/doc/file-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/file-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/file/file.crdaregbin.magic b/source/a/file/file.crdaregbin.magic
new file mode 100644
index 000000000..bff01854f
--- /dev/null
+++ b/source/a/file/file.crdaregbin.magic
@@ -0,0 +1,5 @@
+# CRDA Regulatory database file
+# http://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git;a=summary
+# (see regdb.h)
+0       belong          0x52474442      CRDA regulatory database file
+>4      belong          19              (Version 1)
diff --git a/source/a/file/file.etc.file.diff b/source/a/file/file.etc.file.diff
new file mode 100644
index 000000000..98e075486
--- /dev/null
+++ b/source/a/file/file.etc.file.diff
@@ -0,0 +1,11 @@
+--- ./configure.ac.orig	2009-05-06 15:32:25.000000000 -0500
++++ ./configure.ac	2009-06-12 17:40:25.000000000 -0500
+@@ -47,7 +47,7 @@
+   fsect=4
+ ])
+ 
+-AC_SUBST([pkgdatadir], ['$(datadir)/misc'])
++AC_SUBST([pkgdatadir], ['$(datadir)/file'])
+ AC_SUBST(fsect)
+ AM_CONDITIONAL(FSECT5, test x$fsect = x5)
+ 
diff --git a/source/a/file/file.quiet.diff b/source/a/file/file.quiet.diff
new file mode 100644
index 000000000..198f62df5
--- /dev/null
+++ b/source/a/file/file.quiet.diff
@@ -0,0 +1,14 @@
+diff -Nur file-5.00.orig/src/apprentice.c file-5.00/src/apprentice.c
+--- file-5.00.orig/src/apprentice.c	2009-02-03 14:27:51.000000000 -0600
++++ file-5.00/src/apprentice.c	2009-02-08 22:19:19.215635230 -0600
+@@ -285,8 +285,8 @@
+ 
+ #ifndef COMPILE_ONLY
+ 	if ((rv = apprentice_map(ms, &magic, &nmagic, fn)) == -1) {
+-		if (ms->flags & MAGIC_CHECK)
+-			file_magwarn(ms, "using regular magic file `%s'", fn);
++		/* if (ms->flags & MAGIC_CHECK)
++			file_magwarn(ms, "using regular magic file `%s'", fn); */
+ 		rv = apprentice_load(ms, &magic, &nmagic, fn, action);
+ 		if (rv != 0)
+ 			return -1;
diff --git a/source/a/file/file.short.diff b/source/a/file/file.short.diff
new file mode 100644
index 000000000..be47218c5
--- /dev/null
+++ b/source/a/file/file.short.diff
@@ -0,0 +1,12 @@
+diff -Nur file-5.00.orig/src/readelf.h file-5.00/src/readelf.h
+--- file-5.00.orig/src/readelf.h	2008-05-28 15:58:16.000000000 -0500
++++ file-5.00/src/readelf.h	2009-02-08 22:17:26.681636542 -0600
+@@ -233,7 +233,7 @@
+ #define NT_OPENBSD_VERSION	1
+ #define NT_DRAGONFLY_VERSION	1
+ /* GNU executables (name = "GNU") */
+-#define NT_GNU_VERSION		1
++#define NT_GNU_VERSION		0
+ 
+ /* GNU OS tags */
+ #define GNU_OS_LINUX	0
diff --git a/source/a/file/file.xz.magic b/source/a/file/file.xz.magic
new file mode 100644
index 000000000..9aa36e45a
--- /dev/null
+++ b/source/a/file/file.xz.magic
@@ -0,0 +1,9 @@
+
+# XZ (Lempel-Ziv-Markov chain-Algorithm) file format supported by:
+#   - 7-Zip <http://7-zip.org/>
+#   - LZMA SDK <http://7-zip.org/sdk.html>
+#   - XZ Utils <http://tukaani.org/xz/>
+#
+0	ustring		\xFD7zXZ\x00	xz compressed data,
+>6	ubyte&0x10	0x00		single-block stream
+>6	ubyte&0x10	0x10		multi-block stream
diff --git a/source/a/file/file.zisofs.magic b/source/a/file/file.zisofs.magic
new file mode 100644
index 000000000..9aeb61edd
--- /dev/null
+++ b/source/a/file/file.zisofs.magic
@@ -0,0 +1,8 @@
+
+#------------------------------------------------------------------------------
+# zisofs: file(1) magic for zisofs/RockRidge compressed files
+#
+# from H. Peter Anvin <hpa@zytor.com> May 4, 2001
+#
+0	string	\x37\xE4\x53\x96\xC9\xDB\xD6\x07	zisofs/Rockridge compressed file
+>8	lelong		x		- %d bytes
diff --git a/source/a/file/slack-desc b/source/a/file/slack-desc
new file mode 100644
index 000000000..96be26176
--- /dev/null
+++ b/source/a/file/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------------------------------------------------------|
+file: file (a utility to determine file type)
+file:
+file: This is Ian F. Darwin's 'file' utility, used to identify files.
+file: Christos Zoulas has been file's maintainer since 1994.
+file:
+file:
+file:
+file:
+file:
+file:
+file:
diff --git a/source/a/findutils/findutils.SlackBuild b/source/a/findutils/findutils.SlackBuild
new file mode 100755
index 000000000..aca93a0cc
--- /dev/null
+++ b/source/a/findutils/findutils.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=4.4.2
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-findutils
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf findutils-$VERSION
+tar xvf $CWD/findutils-$VERSION.tar.?z* || exit 1
+cd findutils-$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 {} \;
+
+# We use slocate instead of these:
+zcat $CWD/findutils.nolocate.diff.gz | patch -p1 --verbose || exit 1
+
+# Don't output warnings by default.  Let's make the crazy assumption that the
+# user actually does know what they are doing, and will use -warn if they'd
+# like to be yelled at.
+zcat $CWD/findutils.no.default.options.warnings.diff.gz | patch -p1 --verbose || exit 1
+
+# Feel free to change the "--without-fts" if you like find to be faster and
+# less reliable.  With the current setting, "find" will be non-fts(), and
+# ftsfind will still be there if you want to use it.
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-locate \
+  --without-fts \
+  --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/usr/doc/findutils-$VERSION
+cp -a \
+  AUTHORS COPYING* NEWS README* THANKS TODO \
+  $PKG/usr/doc/findutils-$VERSION
+
+# 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
+
+# Compress info pages and purge "dir" file from the package:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/findutils-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/findutils/findutils.no.default.options.warnings.diff b/source/a/findutils/findutils.no.default.options.warnings.diff
new file mode 100644
index 000000000..2b1076731
--- /dev/null
+++ b/source/a/findutils/findutils.no.default.options.warnings.diff
@@ -0,0 +1,11 @@
+--- ./find/util.c.orig	2008-03-10 04:37:22.000000000 -0500
++++ ./find/util.c	2009-02-21 15:50:38.000000000 -0600
+@@ -910,7 +910,7 @@
+   
+   if (isatty(0))
+     {
+-      p->warnings = true;
++      p->warnings = false;
+       p->literal_control_chars = false;
+     }
+   else
diff --git a/source/a/findutils/findutils.nolocate.diff b/source/a/findutils/findutils.nolocate.diff
new file mode 100644
index 000000000..920b57baf
--- /dev/null
+++ b/source/a/findutils/findutils.nolocate.diff
@@ -0,0 +1,22 @@
+--- ./Makefile.am.orig	2009-02-21 15:09:54.000000000 -0600
++++ ./Makefile.am	2009-02-21 15:18:43.000000000 -0600
+@@ -4,7 +4,7 @@
+ EXTRA_DIST = COPYING ChangeLog TODO config.h.in stamp-h.in \
+ 		THANKS import-gnulib.sh import-gnulib.config
+ # "tests" is the gnulib unit test dir.
+-SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4 
++SUBDIRS = gnulib tests build-aux lib find xargs doc po m4 
+ 
+ ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
+ 
+--- ./Makefile.in.orig	2009-02-21 15:09:54.000000000 -0600
++++ ./Makefile.in	2009-02-21 15:18:56.000000000 -0600
+@@ -572,7 +572,7 @@
+ 		THANKS import-gnulib.sh import-gnulib.config
+ 
+ # "tests" is the gnulib unit test dir.
+-SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4 
++SUBDIRS = gnulib tests build-aux lib find xargs doc po m4 
+ ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
+ TESTFILE_SUFFIXES = .exp .xo .xe .xi
+ all: config.h
diff --git a/source/a/findutils/slack-desc b/source/a/findutils/slack-desc
new file mode 100644
index 000000000..f26e47217
--- /dev/null
+++ b/source/a/findutils/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------------------------------------------------------|
+findutils: findutils (utilities to locate files)
+findutils:
+findutils: This package contains the GNU find and xargs programs.  The find and
+findutils: xargs implementations comply with POSIX 1003.2.  They also support
+findutils: some additional options, some borrowed from Unix and some unique to
+findutils: GNU.
+findutils:
+findutils:
+findutils:
+findutils:
+findutils:
diff --git a/source/a/floppy/fdutils-5.4-20020222.diff b/source/a/floppy/fdutils-5.4-20020222.diff
new file mode 100644
index 000000000..28a7b0405
--- /dev/null
+++ b/source/a/floppy/fdutils-5.4-20020222.diff
@@ -0,0 +1,2991 @@
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/Changelog fdutils/Changelog
+--- fdutils-5.4/Changelog	Sat Jun  3 16:29:33 2000
++++ fdutils/Changelog	Sun Feb  3 23:51:42 2002
+@@ -1,3 +1,9 @@
++020203	Fix fdmount and superformat bugs
++020203	Create /dev/fd0 before testing for existence of /dev/fd0
++011002	Fix floppycontrol.c printf conditional on FD_DISK_CHANGED, so that
++	it works with gcc3 which apparently considers printf as a macro...
++000612	Explicitly include sysmacros.h, apparently this is needed in
++	certain environments
+ 000603	Released 5.4
+ 000527	Fixed a couple of buffer overrun exploits and other cleanup. Made
+ 	fdutils compilable with Linux 2.3/2.4 kernels. Documentation fixes
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/INSTALL fdutils/INSTALL
+--- fdutils-5.4/INSTALL	Thu Jul  1 19:48:19 1999
++++ fdutils/INSTALL	Mon May 21 00:24:21 2001
+@@ -8,14 +8,17 @@
+  3. Compile the utilities:
+      make
+ 
+- 3. Run the MAKEFLOPPIES script to create the device files:
++ 4. Install:
++     make install
++
++ 5. Run the MAKEFLOPPIES script to create the device files:
+       cd /dev
+       MAKEFLOPPIES
+ 
+- 4. Enjoy!
++ 6. Enjoy!
+  I you have any questions, feel free to ask!
+ 
+- 5. You might also want to get a recent version of mtools (later than
++ 7. You might also want to get a recent version of mtools (later than
+ 3.0)
+ 
+    A. Knaff
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/config.guess fdutils/config.guess
+--- fdutils-5.4/config.guess	Tue Jun 17 22:37:13 1997
++++ fdutils/config.guess	Mon May 21 00:24:45 2001
+@@ -1,7 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
+-#
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++#   Free Software Foundation, Inc.
++
++timestamp='2001-04-20'
++
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+@@ -22,18 +25,92 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # Written by Per Bothner <bothner@cygnus.com>.
+-# The master version of this file is at the FSF in /home/gd/gnu/lib.
++# Please send patches to <config-patches@gnu.org>.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+ # The plan is that this can be called by configure scripts if you
+-# don't specify an explicit system type (host/target name).
+-#
+-# Only a few systems have been added to this list; please add others
+-# (but try to keep the structure clean).
+-#
++# don't specify an explicit build system type.
++
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION]
++
++Output the configuration name of the system \`$me' is run on.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.guess ($timestamp)
++
++Originally written by Per Bothner.
++Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help" >&2
++       exit 1 ;;
++    * )
++       break ;;
++  esac
++done
++
++if test $# != 0; then
++  echo "$me: too many arguments$help" >&2
++  exit 1
++fi
++
++
++dummy=dummy-$$
++trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
++
++# CC_FOR_BUILD -- compiler used by this script.
++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
++# use `HOST_CC' if defined, but it is deprecated.
++
++case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int dummy(){}" > $dummy.c
++	for c in cc gcc c89 ; do
++	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
++	  if test $? = 0 ; then
++	     CC_FOR_BUILD="$c"; break
++	  fi
++	done
++	rm -f $dummy.c $dummy.o $dummy.rel
++	if test x"$CC_FOR_BUILD" = x ; then
++	  CC_FOR_BUILD=no_compiler_found
++	fi
++	;;
++ ,,*)   CC_FOR_BUILD=$CC ;;
++ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
++esac
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi@noc.rutgers.edu 8/24/94.)
+@@ -43,37 +120,162 @@
+ 
+ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+-
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++    *:NetBSD:*:*)
++	# Netbsd (nbsd) targets should (where applicable) match one or
++	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
++	# switched to ELF, *-*-netbsd* would select the old
++	# object file format.  This provides both forward
++	# compatibility and a consistent mechanism for selecting the
++	# object file format.
++	# Determine the machine/vendor (is the vendor relevant).
++	case "${UNAME_MACHINE}" in
++	    amiga) machine=m68k-unknown ;;
++	    arm32) machine=arm-unknown ;;
++	    atari*) machine=m68k-atari ;;
++	    sun3*) machine=m68k-sun ;;
++	    mac68k) machine=m68k-apple ;;
++	    macppc) machine=powerpc-apple ;;
++	    hp3[0-9][05]) machine=m68k-hp ;;
++	    ibmrt|romp-ibm) machine=romp-ibm ;;
++	    *) machine=${UNAME_MACHINE}-unknown ;;
++	esac
++	# The Operating System including object format, if it has switched
++	# to ELF recently, or will in the future.
++	case "${UNAME_MACHINE}" in
++	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
++		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++			| grep __ELF__ >/dev/null
++		then
++		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++		    # Return netbsd for either.  FIX?
++		    os=netbsd
++		else
++		    os=netbsdelf
++		fi
++		;;
++	    *)
++	        os=netbsd
++		;;
++	esac
++	# The OS release
++	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
++	# contains redundant information, the shorter form:
++	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
++	echo "${machine}-${os}${release}"
++	exit 0 ;;
+     alpha:OSF1:*:*)
++	if test $UNAME_RELEASE = "V4.0"; then
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
++	fi
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
++	cat <<EOF >$dummy.s
++	.data
++\$Lformat:
++	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
++
++	.text
++	.globl main
++	.align 4
++	.ent main
++main:
++	.frame \$30,16,\$26,0
++	ldgp \$29,0(\$27)
++	.prologue 1
++	.long 0x47e03d80 # implver \$0
++	lda \$2,-1
++	.long 0x47e20c21 # amask \$2,\$1
++	lda \$16,\$Lformat
++	mov \$0,\$17
++	not \$1,\$18
++	jsr \$26,printf
++	ldgp \$29,0(\$26)
++	mov 0,\$16
++	jsr \$26,exit
++	.end main
++EOF
++	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
++	if test "$?" = 0 ; then
++		case `./$dummy` in
++			0-0)
++				UNAME_MACHINE="alpha"
++				;;
++			1-0)
++				UNAME_MACHINE="alphaev5"
++				;;
++			1-1)
++				UNAME_MACHINE="alphaev56"
++				;;
++			1-101)
++				UNAME_MACHINE="alphapca56"
++				;;
++			2-303)
++				UNAME_MACHINE="alphaev6"
++				;;
++			2-307)
++				UNAME_MACHINE="alphaev67"
++				;;
++		esac
++	fi
++	rm -f $dummy.s $dummy
++	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	exit 0 ;;
++    Alpha\ *:Windows_NT*:*)
++	# How do we know it's Interix rather than the generic POSIX subsystem?
++	# Should we change UNAME_MACHINE based on the output of uname instead
++	# of the specific Alpha model?
++	echo alpha-pc-interix
+ 	exit 0 ;;
+     21064:Windows_NT:50:3)
+ 	echo alpha-dec-winnt3.5
+ 	exit 0 ;;
+     Amiga*:UNIX_System_V:4.0:*)
+-	echo m68k-cbm-sysv4
++	echo m68k-unknown-sysv4
+ 	exit 0;;
+-    amiga:NetBSD:*:*)
+-      echo m68k-cbm-netbsd${UNAME_RELEASE}
+-      exit 0 ;;
+     amiga:OpenBSD:*:*)
+-      echo m68k-cbm-openbsd${UNAME_RELEASE}
+-      exit 0 ;;
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:[Aa]miga[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-amigaos
++	exit 0 ;;
++    arc64:OpenBSD:*:*)
++	echo mips64el-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    arc:OpenBSD:*:*)
++	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    hkmips:OpenBSD:*:*)
++	echo mips-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    pmax:OpenBSD:*:*)
++	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    sgi:OpenBSD:*:*)
++	echo mips-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    wgrisc:OpenBSD:*:*)
++	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:OS/390:*:*)
++	echo i370-ibm-openedition
++	exit 0 ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
++    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
++	echo hppa1.1-hitachi-hiuxmpp
++	exit 0;;
++    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ 		echo pyramid-pyramid-sysv3
+@@ -81,9 +283,12 @@
+ 		echo pyramid-pyramid-bsd
+ 	fi
+ 	exit 0 ;;
+-    NILE:*:*:dcosx)
++    NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+ 	exit 0 ;;
++    sun4H:SunOS:5.*:*)
++	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit 0 ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+@@ -108,26 +313,61 @@
+     sun3*:SunOS:*:*)
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
++    sun*:*:4.2BSD:*)
++	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
++	case "`/bin/arch`" in
++	    sun3)
++		echo m68k-sun-sunos${UNAME_RELEASE}
++		;;
++	    sun4)
++		echo sparc-sun-sunos${UNAME_RELEASE}
++		;;
++	esac
++	exit 0 ;;
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+-    atari*:NetBSD:*:*)
+-	echo m68k-atari-netbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     atari*:OpenBSD:*:*)
+-	echo m68k-atari-openbsd${UNAME_RELEASE}
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    sun3*:NetBSD:*:*)
+-	echo m68k-sun-netbsd${UNAME_RELEASE}
++    # The situation for MiNT is a little confusing.  The machine name
++    # can be virtually everything (everything which is not
++    # "atarist" or "atariste" at least should have a processor
++    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
++    # to the lowercase version "mint" (or "freemint").  Finally
++    # the system name "TOS" denotes a system which is actually not
++    # MiNT.  But MiNT is downward compatible to TOS, so this should
++    # be no problem.
++    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit 0 ;;
+-    sun3*:OpenBSD:*:*)
+-	echo m68k-sun-openbsd${UNAME_RELEASE}
++    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
++	echo m68k-atari-mint${UNAME_RELEASE}
++        exit 0 ;;
++    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit 0 ;;
+-    mac68k:NetBSD:*:*)
+-	echo m68k-apple-netbsd${UNAME_RELEASE}
++    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
++        echo m68k-milan-mint${UNAME_RELEASE}
++        exit 0 ;;
++    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
++        echo m68k-hades-mint${UNAME_RELEASE}
++        exit 0 ;;
++    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
++        echo m68k-unknown-mint${UNAME_RELEASE}
++        exit 0 ;;
++    sun3*:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mac68k:OpenBSD:*:*)
+-	echo m68k-apple-openbsd${UNAME_RELEASE}
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvme68k:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvme88k:OpenBSD:*:*)
++	echo m88k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+@@ -141,9 +381,17 @@
+     VAX*:ULTRIX*:*:*)
+ 	echo vax-dec-ultrix${UNAME_RELEASE}
+ 	exit 0 ;;
++    2020:CLIX:*:* | 2430:CLIX:*:*)
++	echo clipper-intergraph-clix${UNAME_RELEASE}
++	exit 0 ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+-	sed 's/^	//' << EOF >dummy.c
+-	int main (argc, argv) int argc; char **argv; {
++	sed 's/^	//' << EOF >$dummy.c
++#ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
++	int main (int argc, char *argv[]) {
++#else
++	int main (argc, argv) int argc; char *argv[]; {
++#endif
+ 	#if defined (host_mips) && defined (MIPSEB)
+ 	#if defined (SYSTYPE_SYSV)
+ 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+@@ -158,12 +406,15 @@
+ 	  exit (-1);
+ 	}
+ EOF
+-	${CC-cc} dummy.c -o dummy \
+-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && rm dummy.c dummy && exit 0
+-	rm -f dummy.c dummy
++	$CC_FOR_BUILD $dummy.c -o $dummy \
++	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
++	  && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
++    Motorola:PowerMAX_OS:*:*)
++	echo powerpc-motorola-powermax
++	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
+@@ -179,15 +430,18 @@
+     AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
++	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	then
++	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
++	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    then
+ 		echo m88k-dg-dgux${UNAME_RELEASE}
+-	else
++	    else
+ 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++	    fi
++	else
++	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+-        else echo i586-dg-dgux${UNAME_RELEASE}
+-        fi
+  	exit 0 ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+@@ -208,12 +462,20 @@
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+ 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+-    i?86:AIX:*:*)
++    i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+ 	exit 0 ;;
++    ia64:AIX:*:*)
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	exit 0 ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+-		sed 's/^		//' << EOF >dummy.c
++		sed 's/^		//' << EOF >$dummy.c
+ 		#include <sys/systemcfg.h>
+ 
+ 		main()
+@@ -224,8 +486,8 @@
+ 			exit(0);
+ 			}
+ EOF
+-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+-		rm -f dummy.c dummy
++		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
++		rm -f $dummy.c $dummy
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+@@ -233,8 +495,9 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit 0 ;;
+-    *:AIX:*:4)
+-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
++    *:AIX:*:[45])
++	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
++	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+@@ -242,7 +505,7 @@
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+-		IBM_REV=4.${UNAME_RELEASE}
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ 	exit 0 ;;
+@@ -252,7 +515,7 @@
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit 0 ;;
+-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
++    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+ 	exit 0 ;;                           # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+@@ -267,18 +530,75 @@
+     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ 	echo m68k-hp-bsd4.4
+ 	exit 0 ;;
+-    9000/[3478]??:HP-UX:*:*)
++    9000/[34678]??:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+ 	    9000/31? )            HP_ARCH=m68000 ;;
+ 	    9000/[34]?? )         HP_ARCH=m68k ;;
+-	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
+-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
++	    9000/[678][0-9][0-9])
++              case "${HPUX_REV}" in
++                11.[0-9][0-9])
++                  if [ -x /usr/bin/getconf ]; then
++                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++                    case "${sc_cpu_version}" in
++                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                      532)                      # CPU_PA_RISC2_0
++                        case "${sc_kernel_bits}" in
++                          32) HP_ARCH="hppa2.0n" ;;
++                          64) HP_ARCH="hppa2.0w" ;;
++                        esac ;;
++                    esac
++                  fi ;;
++              esac
++              if [ "${HP_ARCH}" = "" ]; then
++              sed 's/^              //' << EOF >$dummy.c
++
++              #define _HPUX_SOURCE
++              #include <stdlib.h>
++              #include <unistd.h>
++
++              int main ()
++              {
++              #if defined(_SC_KERNEL_BITS)
++                  long bits = sysconf(_SC_KERNEL_BITS);
++              #endif
++                  long cpu  = sysconf (_SC_CPU_VERSION);
++
++                  switch (cpu)
++              	{
++              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++              	case CPU_PA_RISC2_0:
++              #if defined(_SC_KERNEL_BITS)
++              	    switch (bits)
++              		{
++              		case 64: puts ("hppa2.0w"); break;
++              		case 32: puts ("hppa2.0n"); break;
++              		default: puts ("hppa2.0"); break;
++              		} break;
++              #else  /* !defined(_SC_KERNEL_BITS) */
++              	    puts ("hppa2.0"); break;
++              #endif
++              	default: puts ("hppa1.0"); break;
++              	}
++                  exit (0);
++              }
++EOF
++	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
++	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
++	rm -f $dummy.c $dummy
++	fi ;;
+ 	esac
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
++    ia64:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux${HPUX_REV}
++	exit 0 ;;
+     3050*:HI-UX:*:*)
+-	sed 's/^	//' << EOF >dummy.c
++	sed 's/^	//' << EOF >$dummy.c
+ 	#include <unistd.h>
+ 	int
+ 	main ()
+@@ -303,8 +623,8 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+-	rm -f dummy.c dummy
++	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+@@ -313,13 +633,16 @@
+     9000/8??:4.3bsd:*:*)
+ 	echo hppa1.0-hp-bsd
+ 	exit 0 ;;
++    *9??*:MPE/iX:*:*)
++	echo hppa1.0-hp-mpeix
++	exit 0 ;;
+     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ 	echo hppa1.1-hp-osf
+ 	exit 0 ;;
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+ 	exit 0 ;;
+-    i?86:OSF1:*:*)
++    i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+@@ -329,6 +652,9 @@
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+ 	exit 0 ;;
++    hppa*:OpenBSD:*:*)
++	echo hppa-unknown-openbsd
++	exit 0 ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+         exit 0 ;;
+@@ -359,104 +685,297 @@
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+ 	exit 0 ;;
+     CRAY*TS:*:*:*)
+-	echo t90-cray-unicos${UNAME_RELEASE}
++	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*T3D:*:*:*)
++	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*T3E:*:*:*)
++	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*SV1:*:*:*)
++	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY-2:*:*:*)
+ 	echo cray2-cray-unicos
+         exit 0 ;;
+-    F300:UNIX_System_V:*:*)
+-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
++    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
++	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
+-    F301:UNIX_System_V:*:*)
+-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+-       exit 0 ;;
+-    hp3[0-9][05]:NetBSD:*:*)
+-	echo m68k-hp-netbsd${UNAME_RELEASE}
++    hp300:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    hp3[0-9][05]:OpenBSD:*:*)
+-	echo m68k-hp-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
++    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
++    sparc*:BSD/OS:*:*)
++	echo sparc-unknown-bsdi${UNAME_RELEASE}
++	exit 0 ;;
++    *:BSD/OS:*:*)
++	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++	exit 0 ;;
+     *:FreeBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit 0 ;;
+-    *:NetBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+-	exit 0 ;;
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 	exit 0 ;;
+     i*:CYGWIN*:*)
+-	echo i386-pc-cygwin32
++	echo ${UNAME_MACHINE}-pc-cygwin
++	exit 0 ;;
++    i*:MINGW*:*)
++	echo ${UNAME_MACHINE}-pc-mingw32
++	exit 0 ;;
++    i*:PW*:*)
++	echo ${UNAME_MACHINE}-pc-pw32
++	exit 0 ;;
++    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
++	# How do we know it's Interix rather than the generic POSIX subsystem?
++	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
++	# UNAME_MACHINE based on the output of uname instead of i386?
++	echo i386-pc-interix
++	exit 0 ;;
++    i*:UWIN*:*)
++	echo ${UNAME_MACHINE}-pc-uwin
+ 	exit 0 ;;
+     p*:CYGWIN*:*)
+-	echo powerpcle-unknown-cygwin32
++	echo powerpcle-unknown-cygwin
+ 	exit 0 ;;
+     prep*:SunOS:5.*:*)
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     *:GNU:*:*)
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
+-    *:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us.
+-	ld_help_string=`ld --help 2>&1`
+-	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
+-	  echo "${UNAME_MACHINE}-pc-linux" ; exit 0
+-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
+-	  echo "${UNAME_MACHINE}-pc-linux-aout" ; exit 0
+-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
+-	  echo "${UNAME_MACHINE}-pc-linux-coff" ; exit 0
+-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
+-	  echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
+-	  echo "${UNAME_MACHINE}-unknown-linux-aout" ; exit 0
+-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
+-	  echo "powerpc-unknown-linux" ; exit 0
+-	elif test "${UNAME_MACHINE}" = "alpha" ; then
+-	  echo alpha-unknown-linux ; exit 0
+-	elif test "${UNAME_MACHINE}" = "sparc" ; then
+-	  echo sparc-unknown-linux ; exit 0
+-	else
+-	  # Either a pre-BFD a.out linker (linux-oldld) or one that does not give us
+-	  # useful --help.  Gcc wants to distinguish between linux-oldld and linux-aout.
+-	  test ! -d /usr/lib/ldscripts/. \
+-	    && echo "${UNAME_MACHINE}-pc-linux-oldld" && exit 0
+-	  # Determine whether the default compiler is a.out or elf
+-	  cat >dummy.c <<EOF
++    i*86:Minix:*:*)
++	echo ${UNAME_MACHINE}-pc-minix
++	exit 0 ;;
++    arm*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux
++	exit 0 ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    mips:Linux:*:*)
++	cat >$dummy.c <<EOF
++#ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
++int main (int argc, char *argv[]) {
++#else
++int main (argc, argv) int argc; char *argv[]; {
++#endif
++#ifdef __MIPSEB__
++  printf ("%s-unknown-linux-gnu\n", argv[1]);
++#endif
++#ifdef __MIPSEL__
++  printf ("%sel-unknown-linux-gnu\n", argv[1]);
++#endif
++  return 0;
++}
++EOF
++	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
++	;;
++    ppc:Linux:*:*)
++	# Determine Lib Version
++	cat >$dummy.c <<EOF
++#include <features.h>
++#if defined(__GLIBC__)
++extern char __libc_version[];
++extern char __libc_release[];
++#endif
+ main(argc, argv)
+-int argc;
+-char *argv[];
++     int argc;
++     char *argv[];
+ {
++#if defined(__GLIBC__)
++  printf("%s %s\n", __libc_version, __libc_release);
++#else
++  printf("unknown\n");
++#endif
++  return 0;
++}
++EOF
++	LIBC=""
++	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
++	if test "$?" = 0 ; then
++		./$dummy | grep 1\.99 > /dev/null
++		if test "$?" = 0 ; then LIBC="libc1" ; fi
++	fi
++	rm -f $dummy.c $dummy
++	echo powerpc-unknown-linux-gnu${LIBC}
++	exit 0 ;;
++    alpha:Linux:*:*)
++	cat <<EOF >$dummy.s
++	  .data
++	  \$Lformat:
++		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
++	   .text
++		.globl main
++		.align 4
++		.ent main
++	    main:
++		.frame \$30,16,\$26,0
++		ldgp \$29,0(\$27)
++		.prologue 1
++		.long 0x47e03d80 # implver \$0
++		lda \$2,-1
++		.long 0x47e20c21 # amask \$2,\$1
++		lda \$16,\$Lformat
++		mov \$0,\$17
++		not \$1,\$18
++		jsr \$26,printf
++		ldgp \$29,0(\$26)
++		mov 0,\$16
++		jsr \$26,exit
++		.end main
++EOF
++	LIBC=""
++	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
++	if test "$?" = 0 ; then
++		case `./$dummy` in
++		0-0)	UNAME_MACHINE="alpha" ;;
++		1-0)	UNAME_MACHINE="alphaev5" ;;
++		1-1)    UNAME_MACHINE="alphaev56" ;;
++		1-101)	UNAME_MACHINE="alphapca56" ;;
++		2-303)	UNAME_MACHINE="alphaev6" ;;
++		2-307)	UNAME_MACHINE="alphaev67" ;;
++		esac
++		objdump --private-headers $dummy | \
++		  grep ld.so.1 > /dev/null
++		if test "$?" = 0 ; then
++			LIBC="libc1"
++		fi
++	fi
++	rm -f $dummy.s $dummy
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit 0 ;;
++    parisc:Linux:*:* | hppa:Linux:*:*)
++	# Look for CPU level
++	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
++	esac
++	exit 0 ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit 0 ;;
++    s390:Linux:*:* | s390x:Linux:*:*)
++	echo ${UNAME_MACHINE}-ibm-linux
++	exit 0 ;;
++    sh*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    sparc:Linux:*:* | sparc64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    x86_64:Linux:*:*)
++	echo x86_64-unknown-linux-gnu
++	exit 0 ;;
++    i*86:Linux:*:*)
++	# The BFD linker knows what the default object file format is, so
++	# first see if it will tell us. cd to the root directory to prevent
++	# problems with other programs or directories called `ld' in the path.
++	ld_supported_emulations=`cd /; ld --help 2>&1 \
++			 | sed -ne '/supported emulations:/!d
++				    s/[ 	][ 	]*/ /g
++				    s/.*supported emulations: *//
++				    s/ .*//
++				    p'`
++        case "$ld_supported_emulations" in
++	  i*86linux)
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
++		exit 0
++		;;
++	  elf_i*86)
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++		;;
++	  i*86coff)
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++		exit 0
++		;;
++	esac
++	# Either a pre-BFD a.out linker (linux-gnuoldld)
++	# or one that does not give us useful --help.
++	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
++	# If ld does not provide *any* "supported emulations:"
++	# that means it is gnuoldld.
++	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
++	case "${UNAME_MACHINE}" in
++	i*86)
++	  VENDOR=pc;
++	  ;;
++	*)
++	  VENDOR=unknown;
++	  ;;
++	esac
++	# Determine whether the default compiler is a.out or elf
++	cat >$dummy.c <<EOF
++#include <features.h>
++#ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
++	int main (int argc, char *argv[]) {
++#else
++	int main (argc, argv) int argc; char *argv[]; {
++#endif
+ #ifdef __ELF__
+-  printf ("%s-pc-linux\n", argv[1]);
++# ifdef __GLIBC__
++#  if __GLIBC__ >= 2
++    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
++#  else
++    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
++#  endif
++# else
++   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
++# endif
+ #else
+-  printf ("%s-pc-linux-aout\n", argv[1]);
++  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+ #endif
+   return 0;
+ }
+ EOF
+-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+-	  rm -f dummy.c dummy
+-	fi ;;
++	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
++	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	;;
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+ # are messed up and put the nodename in both sysname and nodename.
+-    i?86:DYNIX/ptx:4*:*)
++    i*86:DYNIX/ptx:4*:*)
+ 	echo i386-sequent-sysv4
+ 	exit 0 ;;
+-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
++    i*86:UNIX_SV:4.2MP:2.*)
++        # Unixware is an offshoot of SVR4, but it has its own version
++        # number series starting with 2...
++        # I am not positive that other SVR4 systems won't match this,
++	# I just have to hope.  -- rms.
++        # Use sysv4.2uw... so that sysv4* matches it.
++	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++	exit 0 ;;
++    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
++	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
++		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ 	else
+-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
++		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+ 	exit 0 ;;
+-    i?86:*:3.2:*)
++    i*86:*:5:7*)
++        # Fixed at (any) Pentium or better
++        UNAME_MACHINE=i586
++        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
++	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
++	else
++	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
++	fi
++	exit 0 ;;
++    i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+@@ -465,11 +984,24 @@
+ 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+ 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ 			&& UNAME_MACHINE=i586
++		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
++			&& UNAME_MACHINE=i686
++		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
++			&& UNAME_MACHINE=i686
+ 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit 0 ;;
++    pc:*:*:*)
++	# Left here for compatibility:
++        # uname -m prints for DJGPP always 'pc', but it prints nothing about
++        # the processor, so we play safe by assuming i386.
++	echo i386-pc-msdosdjgpp
++        exit 0 ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+ 	exit 0 ;;
+@@ -489,7 +1021,7 @@
+ 	exit 0 ;;
+     M68*:*:R3V[567]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
++    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -500,24 +1032,30 @@
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && echo i486-ncr-sysv4 && exit 0 ;;
+-    m68*:LynxOS:2.*:*)
++    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
+-    i?86:LynxOS:2.*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
++    rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+ 	exit 0 ;;
++    RM*:ReliantUNIX-*:*:*)
++	echo mips-sni-sysv4
++	exit 0 ;;
+     RM*:SINIX-*:*:*)
+ 	echo mips-sni-sysv4
+ 	exit 0 ;;
+@@ -529,6 +1067,10 @@
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit 0 ;;
++    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                           # says <Richard.M.Bartel@ccMail.Census.GOV>
++        echo i586-unisys-sysv4
++        exit 0 ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+@@ -541,23 +1083,101 @@
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+ 	exit 0 ;;
+-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
++    news*:NEWS-OS:6*:*)
++	echo mips-sony-newsos6
++	exit 0 ;;
++    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+ 	        echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+         exit 0 ;;
+-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
+-        exit 0 ;;
++    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
++	echo powerpc-be-beos
++	exit 0 ;;
++    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
++	echo powerpc-apple-beos
++	exit 0 ;;
++    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
++	echo i586-pc-beos
++	exit 0 ;;
++    SX-4:SUPER-UX:*:*)
++	echo sx4-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
++    SX-5:SUPER-UX:*:*)
++	echo sx5-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
++    Power*:Rhapsody:*:*)
++	echo powerpc-apple-rhapsody${UNAME_RELEASE}
++	exit 0 ;;
++    *:Rhapsody:*:*)
++	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++	exit 0 ;;
++    *:Darwin:*:*)
++	echo `uname -p`-apple-darwin${UNAME_RELEASE}
++	exit 0 ;;
++    *:procnto*:*:* | *:QNX:[0123456789]*:*)
++	if test "${UNAME_MACHINE}" = "x86pc"; then
++		UNAME_MACHINE=pc
++	fi
++	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
++	exit 0 ;;
++    *:QNX:*:4*)
++	echo i386-pc-qnx
++	exit 0 ;;
++    NSR-[KW]:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk${UNAME_RELEASE}
++	exit 0 ;;
++    *:NonStop-UX:*:*)
++	echo mips-compaq-nonstopux
++	exit 0 ;;
++    BS2000:POSIX*:*:*)
++	echo bs2000-siemens-sysv
++	exit 0 ;;
++    DS/*:UNIX_System_V:*:*)
++	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	exit 0 ;;
++    *:Plan9:*:*)
++	# "uname -m" is not consistent, so use $cputype instead. 386
++	# is converted to i386 for consistency with other x86
++	# operating systems.
++	if test "$cputype" = "386"; then
++	    UNAME_MACHINE=i386
++	else
++	    UNAME_MACHINE="$cputype"
++	fi
++	echo ${UNAME_MACHINE}-unknown-plan9
++	exit 0 ;;
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit 0 ;;
++    *:TOPS-10:*:*)
++	echo pdp10-unknown-tops10
++	exit 0 ;;
++    *:TENEX:*:*)
++	echo pdp10-unknown-tenex
++	exit 0 ;;
++    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
++	echo pdp10-dec-tops20
++	exit 0 ;;
++    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
++	echo pdp10-xkl-tops20
++	exit 0 ;;
++    *:TOPS-20:*:*)
++	echo pdp10-unknown-tops20
++	exit 0 ;;
++    *:ITS:*:*)
++	echo pdp10-unknown-its
++	exit 0 ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+ #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+ 
+-cat >dummy.c <<EOF
++cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+ # include <sys/types.h>
+ # include <sys/utsname.h>
+@@ -595,7 +1215,10 @@
+ #endif
+   int version;
+   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
++  if (version < 4)
++    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
++  else
++    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+   exit (0);
+ #endif
+ 
+@@ -640,11 +1263,24 @@
+ #endif
+ 
+ #if defined (vax)
+-#if !defined (ultrix)
+-  printf ("vax-dec-bsd\n"); exit (0);
+-#else
+-  printf ("vax-dec-ultrix\n"); exit (0);
+-#endif
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
+ #endif
+ 
+ #if defined (alliant) && defined (i860)
+@@ -655,8 +1291,8 @@
+ }
+ EOF
+ 
+-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
+-rm -f dummy.c dummy
++$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
++rm -f $dummy.c $dummy
+ 
+ # Apollos put the system type in the environment.
+ 
+@@ -688,6 +1324,48 @@
+     esac
+ fi
+ 
+-#echo '(Unable to guess system type)' 1>&2
++cat >&2 <<EOF
++$0: unable to guess system type
++
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
++
++    ftp://ftp.gnu.org/pub/gnu/config/
++
++If the version you run ($0) is already up to date, please
++send the following data and any information you think might be
++pertinent to <config-patches@gnu.org> in order to provide the needed
++information to handle your system.
++
++config.guess timestamp = $timestamp
++
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
++
++hostinfo               = `(hostinfo) 2>/dev/null`
++/bin/universe          = `(/bin/universe) 2>/dev/null`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
++/bin/arch              = `(/bin/arch) 2>/dev/null`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++
++UNAME_MACHINE = ${UNAME_MACHINE}
++UNAME_RELEASE = ${UNAME_RELEASE}
++UNAME_SYSTEM  = ${UNAME_SYSTEM}
++UNAME_VERSION = ${UNAME_VERSION}
++EOF
+ 
+ exit 1
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/config.h.in fdutils/config.h.in
+--- fdutils-5.4/config.h.in	Fri Jul  2 23:37:12 1999
++++ fdutils/config.h.in	Mon May 21 00:24:53 2001
+@@ -14,3 +14,6 @@
+ 
+ /* Define if you have the <linux/xia_fs.h> header file.  */
+ #undef HAVE_LINUX_XIA_FS_H
++
++/* Define if you have the <sys/sysmacros.h> header file.  */
++#undef HAVE_SYS_SYSMACROS_H
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/config.sub fdutils/config.sub
+--- fdutils-5.4/config.sub	Sun Mar  2 18:43:27 1997
++++ fdutils/config.sub	Mon May 21 00:24:43 2001
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+-# Configuration validation subroutine script, version 1.1.
+-#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++#   Free Software Foundation, Inc.
++
++timestamp='2001-05-11'
++
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+ # can handle that machine.  It does not imply ALL GNU software can.
+@@ -25,6 +29,8 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++# Please send patches to <config-patches@gnu.org>.
++#
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+@@ -45,30 +51,73 @@
+ #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # It is wrong to echo any other type of specification.
+ 
+-if [ x$1 = x ]
+-then
+-	echo Configuration name missing. 1>&2
+-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+-	echo "or     $0 ALIAS" 1>&2
+-	echo where ALIAS is a recognized configuration type. 1>&2
+-	exit 1
+-fi
++me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+-# First pass through any local machine types.
+-case $1 in
+-	*local*)
+-		echo $1
+-		exit 0
+-		;;
+-	*)
+-	;;
++usage="\
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
++
++Canonicalize a configuration name.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help"
++       exit 1 ;;
++
++    *local*)
++       # First pass through any local machine types.
++       echo $1
++       exit 0;;
++
++    * )
++       break ;;
++  esac
++done
++
++case $# in
++ 0) echo "$me: missing argument$help" >&2
++    exit 1;;
++ 1) ;;
++ *) echo "$me: too many arguments$help" >&2
++    exit 1;;
+ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  linux-gnu*)
++  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -94,15 +143,25 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple)
++	-apple | -axis)
+ 		os=
+ 		basic_machine=$1
+ 		;;
++	-sim | -cisco | -oki | -wec | -winbond)
++		os=
++		basic_machine=$1
++		;;
++	-scout)
++		;;
++	-wrs)
++		os=-vxworks
++		basic_machine=$1
++		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+ 	-sco5)
+-		os=sco3.2v5
++		os=-sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco4)
+@@ -121,6 +180,9 @@
+ 		os=-sco3.2v2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-udk*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-isc)
+ 		os=-isc2.2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -143,25 +205,50 @@
+ 	-psos*)
+ 		os=-psos
+ 		;;
++	-mint | -mint[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
+ esac
+ 
+ # Decode aliases for certain CPU-COMPANY combinations.
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+-	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
+-		| arme[lb] | pyramid \
+-		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+-		| alpha | we32k | ns16k | clipper | i370 | sh \
+-		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
+-		| pdp11 | mips64el | mips64orion | mips64orionel \
+-		| sparc | sparclet | sparclite | sparc64)
++	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
++	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
++		| pyramid | mn10200 | mn10300 | tron | a29k \
++		| 580 | i960 | h8300 \
++		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
++		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
++		| hppa64 \
++		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
++		| alphaev6[78] \
++		| we32k | ns16k | clipper | i370 | sh | sh[34] \
++		| powerpc | powerpcle \
++		| 1750a | dsp16xx | pdp10 | pdp11 \
++		| mips16 | mips64 | mipsel | mips64el \
++		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
++		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
++		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
++		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
++		| v850 | c4x \
++		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
++		| pj | pjl | h8500 | z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
++	m6811 | m68hc11 | m6812 | m68hc12)
++		# Motorola 68HC11/12.
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65 | z8k)
++		;;
++
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+-	i[3456]86)
++	i*86 | x86_64)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+@@ -170,23 +257,52 @@
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+-	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
+-	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
+-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
+-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
+-	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
+-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
+-	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
+-	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
++	# FIXME: clean up the formatting here.
++	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
++	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
++	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
++	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
++	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
++	      | xmp-* | ymp-* \
++	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
++	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
++	      | hppa2.0n-* | hppa64-* \
++	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
++	      | alphaev6[78]-* \
++	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
++	      | clipper-* | orion-* \
++	      | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
++	      | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
++	      | mips16-* | mips64-* | mipsel-* \
++	      | mips64el-* | mips64orion-* | mips64orionel-* \
++	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
++	      | mipstx39-* | mipstx39el-* | mcore-* \
++	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
++	      | [cjt]90-* \
++	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
++	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
++	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
++	386bsd)
++		basic_machine=i386-unknown
++		os=-bsd
++		;;
+ 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ 		basic_machine=m68000-att
+ 		;;
+ 	3b*)
+ 		basic_machine=we32k-att
+ 		;;
++	a29khif)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++	adobe68k)
++		basic_machine=m68010-adobe
++		os=-scout
++		;;
+ 	alliant | fx80)
+ 		basic_machine=fx80-alliant
+ 		;;
+@@ -202,20 +318,24 @@
+ 		os=-sysv
+ 		;;
+ 	amiga | amiga-*)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		;;
+-	amigados)
+-		basic_machine=m68k-cbm
+-		os=-amigados
++	amigaos | amigados)
++		basic_machine=m68k-unknown
++		os=-amigaos
+ 		;;
+ 	amigaunix | amix)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		os=-sysv4
+ 		;;
+ 	apollo68)
+ 		basic_machine=m68k-apollo
+ 		os=-sysv
+ 		;;
++	apollo68bsd)
++		basic_machine=m68k-apollo
++		os=-bsd
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -252,13 +372,16 @@
+ 		basic_machine=cray2-cray
+ 		os=-unicos
+ 		;;
+-	[ctj]90-cray)
+-		basic_machine=c90-cray
++	[cjt]90)
++		basic_machine=${basic_machine}-cray
+ 		os=-unicos
+ 		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
++	cris | cris-* | etrax*)
++		basic_machine=cris-axis
++		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+@@ -292,6 +415,10 @@
+ 	encore | umax | mmax)
+ 		basic_machine=ns32k-encore
+ 		;;
++	es1800 | OSE68k | ose68k | ose | OSE)
++		basic_machine=m68k-ericsson
++		os=-ose
++		;;
+ 	fx2800)
+ 		basic_machine=i860-alliant
+ 		;;
+@@ -302,6 +429,10 @@
+ 		basic_machine=tron-gmicro
+ 		os=-sysv
+ 		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
+ 	h3050r* | hiux*)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+@@ -310,6 +441,14 @@
+ 		basic_machine=h8300-hitachi
+ 		os=-hms
+ 		;;
++	h8300xray)
++		basic_machine=h8300-hitachi
++		os=-xray
++		;;
++	h8500hms)
++		basic_machine=h8500-hitachi
++		os=-hms
++		;;
+ 	harris)
+ 		basic_machine=m88k-harris
+ 		os=-sysv3
+@@ -325,13 +464,30 @@
+ 		basic_machine=m68k-hp
+ 		os=-hpux
+ 		;;
++	hp3k9[0-9][0-9] | hp9[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
+ 	hp9k2[0-9][0-9] | hp9k31[0-9])
+ 		basic_machine=m68000-hp
+ 		;;
+ 	hp9k3[2-9][0-9])
+ 		basic_machine=m68k-hp
+ 		;;
+-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
++	hp9k6[0-9][0-9] | hp6[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hp9k7[0-79][0-9] | hp7[0-79][0-9])
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k78[0-9] | hp78[0-9])
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[0-9][13679] | hp8[0-9][13679])
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+@@ -340,27 +496,42 @@
+ 	hppa-next)
+ 		os=-nextstep3
+ 		;;
++	hppaosf)
++		basic_machine=hppa1.1-hp
++		os=-osf
++		;;
++	hppro)
++		basic_machine=hppa1.1-hp
++		os=-proelf
++		;;
+ 	i370-ibm* | ibm*)
+ 		basic_machine=i370-ibm
+-		os=-mvs
+ 		;;
+ # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+-	i[3456]86v32)
++	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+-	i[3456]86v4*)
++	i*86v4*)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+-	i[3456]86v)
++	i*86v)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+-	i[3456]86sol2)
++	i*86sol2)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
++	i386mach)
++		basic_machine=i386-mach
++		os=-mach
++		;;
++	i386-vsta | vsta)
++		basic_machine=i386-unknown
++		os=-vsta
++		;;
+ 	iris | iris4d)
+ 		basic_machine=mips-sgi
+ 		case $os in
+@@ -386,19 +557,59 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
++	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
++	mipsel*-linux*)
++		basic_machine=mipsel-unknown
++		os=-linux-gnu
++		;;
++	mips*-linux*)
++		basic_machine=mips-unknown
++		os=-linux-gnu
++		;;
+ 	mips3*-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ 		;;
+ 	mips3*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
++	mmix*)
++		basic_machine=mmix-knuth
++		os=-mmixware
++		;;
++	monitor)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
++	msdos)
++		basic_machine=i386-pc
++		os=-msdos
++		;;
++	mvs)
++		basic_machine=i370-ibm
++		os=-mvs
++		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+ 		;;
++	netbsd386)
++		basic_machine=i386-unknown
++		os=-netbsd
++		;;
++	netwinder)
++		basic_machine=armv4l-rebel
++		os=-linux
++		;;
+ 	news | news700 | news800 | news900)
+ 		basic_machine=m68k-sony
+ 		os=-newsos
+@@ -411,6 +622,10 @@
+ 		basic_machine=mips-sony
+ 		os=-newsos
+ 		;;
++	necv70)
++		basic_machine=v70-nec
++		os=-sysv
++		;;
+ 	next | m*-next )
+ 		basic_machine=m68k-next
+ 		case $os in
+@@ -436,9 +651,32 @@
+ 		basic_machine=i960-intel
+ 		os=-nindy
+ 		;;
++	mon960)
++		basic_machine=i960-intel
++		os=-mon960
++		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	nsr-tandem)
++		basic_machine=nsr-tandem
++		;;
++	op50n-* | op60c-*)
++		basic_machine=hppa1.1-oki
++		os=-proelf
++		;;
++	OSE68000 | ose68000)
++		basic_machine=m68000-ericsson
++		os=-ose
++		;;
++	os68k)
++		basic_machine=m68k-none
++		os=-os68k
++		;;
+ 	pa-hitachi)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+@@ -456,30 +694,28 @@
+         pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
+-	pentium | p5)
+-		basic_machine=i586-intel
++	pentium | p5 | k5 | k6 | nexgen)
++		basic_machine=i586-pc
++		;;
++	pentiumpro | p6 | 6x86 | athlon)
++		basic_machine=i686-pc
+ 		;;
+-	pentiumpro | p6)
+-		basic_machine=i686-intel
++	pentiumii | pentium2)
++		basic_machine=i686-pc
+ 		;;
+-	pentium-* | p5-*)
++	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+-	pentiumpro-* | p6-*)
++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+-	k5)
+-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
+-		basic_machine=i586-amd
+-		;;
+-	nexen)
+-		# We don't have specific support for Nexgen yet, so just call it a Pentium
+-		basic_machine=i586-nexgen
++	pentiumii-* | pentium2-*)
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+-	power)	basic_machine=rs6000-ibm
++	power)	basic_machine=power-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+ 	        ;;
+@@ -494,12 +730,24 @@
+ 	ps2)
+ 		basic_machine=i386-ibm
+ 		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
++	rom68k)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
+ 	rm[46]00)
+ 		basic_machine=mips-siemens
+ 		;;
+ 	rtpc | rtpc-*)
+ 		basic_machine=romp-ibm
+ 		;;
++	sa29200)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
+ 	sequent)
+ 		basic_machine=i386-sequent
+ 		;;
+@@ -507,6 +755,10 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
++	sparclite-wrs)
++		basic_machine=sparclite-wrs
++		os=-vxworks
++		;;
+ 	sps7)
+ 		basic_machine=m68k-bull
+ 		os=-sysv2
+@@ -514,6 +766,13 @@
+ 	spur)
+ 		basic_machine=spur-unknown
+ 		;;
++	st2000)
++		basic_machine=m68k-tandem
++		;;
++	stratus)
++		basic_machine=i860-stratus
++		os=-sysv4
++		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+@@ -554,10 +813,28 @@
+ 	sun386 | sun386i | roadrunner)
+ 		basic_machine=i386-sun
+ 		;;
++	sv1)
++		basic_machine=sv1-cray
++		os=-unicos
++		;;
+ 	symmetry)
+ 		basic_machine=i386-sequent
+ 		os=-dynix
+ 		;;
++	t3e)
++		basic_machine=t3e-cray
++		os=-unicos
++		;;
++	tic54x | c54x*)
++		basic_machine=tic54x-unknown
++		os=-coff
++		;;
++	tx39)
++		basic_machine=mipstx39-unknown
++		;;
++	tx39el)
++		basic_machine=mipstx39el-unknown
++		;;
+ 	tower | tower-32)
+ 		basic_machine=m68k-ncr
+ 		;;
+@@ -569,6 +846,10 @@
+ 		basic_machine=a29k-nyu
+ 		os=-sym1
+ 		;;
++	v810 | necv810)
++		basic_machine=v810-nec
++		os=-none
++		;;
+ 	vaxv)
+ 		basic_machine=vax-dec
+ 		os=-sysv
+@@ -577,7 +858,7 @@
+ 		basic_machine=vax-dec
+ 		os=-vms
+ 		;;
+-       vpp*|vx|vx-*)
++	vpp*|vx|vx-*)
+                basic_machine=f301-fujitsu
+                ;;
+ 	vxworks960)
+@@ -592,6 +873,14 @@
+ 		basic_machine=a29k-wrs
+ 		os=-vxworks
+ 		;;
++	w65*)
++		basic_machine=w65-wdc
++		os=-none
++		;;
++	w89k-*)
++		basic_machine=hppa1.1-winbond
++		os=-proelf
++		;;
+ 	xmp)
+ 		basic_machine=xmp-cray
+ 		os=-unicos
+@@ -599,6 +888,10 @@
+         xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
++	z8k-*-coff)
++		basic_machine=z8k-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -606,8 +899,21 @@
+ 
+ # Here we handle the default manufacturer of certain CPU types.  It is in
+ # some cases the only manufacturer, in others, it is the most popular.
++	w89k)
++		basic_machine=hppa1.1-winbond
++		;;
++	op50n)
++		basic_machine=hppa1.1-oki
++		;;
++	op60c)
++		basic_machine=hppa1.1-oki
++		;;
+ 	mips)
+-		basic_machine=mips-mips
++		if [ x$os = x-linux-gnu ]; then
++			basic_machine=mips-unknown
++		else
++			basic_machine=mips-mips
++		fi
+ 		;;
+ 	romp)
+ 		basic_machine=romp-ibm
+@@ -618,13 +924,20 @@
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sparc)
++	sh3 | sh4)
++		basic_machine=sh-unknown
++		;;
++	sparc | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+         cydra)
+@@ -636,6 +949,19 @@
+ 	orion105)
+ 		basic_machine=clipper-highlevel
+ 		;;
++	mac | mpw | mac-mpw)
++		basic_machine=m68k-apple
++		;;
++	pmac | pmac-mpw)
++		basic_machine=powerpc-apple
++		;;
++	c4x*)
++		basic_machine=c4x-none
++		os=-coff
++		;;
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
++		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+@@ -668,9 +994,12 @@
+ 	-solaris)
+ 		os=-solaris2
+ 		;;
+-	-unixware* | svr4*)
++	-svr4*)
+ 		os=-sysv4
+ 		;;
++	-unixware*)
++		os=-sysv4.2uw
++		;;
+ 	-gnu/linux*)
+ 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ 		;;
+@@ -681,19 +1010,42 @@
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+-	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
++	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
++	      | -aos* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
++	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+-	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -linux-gnu* | -uxpv*)
++	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
++	-qnx*)
++		case $basic_machine in
++		    x86-* | i*86-*)
++			;;
++		    *)
++			os=-nto$os
++			;;
++		esac
++		;;
++	-nto*)
++		os=-nto-qnx
++		;;
++	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
++	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
++		;;
++	-mac*)
++		os=`echo $os | sed -e 's|mac|macos|'`
++		;;
+ 	-linux*)
+-		os=`echo $os | sed -e 's|linux|linux|'`
++		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+ 	-sunos5*)
+ 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+@@ -701,6 +1053,12 @@
+ 	-sunos6*)
+ 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ 		;;
++	-opened*)
++		os=-openedition
++		;;
++	-wince*)
++		os=-wince
++		;;
+ 	-osfrose*)
+ 		os=-osfrose
+ 		;;
+@@ -716,12 +1074,18 @@
+ 	-acis*)
+ 		os=-aos
+ 		;;
++	-386bsd)
++		os=-bsd
++		;;
+ 	-ctix* | -uts*)
+ 		os=-sysv
+ 		;;
+ 	-ns2 )
+ 	        os=-nextstep2
+ 		;;
++	-nsk*)
++		os=-nsk
++		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+ 		os=`echo $os | sed -e 's|sinix|sysv|'`
+@@ -747,9 +1111,18 @@
+ 	# This must come after -sysvr4.
+ 	-sysv*)
+ 		;;
++	-ose*)
++		os=-ose
++		;;
++	-es1800*)
++		os=-ose
++		;;
+ 	-xenix)
+ 		os=-xenix
+ 		;;
++        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++	        os=-mint
++		;;
+ 	-none)
+ 		;;
+ 	*)
+@@ -775,9 +1148,15 @@
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
++	arm*-rebel)
++		os=-linux
++		;;
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
++	pdp10-*)
++		os=-tops20
++		;;
+         pdp11-*)
+ 		os=-none
+ 		;;
+@@ -796,15 +1175,36 @@
+ 		# default.
+ 		# os=-sunos4
+ 		;;
++	m68*-cisco)
++		os=-aout
++		;;
++	mips*-cisco)
++		os=-elf
++		;;
++	mips*-*)
++		os=-elf
++		;;
+ 	*-tti)	# must be before sparc entry or we get the wrong os.
+ 		os=-sysv3
+ 		;;
+ 	sparc-* | *-sun)
+ 		os=-sunos4.1.1
+ 		;;
++	*-be)
++		os=-beos
++		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
++	*-wec)
++		os=-proelf
++		;;
++	*-winbond)
++		os=-proelf
++		;;
++	*-oki)
++		os=-proelf
++		;;
+ 	*-hp)
+ 		os=-hpux
+ 		;;
+@@ -815,7 +1215,7 @@
+ 		os=-sysv
+ 		;;
+ 	*-cbm)
+-		os=-amigados
++		os=-amigaos
+ 		;;
+ 	*-dg)
+ 		os=-dgux
+@@ -865,9 +1265,21 @@
+ 	*-masscomp)
+ 		os=-rtu
+ 		;;
+-	f301-fujitsu)
++	f30[01]-fujitsu | f700-fujitsu)
+ 		os=-uxpv
+ 		;;
++	*-rom68k)
++		os=-coff
++		;;
++	*-*bug)
++		os=-coff
++		;;
++	*-apple)
++		os=-macos
++		;;
++	*-atari*)
++		os=-mint
++		;;
+ 	*)
+ 		os=-none
+ 		;;
+@@ -889,9 +1301,15 @@
+ 			-aix*)
+ 				vendor=ibm
+ 				;;
++			-beos*)
++				vendor=be
++				;;
+ 			-hpux*)
+ 				vendor=hp
+ 				;;
++			-mpeix*)
++				vendor=hp
++				;;
+ 			-hiux*)
+ 				vendor=hitachi
+ 				;;
+@@ -907,7 +1325,7 @@
+ 			-genix*)
+ 				vendor=ns
+ 				;;
+-			-mvs*)
++			-mvs* | -opened*)
+ 				vendor=ibm
+ 				;;
+ 			-ptx*)
+@@ -919,9 +1337,26 @@
+ 			-aux*)
+ 				vendor=apple
+ 				;;
++			-hms*)
++				vendor=hitachi
++				;;
++			-mpw* | -macos*)
++				vendor=apple
++				;;
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++				vendor=atari
++				;;
+ 		esac
+ 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+ echo $basic_machine$os
++exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/configure fdutils/configure
+--- fdutils-5.4/configure	Fri Jul  2 23:37:09 1999
++++ fdutils/configure	Mon May 21 00:24:49 2001
+@@ -1250,7 +1250,7 @@
+ esac
+ 
+ 
+-for ac_hdr in linux/ext_fs.h linux/xia_fs.h
++for ac_hdr in linux/ext_fs.h linux/xia_fs.h sys/sysmacros.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/configure.in fdutils/configure.in
+--- fdutils-5.4/configure.in	Thu Jul  1 19:22:51 1999
++++ fdutils/configure.in	Mon May 21 00:24:21 2001
+@@ -18,7 +18,7 @@
+ AC_C_CONST
+ AC_C_INLINE
+ 
+-AC_CHECK_HEADERS(linux/ext_fs.h linux/xia_fs.h)
++AC_CHECK_HEADERS(linux/ext_fs.h linux/xia_fs.h sys/sysmacros.h)
+ 
+ dnl Make fdmount accessible by the floppy group only
+ undefine([fdmount-floppy-only])dnl
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/README fdutils/doc/README
+--- fdutils-5.4/doc/README	Thu Jul  1 19:43:45 1999
++++ fdutils/doc/README	Mon Jun 11 22:26:36 2001
+@@ -171,7 +171,7 @@
+ disks and also Commodore 1581 disks. Please get Michael Haardt's
+ documentation on floppy drives for a detailed description of those
+ formats. This can be ftp'ed from
+-ftp://cantor.informatik.rwth-aachen.de/pub/linux/floppy.ps
++http://www.moria.de/~michael/floppy/floppy.ps
+ 
+  Commodore 1581 disks are not yet described in this documentation.
+ Use 'setfdprm /dev/fd0 1600 10 2 80 2 0x2A 0x02 0xDF 0x2E' to use
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/acronyms.texi fdutils/doc/acronyms.texi
+--- fdutils-5.4/doc/acronyms.texi	Sat May 27 18:37:00 2000
++++ fdutils/doc/acronyms.texi	Mon Jun 11 22:23:31 2001
+@@ -100,7 +100,7 @@
+ disks, i.e. virtually all disks that are available today.  The PC
+ hardware can only read MFM and FM disks.  The doc at:
+ @example
+-ftp://cantor.informatik.rwth-aachen.de/pub/linux/floppy.ps
++http://www.moria.de/~michael/floppy/floppy.ps
+ @end example
+ contains more detailed information about FM and MFM encoding.
+ 
+@@ -108,7 +108,7 @@
+ FM is a low level encoding of disk data. It was used for SD disks, and
+ is now considered to be obsolete.  The doc at:
+ @example
+-ftp://cantor.informatik.rwth-aachen.de/pub/linux/floppy.ps
++http://www.moria.de/~michael/floppy/floppy.ps
+ @end example
+ contains more detailed information about FM and MFM encoding.
+ 
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/diskd.1 fdutils/doc/diskd.1
+--- fdutils-5.4/doc/diskd.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/diskd.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH diskd 1 "02jun00" fdutils-5.4
++.TH diskd 1 "11Jun01" fdutils-5.4
+ .SH Name
+ diskd - disk daemon; wait for disk to be inserted
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/diskseekd.1 fdutils/doc/diskseekd.1
+--- fdutils-5.4/doc/diskseekd.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/diskseekd.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH diskseekd 1 "02jun00" fdutils-5.4
++.TH diskseekd 1 "11Jun01" fdutils-5.4
+ .SH Name
+ diskseek, diskseekd - disk seek daemon; simulates Messy Dos' drive cleaning effect
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/fd.4 fdutils/doc/fd.4
+--- fdutils-5.4/doc/fd.4	Fri Jul  2 23:44:15 1999
++++ fdutils/doc/fd.4	Mon Jun 11 22:23:59 2001
+@@ -1,7 +1,7 @@
+ '\" t
+ .\"{{{}}}
+ .\"{{{  Notes
+-.\" Copyright (c) 1993 Michael Haardt (michael@cantor.informatik.rwth-aachen.de)
++.\" Copyright (c) 1993 Michael Haardt (michael@moria.de)
+ .\" and 1994,1995, 1997 Alain Knaff (alain@linux.lu)
+ .\"
+ .\" This is free documentation; you can redistribute it and/or
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/fdmount.1 fdutils/doc/fdmount.1
+--- fdutils-5.4/doc/fdmount.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/fdmount.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH fdmount 1 "02jun00" fdutils-5.4
++.TH fdmount 1 "11Jun01" fdutils-5.4
+ .SH Name
+ fdmount - Floppy disk mount utility
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/fdrawcmd.1 fdutils/doc/fdrawcmd.1
+--- fdutils-5.4/doc/fdrawcmd.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/fdrawcmd.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH fdrawcmd 1 "02jun00" fdutils-5.4
++.TH fdrawcmd 1 "11Jun01" fdutils-5.4
+ .SH Name
+ fdrawcmd - send raw commands to the floppy disk controller
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/floppycontrol.1 fdutils/doc/floppycontrol.1
+--- fdutils-5.4/doc/floppycontrol.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/floppycontrol.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH floppycontrol 1 "02jun00" fdutils-5.4
++.TH floppycontrol 1 "11Jun01" fdutils-5.4
+ .SH Name
+ floppycontrol - floppy driver configuration utility
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/floppymeter.1 fdutils/doc/floppymeter.1
+--- fdutils-5.4/doc/floppymeter.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/floppymeter.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH floppymeter 1 "02jun00" fdutils-5.4
++.TH floppymeter 1 "11Jun01" fdutils-5.4
+ .SH Name
+ floppymeter - measure raw capacity and exact rotation speed of floppy drive
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/format2.texi fdutils/doc/format2.texi
+--- fdutils-5.4/doc/format2.texi	Fri Sep 19 21:01:19 1997
++++ fdutils/doc/format2.texi	Mon Jun 11 21:59:18 2001
+@@ -157,7 +157,7 @@
+ on floppy drives for a detailed description of those formats. This can
+ be ftp'ed from the following location:
+ @example
+-ftp://cantor.informatik.rwth-aachen.de/pub/linux/floppy.ps
++http://www.moria.de/~michael/floppy/
+ @end example
+ 
+ Commodore 1581 disks are not yet described in this documentation.  Use
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/getfdprm.1 fdutils/doc/getfdprm.1
+--- fdutils-5.4/doc/getfdprm.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/getfdprm.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH getfdprm 1 "02jun00" fdutils-5.4
++.TH getfdprm 1 "11Jun01" fdutils-5.4
+ .SH Name
+ getfdprm - print the current format information
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/makefloppies.1 fdutils/doc/makefloppies.1
+--- fdutils-5.4/doc/makefloppies.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/makefloppies.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH makefloppies 1 "02jun00" fdutils-5.4
++.TH makefloppies 1 "11Jun01" fdutils-5.4
+ .SH Name
+ MAKEFLOPPIES - Creates the default floppy device nodes.
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/setfdprm.1 fdutils/doc/setfdprm.1
+--- fdutils-5.4/doc/setfdprm.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/setfdprm.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH setfdprm 1 "02jun00" fdutils-5.4
++.TH setfdprm 1 "11Jun01" fdutils-5.4
+ .SH Name
+ setfdprm - sets user-provided floppy disk parameters
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/superformat.1 fdutils/doc/superformat.1
+--- fdutils-5.4/doc/superformat.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/superformat.1	Mon Jun 11 22:22:46 2001
+@@ -1,4 +1,4 @@
+-.TH superformat 1 "02jun00" fdutils-5.4
++.TH superformat 1 "11Jun01" fdutils-5.4
+ .SH Name
+ superformat - format floppies
+ '\" t
+@@ -258,14 +258,19 @@
+ spins, and on how much time is needed to change the head or the track.
+ .TP
+ \&\fR\&\f(CW--absolute_skew\ \fIabsolute-skew\fR\&\f(CW\fR\ 
+-Set the absolute skew. (The skew value used for the first formatted
+-track)
++.IP
++Set the absolute skew. This skew value is used for the first formatted
++track.  It is expressed in raw bytes.
+ .TP
+ \&\fR\&\f(CW--head_skew\ \fIhead-skew\fR\&\f(CW\fR\ 
+-Set the head skew. (The skew added for passing from head 0 to head 1)
++.IP
++Set the head skew. This is the skew added for passing from head 0 to
++head 1.  It is expressed in raw bytes.
+ .TP
+ \&\fR\&\f(CW--track_skew\ \fItrack-skew\fR\&\f(CW\fR\ 
+-Set the track skew. (The skew added for seeking to the next track)
++.IP
++Set the track skew. This is the skew added for seeking to the next
++track.  It is expressed in raw bytes.
+ .PP
+ Example: (absolute skew=3, head skew=1, track skew=2)
+ .PP
+@@ -287,6 +292,10 @@
+ .lp
+  
+ \&\fR
++.PP
++N.B. For simplicitie's sake, this example expresses skews in units of
++sectors. In reality, superformat expects the skews to be expressed in
++raw bytes.
+ .PP
+ .SH Examples
+ In all the examples of this section, we assume that drive 0 is a 3 1/2
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/superformat.texi fdutils/doc/superformat.texi
+--- fdutils-5.4/doc/superformat.texi	Sat May 27 18:36:51 2000
++++ fdutils/doc/superformat.texi	Mon May 21 00:24:21 2001
+@@ -187,14 +187,20 @@
+ 
+ @table @code
+ @item --absolute_skew @var{absolute-skew}
+-Set the absolute skew. (The skew value used for the first formatted
+-track)
++
++Set the absolute skew. This skew value is used for the first formatted
++track.  It is expressed in raw bytes.
+ 
+ @item --head_skew @var{head-skew}
+-Set the head skew. (The skew added for passing from head 0 to head 1)
++
++Set the head skew. This is the skew added for passing from head 0 to
++head 1.  It is expressed in raw bytes.
+ 
+ @item --track_skew @var{track-skew}
+-Set the track skew. (The skew added for seeking to the next track)
++
++Set the track skew. This is the skew added for seeking to the next
++track.  It is expressed in raw bytes.
++
+ @end table
+ 
+ Example: (absolute skew=3, head skew=1, track skew=2)
+@@ -209,6 +215,10 @@
+ track 2 head 0: 4,5,6,1,2,3	(skew=3)
+ track 2 head 1: 3,4,5,6,1,2	(skew=4)
+ @end example
++
++N.B. For simplicitie's sake, this example expresses skews in units of
++sectors. In reality, superformat expects the skews to be expressed in
++raw bytes.
+ 
+ @node Examples, Troubleshooting, Sector skewing options, superformat
+ @subsection Examples
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/doc/xdfcopy.1 fdutils/doc/xdfcopy.1
+--- fdutils-5.4/doc/xdfcopy.1	Fri Jun  2 22:28:27 2000
++++ fdutils/doc/xdfcopy.1	Mon Jun 11 22:22:47 2001
+@@ -1,4 +1,4 @@
+-.TH xdfcopy 1 "02jun00" fdutils-5.4
++.TH xdfcopy 1 "11Jun01" fdutils-5.4
+ .SH Name
+ xdfcopy - Program to copy and format Xdf disks in Linux
+ '\" t
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/MAKEFLOPPIES fdutils/src/MAKEFLOPPIES
+--- fdutils-5.4/src/MAKEFLOPPIES	Wed Aug 21 16:51:25 1996
++++ fdutils/src/MAKEFLOPPIES	Sun Feb  3 20:13:39 2002
+@@ -12,6 +12,9 @@
+ set -u
+ MAJOR=2
+ TMPDEVICE=/dev/tmpfloppy$$
++if [ ! -b /dev/fd0 ] ; then
++    mknod /dev/fd0 b $MAJOR 0
++fi
+ if floppycontrol 2>/dev/null; then
+ 	FLOPPYCONTROL=yes
+ else
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/diskseekd.c fdutils/src/diskseekd.c
+--- fdutils-5.4/src/diskseekd.c	Sat May 27 18:50:05 2000
++++ fdutils/src/diskseekd.c	Mon May 21 00:24:21 2001
+@@ -1,4 +1,7 @@
+ #include <sys/types.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++# include <sys/sysmacros.h>
++#endif
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <stdio.h>
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/driveprm.c fdutils/src/driveprm.c
+--- fdutils-5.4/src/driveprm.c	Sat May 27 18:49:58 2000
++++ fdutils/src/driveprm.c	Mon May 21 00:24:21 2001
+@@ -1,3 +1,7 @@
++#include <sys/types.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++# include <sys/sysmacros.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/fdmount.c fdutils/src/fdmount.c
+--- fdutils-5.4/src/fdmount.c	Sat May 27 18:50:14 2000
++++ fdutils/src/fdmount.c	Sun Feb  3 23:50:06 2002
+@@ -826,14 +826,9 @@
+ 
+     mnt=get_mounted(devname);
+     if (!mnt) {
+-	if (!force) {
+-	    errmsg("not mounted");
+-	    save_unlock_mtab();
+-	    return -1;
+-	}
+-	else {
+-	    msg("not in /etc/mtab, trying to unmount anyway!");
+-	}
++	errmsg("not mounted");
++	save_unlock_mtab();
++	return -1;
+     }
+     else {
+ 	mountpoint=mnt->ms.mnt_dir;
+@@ -860,7 +855,7 @@
+     }
+ #endif
+    
+-    e=umount(devname);
++    e=umount(mountpoint);
+     if (e) {
+ 	errmsg("failed to unmount: %s\n",strerror(errno));
+ 	goto err;
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/floppycontrol.c fdutils/src/floppycontrol.c
+--- fdutils-5.4/src/floppycontrol.c	Sun Apr  2 10:18:15 2000
++++ fdutils/src/floppycontrol.c	Sat Oct 27 13:47:28 2001
+@@ -16,6 +16,11 @@
+ #include <getopt.h>
+ #include "enh_options.h"
+ 
++#ifndef FD_DISK_CHANGED
++#define FD_DISK_CHANGED 0
++#endif
++
++
+ int eioctl(int fd, int command,void * param, char *emsg)
+ {
+   int r;
+@@ -381,14 +386,17 @@
+ 			eioctl( fd, FDPOLLDRVSTAT, &drivstat,"get drive state");
+ 		else
+ 			eioctl( fd, FDGETDRVSTAT , &drivstat,"get drive state");
+-		printf("%s %s %s %s %s\n", 
++
++#ifndef FD_DCL_SEEN
++# define FD_DCL_SEEN 0x40
++#endif
++		printf("%s %s %s %s %s %s\n", 
+ 		       drivstat.flags & FD_VERIFY ? "verify" : "",
+ 		       drivstat.flags & FD_DISK_NEWCHANGE ? "newchange" : "",
+ 		       drivstat.flags & FD_NEED_TWADDLE ? "need_twaddle" : "",
+-#ifdef FD_DISK_CHANGED
+ 		       drivstat.flags & FD_DISK_CHANGED ? "disk_changed" : "",
+-#endif
+-		       drivstat.flags & FD_DISK_WRITABLE ?"disk_writable" : "");
++		       drivstat.flags & FD_DISK_WRITABLE ?"disk_writable" : "",
++		       drivstat.flags & FD_DCL_SEEN ?"dcl_seen" : "");
+ 		printf("spinup=		%ld\n", drivstat.spinup_date);
+ 		printf("select=		%ld\n", drivstat.select_date);
+ 		printf("first_read=	%ld\n", drivstat.first_read_date);
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/floppymeter.c fdutils/src/floppymeter.c
+--- fdutils-5.4/src/floppymeter.c	Sat May 27 18:49:58 2000
++++ fdutils/src/floppymeter.c	Mon May 21 00:24:21 2001
+@@ -1,3 +1,7 @@
++#include <sys/types.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++# include <sys/sysmacros.h>
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/measure.c fdutils/src/measure.c
+--- fdutils-5.4/src/measure.c	Sat May 27 18:49:57 2000
++++ fdutils/src/measure.c	Sun Feb  3 22:15:54 2002
+@@ -138,6 +138,23 @@
+ 		perror("format");
+ 		exit(1);
+ 	}
++
++	if((raw_cmd.reply[1] & ~0x20) |
++	   (raw_cmd.reply[2] & ~0x20)) {
++		int i;
++
++		if ( raw_cmd.reply[1] & ST1_WP ){
++		    fprintf(stderr,"The disk is write protected\n");
++		    exit(1);
++		}
++
++		fprintf(stderr, 
++			"\nFatal error while measuring raw capacity\n");
++		for(i=0; i < raw_cmd.reply_count; i++) {
++			fprintf(stderr, "%d: %02x\n", i, raw_cmd.reply[i]);
++		}
++		exit(1);
++	}
+ }
+ 
+ 
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/mediaprm.c fdutils/src/mediaprm.c
+--- fdutils-5.4/src/mediaprm.c	Wed Mar 22 22:16:53 2000
++++ fdutils/src/mediaprm.c	Mon May 21 00:24:21 2001
+@@ -20,6 +20,7 @@
+ 	FE_TPI,
+ 	FE_STRETCH,
+ 	FE_SWAPSIDES,
++	FE_ZEROBASED,
+ 
+ 	FE_GAP,
+ 
+@@ -35,7 +36,8 @@
+ 	FE_DENSITY,
+ } field_t;
+ 
+-static int SIZE, SECT, VSECT, HEAD, CYL, TPI, STRETCH, SWAPSIDES, GAP, FM;
++static int SIZE, SECT, VSECT, HEAD, CYL, TPI, STRETCH, SWAPSIDES, ZEROBASED;
++static int GAP, FM;
+ static int PERP, SSIZE, _2M, DTR, SPEC1, FMT_GAP, DENSITY;
+ static int ssize;
+ 
+@@ -48,6 +50,7 @@
+ #define F_TPI FE_TPI,&TPI
+ #define F_STRETCH FE_STRETCH,&STRETCH
+ #define F_SWAPSIDES FE_SWAPSIDES,&SWAPSIDES
++#define F_ZEROBASED FE_ZEROBASED,&ZEROBASED
+ 
+ #define F_GAP FE_GAP,&GAP
+ 
+@@ -77,6 +80,7 @@
+ 	{ "stretch", F_STRETCH, 0 },
+ 
+ 	{ "swapsides", F_SWAPSIDES, 1},
++	{ "zerobased", F_ZEROBASED, 1},
+ 
+ 	{ "gap", F_GAP, 0},
+ 
+@@ -234,7 +238,7 @@
+ 	medprm->sect = VSECT / 512;
+ 	medprm->head = HEAD;
+ 	medprm->track = CYL;
+-	medprm->stretch = STRETCH | (SWAPSIDES << 1);
++	medprm->stretch = STRETCH | (SWAPSIDES << 1) | (ZEROBASED << 2);
+ 	medprm->gap = GAP;
+ 	medprm->rate = (FM<<7) | (PERP<<6) | (ssize<<3) | (_2M<<2) | DTR;
+ 	medprm->spec1 = SPEC1;
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/printfdprm.c fdutils/src/printfdprm.c
+--- fdutils-5.4/src/printfdprm.c	Mon Jun  9 22:58:15 1997
++++ fdutils/src/printfdprm.c	Mon May 21 00:24:21 2001
+@@ -141,6 +141,12 @@
+ 		print("swapsides",0);			
+ #endif
+ 
++#ifdef FD_ZEROBASED
++	if(ft->stretch & FD_ZEROBASED)
++		print("zerobased",0);			
++#endif
++
++
+ 	if(ft->rate & FD_2M)
+ 		print("2M",0);
+ 	
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/superformat.c fdutils/src/superformat.c
+--- fdutils-5.4/src/superformat.c	Sat May 27 18:49:57 2000
++++ fdutils/src/superformat.c	Fri Feb 22 11:55:23 2002
+@@ -26,7 +26,10 @@
+ 	cylinders as happen to work (as in 2m).  Currently, if too many cylinders
+ 	are attempted it won't fail until the very end
+  */
+-
++#include <sys/types.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++# include <sys/sysmacros.h>
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -68,6 +71,7 @@
+ char floppy_buffer[24 * 512];
+ int verbosity = 3;
+ static char noverify = 0;
++static char noformat = 0;
+ static char dosverify = 0;
+ static char verify_later = 0;
+ short stretch;
+@@ -323,7 +327,8 @@
+ 	raw_cmd.length = nssect * sizeof(format_map_t);
+ 	raw_cmd.cmd_count = 6;
+ 	raw_cmd.cmd[0] = FD_FORMAT & ~fm_mode;
+-	raw_cmd.cmd[1] = head << 2 | ( fd->drive & 3);
++	raw_cmd.cmd[1] = (head << 2 | ( fd->drive & 3)) ^
++	    (fd->swapSides ? 4 : 0);
+ 	raw_cmd.cmd[2] = fd->sizecode;
+ 	raw_cmd.cmd[3] = nssect;
+ 	raw_cmd.cmd[4] = fd->fmt_gap;
+@@ -355,7 +360,8 @@
+ 		raw_cmd.data = floppy_buffer;
+ 		raw_cmd.cmd_count = 9;
+ 		raw_cmd.cmd[0] = FD_WRITE & ~fm_mode & ~0x80;
+-		raw_cmd.cmd[1] = head << 2 | ( fd->drive & 3);
++		raw_cmd.cmd[1] = (head << 2 | ( fd->drive & 3)) ^
++		    (fd->swapSides ? 4 : 0);
+ 		raw_cmd.cmd[2] = cylinder;
+ 		raw_cmd.cmd[3] = head;
+ 		raw_cmd.cmd[4] = cur_sector;
+@@ -490,6 +496,7 @@
+ 
+ 	short retries;
+ 	short zeroBased=0;
++	short swapSides=0;
+ 	int n,rsize;
+ 	char *verify_buffer = NULL;
+ 	char dosdrive;
+@@ -510,6 +517,11 @@
+ 		(void *) &noverify,
+ 		"skip verification" },
+ 
++	{ '\0', "print-drive-deviation", 0, EO_TYPE_BYTE, 1, 0,
++		(void *) &noformat,
++		"print deviation, do not format " },
++
++
+ 	{ 'B', "dosverify", 0, EO_TYPE_BYTE, 1, 0,
+ 		(void *) &dosverify,
+ 		"verify disk using mbadblocks" },
+@@ -662,11 +674,6 @@
+ 		exit(1);
+ 	}
+ 
+-	fd[0].zeroBased = zeroBased;
+-	if(zeroBased)
+-		noverify = 1;
+-
+-
+ 	/* sanity checking */
+ 	if (sizecode < 0 || sizecode >= MAX_SIZECODE) {
+ 		fprintf(stderr,"Bad sizecode %d\n", sizecode);
+@@ -779,7 +786,16 @@
+ 				break;
+ 		}
+ 		stretch = geometry.stretch & 1;
+-		
++#ifdef FD_ZEROBASED
++		if(geometry.stretch & FD_ZEROBASED) {
++			zeroBased = 1;
++		}
++#endif
++#ifdef FD_SWAPSIDES
++		if(geometry.stretch & FD_SWAPSIDES) {
++			swapSides = 1;
++		}
++#endif
+ 		mask |= SET_SECTORS | SET_CYLINDERS | 
+ 			SET_SIZECODE | SET_2M | SET_RATE;
+ 	} else {
+@@ -831,6 +847,15 @@
+ 				stretch = 0;
+ 		}
+ 	}
++
++	fd[0].zeroBased = zeroBased;
++#ifndef FD_ZEROBASED
++	if(zeroBased) {
++		noverify = 1;
++	}
++#endif
++	
++	fd[0].swapSides = swapSides;
+ 		
+ 	if (cylinders > fd[0].drvprm.tracks) {
+ 		fprintf(stderr,"too many cylinder for this drive\n");
+@@ -900,8 +925,9 @@
+ 			fprintf(stderr,
+ 				"In order to avoid this time consuming "
+ 				"measurement in the future,\n"
+-				"add the following line to " DRIVEPRMFILE
+-				":\ndrive%d: deviation=%d\n",
++				"add the following line to " DRIVEPRMFILE ":\n");
++			fprintf(stdout,
++				"drive%d: deviation=%d\n",
+ 				fd[0].drive, 
+ 				(fd[0].raw_capacity-old_capacity)*1000000/
+ 				old_capacity);
+@@ -914,6 +940,9 @@
+ 		}
+ 	}
+ 
++	if(noformat)
++	    return 0;
++
+ 	/* FIXME.  Why is this needed? */
+ 	fd[0].raw_capacity -= 30;
+ 
+@@ -971,7 +1000,11 @@
+ 	parameters.head = heads;
+ 	parameters.track = cylinders;
+ 	parameters.size = cylinders * heads * sectors;
+-	parameters.stretch = stretch;
++	parameters.stretch = stretch 
++#ifdef FD_ZEROBASED
++		| (zeroBased ? 4 : 0)
++#endif
++		| (swapSides ? 2 : 0);
+ 	parameters.gap = fd[0].gap;
+ 	if ( !use_2m)
+ 		fd0.rate = fd[0].rate;
+@@ -1054,7 +1087,7 @@
+ 	ioctl(fd[0].fd, FDFLUSH );
+ 	close(fd[0].fd);
+ 
+-	if (! (mask & SET_DOSDRIVE ) && fd[0].drive < 2)
++	if (! (mask & SET_DOSDRIVE ) && fd[0].drive < 2 && !zeroBased)
+ 		dosdrive = fd[0].drive+'a';
+ 
+ 	if (dosdrive) {
+@@ -1085,8 +1118,9 @@
+ 			dosverify = 0;
+ 		}			
+ 	} else {
+-		fprintf(stderr,
+-			"\nwarning: mformat not called because DOS drive unknown\n");
++		if(!zeroBased)
++			fprintf(stderr,
++				"\nwarning: mformat not called because DOS drive unknown\n");
+ 		/*exit(1);*/
+ 		dosverify = 0;
+ 	}
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/superformat.h fdutils/src/superformat.h
+--- fdutils-5.4/src/superformat.h	Sun Apr  2 10:09:28 2000
++++ fdutils/src/superformat.h	Mon May 21 00:24:21 2001
+@@ -84,6 +84,7 @@
+ 	int rotations; /* how many time do we have to go over 0 to read
+ 			* the track */
+ 	int zeroBased; /* 1 if sector numbering starts at zero */
++	int swapSides; /* if logical side 0 is on physical 1 and vice-versa */
+ };
+ 
+ 
+diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.4/src/xdfcopy.c fdutils/src/xdfcopy.c
+--- fdutils-5.4/src/xdfcopy.c	Sat May 27 18:49:57 2000
++++ fdutils/src/xdfcopy.c	Mon May 21 00:24:21 2001
+@@ -2,6 +2,10 @@
+  * Software patents declared unconstitutional, worldwide
+  */
+ 
++#include <sys/types.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++# include <sys/sysmacros.h>
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/source/a/floppy/fdutils.mediaprm.diff b/source/a/floppy/fdutils.mediaprm.diff
new file mode 100644
index 000000000..cf9a0a6d7
--- /dev/null
+++ b/source/a/floppy/fdutils.mediaprm.diff
@@ -0,0 +1,8 @@
+--- ./src/mediaprm.orig	Sat Feb  3 21:01:37 2001
++++ ./src/mediaprm	Sat Feb  3 21:01:48 2001
+@@ -1,4 +1,4 @@
+-# /etc/fdprm  -  floppy disk parameter table
++# /etc/mediaprm  -  floppy disk parameter table
+ 
+ ########################################################################
+ # Standard linux disk formats. Names are of the form
diff --git a/source/a/floppy/floppy.SlackBuild b/source/a/floppy/floppy.SlackBuild
new file mode 100755
index 000000000..38a5cc86f
--- /dev/null
+++ b/source/a/floppy/floppy.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=5.4
+MTOOLS=3.9.8
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+if [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-floppy
+
+rm -rf $PKG $TMP/fdutils-$VERSION $TMP/mtools-$MTOOLS
+mkdir -p $TMP $PKG/{etc,usr/{bin,info,man/man{1,4,5}}}
+
+cd $TMP
+tar xzvf $CWD/fdutils-$VERSION.tar.gz
+cd fdutils-$VERSION
+zcat $CWD/fdutils-5.4-20020222.diff.gz | patch -p1 --verbose --backup --suffix=.orig
+zcat $CWD/fdutils.mediaprm.diff.gz | patch -p1 --verbose --backup --suffix=.orig
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  $ARCH-slackware-linux
+make install prefix=$PKG/usr
+mkdir -p $PKG/usr/doc/fdutils-$VERSION
+cp -a COPYING CREDITS Changelog INSTALL doc/FAQ.html doc/README \
+  $PKG/usr/doc/fdutils-$VERSION
+chown root:root $PKG/usr/doc/fdutils-$VERSION/*
+chmod 644 $PKG/usr/doc/fdutils-$VERSION/*
+cd $TMP
+tar xzvf $CWD/mtools-$MTOOLS.tar.gz
+cd mtools-$MTOOLS
+CFLAGS="$SLKCFLAGS" \
+./configure \
+   --prefix=/usr \
+   --libdir=/usr/lib${LIBDIRSUFFIX} \
+   --sysconfdir=/etc \
+  $ARCH-slackware-linux
+#make all floppyd floppyd_installtest
+make all
+make install prefix=$PKG/usr sysconfdir=$PKG/etc bindir=$PKG/usr/bin \
+  MAN1DIR=$PKG/usr/man/man1  MAN5DIR=$PKG/usr/man/man5
+cat $CWD/mtools.conf > $PKG/etc/mtools.conf
+cat $CWD/mediaprm > $PKG/etc/mediaprm
+mkdir -p $PKG/usr/doc/mtools-$MTOOLS
+cp -a COPYING Changelog INSTALL README Release.notes TODO \
+  $PKG/usr/doc/mtools-$MTOOLS
+chown root:root $PKG/usr/doc/mtools-$MTOOLS/*
+chmod 644 $PKG/usr/doc/mtools-$MTOOLS/*
+( 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
+)
+( cd $PKG/usr/info ; rm -f dir ; gzip -9 * )
+
+# These are obsolete and/or cruft:
+rm -f $PKG/usr/bin/MAKEFLOPPIES $PKG/usr/bin/lz $PKG/usr/bin/mcheck \
+  $PKG/usr/bin/mcomp $PKG/usr/bin/mxtar $PKG/usr/bin/tgz \
+  $PKG/usr/bin/uz $PKG/usr/man/man1/makefloppies.1
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cd $PKG
+makepkg -l y -c n $TMP/floppy-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/floppy/mediaprm b/source/a/floppy/mediaprm
new file mode 100644
index 000000000..03c82e3b7
--- /dev/null
+++ b/source/a/floppy/mediaprm
@@ -0,0 +1,786 @@
+# /etc/mediaprm  -  floppy disk parameter table
+
+########################################################################
+# Standard linux disk formats. Names are of the form
+#  actual media capacity/maximum drive capacity
+# (Note: although 5.25" HD drives can format disks at 1.44M, they're listed
+#        as 1200 because that's the common maximum size.)
+
+#		size sec/t hds trk stre gap  rate spec1 fmt_gap
+
+"360/360":
+ DS DD sect=9
+
+"1200/1200":
+ DS HD sect=15
+
+"360/720":
+ SS DD sect=9
+
+"720/720":
+ DS DD sect=9
+
+"360/1200":
+ DS DD sect=9
+
+"720/1200":
+ DS QD sect=9
+
+"1440/1440":
+ DS HD sect=18
+
+"2880/2880":
+ DS ED sect=36
+
+"2880/2880":
+ DS ED sect=36
+
+"2880/2880":
+ DS ED sect=36
+
+"1440/1200":
+ DS HD sect=18
+
+"1680/1440":
+ DS HD sect=21
+
+"410/1200":
+ DS DD sect=10 cyl=41
+
+"820/1440":
+ DS DD sect=10 cyl=82
+
+"1476/1200":
+ DS HD sect=18 cyl=82
+
+"1722/1440":
+ DS HD sect=21 cyl=82
+
+"420/1200":
+ DS DD sect=10 cyl=42
+
+"830/1440":
+ DS DD sect=10 cyl=83
+
+"1494/1200":
+ DS HD sect=18 cyl=83
+
+"1743/1440":
+ DS HD sect=21 cyl=83
+
+"1743/1440":
+ DS HD sect=21 cyl=83
+
+"880/1200":
+ DS QD tracksize=11b ssize=1KB
+
+"1040/720":
+ DS QD sect=13
+
+"1120/720":
+ DS QD tracksize=7KB mss
+
+"1600/1200":
+ DS HD tracksize=10KB mss
+
+"1760/1440":
+ DS HD sect=11 ssize=1KB
+
+"1920/1440":
+ DS HD tracksize=12KB mss
+
+"3200/2880":
+ DS ED sect=5 ssize=4KB
+
+"3520/2880":
+ DS ED tracksize=22KB ssize=4KB
+
+"3840/2880":
+ DS ED sect=3 ssize=8KB
+
+"3840/2880":
+ DS ED sect=3 ssize=8KB
+
+"1840/1440":
+ DS HD tracksize=23b ssize=2KB
+
+"800/720":
+ DS DD sect=10
+
+"1600/1440":
+ DS HD sect=20
+
+########################################################################
+# CP/M formats
+#
+# the name is constructed as CODsize, where COD identifies the
+# brand of the computer having formatted the disk
+
+# Generic CP/M - SSSD 8"
+
+"GEN250":
+ SS DD sect=24 dtr=0 fm=1 cyl=77 ssize=128
+
+# ABC-80 - SSDD 48 tpi 5.25"
+
+"ABC160":
+ SS DD sect=16 ssize=256
+
+# Actrix (Access Matrix) - SSDD 48 tpi 5.25"
+
+"ACT180":
+ SS DD sect=9
+
+# Adler Textriter - SSDD 48 tpi 5.25"
+
+"ADL160":
+ SS DD sect=16 ssize=256
+
+# Advanced Digital Super 6 - SSDD 48 tpi 5.25"
+
+"ADV160":
+ SS DD sect=4 ssize=1KB
+
+# Advanced Digital Super 6 - DSDD 96 tpi 5.25"
+
+"ADV640":
+ DS QD sect=4 ssize=1KB
+
+# Altos Series 5 - DSDD 96 tpi 5.25"
+
+"ALT720":
+ DS QD sect=9
+
+# Amigo - SSDD 48 tpi 5.25"
+
+"AMI200":
+ SS DD sect=10
+
+# Ampro - SSDD 48 tpi 5.25"
+
+"AMP200":
+ SS DD sect=10
+
+# Ampro - SSDD 96 tpi 5.25"
+
+"AMP400":
+ SS QD sect=5 ssize=1KB
+
+# Amstrad PCW8256 - DSDD 96 tpi 5.25"
+
+"AMS720":
+ DS QD sect=9
+
+# Archive I - SSDD 96 tpi 5.25"
+
+"ARC400":
+ SS QD sect=5 ssize=1KB
+
+# Archive II & III - DSDD 96 tpi 5.25"
+
+"ARC800":
+ DS QD sect=5 ssize=1KB
+
+# Arisia - SSDD 48 tpi 5.25"
+
+"ARI180":
+ SS DD sect=18 ssize=256
+
+# ATR-8000 - SSDD 48 tpi 5.25"
+
+"ATR200":
+ SS DD sect=5 ssize=1KB
+
+# Beehive - DSDD 48 tpi 5.25"
+
+"BEE400":
+ DS DD sect=10
+
+# Bitelex - SSDD 48 tpi 5.25"
+
+"BIT160":
+ SS DD sect=16 ssize=256
+
+# BMC IF800 Model 20 - DSDD 48 tpi 5.25"
+
+"BMC400":
+ DS DD sect=10
+
+# Burr-Brown - DSDD 48 tpi 5.25"
+
+"BUR360":
+ DS DD sect=18 ssize=256
+
+# Cal-PC - DSDD 48 tpi 5.25"
+
+"CAL400":
+ DS DD sect=5 ssize=1KB
+
+# Cashcom 100 - DSDD 96 tpi 5.25"
+
+"CAS640":
+ DS QD sect=4 ssize=1KB
+
+# CDI-5000 - DSDD 48 tpi 5.25"
+
+"CDI400":
+ DS DD sect=5 ssize=1KB
+
+# CMC Supersystem 2 - DSDD 96 tpi 5.25"
+
+"CMC800":
+ DS QD sect=5 ssize=1KB
+
+# Coleco ADAM, 40 track - SSDD 48 tpi 5.25"
+
+"COL160":
+ SS DD sect=8
+
+# Compugraphic MCS-5 - SSDD 48 tpi 5.25"
+
+"COM160":
+ SS DD sect=16 ssize=256
+
+# Compupro (Viasyn) (1024 bytes/sector) - DSDD 96 tpi 5.25"
+
+"COM800":
+ DS QD sect=5 ssize=1KB
+
+# Cromemco CDOS - SSSD 48 tpi 5.25"
+
+"CRO80":
+ SS SD sect=16 dtr=1 fm=1 ssize=128
+
+# Cromemco CDOS - SSDD 48 tpi 5.25"
+
+"CRO200":
+ SS DD sect=10
+
+# Cromemco CP/M - SSDD 48 tpi 5.25"
+
+"CRO200":
+ SS DD sect=10
+
+# C/WP Cortex - SSDD 48 tpi 5.25"
+
+"CWP200":
+ SS DD sect=10
+
+# Cykey - DSDD 48 tpi 5.25"
+
+"CYK320":
+ DS DD sect=16 ssize=256
+
+# DEC DECMate II - SSDD 96 tpi 5.25"
+
+"DEC400":
+ SS QD sect=10
+
+# DEC Rainbow - SSDD 96 tpi 5.25"
+
+"DEC180":
+ SS DD sect=9
+
+# DEC VT-180 - SSDD 48 tpi 5.25"
+
+"DEC180":
+ SS DD sect=9
+
+# Direct 1025 - DSDD 48 tpi 5.25"
+
+"DIR320":
+ DS DD sect=16 ssize=256
+
+# Discovery - DSDD 96 tpi 5.25"
+
+"DIS640":
+ DS QD sect=8
+
+# Eagle II - SSDD 96 tpi 5.25"
+
+"EAG400":
+ SS QD sect=5 ssize=1KB
+
+# Epson QX-10 - DSDD 48 tpi 5.25"
+
+"EPS400":
+ DS DD sect=10
+
+# Epson QX-10 (256 bytes/sector) - DSDD 48 tpi 5.25"
+
+"EPS320":
+ DS DD sect=16 ssize=256
+
+# Epson PX-8 - DSDD 3.5"
+
+"EPS320":
+ DS DD sect=8
+
+# Ericsson DTC - SSDD 96 tpi 5.25"
+
+"ERI320":
+ SS QD sect=16 ssize=256
+
+# Ericsson Step One - DSDD 96 tpi 5.25"
+
+"ERI720":
+ DS QD sect=9
+
+# Florida Graphics - DSDD 96 tpi 5.25"
+
+"FLO640":
+ DS QD sect=16 ssize=256
+
+# Formula 1 - DSDD 48 tpi 5.25"
+
+"FOR360":
+ DS DD sect=18 ssize=256
+
+# Fujitsu Micro 16 - DSDD 48 tpi 5.25"
+
+"FUJ320":
+ DS DD sect=16 ssize=256
+
+# Fujitsu Micro 8 - DSDD 48 tpi 5.25"
+
+"FUJ320":
+ DS DD sect=16 ssize=256
+
+# HCL System 2 - DSDD 96 tpi 5.25"
+
+"HCL800":
+ DS QD sect=5 ssize=1KB
+
+# Heath H89, Magnolia CP/M - SSDD 48 tpi 5.25"
+
+"HEA180":
+ SS DD sect=9
+
+# Heurikon MLZ-91A - DSDD 96 tpi 5.25"
+
+"HEU640":
+ DS QD sect=16 ssize=256
+
+# IBM PC, CP/M-86 - SSDD 48 tpi 5.25"
+
+"IBM160":
+ SS DD sect=8
+
+# IMS 5000 - SSDD 48 tpi 5.25"
+
+"IMS160":
+ SS DD sect=16 ssize=256
+
+# IMS 5000 TurboDOS - DSDD 96 tpi 5.25"
+
+"IMS800":
+ DS QD sect=5 ssize=1KB
+
+# Intel iPDS 100 - DSDD 96 tpi 5.25"
+
+"INT640":
+ DS QD sect=16 ssize=256
+
+# Insight Enterprises - DSDD 48 tpi 5.25"
+
+"INS320":
+ DS DD sect=16 ssize=256
+
+# Ithaca Intersystems - SSDD 96 tpi 5.25"
+
+"ITH360":
+ SS QD sect=18 ssize=256
+
+# Jet-80 - DSDD 48 tpi 5.25"
+
+"JET400":
+ DS DD sect=5 ssize=1KB
+
+# Lexoriter - SSDD 48 tpi 5.25"
+
+"LEX160":
+ SS DD sect=16 ssize=256
+
+# LNW 2 - SSDD 48 tpi 5.25"
+
+"LNW180":
+ SS DD sect=18 ssize=256
+
+# Macsym 150 - SSDD 96 tpi 5.25"
+
+"MAC320":
+ SS QD sect=8
+
+# Magic - DSDD 48 tpi 5.25"
+
+"MAG400":
+ DS DD sect=10
+
+# MAI Basic Four - DSDD 96 tpi 5.25"
+
+"MAI640":
+ DS QD sect=16 ssize=256
+
+# Micron Quark - DSDD 48 tpi 5.25"
+
+"MIC320":
+ DS DD sect=4 ssize=1KB
+
+# Monroe 8800 Series - SSDD 96 tpi 5.25"
+
+"MON320":
+ SS QD sect=16 ssize=256
+
+# Morrow MD2 - SSDD 48 tpi 5.25"
+
+"MOR200":
+ SS DD sect=5 ssize=1KB
+
+# Morrow MD3, 5, 11, 16, 34 - DSDD 48 tpi 5.25"
+
+"MOR400":
+ DS DD sect=5 ssize=1KB
+
+# Morrow TurboDOS - DSDD 48 tpi 5.25"
+
+"MOR320":
+ DS DD sect=4 ssize=1KB
+
+# NCR FirstStep - DSDD 96 tpi 5.25"
+
+"NCR640":
+ DS QD sect=16 ssize=256
+
+# NEC PC-8001A - SSDD 48 tpi 5.25"
+
+"NEC160":
+ SS DD sect=16 ssize=256
+
+# NEC PC 8801A/8831A - DSDD 48 tpi 5.25"
+
+"NEC320":
+ DS DD sect=8
+
+# NEC PC 8500/8431A, Starlet - DSDD 3.5"
+
+"NEC320":
+ SS QD sect=16 ssize=256
+
+# Nixdorf 8810/30 - DSDD 96 tpi 5.25"
+
+"NIX800":
+ DS QD sect=10
+
+# OKI IF800 Model 20 - DSDD 48 tpi 5.25"
+
+"OKI400":
+ DS DD sect=10
+
+# Olivetti ETV300 - SSDD 48 tpi 5.25"
+
+"OLI180":
+ SS DD sect=18 ssize=256
+
+# Olivetti M20 - DSDD 48 tpi 5.25"
+
+"OLI320":
+ DS DD sect=16 ssize=256
+
+# Olivetti 250 -  SSDD 3.5"
+
+"OLI320":
+ SS QD sect=16 ssize=256
+
+# Olympia EX-100 - DSDD 48 tpi 5.25"
+
+"OLY360":
+ DS DD sect=9
+
+# Olympia ETX II - SSDD 48 tpi 5.25"
+
+"OLY180":
+ SS DD sect=9
+
+# Osborne 1 - SSSD 48 tpi 5.25"
+
+"OSB100":
+ SS SD sect=10 dtr=1 fm=1 ssize=256
+
+# Osborne 1 - SSDD 48 tpi 5.25"
+
+"OSB200":
+ SS DD sect=5 ssize=1KB
+
+# Osborne Executive - SSDD 48 tpi 5.25"
+
+"OSB200":
+ SS DD sect=5 ssize=1KB
+
+# Osborne 1 + Osmosis - DSDD 96 tpi 5.25"
+
+"OSB400":
+ DS DD sect=10
+
+# Osborne Vixen - DSDD 48 tpi 5.25"
+
+"OSB400":
+ DS DD sect=5 ssize=1KB
+
+# Osborne Executive w/Z3 - DSDD 96 tpi 5.25"
+
+"OSB800":
+ DS QD sect=5 ssize=1KB
+
+# OSM Zeus 4 - DSDD 96 tpi 5.25"
+
+"OSM640":
+ DS QD sect=8
+
+# Panasonic KX-E828 - DSDD 48 tpi 5.25"
+
+"PAN320":
+ DS DD sect=16 ssize=256
+
+# Pegasus Data Logger - DSDD 48 tpi 5.25"
+
+"PEG360":
+ DS DD sect=9
+
+# Philips PC-2010 - SSDD 48 tpi 5.25"
+
+"PHI160":
+ SS DD sect=16 ssize=256
+
+# Philips PC-3000 - 3004 - SSDD 96 tpi 5.25"
+
+"PHI320":
+ SS QD sect=16 ssize=256
+
+# Pied Piper - DSDD 96 tpi 5.25"
+
+"PIE800":
+ DS QD sect=10
+
+# PMC Micromate - DSDD 48 tpi 5.25"
+
+"PMC400":
+ DS DD sect=5 ssize=1KB
+
+# Proglas 770KB - DSDD 96 tpi 5.25"
+
+"PRO800":
+ DS QD sect=10
+
+# Royal Alphatronic - DSDD 48 tpi 5.25"
+
+"ROY320":
+ DS DD sect=16 ssize=256
+
+# Sage IV - DSDD 96 tpi 5.25"
+
+"SAG640":
+ DS QD sect=8
+
+# Sanyo MBC-1000, MBC-1150 - DSDD 48 tpi 5.25"
+
+"SAN320":
+ DS DD sect=16 ssize=256
+
+# Sanyo  MBC-1250 - DSDD 96 tpi 5.25"
+
+"SAN640":
+ DS QD sect=16 ssize=256
+
+# Seequa Chameleon - SSDD 48 tpi 5.25"
+
+"SEE160":
+ SS DD sect=8
+
+# Seiko - DSDD 96 tpi 5.25"
+
+"SEI640":
+ DS QD sect=16 ssize=256
+
+# Siemens  PG-685 - DSDD 96 tpi 5.25"
+
+"SIE720":
+ DS QD sect=9
+
+# Siemens PG-675 DSDD 48 tpi 5.25"
+
+"SIE360":
+ DS DD sect=9
+
+# Siemens PG-635 DSDD 3.5"
+
+"SIE720":
+ DS QD sect=9
+
+# Sorbus TurboDOS - 5.25" DSHD (or 8" DSDD)
+
+"SOR1232":
+ DS HD sect=8 cyl=77 ssize=1KB
+
+# Sperry UTS 30, UTS 5000 - DSDD 96 tpi 5.25"
+
+"SPE720":
+ DS QD sect=9
+
+# Superbrain JR - SSDD 48 tpi 5.25"
+
+"SUP175":
+ SS DD sect=10 cyl=35
+
+# Superbrain 40 track - SSDD 48 tpi 5.25"
+
+"SUP200":
+ SS DD sect=10
+
+# Systel 2 - SSDD 48 tpi 5.25"
+
+"SYS180":
+ SS DD sect=9
+
+# Systel 3 - DSDD 48 tpi 5.25"
+
+"SYS360":
+ DS DD sect=9
+
+# Televideo 801, 806 - DSDD 48 tpi 5.25"
+
+"TEL360":
+ DS DD sect=18 ssize=256
+
+# Televideo 1603 - DSDD 96 tpi 5.25"
+
+"TEL720":
+ DS QD sect=9
+
+# TI Professional, CP/M-86 - SSDD 48 tpi 5.25"
+
+"TI1160":
+ SS DD sect=8
+
+# Toshiba T100, T200 - DSDD 48 tpi 5.25"
+
+"TOS320":
+ DS DD sect=16 ssize=256
+
+# TRS-80 Model 1, Omikron CP/M - SSSD 48 tpi 5.25"
+
+"TRS0":
+ SS SD sect=16 dtr=1 fm=1 cyl=0 ssize=128
+
+# TRS-80 Model 1, Color Power II - SSDD 48 tpi 5.25"
+
+"TRS180":
+ SS DD sect=18 ssize=256
+
+# TRS-80, MM CP/M - SSDD 48 tpi 5.25"
+
+"TRS200":
+ SS DD sect=10
+
+# TRS-80 Model 4, MT CP/M - SSDD 48 tpi 5.25"
+
+"TRS180":
+ SS DD sect=18 ssize=256
+
+# TRS-80 Model 4, MT CP/M - DSDD 48 tpi 5.25"
+
+"TRS360":
+ DS DD sect=18 ssize=256
+
+# TRS-80 Model 4 - SSDD 48 tpi 5.25"
+
+"TRS160":
+ SS DD sect=8
+
+# Visual 1050 - SSDD 96 tpi 5.25"
+
+"VIS400":
+ SS QD sect=10
+
+# Wangwriter - DSDD 48 tpi 5.25"
+
+"WAN320":
+ DS DD sect=16 ssize=256
+
+# Wave Mate Bullet - SSDD 48 tpi 5.25"
+
+"WAV200":
+ SS DD sect=5 ssize=1KB
+
+# Xerox 820 - SSSD 48 tpi 5.25"
+
+"XER80":
+ SS SD sect=16 dtr=1 fm=1 ssize=128
+
+# Xerox 820 II - SSDD 48 tpi 5.25"
+
+"XER160":
+ SS DD sect=16 ssize=256
+
+# Zenith Z-37 Disk - SSSD 48 tpi 5.25"
+
+"ZEN100":
+ SS SD sect=10 dtr=1 fm=1 ssize=256
+
+# Zenith Z-37 Disk - DSDD 96 tpi 5.25"
+
+"ZEN640":
+ DS QD sect=16 ssize=256
+
+# Zenith Z89, Heath H89 - DSDD 48 tpi 5.25"
+
+"ZEN320":
+ DS DD sect=16 ssize=256
+
+# Zenith Z89, Heath H89 - DSDD 96 tpi 5.25"
+
+"ZEN640":
+ DS QD sect=16 ssize=256
+
+# Zenith Z90 - SSDD 48 tpi 5.25"
+
+"ZEN160":
+ SS DD sect=16 ssize=256
+
+# Zenith Z90 - DSDD 48 tpi 5.25"
+
+"ZEN320":
+ DS DD sect=16 ssize=256
+
+# Zenith Z-100 - SSDD 48 tpi 5.25"
+
+"ZEN160":
+ SS DD sect=8
+
+# Zenith Z-100 - DSDD 48 tpi 5.25"
+
+"ZEN320":
+ DS DD sect=8
+
+
+
+########################################################################
+#  Other interesting formats, please contribute ;-)
+#
+
+# Commodore 1581  (the 3 1/2 drive of the Commodore 128)
+"CBM1581":
+ DS DD sect=10 swapsides
+
+# Color computer, sides 1 and 2
+"COCO1":
+ SS DD sect=18 cyl=35 ssize=256
+
+"COCO2":
+ SS DD sect=18 cyl=35 ssize=256
+
+# TO7 (Thomson), sides 1 and 2
+"TO7-1"
+ SS DD sect=16 ssize=256
+
+"TO7-2"
+ SS DD sect=16 ssize=256 swapsides
diff --git a/source/a/floppy/mtools.conf b/source/a/floppy/mtools.conf
new file mode 100644
index 000000000..b528c01d6
--- /dev/null
+++ b/source/a/floppy/mtools.conf
@@ -0,0 +1,64 @@
+# Example mtools.conf files.  Uncomment the lines which correspond to
+# your architecture and comment out the "SAMPLE FILE" line below
+#SAMPLE FILE
+
+# # Linux floppy drives
+drive a: file="/dev/fd0" exclusive
+drive b: file="/dev/fd1" exclusive
+
+# # First SCSI hard disk partition
+# drive c: file="/dev/sda1"
+
+# # First IDE hard disk partition
+# drive c: file="/dev/hda1"
+
+# # dosemu floppy image
+# drive m: file="/var/lib/dosemu/diskimage"
+
+# # dosemu hdimage
+# drive n: file="/var/lib/dosemu/diskimage" offset=3840
+
+# # Atari ramdisk image
+# drive o: file="/tmp/atari_rd" offset=136
+
+# # ZIP disk for Solaris:
+# Drive X is ZIP-100 at target 5
+# drive X: file="/dev/rdsk/c0t5d0s2" partition=4 scsi=1 nodelay
+
+# # ZIP disk for SunOS:
+# # Zip drive is at target 5, which default kernel calls tape st1 !!
+# drive Y: file="/dev/rsd5c" partition=4 scsi=1 nodelay
+
+# # autoselect zip drive/floppy on HP-UX 9/10
+#    drive a: file="/dev/rdsk/c201d5"      exclusive partition=4
+#    drive a: file="/dev/rdsk/c201d5s0"    exclusive partition=4
+#    drive a: file="/dev/rfloppy/c201d0s0" exclusive
+
+#          A/UX target 5 on 1st scsi bus   jaz or zip
+# drive X: file="/dev/rdsk/c105d0s31"      partition=4
+
+
+# Some examples for BeOS.
+# floppy drive. hardcoded in devices.c, so no real need to define it here
+#drive a: file="/dev/floppy_disk" exclusive
+# ZIP drive on SCSI ID 6
+#drive z: file="/dev/scsi_disk_060" offset=16384 fat_bits=16                        
+
+# SCO Unix 3.2v4
+# # Floppy disk drives
+#
+# drive a: file="/dev/install" exclusive
+# drive b: file="/dev/install1" exclusive
+#  
+# # SCSI hard disk partitions
+#  
+# drive c: file="/dev/dsk/0sC"
+# drive d: file="/dev/dsk/0sD"
+# drive e: file="/dev/dsk/0sE"
+# drive f: file="/dev/dsk/0sF"
+# drive g: file="/dev/dsk/0sG"
+# drive h: file="/dev/dsk/0sH"
+
+# # uncomment the following line to display all file names in lower
+# # case by default
+# mtools_lower_case=1
diff --git a/source/a/floppy/slack-desc b/source/a/floppy/slack-desc
new file mode 100644
index 000000000..bb9169420
--- /dev/null
+++ b/source/a/floppy/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------------------------------------------------------|
+floppy: floppy (floppy disk utilities)
+floppy:
+floppy: Contains fdutils-5.4, tools to test and format floppy disks; and
+floppy: mtools-3.9.8, a collection of utilities for using DOS/Windows floppy
+floppy: disks with Linux.
+floppy:
+floppy:
+floppy:
+floppy:
+floppy:
+floppy:
diff --git a/source/a/gawk/gawk.SlackBuild b/source/a/gawk/gawk.SlackBuild
new file mode 100755
index 000000000..e65e5aaf7
--- /dev/null
+++ b/source/a/gawk/gawk.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=3.1.6
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-gawk
+
+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"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf gawk-$VERSION
+tar xjvf $CWD/gawk-$VERSION.tar.bz2
+cd gawk-$VERSION
+
+chown -R root:root .
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  $ARCH-slackware-linux
+
+make -j3 || exit 1
+make 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
+)
+( cd $PKG/usr/bin
+  ln -sf gawk-$VERSION gawk
+  ln -sf pgawk-$VERSION pgawk
+)
+mkdir -p $PKG/bin
+mv $PKG/usr/bin/gawk* $PKG/bin
+mv $PKG/usr/bin/awk $PKG/bin
+( cd $PKG/usr/bin
+  ln -sf ../../bin/awk .
+  ln -sf ../../bin/gawk .
+  ln -sf ../../bin/gawk-$VERSION .
+)
+( cd $PKG/usr/info
+  rm dir
+  gzip -9 *
+)
+( cd $PKG/usr/man/man1
+  rm -f pgawk.1
+  gzip -9 *
+  ln -sf gawk.1.gz awk.1.gz
+  ln -sf gawk.1.gz pgawk.1.gz
+)
+mkdir -p $PKG/usr/doc/gawk-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING FUTURES INSTALL LIMITATIONS NEWS POSIX.STD \
+  PROBLEMS README README_d \
+  $PKG/usr/doc/gawk-$VERSION
+find $PKG/usr/doc/gawk-$VERSION -type d -exec chmod 755 {} \;
+find $PKG/usr/doc/gawk-$VERSION -type f -exec chmod 644 {} \;
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/gawk-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/gawk/slack-desc b/source/a/gawk/slack-desc
new file mode 100644
index 000000000..739f2a9e6
--- /dev/null
+++ b/source/a/gawk/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------------------------------------------------------|
+gawk: gawk (pattern scanning and processing language)
+gawk:
+gawk: Gawk is the GNU Project's implementation of the AWK programming
+gawk: language.  It conforms to the definition of the language in the POSIX
+gawk: 1003.2 Command Language And Utilities Standard.  This version in turn
+gawk: is based on the description in The AWK Programming Language, by Aho,
+gawk: Kernighan, and Weinberger, with the additional features found in the
+gawk: System V Release 4 version of UNIX awk.  Gawk also provides more
+gawk: recent Bell Labs awk extensions, and some GNU-specific extensions.
+gawk:
+gawk:
diff --git a/source/a/genpower/genpower.SlackBuild b/source/a/genpower/genpower.SlackBuild
new file mode 100755
index 000000000..03f15675c
--- /dev/null
+++ b/source/a/genpower/genpower.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=${VERSION:-1.0.5}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-genpower
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf genpower-$VERSION
+tar xvf $CWD/genpower-$VERSION.tar.gz || exit 1
+cd genpower-$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 {} \;
+
+find . -type d -name CVS -depth -exec rm -rf {} \;
+
+zcat $CWD/genpower.var.diff.gz | patch -p1 -E --verbose || exit 1
+zcat $CWD/genpower.halt.diff.gz | patch -p1 --verbose || exit 1
+
+make -j4 || make || exit 1
+mkdir -p $PKG/sbin
+cat genpowerd > $PKG/sbin/genpowerd
+cat gentest > $PKG/sbin/gentest
+cat genpowerfail > $PKG/sbin/genpowerfail
+mkdir -p $PKG/etc
+cat genpowerd.conf > $PKG/etc/genpowerd.conf.new
+chmod 755 $PKG/sbin/*
+
+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/man/man8
+cat genpowerd.8 | gzip -9c > $PKG/usr/man/man8/genpowerd.8.gz
+cat gentest.8 | gzip -9c > $PKG/usr/man/man8/gentest.8.gz
+
+mkdir -p $PKG/usr/doc/genpower-$VERSION
+cp -a \
+  COPYING Change.Log README TODO genpower.docs cables \
+  $PKG/usr/doc/genpower-$VERSION
+
+mkdir -p $PKG/install
+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...
+}
+config etc/genpowerd.conf.new
+EOF
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/genpower-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/genpower/genpower.halt.diff b/source/a/genpower/genpower.halt.diff
new file mode 100644
index 000000000..05c6a23f1
--- /dev/null
+++ b/source/a/genpower/genpower.halt.diff
@@ -0,0 +1,32 @@
+--- ./genpowerfail.orig	2008-12-02 17:49:36.000000000 -0600
++++ ./genpowerfail	2008-12-02 18:22:37.000000000 -0600
+@@ -36,23 +36,23 @@
+ 	                stats=`head -1 $statpath`
+ 			case "$stats" in
+ 				FAIL)  # Power is down
+-                                	shutdown -r +2 "THE POWER IS DOWN! SHUTTING DOWN SYSTEM! PLEASE LOG OFF NOW!" < /dev/console &
++                                	shutdown -h +2 "THE POWER IS DOWN! SHUTTING DOWN SYSTEM! PLEASE LOG OFF NOW!" < /dev/console &
+ 					;;
+ 				SCRAM) # Battery is low
+-					shutdown -r now "THE POWER IS DOWN! BATTERY POWER IS LOW!  EMERGENCY SHUTDOWN!" < /dev/console &
++					shutdown -h now "THE POWER IS DOWN! BATTERY POWER IS LOW!  EMERGENCY SHUTDOWN!" < /dev/console &
+ 					;;
+ 				CABLE) # Possible bad cable
+- 	                                shutdown -r +1 "POSSIBLE BAD CABLE! SHUTTING DOWN SYSTEM! PLEASE LOG OFF NOW!" < /dev/console &
++ 	                                shutdown -h +1 "POSSIBLE BAD CABLE! SHUTTING DOWN SYSTEM! PLEASE LOG OFF NOW!" < /dev/console &
+ 					;;
+                                 *)     # Unknown message, assume power is down
+-                                        shutdown -r +2 "THE POWER IS DOWN! SHUTTING DOWN SYSTEM! PLEASE LOG OFF NOW!" < /dev/console &
++                                        shutdown -h +2 "THE POWER IS DOWN! SHUTTING DOWN SYSTEM! PLEASE LOG OFF NOW!" < /dev/console &
+                                         ;;
+ 
+ 			esac
+ 		else
+-			# genowerfail called, and upsstatus dosen't exist.
++			# genpowerfail called, and upsstatus dosen't exist.
+ 			# Assume user is using powerd, and shutdown.
+-			shutdown -r +2 "THE POWER IS DOWN! SHUTTING DOWN SYSTEM! PLEASE LOG OFF NOW!" < /dev/console &
++			shutdown -h +2 "THE POWER IS DOWN! SHUTTING DOWN SYSTEM! PLEASE LOG OFF NOW!" < /dev/console &
+  
+ 		fi
+ 		;;
diff --git a/source/a/genpower/genpower.var.diff b/source/a/genpower/genpower.var.diff
new file mode 100644
index 000000000..fa3c9e998
--- /dev/null
+++ b/source/a/genpower/genpower.var.diff
@@ -0,0 +1,34 @@
+--- ./genpowerfail.orig	Wed Apr 10 18:25:07 2002
++++ ./genpowerfail	Wed Apr 10 19:14:27 2002
+@@ -6,19 +6,19 @@
+ #		This script is also being run when the power comes
+ #		up again (if it does in time!)
+ #
+-# Version:	/etc/genpowerfail 1.0.1
++# Version:	/sbin/genpowerfail 1.0.1
+ #
+ # Author:	Tom Webster <webster@kaiwan.com>
+ #
+ 
+ # Set the path.
+-PATH=/sbin:/etc:/bin:/usr/bin
++PATH=/sbin:/bin:/usr/bin:/usr/sbin
+ 
+ # Set location of upsstatus file
+ statpath="/etc/upsstatus"
+ 
+ # Set location of file containing PID of running shutdowns
+-spidpath="/etc/shutdownpid"
++spidpath="/var/run/shutdownpid"
+ 
+ # See what happened.
+ case "$1" in
+@@ -63,7 +63,7 @@
+ 		shutdown -c "THE POWER IS BACK"
+ 		;;
+   	*)
+-		echo "Usage: /etc/genpowerfail {start|stop}"
++		echo "Usage: /sbin/genpowerfail {start|stop}"
+ 		exit 1
+ 		;;
+   esac
diff --git a/source/a/genpower/slack-desc b/source/a/genpower/slack-desc
new file mode 100644
index 000000000..e0f4590e5
--- /dev/null
+++ b/source/a/genpower/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------------------------------------------------------|
+genpower: genpower (UPS monitoring daemon)
+genpower:
+genpower: The genpower daemon, genpowerd, will monitor the status of a serial
+genpower: line connected to a UPS (Uninterruptible Power Supply).  If a power
+genpower: failure is detected, genpowerd will notify the system to take the
+genpower: needed steps to react to the condition of the UPS.  This may include
+genpower: shutting the system down, or canceling a pending shutdown if the
+genpower: power is restored.
+genpower:
+genpower:
+genpower:
diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild
new file mode 100755
index 000000000..945032c69
--- /dev/null
+++ b/source/a/gettext/gettext-tools.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Copyright 2005-2008  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.
+
+VERSION=0.17
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-gettext-tools
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  LIBDIRSUFFIX=""
+elif [ "$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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf gettext-$VERSION
+tar xjvf $CWD/gettext-$VERSION.tar.bz2 || exit 1
+cd gettext-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-static \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/gettext-tools-$VERSION \
+  --build=$ARCH-slackware-linux
+make -j4 || exit 1
+cd gettext-tools
+make install DESTDIR=$PKG
+
+( 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
+)
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+gzip $PKG/usr/man/man?/*
+( cd $PKG/usr/doc
+  mv gettext gettext-tools-$VERSION
+  cd gettext-tools-$VERSION
+  # These take up a ton of space otherwise
+  tar cf examples.tar examples
+  bzip2 -9 examples.tar
+  rm -rf examples
+  # Move the HTML docs into a subdirectory:
+  mkdir html
+  mv *.html html
+  # This file isn't in the package, but it's in one you have to install,
+  # or there will be bigger problems than this dead link:
+  rm -f ABOUT-NLS
+  ln -sf /usr/share/gettext/ABOUT-NLS .
+)
+cp -a \
+  AUTHORS ../COPYING INSTALL NEWS README \
+  $PKG/usr/doc/gettext-tools-$VERSION
+mkdir -p $PKG/install
+cat $CWD/slack-desc.gettext-tools > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/gettext-tools-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild
new file mode 100755
index 000000000..bdc269c50
--- /dev/null
+++ b/source/a/gettext/gettext.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=0.17
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-gettext
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  LIBDIRSUFFIX=""
+elif [ "$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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf gettext-$VERSION
+tar xjvf $CWD/gettext-$VERSION.tar.bz2 || exit 1
+cd gettext-$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 {} \;
+
+cd gettext-runtime
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/gettext-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make -j4 || exit 1
+make install DESTDIR=$PKG
+( 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
+)
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+gzip -9 $PKG/usr/man/man?/*
+( cd $PKG/usr/doc
+  mkdir gettext-$VERSION
+  mv gettext/csharpdoc gettext/javadoc1 gettext/javadoc2 libasprintf \
+  gettext-$VERSION
+  rm -rf gettext
+  cd gettext-$VERSION
+  if [ -r $PKG/usr/share/gettext/ABOUT-NLS ]; then
+    rm -f ABOUT-NLS
+    ln -sf /usr/share/gettext/ABOUT-NLS .
+  fi
+)
+cp -a \
+  AUTHORS BUGS intl/COPYING.LIB-2.0 intl/COPYING.LIB-2.1 INSTALL NEWS README \
+  $PKG/usr/doc/gettext-$VERSION
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/gettext-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/gettext/slack-desc b/source/a/gettext/slack-desc
new file mode 100644
index 000000000..b8f30f254
--- /dev/null
+++ b/source/a/gettext/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------------------------------------------------------|
+gettext: gettext (internationalization framework)
+gettext:
+gettext: The GNU gettext package contains "gettext" and "ngettext", programs
+gettext: that are used to internationalize the messages given by shell scripts.
+gettext:
+gettext:
+gettext:
+gettext:
+gettext:
+gettext:
+gettext:
diff --git a/source/a/gettext/slack-desc.gettext-tools b/source/a/gettext/slack-desc.gettext-tools
new file mode 100644
index 000000000..06c32c463
--- /dev/null
+++ b/source/a/gettext/slack-desc.gettext-tools
@@ -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------------------------------------------------------|
+gettext-tools: gettext-tools (internationalization framework tools)
+gettext-tools:
+gettext-tools: The GNU gettext-tools package is useful for authors and maintainers of
+gettext-tools: internationalized software, or for anyone compiling programs that
+gettext-tools: use the gettext functions.  This package provides the needed tools and
+gettext-tools: library functions for the handling of messages in different languages.
+gettext-tools: Some other GNU packages use the gettext program (included in this
+gettext-tools: package) to internationalize the messages given by shell scripts.
+gettext-tools:
+gettext-tools:
+gettext-tools:
diff --git a/source/a/getty-ps/getty-ps.SlackBuild b/source/a/getty-ps/getty-ps.SlackBuild
new file mode 100755
index 000000000..76e4012dd
--- /dev/null
+++ b/source/a/getty-ps/getty-ps.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=2.1.0b
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-getty-ps
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+tar xzvf $CWD/getty_ps-$VERSION.tar.gz
+cd getty_ps-$VERSION
+zcat $CWD/getty.bugfixes.diff.gz | patch -p1 --verbose || exit
+# Prevent "error: conflicting types for 'send'"
+# because send is already defined in <sys/net.h>
+sed -i -e "s/send/gettysend/g" funcs.c
+chown -R root:root .
+make clean
+rm getty uugetty
+make
+strip getty uugetty
+mkdir $PKG/sbin
+cat getty > $PKG/sbin/getty
+cat uugetty > $PKG/sbin/uugetty
+chmod 755 $PKG/sbin/*
+mkdir $PKG/etc
+cat Examples/gettydefs > $PKG/etc/gettydefs
+#cat Examples/ttytype > $PKG/etc/ttytype
+mkdir $PKG/etc/default
+cp -a Examples/default/* $PKG/etc/default
+chown root:root $PKG/etc/default/*
+mkdir -p $PKG/usr/man/man1
+cat man/getty.1 | gzip -9c > $PKG/usr/man/man1/getty.1.gz
+( cd $PKG/usr/man/man1 ; ln -sf getty.1.gz uugetty.1.gz )
+mkdir -p $PKG/usr/man/man5
+cat man/gettydefs.5 | gzip -9c > $PKG/usr/man/man5/gettydefs.5.gz
+mkdir -p $PKG/usr/doc/getty-ps-$VERSION
+cp -a \
+  ANNOUNCE ChangeLog README.* Examples *.lsm INSTALL \
+  $PKG/usr/doc/getty-ps-$VERSION
+find $PKG/usr/doc/getty-ps-$VERSION -type d -exec chmod 755 {} \;
+find $PKG/usr/doc/getty-ps-$VERSION -type f -exec chmod 644 {} \;
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/getty-ps-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/getty_ps-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/a/getty-ps/getty.bugfixes.diff b/source/a/getty-ps/getty.bugfixes.diff
new file mode 100644
index 000000000..6a1ed29e9
--- /dev/null
+++ b/source/a/getty-ps/getty.bugfixes.diff
@@ -0,0 +1,356 @@
+This patch contains the following bugfixes:
+
+* the TIMEOUT (and -t flag) has now different effect for getty and uugetty:
+  with uugetty, TIMEOUT set will now cause uugetty exit no matter whether
+  there has been any input from the user (the counting will start immediately
+  after login() has been spawned - pre- getty-2.1.0 behavior), while for
+  getty, it will make the counter start after single input has been detected
+  from the user
+  * getty.1 manpage updated accordingly
+
+* @F issue substitution now works as expected
+
+* @V / VERSION functionality documentation fix in getty.1 manpage
+
+* fixed a bunch of memleaks (if not all):
+  * Fputs() made strdup()-free (we now use static structs where possible)
+  * avoided unnecessary dual strdup() for Version in defs()
+  * freeing of "DEF **def" including its internals is now handled, as well as
+    feeing of other variables in defs() pointing to strdup()ed memory areas
+
+Jan Rafaj
+
+--- ./man/getty.1.orig	2002-09-13 09:05:03.000000000 +0200
++++ ./man/getty.1	2005-07-21 10:24:53.000000000 +0200
+@@ -307,7 +307,18 @@
+ to exit (which
+ .I init
+ should then respawn), if the login is not completed within timeout seconds
+-(after the login name is entered)
++(after the login name is entered). This option behaves differently for
++.I getty
++and
++.I uugetty.
++If
++.I getty
++is used, the counting will start after single input from the user has been
++detected, whileas with
++.I uugetty,
++the counting will start immediately after
++.IR login (1m)
++has been spawned, no matter the input from the user.
+ 
+ Giving
+ .B \-w
+@@ -388,9 +399,12 @@
+ If
+ .I string
+ begins with a '/' character, it is assumed to be the full pathname of a
+-file, and
++text file, and
+ .B @V
+-is set to be the contents of that file.  The default is /proc/version.
++is set to be the contents of the first line in that file (line has to be
++terminated by newline character or by end of file).
++.br
++The default is /proc/version.
+ .TP
+ LOGIN=\fIname\fR
+ Sets the name of the login program to
+@@ -503,6 +517,14 @@
+ to exit if no user name is accepted before the
+ .I number
+ of seconds elapse after the login prompt is displayed.
++With
++.I getty,
++the counting will start as soon as a single character
++has been entered by the user, whileas with
++.I uugetty,
++the counting will start immediately after the login prompt
++is displayed, no matter the input from the user.
++.br
+ The default is to wait indefinitely for the user name.
+ .TP
+ CONNECT=\fIstring\fR
+@@ -865,6 +887,11 @@
+ .IR cu (1)
+ and others).  This prevents two or more processes from having conficting
+ use of a tty port.
++.br
++.I Uugetty
++also differs from
++.I getty
++by handling the -t parameter and TIMEOUT option.
+ .PP
+ When
+ .I uugetty
+--- ./main.c.orig	2004-04-11 03:34:34.000000000 +0200
++++ ./main.c	2005-07-21 11:37:19.000000000 +0200
+@@ -78,6 +78,8 @@
+ void	debugstart();
+ #endif /* DEBUG */
+ 
++DEF	**def;
++
+ /* trivial globals */
+ 
+ char	buf[MAXLINE];
+@@ -86,7 +88,7 @@
+ char	tbuf[64];
+ 
+ #define Perror(s)	{ debug(D_INIT, "Line %d: %s: Error %d: %s\n", \
+-				__LINE__, s, errno, sys_errlist[errno]); \
++				__LINE__, s, errno, strerror(errno)); \
+ 			    exit(errno); \
+ 			}
+ 
+@@ -149,6 +151,50 @@
+ 	}
+ }
+ 
++/*
++ * Why a lot of programmers ignore the fact that memory area returned
++ * by strdup() and *alloc() has to be freed upon exit? :(( -JR
++ */
++void free_def(void)
++{
++	register DEF **deflist = def;
++
++	for (; *deflist != (DEF *)NULL; deflist++) {
++	    free((*deflist)->name);
++	    free((*deflist)->value);
++	    free(*deflist);
++	}
++}
++
++void free_sysname(void)
++{
++	if (SysName)
++		free(SysName);
++	SysName = NULL;
++}
++
++void free_version(void)
++{
++	if (Version)
++		free(Version);
++	Version = NULL;
++}
++
++#ifdef UUGETTY
++void free_lock(void)
++{
++	if (lock)
++		free(lock);
++	lock = NULL;
++}
++
++void free_altlock(void)
++{
++	if (altlock)
++		free(altlock);
++	altlock = NULL;
++}
++#endif
+ 
+ /*
+ ** main
+@@ -320,7 +366,6 @@
+ char	**args;
+ {
+ 	register int	c;
+-	DEF		**def;
+ 	char		*p;
+ 	char		termcap[1024];
+ 
+@@ -416,22 +461,27 @@
+ /* now, get all that info in the defaults file */
+ 
+ 	def = defbuild(defname);
++	atexit(free_def);
+ #ifdef DEBUG
+ 	if ((p = defvalue(def, "DEBUG"))) (void) sscanf(p, "%o", &Debug);
+ 	if (Debug) debugstart();
+ #endif /* DEBUG */
+ 	SysName = strdup(getuname());
++	atexit(free_sysname);
+ 	if (p = defvalue(def, "SYSTEM")) SysName = p;
+-	if (p = defvalue(def, "VERSION"))
+-	     Version = strdup(p);
+-	if (*Version == '/')
+-	   { if ((fp = fopen(Version, "r")))
+-		{  fgets(buf, MAXLINE, fp);
+-		   fclose(fp);
+-		   buf[strlen(buf)-1] = '\0';
+-		   Version = strdup(buf);
++	if (p = defvalue(def, "VERSION")) {
++	    if (*p == '/') {
++		if ((fp = fopen(p, "r"))) {
++		    fgets(buf, MAXLINE, fp);
++		    fclose(fp);
++		    buf[strlen(buf)-1] = '\0';
++		    Version = strdup(buf);
+ 	        }
+-	   }
++	    } else {
++		Version = strdup(p);
++	    }
++	    atexit(free_version);
++	}
+ 	if((p = defvalue(def, "LOGIN"))) login_pgm = p;
+ 	if((p = defvalue(def, "ISSUE"))) issue = p;
+ 	if((p = defvalue(def, "CLEAR")) && (strequal(p, "NO"))) 
+@@ -489,12 +539,15 @@
+ #ifdef UUGETTY
+ 	(void) sprintf(buf, LOCK, Device);
+ 	lock = strdup(buf);
++	atexit(free_lock);
+ 	if((p = defvalue(def, "ALTLOCK"))) {
+ 		(void) sprintf(buf, LOCK, p);
+ 		altlock = strdup(buf);
++		atexit(free_altlock);
+ 	} else if(! strequal(Device, InitDevice)) {
+ 		(void) sprintf(buf, LOCK, InitDevice);
+ 		altlock = strdup(buf);
++		atexit(free_altlock);
+ 	}
+ 
+ 	debug(D_LOCK, "lock = (%s), altlock = (%s)", lock, altlock);
+@@ -625,8 +678,8 @@
+ 	with the uts struct filled above.
+ 	*/
+ 
+-	debug(D_UTMP, "adding utmp entry: type: %d, pid: %d, line: %s,
+-	   id: %c%c, time: %d, user: %s, host: %s, addr: %d",
++	debug(D_UTMP, "adding utmp entry: type: %d, pid: %d, line: %s, "
++	   "id: %c%c, time: %d, user: %s, host: %s, addr: %d",
+ 	   uts.ut_type, uts.ut_pid, uts.ut_line,
+ 	   (uts.ut_id[0] ? uts.ut_id[0] : ' '), 
+ 	   (uts.ut_id[1] ? uts.ut_id[1] : ' '), 
+@@ -1077,16 +1130,20 @@
+ login_prompt:
+ 		(void) ioctl(STDIN, TCFLSH, 0);
+ #ifdef FIDO
+-	if (emsi && (strcmp(emsi,"yes") == 0)) 
+-		(void) Fputs("**EMSI_REQA77E\r", stdout);
++		if (emsi && (strcmp(emsi,"yes") == 0)) 
++			(void) Fputs("**EMSI_REQA77E\r", stdout);
+ #endif
+ 		(void) Fputs(gtab->login, stdout);
+-
++#ifndef UUGETTY
+ 		login_result=getlogname(&termio, buf, MAXLINE);
++#endif
+ 		if(TimeOut > 0) {
+ 			(void) signal(SIGALRM, timeout);
+ 			(void) alarm((unsigned) TimeOut);
+ 		}
++#ifdef UUGETTY
++		login_result=getlogname(&termio, buf, MAXLINE);
++#endif
+ 
+ 		switch(login_result) {
+ #ifdef FIDO
+@@ -1114,6 +1171,13 @@
+ #ifdef SETTERM
+ 				setenv("TERM", term, TRUE);
+ #endif /* SETTERM */
++				free_def();
++				free_sysname();
++				free_version();
++#ifdef UUGETTY
++				free_lock();
++				free_altlock();
++#endif
+ 				debug(D_RUN, "execing login");
+ 				(void) execl(login_pgm, 
+ 				  "login", buf, NULLPTR);
+--- ./funcs.c.orig	2002-09-25 08:43:28.000000000 +0200
++++ ./funcs.c	2005-07-20 19:01:55.000000000 +0200
+@@ -87,12 +87,11 @@
+ register char *s;
+ register FILE *stream;
+ {
+-    char c, n, tbuf[20], ubuf[MAXBUF];
+-    char *cbuf;
++    char c, n, tbuf[20];
+     time_t clock;
+     struct tm *lt;
+-    struct utsname utsbuf;
+-    struct hostent *fqdname;
++    static struct utsname utsbuf;
++    static struct hostent *fqdname;
+     FILE  *fp1;
+ 
+     char *day_name[] = { "Sun", "Mon", "Tue", "Wed", "Thur", "Fri", "Sat" };
+@@ -119,21 +118,8 @@
+ 				return(EOF);
+ 			break;
+ 		case 'F':	/* FQDName */
+-			cbuf = strdup(SysName);
+-#if 0			/* The does a seg violation - no idea why.... */
+ 			fqdname = gethostbyname(SysName);
+-#endif
+-#if 0			/* So, we cheat.....! */
+-			/* Which also gets a seg violation! */
+-			if (fp1 = fopen("/etc/HOSTNAME", "r"))
+-			 { fgets(cbuf, MAXBUF, fp1);
+-			   fclose(fp1);
+-			   cbuf[strlen(cbuf)] = '\0';
+-			 }
+-			if (fqdname != NULL)
+-			    cbuf = strdup(fqdname->h_name);
+-#endif
+-			if (Fputs(cbuf, stream) == EOF)
++			if (fqdname && Fputs(fqdname->h_name, stream) == EOF)
+ 			    return(EOF);
+ 			break;
+ 		case 'L':	/* line */
+@@ -141,18 +127,15 @@
+ 				return(EOF);
+ 			break;
+ 		case 'M':	/* arch of machine */
+-			cbuf = strdup(utsbuf.machine);
+-			if (Fputs(cbuf, stream) == EOF)
++			if (Fputs(utsbuf.machine, stream) == EOF)
+ 				return(EOF);
+ 			break;
+ 		case 'O':	/* O/S name */
+-			cbuf = strdup(utsbuf.sysname);
+-			if (Fputs(cbuf, stream) == EOF)
++			if (Fputs(utsbuf.sysname, stream) == EOF)
+ 				return(EOF);
+ 			break;
+ 		case 'R':	/* O/S rev_id */
+-			cbuf = strdup(utsbuf.release);
+-			if (Fputs(cbuf, stream) == EOF)
++			if (Fputs(utsbuf.release, stream) == EOF)
+ 				return(EOF);
+ 			break;
+ 		case 'S':	/* system node name */
+@@ -166,8 +149,8 @@
+ 				return(EOF);
+ 			break;
+ 		case 'U':	/* number of active users */
+-			(void) sprintf(ubuf, "%d", Nusers);
+-			if (Fputs(ubuf, stream) == EOF)
++			(void) sprintf(tbuf, "%d", Nusers);
++			if (Fputs(tbuf, stream) == EOF)
+ 				return(EOF);
+ 			break;
+ 		case 'V':	/* version */
+@@ -175,12 +158,10 @@
+ 				return(EOF);
+ 			break;
+ 		case 'u':	/* user count str */
+-			cbuf = malloc(20);
+ 			(void) sprintf(tbuf, "%d User", Nusers);
+ 			if (Nusers > 1) 
+-			     cbuf = strcat(tbuf,"s");
+-			else cbuf=strdup(tbuf);
+-			if (Fputs(cbuf, stream) == EOF)
++			    strcat(tbuf, "s");
++			if (Fputs(tbuf, stream) == EOF)
+ 				return(EOF);
+ 			break;
+ 		case '@':	/* in case '@@' was used */
diff --git a/source/a/getty-ps/getty_ps-2.1.0.lsm b/source/a/getty-ps/getty_ps-2.1.0.lsm
new file mode 100644
index 000000000..b89d9f50f
--- /dev/null
+++ b/source/a/getty-ps/getty_ps-2.1.0.lsm
@@ -0,0 +1,26 @@
+Begin4
+Title: 		getty-ps
+Version: 	2.1.0
+Entered-date: 	27SEP02
+Description:	A versatile getty/uugetty program designed to allow easy
+		use of a modem for incoming/outgoing data/fax/voice calls.
+		It also allows easy set-up of regular login ports.  Unlike
+		agetty, it stores most of it's configuration and port
+		initialization information in up to 2 files.  This usually
+		results in slightly more involved initial installation, but
+		easier	maintenance than agetty.  It also leaves the
+		inittab entries looking uncluttered.  Supports 57600 and
+		faster speeds, and is compatible with uucp and efax-0.9[a].
+		Ringback is provided as an optional feature.
+Keywords:	getty uugetty serial modem ringback efax uucp
+Author:		Paul Sutcliffe, Jr.
+Maintained-by:	Christine Jamison <getty-info@nwmagic.net>
+Primary-site:	ftp.ibiblio.org:/pub/Linux/system/serial/getty_ps-2.1.0.tar.gz
+Alternate-site:	ftp.nwmagic.net:/pub/sources/getty_ps-2.1.0.tar.gz
+Original-site:	Unknown
+Platforms: 	Linux (tested on 1.0.x-2.4.5, Slackware 4.0 thru 8.1); should
+		compile and work on almost any Unix, after library
+		compatibility is resolved and paths are checked in tune.h;
+		compiles clean with gcc 2.7.2.3 & 2.95.3.
+Copying-policy: FRS
+End
diff --git a/source/a/getty-ps/slack-desc b/source/a/getty-ps/slack-desc
new file mode 100644
index 000000000..dda6cf7ad
--- /dev/null
+++ b/source/a/getty-ps/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------------------------------------------------------|
+getty-ps: getty-ps (console or terminal login)
+getty-ps:
+getty-ps: /sbin/getty and /sbin/uugetty. 
+getty-ps: These control the process of logging into your system, and may be used
+getty-ps: instead of 'agetty', which is the default getty included with the
+getty-ps: util-linux package. getty-ps supports a number of enhancements such as
+getty-ps: ringback support.
+getty-ps:
+getty-ps: getty-ps was originally written by Paul Sutcliffe, Jr, and is
+getty-ps: currently maintained by Christine Jamison.
+getty-ps:
diff --git a/source/a/gpm/gpm-1.20.1-consolename.patch b/source/a/gpm/gpm-1.20.1-consolename.patch
new file mode 100644
index 000000000..c5879fb41
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-consolename.patch
@@ -0,0 +1,18 @@
+--- gpm-1.20.1/src/lib/liblow.c.orig	2004-10-13 16:34:15.181502369 -0400
++++ gpm-1.20.1/src/lib/liblow.c	2004-10-13 16:34:20.491778415 -0400
+@@ -262,13 +262,14 @@
+             gpm_report(GPM_PR_ERR,"consolename not set");
+             goto err;
+          }   
++#if 0
+          /* do we really need this check ? */
+          if(strncmp(tty,consolename,strlen(consolename)-1)
+             || !isdigit(tty[strlen(consolename)-1])) {
+             gpm_report(GPM_PR_ERR,"strncmp/isdigit/consolename failed");
+             goto err;
+          }
+-          
++#endif
+          conn->vc=atoi(&tty[strlen(consolename)-1]);
+       }
+ 
diff --git a/source/a/gpm/gpm-1.20.1-gpmopen.patch b/source/a/gpm/gpm-1.20.1-gpmopen.patch
new file mode 100644
index 000000000..f36ad9396
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-gpmopen.patch
@@ -0,0 +1,22 @@
+--- gpm-1.20.1/src/lib/liblow.c.gpmopen	2004-05-04 17:36:09.000000000 -0400
++++ gpm-1.20.1/src/lib/liblow.c	2004-05-04 17:42:51.000000000 -0400
+@@ -200,8 +200,6 @@
+    Gpm_Stst *new = NULL;
+    char* sock_name = 0;
+ 
+-   consolename = NULL;
+-
+ #if 0
+    gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
+ #endif
+@@ -260,6 +258,10 @@
+             gpm_report(GPM_PR_ERR,"checking tty name failed");
+             goto err;
+          }   
++         if (consolename == NULL) {
++            gpm_report(GPM_PR_ERR,"consolename not set");
++            goto err;
++         }   
+          /* do we really need this check ? */
+          if(strncmp(tty,consolename,strlen(consolename)-1)
+             || !isdigit(tty[strlen(consolename)-1])) {
diff --git a/source/a/gpm/gpm-1.20.1-idie.patch b/source/a/gpm/gpm-1.20.1-idie.patch
new file mode 100644
index 000000000..4594f0784
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-idie.patch
@@ -0,0 +1,12 @@
+--- gpm-1.20.1/src/lib/liblow.c.orig	2004-05-06 14:14:03.000000000 -0400
++++ gpm-1.20.1/src/lib/liblow.c	2004-05-06 14:18:05.000000000 -0400
+@@ -376,7 +376,9 @@
+ 
+   /*....................................... Error: free all memory */
+    err:
++#if 0
+    gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");
++#endif
+    do {
+       new=gpm_stack->next;
+       free(gpm_stack);
diff --git a/source/a/gpm/gpm-1.20.1-input-defines.diff b/source/a/gpm/gpm-1.20.1-input-defines.diff
new file mode 100644
index 000000000..4a925a6a3
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-input-defines.diff
@@ -0,0 +1,26 @@
+--- ./src/headers/input-defines.h.orig	2006-12-11 19:56:14.000000000 -0600
++++ ./src/headers/input-defines.h	2006-12-11 19:59:30.000000000 -0600
+@@ -59,23 +59,4 @@
+ #define PSMOUSE_SYNAPTICS     7
+ #endif
+ 
+-#ifndef HAVE_INPUT_ID
+-struct input_id {
+-   unsigned short bustype;
+-   unsigned short vendor;
+-   unsigned short product;
+-   unsigned short version;
+-};
+-#endif
+-
+-#ifndef HAVE_INPUT_ABSINFO
+-struct input_absinfo {
+-   int value;
+-   int minimum;
+-   int maximum;
+-   int fuzz;
+-   int flat;
+-};
+-#endif
+-
+ #endif
diff --git a/source/a/gpm/gpm-1.20.1-input.patch b/source/a/gpm/gpm-1.20.1-input.patch
new file mode 100644
index 000000000..152e60381
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-input.patch
@@ -0,0 +1,16 @@
+diff -ur gpm-1.20.1.orig/src/headers/config.h.in gpm-1.20.1/src/headers/config.h.in
+--- gpm-1.20.1.orig/src/headers/config.h.in	2004-09-04 10:24:11.000000000 -0400
++++ gpm-1.20.1/src/headers/config.h.in	2004-09-04 10:26:02.000000000 -0400
+@@ -46,6 +46,12 @@
+ /* Define if you have the <linux/input.h> header file.  */
+ #undef HAVE_LINUX_INPUT_H
+ 
++/* Definedif you have the input_id structure */
++#undef HAVE_INPUT_ID
++
++/* Definedif you have the input_absinfo structure */
++#undef HAVE_INPUT_ABSINFO
++
+ /* Define if you have the <linux/joystick.h> header file.  */
+ #undef HAVE_LINUX_JOYSTICK_H
+ 
diff --git a/source/a/gpm/gpm-1.20.1-lib-silent.patch b/source/a/gpm/gpm-1.20.1-lib-silent.patch
new file mode 100644
index 000000000..099075b5b
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-lib-silent.patch
@@ -0,0 +1,19 @@
+--- gpm-1.20.1/src/lib/report-lib.c.lib-silent	2002-12-24 23:57:16.000000000 +0100
++++ gpm-1.20.1/src/lib/report-lib.c	2006-01-18 17:55:38.000000000 +0100
+@@ -24,8 +24,16 @@
+ 
+ #include "headers/message.h"
+ 
++static int gpm_silent() {
++   if ( getenv( "GPM_VERBOSE" ) == NULL ) return 1;
++   return 0;
++}
++
+ void gpm_report(int line, char *file, int stat, char *text, ... )
+ {
++   if ( gpm_silent() && stat != GPM_STAT_OOPS )
++      return;
++
+    char *string = NULL;
+    va_list ap;
+    va_start(ap,text);
diff --git a/source/a/gpm/gpm-1.20.1-math.patch b/source/a/gpm/gpm-1.20.1-math.patch
new file mode 100644
index 000000000..634a5fd84
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-math.patch
@@ -0,0 +1,11 @@
+--- gpm-1.20.1/configure.in.math	Tue Jun 24 10:52:44 2003
++++ gpm-1.20.1/configure.in	Tue Jun 24 10:53:54 2003
+@@ -128,7 +128,7 @@
+ AC_SUBST(lispdir)
+ 
+ CPPFLAGS='-I$(srcdir) $(DEFS) -include headers/config.h -Wall -DSYSCONFDIR="\"$(sysconfdir)\"" -DSBINDIR="\"$(sbindir)\""'
+-LDFLAGS='-L$(srcdir)'
++LDFLAGS='-lm -L$(srcdir)'
+ 
+ dnl AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir")
+ dnl AC_DEFINE_UNQUOTED(SBINDIR,"$sbindir")
diff --git a/source/a/gpm/gpm-1.20.1-multilib.patch b/source/a/gpm/gpm-1.20.1-multilib.patch
new file mode 100644
index 000000000..723ee2b59
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-multilib.patch
@@ -0,0 +1,52 @@
+--- gpm-1.20.1/doc/Makefile.in.multilib	2002-12-24 17:57:16.000000000 -0500
++++ gpm-1.20.1/doc/Makefile.in	2004-10-20 17:25:11.000000000 -0400
+@@ -97,7 +97,7 @@
+ 
+ # Main portion
+ 
+-all: $(srcdir)/gpm.info $(MANPAGES)
++all: gpm.info $(MANPAGES)
+ 
+ # why gpmdoc.ps and gpm.ps??
+ # there is no gpm.ps in my tree and no rule to generate gpm.ps.
+@@ -131,8 +131,8 @@
+ 	#i keep all my infopages compressed and i'm tired to do it by
+ 	#hand, so check if there are any compressed pages and do this
+ 	#one too
+-	-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
+-		&& gzip -f $(infodir)/gpm.info
++	#-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
++	#	&& gzip -f $(infodir)/gpm.info
+ 	# Hmm.... shouldn't man pages be compressed too?
+    # maybe they should, but at least at my system they are not.
+ 
+--- gpm-1.20.1/contrib/Makefile.in.multilib	2002-12-24 17:57:16.000000000 -0500
++++ gpm-1.20.1/contrib/Makefile.in	2004-10-20 17:11:38.000000000 -0400
+@@ -9,10 +9,10 @@
+ 
+ include $(top_builddir)/Makefile.include
+ 
+-all: $(srcdir)/$(ELISP)
++all: $(filter-out %.elc,$(srcdir)/$(ELISP))
+ 
+ install: all
+-	if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
++	if [ -n "$(filter-out %.elc,$(ELISP))" ]; then for i in `echo $(filter-out %.elc,$(ELISP))`; do \
+ 		$(INSTALL_DATA) $(srcdir)/$$i $(lispdir)/`basename $$i` ;\
+ 	done; fi
+ 
+@@ -20,7 +20,7 @@
+ 	$(EMACS) -batch -l $(srcdir)/emacs/exec.el -exec '(byte-compile-file "$<")'
+ 
+ uninstall:
+-	if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
++	if [ -n "$(filter-out %.elc,$(ELISP))" ]; then for i in `echo $(filter-out %.elc,$(ELISP))`; do \
+ 		rm -f $(lispdir)/$$i ;\
+ 	done; fi 
+ 
+@@ -28,4 +28,4 @@
+ 	$(CP) -r $(srcdir) $(top_builddir)/gpm-$(release)/
+ 
+ clean distclean:
+-	$(RM) -f $(srcdir)/emacs/*.elc
++	$(RM) $(srcdir)/emacs/*.elc
diff --git a/source/a/gpm/gpm-1.20.1-no-console-error.patch b/source/a/gpm/gpm-1.20.1-no-console-error.patch
new file mode 100644
index 000000000..20c177b4d
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-no-console-error.patch
@@ -0,0 +1,15 @@
+--- gpm-1.20.1/src/console.c.no-console-error	2006-01-18 17:06:15.000000000 +0100
++++ gpm-1.20.1/src/console.c	2006-01-18 17:08:19.000000000 +0100
+@@ -249,8 +249,10 @@
+    /* Failed, try OLD console */
+    else if (stat(GPM_OLD_CONSOLE, &buf) == 0)
+       console.device = GPM_OLD_CONSOLE;
+-   else
+-      gpm_report(GPM_PR_OOPS, "Can't determine console device"); 
++   else { // XXX handle this gracefully?
++      fprintf( stderr, "no console device found" );
++      exit( 1 );
++   }
+ 
+    return console.device;
+ }
diff --git a/source/a/gpm/gpm-1.20.1-nodebug.patch b/source/a/gpm/gpm-1.20.1-nodebug.patch
new file mode 100644
index 000000000..945b576c4
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-nodebug.patch
@@ -0,0 +1,12 @@
+--- gpm-1.20.1/src/lib/liblow.c.orig	2004-03-31 15:06:45.000000000 -0500
++++ gpm-1.20.1/src/lib/liblow.c	2004-03-31 15:09:32.000000000 -0500
+@@ -202,7 +202,9 @@
+ 
+    consolename = NULL;
+ 
++#if 0
+    gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
++#endif
+ 
+    /*....................................... First of all, check xterm */
+ 
diff --git a/source/a/gpm/gpm-1.20.1-subscript.patch b/source/a/gpm/gpm-1.20.1-subscript.patch
new file mode 100644
index 000000000..bf4ca75b0
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-subscript.patch
@@ -0,0 +1,11 @@
+--- gpm-1.20.1/src/mice.c.lr	2004-02-15 09:19:48.000000000 +0100
++++ gpm-1.20.1/src/mice.c	2004-02-15 09:22:18.000000000 +0100
+@@ -2112,7 +2112,7 @@
+       for (i=0; i<4; i++)
+          if (gunze_calib[i] & ~1023) calibok = 0;
+       if (gunze_calib[0] == gunze_calib[2]) calibok = 0;
+-      if (gunze_calib[1] == gunze_calib[4]) calibok = 0;
++      if (gunze_calib[1] == gunze_calib[3]) calibok = 0;
+       fclose(f);
+    }
+    if (!calibok) {
diff --git a/source/a/gpm/gpm-1.20.1-weak-wgetch.patch b/source/a/gpm/gpm-1.20.1-weak-wgetch.patch
new file mode 100644
index 000000000..81e6a2b5b
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1-weak-wgetch.patch
@@ -0,0 +1,38 @@
+--- gpm-1.20.1/src/lib/libcurses.c.weak-wgetch	2002-12-24 17:57:16.000000000 -0500
++++ gpm-1.20.1/src/lib/libcurses.c	2004-03-22 15:51:24.000000000 -0500
+@@ -41,7 +41,12 @@
+ #endif /* HAVE_NCURSES_CURSES_H */
+ #endif /* HAVE_NCURSES_H */
+ 
+-#define GET(win) ((win) ? wgetch(win) : getch())
++/* If win != NULL, it must have been created by ncurses anyway.
++   Avoid circular library dependencies.  */
++#pragma weak wgetch
++#pragma weak stdscr
++
++#define GET(win) ((win && wgetch) ? wgetch(win) : getch())
+ 
+ int Gpm_Wgetch(WINDOW *win)
+ {
+--- gpm-1.20.1/configure.in.weak-wgetch	2004-03-22 15:49:51.000000000 -0500
++++ gpm-1.20.1/configure.in	2004-03-22 15:51:24.000000000 -0500
+@@ -115,7 +115,7 @@
+             AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
+         else :; fi
+     done
+-    SHARED_LIBS="$LIBS $TERMLIBS -lc"
++    SHARED_LIBS="-lc"
+     LIBS=$SAVELIBS ;;
+ esac    
+ 
+--- gpm-1.20.1/configure.weak-wgetch	2004-03-22 15:49:55.000000000 -0500
++++ gpm-1.20.1/configure	2004-03-22 15:51:24.000000000 -0500
+@@ -4295,7 +4295,7 @@
+ 
+         else :; fi
+     done
+-    SHARED_LIBS="$LIBS $TERMLIBS -lc"
++    SHARED_LIBS="-lc"
+     LIBS=$SAVELIBS ;;
+ esac
+ 
diff --git a/source/a/gpm/gpm-1.20.1.send-noise-to-syslogs.diff b/source/a/gpm/gpm-1.20.1.send-noise-to-syslogs.diff
new file mode 100644
index 000000000..111e7843b
--- /dev/null
+++ b/source/a/gpm/gpm-1.20.1.send-noise-to-syslogs.diff
@@ -0,0 +1,86 @@
+diff -u -r gpm-1.20.1.orig/src/report.c gpm-1.20.1/src/report.c
+--- gpm-1.20.1.orig/src/report.c	2006-08-20 14:34:30.000000000 -0500
++++ gpm-1.20.1/src/report.c	2006-08-20 14:44:54.000000000 -0500
+@@ -48,15 +48,15 @@
+  *
+  * Startup Mode:
+  *    debug    :  - (ignore)
+- *    info     :  syslog/stdout
+- *    warn/err :  syslog/stderr
++ *    info     :  syslog 
++ *    warn/err :  syslog
+  *    oops     :  syslog/stderr  [exit]
+  *
+  * Running Mode: (daemon)
+  *    debug    :  - (ignore)
+  *    info     :  syslog
+- *    warn     :  syslog+system console
+- *    err      :  syslog+system console+current console
++ *    warn     :  syslog
++ *    err      :  syslog
+  *    oops     :  syslog/stderr  [_exit]
+  *
+  * Debug Mode  :
+@@ -85,9 +85,6 @@
+                syslog(LOG_INFO | LOG_USER, GPM_STRING_INFO);
+                vsyslog(LOG_INFO | LOG_USER, text, ap);
+ #endif               
+-               fprintf(stderr,GPM_STRING_INFO);
+-               vfprintf(stderr,text,ap);
+-               fprintf(stderr,"\n");
+                break;
+ 
+             case GPM_STAT_WARN:
+@@ -95,9 +92,6 @@
+                syslog(LOG_DAEMON | LOG_WARNING, GPM_STRING_WARN);
+                vsyslog(LOG_DAEMON | LOG_WARNING, text, ap);
+ #endif               
+-               fprintf(stderr,GPM_STRING_WARN);
+-               vfprintf(stderr,text,ap);
+-               fprintf(stderr,"\n");
+                break;
+ 
+             case GPM_STAT_ERR:
+@@ -105,9 +99,6 @@
+                syslog(LOG_DAEMON | LOG_ERR, GPM_STRING_ERR);
+                vsyslog(LOG_DAEMON | LOG_ERR, text, ap);
+ #endif               
+-               fprintf(stderr,GPM_STRING_ERR);
+-               vfprintf(stderr,text,ap);
+-               fprintf(stderr,"\n");
+                break;
+ 
+             case GPM_STAT_OOPS:
+@@ -139,12 +130,6 @@
+                syslog(LOG_DAEMON | LOG_WARNING, GPM_STRING_WARN);
+                vsyslog(LOG_DAEMON | LOG_WARNING, text, ap);
+ #endif               
+-               if ((f = fopen(GPM_SYS_CONSOLE, "a")) != NULL) {
+-                  fprintf(f, GPM_STRING_WARN);
+-                  vfprintf(f, text, ap);
+-                  fprintf(f, "\n");
+-                  fclose(f);
+-               }   
+                break;
+  
+             case GPM_STAT_ERR:
+@@ -152,19 +137,6 @@
+                syslog(LOG_DAEMON | LOG_ERR, GPM_STRING_ERR);
+                vsyslog(LOG_DAEMON | LOG_ERR, text, ap);
+ #endif               
+-               if ((f = fopen(GPM_SYS_CONSOLE, "a")) != NULL) {
+-                  fprintf(f, GPM_STRING_ERR);
+-                  vfprintf(f, text, ap);
+-                  fprintf(f, "\n");
+-                  fclose(f);
+-               }
+-
+-               if ((f = fopen(console.device, "a")) != NULL) {
+-                  fprintf(f, GPM_STRING_ERR);
+-                  vfprintf(f, text, ap);
+-                  fprintf(f, "\n");
+-                  fclose(f);
+-               }
+                break;
+ 
+             case GPM_STAT_OOPS:
diff --git a/source/a/gpm/gpm-evdev-cumulative.patch b/source/a/gpm/gpm-evdev-cumulative.patch
new file mode 100644
index 000000000..2fd86d10c
--- /dev/null
+++ b/source/a/gpm/gpm-evdev-cumulative.patch
@@ -0,0 +1,7023 @@
+diff -urN gpm-1.20.1/configure.in gpm/configure.in
+--- gpm-1.20.1/configure.in	2002-12-24 17:57:16.000000000 -0500
++++ gpm/configure.in	2003-10-02 01:22:42.000000000 -0500
+@@ -61,6 +61,13 @@
+ 
+ AC_CHECK_HEADERS(syslog.h linux/input.h linux/joystick.h ncurses.h ncurses/curses.h curses.h)
+ 
++EVDEV_SRCS=
++if test ${ac_cv_header_linux_input_h} = yes ; then
++        EVDEV_SRCS=evdev.c ;
++        AC_CHECK_TYPE(struct input_absinfo,AC_DEFINE_UNQUOTED(HAVE_INPUT_ABSINFO, 1, [define if struct input_absinfo defined in linux/input.h]),,[#include <linux/input.h>])
++        AC_CHECK_TYPE(struct input_id,AC_DEFINE_UNQUOTED(HAVE_INPUT_ID, 1, [define if struct input_id defined in linux/input.h]),,[#include <linux/input.h>])
++fi
++
+ AC_ARG_WITH(curses,
+ [  --without-curses        disable curses support even if curses found])
+ 
+@@ -124,6 +131,7 @@
+ AC_SUBST(PICFLAGS)
+ AC_SUBST(SOLDFLAGS)
+ AC_SUBST(CURSES_OBJS)
++AC_SUBST(EVDEV_SRCS)
+ AC_SUBST(SHARED_LIBS)
+ AC_SUBST(lispdir)
+ 
+diff -urN gpm-1.20.1/src/client.c gpm/src/client.c
+--- gpm-1.20.1/src/client.c	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/client.c	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,319 @@
++/*
++ * client.c - GPM client handling (server side)
++ *
++ * Copyright (C) 1993        Andreq Haylett <ajh@gec-mrc.co.uk>
++ * Copyright (C) 1994-1999   Alessandro Rubini <rubini@linux.it>
++ * Copyright (C) 1998         Ian Zimmerman <itz@rahul.net>
++ * Copyright (c) 2001,2002   Nico Schottelius <nico@schottelius.org>
++ * Copyright (C) 2003        Dmitry Torokhov <dtor@mail.ru>
++ *
++ *   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>
++#include <stdlib.h>
++#include <string.h>        /* strerror(); ?!?  */
++#include <errno.h>
++#include <unistd.h>        /* select(); */
++#include <signal.h>        /* SIGPIPE */
++#include <time.h>          /* time() */
++#include <sys/fcntl.h>     /* O_RDONLY */
++#include <sys/stat.h>      /* mkdir()  */
++#include <sys/time.h>      /* timeval */
++#include <sys/types.h>     /* socket() */
++#include <sys/socket.h>    /* socket() */
++#include <sys/un.h>        /* struct sockaddr_un */
++
++#include "headers/gpmInt.h"
++#include "headers/message.h"
++#include "headers/console.h"
++#include "headers/selection.h"
++#include "headers/client.h"
++
++/* who the f*** runs gpm without glibc? doesn't have dietlibc __socklent_t? */
++#if !defined(__GLIBC__)
++   typedef unsigned int __socklen_t;
++#endif    /* __GLIBC__ */
++
++#ifndef max
++#define max(a,b) ((a)>(b) ? (a) : (b))
++#endif
++
++extern int errno;
++
++struct client_info *cinfo[MAX_VC + 1];
++
++/*-------------------------------------------------------------------*
++ * This  was inline, and incurred in a compiler bug (2.7.0)
++ *-------------------------------------------------------------------*/
++static int get_data(int fd, Gpm_Connect *data) 
++{
++   static int len;
++   
++#ifdef GPM_USE_MAGIC
++   while ((len = read(whence, &check, sizeof(int))) == 4 && 
++          check != GPM_MAGIC)
++      gpm_report(GPM_PR_INFO, GPM_MESS_NO_MAGIC);
++
++   if (len == 0) return 0;
++
++   if (check != GPM_MAGIC) {
++      gpm_report(GPM_PR_INFO, GPM_MESS_NOTHING_MORE);
++      return -1;
++   }
++#endif
++
++   len = read(fd, data, sizeof(Gpm_Connect));
++
++   return len ? (len == sizeof(Gpm_Connect) ? 1 : -1) : 0;
++}
++
++/*-------------------------------------------------------------------*/
++int listen_for_clients(void)
++{
++   struct sockaddr_un ctladdr;
++   int fd, len;
++
++   unlink(GPM_NODE_CTL);
++
++   if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) 
++      gpm_report(GPM_PR_OOPS, GPM_MESS_SOCKET_PROB);
++   
++   memset(&ctladdr, 0, sizeof(ctladdr));
++   ctladdr.sun_family = AF_UNIX;
++   strcpy(ctladdr.sun_path, GPM_NODE_CTL);
++   len = sizeof(ctladdr.sun_family) + strlen(GPM_NODE_CTL);
++
++   if (bind(fd, (struct sockaddr *)&ctladdr, len) == -1)
++      gpm_report(GPM_PR_OOPS, GPM_MESS_BIND_PROB, ctladdr.sun_path);
++
++   /* needs to be 0777, so all users can _try_ to access gpm */
++   chmod(GPM_NODE_CTL, 0777);
++   listen(fd, 5);          /* Queue up calls */
++
++   return fd;
++}
++
++/*-------------------------------------------------------------------*/
++struct client_info *accept_client_connection(int fd)
++{
++   struct client_info *info;
++   Gpm_Connect *request;
++   int newfd;
++#if !defined(__GLIBC__)
++   int len;
++#else /* __GLIBC__ */
++   size_t len; /* isn't that generally defined in C ???  -- nico */
++#endif /* __GLIBC__ */
++   struct sockaddr_un addr; /* reuse this each time */
++#ifndef SO_PEERCRED
++   struct stat statbuf;
++   time_t staletime;
++#endif
++   uid_t uid;
++
++   /*....................................... Accept */
++   memset(&addr, 0, sizeof(addr));
++   addr.sun_family = AF_UNIX;
++
++   len = sizeof(addr);
++   if ((newfd = accept(fd, (struct sockaddr *)&addr, &len)) < 0) {
++      gpm_report(GPM_PR_ERR, GPM_MESS_ACCEPT_FAILED, strerror(errno));
++      return NULL; 
++   }
++
++   gpm_report(GPM_PR_INFO, GPM_MESS_CONECT_AT, newfd);
++
++   if (!(info = malloc(sizeof(struct client_info))))
++      gpm_report(GPM_PR_OOPS, GPM_MESS_NO_MEM);
++
++   request = &info->data;
++   if (get_data(newfd, request) == -1)
++      goto err;
++
++   if (request->vc > MAX_VC) {
++      gpm_report(GPM_PR_WARN,GPM_MESS_REQUEST_ON, request->vc, MAX_VC);
++      goto err;
++   }
++
++#ifndef SO_PEERCRED
++   if (stat(addr.sun_path, &statbuf) == -1 || !S_ISSOCK(statbuf.st_mode)) {
++      gpm_report(GPM_PR_ERR,GPM_MESS_ADDRES_NSOCKET,addr.sun_path);
++      goto err;
++   }
++
++   unlink(addr.sun_path);   /* delete socket */
++
++   staletime = time(0) - 30;
++   if (statbuf.st_atime < staletime ||
++       statbuf.st_ctime < staletime ||
++       statbuf.st_mtime < staletime) {
++      gpm_report(GPM_PR_ERR, GPM_MESS_SOCKET_OLD);
++      goto err;
++   }
++
++   uid = statbuf.st_uid;      /* owner of socket */
++#else
++   {
++      struct ucred sucred;
++      socklen_t credlen = sizeof(struct ucred);
++
++      if (getsockopt(newfd, SOL_SOCKET, SO_PEERCRED, &sucred, &credlen) == -1) {
++         gpm_report(GPM_PR_ERR,GPM_MESS_GETSOCKOPT, strerror(errno));
++         goto err;
++      }
++      uid = sucred.uid;
++      gpm_report(GPM_PR_DEBUG,GPM_MESS_PEER_SCK_UID, uid);
++   }
++#endif
++
++   if (uid != 0 && !is_console_owner(request->vc, uid)) {
++      gpm_report(GPM_PR_WARN, GPM_MESS_FAILED_CONNECT, uid, request->vc);
++      goto err;
++   }
++
++   /* register the connection information in the right place */
++   info->next = cinfo[request->vc];
++   info->fd = newfd;
++   cinfo[request->vc] = info;
++   gpm_report(GPM_PR_DEBUG, GPM_MESS_LONG_STATUS,
++        request->pid, request->vc, request->eventMask, request->defaultMask,
++        request->minMod, request->maxMod);
++
++   return info;
++
++err:
++   free(info);
++   close(newfd);
++
++   return NULL;
++}
++
++/*-------------------------------------------------------------------*/
++void remove_client(struct client_info *ci, int vc)
++{
++   struct client_info *p, *prev = NULL;
++
++   for (p = cinfo[vc]; p; prev = p, p = p->next) {
++      if (p == ci) {
++         if (!prev)    /* it is on top of the stack */
++            cinfo[vc] = p->next;
++         else 
++            prev->next = p->next;
++         break;
++      }
++   }
++   if (p) free(p);
++}
++
++/*-------------------------------------------------------------------*/
++void notify_clients_resize(void)
++{
++   struct client_info *ci;
++   int i;
++
++   for (i = 0; i < MAX_VC + 1; i++)
++      for (ci = cinfo[i]; ci; ci = ci->next) 
++         kill(ci->data.pid, SIGWINCH);
++}
++
++/*-------------------------------------------------------------------*/
++/* returns 0 if the event has not been processed, and 1 if it has    */
++int do_client(struct client_info *cinfo, Gpm_Event *event)
++{
++   Gpm_Connect *info = &cinfo->data;
++   /* value to return if event is not used */
++   int res = !(info->defaultMask & event->type);
++
++   /* instead of returning 0, scan the stack of clients */
++   if ((info->minMod & event->modifiers) < info->minMod)
++      goto try_next;
++   if ((info->maxMod & event->modifiers) < event->modifiers) 
++      goto try_next;
++
++   /* if not managed, use default mask */
++   if (!(info->eventMask & GPM_BARE_EVENTS(event->type))) {
++      if (res) return res;
++      else goto try_next;
++   }   
++
++   /* WARNING */ /* This can generate a SIGPIPE... I'd better catch it */
++   MAGIC_P((write(cinfo->fd, &magic, sizeof(int))));
++   write(cinfo->fd, event, sizeof(Gpm_Event));
++
++   return info->defaultMask & GPM_HARD ? res : 1; /* HARD forces pass-on */
++
++ try_next:
++   if (cinfo->next != 0) 
++      return do_client(cinfo->next, event); /* try the next */
++
++   return 0; /* no next, not used */
++}
++
++/*-------------------------------------------------------------------*/
++/* returns 0 if client disconnects, -1 - error, 1 -successs */
++int process_client_request(struct client_info *ci, int vc,
++                           int x, int y, int buttons, int clicks,
++                           int three_button_mouse) 
++{
++   int rc;
++   Gpm_Connect conn;
++   static Gpm_Event event;
++
++   gpm_report(GPM_PR_INFO, GPM_MESS_CON_REQUEST, ci->fd, vc);
++   if (vc > MAX_VC) return -1;
++
++   /* itz 10-22-96 this shouldn't happen now */
++   if (vc == -1) gpm_report(GPM_PR_OOPS, GPM_MESS_UNKNOWN_FD);
++
++   rc = get_data(ci->fd, &conn);
++
++   if (rc == 0) { /* no data */
++      gpm_report(GPM_PR_INFO, GPM_MESS_CLOSE);
++      close(ci->fd);
++      return 0;
++   }
++ 
++   if (rc == -1) return -1; /* too few bytes */
++
++   if (conn.pid != 0) {
++      ci->data = conn;
++      return 1;
++   }
++
++   /* Aha, request for information (so-called snapshot) */
++   switch (conn.vc) {
++      case GPM_REQ_SNAPSHOT:
++         event.vc = get_console_state(&event.modifiers);
++         event.x = x; event.y = y;
++         event.buttons = buttons;
++         event.clicks = clicks;
++         event.dx = console.max_x; event.dy = console.max_y;
++         /* fall through */
++
++      case GPM_REQ_BUTTONS:
++         event.type = (three_button_mouse == 1 ? 3 : 2); /* buttons */
++         write(ci->fd, &event, sizeof(Gpm_Event));
++         break;
++
++      case GPM_REQ_NOPASTE:
++         selection_disable_paste();
++         gpm_report(GPM_PR_INFO, GPM_MESS_DISABLE_PASTE, vc);
++         break;
++   }
++
++   return 1;
++}
++
+diff -urN gpm-1.20.1/src/console.c gpm/src/console.c
+--- gpm-1.20.1/src/console.c	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/console.c	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,257 @@
++/*
++ * console.c - GPM console and selection/paste handling
++ *
++ * Copyright (C) 1993        Andreq Haylett <ajh@gec-mrc.co.uk>
++ * Copyright (C) 1994-1999   Alessandro Rubini <rubini@linux.it>
++ * Copyright (C) 1998        Ian Zimmerman <itz@rahul.net>
++ * Copyright (c) 2001,2002   Nico Schottelius <nico@schottelius.org>
++ * Copyright (c) 2003        Dmitry Torokhov <dtor@mail.ru>
++ *
++ *   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>
++#include <stdlib.h>
++#include <string.h>        /* strerror(); ?!?  */
++#include <errno.h>
++#include <unistd.h>        /* select(); */
++#include <time.h>          /* time() */
++#include <sys/fcntl.h>     /* O_RDONLY */
++#include <sys/stat.h>      /* mkdir()  */
++#include <asm/types.h>     /* __u32 */
++
++#include <linux/vt.h>      /* VT_GETSTATE */
++#include <sys/kd.h>        /* KDGETMODE */
++#include <termios.h>       /* winsize */
++
++#include "headers/gpmInt.h"
++#include "headers/console.h"
++#include "headers/message.h"
++
++#ifndef HAVE___U32
++# ifndef _I386_TYPES_H /* /usr/include/asm/types.h */
++typedef unsigned int __u32;
++# endif
++#endif
++
++struct gpm_console console = { 0, DEF_LUT, 0, 0 };
++
++/*-------------------------------------------------------------------*/
++static int count_digits(int num)
++{
++   int digits = 1;
++
++   while ((num /= 10))
++      digits++;
++
++   return digits;
++}
++
++/*-------------------------------------------------------------------*/
++char *compose_vc_name(int vc)
++{   
++   char  *tty;
++  
++   tty = malloc(strlen(console.device) + count_digits(vc) + sizeof(char));
++   if (tty) {
++      /* console is /dev/vc/0 or /dev/tty0 and we trimming the ending 0 */
++      strncpy(tty, console.device, strlen(console.device) - 1);
++      sprintf(&tty[strlen(console.device) - 1], "%d", vc);
++   }
++
++   return tty;
++}
++
++/*-------------------------------------------------------------------*/
++int open_console(int mode)
++{
++   int fd;
++
++   if ((fd = open(console.device, mode)) < 0)
++      gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN_CON);
++
++   return fd;
++}
++
++/*-------------------------------------------------------------------*/
++int is_text_console(void)
++{
++   int fd;
++   int kd_mode;
++
++   fd = open_console(O_RDONLY);
++   if (ioctl(fd, KDGETMODE, &kd_mode)<0)
++      gpm_report(GPM_PR_OOPS, GPM_MESS_IOCTL_KDGETMODE);
++   close(fd);
++   
++   return kd_mode == KD_TEXT;
++}
++
++/*-------------------------------------------------------------------*/
++void wait_text_console(void)
++{
++   do {
++      sleep(2);
++   } while (!is_text_console());
++}
++
++/*-------------------------------------------------------------------*/
++void refresh_console_size(void)
++{
++   struct winsize win;
++   int fd = open_console(O_RDONLY);
++
++   ioctl(fd, TIOCGWINSZ, &win);
++   close(fd);
++
++   if (!win.ws_col || !win.ws_row) {
++      gpm_report(GPM_PR_DEBUG, GPM_MESS_ZERO_SCREEN_DIM);
++      console.max_x = 80; console.max_y = 25;
++   } else {
++      console.max_x = win.ws_col; console.max_y = win.ws_row;
++   }
++   gpm_report(GPM_PR_DEBUG, GPM_MESS_SCREEN_SIZE, console.max_x, console.max_y);
++}
++
++/*-------------------------------------------------------------------*/
++int get_console_state(unsigned char *shift_state)
++{
++   struct vt_stat stat;
++   int fd;
++
++   fd = open_console(O_RDONLY);
++
++   *shift_state = 6; /* code for the ioctl */
++   if (ioctl(fd, TIOCLINUX, shift_state) < 0)
++      gpm_report(GPM_PR_OOPS, GPM_MESS_GET_SHIFT_STATE);
++
++   if (ioctl(fd, VT_GETSTATE, &stat) < 0) 
++      gpm_report(GPM_PR_OOPS, GPM_MESS_GET_CONSOLE_STAT);
++
++   close(fd);
++
++   return stat.v_active;
++}
++
++/*-------------------------------------------------------------------*/
++int is_console_owner(int vc, uid_t uid)
++{   
++   struct stat statbuf;
++   char  *tty;
++   int   rc;
++  
++   if ((tty = compose_vc_name(vc)) == NULL)
++      gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
++
++   if ((rc = stat(tty, &statbuf)) == -1)
++      gpm_report(GPM_PR_ERR, GPM_MESS_STAT_FAILS, tty);
++   
++   free(tty);
++
++   return rc != -1 && uid == statbuf.st_uid;
++}
++
++/*-------------------------------------------------------------------*/
++/* octal digit */
++static int isodigit(const unsigned char c)
++{
++   return ((c & ~7) == '0');
++}
++
++/*-------------------------------------------------------------------*/
++/* routine to convert digits from octal notation (Andries Brouwer) */
++static int getsym(const unsigned char *p0, unsigned char *res)
++{
++   const unsigned char *p = p0;
++   char c;
++
++   c = *p++;
++   if (c == '\\' && *p) {
++      c = *p++;
++      if (isodigit(c)) {
++         c -= '0';
++         if (isodigit(*p)) c = 8*c + (*p++ - '0');
++         if (isodigit(*p)) c = 8*c + (*p++ - '0');
++      }
++   }
++   *res = c;
++   return (p - p0);
++}
++
++/*-------------------------------------------------------------------*/
++/* description missing! FIXME */
++void console_load_lut(void)
++{
++   extern int errno;
++   int i, c, fd;
++   unsigned char this, next;
++   static __u32 long_array[9] = {
++      0x05050505, /* ugly, but preserves alignment */
++      0x00000000, /* control chars     */
++      0x00000000, /* digits            */
++      0x00000000, /* uppercase and '_' */
++      0x00000000, /* lowercase         */
++      0x00000000, /* Latin-1 control   */
++      0x00000000, /* Latin-1 misc      */
++      0x00000000, /* Latin-1 uppercase */
++      0x00000000  /* Latin-1 lowercase */
++   };
++
++#define inwordLut (long_array+1)
++
++   for (i = 0; console.charset[i]; ) {
++      i += getsym(console.charset + i, &this);
++      if (console.charset[i] == '-' && console.charset[i + 1] != '\0')
++         i += getsym(console.charset + i + 1, &next) + 1;
++      else
++         next = this;
++      for (c = this; c <= next; c++)
++         inwordLut[c >> 5] |= 1 << (c & 0x1F);
++   }
++  
++   fd = open_console(O_WRONLY);
++
++   if (ioctl(fd, TIOCLINUX, &long_array) < 0) { /* fd <0 is checked */
++      if (errno == EPERM && getuid())
++         gpm_report(GPM_PR_WARN, GPM_MESS_ROOT); /* why do we still continue?*/
++      else if (errno == EINVAL)
++         gpm_report(GPM_PR_OOPS, GPM_MESS_CSELECT);
++   }
++   close(fd);
++}
++
++/*-------------------------------------------------------------------*/
++/* Returns the name of the console (/dev/tty0 or /dev/vc/0)          */
++/* Also fills console.device                                         */
++char *get_console_name()
++{
++   struct stat buf;
++
++   /* first try the devfs device, because in the next time this will be
++    * the preferred one. If that fails, take the old console */
++   
++   /* Check for open new console */
++   if (stat(GPM_DEVFS_CONSOLE, &buf) == 0)
++      console.device = GPM_DEVFS_CONSOLE;
++  
++   /* Failed, try OLD console */
++   else if (stat(GPM_OLD_CONSOLE, &buf) == 0)
++      console.device = GPM_OLD_CONSOLE;
++   else
++      gpm_report(GPM_PR_OOPS, "Can't determine console device"); 
++
++   return console.device;
++}
++
+diff -urN gpm-1.20.1/src/evdev.c gpm/src/evdev.c
+--- gpm-1.20.1/src/evdev.c	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/evdev.c	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,851 @@
++/*
++ * evdev.c - support for event input devices in linux 2.4 & 2.6
++ *
++ * Copyright (C) 2003        Dmitry Torokhov <dtor@mail.ru>
++ * Based on XFree86 driver by Stefan Gmeiner & Peter Osterlund
++ *
++ *   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>
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++#include <time.h>
++#include <sys/select.h>
++#include <sys/time.h>
++
++#include <linux/input.h>
++#include "headers/input-defines.h" /* misisng bits in case <linux/input.h> is old */ 
++
++#include "headers/gpm.h"
++#include "headers/gpmInt.h"
++#include "headers/console.h"
++#include "headers/message.h"
++#include "headers/optparser.h"
++
++enum evdev_type { 
++   EVDEV_UNKNOWN,
++   EVDEV_RELATIVE, 
++   EVDEV_ABSOLUTE, 
++   EVDEV_TOUCHPAD, 
++   EVDEV_SYNAPTICS 
++};
++
++enum touch_type {
++   TOUCH_NONE, 
++   TOUCH_FINGERS, 
++   TOUCH_PALM
++};
++
++enum gesture_type {
++   GESTURE_NONE,
++   GESTURE_TAP_PENDING,
++   GESTURE_TAP,
++   GESTURE_DRAG_PENDING,
++   GESTURE_DRAG,
++   GESTURE_DOUBLE_TAP
++};
++
++enum edge_type {
++   BOTTOM_EDGE = 1,
++   TOP_EDGE = 2,
++   LEFT_EDGE = 4,
++   RIGHT_EDGE = 8,
++   LEFT_BOTTOM_EDGE = BOTTOM_EDGE | LEFT_EDGE,
++   RIGHT_BOTTOM_EDGE = BOTTOM_EDGE | RIGHT_EDGE,
++   RIGHT_TOP_EDGE = TOP_EDGE | RIGHT_EDGE,
++   LEFT_TOP_EDGE = TOP_EDGE | LEFT_EDGE              
++};
++ 
++struct event_data {
++   int dx, dy;
++   int wdx, wdy;
++   int abs_x, abs_y;
++   int buttons;
++   int touch;  /* dumb touchpad report touch events, smart ones - pressure */
++   int pressure;
++   int w;
++   int finger_count;
++   int synced;   
++};
++
++struct touch_data {
++   int touching;
++   int x, y;
++   int finger_count;
++   int buttons;
++   int clicks;
++   struct timeval start;
++   enum gesture_type gesture;
++};
++
++struct event_device {
++   enum evdev_type type;
++   int dont_sync;
++
++   struct event_data pkt;
++   int pkt_count;
++
++   int prev_x[4], prev_y[4];
++   int prev_pressure, avg_w;
++   struct touch_data touch;
++  
++   int left_edge, right_edge;
++   int top_edge, bottom_edge;
++   int touch_high, touch_low;
++   int tap_time, tap_move;
++   int y_inverted;   
++
++   enum touch_type (*detect_touch)(struct event_device *evdev);
++   void (*update_finger_count)(struct event_device *evdev);
++};
++
++struct evdev_capabilities {
++   unsigned char evbits[EV_MAX/8 + 1];
++   unsigned char keybits[KEY_MAX/8 + 1];
++   unsigned char absbits[ABS_MAX/8 + 1];
++   unsigned char mscbits[MSC_MAX/8 + 1];
++};
++
++#ifndef max
++#define max(a,b) ((a)>(b) ? (a) : (b))
++#endif
++
++#define fx(i)  (evdev->prev_x[(evdev->pkt_count - (i)) & 03])
++#define fy(i)  (evdev->prev_y[(evdev->pkt_count - (i)) & 03])
++
++#define toggle_btn(btn, val) do { if (val) data->buttons |= (btn);\
++                                  else     data->buttons &= ~(btn);\
++                             } while (0)
++#define GET_TIME(tv) (gettimeofday(&tv, (struct timezone *)NULL))
++#define DIF_TIME(t1,t2) ((t2.tv_sec - t1.tv_sec) * 1000 + (t2.tv_usec - t1.tv_usec) / 1000)
++
++#define test_bit(bit, array)    (array[bit / 8] & (1 << (bit % 8)))
++
++/* ------------- evdev protocol handling routines ---------------------*/
++
++static void parse_input_event(struct input_event *event, struct event_data *data)
++{
++   switch (event->type) {
++      case EV_REL:
++         switch (event->code) {
++            case REL_X:
++               data->dx = (signed char)event->value;
++               break;
++            case REL_Y:
++               data->dy = (signed char)event->value;
++               break;
++            case REL_WHEEL:
++               data->wdy += event->value;
++               break;
++            case REL_HWHEEL:
++               data->wdx += event->value;
++               break;
++         }
++         break;
++
++      case EV_ABS:
++         switch (event->code) {
++            case ABS_X:
++               data->abs_x = event->value;
++               break;
++
++            case ABS_Y:
++               data->abs_y = event->value;
++               break;
++
++            case ABS_PRESSURE:
++               data->pressure = event->value;
++               break;
++
++            case ABS_TOOL_WIDTH:
++               data->w = event->value;
++               break;
++         }
++         break;
++
++      case EV_MSC:
++         switch (event->code) {
++            case MSC_GESTURE:
++               data->w = event->value;
++               break;
++         }
++         break;
++
++
++      case EV_KEY:
++         switch(event->code) {
++            case BTN_0:
++            case BTN_LEFT:
++               toggle_btn(GPM_B_LEFT, event->value);
++               break;
++
++            case BTN_2:
++            case BTN_STYLUS2:
++            case BTN_SIDE:
++            case BTN_MIDDLE:
++               toggle_btn(GPM_B_MIDDLE, event->value);
++               break;
++
++            case BTN_STYLUS:
++            case BTN_1:
++            case BTN_RIGHT:
++               toggle_btn(GPM_B_RIGHT, event->value);
++               break;
++
++            case BTN_TOUCH:
++               data->touch = event->value ? 1 : 0;
++               break;
++
++            case BTN_TOOL_FINGER:
++               if (event->value) data->finger_count = 1;
++               break;
++
++            case BTN_TOOL_DOUBLETAP:
++               if (event->value) data->finger_count = 2;
++               break;
++
++            case BTN_TOOL_TRIPLETAP:
++               if (event->value) data->finger_count = 3;
++               break;
++ 
++         }
++         break;
++
++      case EV_SYNC:
++         switch(event->code) {
++            case SYN_REPORT:
++               data->synced = 1;
++               break;
++         }
++         break;
++   }
++}
++
++static void tp_figure_deltas(struct event_device *evdev, struct Gpm_Event *state)
++{
++   struct event_data *pkt = &evdev->pkt;
++
++   state->dx = state->dy = 0;
++   if (evdev->touch.touching) {
++      fx(0) = pkt->abs_x; 
++      fy(0) = pkt->abs_y;
++      if (evdev->pkt_count >= 2 && 
++          evdev->touch.gesture != GESTURE_DRAG_PENDING) {
++         state->dx = ((fx(0) - fx(1)) / 2 + (fx(1) - fx(2)) / 2) / 8; //SYN_REL_DECEL_FACTOR;
++         state->dy = ((fy(0) - fy(1)) / 2 + (fy(1) - fy(2)) / 2) / 8; //SYN_REL_DECEL_FACTOR;
++      }
++      evdev->pkt_count++;
++   } else  {
++      evdev->pkt_count = 0;
++   }
++}
++
++static enum touch_type dumb_tp_detect_touch(struct event_device *evdev)
++{
++   return evdev->pkt.touch ? TOUCH_FINGERS : TOUCH_NONE;
++}
++
++static enum touch_type smart_tp_detect_touch(struct event_device *evdev)
++{
++   if (evdev->touch.touching)
++      return evdev->pkt.pressure > evdev->touch_low ? TOUCH_FINGERS : TOUCH_NONE;
++   else 
++      return evdev->pkt.pressure > evdev->touch_high ? TOUCH_FINGERS : TOUCH_NONE;
++}
++
++static enum touch_type syn_detect_touch(struct event_device *evdev)
++{
++   struct event_data *pkt = &evdev->pkt;
++   enum touch_type type = TOUCH_NONE;
++
++   if (pkt->pressure > 200 || pkt->w > 10)
++      return TOUCH_PALM;
++
++   if (pkt->abs_x == 0)
++      evdev->avg_w = 0;
++   else
++      evdev->avg_w = (pkt->w - evdev->avg_w + 1) / 2;
++  
++   if (evdev->touch.touching) {
++      type = pkt->pressure > evdev->touch_low ? TOUCH_FINGERS : TOUCH_NONE;
++   } else if (pkt->pressure > evdev->touch_high) {
++      int safe_w = max(pkt->w, evdev->avg_w);
++
++      if (pkt->finger_count > 1)    
++         type = TOUCH_FINGERS;
++      else if (pkt->w < 2)
++         type = TOUCH_FINGERS;                  /* more than one finger -> not a palm */
++      else if (safe_w < 6 && evdev->prev_pressure < evdev->touch_high)
++         type = TOUCH_FINGERS;                  /* thin finger, distinct touch -> not a palm */
++      else if (safe_w < 7 && evdev->prev_pressure < evdev->touch_high / 2)
++         type = TOUCH_FINGERS;                  /* thin finger, distinct touch -> not a palm */
++      else if (pkt->pressure > evdev->prev_pressure + 1)
++         type = TOUCH_NONE;                     /* pressure not stable, may be a palm */
++      else if (pkt->pressure < evdev->prev_pressure - 5)
++         type = TOUCH_NONE;                     /* pressure not stable, may be a palm */
++      else
++         type = TOUCH_FINGERS;      
++   }
++
++   evdev->prev_pressure = pkt->pressure;
++   return type;
++}
++
++static enum edge_type tp_detect_edges(struct event_device *evdev, int x, int y)
++{
++   enum edge_type edge = 0;
++   
++   if (x > evdev->right_edge)
++      edge |= RIGHT_EDGE;
++   else if (x < evdev->left_edge)
++      edge |= LEFT_EDGE;
++
++   if (y < evdev->top_edge)
++      edge |= TOP_EDGE;
++   else if (y > evdev->bottom_edge)
++      edge |= BOTTOM_EDGE;
++
++   return edge;
++}
++
++static int tp_touch_expired(struct event_device *evdev)
++{
++   struct timeval now;
++
++   GET_TIME(now);
++   return DIF_TIME(evdev->touch.start, now) > evdev->tap_time;
++}
++
++static int tp_detect_tap(struct event_device *evdev)
++{
++   return !tp_touch_expired(evdev) &&
++          (evdev->touch.finger_count > 1 ||
++           (abs(evdev->pkt.abs_x - evdev->touch.x) < evdev->tap_move &&
++            abs(evdev->pkt.abs_y - evdev->touch.y) < evdev->tap_move));
++}
++
++static int tp_tap_to_buttons(struct event_device *evdev)
++{
++   enum edge_type edge;
++   if (evdev->touch.finger_count < 2) {
++      edge = tp_detect_edges(evdev, evdev->pkt.abs_x, evdev->pkt.abs_y);
++      switch (edge) {
++         case RIGHT_TOP_EDGE:
++            return GPM_B_MIDDLE;
++            break;
++         case RIGHT_BOTTOM_EDGE:
++            return GPM_B_RIGHT;
++            break;
++         default:
++            return GPM_B_LEFT;
++            break;
++      }
++   } else {
++      switch (evdev->touch.finger_count) {
++         case 2:
++            return GPM_B_MIDDLE;
++         case 3:
++            return GPM_B_RIGHT;
++         default:
++            return GPM_B_LEFT;
++      }
++   }
++}
++
++static void tp_detect_gesture(struct event_device *evdev, int timed_out, enum touch_type touch_type)
++{
++   struct touch_data *touch = &evdev->touch;
++   int was_touching = touch->touching;
++  
++   touch->touching = touch_type == TOUCH_FINGERS;
++
++   if (touch->touching) {
++      if (!was_touching) {
++         GET_TIME(touch->start);
++         touch->finger_count = 0; 
++         if (touch->gesture == GESTURE_TAP_PENDING) {
++            touch->gesture = GESTURE_DRAG_PENDING;
++         } else {
++            touch->x = evdev->pkt.abs_x;
++            touch->y = evdev->pkt.abs_y;
++            touch->buttons = 0;
++         }
++      } else if (touch->gesture == GESTURE_DRAG_PENDING && tp_touch_expired(evdev)) {
++         touch->gesture = GESTURE_DRAG;
++      }
++   } else {
++      if (was_touching) {
++        if (tp_detect_tap(evdev)) {
++            if (touch->gesture == GESTURE_DRAG_PENDING) {
++               touch->gesture = GESTURE_DOUBLE_TAP;
++               touch->clicks = 4;
++            } else {
++               if ((touch->buttons = tp_tap_to_buttons(evdev)) == GPM_B_LEFT) {
++                  touch->gesture = GESTURE_TAP_PENDING;
++               } else {
++                  touch->gesture = GESTURE_TAP;
++                  touch->clicks = 2;
++               }
++            }
++         } else {
++            touch->gesture = GESTURE_NONE;
++         }
++      } else {
++         if (touch->gesture == GESTURE_TAP_PENDING && tp_touch_expired(evdev)) {
++            touch->gesture = GESTURE_TAP;
++            touch->clicks = 2;
++         }
++      }
++   }
++}
++
++static int tp_process_gesture(struct event_device *evdev, struct Gpm_Event *state)
++{
++   int next_timeout = -1;
++
++   switch(evdev->touch.gesture) {
++      case GESTURE_DOUBLE_TAP:
++      case GESTURE_TAP:
++         if (--evdev->touch.clicks == 0) 
++            evdev->touch.gesture = GESTURE_NONE;
++         else 
++            next_timeout = 0;
++
++         if (evdev->touch.clicks % 2)
++            state->buttons |= evdev->touch.buttons;
++         else
++            state->buttons &= ~evdev->touch.buttons;
++         break;
++
++      case GESTURE_DRAG:
++         state->buttons |= evdev->touch.buttons;
++         break;
++
++      case GESTURE_DRAG_PENDING:
++      case GESTURE_TAP_PENDING:
++         next_timeout = evdev->tap_time;
++         break;
++               
++      default:
++         break;
++   }
++   return next_timeout;
++}
++
++static void tp_update_finger_count(struct event_device *evdev)
++{
++   evdev->touch.finger_count = max(evdev->pkt.finger_count, evdev->touch.finger_count);
++}
++
++static void syn_update_finger_count(struct event_device *evdev)
++{
++   if (evdev->pkt.w == 1)
++      evdev->touch.finger_count = 3;
++   else if (evdev->pkt.w == 0 && evdev->touch.finger_count != 3) 
++      evdev->touch.finger_count = 2;
++   else
++      evdev->touch.finger_count = 1;
++}
++ 
++static int compose_gpm_event(struct event_device *evdev, int timed_out, Gpm_Event *state)
++{
++   struct event_data *pkt = &evdev->pkt;
++   enum touch_type touch_type;
++   int next_timeout = -1;
++
++	if (!timed_out) {
++      state->buttons = pkt->buttons;
++      state->wdx = pkt->wdx; state->wdy = pkt->wdy;
++   }
++
++   switch (evdev->type) {
++      case EVDEV_RELATIVE:
++         if (!timed_out) {
++            state->dx = pkt->dx; state->dy = pkt->dy;
++            if (evdev->pkt.touch)
++               state->buttons |=  GPM_B_LEFT;
++            else
++               state->buttons &= ~GPM_B_LEFT;
++         }
++         break;
++
++      case EVDEV_ABSOLUTE:
++         if (!timed_out) {
++            if (pkt->abs_x < evdev->left_edge) 
++               pkt->abs_x = evdev->left_edge;
++            else if (pkt->abs_x > evdev->right_edge) 
++               pkt->abs_x = evdev->right_edge;
++
++            if (pkt->abs_y > evdev->bottom_edge) 
++               pkt->abs_y = evdev->bottom_edge;
++            else if (pkt->abs_y < evdev->top_edge) 
++               pkt->abs_y = evdev->top_edge;
++
++            state->x = (pkt->abs_x - evdev->left_edge) * 
++                        console.max_x / (evdev->right_edge - evdev->left_edge);
++            state->y = (pkt->abs_y - evdev->top_edge) * 
++                        console.max_y / (evdev->bottom_edge - evdev->top_edge);
++
++            if (evdev->y_inverted) state->y = console.max_y - state->y;
++
++            if (evdev->pkt.touch)
++               state->buttons |=  GPM_B_LEFT;
++            else
++               state->buttons &= ~GPM_B_LEFT;
++         }
++         break;
++
++      case EVDEV_TOUCHPAD:
++      case EVDEV_SYNAPTICS:
++         touch_type = timed_out ? TOUCH_NONE : evdev->detect_touch(evdev);
++
++         if (touch_type != TOUCH_PALM) {
++            tp_detect_gesture(evdev, timed_out, touch_type);
++
++            if (evdev->touch.touching && !tp_touch_expired(evdev))
++               evdev->update_finger_count(evdev);
++
++            if (evdev->touch.finger_count < 2)
++               tp_figure_deltas(evdev, state);
++
++            next_timeout = tp_process_gesture(evdev, state);
++         }
++         break;
++
++      default:
++         /* should not happen */
++         gpm_report(GPM_PR_OOPS, "Bad evdev type %d", evdev->type);
++         break;
++   }
++
++   if (evdev->y_inverted) state->dy = -state->dy;
++
++   return next_timeout;   
++}
++
++int M_evdev(struct micedev *dev, struct miceopt *opts, 
++            unsigned char *data, struct Gpm_Event *state)
++{
++   struct event_device *evdev = dev->private;
++   struct input_event *event = (struct input_event *)data;
++   int timed_out = data == NULL;
++
++   if (!timed_out)
++      parse_input_event(event, &evdev->pkt);
++
++   if (timed_out || evdev->pkt.synced || evdev->dont_sync) {
++      dev->timeout = compose_gpm_event(evdev, timed_out, state);
++      evdev->pkt.dx = evdev->pkt.dy = 0;
++      evdev->pkt.wdx = evdev->pkt.wdy = 0;
++      evdev->pkt.finger_count = 0;
++      evdev->pkt.synced = 0;
++      return 0;
++   }
++
++   dev->timeout = -1;
++   return -1;
++}
++
++/* ------------- evdev initialization routines ---------------------*/
++
++static int evdev_get_id(int fd, struct input_id *id)
++{
++   if (ioctl(fd, EVIOCGID, id) < 0) {
++      gpm_report(GPM_PR_ERR, "evdev: cannot query device identification");
++      return -1;
++   }
++   return 0;
++}
++
++static int evdev_get_capabilities(int fd, struct evdev_capabilities *caps)
++{
++   memset(caps, 0, sizeof(*caps));
++
++   if (ioctl(fd, EVIOCGBIT(0, EV_MAX), caps->evbits) < 0) {
++      gpm_report(GPM_PR_ERR, "evdev: cannot query device capabilities");
++      return -1;
++   }
++
++   if (test_bit(EV_ABS, caps->evbits) &&
++       ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(caps->absbits)), caps->absbits) < 0) {
++      gpm_report(GPM_PR_ERR, "evdev: cannot query ABS device capabilities");
++      return -1;
++   }
++
++   if (test_bit(EV_KEY, caps->evbits) &&
++       ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(caps->keybits)), caps->keybits) < 0) {
++      gpm_report(GPM_PR_ERR, "evdev: cannot query KEY device capabilities");
++      return -1;
++   }
++
++   if (test_bit(EV_MSC, caps->evbits) &&
++       ioctl(fd, EVIOCGBIT(EV_MSC, sizeof(caps->mscbits)), caps->mscbits) < 0) {
++      /* don't complain as 2.4 kernels didnt have it 
++      gpm_report(GPM_PR_ERR, "evdev: cannot query MSC device capabilities");
++      return -1;
++      */
++   }
++   return 0;
++}
++
++static int evdev_query_axis(int fd, int axis, int *axis_min, int *axis_max)
++{
++   struct input_absinfo axis_info;
++
++   if (ioctl(fd, EVIOCGABS(axis), &axis_info) == -1) {
++      gpm_report(GPM_PR_ERR, "evdev: could not query axis data");
++      return -1;
++   }
++
++   *axis_min = axis_info.minimum;
++   *axis_max = axis_info.maximum;
++   return 0;
++}
++
++static int evdev_get_limits(int fd, struct event_device *evdev,
++                            struct evdev_capabilities *caps)
++{
++   if (test_bit(ABS_X, caps->absbits) &&
++         evdev_query_axis(fd, ABS_X, &evdev->left_edge, &evdev->right_edge) < 0)
++      return -1;
++   
++   if (test_bit(ABS_Y, caps->absbits) &&
++         evdev_query_axis(fd, ABS_Y, &evdev->top_edge, &evdev->bottom_edge) < 0)
++      return -1; 
++
++   return 0;
++}
++
++static int is_synaptics(struct input_id *id)
++{
++   return id->bustype == BUS_I8042 && id->vendor == 0x0002 && id->product == PSMOUSE_SYNAPTICS;
++}
++
++static enum evdev_type evdev_guess_type(struct input_id *id, struct evdev_capabilities *caps) 
++{
++   if (test_bit(EV_ABS, caps->evbits)) {
++      if (is_synaptics(id))
++         return EVDEV_SYNAPTICS;
++
++      if (test_bit(BTN_TOUCH, caps->keybits) && caps->keybits[BTN_MOUSE / 8])
++         return EVDEV_TOUCHPAD;
++
++      return EVDEV_ABSOLUTE;
++   }
++
++   if (!test_bit(EV_REL, caps->evbits)) {
++      gpm_report(GPM_PR_ERR, 
++                 "evdev: device does not report neither absolute nor relative coordinates");
++      return EVDEV_UNKNOWN;
++   }
++
++   return EVDEV_RELATIVE;
++}
++
++static enum evdev_type evdev_str_to_type(const char *type)
++{
++   if (!strcmp(type, "relative")) {
++      return EVDEV_RELATIVE;
++   } else if (!strcmp(type, "absolute")) {
++      return EVDEV_ABSOLUTE;
++   } else if (!strcmp(type, "touchpad")) {
++      return EVDEV_TOUCHPAD;
++   } else if (!strcmp(type, "synaptics")) {
++      return EVDEV_SYNAPTICS;
++   } else {
++      gpm_report(GPM_PR_ERR, "evdev: unknown type '%s'", type);
++      return EVDEV_UNKNOWN;
++   }
++}
++
++static void warn_if_present(struct option_helper *optinfo, const char *name, const char *type)
++{
++   if (is_option_present(optinfo, name))
++      gpm_report(GPM_PR_WARN,
++                 "evdev: option '%s' is not valud for type '%s', ignored",
++                 name, type);
++}
++
++// -o type=(auto|synaptics|touchpad|relative|absolute),y_inverse,
++//    left=1234,right=1234,top=1234,bottom=1234,
++//    touch_high=30,touch_low=25,tap_time=30,tap_move=100
++static int evdev_apply_options(struct event_device *evdev, char *optstring)
++{
++   char *type = "auto";
++   struct option_helper optinfo[] = {
++      { "type",         OPT_STRING, u: { sptr: &type } },
++      { "y_inverted",   OPT_BOOL,   u: { iptr: &evdev->y_inverted }, value: 1 },
++      { "left",         OPT_INT,    u: { iptr: &evdev->left_edge } }, 
++      { "right",        OPT_INT,    u: { iptr: &evdev->right_edge } }, 
++      { "top",          OPT_INT,    u: { iptr: &evdev->top_edge } }, 
++      { "bottom",       OPT_INT,    u: { iptr: &evdev->bottom_edge } }, 
++      { "touch_high",   OPT_INT,    u: { iptr: &evdev->touch_high } }, 
++      { "touch_low",    OPT_INT,    u: { iptr: &evdev->touch_low } }, 
++      { "tap_time",     OPT_INT,    u: { iptr: &evdev->tap_time } }, 
++      { "tap_move",     OPT_INT,    u: { iptr: &evdev->tap_move } }, 
++      { "",             OPT_END }
++   }; 
++
++   if (parse_options("evdev", optstring, ',', optinfo) < 0)
++      return -1;
++
++   if (strcmp(type, "auto"))
++      evdev->type = evdev_str_to_type(type);
++
++   switch (evdev->type) {
++      case EVDEV_RELATIVE:
++         warn_if_present(optinfo, "left", type);
++         warn_if_present(optinfo, "right", type);
++         warn_if_present(optinfo, "top", type);
++         warn_if_present(optinfo, "bottom", type);
++         warn_if_present(optinfo, "tap_move", type);
++         warn_if_present(optinfo, "tap_time", type);
++         warn_if_present(optinfo, "touch_high", type);
++         warn_if_present(optinfo, "touch_low", type);
++         break;
++      
++      case EVDEV_ABSOLUTE:
++         warn_if_present(optinfo, "tap_move", type);
++         warn_if_present(optinfo, "tap_time", type);
++         warn_if_present(optinfo, "touch_high", type);
++         warn_if_present(optinfo, "touch_low", type);
++         break;
++     
++      case EVDEV_TOUCHPAD:
++         break;      
++
++      case EVDEV_SYNAPTICS:
++         warn_if_present(optinfo, "y_inverted", type);
++         break;
++
++      default:
++         return -1;
++   }
++   return 0;
++}
++
++int I_evdev(struct micedev *dev, struct miceopt *opts, Gpm_Type *type)
++{
++   struct input_id id;
++   struct evdev_capabilities caps;
++   struct event_device *evdev;
++
++   if (!dev->private) {          /* called first time, not re-init */
++      if (!(dev->private = evdev = malloc(sizeof(*evdev))))
++         gpm_report(GPM_PR_OOPS, "Can't allocate memory for event device");
++
++      memset(evdev, 0, sizeof(*evdev));
++
++      if (evdev_get_id(dev->fd, &id))
++         goto init_fail;
++
++      if (evdev_get_capabilities(dev->fd, &caps))
++         goto init_fail;
++      
++      evdev->type = evdev_guess_type(&id, &caps);
++      
++      /* load default values - suitable for my synaptics ;P */
++      evdev->left_edge = 1900;
++      evdev->right_edge = 5300;
++      evdev->top_edge = 2000;
++      evdev->bottom_edge = 3900;
++      evdev->tap_time = 180;
++      evdev->tap_move = 220;
++      evdev->touch_high = 30;
++      evdev->touch_low = 25;
++
++      if (evdev->type == EVDEV_ABSOLUTE && evdev_get_limits(dev->fd, evdev, &caps) < 0) 
++         goto init_fail;
++     
++      if (evdev_apply_options(evdev, opts->text) < 0)
++         goto init_fail;
++
++      if (!test_bit(EV_SYNC, caps.evbits)) {
++         evdev->dont_sync = 1;
++         if (evdev->type == EVDEV_TOUCHPAD || evdev->type == EVDEV_SYNAPTICS) {
++            gpm_report(GPM_PR_ERR, 
++                       "evdev: The running kernel lacks EV_SYNC support which is required for touchpad/synaptics mode"); 
++            goto init_fail;
++         }
++      }
++      
++      switch (evdev->type) {
++         case EVDEV_RELATIVE:
++            gpm_report(GPM_PR_INFO, "evdev: selected Relative mode");
++            if (!test_bit(EV_REL, caps.evbits))
++               gpm_report(GPM_PR_WARN, "evdev: selected relative mode but device does not report any relative events");
++            break;
++            
++         case EVDEV_ABSOLUTE:
++            gpm_report(GPM_PR_INFO, "evdev: selected Absolute mode");
++            if (evdev->right_edge <= evdev->left_edge) {
++               gpm_report(GPM_PR_ERR, "evdev: right edge value should be gerater than left");
++               goto init_fail;
++            }
++            if (evdev->bottom_edge <= evdev->top_edge) {
++               gpm_report(GPM_PR_ERR, "evdev: bottom edge value should be gerater than top");
++               goto init_fail;
++            }
++            if (!test_bit(EV_ABS, caps.evbits))
++               gpm_report(GPM_PR_WARN, "evdev: selected absolute mode but device does not report any absolute events");
++            opts->absolute = 1;
++            break;
++
++         case EVDEV_TOUCHPAD:
++            gpm_report(GPM_PR_INFO, "evdev: selected Touchpad mode");
++            if (!test_bit(EV_ABS, caps.evbits))
++               gpm_report(GPM_PR_WARN, "evdev: selected touchpad mode but device does not report any absolute events");
++            if (test_bit(ABS_PRESSURE, caps.absbits))
++               evdev->detect_touch = smart_tp_detect_touch;
++            else if (test_bit(BTN_TOUCH, caps.keybits))
++               evdev->detect_touch = dumb_tp_detect_touch;
++            else
++               gpm_report(GPM_PR_WARN, "evdev: selected touchpad mode but device does not report pressure not touch events");
++            evdev->update_finger_count = tp_update_finger_count;
++            break;
++
++         case EVDEV_SYNAPTICS:
++            gpm_report(GPM_PR_INFO, "evdev: selected Synaptics mode");
++            if (!is_synaptics(&id))
++               gpm_report(GPM_PR_WARN, "evdev: idevice isn't identified as Synaptics");
++            if (!test_bit(EV_ABS, caps.evbits))
++               gpm_report(GPM_PR_WARN, "evdev: selected synaptics mode but device does not report any absolute events");
++            if (!test_bit(ABS_PRESSURE, caps.absbits))
++               gpm_report(GPM_PR_WARN, "evdev: selected synaptics mode but device does not report pressure");
++            if (test_bit(EV_MSC, caps.evbits) && test_bit(MSC_GESTURE, caps.mscbits)) {
++               /* this is compatibility mode with pre 2.6-test6 kernels */
++               evdev->update_finger_count = syn_update_finger_count;
++               evdev->y_inverted = 1;
++            } else { 
++               evdev->update_finger_count = tp_update_finger_count;
++            }
++            evdev->detect_touch = syn_detect_touch;
++            break;
++
++         default:
++            break;
++      }
++   }
++   
++   return 0;
++
++init_fail:
++   free(dev->private);
++   return -1;      
++}
++
+diff -urN gpm-1.20.1/src/gpm.c gpm/src/gpm.c
+--- gpm-1.20.1/src/gpm.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/gpm.c	2003-10-02 01:22:42.000000000 -0500
+@@ -24,1108 +24,607 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>        /* strerror(); ?!?  */
++#include <limits.h>
+ #include <errno.h>
+ #include <unistd.h>        /* select(); */
+ #include <signal.h>        /* SIGPIPE */
+ #include <time.h>          /* time() */
+-#include <sys/param.h>
+ #include <sys/fcntl.h>     /* O_RDONLY */
+ #include <sys/wait.h>      /* wait()   */
+-#include <sys/stat.h>      /* mkdir()  */
+ #include <sys/time.h>      /* timeval */
+-#include <sys/types.h>     /* socket() */
+-#include <sys/socket.h>    /* socket() */
+-#include <sys/un.h>        /* struct sockaddr_un */
+-
+-#include <linux/vt.h>      /* VT_GETSTATE */
+-#include <sys/kd.h>        /* KDGETMODE */
+-#include <termios.h>       /* winsize */
+ 
+ #include "headers/gpmInt.h"
+ #include "headers/message.h"
+-
+-/* who the f*** runs gpm without glibc? doesn't have dietlibc __socklent_t? */
+-#if !defined(__GLIBC__)
+-   typedef unsigned int __socklen_t;
+-#endif    /* __GLIBC__ */
++#include "headers/console.h"
++#include "headers/selection.h"
++#include "headers/client.h"
+ 
+ #ifndef max
+ #define max(a,b) ((a)>(b) ? (a) : (b))
+ #endif
+ 
+-extern int errno;
+-
+-static void gpm_killed(int);
+-
+-/*
+- * all the values duplicated for dual-mouse operation are
+- * now in this structure (see gpmInt.h)
+- * mouse_table[0] is single mouse, mouse_table[1] and mouse_table[2]
+- * are copied data from mouse_table[0] for dual mouse operation.
+- */
+-
+-struct mouse_features mouse_table[3] = {
+-   {
+-      DEF_TYPE, DEF_DEV, DEF_SEQUENCE,
+-      DEF_BAUD, DEF_SAMPLE, DEF_DELTA, DEF_ACCEL, DEF_SCALE, 0 /* scaley */,
+-      DEF_TIME, DEF_CLUSTER, DEF_THREE, DEF_GLIDEPOINT_TAP,
+-      (char *)NULL /* extra */,
+-      (Gpm_Type *)NULL,
+-      -1
+-   }
+-};
+-struct mouse_features *which_mouse;
+-
+-/* These are only the 'global' options */
+-
+-char *opt_lut=DEF_LUT;
+-int opt_test=DEF_TEST;
+-int opt_ptrdrag=DEF_PTRDRAG;
+-int opt_double=0;
+-int opt_aged = 0;
+-char *opt_special=NULL; /* special commands, like reboot or such */
+-int opt_rawrep=0;
+-Gpm_Type *repeated_type=0;
+-
+-static int opt_resize=0; /* not really an option */
+-struct winsize win;
+-int maxx, maxy;
+-int fifofd=-1;
+-
+-int eventFlag=0;
+-Gpm_Cinfo *cinfo[MAX_VC+1];
+-fd_set selSet, readySet, connSet;
+-
+-time_t last_selection_time;
+-time_t opt_age_limit = 0;
+-
+-/* BRAINDEAD..ok not really, but got to leave anyway... FIXME */
+-/* argc and argv for mice initialization */
+-static int mouse_argc[3]; /* 0 for default (unused) and two mice */
+-static char **mouse_argv[3]; /* 0 for default (unused) and two mice */
+-
+-/*===================================================================*/
+-/*
+- *      first, all the stuff that used to be in gpn.c (i.e., not main-loop)
+- */
+-/*-------------------------------------------------------------------*/
++#ifndef min
++#define min(a,b) ((a)<(b) ? (a) : (b))
++#endif
+ 
+-/* build_argv is used for mouse initialization routines */
+-static char **build_argv(char *argv0, char *str, int *argcptr, char sep)
+-{
+-   int argc = 1;
+-   char **argv;
+-   char *s;
+-
+-   /* argv0 is never NULL, but the extra string may well be */
+-   if (str)
+-      for (s=str; sep && (s = strchr(s, sep)); argc++) s++;
+-   
+-   argv = calloc(argc+2, sizeof(char **));
+-   if (!argv) gpm_report(GPM_PR_OOPS,GPM_MESS_ALLOC_FAILED);
+-   argv[0] = argv0;
+-
+-   if (!str) {
+-      *argcptr = argc; /* 1 */
+-      return argv;
+-   }
+-   /* else, add arguments */
+-   s = argv[1] = strdup(str);
+-   argc = 2; /* first to fill */
+-
+-   /* ok, now split: the first one is in place, and s is the whole string */
+-   for ( ; sep && (s = strchr(s, sep)) ; argc++) {
+-      *s = '\0';
+-      s++;
+-      argv[argc] = s;
+-   }
+-   *argcptr = argc;
+-   return argv;
+-}
++#define NULL_SET ((fd_set *)NULL)
++#define GET_TIME(tv) (gettimeofday(&tv, (struct timezone *)NULL))
++#define DIF_TIME(t1,t2) ((t2.tv_sec - t1.tv_sec)*1000 + (t2.tv_usec - t1.tv_usec)/1000)
+ 
+-/*-------------------------------------------------------------------*/
+-/* The old console option is removed. We are taking stderr now
+- * In the next update there should also be support for syslog
+- ********************************************************************/
+ 
+-static inline int open_console(const int mode)
+-{
+-   int fd;
++enum mouse_rslt { MOUSE_NO_DATA, MOUSE_DATA_OK, MOUSE_MORE_DATA };
+ 
+-   if ((fd=open(option.consolename, mode)) < 0)
+-      gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN_CON);
+-   return fd;
+-}
++extern int errno;
+ 
+-/*-------------------------------------------------------------------*/
+-static inline int wait_text(int *fdptr)
+-{
+-   int fd;
+-   int kd_mode;
++char *opt_special=NULL; /* special commands, like reboot or such */
++struct repeater repeater;
+ 
+-   close(*fdptr);
+-   do
+-   {
+-      sleep(2);
+-      fd = open_console(O_RDONLY);
+-      if (ioctl(fd, KDGETMODE, &kd_mode)<0)
+-         gpm_report(GPM_PR_OOPS,GPM_MESS_IOCTL_KDGETMODE);
+-      close(fd);
+-   }
+-   while (kd_mode != KD_TEXT) ;
+-
+-   /* reopen, reinit (the function is only used if we have one mouse device) */
+-   if ((*fdptr=open(opt_dev,O_RDWR))<0)
+-      gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN,opt_dev);
+-   if (m_type->init)
+-      m_type=(m_type->init)(*fdptr, m_type->flags, m_type, mouse_argc[1],
+-              mouse_argv[1]);
+-   return (1);
+-}
++static int console_resized; /* not really an option */
+ 
+ /*-------------------------------------------------------------------*/
+-static inline void selection_copy(int x1, int y1, int x2, int y2, int mode)
++static void gpm_killed(int signo)
+ {
+-/*
+- * The approach in "selection" causes a bus error when run under SunOS 4.1
+- * due to alignment problems...
+- */
+-   unsigned char buf[6*sizeof(short)];
+-   unsigned short *arg = (unsigned short *)buf + 1;
+-   int fd;
+-
+-   buf[sizeof(short)-1] = 2;  /* set selection */
+-
+-   arg[0]=(unsigned short)x1;
+-   arg[1]=(unsigned short)y1;
+-   arg[2]=(unsigned short)x2;
+-   arg[3]=(unsigned short)y2;
+-   arg[4]=(unsigned short)mode;
+-
+-   if ((fd=open_console(O_WRONLY))<0)
+-      gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN_CON);
+-   /* FIXME: should be replaced with string constant (headers/message.h) */
+-   gpm_report(GPM_PR_DEBUG,"ctl %i, mode %i",(int)*buf, arg[4]);
+-   if (ioctl(fd, TIOCLINUX, buf+sizeof(short)-1) < 0)
+-     gpm_report(GPM_PR_OOPS,GPM_MESS_IOCTL_TIOCLINUX);
+-   close(fd);
+-
+-   if (mode < 3) {
+-      opt_aged = 0;
+-      last_selection_time = time(0);
++   if (signo == SIGWINCH) {
++      gpm_report(GPM_PR_WARN, GPM_MESS_RESIZING, option.progname, getpid());
++      console_resized = 1;
++   } else {
++      if (signo == SIGUSR1) 
++         gpm_report(GPM_PR_WARN, GPM_MESS_KILLED_BY, option.progname, getpid(), option.progname);
++      exit(0);
+    }
+ }
+ 
+-
+-/*-------------------------------------------------------------------*/
+-/* comment missing; FIXME */
+-/*-------------------------------------------------------------------*/
+-static inline void selection_paste(void)
+-{
+-   char c=3;
+-   int fd;
+-
+-   if (!opt_aged && (0 != opt_age_limit) &&
+-      (last_selection_time + opt_age_limit < time(0))) {
+-      opt_aged = 1;
+-   }
+-
+-   if (opt_aged) {
+-      gpm_report(GPM_PR_DEBUG,GPM_MESS_SKIP_PASTE);
+-      return;
+-   } 
+-
+-   fd=open_console(O_WRONLY);
+-   if(ioctl(fd, TIOCLINUX, &c) < 0)
+-      gpm_report(GPM_PR_OOPS,GPM_MESS_IOCTL_TIOCLINUX);
+-   close(fd);
+-}
+-
+-/*-------------------------------------------------------------------*/
+-static  inline int do_selection(Gpm_Event *event)  /* returns 0, always */
+-{
+-   static int x1=1, y1=1, x2, y2;
+-#define UNPOINTER() 0
+-
+-   x2=event->x; y2=event->y;
+-   switch(GPM_BARE_EVENTS(event->type)) {
+-      case GPM_MOVE:
+-         if (x2<1) x2++; else if (x2>maxx) x2--;
+-         if (y2<1) y2++; else if (y2>maxy) y2--;
+-         selection_copy(x2,y2,x2,y2,3); /* just highlight pointer */
+-         return 0;
+-
+-      case GPM_DRAG:
+-         if (event->buttons==GPM_B_LEFT) {
+-            if (event->margin) /* fix margins */
+-               switch(event->margin) {
+-                  case GPM_TOP: x2=1; y2++; break;
+-                  case GPM_BOT: x2=maxx; y2--; break;
+-                  case GPM_RGT: x2--; break;
+-                  case GPM_LFT: y2<=y1 ? x2++ : (x2=maxx, y2--); break;
+-               }
+-            selection_copy(x1,y1,x2,y2,event->clicks);
+-            if (event->clicks>=opt_ptrdrag && !event->margin) /* pointer */
+-               selection_copy(x2,y2,x2,y2,3);
+-         } /* if */
+-         return 0;
+-
+-      case GPM_DOWN:
+-         switch (event->buttons) {
+-            case GPM_B_LEFT:
+-               x1=x2; y1=y2;
+-               selection_copy(x1,y1,x2,y2,event->clicks); /* start selection */
+-               return 0;
+-
+-            case GPM_B_MIDDLE:
+-               selection_paste();
+-               return 0;
+-
+-            case GPM_B_RIGHT:
+-               if (opt_three==1)
+-                  selection_copy(x1,y1,x2,y2,event->clicks);
+-               else
+-                  selection_paste();
+-               return 0;
+-         }
+-   } /* switch above */
+-   return 0;
+-}
+-
+-/*-------------------------------------------------------------------*/
+-/* returns 0 if the event has not been processed, and 1 if it has */
+-static inline int do_client(Gpm_Cinfo *cinfo, Gpm_Event *event)
+-{
+-   Gpm_Connect info=cinfo->data;
+-   int fd=cinfo->fd;
+-   /* value to return if event is not used */
+-   int res = !(info.defaultMask & event->type);
+-
+-   /* instead of returning 0, scan the stack of clients */
+-   if ((info.minMod & event->modifiers) < info.minMod)
+-      goto scan;
+-   if ((info.maxMod & event->modifiers) < event->modifiers) 
+-      goto scan;
+-
+-   /* if not managed, use default mask */
+-   if (!(info.eventMask & GPM_BARE_EVENTS(event->type))) {
+-      if (res) return res;
+-      else goto scan;
+-   }   
+-
+-   /* WARNING */ /* This can generate a SIGPIPE... I'd better catch it */
+-   MAGIC_P((write(fd,&magic, sizeof(int))));
+-   write(fd,event, sizeof(Gpm_Event));
+-
+-   return info.defaultMask & GPM_HARD ? res : 1; /* HARD forces pass-on */
+-
+-   scan:
+-   if (cinfo->next != 0) 
+-      return do_client (cinfo->next, event); /* try the next */
+-   return 0; /* no next, not used */
+-}
+-
+ /*-------------------------------------------------------------------
+  * fetch the actual device data from the mouse device, dependent on
+  * what Gpm_Type is being passed.
+  *-------------------------------------------------------------------*/
+-static inline char *getMouseData(int fd, Gpm_Type *type, int kd_mode)
++static char *getMouseData(int fd, Gpm_Type *type, int text_mode)
+ {
+    static unsigned char data[32]; /* quite a big margin :) */
+-   char *edata=data+type->packetlen;
+-   int howmany=type->howmany;
+-   int i,j;
++   unsigned char *pdata;
++   int len, togo;
+ 
+-/*....................................... read and identify one byte */
+-
+-   if (read(fd, data, howmany)!=howmany) {
+-      if (opt_test) exit(0);
++   /*....................................... read and identify one byte */
++   if (read(fd, data, type->howmany) != type->howmany) {
+       gpm_report(GPM_PR_ERR,GPM_MESS_READ_FIRST, strerror(errno));
+       return NULL;
+    }
+ 
+-   if (kd_mode!=KD_TEXT && fifofd != -1 && opt_rawrep)
+-      write(fifofd, data, howmany);
++   if (!text_mode && repeater.fd != -1 && repeater.raw)
++      write(repeater.fd, data, type->howmany);
+ 
+-   if ((data[0]&(m_type->proto)[0]) != (m_type->proto)[1]) {
+-      if (m_type->getextra == 1) {
+-         data[1]=GPM_EXTRA_MAGIC_1; data[2]=GPM_EXTRA_MAGIC_2;
+-         gpm_report(GPM_PR_DEBUG,GPM_EXTRA_DATA,data[0]);
++   if ((data[0] & type->proto[0]) != type->proto[1]) {
++      if (type->getextra == 1) {
++         data[1] = GPM_EXTRA_MAGIC_1; data[2] = GPM_EXTRA_MAGIC_2;
++         gpm_report(GPM_PR_DEBUG, GPM_EXTRA_DATA, data[0]);
+          return data;
+       }
+-      gpm_report(GPM_PR_DEBUG,GPM_MESS_PROT_ERR);
++      gpm_report(GPM_PR_DEBUG, GPM_MESS_PROT_ERR);
+       return NULL;
+    }
+ 
+-/*....................................... read the rest */
++   /*....................................... read the rest */
+ 
+    /*
+     * well, this seems to work almost right with ps2 mice. However, I've never
+     * tried ps2 with the original selection package, which called usleep()
+     */
+-     
+-   if((i=m_type->packetlen-howmany)) /* still to get */
++   if ((togo = type->packetlen - type->howmany)) { /* still to get */
++      pdata = &data[type->howmany];
+       do {
+-         j = read(fd,edata-i,i); /* edata is pointer just after data */
+-         if (kd_mode!=KD_TEXT && fifofd != -1 && opt_rawrep && j > 0)
+-            write(fifofd, edata-i, j);
+-         i -= j;
+-      } while (i && j);
+-
+-   if (i) {
+-      gpm_report(GPM_PR_ERR,GPM_MESS_READ_REST, strerror(errno));
++         if ((len = read(fd, pdata, togo)) == 0)
++            break; 
++         if (!text_mode && repeater.fd != -1 && repeater.raw && len > 0)
++            write(repeater.fd, pdata, len);
++         pdata += len;
++         togo -= len;
++      } while (togo);
++   }
++   
++   if (togo) {
++      gpm_report(GPM_PR_ERR, GPM_MESS_READ_REST, strerror(errno));
+       return NULL;
+    }
+      
+-   if ((data[1]&(m_type->proto)[2]) != (m_type->proto)[3]) {
+-      gpm_report(GPM_PR_INFO,GPM_MESS_SKIP_DATA);
++   if ((data[1] & type->proto[2]) != type->proto[3]) {
++      gpm_report(GPM_PR_INFO, GPM_MESS_SKIP_DATA);
+       return NULL;
+    }
+-   gpm_report(GPM_PR_DEBUG,GPM_MESS_DATA_4,data[0],data[1],data[2],data[3]);
++   gpm_report(GPM_PR_DEBUG, GPM_MESS_DATA_4, data[0], data[1], data[2], data[3]);
+    return data;
+ }
+ 
+-
+-static int statusX,statusY,statusB; /* to return info */
+-static int statusC=0; /* clicks */
+-void get_console_size(Gpm_Event *ePtr);
+-
+-/*-------------------------------------------------------------------
+- * call getMouseData to get hardware device data, call mouse device's fun() 
+- * to retrieve the hardware independent event data, then optionally repeat
+- * the data via repeat_fun() to the repeater device
+- *-------------------------------------------------------------------*/
+-static inline int processMouse(int fd, Gpm_Event *event, Gpm_Type *type,
+-                int kd_mode)
++/*-------------------------------------------------------------------*/
++void handle_console_resize(Gpm_Event *event)
+ {
+-   char *data;
+-   static int fine_dx, fine_dy;
+-   static int i, j, m;
+-   static Gpm_Event nEvent;
+-   static struct vt_stat stat;
+-   static struct timeval tv1={0,0}, tv2; /* tv1==0: first click is single */
+-   static struct timeval timeout={0,0};
+-   fd_set fdSet;
+-   static int newB=0, oldB=0, oldT=0; /* old buttons and Type to chain events */
+-   /* static int buttonlock, buttonlockflag; */
+-
+-#define GET_TIME(tv) (gettimeofday(&tv, (struct timezone *)NULL))
+-#define DIF_TIME(t1,t2) ((t2.tv_sec -t1.tv_sec) *1000+ \
+-                          (t2.tv_usec-t1.tv_usec)/1000)
+-
+-
+-   oldT=event->type;
+-
+-   if (eventFlag) {
+-      eventFlag=0;
+-
+-      if (m_type->absolute) {     /* a pen or other absolute device */
+-         event->x=nEvent.x;
+-         event->y=nEvent.y;
+-      }
+-      event->dx=nEvent.dx;
+-      event->dy=nEvent.dy;
+-      event->buttons=nEvent.buttons;
+-   } else {
+-      event->dx=event->dy=0;
+-      event->wdx=event->wdy=0;
+-      nEvent.modifiers = 0; /* some mice set them */
+-      FD_ZERO(&fdSet); FD_SET(fd,&fdSet); i=0;
+-
+-      do { /* cluster loop */
+-         if(((data=getMouseData(fd,m_type,kd_mode))==NULL)
+-            || ((*(m_type->fun))(&nEvent,data)==-1) ) {
+-            if (!i) return 0;
+-            else break;
+-         }
+-
+-         event->modifiers = nEvent.modifiers; /* propagate modifiers */
+-
+-         /* propagate buttons */
+-         nEvent.buttons = (opt_sequence[nEvent.buttons&7]&7) |
+-            (nEvent.buttons & ~7); /* change the order */
+-         oldB=newB; newB=nEvent.buttons;
+-         if (!i) event->buttons=nEvent.buttons;
+-
+-         if (oldB!=newB) {
+-            eventFlag = (i!=0)*(which_mouse-mouse_table); /* 1 or 2 */
+-            break;
+-         }
+-
+-         /* propagate movement */
+-         if (!(m_type->absolute)) { /* mouse */
+-            if (abs(nEvent.dx)+abs(nEvent.dy) > opt_delta)
+-               nEvent.dx*=opt_accel, nEvent.dy*=opt_accel;
+-
+-            /* increment the reported dx,dy */
+-            event->dx+=nEvent.dx;
+-            event->dy+=nEvent.dy;
+-         } else { /* a pen */
+-            /* get dx,dy to check if there has been movement */
+-            event->dx = (nEvent.x) - (event->x);
+-            event->dy = (nEvent.y) - (event->y);
+-         }
+-
+-         /* propagate wheel */
+-         event->wdx += nEvent.wdx;
+-         event->wdy += nEvent.wdy;
+-
+-         select(fd+1,&fdSet,(fd_set *)NULL,(fd_set *)NULL,&timeout/* zero */);
+-
+-      } while (i++ <opt_cluster && nEvent.buttons==oldB && FD_ISSET(fd,&fdSet));
+-     
+-   } /* if(eventFlag) */
+-
+-/*....................................... update the button number */
++   int old_x, old_y;
++   struct micetab *mouse;
+ 
+-   if ((event->buttons&GPM_B_MIDDLE) && !opt_three) opt_three++;
++   old_x = console.max_x; old_y = console.max_y;
++   refresh_console_size();
++   if (!old_x) { /* first invocation, place the pointer in the middle */
++      event->x = console.max_x / 2;
++      event->y = console.max_y / 2;
++   } else { /* keep the pointer in the same position where it was */
++      event->x = event->x * console.max_x / old_x;
++      event->y = event->y * console.max_y / old_y;
++   } 
+ 
+-/*....................................... we're a repeater, aren't we? */
++   for (mouse = micelist; mouse; mouse = mouse->next) {
++      /*
++       * the following operation is based on the observation that 80x50
++       * has square cells. (An author-centric observation ;-)
++       */
++      mouse->options.scaley = mouse->options.scalex * 50 * console.max_x / 80 / console.max_y;
++      gpm_report(GPM_PR_DEBUG, GPM_MESS_X_Y_VAL, 
++                 mouse->options.scalex, mouse->options.scaley);
++   }
++}
+ 
+-   if (kd_mode!=KD_TEXT) {
+-      if (fifofd != -1 && ! opt_rawrep) {
+-         if (m_type->absolute) { /* hof Wed Feb  3 21:43:28 MET 1999 */ 
+-            /* prepare the values from a absolute device for repeater mode */
+-            static struct timeval rept1,rept2;
+-            gettimeofday(&rept2, (struct timezone *)NULL);
+-            if (((rept2.tv_sec -rept1.tv_sec)
+-                  *1000+(rept2.tv_usec-rept1.tv_usec)/1000)>250) {
+-               event->dx=0;
+-               event->dy=0;
+-            }
+-            rept1=rept2;
+-              
+-            event->dy=event->dy*((win.ws_col/win.ws_row)+1);
+-            event->x=nEvent.x; 
+-            event->y=nEvent.y;
+-         }
+-         repeated_type->repeat_fun(event, fifofd); /* itz Jan 11 1999 */
++static void handle_repeater(int absolute_dev, Gpm_Event *new_event, Gpm_Event *event)
++{
++   static struct timeval last; 
++   struct timeval now;
++ 
++   if (absolute_dev) {
++      /* prepare the values from a absolute device for repeater mode */
++      GET_TIME(now); 
++      if (((now.tv_sec - last.tv_sec) * 1000 + 
++               (now.tv_usec - last.tv_usec) / 1000) > 250) {
++         event->dx = 0;
++         event->dy = 0;
+       }
+-      return 0; /* no events nor information for clients */
+-   } /* first if of these three */
+-
+-/*....................................... no, we arent a repeater, go on */
++      last = now;
+ 
+-   /* use fine delta values now, if delta is the information */
+-   if (!(m_type)->absolute) {
+-      fine_dx+=event->dx;             fine_dy+=event->dy;
+-      event->dx=fine_dx/opt_scale;    event->dy=fine_dy/opt_scaley;
+-      fine_dx %= opt_scale;           fine_dy %= opt_scaley;
++      event->dy = event->dy * ((console.max_x / console.max_y) + 1);
++      event->x = new_event->x;
++      event->y = new_event->y;
+    }
++   repeater.type->repeat_fun(event, repeater.fd);
++}
+ 
+-   /* up and down, up and down, ... who does a do..while(0) loop ???
+-      and then makes a break into it... argh ! */
+-
+-   if (!event->dx && !event->dy && (event->buttons==oldB))
+-      do { /* so to break */
+-         static long awaketime;
+-         /*
+-          * Ret information also if never happens, but enough time has elapsed.
+-          * Note: return 1 will segfault due to missing event->vc; FIXME!
+-          */
+-         if (time(NULL)<=awaketime) return 0;
+-         awaketime=time(NULL)+1;
+-         break;
+-      } while (0);
+-
+-/*....................................... fill missing fields */
+-
+-   event->x+=event->dx, event->y+=event->dy;
+-   statusB=event->buttons;
+-
+-   i=open_console(O_RDONLY);
+-   /* modifiers */
+-   j = event->modifiers; /* save them */
+-   event->modifiers=6; /* code for the ioctl */
+-   if (ioctl(i,TIOCLINUX,&(event->modifiers))<0)
+-      gpm_report(GPM_PR_OOPS,GPM_MESS_GET_SHIFT_STATE);
+-   event->modifiers |= j; /* add mouse-specific bits */
+-
+-   /* status */
+-   j = stat.v_active;
+-   if (ioctl(i,VT_GETSTATE,&stat)<0) gpm_report(GPM_PR_OOPS,GPM_MESS_GET_CONSOLE_STAT);
+-
+-   /*
+-    * if we changed console, request the current console size,
+-    * as different consoles can be of different size
+-    */
+-   if (stat.v_active != j)
+-      get_console_size(event);
+-   close(i);
+-
+-   event->vc = stat.v_active;
+-
+-   if (oldB==event->buttons)
+-      event->type = (event->buttons ? GPM_DRAG : GPM_MOVE);
+-   else
+-      event->type = (event->buttons > oldB ? GPM_DOWN : GPM_UP);
+-
++static void calculate_clicks(Gpm_Event *event, int click_tmo)
++{
++   static struct timeval release;
++   struct timeval now;
++   
+    switch(event->type) {                /* now provide the cooked bits */
+       case GPM_DOWN:
+-         GET_TIME(tv2);
+-         if (tv1.tv_sec && (DIF_TIME(tv1,tv2)<opt_time)) /* check first click */
+-            statusC++, statusC%=3; /* 0, 1 or 2 */
++         GET_TIME(now);
++         if (release.tv_sec && (DIF_TIME(release, now) < click_tmo)) /* check first click */
++            event->clicks++, event->clicks %= 3; /* 0, 1 or 2 */
+          else
+-            statusC=0;
+-         event->type|=(GPM_SINGLE<<statusC);
++            event->clicks = 0;
++         event->type |= GPM_SINGLE << event->clicks;
+          break;
+ 
+       case GPM_UP:
+-         GET_TIME(tv1);
+-         event->buttons^=oldB; /* for button-up, tell which one */
+-         event->type|= (oldT&GPM_MFLAG);
+-         event->type|=(GPM_SINGLE<<statusC);
++         GET_TIME(release);
++         event->type |= GPM_SINGLE << event->clicks;
+          break;
+ 
+       case GPM_DRAG:
+-         event->type |= GPM_MFLAG;
+-         event->type|=(GPM_SINGLE<<statusC);
++         event->type |= GPM_SINGLE << event->clicks;
+          break;
+ 
+       case GPM_MOVE:
+-         statusC=0;
++         event->clicks = 0;
++
+       default:
+          break;
+    }
+-   event->clicks=statusC;
++}
++
++static void snap_to_screen_limits(Gpm_Event *event)
++{
++   int extent;
+    
+-/* UGLY - FIXME! */
+-/* The current policy is to force the following behaviour:
+- * - At buttons up, must fit inside the screen, though flags are set.
+- * - At button down, allow going outside by one single step
+- */
++   /* The current policy is to force the following behaviour:
++    * - At buttons up, must fit inside the screen, though flags are set.
++    * - At button down, allow going outside by one single step
++    * DTOR: Midnight Commander seems to want the opposite...
++    */
+ 
++   extent = (event->type & (GPM_DRAG|GPM_UP)) ? 1 : 0;
+ 
+    /* selection used 1-based coordinates, so do I */
+-
+    /*
+     * 1.05: only one margin is current. Y takes priority over X.
+-    * The i variable is how much margin is allowed. "m" is which one is there.
+     */
+ 
+-   m = 0;
+-   i = ((event->type&(GPM_DRAG|GPM_UP))!=0); /* i is boolean */
+-
+-   if (event->y>win.ws_row)  {event->y=win.ws_row+1-!i; i=0; m = GPM_BOT;}
+-   else if (event->y<=0)     {event->y=1-i;             i=0; m = GPM_TOP;}
+-
+-   if (event->x>win.ws_col)  {event->x=win.ws_col+1-!i; if (!m) m = GPM_RGT;}
+-   else if (event->x<=0)     {event->x=1-i;             if (!m) m = GPM_LFT;}
++   event->margin = 0;
+ 
+-   event->margin=m;
++   if (event->y > console.max_y) {
++      event->y = console.max_y + extent; 
++      extent = 0; 
++      event->margin = GPM_BOT;
++   } else if (event->y <= 0) {
++      event->y = 1 - extent;
++      extent = 0; 
++      event->margin = GPM_TOP;
++   }
+ 
+-   gpm_report(GPM_PR_DEBUG,"M: %3i %3i (%3i %3i) - butt=%i vc=%i cl=%i",
+-                                       event->dx,event->dy,
+-                                       event->x,event->y,
+-                                       event->buttons, event->vc,
+-                                       event->clicks);
++   if (event->x > console.max_x) {
++      event->x = console.max_x + extent; 
++      if (!event->margin) event->margin = GPM_RGT;
++   } else if (event->x <= 0) {
++      event->x = 1 - extent;
++      if (!event->margin) event->margin = GPM_LFT;
++   }
++}
+ 
+-   /* update the global state */
+-   statusX=event->x; statusY=event->y;
++static int more_data_waiting(int fd)
++{
++   static struct timeval timeout = {0, 0};
++   fd_set fdSet;
+ 
+-   if (opt_special && event->type & GPM_DOWN) 
+-      return processSpecial(event);
++   FD_ZERO(&fdSet);
++   FD_SET(fd, &fdSet);
++   select(fd + 1, &fdSet, NULL_SET, NULL_SET, &timeout/* zero */);
+ 
+-   return 1;
++   return FD_ISSET(fd, &fdSet);
+ }
+ 
+-/*-------------------------------------------------------------------*
+- * This  was inline, and incurred in a compiler bug (2.7.0)
+- *-------------------------------------------------------------------*/
+-static int get_data(Gpm_Connect *where, int whence)
++static int multiplex_buttons(struct micetab *mouse, int new_buttons)
+ {
+-   static int i;
++   static int left_btn_clicks, mid_btn_clicks, right_btn_clicks;
++   int mask;
++   int muxed_buttons = 0;
++  
++   new_buttons = 
++      (mouse->options.sequence[new_buttons & 7] & 7) | (new_buttons & ~7);
++   mask = new_buttons ^ mouse->buttons;
++   mouse->buttons = new_buttons;
+ 
+-#ifdef GPM_USE_MAGIC
+-   while ((i=read(whence,&check,sizeof(int)))==4 && check!=GPM_MAGIC)
+-      gpm_report(GPM_PR_INFO,GPM_MESS_NO_MAGIC);
+-
+-   if (!i) return 0;
+-   if (check!=GPM_MAGIC) {
+-     gpm_report(GPM_PR_INFO,GPM_MESS_NOTHING_MORE);
+-     return -1;
++   if (mask & GPM_B_LEFT) {
++      if (new_buttons & GPM_B_LEFT) left_btn_clicks++;
++      else left_btn_clicks--;   
+    }
+-#endif
++   if (left_btn_clicks) muxed_buttons |= GPM_B_LEFT;
+ 
+-   if ((i=read(whence, where, sizeof(Gpm_Connect)))!=sizeof(Gpm_Connect)) {
+-      return i ? -1 : 0;
++   if (mask & GPM_B_MIDDLE) {
++      if (new_buttons & GPM_B_MIDDLE) mid_btn_clicks++;
++      else mid_btn_clicks--;
+    }
++   if (mid_btn_clicks) muxed_buttons |= GPM_B_MIDDLE;
+ 
+-   return 1;
+-}
++   if (mask & GPM_B_RIGHT) {
++      if (new_buttons & GPM_B_RIGHT) right_btn_clicks++;
++      else right_btn_clicks--;
++   }
++   if (right_btn_clicks) muxed_buttons |= GPM_B_RIGHT;
+ 
+-static void disable_paste(int vc)
+-{
+-   opt_aged++;
+-   gpm_report(GPM_PR_INFO,GPM_MESS_DISABLE_PASTE,vc);
++   return muxed_buttons; 
+ }
+ 
+-/*-------------------------------------------------------------------*/
+-                                  /* returns -1 if closing connection */
+-static inline int processRequest(Gpm_Cinfo *ci, int vc) 
++/*-------------------------------------------------------------------
++ * call getMouseData to get hardware device data, call mouse device's fun() 
++ * to retrieve the hardware independent event data, then optionally repeat
++ * the data via repeat_fun() to the repeater device
++ *-------------------------------------------------------------------*/
++static enum mouse_rslt processMouse(struct micetab *mouse, int timeout, int attempt, 
++                                    Gpm_Event *event, int text_mode)
+ {
++   static int last_active;
++   static int fine_dx, fine_dy;
++   static int oldB; 
++
++   static Gpm_Event nEvent;
++   struct Gpm_Type *type = mouse->type;
++   struct miceopt *opt = &mouse->options;
++   enum mouse_rslt rslt = MOUSE_DATA_OK;
++   unsigned char shift_state;
++   char *data = NULL;
+    int i;
+-   Gpm_Cinfo *cinfoPtr, *next;
+-   Gpm_Connect conn;
+-   static Gpm_Event event;
+-   static struct vt_stat stat;
+-
+-   gpm_report(GPM_PR_INFO,GPM_MESS_CON_REQUEST, ci->fd, vc);
+-   if (vc>MAX_VC) return -1;
+-
+-   /* itz 10-22-96 this shouldn't happen now */
+-   if (vc==-1) gpm_report(GPM_PR_OOPS,GPM_MESS_UNKNOWN_FD);
+-
+-   i=get_data(&conn,ci->fd);
+-
+-   if (!i) { /* no data */
+-      gpm_report(GPM_PR_INFO,GPM_MESS_CLOSE);
+-      close(ci->fd);
+-      FD_CLR(ci->fd,&connSet);
+-      FD_CLR(ci->fd,&readySet);
+-      if (cinfo[vc]->fd == ci->fd) { /* it was on top of the stack */
+-         cinfoPtr = cinfo[vc];
+-         cinfo[vc]=cinfo[vc]->next; /* pop the stack */
+-         free(cinfoPtr);
+-         return -1;
+-      }
+-      /* somewhere inside the stack, have to walk it */
+-      cinfoPtr = cinfo[vc];
+-      while (cinfoPtr && cinfoPtr->next) {
+-         if (cinfoPtr->next->fd == ci->fd) {
+-            next = cinfoPtr->next;
+-            cinfoPtr->next = next->next;
+-            free (next);
++  
++   if (attempt > 1) {          /* continue interrupted cluster loop */
++      if (opt->absolute) {     
++         event->x = nEvent.x;
++         event->y = nEvent.y;
++      }
++      event->dx = nEvent.dx;
++      event->dy = nEvent.dy;
++      event->buttons = nEvent.buttons;
++   } else {
++      event->dx = event->dy = 0;
++      event->wdx = event->wdy = 0;
++      nEvent.modifiers = 0; /* some mice set them */
++      i = 0;
++
++      do { /* cluster loop */
++         if (!timeout && (data = getMouseData(mouse->dev.fd, type, text_mode)) != NULL) {
++            GET_TIME(mouse->timestamp);
++         }
++
++         /* in case of timeout data passed to typr->fun() is NULL */
++         if ((!timeout && data == NULL) || 
++             type->fun(&mouse->dev, &mouse->options, data, &nEvent) == -1) {
++            if (!i) return MOUSE_NO_DATA;
++            else break;
++         }
++         
++         event->modifiers = nEvent.modifiers; /* propagate modifiers */
++
++         /* propagate buttons */
++         nEvent.buttons = multiplex_buttons(mouse, nEvent.buttons);
++
++         if (!i) event->buttons = nEvent.buttons;
++
++         if (oldB != nEvent.buttons) {
++            rslt = MOUSE_MORE_DATA;
+             break;
+          }
+-         cinfoPtr = cinfoPtr->next;
+-      }
+-      return -1;
+-   } /* not data */
+- 
+-   if (i == -1) return -1; /* too few bytes */
+ 
+-   if (conn.pid!=0) {
+-      ci->data = conn;
+-      return 0;
+-   }
+-
+-   /* Aha, request for information (so-called snapshot) */
+-   switch(conn.vc) {
+-      case GPM_REQ_SNAPSHOT:
+-         i=open_console(O_RDONLY);
+-         ioctl(i,VT_GETSTATE,&stat);
+-         event.modifiers=6; /* code for the ioctl */
+-         if (ioctl(i,TIOCLINUX,&(event.modifiers))<0)
+-         gpm_report(GPM_PR_OOPS,GPM_MESS_GET_SHIFT_STATE);
+-         close(i);
+-         event.vc = stat.v_active;
+-         event.x=statusX;   event.y=statusY;
+-         event.dx=maxx;     event.dy=maxy;
+-         event.buttons= statusB;
+-         event.clicks=statusC;
+-         /* fall through */
+-         /* missing break or do you want this ??? */
+-
+-      case GPM_REQ_BUTTONS:
+-         event.type= (opt_three==1 ? 3 : 2); /* buttons */
+-         write(ci->fd,&event,sizeof(Gpm_Event));
+-         break;
++         /* propagate movement */
++         if (!opt->absolute) { /* mouse */
++            if (abs(nEvent.dx) + abs(nEvent.dy) > opt->delta)
++               nEvent.dx *= opt->accel, nEvent.dy *= opt->accel;
+ 
+-      case GPM_REQ_NOPASTE:
+-         disable_paste(vc);
+-         break;
++            /* increment the reported dx,dy */
++            event->dx += nEvent.dx;
++            event->dy += nEvent.dy;
++         } else { /* a pen */
++            /* get dx,dy to check if there has been movement */
++            event->dx = nEvent.x - event->x;
++            event->dy = nEvent.y - event->y;
++         }
++
++         /* propagate wheel */
++         event->wdx += nEvent.wdx;
++         event->wdy += nEvent.wdy;
++         
++      } while (i++ < opt->cluster && more_data_waiting(mouse->dev.fd));
++   } /* if(eventFlag) */
++
++   /*....................................... update the button number */
++
++   if ((event->buttons & GPM_B_MIDDLE) && !opt->three_button) opt->three_button++;
++
++   /*....................................... we're a repeater, aren't we? */
++
++   if (!text_mode) {
++      if (repeater.fd != -1 && !repeater.raw)
++         handle_repeater(opt->absolute, &nEvent, event);
++      oldB = nEvent.buttons;
++      return MOUSE_NO_DATA; /* no events nor information for clients */
+    }
+ 
+-   return 0;
+-}
++/*....................................... no, we arent a repeater, go on */
+ 
+-/*-------------------------------------------------------------------*/
+-static inline int processConn(int fd) /* returns newfd or -1 */
+-{
+-   Gpm_Cinfo *info;
+-   Gpm_Connect *request;
+-   Gpm_Cinfo *next;
+-   int vc, newfd;
+-#if !defined(__GLIBC__)
+-   int len;
+-#else /* __GLIBC__ */
+-   size_t len; /* isn't that generally defined in C ???  -- nico */
+-#endif /* __GLIBC__ */
+-   struct sockaddr_un addr; /* reuse this each time */
+-   struct stat statbuf;
+-   uid_t uid;
+-   char *tty = NULL;
+-
+-/*....................................... Accept */
+-
+-   bzero((char *)&addr,sizeof(addr));
+-   addr.sun_family=AF_UNIX;
+-
+-   len=sizeof(addr);
+-   if ((newfd=accept(fd,(struct sockaddr *)&addr, &len))<0) {
+-      gpm_report(GPM_PR_ERR,GPM_MESS_ACCEPT_FAILED,strerror(errno));
+-      return -1;
+-   }
+-
+-   gpm_report(GPM_PR_INFO,GPM_MESS_CONECT_AT,newfd);
+-
+-   info=malloc(sizeof(Gpm_Cinfo));
+-   if (!info) gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
+-   request=&(info->data);
+-
+-   if(get_data(request,newfd)==-1) {
+-      free(info);
+-      close(newfd);
+-      return -1;
+-   }
+-
+-   if ((vc=request->vc)>MAX_VC) {
+-      gpm_report(GPM_PR_WARN,GPM_MESS_REQUEST_ON, vc, MAX_VC);
+-      free(info);
+-      close(newfd);
+-      return -1;
+-   }
+-
+-#ifndef SO_PEERCRED
+-   if (stat (addr.sun_path, &statbuf) == -1 || !S_ISSOCK(statbuf.st_mode)) {
+-      gpm_report(GPM_PR_ERR,GPM_MESS_ADDRES_NSOCKET,addr.sun_path);
+-      free(info);         /* itz 10-12-95 verify client's right */
+-      close(newfd);
+-      return -1;         /* to read requested tty */
++   /* use fine delta values now, if delta is the information */
++   if (!opt->absolute) {
++      fine_dx += event->dx;
++      fine_dy += event->dy;
++      event->dx = fine_dx / opt->scalex;
++      event->dy = fine_dy / opt->scaley;
++      fine_dx %= opt->scalex;           
++      fine_dy %= opt->scaley;
+    }
+-   
+-   unlink(addr.sun_path);   /* delete socket */
+ 
+-   staletime = time(0) - 30;
+-   if (statbuf.st_atime < staletime
+-    || statbuf.st_ctime < staletime
+-    || statbuf.st_mtime < staletime) {
+-      gpm_report(GPM_PR_ERR,GPM_MESS_SOCKET_OLD);
+-      free (info);
+-      close(newfd);
+-      return -1;         /* socket is ancient */
++   /* up and down, up and down, ... who does a do..while(0) loop ???
++      and then makes a break into it... argh ! */
++
++   if (!event->dx && !event->dy && event->buttons == oldB) {
++      static time_t awaketime;
++      /*
++       * Ret information also if never happens, but enough time has elapsed.
++       * Note: return 1 will segfault due to missing event->vc; FIXME!
++       */
++      if (time(NULL) <= awaketime) return MOUSE_NO_DATA;
++      awaketime = time(NULL) + 1;
+    }
+    
+-   uid = statbuf.st_uid;      /* owner of socket */
+-#else
+-   {
+-      struct ucred sucred;
+-      socklen_t credlen = sizeof(struct ucred);
+-
+-      if(getsockopt(newfd, SOL_SOCKET, SO_PEERCRED, &sucred, &credlen) == -1) {
+-         gpm_report(GPM_PR_ERR,GPM_MESS_GETSOCKOPT, strerror(errno));
+-         free(info);
+-         close(newfd);
+-         return -1;
+-      }
+-      uid = sucred.uid;
+-      gpm_report(GPM_PR_DEBUG,GPM_MESS_PEER_SCK_UID, uid);
+-   }
+-#endif
+-   if (uid != 0) {
+-      if(( tty =
+-         malloc(strlen(option.consolename)+Gpm_cnt_digits(vc) + sizeof(char))) == NULL)
+-            gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
+-      
+-      strncpy(tty,option.consolename,strlen(option.consolename)-1);
+-      sprintf(&tty[strlen(option.consolename)-1],"%d",vc);
++   /*....................................... fill missing fields */
++   event->x += event->dx; event->y += event->dy;
+ 
+-      if(stat(tty, &statbuf) == -1) {
+-         gpm_report(GPM_PR_ERR,GPM_MESS_STAT_FAILS,tty);
+-         free(info);
+-         free(tty);
+-         close(newfd);
+-         return -1;
+-      }
+-      if (uid != statbuf.st_uid) {
+-         gpm_report(GPM_PR_WARN,GPM_MESS_FAILED_CONNECT, uid, tty); /*SUSPECT!*/
+-         free(info);
+-         free(tty);
+-         close(newfd);
+-         return -1;
++   event->vc = get_console_state(&shift_state);
++   if (event->vc != last_active) {
++      handle_console_resize(event);
++      last_active = event->vc;
++   }
++   event->modifiers |= shift_state;
++
++   if (oldB == event->buttons)
++      event->type = (event->buttons ? (GPM_DRAG | GPM_MFLAG) : GPM_MOVE);
++   else {
++      if (event->buttons > oldB)
++         event->type = GPM_DOWN;
++      else {
++         event->type &= GPM_MFLAG;
++         event->type |= GPM_UP;
++         event->buttons ^= oldB; /* for button-up, tell which one */
+       }
+-      free(tty); /* at least here it's not needed anymore */
+    }
++   calculate_clicks(event, opt->time);
++   snap_to_screen_limits(event);
++   
++   gpm_report(GPM_PR_DEBUG,"M: %3i %3i (%3i %3i) - butt=%i vc=%i cl=%i",
++                            event->dx, event->dy, event->x, event->y,
++                            event->buttons, event->vc, event->clicks);
+ 
+-   /* register the connection information in the right place */
+-   info->next=next=cinfo[vc];
+-   info->fd=newfd;
+-   cinfo[vc]=info;
+-   gpm_report(GPM_PR_DEBUG,GPM_MESS_LONG_STATUS,
+-        request->pid, request->vc, request->eventMask, request->defaultMask,
+-        request->minMod, request->maxMod);
+-
+-   /* if the client gets motions, give it the current position */
+-   if(request->eventMask & GPM_MOVE) {
+-      Gpm_Event event={0,0,vc,0,0,statusX,statusY,GPM_MOVE,0,0};
+-      do_client(info, &event);
+-   }
++   oldB = nEvent.buttons;
+ 
+-   return newfd;
++   if (opt_special && (event->type & GPM_DOWN) && !processSpecial(event))
++      rslt = MOUSE_NO_DATA;
++   
++   return rslt;
+ }
+ 
+-/*-------------------------------------------------------------------*/
+-void get_console_size(Gpm_Event *ePtr)
++static int wait_for_data(fd_set *connSet, int maxfd, fd_set *selSet)
+ {
+-   int i, prevmaxx, prevmaxy;
+-   struct mouse_features *which_mouse; /* local */
++   struct micetab *mouse;
++   struct timeval now, timeout = { 0, 0 };
++   int mouse_tmo, tmo = INT_MAX;
+ 
+-   /* before asking the new console size, save the previous values */
+-   prevmaxx = maxx; prevmaxy = maxy;
++   GET_TIME(now);
+ 
+-   i=open_console(O_RDONLY);
+-   ioctl(i, TIOCGWINSZ, &win);
+-   close(i);
+-   if (!win.ws_col || !win.ws_row) {
+-      gpm_report(GPM_PR_DEBUG,GPM_MESS_ZERO_SCREEN_DIM);
+-      win.ws_col=80; win.ws_row=25;
+-   }
+-   maxx=win.ws_col; maxy=win.ws_row;
+-   gpm_report(GPM_PR_DEBUG,GPM_MESS_SCREEN_SIZE,maxx,maxy);
+-
+-   if (!prevmaxx) { /* first invocation, place the pointer in the middle */
+-      statusX = ePtr->x = maxx/2;
+-      statusY = ePtr->y = maxy/2;
+-   } else { /* keep the pointer in the same position where it was */
+-      statusX = ePtr->x = ePtr->x * maxx / prevmaxx;
+-      statusY = ePtr->y = ePtr->y * maxy / prevmaxy;
+-   } 
+-
+-   for (i=1; i <= 1+opt_double; i++) {
+-      which_mouse=mouse_table+i; /* used to access options */
+-     /*
+-      * the following operation is based on the observation that 80x50
+-      * has square cells. (An author-centric observation ;-)
+-      */
+-     opt_scaley=opt_scale*50*maxx/80/maxy;
+-     gpm_report(GPM_PR_DEBUG,GPM_MESS_X_Y_VAL,opt_scale,opt_scaley);
++   *selSet = *connSet;
++   for (mouse = micelist; mouse; mouse = mouse->next) {
++      FD_SET(mouse->dev.fd, selSet);
++      maxfd = max(maxfd, mouse->dev.fd);
++      if (mouse->dev.timeout >= 0) {
++         mouse_tmo = mouse->dev.timeout - DIF_TIME(mouse->timestamp, now);
++         tmo = min(tmo, mouse_tmo);
++      }
+    }
++   
++   if (tmo == INT_MAX)
++      timeout.tv_sec = SELECT_TIME;
++   else if (tmo > 0) {
++      timeout.tv_sec = tmo / 1000;
++      timeout.tv_usec = (tmo % 1000) * 1000;
++   }
++   
++   return select(maxfd + 1, selSet, NULL_SET, NULL_SET, &timeout);
+ }
+ 
+-/*-------------------------------------------------------------------*/
+-static void gpm_killed(int signo)
+-{
+-   if(signo==SIGWINCH) {
+-      gpm_report(GPM_PR_WARN,GPM_MESS_RESIZING, option.progname, getpid());
+-      opt_resize++;
+-      return;
+-   }
+-   if (signo==SIGUSR1)
+-     gpm_report(GPM_PR_WARN,GPM_MESS_KILLED_BY,option.progname, getpid(),option.progname);
+-   exit(0);
+-}
++
+ 
+ /*-------------------------------------------------------------------*/
+ int old_main()
+ {
+-   int ctlfd, newfd;
+-   struct sockaddr_un ctladdr;
+-   int i, len, kd_mode, fd;
+-   struct timeval timeout;
+-   int maxfd=-1;
+-   int pending;
++   int ctlfd;
++   int i, text_mode;
++   struct timeval now;
++   int maxfd = -1;
++   int pending, attempt;
++   int timed_out;
+    Gpm_Event event;
++   struct micetab *mouse;
++   struct client_info *ci;
++   fd_set selSet, connSet;
++   enum mouse_rslt rslt;
+ 
+-   for (i = 1; i <= 1+opt_double; i++) {
+-      which_mouse=mouse_table+i; /* used to access options */
+-
+-      if (!opt_dev) gpm_report(GPM_PR_OOPS,GPM_MESS_NEED_MDEV);
+-
+-      if(!strcmp(opt_dev,"-")) fd=0; /* use stdin */
+-      else if( (fd=open(opt_dev,O_RDWR | O_NDELAY)) < 0)
+-         gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN,opt_dev); 
+-             
+-      /* and then reset the flag */
+-      fcntl(fd,F_SETFL,fcntl(fd,F_GETFL) & ~O_NDELAY);
+-
+-      /* create argc and argv for this device */
+-      mouse_argv[i] = build_argv(opt_type, opt_options, &mouse_argc[i], ',');
+-
+-      /* init the device, and use the return value as new mouse type */
+-      if (m_type->init)
+-         m_type=(m_type->init)(fd, m_type->flags, m_type, mouse_argc[i],
+-         mouse_argv[i]);
+-      if (!m_type) gpm_report(GPM_PR_OOPS,GPM_MESS_MOUSE_INIT);
+-
+-      which_mouse->fd=fd;
+-      maxfd=max(fd, maxfd);
+-   }
+-
+-/*....................................... catch interesting signals */
+-
++   /*....................................... catch interesting signals */
+    signal(SIGTERM, gpm_killed);
+    signal(SIGINT,  gpm_killed);
+    signal(SIGUSR1, gpm_killed); /* usr1 is used by a new gpm killing the old */
+    signal(SIGWINCH,gpm_killed); /* winch can be sent if console is resized */
++   signal(SIGPIPE, SIG_IGN);    /* WARN */
+ 
+-/*....................................... create your nodes */
+-
+-   /* control node */
+-
+-   if((ctlfd=socket(AF_UNIX,SOCK_STREAM,0))==-1) gpm_report(GPM_PR_OOPS,GPM_MESS_SOCKET_PROB);
+-   bzero((char *)&ctladdr,sizeof(ctladdr));
+-   ctladdr.sun_family=AF_UNIX;
+-   strcpy(ctladdr.sun_path,GPM_NODE_CTL);
+-   unlink(GPM_NODE_CTL);
+-
+-   len=sizeof(ctladdr.sun_family)+strlen(GPM_NODE_CTL);
+-   if(bind(ctlfd,(struct sockaddr *)(&ctladdr),len) == -1)
+-      gpm_report(GPM_PR_OOPS,GPM_MESS_BIND_PROB,ctladdr.sun_path);
+-   maxfd=max(maxfd,ctlfd);
+-
+-   /* needs to be 0777, so all users can _try_ to access gpm */
+-   chmod(GPM_NODE_CTL,0777);
+-
+-   get_console_size(&event); /* get screen dimensions */
+-
+-/*....................................... wait for mouse and connections */
+-
+-   listen(ctlfd, 5);          /* Queue up calls */
+-
+-#define NULL_SET ((fd_set *)NULL)
+-#define resetTimeout() (timeout.tv_sec=SELECT_TIME,timeout.tv_usec=0)
++   init_mice();
++   handle_console_resize(&event); /* get screen dimensions */
++   ctlfd = listen_for_clients();
+ 
++   /*....................................... wait for mouse and connections */
+    FD_ZERO(&connSet);
+-   FD_SET(ctlfd,&connSet);
+-
+-   if (opt_double) FD_SET(mouse_table[2].fd,&connSet);
+-
+-   readySet=connSet;
+-   FD_SET(mouse_table[1].fd,&readySet);
+-
+-   signal(SIGPIPE,SIG_IGN);  /* WARN */
+-
+-/*--------------------------------------- main loop begins here */
++   FD_SET(ctlfd, &connSet);
++   maxfd = max(maxfd, ctlfd);
++   
++   /*--------------------------------------- main loop begins here */
+ 
+-   while(1) {
+-      selSet=readySet;
+-      resetTimeout();
+-      if (opt_test) timeout.tv_sec=0;
++   while (1) {
+ 
+-      if (eventFlag) { /* an event left over by clustering */
+-         pending=1;
+-         FD_ZERO(&selSet);
+-         FD_SET(mouse_table[eventFlag].fd,&selSet);
+-      }
+-      else
+-         while((pending=select(maxfd+1,&selSet,NULL_SET,NULL_SET,&timeout))==0){
+-            selSet=readySet;
+-            resetTimeout();
+-         } /* go on */
+-
+-      if(opt_resize) { /* did the console resize? */
+-         get_console_size(&event);
+-         opt_resize--;
+-         signal(SIGWINCH,gpm_killed); /* reinstall handler */
+-
+-         /* and notify clients */
+-         for(i=0; i<MAX_VC+1; i++) {
+-            Gpm_Cinfo *ci;
+-            for (ci = cinfo[i]; ci; ci = ci->next) kill(ci->data.pid,SIGWINCH);
+-         }
++      pending = wait_for_data(&connSet, maxfd, &selSet);
++      
++      if (console_resized) { /* did the console resize? */
++         handle_console_resize(&event);
++         console_resized = 0;
++         signal(SIGWINCH, gpm_killed); /* reinstall handler */
++         notify_clients_resize();
+       }
+ 
+       if (pending < 0) {
+-         if (errno==EBADF) gpm_report(GPM_PR_OOPS,GPM_MESS_SELECT_PROB);
+-         gpm_report(GPM_PR_ERR,GPM_MESS_SELECT_STRING,strerror(errno));
+-         selSet=readySet;
+-         resetTimeout();
++         if (errno == EBADF) gpm_report(GPM_PR_OOPS,GPM_MESS_SELECT_PROB);
++         gpm_report(GPM_PR_ERR, GPM_MESS_SELECT_STRING, strerror(errno));
+          continue;
+       }
+ 
+-      gpm_report(GPM_PR_DEBUG,GPM_MESS_SELECT_TIMES,pending);
++      gpm_report(GPM_PR_DEBUG, GPM_MESS_SELECT_TIMES, pending);
+ 
+-/*....................................... manage graphic mode */
++      /*....................................... manage graphic mode */
+ 
+-     /* 
+-      * Be sure to be in text mode. This used to be before select,
+-      * but actually it only matters if you have events.
+-      */
+-      {
+-      int fd = open_console(O_RDONLY);
+-      if (ioctl(fd, KDGETMODE, &kd_mode) < 0)
+-         gpm_report(GPM_PR_OOPS,GPM_MESS_IOCTL_KDGETMODE);
+-      close(fd);
+-      if(kd_mode != KD_TEXT && !option.repeater) {
+-         wait_text(&mouse_table[1].fd);
+-         maxfd=max(maxfd,mouse_table[1].fd);
+-         readySet=connSet;
+-         FD_SET(mouse_table[1].fd,&readySet);
++      /* 
++       * Be sure to be in text mode. This used to be before select,
++       * but actually it only matters if you have events.
++       */
++      text_mode = is_text_console();
++      if (!text_mode && !repeater.type && !repeater.raw) {
++         /* if we don;t have repeater then there is only one mouse so
++          * we can safely use micelist
++          */
++         close(micelist->dev.fd);
++         wait_text_console();
++         /* reopen, reinit (the function is only used if we have one mouse device) */
++         if ((micelist->dev.fd = open(micelist->device, O_RDWR)) < 0)
++            gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN, micelist->device);
++         if (micelist->type->init)
++            micelist->type->init(&micelist->dev, &micelist->options, micelist->type); 
+          continue; /* reselect */
+       }
+-      }
+ 
+-/*....................................... got mouse, process event */
+-/*
+- * Well, actually, run a loop to maintain inlining of functions without
+- * lenghtening the file. This is not too clean a code, but it works....
+- */
+-
+-      for (i=1; i <= 1+opt_double; i++) {
+-         which_mouse=mouse_table+i; /* used to access options */
+-         if (FD_ISSET(which_mouse->fd,&selSet)) {
+-            FD_CLR(which_mouse->fd,&selSet); pending--;
+-            if (processMouse(which_mouse->fd, &event, m_type, kd_mode))
+-               /* pass it to the client, if any
+-                * or to the default handler, if any
+-                * or to the selection handler
+-                */ /* FIXME -- check event.vc */
+-               /* can't we please rewrite the following a bit nicer?*/
+-               (cinfo[event.vc] && do_client(cinfo[event.vc], &event))
+-               || (cinfo[0]        && do_client(cinfo[0],        &event))
+-               ||  do_selection(&event);
++      /*....................................... got mouse, process event */
++      /*
++       * Well, actually, run a loop to maintain inlining of functions without
++       * lenghtening the file. This is not too clean a code, but it works....
++       */
++      GET_TIME(now);
++      for (mouse = micelist; mouse; mouse = mouse->next) {
++         timed_out = mouse->dev.timeout >= 0 &&
++                     DIF_TIME(mouse->timestamp, now) >= mouse->dev.timeout;
++         if (timed_out || FD_ISSET(mouse->dev.fd, &selSet)) {
++            if (FD_ISSET(mouse->dev.fd, &selSet)) {
++               FD_CLR(mouse->dev.fd, &selSet); 
++               pending--;
+             }
++            attempt = 0;
++            do {
++               rslt = processMouse(mouse, timed_out, ++attempt, &event, text_mode);
++               if (rslt != MOUSE_NO_DATA) {
++                  /* pass it to the client or to the default handler,
++                   * or to the selection handler
++                   */
++                  if (event.vc > MAX_VC) event.vc = 0; 
++                  if (event.vc == 0 || !cinfo[event.vc] || !do_client(cinfo[event.vc], &event))
++                     if (!cinfo[0] || !do_client(cinfo[0], &event))
++                        do_selection(&event, mouse->options.three_button);
++               }
++            } while (rslt == MOUSE_MORE_DATA);
++         }
+       }
+ 
+       /*..................... got connection, process it */
+-
+-      if (pending && FD_ISSET(ctlfd,&selSet)) {
+-         FD_CLR(ctlfd,&selSet); pending--;
+-         newfd=processConn(ctlfd);
+-         if (newfd>=0) {
+-            FD_SET(newfd,&connSet);
+-            FD_SET(newfd,&readySet);
+-            maxfd=max(maxfd,newfd);
++      if (pending && FD_ISSET(ctlfd, &selSet)) {
++         FD_CLR(ctlfd, &selSet); 
++         pending--;
++         if ((ci = accept_client_connection(ctlfd))) {
++            if (ci->data.eventMask & GPM_MOVE) {
++               Gpm_Event e = { 0, 0, ci->data.vc, 0, 0, 
++                               event.x, event.y, GPM_MOVE, 0, 0 };
++               do_client(ci, &e);
++            }
++            FD_SET(ci->fd, &connSet);
++            maxfd = max(maxfd, ci->fd);
+          }
+       }
+ 
+       /*........................ got request */
+-
+-     /* itz 10-22-96 check _all_ clients, not just those on top! */
+-      for (i=0; pending && (i<=MAX_VC); i++) {
+-         Gpm_Cinfo* ci;
++      /* itz 10-22-96 check _all_ clients, not just those on top! */
++      for (i = 0; pending && i <= MAX_VC; i++) {
+          for (ci = cinfo[i]; pending && ci; ci = ci->next) {
+-            if (FD_ISSET(ci->fd,&selSet)) {
+-               FD_CLR(ci->fd,&selSet); pending--;
+-           /* itz Sat Sep 12 21:10:22 PDT 1998 */
+-           /* this code is clearly incorrect; the next highest
+-              descriptor after the one we're closing is not necessarily
+-              being used.  Fortunately, it doesn't hurt simply to leave this
+-              out. */
+-
+-#ifdef NOTDEF
+-               if ((processRequest(ci,i)==-1) && maxfd==ci->fd) maxfd--;
+-#else
+-               (void)processRequest(ci,i);
+-#endif
++            if (FD_ISSET(ci->fd, &selSet)) {
++               FD_CLR(ci->fd, &selSet); 
++               pending--;
++               if (!process_client_request(ci, i, event.x, event.y, event.clicks,
++                                           event.buttons, micelist->options.three_button)) {
++                  FD_CLR(ci->fd, &connSet);
++                  remove_client(ci, i);
++               }
+             }
+          }
+       }
+ 
+       /*.................. look for a spare fd */
+-
+       /* itz 10-22-96 this shouldn't happen now! */
+-      for (i=0; pending && i<=maxfd; i++) {
+-         if (FD_ISSET(i,&selSet)) {
+-            FD_CLR(i,&selSet);
++      for (i = 0; pending && i <= maxfd; i++) {
++         if (FD_ISSET(i, &selSet)) {
++            FD_CLR(i, &selSet);
+             pending--;
+-            gpm_report(GPM_PR_WARN,GPM_MESS_STRANGE_DATA,i);
++            gpm_report(GPM_PR_WARN, GPM_MESS_STRANGE_DATA,i);
+          }
+       }
+         
+       /*................... all done. */
+-     
+-     if(pending) gpm_report(GPM_PR_OOPS,GPM_MESS_SELECT_PROB);
++      if (pending) gpm_report(GPM_PR_OOPS, GPM_MESS_SELECT_PROB);
+    } /* while(1) */
+ }
+diff -urN gpm-1.20.1/src/gpn.c gpm/src/gpn.c
+--- gpm-1.20.1/src/gpn.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/gpn.c	2003-10-02 01:22:42.000000000 -0500
+@@ -28,201 +28,104 @@
+ #include <stdlib.h>
+ #include <string.h>        /* strerror(); ?!? memcpy() */
+ #include <ctype.h>         /* isdigit */
+-#include <signal.h>
+-#include <stdarg.h>        /* Log uses it */
+-#include <errno.h>
+ #include <unistd.h>        /* getopt(),symlink() */
+-#include <sys/stat.h>      /* mkdir()  */
+-#include <sys/param.h>
+-#include <sys/time.h>      /* timeval */
+-#include <sys/wait.h>      /* wait() */
+-#include <sys/types.h>     /* socket() */
+-#include <sys/socket.h>    /* socket() */
+-#include <sys/un.h>        /* struct sockaddr_un */
+-#include <asm/types.h>     /* __u32  */
+-
+-#ifdef	SIGTSTP		/* true if BSD system */
+-#include <sys/file.h>
+-#include <sys/ioctl.h>
+-#endif
+-
+-#ifndef HAVE___U32
+-# ifndef _I386_TYPES_H /* /usr/include/asm/types.h */
+-typedef unsigned int __u32;
+-# endif
+-#endif
+ 
+ #include "headers/message.h"
+ #include "headers/gpmInt.h"
+ #include "headers/gpm.h"
++#include "headers/console.h"
++#include "headers/selection.h"
+ 
+-extern int errno;
+-
+-/*===================================================================*/
+-/* octal digit */
+-static int isodigit(const unsigned char c)
++/* usage: display for usage informations */
++int usage(char *whofailed)
+ {
+-   return ((c & ~7) == '0');
++   if (whofailed) {
++      gpm_report(GPM_PR_ERR, GPM_MESS_SPEC_ERR, whofailed, option.progname);
++      return 1;
++   }
++   printf(GPM_MESS_USAGE, option.progname, DEF_ACCEL, DEF_BAUD, DEF_SEQUENCE,
++          DEF_DELTA, DEF_TIME, DEF_LUT, DEF_SCALE, DEF_SAMPLE, DEF_TYPE);
++   return 1;
+ }
+ 
+-/* routine to convert digits from octal notation (Andries Brouwer) */
+-static int getsym(const unsigned char *p0, unsigned char *res)
++/*****************************************************************************
++ * the function returns a valid type pointer or NULL if not found
++ *****************************************************************************/
++static struct Gpm_Type *find_mouse_by_name(char *name)
+ {
+-   const unsigned char *p = p0;
+-   char c;
++   Gpm_Type *type;
++   char *s;
++   int len = strlen(name);
+ 
+-   c = *p++;
+-   if (c == '\\' && *p) {
+-      c = *p++;
+-      if (isodigit(c)) {
+-         c -= '0';
+-         if (isodigit(*p)) c = 8*c + (*p++ - '0');
+-         if (isodigit(*p)) c = 8*c + (*p++ - '0');
++   for (type = mice; type->fun; type++) {
++      if (!strcasecmp(name, type->name)) break;
++      /* otherwise, look in the synonym list */
++      for (s = type->synonyms; s; s = strchr(s, ' ')) {
++         while (*s && isspace(*s)) s++; /* skip spaces */
++         if (!strncasecmp(name, s, len) && !isprint(*(s + len))) break;/*found*/
+       }
++   	if (s) break; /* found a synonym */
+    }
+-   *res = c;
+-   return (p - p0);
++   return type->fun ? type : NULL;
+ }
+ 
+-/* description missing! FIXME */
+-int loadlut(char *charset)
++static void init_button_sequence(struct miceopt *opt, char *arg)
+ {
+-   int i, c, fd;
+-   unsigned char this, next;
+-   static __u32 long_array[9]={
+-      0x05050505, /* ugly, but preserves alignment */
+-      0x00000000, /* control chars     */
+-      0x00000000, /* digits            */
+-      0x00000000, /* uppercase and '_' */
+-      0x00000000, /* lowercase         */
+-      0x00000000, /* Latin-1 control   */
+-      0x00000000, /* Latin-1 misc      */
+-      0x00000000, /* Latin-1 uppercase */
+-      0x00000000  /* Latin-1 lowercase */
++	int i;
++   static struct {
++      char *in;
++      char *out;
++   } seq[] = {
++      {"123", "01234567"},
++      {"132", "02134657"},
++      {"213", "01452367"}, /* warning: these must be readable as integers... */
++      {"231", "02461357"},
++      {"312", "04152637"},
++      {"321", "04261537"},
++      {NULL, NULL}
+    };
+ 
++	if (strlen(arg) != 3 || atoi(arg) < 100)
++		exit(usage("sequence"));
+ 
+-#define inwordLut (long_array+1)
+-
+-   for (i=0; charset[i]; ) {
+-      i += getsym(charset+i, &this);
+-      if (charset[i] == '-' && charset[i + 1] != '\0')
+-         i += getsym(charset+i+1, &next) + 1;
+-      else
+-         next = this;
+-      for (c = this; c <= next; c++)
+-         inwordLut[c>>5] |= 1 << (c&0x1F);
+-   }
+-  
+-   if ((fd=open(option.consolename, O_WRONLY)) < 0) {
+-      /* try /dev/console, if /dev/tty0 failed -- is that really senseful ??? */
+-      free(option.consolename); /* allocated by main */
+-      if((option.consolename=malloc(strlen(GPM_SYS_CONSOLE)+1)) == NULL)
+-         gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
+-      strcpy(option.consolename,GPM_SYS_CONSOLE);
+-     
+-      if ((fd=open(option.consolename, O_WRONLY)) < 0) gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN_CON);
+-   }
+-   if (ioctl(fd, TIOCLINUX, &long_array) < 0) { /* fd <0 is checked */
+-      if (errno==EPERM && getuid())
+-         gpm_report(GPM_PR_WARN,GPM_MESS_ROOT); /* why do we still continue?*/
+-      else if (errno==EINVAL)
+-         gpm_report(GPM_PR_OOPS,GPM_MESS_CSELECT);
+-   }
+-   close(fd);
+-
+-   return 0;
++	for (i = 0; seq[i].in && strcmp(seq[i].in, arg); i++);
++   if (!seq[i].in) 
++		exit(usage("button sequence"));
++   opt->sequence = strdup(seq[i].out); /* I can rewrite on it */
+ }
+ 
+-/* usage: display for usage informations */
+-int usage(char *whofailed)
++static void validate_mouse(struct micetab *mouse, int mouse_no)
+ {
+-   if (whofailed) {
+-      gpm_report(GPM_PR_ERR,GPM_MESS_SPEC_ERR,whofailed,option.progname);
+-      return 1;
+-   }
+-   printf(GPM_MESS_USAGE,option.progname, DEF_ACCEL, DEF_BAUD, DEF_SEQUENCE,
+-   DEF_DELTA, DEF_TIME, DEF_LUT,DEF_SCALE, DEF_SAMPLE, DEF_TYPE);
+-   return 1;
+-}
+-
+-/* itz Sat Sep 12 10:55:51 PDT 1998 Added this as replacement for the
+-   unwanted functionality in check_uniqueness. */
+-
+-void check_kill(void)
+-{
+-   int old_pid;
+-   FILE* fp = fopen(GPM_NODE_PID, "r");
+-
+-   /* if we cannot find the old pid file, leave */
+-   if (fp == NULL) gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN, GPM_NODE_PID);
+-  
+-   /* else read the pid */
+-   if (fscanf(fp,"%d",&old_pid) != 1)
+-      gpm_report(GPM_PR_OOPS,GPM_MESS_READ_PROB,GPM_NODE_PID);
+-   fclose(fp);
+-
+-   gpm_report(GPM_PR_DEBUG,GPM_MESS_KILLING,old_pid);
+-
+-   /* first check if we run */
+-   if (kill(old_pid,0) == -1) {
+-      gpm_report(GPM_PR_INFO,GPM_MESS_STALE_PID, GPM_NODE_PID);
+-      unlink(GPM_NODE_PID);
++   if (!mouse->device) {
++      if (!mouse->type && mouse_no > 1)
++         gpm_report(GPM_PR_OOPS, 
++            "No device/protocol specified for mouse #%d, probably extra -M option?", mouse_no);
++      else
++         gpm_report(GPM_PR_OOPS, "No device specified for mouse #%d", mouse_no); 
+    }
+-   /* then kill us (not directly, but the other instance ... ) */
+-   if (kill(old_pid,SIGTERM) == -1)
+-      gpm_report(GPM_PR_OOPS,GPM_MESS_CANT_KILL, old_pid);
+ 
+-   gpm_report(GPM_PR_INFO,GPM_MESS_KILLED,old_pid);
+-   exit(0);
+-}
++   if (!mouse->type)
++      mouse->type = find_mouse_by_name(DEF_TYPE);
+ 
+-/* itz Sat Sep 12 10:30:05 PDT 1998 this function used to mix two
+-   completely different things; opening a socket to a running daemon
+-   and checking that a running daemon existed.  Ugly. */
+-/* rewritten mostly on 20th of February 2002 - nico */   
+-void check_uniqueness(void)
+-{
+-   FILE *fp    =  0;
+-   int old_pid = -1;
++   mouse->options.absolute = mouse->type->absolute;
+ 
+-   if((fp = fopen(GPM_NODE_PID, "r")) != NULL) {
+-      fscanf(fp, "%d", &old_pid);
+-      if (kill(old_pid,0) == -1) {
+-         gpm_report(GPM_PR_INFO,GPM_MESS_STALE_PID, GPM_NODE_PID);
+-         unlink(GPM_NODE_PID);
+-      } else /* we are really running, exit asap! */ 
+-         gpm_report(GPM_PR_OOPS,GPM_MESS_ALREADY_RUN, old_pid);
+-   }
+-   /* now try to sign ourself */
+-   if ((fp = fopen(GPM_NODE_PID,"w")) != NULL) {
+-      fprintf(fp,"%d\n",getpid());
+-      fclose(fp);
+-   } else {
+-      gpm_report(GPM_PR_OOPS,GPM_MESS_NOTWRITE,GPM_NODE_PID);
+-   }
++   if (!mouse->options.sequence)
++      init_button_sequence(&mouse->options, DEF_SEQUENCE);
+ }
+ 
+-/*****************************************************************************
+- * the function returns a valid type pointer or NULL if not found
+- *****************************************************************************/
+-struct Gpm_Type *find_mouse_by_name(char *name)
++static void validate_repeater(char *type)
+ {
+-   Gpm_Type *type;
+-   char *s;
+-   int len = strlen(name);
+-
+-   for (type=mice; type->fun; type++) {
+-      if (!strcasecmp(name, type->name)) break;
+-      /* otherwise, look in the synonym list */
+-      for (s = type->synonyms; s; s = strchr(s, ' ')) {
+-         while (*s && isspace(*s)) s++; /* skip spaces */
+-         if(!strncasecmp(name, s, len) && !isprint(*(s + len))) break;/*found*/
+-      }
+-   	if(s) break; /* found a synonym */
++   if (strcmp(type, "raw") == 0)
++      repeater.raw = 1;
++   else {
++      repeater.raw = 0; 
++      
++      if (!(repeater.type = find_mouse_by_name(type)))
++         exit(M_listTypes()); /* not found */
++ 
++      if (!repeater.type->repeat_fun) /* unsupported translation */
++         gpm_report(GPM_PR_OOPS, GPM_MESS_NO_REPEAT, type);
+    }
+-   if (!type->fun) return NULL;
+-   return type;
+ }
+ 
+ /*****************************************************************************
+@@ -230,60 +133,86 @@
+  * Can't believe it, today cmdline() really does what the name tries to say
+  *****************************************************************************/
+ void cmdline(int argc, char **argv)
+-{
+-   extern struct options option;
++{  
++   struct micetab *mouse;
++   struct miceopt *opt;   
+    char options[]="a:A::b:B:d:Dg:hi:kl:m:Mo:pr:R::s:S:t:TuvV::23";
+-   int  opt;
++   int  opt_char, tmp;
++   int  mouse_no = 1;
++
++   mouse = add_mouse();
++   opt = &mouse->options;
+ 
+-   /* initialize for the dual mouse */ 
+-   mouse_table[2]=mouse_table[1]=mouse_table[0]; /* copy defaults */
+-   which_mouse=mouse_table+1; /* use the first */
+-
+-   while ((opt = getopt(argc, argv, options)) != -1) {
+-      switch (opt) {
+-         case 'a': opt_accel = atoi(optarg);             break;
+-         case 'A': opt_aged++;
+-                   if (optarg)
+-                     opt_age_limit = atoi(optarg);       break;
+-         case 'b': opt_baud = atoi(optarg);              break;
+-         case 'B': opt_sequence = optarg;                break;
+-         case 'd': opt_delta = atoi(optarg);             break;
+-         case 'D': option.run_status = GPM_RUN_DEBUG;    break;
+-         case 'g': opt_glidepoint_tap=atoi(optarg);      break;
+-         case 'h': exit(usage(NULL));
+-         case 'i': opt_time=atoi(optarg);                break;
+-         case 'k': check_kill();                         break;
+-         case 'l': opt_lut = optarg;                     break;
+-         case 'm': add_mouse(GPM_ADD_DEVICE,optarg);     
+-                   opt_dev = optarg;                     break; /* GO AWAY!*/
+-         case 'M': opt_double++; option.repeater++;
+-            if (option.repeater_type == 0)
+-               option.repeater_type = "msc";
+-            which_mouse=mouse_table+2;                   break;
+-         case 'o': add_mouse(GPM_ADD_OPTIONS,optarg);
+-                   gpm_report(GPM_PR_DEBUG,"options: %s",optarg);
+-                   opt_options = optarg;                 break; /* GO AWAY */
+-         case 'p': opt_ptrdrag = 0;                      break;
+-         case 'r':
+-            /* being called responsiveness, I must take the inverse */
+-            opt_scale=atoi(optarg);
+-            if(!opt_scale || opt_scale > 100) opt_scale=100; /* the maximum */
+-            else opt_scale=100/opt_scale;                break;
+-         case 'R':
+-            option.repeater++;
+-            if (optarg) option.repeater_type = optarg;
+-            else        option.repeater_type = "msc";    break;
+-         case 's': opt_sample = atoi(optarg);            break;
+-         case 'S': if (optarg) opt_special = optarg;
+-                   else opt_special="";                  break;
+-         case 't': add_mouse(GPM_ADD_TYPE,optarg);
+-                   opt_type = optarg;                    break; /* GO AWAY */
+-         case 'u': option.autodetect = 1;                break;
+-         case 'T': opt_test++;                           break;
+-         case 'v': printf(GPM_MESS_VERSION "\n");        exit(0);
+-         case '2': opt_three = -1;                       break;
+-         case '3': opt_three =  1;                       break;
+-         default: exit(usage("commandline"));
++   while ((opt_char = getopt(argc, argv, options)) != -1) {
++      switch (opt_char) {
++         case 'a':   if ((opt->accel = atoi(optarg)) < 1)
++                        exit(usage("acceleration"));
++                     break;
++         case 'A':   sel_opts.aged = 1;
++                     if (optarg)
++                        sel_opts.age_limit = atoi(optarg); 
++                     break;
++         case 'b':   opt->baud = atoi(optarg);
++                     break;
++         case 'B':   init_button_sequence(opt, optarg);
++                     break;
++         case 'd':   if ((opt->delta = atoi(optarg)) < 2)
++                        exit(usage("delta"));
++                     break;
++         case 'D':   option.run_status = GPM_RUN_DEBUG;
++                     break;
++         case 'g':   if (atoi(optarg) > 3)
++                        exit(usage("glidepoint tap button"));
++                     opt->glidepoint_tap = GPM_B_LEFT >> (atoi(optarg) - 1);
++                     break;
++         case 'h':   exit(usage(NULL));
++         case 'i':   opt->time = atoi(optarg);
++                     break;
++         case 'k':   kill_gpm();
++                     break;
++         case 'l':   console.charset = optarg;
++                     break;
++         case 'm':   mouse->device = optarg;     
++                     break;
++         case 'M':   validate_mouse(mouse, mouse_no);
++                     mouse = add_mouse();
++                     opt = &mouse->options;
++                     mouse_no++;
++                     if (!repeater.type && !repeater.raw)
++                        repeater.type = find_mouse_by_name(DEF_REP_TYPE);
++                     break;
++         case 'o':   gpm_report(GPM_PR_DEBUG,"options: %s", optarg);
++                     opt->text = optarg;
++                     break;
++         case 'p':   sel_opts.ptrdrag = 0;
++                     break;
++         case 'r':   /* being called responsiveness, I must take the inverse */
++                     tmp = atoi(optarg);
++                     if (!tmp || tmp > 100) tmp = 1;
++                     opt->scalex = 100 / tmp;
++                     break;
++         case 'R':   validate_repeater((optarg) ? optarg : DEF_REP_TYPE);
++                     break;
++         case 's':   opt->sample = atoi(optarg);
++                     break;
++         case 'S':   if (optarg) opt_special = optarg;
++                     else opt_special="";
++                     break;
++         case 't':   mouse->type = find_mouse_by_name(optarg);
++                     if (!mouse->type)
++                        exit(M_listTypes());
++                     break;
++         case 'u':   option.autodetect = 1;
++                     break;
++         case 'v':   printf(GPM_MESS_VERSION "\n");
++                     exit(0);
++         case '2':   opt->three_button = -1;
++                     break;
++         case '3':   opt->three_button = 1;
++                     break;
++         default:    exit(usage("commandline"));
+       }
+    }
++   
++   validate_mouse(micelist, mouse_no);
+ }
+diff -urN gpm-1.20.1/src/headers/client.h gpm/src/headers/client.h
+--- gpm-1.20.1/src/headers/client.h	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/headers/client.h	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,57 @@
++/* -*-mode:C;tab-width:3-*-
++ * client.h - GPM client handling (server side)
++ *
++ * Copyright (C) 2003  Dmitry Torokhov <dtor@mail.ru>
++ *
++ *   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.
++ ********/
++
++#ifndef __GPM_CLIENT_H
++#define __GPM_CLIENT_H_
++
++#ifdef HAVE_LINUX_TTY_H
++#include <linux/tty.h>
++#endif
++
++#include "headers/gpm.h"
++
++/* FIXME: still needed ?? */
++/* How many virtual consoles are managed? */
++#ifndef MAX_NR_CONSOLES
++#  define MAX_NR_CONSOLES 64 /* this is always sure */
++#endif
++
++#define MAX_VC    MAX_NR_CONSOLES  /* doesn't work before 1.3.77 */
++
++struct client_info {
++  Gpm_Connect data;
++  int fd;
++  struct client_info *next;
++};
++
++struct Gpm_Event;
++
++extern struct client_info *cinfo[MAX_VC + 1];
++
++int   listen_for_clients(void);
++struct client_info *accept_client_connection(int fd);
++void  remove_client(struct client_info *ci, int vc);
++void  notify_clients_resize(void);
++int   do_client(struct client_info *cinfo, struct Gpm_Event *event);
++int   process_client_request(struct client_info *ci, int vc,
++                             int x, int y, int buttons, int clicks,
++                             int three_button_mouse);
++
++#endif /* __GPM_CLIENT_H_ */
+diff -urN gpm-1.20.1/src/headers/console.h gpm/src/headers/console.h
+--- gpm-1.20.1/src/headers/console.h	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/headers/console.h	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,42 @@
++/* -*-mode:C;tab-width:3-*-
++ * console.h - GPM console and selection/paste handling
++ *
++ * Copyright (C) 2003  Dmitry Torokhov <dtor@mail.ru>
++ *
++ *   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.
++ ********/
++
++#ifndef __GPM_CONSOLE_H_
++#define __GPM_CONSOLE_H_
++
++struct gpm_console {
++   char  *device;
++   char  *charset;
++   int   max_x, max_y;
++};
++
++extern struct gpm_console console;
++
++int   open_console(int mode);
++char  *get_console_name();
++char  *compose_vc_name(int vc);
++int   is_text_console(void);
++void  wait_text_console(void);
++void  refresh_console_size(void);
++int   is_console_owner(int vc, uid_t uid);
++int   get_console_state(unsigned char *shift_state);
++void  console_load_lut(void);
++
++#endif /* __GPM_CONSOLE_H_ */
+diff -urN gpm-1.20.1/src/headers/gpmInt.h gpm/src/headers/gpmInt.h
+--- gpm-1.20.1/src/headers/gpmInt.h	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/headers/gpmInt.h	2003-10-02 01:22:42.000000000 -0500
+@@ -23,8 +23,7 @@
+ #ifndef _GPMINT_INCLUDED
+ #define _GPMINT_INCLUDED
+ 
+-#include <sys/types.h>          /* time_t */ /* for whom ????  FIXME */
+-
++#include <sys/time.h>   /* timeval */
+ #include "gpm.h"
+ 
+ #if !defined(__GNUC__)
+@@ -35,23 +34,12 @@
+ /* timeout for the select() syscall */
+ #define SELECT_TIME 86400 /* one day */
+ 
+-#ifdef HAVE_LINUX_TTY_H
+-#include <linux/tty.h>
+-#endif
+-
+-/* FIXME: still needed ?? */
+-/* How many virtual consoles are managed? */
+-#ifndef MAX_NR_CONSOLES
+-#  define MAX_NR_CONSOLES 64 /* this is always sure */
+-#endif
+-
+-#define MAX_VC    MAX_NR_CONSOLES  /* doesn't work before 1.3.77 */
+-
+ /* How many buttons may the mouse have? */
+ /* #define MAX_BUTTONS 3  ===> not used, it is hardwired :-( */
+ 
+ /* all the default values */
+ #define DEF_TYPE          "ms"
++#define DEF_REP_TYPE     "msc"
+ #define DEF_DEV           NULL     /* use the type-related one */
+ #define DEF_LUT   "-a-zA-Z0-9_./\300-\326\330-\366\370-\377"
+ #define DEF_SEQUENCE     "123"     /* how buttons are reordered */
+@@ -62,12 +50,10 @@
+ #define DEF_SCALE           10
+ #define DEF_TIME           250    /* time interval (ms) for multiple clicks */
+ #define DEF_THREE            0    /* have three buttons? */
+-#define DEF_KERNEL           0    /* no kernel module, by default */
+ 
+ /* 10 on old computers (<=386), 0 on current machines */
+ #define DEF_CLUSTER          0    /* maximum number of clustered events */
+ 
+-#define DEF_TEST             0
+ #define DEF_PTRDRAG          1    /* double or triple click */
+ #define DEF_GLIDEPOINT_TAP   0    /* tapping emulates no buttons by default */
+ 
+@@ -84,11 +70,6 @@
+ #define GPM_DEVFS_CONSOLE    "/dev/vc/0"
+ #define GPM_OLD_CONSOLE      "/dev/tty0"
+ 
+-/* for adding a mouse; add_mouse */
+-#define GPM_ADD_DEVICE        0
+-#define GPM_ADD_TYPE          1
+-#define GPM_ADD_OPTIONS       2
+-
+ /*** mouse commands ***/ 
+ 
+ #define GPM_AUX_SEND_ID    0xF2
+@@ -117,126 +98,95 @@
+ 
+ /*....................................... Structures */
+ 
++struct micedev {
++   int   fd;
++   int   timeout;             /* the protocol driver wants to be called 
++                                 after X msec even if there is no new data
++                                 arrived (-1 to disable/default) */
++   void  *private;            /* private data maintained by protocol driver */
++};
++
++struct miceopt {
++   char  *sequence;
++   int   baud;
++   int   sample;
++   int   delta;
++   int   accel;
++   int   scalex, scaley;
++   int   time;
++   int   cluster;
++   int   three_button;
++   int   glidepoint_tap;
++   int   absolute;         /* device reports absolute coordinates - initially copied 
++                              from Gpm_Type; allows same protocol (type) control devices
++                              in absolute and relative mode */  
++   char  *text;            /* extra textual options supplied via '-o text' */   
++};
++
+ /*
+  * and this is the entry in the mouse-type table
+  */
+ typedef struct Gpm_Type {
+-  char *name;
+-  char *desc;             /* a descriptive line */
+-  char *synonyms;         /* extra names (the XFree name etc) as a list */
+-  int (*fun)(Gpm_Event *state, unsigned char *data);
+-  struct Gpm_Type *(*init)(int fd, unsigned short flags,
+-			   struct Gpm_Type *type, int argc, char **argv);
+-  unsigned short flags;
+-  unsigned char proto[4];
+-  int packetlen;
+-  int howmany;            /* how many bytes to read at a time */
+-  int getextra;           /* does it get an extra byte? (only mouseman) */
+-  int absolute;           /* flag indicating absolute pointing device */
++   char *name;
++   char *desc;             /* a descriptive line */
++   char *synonyms;         /* extra names (the XFree name etc) as a list */
++   int (*fun)(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state);
++   int (*init)(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type);
++   unsigned short flags;
++   unsigned char proto[4];
++   int packetlen;
++   int howmany;            /* how many bytes to read at a time */
++   int getextra;           /* does it get an extra byte? (only mouseman) */
++   int absolute;           /* flag indicating absolute pointing device */
+ 
+-  int (*repeat_fun)(Gpm_Event *state, int fd); /* repeat this event into fd */
++   int (*repeat_fun)(Gpm_Event *state, int fd); /* repeat this event into fd */
+                           /* itz Mon Jan 11 23:27:54 PST 1999 */
+ }                   Gpm_Type;
+ 
+ #define GPM_EXTRA_MAGIC_1 0xAA
+ #define GPM_EXTRA_MAGIC_2 0x55
+ 
+-typedef struct Gpm_Cinfo {
+-  Gpm_Connect data;
+-  int fd;
+-  struct Gpm_Cinfo *next;
+-}              Gpm_Cinfo;
+-
+-
+-/*....................................... Global variables */
+-
+-/* this structure is used to hide the dual-mouse stuff */
+-
+-struct mouse_features {
+-  char *opt_type, *opt_dev, *opt_sequence;
+-  int opt_baud,opt_sample,opt_delta, opt_accel, opt_scale, opt_scaley;
+-  int opt_time, opt_cluster, opt_three, opt_glidepoint_tap;
+-  char *opt_options; /* extra textual configuration */
+-  Gpm_Type *m_type;
+-  int fd;
+-};
+-
+-extern struct mouse_features mouse_table[3], *which_mouse; /*the current one*/
+-
+-// looks unused; delete
+-//typedef struct Opt_struct_type {int a,B,d,i,p,r,V,A;} Opt_struct_type;
+-
+-/* this is not very clean, actually, but it works fine */
+-#define opt_type     (which_mouse->opt_type)
+-#define opt_dev      (which_mouse->opt_dev)
+-#define opt_sequence (which_mouse->opt_sequence)
+-#define opt_baud     (which_mouse->opt_baud)
+-#define opt_sample   (which_mouse->opt_sample)
+-#define opt_delta    (which_mouse->opt_delta)
+-#define opt_accel    (which_mouse->opt_accel)
+-#define opt_scale    (which_mouse->opt_scale)
+-#define opt_scaley   (which_mouse->opt_scaley)
+-#define opt_time     (which_mouse->opt_time)
+-#define opt_cluster  (which_mouse->opt_cluster)
+-#define opt_three    (which_mouse->opt_three)
+-#define opt_glidepoint_tap (which_mouse->opt_glidepoint_tap)
+-#define opt_options  (which_mouse->opt_options)
+-
+-#define m_type       (which_mouse->m_type)
+-
+-/* the other variables */
+-
+-extern char *opt_lut;
+-extern int opt_test, opt_ptrdrag;
+-extern int opt_kill;
+-extern int opt_kernel, opt_explicittype;
+-extern int opt_aged;
+-extern time_t opt_age_limit;
+ extern char *opt_special;
+-extern int opt_rawrep;
+-extern int fifofd;
+-extern int opt_double;
+-
+-extern Gpm_Type *repeated_type;
+ extern Gpm_Type mice[];             /* where the hell are the descriptions...*/
+-extern struct winsize win;
+-extern int maxx, maxy;
+-extern Gpm_Cinfo *cinfo[MAX_VC+1];
+ 
+ /* new variables <CLEAN> */
+ 
+ /* structure prototypes */
++struct repeater {
++   int      fd;
++   int      raw;
++   Gpm_Type *type;
++};
+ 
+ /* contains all mice */
+ struct micetab {
+    struct micetab *next;
+-   char *device;
+-   char *protocol;
+-   char *options;
++   struct micedev dev;
++   struct miceopt options;
++   Gpm_Type       *type;
++   char           *device;
++   int            buttons;    /* mouse's button state from last read */
++   struct timeval timestamp;  /* last time mouse data arrived */ 
+ };  
+ 
+ struct options {
+    int autodetect;            /* -u [aUtodetect..'A' is not available] */
+-   int no_mice;               /* number of mice */
+-   int repeater;              /* repeat data */
+-   char *repeater_type;       /* repeat data as which mouse type */
+    int run_status;            /* startup/daemon/debug */
+    char *progname;            /* hopefully gpm ;) */
+-   struct micetab *micelist;  /* mice and their options */
+-   char *consolename;         /* /dev/tty0 || /dev/vc/0 */
+ };
+ 
+ /* global variables */
+ struct options option;        /* one should be enough for us */
++extern struct repeater repeater; /* again, only one */
++extern struct micetab *micelist;
+ 
+ /* new variables </CLEAN> */
+ 
+-
+ /*....................................... Prototypes */
+          /* server_tools.c */
+-void add_mouse (int type, char *value);
+-int  init_mice (struct micetab *micelist);
+-int  reset_mice(struct micetab *micelist);
++struct micetab *add_mouse(void);
++void init_mice(void);
++void cleanup_mice(void);
+ 
+          /* startup.c */
+ void startup(int argc, char **argv);
+@@ -246,17 +196,15 @@
+ 
+        /* gpn.c */
+ void cmdline(int argc, char **argv);
+-int giveInfo(int request, int fd);
+-int loadlut(char *charset);
+-int usage(char *whofailed);
+-struct Gpm_Type *find_mouse_by_name(char *name);
++int  giveInfo(int request, int fd);
++int  usage(char *whofailed);
+ void check_uniqueness(void);
+-void check_kill(void);
+-
++void kill_gpm(void);
+ 
+        /* mice.c */
+ extern int M_listTypes(void);
+-       /* special.c */
++
++      /* special.c */
+ int processSpecial(Gpm_Event *event);
+ int twiddler_key(unsigned long message);
+ int twiddler_key_init(void);
+diff -urN gpm-1.20.1/src/headers/input-defines.h gpm/src/headers/input-defines.h
+--- gpm-1.20.1/src/headers/input-defines.h	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/headers/input-defines.h	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,81 @@
++/*
++ * input-defines.h - complements <linux/input.h> adding missing bits
++ *
++ * Copyright (C) 2003        Dmitry Torokhov <dtor@mail.ru>
++ *
++ *   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.
++ ********/
++#ifndef __GPM_INPUT_DEFINES_H
++#define __GPM_INPUT_DEFINES_H
++
++#include <linux/input.h>
++#include "headers/config.h"
++
++#ifndef ABS_TOOL_WIDTH  
++#define ABS_TOOL_WIDTH        0x1c
++#endif
++
++#ifndef BTN_TOOL_FINGER  
++#define BTN_TOOL_FINGER       0x145
++#endif
++
++#ifndef BTN_TOUCH  
++#define BTN_TOUCH             0x14a
++#endif
++
++#ifndef BTN_TOOL_DOUBLETAP  
++#define BTN_TOOL_DOUBLETAP    0x14d
++#endif
++
++#ifndef BTN_TOOL_TRIPLETAP  
++#define BTN_TOOL_TRIPLETAP    0x14e
++#endif
++
++#ifndef MSC_GESTURE
++#define MSC_GESTURE           2
++#endif
++
++#ifndef EV_SYNC     
++#define EV_SYNC               0
++#endif
++
++#ifndef SYN_REPORT 
++#define SYN_REPORT            0
++#endif
++
++#ifndef PSMOUSE_SYNAPTICS
++#define PSMOUSE_SYNAPTICS     7
++#endif
++
++#ifndef HAVE_INPUT_ID
++struct input_id {
++   unsigned short bustype;
++   unsigned short vendor;
++   unsigned short product;
++   unsigned short version;
++};
++#endif
++
++#ifndef HAVE_INPUT_ABSINFO
++struct input_absinfo {
++   int value;
++   int minimum;
++   int maximum;
++   int fuzz;
++   int flat;
++};
++#endif
++
++#endif
+diff -urN gpm-1.20.1/src/headers/message.h gpm/src/headers/message.h
+--- gpm-1.20.1/src/headers/message.h	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/headers/message.h	2003-10-02 01:22:42.000000000 -0500
+@@ -96,7 +96,6 @@
+          "    -S [commands]    enable special commands (see man page)\n" \
+          "    -t mouse-type    sets mouse type (default '%s')\n" \
+          "                     Use a non-existent type (e.g. \"help\") to get a list\n" \
+-         "    -T               test: read mouse, no clients\n" \
+          "    -v               print version and exit\n" \
+          "    -V verbosity     increase number of logged messages\n\n\n" \
+          "    Examples:\n\n" \
+@@ -168,7 +167,8 @@
+ #define GPM_MESS_SELECT_TIMES       "selected %i times"
+ 
+ #define GPM_MESS_OPTION_NO_ARG      "%s: Option \"%s\" takes no argument: ignoring \"%s\""
+-#define GPM_MESS_INVALID_ARG        "%s: Invalid arg. \"%s\" to \"%s\""
++#define GPM_MESS_INVALID_ARG        "%s: Invalid argument \"%s\" for option \"%s\""
++#define GPM_MESS_MISSING_ARG        "%s: Option \"%s\" requires an argument"
+ #define GPM_MESS_CONT_WITH_ERR      "%s: Continuing despite errors in option parsing"
+ #define GPM_MESS_TOO_MANY_OPTS      "%s: Too many options for \"-t %s\""
+ 
+@@ -196,7 +196,7 @@
+ 
+ /* warnings */
+ #define GPM_MESS_REQUEST_ON         "Request on vc %i > %i"
+-#define GPM_MESS_FAILED_CONNECT     "Failed gpm connect attempt by uid %d for vc %s"
++#define GPM_MESS_FAILED_CONNECT     "Failed gpm connect attempt by uid %d for vc %d"
+ #define GPM_MESS_ZERO_SCREEN_DIM    "zero screen dimension, assuming 80x25"
+ #define GPM_MESS_STRANGE_DATA       "Data on strange file descriptor %d"
+ #define GPM_MESS_RESIZING           "%s pid %i is resizing :-)"
+diff -urN gpm-1.20.1/src/headers/optparser.h gpm/src/headers/optparser.h
+--- gpm-1.20.1/src/headers/optparser.h	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/headers/optparser.h	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,50 @@
++/*
++ * optparser.h - GPM mouse options parser 
++ *
++ * Copyright (C) 1993        Andrew Haylett <ajh@gec-mrc.co.uk>
++ * Copyright (C) 1994-2000   Alessandro Rubini <rubini@linux.it>
++ * Copyright (C) 1998,1999   Ian Zimmerman <itz@rahul.net>
++ * Copyright (C) 2001,2002   Nico Schottelius <nicos@pcsystems.de>
++ * Copyright (C) 2003        Dmitry Torokhov <dtor@mail.ru>
++ *
++ *   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.
++ ********/
++#ifndef __GPM_OPTPARSER_H_
++#define __GPM_OPTPARSER_H_
++
++enum option_type {
++   OPT_BOOL = 1,
++   OPT_INT, /* "%i" */
++   OPT_DEC, /* "%d" */
++   OPT_STRING,
++   /* other types must be added */
++   OPT_END = 0
++};
++
++struct option_helper {
++   char *name;
++   enum option_type type;
++   union u {
++      int *iptr;   /* used for int and bool arguments */
++      char **sptr; /* used for string arguments, by strdup()ing the value */
++   } u;
++   int value; /* used for boolean arguments */
++   int present;
++};
++
++int   parse_options(const char *who, const char *opt, char sep, struct option_helper *info);
++int   check_no_options(const char *proto, const char *opts, char sep);
++int   is_option_present(struct option_helper *info, const char *name);
++#endif
+diff -urN gpm-1.20.1/src/headers/selection.h gpm/src/headers/selection.h
+--- gpm-1.20.1/src/headers/selection.h	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/headers/selection.h	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,37 @@
++/* 
++ * console.h - GPM selection/paste handling
++ *
++ * Copyright (C) 2003  Dmitry Torokhov <dtor@mail.ru>
++ *
++ *   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.
++ ********/
++
++#ifndef __GPM_SELECTION_H_
++#define __GPM_SELECTION_H_
++
++struct sel_options {
++   int      aged;
++   int      age_limit;
++   int      ptrdrag;
++};
++
++struct Gpm_Event;
++
++extern struct sel_options sel_opts; /* only one exists */
++
++void  do_selection(struct Gpm_Event *event, int three_button_mode);
++void  selection_disable_paste(void);
++
++#endif /* __GPM_CONSOLE_H_ */
+diff -urN gpm-1.20.1/src/headers/synaptics.h gpm/src/headers/synaptics.h
+--- gpm-1.20.1/src/headers/synaptics.h	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/headers/synaptics.h	2003-10-02 01:22:42.000000000 -0500
+@@ -62,7 +62,7 @@
+ **
+ ** Process the touchpad 6/7/8 byte data.
+ */
+-void syn_process_serial_data (Gpm_Event *state,
++void syn_process_serial_data (int fd, Gpm_Event *state,
+ 			      unsigned char *data);
+ 
+ 
+@@ -72,7 +72,7 @@
+ **
+ ** Process the touchpad 6 byte data.
+ */
+-void syn_process_ps2_data (Gpm_Event *state,
++void syn_process_ps2_data (int fd, Gpm_Event *state,
+ 			   unsigned char *data);
+ 
+ 
+diff -urN gpm-1.20.1/src/lib/liblow.c gpm/src/lib/liblow.c
+--- gpm-1.20.1/src/lib/liblow.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/lib/liblow.c	2003-10-02 01:22:42.000000000 -0500
+@@ -80,6 +80,8 @@
+ int gpm_consolefd=-1;  /* used to invoke ioctl() */
+ int gpm_morekeys=0;
+ 
++static char *consolename;
++ 
+ int gpm_convert_event(unsigned char *mdata, Gpm_Event *ePtr);
+ 
+ /*----------------------------------------------------------------------------*
+@@ -192,14 +194,13 @@
+    char *tty = NULL;
+    char *term = NULL;
+    int i;
+-   extern struct options option;
+    static int checked_con = 0;
+    struct sockaddr_un addr;
+    struct winsize win;
+    Gpm_Stst *new = NULL;
+    char* sock_name = 0;
+ 
+-   option.consolename = NULL;
++   consolename = NULL;
+ 
+    gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
+ 
+@@ -216,7 +217,7 @@
+ 
+    /* check whether we know what name the console is: what's with the lib??? */
+    if(checked_con == 0) {
+-      option.consolename = Gpm_get_console();
++      consolename = Gpm_get_console();
+       checked_con++;
+    }   
+ 
+@@ -245,10 +246,10 @@
+       conn->vc=0;                 /* default handler */
+       if (flag > 0) {  /* forced vc number */
+          conn->vc=flag;
+-         if((tty = malloc(strlen(option.consolename)+Gpm_cnt_digits(flag))) == NULL)
++         if((tty = malloc(strlen(consolename)+Gpm_cnt_digits(flag))) == NULL)
+             gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
+-         memcpy(tty,option.consolename,strlen(option.consolename)-1);
+-         sprintf(&tty[strlen(option.consolename)-1],"%i",flag);
++         memcpy(tty,consolename,strlen(consolename)-1);
++         sprintf(&tty[strlen(consolename)-1],"%i",flag);
+       } else { /* use your current vc */ 
+          if (isatty(0)) tty = ttyname(0);             /* stdin */
+          if (!tty && isatty(1)) tty = ttyname(1);     /* stdout */
+@@ -258,13 +259,13 @@
+             goto err;
+          }   
+          /* do we really need this check ? */
+-         if(strncmp(tty,option.consolename,strlen(option.consolename)-1)
+-            || !isdigit(tty[strlen(option.consolename)-1])) {
+-            gpm_report(GPM_PR_ERR,"strncmp/isdigit/option.consolename failed");
++         if(strncmp(tty,consolename,strlen(consolename)-1)
++            || !isdigit(tty[strlen(consolename)-1])) {
++            gpm_report(GPM_PR_ERR,"strncmp/isdigit/consolename failed");
+             goto err;
+          }
+           
+-         conn->vc=atoi(&tty[strlen(option.consolename)-1]);
++         conn->vc=atoi(&tty[strlen(consolename)-1]);
+       }
+ 
+       if (gpm_consolefd == -1)
+@@ -272,6 +273,8 @@
+             gpm_report(GPM_PR_ERR,GPM_MESS_DOUBLE_S,tty,strerror(errno));
+             goto err;
+          }
++
++      if (flag > 0) free(tty);
+    }
+ 
+    new->info=*conn;
+diff -urN gpm-1.20.1/src/lib/tools.c gpm/src/lib/tools.c
+--- gpm-1.20.1/src/lib/tools.c	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/lib/tools.c	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,93 @@
++/*
++ * tools.c - tools which are needed by client and server
++ *
++ * Copyright (c) 2001 	     Nico Schottelius <nico@schottelius.org>
++ *
++ *   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> /* NULL */
++#include <string.h>
++#include <stdlib.h>
++#include <sys/types.h>  /* these three are */
++#include <sys/stat.h>   /* needed for      */
++#include <unistd.h>     /* stat() */
++
++#include "headers/gpmInt.h"   /* only used for some defines */
++#include "headers/message.h"
++
++/*****************************************************************************
++ * check, whether devfs is used or not.
++ * See /usr/src/linux/Documentation/filesystems/devfs/ for details.
++ * Returns: the name of the console (/dev/tty0 or /dev/vc/0)
++ *****************************************************************************/
++char *Gpm_get_console( void )
++{
++
++   char *back = NULL, *tmp = NULL;
++   struct stat buf;
++
++   /* first try the devfs device, because in the next time this will be
++    * the preferred one. If that fails, take the old console */
++   
++   /* Check for open new console */
++   if (stat(GPM_DEVFS_CONSOLE,&buf) == 0)
++      tmp = GPM_DEVFS_CONSOLE;
++  
++   /* Failed, try OLD console */
++   else if(stat(GPM_OLD_CONSOLE,&buf) == 0)
++      tmp = GPM_OLD_CONSOLE;
++  
++   if(tmp != NULL)
++      if((back = malloc(strlen(tmp) + sizeof(char)) ) != NULL)
++         strcpy(back,tmp);
++
++   return(back);
++}
++
++/* what's the english name for potenz ? */
++int Gpm_x_high_y(int base, int pot_y)
++{
++   int val = 1;
++   
++   if(pot_y == 0) val = 1;
++   else if(pot_y  < 0) val = 0;     /* ugly hack ;) */
++   else while(pot_y > 0) {
++      val = val * base;
++      pot_y--;
++   }   
++   return val;
++}   
++      
++/* return characters needed to display int */
++int Gpm_cnt_digits(int number)
++{
++   /* 0-9 = 1        10^0 <-> (10^1)-1
++    * 10 - 99 = 2    10^1 <-> (10^2)-1
++    * 100 - 999 = 3  10^2 <-> (10^3)-1
++    * 1000 - 9999 = 4 ...  */
++   
++   int ret = 0, num = 0;
++
++   /* non negative, please */
++   if(number < 0) number *= -1;
++   else if(number == 0) ret = 1;
++   else while(number > num) {
++      ret++;
++      num = (Gpm_x_high_y(10,ret) - 1);
++   }   
++
++   return(ret);
++}      
+diff -urN gpm-1.20.1/src/Makefile.in gpm/src/Makefile.in
+--- gpm-1.20.1/src/Makefile.in	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/Makefile.in	2003-10-02 01:22:42.000000000 -0500
+@@ -12,15 +12,16 @@
+ include $(top_builddir)/Makefile.include
+ 
+ # Main portion: regular build rules
++MICESRC = mice.c twiddler.c synaptics.c @EVDEV_SRCS@
+ 
+-GSRC = main.c gpm.c gpn.c mice.c special.c twiddler.c synaptics.c \
+-       startup.c server_tools.c
++GSRC = main.c gpm.c gpn.c special.c startup.c server_tools.c console.c \
++       selection.c client.c optparser.c $(MICESRC)
+ 
+-GOBJ = $(GSRC:.c=.o) report.o tools.o
++GOBJ = $(GSRC:.c=.o) report.o
+ 
+-LSRC = lib/liblow.c lib/libhigh.c lib/libxtra.c lib/report-lib.c
++LSRC = lib/liblow.c lib/libhigh.c lib/libxtra.c lib/report-lib.c lib/tools.c
+ 
+-LOBJ = $(LSRC:.c=.o) tools.o @CURSES_OBJS@
++LOBJ = $(LSRC:.c=.o) @CURSES_OBJS@
+ 
+ PICS = $(LOBJ:.o=.lo)
+ 
+@@ -143,7 +144,7 @@
+ 	$(CC) -I. @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o $@.o $<
+ 	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $@.o @LIBS@ $(LIBS) lib/libgpm.a
+ 
+-prog/mouse-test:	mice.o twiddler.o synaptics.o
++prog/mouse-test:	$(MICESRC:.c=.o) console.o optparser.o
+ 
+ $(PROG):	lib/libgpm.so lib/@SHLIB@ lib/libgpm.a
+ 
+diff -urN gpm-1.20.1/src/mice.c gpm/src/mice.c
+--- gpm-1.20.1/src/mice.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/mice.c	2003-10-02 01:22:42.000000000 -0500
+@@ -46,15 +46,11 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <termios.h>
+-#include <fcntl.h>
+-#include <termios.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <ctype.h>
+ 
+-#include <sys/types.h>
+ #include <sys/stat.h> /* stat() */
+-#include <sys/time.h> /* select() */
+ 
+ #include <linux/kdev_t.h> /* MAJOR */
+ #include <linux/keyboard.h>
+@@ -72,135 +68,40 @@
+ 
+ 
+ #include "headers/gpmInt.h"
++#include "headers/console.h"
+ #include "headers/twiddler.h"
+ #include "headers/synaptics.h"
+ #include "headers/message.h"
+-
+-/*========================================================================*/
+-/* Parsing argv: helper dats struct function (should they get elsewhere?) */
+-/*========================================================================*/
+-
+-enum argv_type {
+-   ARGV_BOOL = 1,
+-   ARGV_INT, /* "%i" */
+-   ARGV_DEC, /* "%d" */
+-   ARGV_STRING,
+-   /* other types must be added */
+-   ARGV_END = 0
+-};
+-
+-typedef struct argv_helper {
+-   char *name;
+-   enum argv_type type;
+-   union u {
+-      int *iptr;   /* used for int and bool arguments */
+-      char **sptr; /* used for string arguments, by strdup()ing the value */
+-   } u;
+-   int value; /* used for boolean arguments */
+-} argv_helper;
+-
+-static int parse_argv(argv_helper *info, int argc, char **argv)
+-{
+-   int i, j = 0, errors = 0;
+-   long l;
+-   argv_helper *p;
+-   char *s, *t;
+-   int base = 0; /* for strtol */
+-
+-
+-   for (i=1; i<argc; i++) {
+-      for (p = info; p->type != ARGV_END; p++) {
+-         j = strlen(p->name);
+-         if (strncmp(p->name, argv[i], j))
+-            continue;
+-         if (isalnum(argv[i][j]))
+-            continue;
+-         break;
+-      }
+-      if (p->type == ARGV_END) { /* not found */
+-         fprintf(stderr, "%s: Uknown option \"%s\" for pointer \"%s\"\n",
+-                  option.progname, argv[i], argv[0]);
+-         errors++;
+-         continue;
+-      }
+-      /* Found. Look for trailing stuff, if any */
+-      s = argv[i]+j;
+-      while (*s && isspace(*s)) s++; /* skip spaces */
+-      if (*s == '=') s++; /* skip equal */
+-      while (*s && isspace(*s)) s++; /* skip other spaces */
+-
+-      /* Now parse what s is */
+-      switch(p->type) {
+-         case ARGV_BOOL:
+-            if (*s) {
+-               gpm_report(GPM_PR_ERR,GPM_MESS_OPTION_NO_ARG,option.progname,p->name,s);
+-               errors++;
+-            }
+-            *(p->u.iptr) = p->value;
+-            break;
+-
+-         case ARGV_DEC:
+-            base = 10; /* and fall through */
+-         case ARGV_INT:
+-            l = strtol(s, &t, base);
+-            if (*t) {
+-               gpm_report(GPM_PR_ERR,GPM_MESS_INVALID_ARG, option.progname, s, p->name);
+-               errors++;
+-               break;
+-            }
+-            *(p->u.iptr) = (int)l;
+-            break;
+-
+-         case ARGV_STRING:
+-            *(p->u.sptr) = strdup(s);
+-            break;
+-
+-         case ARGV_END: /* let's please "-Wall" */
+-            break;
+-      }
+-   } /* for i in argc */
+-   if (errors) gpm_report(GPM_PR_ERR,GPM_MESS_CONT_WITH_ERR, option.progname);
+-   return errors;
+-}
+-
+-/*========================================================================*/
+-/* Provide a common error engine by parsing with an empty option-set */
+-/*========================================================================*/
+-static volatile int check_no_argv(int argc, char **argv)
+-{
+-   static argv_helper optioninfo[] = {
+-      {"",       ARGV_END}
+-      };
+-   return parse_argv(optioninfo, argc, argv);
+-}
++#include "headers/optparser.h"
+ 
+ /*========================================================================*/
+ /* Parse the "old" -o options */
+ /*========================================================================*/
+-static int option_modem_lines(int fd, int argc, char **argv)
++static int option_modem_lines(int fd, char *proto, char *opts)
+ {
+-   static unsigned int err, lines, reallines;
++   static unsigned int lines, reallines;
++   static struct option_helper optioninfo[] = {
++      {"dtr",  OPT_BOOL, u: {iptr: &lines}, value: TIOCM_DTR},
++      {"rts",  OPT_BOOL, u: {iptr: &lines}, value: TIOCM_RTS},
++      {"both", OPT_BOOL, u: {iptr: &lines}, value: TIOCM_DTR | TIOCM_RTS},
++      {"",     OPT_END}
++   };
+ 
+-   static argv_helper optioninfo[] = {
+-      {"dtr",  ARGV_BOOL, u: {iptr: &lines}, value: TIOCM_DTR},
+-      {"rts",  ARGV_BOOL, u: {iptr: &lines}, value: TIOCM_RTS},
+-      {"both", ARGV_BOOL, u: {iptr: &lines}, value: TIOCM_DTR | TIOCM_RTS},
+-      {"",       ARGV_END}
+-      };
++   int rslt = parse_options(proto, opts, ',', optioninfo);
+ 
+-   if (argc<2) return 0;
+-   if (argc > 2) {
+-      gpm_report(GPM_PR_ERR,GPM_MESS_TOO_MANY_OPTS,option.progname, argv[0]);
++   if (rslt < 0) {
++      errno = EINVAL;
++      return -1;
++   } else if (rslt > 1) {
++      gpm_report(GPM_PR_ERR, GPM_MESS_TOO_MANY_OPTS, option.progname, proto);
+       errno = EINVAL; /* used by gpm_oops(), if the caller reports failure */
+       return -1;
++   } else if (rslt == 1) {
++      /* ok, move the lines */
++      ioctl(fd, TIOCMGET, &reallines);
++      reallines &= ~lines;
++      ioctl(fd, TIOCMSET, &reallines);
+    }
+-   err = parse_argv(optioninfo, argc, argv);
+-   if(err) return 0; /* a message has been printed, but go on as good */
+-
+-   /* ok, move the lines */
+-   ioctl(fd, TIOCMGET, &reallines);
+-   reallines &= ~lines;
+-   ioctl(fd, TIOCMSET, &reallines);
+    return 0;
+ }
+ 
+@@ -233,28 +134,12 @@
+ /*========================================================================*/
+ 
+ #ifdef HAVE_LINUX_INPUT_H
+-static int M_evdev (Gpm_Event * state, unsigned char *data)
+-{
+-   struct input_event thisevent;
+-   (void) memcpy (&thisevent, data, sizeof (struct input_event));
+-   if (thisevent.type == EV_REL) {
+-      if (thisevent.code == REL_X)
+-         state->dx = (signed char) thisevent.value;
+-      else if (thisevent.code == REL_Y)
+-         state->dy = (signed char) thisevent.value;
+-   } else if (thisevent.type == EV_KEY) {
+-      switch(thisevent.code) {
+-         case BTN_LEFT:    state->buttons ^= GPM_B_LEFT;    break;
+-         case BTN_MIDDLE:  state->buttons ^= GPM_B_MIDDLE;  break;
+-         case BTN_RIGHT:   state->buttons ^= GPM_B_RIGHT;   break;
+-         case BTN_SIDE:    state->buttons ^= GPM_B_MIDDLE;  break;
+-      }   
+-   }
+-   return 0;
+-}
++/* defined in evdev.c */
++extern int M_evdev(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state);
++extern int I_evdev(struct micedev *dev, struct miceopt *opt, Gpm_Type *type);
+ #endif /* HAVE_LINUX_INPUT_H */
+ 
+-static int M_ms(Gpm_Event *state,  unsigned char *data)
++static int M_ms(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    /*
+     * some devices report a change of middle-button state by
+@@ -273,7 +158,7 @@
+    return 0;
+ }
+ 
+-static int M_ms_plus(Gpm_Event *state, unsigned char *data)
++static int M_ms_plus(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    static unsigned char prev=0;
+ 
+@@ -293,7 +178,7 @@
+    return 0;
+ }
+ 
+-static int M_ms_plus_lr(Gpm_Event *state,  unsigned char *data)
++static int M_ms_plus_lr(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    /*
+     * Same as M_ms_plus but with an addition by Edmund GRIMLEY EVANS
+@@ -329,19 +214,19 @@
+ int SUMMA_BORDER=100;
+ int summamaxx,summamaxy;
+ char summaid=-1;
+-static int M_summa(Gpm_Event *state, unsigned char *data)
++static int M_summa(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    int x, y;
+ 
+    x = ((data[2]<<7) | data[1])-SUMMA_BORDER;
+    if (x<0) x=0;
+    if (x>summamaxx) x=summamaxx;
+-   state->x = (x * win.ws_col / summamaxx);
++   state->x = (x * console.max_x / summamaxx);
+    realposx = (x * 16383 / summamaxx);
+ 
+    y = ((data[4]<<7) | data[3])-SUMMA_BORDER;
+    if (y<0) y=0; if (y>summamaxy) y=summamaxy;
+-   state->y = 1 + y * (win.ws_row-1)/summamaxy;
++   state->y = 1 + y * (console.max_y-1)/summamaxy;
+    realposy = y * 16383 / summamaxy;  
+ 
+    state->buttons=
+@@ -396,7 +281,7 @@
+ 
+ 
+ /* 'Genitizer' (kw@dtek.chalmers.se 11/12/97) */
+-static int M_geni(Gpm_Event *state,  unsigned char *data)
++static int M_geni(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    /* this is a little confusing. If we use the stylus, we
+     * have three buttons (tip, lower, upper), and if
+@@ -419,7 +304,7 @@
+ 
+ 
+ /* m$ 'Intellimouse' (steveb 20/7/97) */
+-static int M_ms3(Gpm_Event *state,  unsigned char *data)
++static int M_ms3(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    state->wdx = state->wdy = 0;
+    state->buttons= ((data[0] & 0x20) >> 3)   /* left */
+@@ -470,7 +355,7 @@
+ }
+ 
+ /* M_brw is a variant of m$ 'Intellimouse' the middle button is different */
+-static int M_brw(Gpm_Event *state,  unsigned char *data)
++static int M_brw(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    state->buttons= ((data[0] & 0x20) >> 3)   /* left */
+       | ((data[3] & 0x20) >> 4)   /* middle */
+@@ -491,7 +376,7 @@
+    return 0;
+ }
+ 
+-static int M_bare(Gpm_Event *state,  unsigned char *data)
++static int M_bare(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    /* a bare ms protocol */
+    state->buttons= ((data[0] & 0x20) >> 3) | ((data[0] & 0x10) >> 4);
+@@ -500,7 +385,7 @@
+    return 0;
+ }
+ 
+-static int M_sun(Gpm_Event *state,  unsigned char *data)
++static int M_sun(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    state->buttons= (~data[0]) & 0x07;
+    state->dx=      (signed char)(data[1]);
+@@ -508,7 +393,7 @@
+    return 0;
+ }
+ 
+-static int M_msc(Gpm_Event *state,  unsigned char *data)
++static int M_msc(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    state->buttons= (~data[0]) & 0x07;
+    state->dx=      (signed char)(data[1]) + (signed char)(data[3]);
+@@ -558,7 +443,7 @@
+ 
+ }
+ 
+-static int M_logimsc(Gpm_Event *state,  unsigned char *data) /* same as msc */
++static int M_logimsc(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    state->buttons= (~data[0]) & 0x07;
+    state->dx=      (signed char)(data[1]) + (signed char)(data[3]);
+@@ -566,7 +451,7 @@
+    return 0;
+ }
+ 
+-static int M_mm(Gpm_Event *state,  unsigned char *data)
++static int M_mm(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    state->buttons= data[0] & 0x07;
+    state->dx=      (data[0] & 0x10) ?   data[1] : - data[1];
+@@ -574,7 +459,7 @@
+    return 0;
+ }
+ 
+-static int M_logi(Gpm_Event *state,  unsigned char *data) /* equal to mm */
++static int M_logi(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    state->buttons= data[0] & 0x07;
+    state->dx=      (data[0] & 0x10) ?   data[1] : - data[1];
+@@ -582,7 +467,7 @@
+    return 0;
+ }
+ 
+-static int M_bm(Gpm_Event *state,  unsigned char *data) /* equal to sun */
++static int M_bm(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    state->buttons= (~data[0]) & 0x07;
+    state->dx=      (signed char)data[1];
+@@ -590,7 +475,7 @@
+    return 0;
+ }
+ 
+-static int M_ps2(Gpm_Event *state,  unsigned char *data)
++static int M_ps2(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    static int tap_active=0; /* there exist glidepoint ps2 mice */
+ 
+@@ -599,8 +484,8 @@
+       !!(data[0]&2) * GPM_B_RIGHT +
+       !!(data[0]&4) * GPM_B_MIDDLE;
+ 
+-   if (data[0]==0 && opt_glidepoint_tap) /* by default this is false */
+-      state->buttons = tap_active = opt_glidepoint_tap;
++   if (data[0]==0 && opt->glidepoint_tap) /* by default this is false */
++      state->buttons = tap_active = opt->glidepoint_tap;
+    else if (tap_active) {
+       if (data[0]==8)
+          state->buttons = tap_active = 0;
+@@ -623,10 +508,11 @@
+       state->dy= -((data[0] & 0x20) ? data[2]-256 : data[2]);
+    else
+       state->dy = 0;
++
+    return 0;
+ }
+ 
+-static int M_imps2(Gpm_Event *state,  unsigned char *data)
++static int M_imps2(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    
+    static int tap_active=0;         /* there exist glidepoint ps2 mice */
+@@ -636,8 +522,8 @@
+    state->buttons= ((data[0] & 1) << 2)   /* left              */
+       | ((data[0] & 6) >> 1);             /* middle and right  */
+    
+-   if (data[0]==0 && opt_glidepoint_tap) // by default this is false
+-      state->buttons = tap_active = opt_glidepoint_tap;
++   if (data[0]==0 && opt->glidepoint_tap) // by default this is false
++      state->buttons = tap_active = opt->glidepoint_tap;
+    else if (tap_active) {
+       if (data[0]==8)
+          state->buttons = tap_active = 0;
+@@ -667,7 +553,7 @@
+ 
+ }
+ 
+-static int M_netmouse(Gpm_Event *state,  unsigned char *data)
++static int M_netmouse(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    /* Avoid these beasts if you can.  They connect to normal PS/2 port,
+     * but their protocol is one byte longer... So if you have notebook
+@@ -706,47 +592,45 @@
+ }
+ 
+ /* standard ps2 */
+-static Gpm_Type *I_ps2(int fd, unsigned short flags,
+-        struct Gpm_Type *type, int argc, char **argv)
++int I_ps2(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+    static unsigned char s[] = { 246, 230, 244, 243, 100, 232, 3, };
+-   write (fd, s, sizeof (s));
++   write(dev->fd, s, sizeof (s));
+    usleep (30000);
+-   tcflush (fd, TCIFLUSH);
+-   return type;
++   tcflush (dev->fd, TCIFLUSH);
++   return 0;
+ }
+ 
+-static Gpm_Type *I_netmouse(int fd, unsigned short flags,
+-         struct Gpm_Type *type, int argc, char **argv)
++static int I_netmouse(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+    unsigned char magic[6] = { 0xe8, 0x03, 0xe6, 0xe6, 0xe6, 0xe9 };
+    int i;
+ 
+-   if (check_no_argv(argc, argv)) return NULL;
++   if (!check_no_options(type->name, opt->text, ',')) return -1;
+    for (i=0; i<6; i++) {
+       unsigned char c = 0;
+-      write( fd, magic+i, 1 );
+-      read( fd, &c, 1 );
++      write(dev->fd, magic+i, 1 );
++      read(dev->fd, &c, 1 );
+       if (c != 0xfa) {
+          gpm_report(GPM_PR_ERR,GPM_MESS_NETM_NO_ACK,c);
+-         return NULL;
++         return -1;
+       }
+    }
+    {
+       unsigned char rep[3] = { 0, 0, 0 };
+-      read( fd, rep, 1 );
+-      read( fd, rep+1, 1 );
+-      read( fd, rep+2, 1 );
++      read( dev->fd, rep, 1 );
++      read( dev->fd, rep+1, 1 );
++      read( dev->fd, rep+2, 1 );
+       if (rep[0] || (rep[1] != 0x33) || (rep[2] != 0x55)) {
+          gpm_report(GPM_PR_ERR,GPM_MESS_NETM_INV_MAGIC, rep[0], rep[1], rep[2]);
+-         return NULL;
++         return -1;
+       }
+    }
+-   return type;
++   return 0;
+ }
+ 
+ #define GPM_B_BOTH (GPM_B_LEFT|GPM_B_RIGHT)
+-static int M_mman(Gpm_Event *state,  unsigned char *data)
++static int M_mman(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    /*
+     * the damned MouseMan has 3/4 bytes packets. The extra byte 
+@@ -784,7 +668,7 @@
+          mytype->getextra=1;
+       } else {
+          if (b & 0x2) prev |= GPM_B_MIDDLE;
+-         if (b & 0x1) prev |= opt_glidepoint_tap;
++         if (b & 0x1) prev |= opt->glidepoint_tap;
+       }
+    }
+    state->buttons=prev;
+@@ -828,7 +712,7 @@
+ 
+ #define IsA(m) ((WacomModell==(-1))? 0:!strcmp(#m,wcmodell[WacomModell].name))
+ 
+-static int M_wacom(Gpm_Event *state, unsigned char *data)
++static int M_wacom(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    static int ox=-1, oy;
+    int x, y;
+@@ -878,8 +762,8 @@
+    if (WacomAbsoluteWanted) { /* Absolute Mode */
+       if (x>wmaxx) x=wmaxx; if (x<0) x=0;
+       if (y>wmaxy) y=wmaxy; if (y<0) y=0;
+-      state->x  = (x * win.ws_col / wmaxx);
+-      state->y  = (y * win.ws_row / wmaxy);
++      state->x  = (x * console.max_x / wmaxx);
++      state->y  = (y * console.max_y / wmaxy);
+        
+       realposx = (x / wmaxx); /* this two lines come from the summa driver. */
+       realposy = (y / wmaxy); /* they seem to be buggy (always give zero).  */
+@@ -889,8 +773,8 @@
+       if( abs(x-ox)>(wmaxx/wcmodell[WacomModell].treshold) 
+        || abs(y-oy)>(wmaxy/wcmodell[WacomModell].treshold) ) ox=x; oy=y;
+ 
+-      state->dx= (x-ox) / (wmaxx / win.ws_col / wcmodell[WacomModell].treshold);
+-      state->dy= (y-oy) / (wmaxy / win.ws_row / wcmodell[WacomModell].treshold);
++      state->dx= (x-ox) / (wmaxx / console.max_x / wcmodell[WacomModell].treshold);
++      state->dy= (y-oy) / (wmaxy / console.max_y / wcmodell[WacomModell].treshold);
+    }
+ 
+    ox=x; oy=y;    
+@@ -918,7 +802,7 @@
+ #define CAL_Y_MAX 0xF40
+ #define CAL_Y_SIZE (CAL_Y_MAX - CAL_Y_MIN)
+ 
+-static int M_calus(Gpm_Event *state, unsigned char *data)
++static int M_calus(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    int x, y;
+ 
+@@ -932,12 +816,12 @@
+    state->dx = 0; state->dy = 0;
+ 
+    state->x = x < CAL_X_MIN ? 0
+-     : x > CAL_X_MAX ? win.ws_col+1
+-     : (long)(x-CAL_X_MIN) * (long)(win.ws_col-1) / CAL_X_SIZE+2;
++     : x > CAL_X_MAX ? console.max_x+1
++     : (long)(x-CAL_X_MIN) * (long)(console.max_x-1) / CAL_X_SIZE+2;
+ 
+-   state->y = y < CAL_Y_MIN ? win.ws_row + 1
++   state->y = y < CAL_Y_MIN ? console.max_y + 1
+      : y > CAL_Y_MAX ? 0
+-     : (long)(CAL_Y_MAX-y) * (long)win.ws_row / CAL_Y_SIZE + 1;
++     : (long)(CAL_Y_MAX-y) * (long)console.max_y / CAL_Y_SIZE + 1;
+ 
+    realposx = x < CAL_X_MIN ? 0
+      : x > CAL_X_MAX ? 16384
+@@ -950,7 +834,7 @@
+    return 0;
+ }
+ 
+-static int M_calus_rel(Gpm_Event *state, unsigned char *data)
++static int M_calus_rel(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    static int ox=-1, oy;
+    int x, y;
+@@ -984,7 +868,7 @@
+ #define NCR_DELTA_X    (NCR_RIGHT_X - NCR_LEFT_X)
+ #define NCR_DELTA_Y    (NCR_TOP_Y - NCR_BOTTOM_Y)
+ 
+-static int M_ncr(Gpm_Event *state,  unsigned char *data)
++static int M_ncr(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    int x,y;
+ 
+@@ -1002,14 +886,14 @@
+    state->x = x < NCR_LEFT_X
+              ? 0
+              : x > NCR_RIGHT_X
+-               ? win.ws_col+1
+-               : (long)(x-NCR_LEFT_X) * (long)(win.ws_col-1) / NCR_DELTA_X+2;
++               ? console.max_x+1
++               : (long)(x-NCR_LEFT_X) * (long)(console.max_x-1) / NCR_DELTA_X+2;
+ 
+    state->y = y < NCR_BOTTOM_Y
+-             ? win.ws_row + 1
++             ? console.max_y + 1
+              : y > NCR_TOP_Y
+           ? 0
+-          : (long)(NCR_TOP_Y-y) * (long)win.ws_row / NCR_DELTA_Y + 1;
++          : (long)(NCR_TOP_Y-y) * (long)console.max_y / NCR_DELTA_Y + 1;
+ 
+    realposx = x < NCR_LEFT_X
+              ? 0
+@@ -1026,7 +910,7 @@
+    return 0;
+ }
+ 
+-static int M_twid(Gpm_Event *state,  unsigned char *data)
++static int M_twid(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    unsigned long message=0UL; int i,h,v;
+    static int lasth, lastv, lastkey, key, lock=0, autorepeat=0;
+@@ -1144,7 +1028,7 @@
+ #ifdef HAVE_LINUX_JOYSTICK_H
+ /* Joystick mouse emulation (David Given) */
+ 
+-static int M_js(Gpm_Event *state,  unsigned char *data)
++static int M_js(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    struct JS_DATA_TYPE *jdata = (void*)data;
+    static int centerx = 0;
+@@ -1193,21 +1077,21 @@
+ #endif /* have joystick.h */
+ 
+ /* Synaptics TouchPad mouse emulation (Henry Davies) */
+-static int M_synaptics_serial(Gpm_Event *state,  unsigned char *data)
++static int M_synaptics_serial(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+-   syn_process_serial_data (state, data);
++   syn_process_serial_data(dev->fd, state, data);
+    return 0;
+ }
+ 
+ 
+ /* Synaptics TouchPad mouse emulation (Henry Davies) */
+-static int M_synaptics_ps2(Gpm_Event *state,  unsigned char *data)
++static int M_synaptics_ps2(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+-   syn_process_ps2_data(state, data);
++   syn_process_ps2_data(dev->fd, state, data);
+    return 0;
+ }
+ 
+-static int M_mtouch(Gpm_Event *state,  unsigned char *data)
++static int M_mtouch(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    /*
+     * This is a simple decoder for the MicroTouch touch screen
+@@ -1219,8 +1103,8 @@
+    static int upx, upy;            /* keep track of last finger-up place */
+    static struct timeval uptv, tv; /* time of last up, and down events */
+ 
+-   #define REAL_TO_XCELL(x) (x * win.ws_col / 0x3FFF)
+-   #define REAL_TO_YCELL(y) (y * win.ws_row / 0x3FFF)
++   #define REAL_TO_XCELL(x) (x * console.max_x / 0x3FFF)
++   #define REAL_TO_YCELL(y) (y * console.max_y / 0x3FFF)
+ 
+    #define GET_TIME(tv) (gettimeofday(&tv, (struct timezone *)NULL))
+    #define DIF_TIME(t1,t2) ((t2.tv_sec -t1.tv_sec) *1000+ \
+@@ -1245,7 +1129,7 @@
+ 
+    if (avgx < 0) { /* press event */
+       GET_TIME(tv);
+-      if (DIF_TIME(uptv, tv) < opt_time) {
++      if (DIF_TIME(uptv, tv) < opt->time) {
+          /* count as button press placed at finger-up pixel */
+          state->buttons = GPM_B_LEFT;
+          realposx = avgx = upx; state->x = REAL_TO_XCELL(realposx);
+@@ -1287,7 +1171,7 @@
+ static int gunze_calib[4]; /* x0,y0 x1,y1 (measured at 1/8 and 7/8) */
+ static int gunze_debounce = 100; /* milliseconds: ignore shorter taps */
+ 
+-static int M_gunze(Gpm_Event *state,  unsigned char *data)
++static int M_gunze(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    /*
+     * This generates button-1 events, by now.
+@@ -1300,8 +1184,8 @@
+    static struct timeval uptv, tv; /* time of last up, and down events */
+    int timediff;
+     
+-   #define REAL_TO_XCELL(x) (x * win.ws_col / 0x3FFF)
+-   #define REAL_TO_YCELL(y) (y * win.ws_row / 0x3FFF)
++   #define REAL_TO_XCELL(x) (x * console.max_x / 0x3FFF)
++   #define REAL_TO_YCELL(y) (y * console.max_y / 0x3FFF)
+     
+    #define GET_TIME(tv) (gettimeofday(&tv, (struct timezone *)NULL))
+    #define DIF_TIME(t1,t2) ((t2.tv_sec -t1.tv_sec) *1000+ \
+@@ -1350,7 +1234,7 @@
+       GET_TIME(tv);
+       timediff = DIF_TIME(uptv, tv);
+       released = 0;
+-      if (timediff > gunze_debounce && timediff < opt_time) {
++      if (timediff > gunze_debounce && timediff < opt->time) {
+          /* count as button press placed at finger-up pixel */
+          dragging = 1;
+          state->buttons = GPM_B_LEFT;
+@@ -1399,7 +1283,7 @@
+ /* corresponding correction of the protocol identification     */
+ /* mask) 2001/07/12 by Maciej W. Rozycki (macro@ds2.pg.gda.pl) */
+ 
+-static int M_vsxxx_aa(Gpm_Event *state, unsigned char *data)
++static int M_vsxxx_aa(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+ 
+ /* The mouse protocol is as follows:
+@@ -1449,16 +1333,16 @@
+ /*  Genius Wizardpad tablet  --  Matt Kimball (mkimball@xmission.com)  */
+ static int wizardpad_width = -1;
+ static int wizardpad_height = -1;
+-static int M_wp(Gpm_Event *state,  unsigned char *data)
++static int M_wp(struct micedev *dev, struct miceopt *opt, unsigned char *data, Gpm_Event *state)
+ {
+    int x, y, pressure;
+ 
+    x = ((data[4] & 0x1f) << 12) | ((data[3] & 0x3f) << 6) | (data[2] & 0x3f);
+-   state->x = x * win.ws_col / (wizardpad_width * 40);
++   state->x = x * console.max_x / (wizardpad_width * 40);
+    realposx = x * 16383 / (wizardpad_width * 40);
+ 
+    y = ((data[7] & 0x1f) << 12) | ((data[6] & 0x3f) << 6) | (data[5] & 0x3f);
+-   state->y = win.ws_row - y * win.ws_row / (wizardpad_height * 40) - 1;
++   state->y = console.max_y - y * console.max_y / (wizardpad_height * 40) - 1;
+    realposy = 16383 - y * 16383 / (wizardpad_height * 40) - 1;  
+ 
+    pressure = ((data[9] & 0x0f) << 4) | (data[8] & 0x0f);
+@@ -1475,11 +1359,9 @@
+ /*========================================================================*/
+ /* Then, mice should be initialized */
+ 
+-static Gpm_Type* I_empty(int fd, unsigned short flags,
+-    struct Gpm_Type *type, int argc, char **argv)
++static int I_empty(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+-    if (check_no_argv(argc, argv)) return NULL;
+-    return type;
++    return check_no_options(type->name, opt->text, ',') ? 0 : -1;
+ }
+ 
+ static int setspeed(int fd,int old,int new,int needtowrite,unsigned short flags)
+@@ -1536,28 +1418,27 @@
+     {125,"Q"},
+     {1E9,"N"}, };
+ 
+-static Gpm_Type* I_serial(int fd, unsigned short flags,
+-    struct Gpm_Type *type, int argc, char **argv)
++static int I_serial(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+    int i; unsigned char c;
+    fd_set set; struct timeval timeout={0,0}; /* used when not debugging */
+ 
+    /* accept "-o dtr", "-o rts" and "-o both" */
+-   if (option_modem_lines(fd, argc, argv)) return NULL;
++   if (option_modem_lines(dev->fd, type->name, opt->text)) return -1;
+ 
+ #ifndef DEBUG
+    /* flush any pending input (thanks, Miguel) */
+    FD_ZERO(&set);
+    for(i=0; /* always */ ; i++) {
+-      FD_SET(fd,&set);
+-      switch(select(fd+1,&set,(fd_set *)NULL,(fd_set *)NULL,&timeout/*zero*/)){
+-         case  1: if (read(fd,&c,1)==0) break;
++      FD_SET(dev->fd,&set);
++      switch(select(dev->fd+1,&set,(fd_set *)NULL,(fd_set *)NULL,&timeout/*zero*/)){
++         case  1: if (read(dev->fd,&c,1)==0) break;
+          case -1: continue;
+       }
+       break;
+    }
+ 
+-   if (type->fun==M_logimsc) write(fd, "QU", 2 );
++   if (type->fun==M_logimsc) write(dev->fd, "QU", 2 );
+ 
+ #if 0 /* Did this ever work? -- I don't know, but should we not remove it,
+        * if it doesn't work ??? -- Nico */
+@@ -1570,7 +1451,7 @@
+ 
+    /* Non mman: change from any available speed to the chosen one */
+    for (i=9600; i>=1200; i/=2)
+-      setspeed(fd, i, opt_baud, (type->fun != M_mman) /* write */, flags);
++      setspeed(dev->fd, i, opt->baud, (type->fun != M_mman) /* write */, type->flags);
+ 
+    /*
+     * reset the MouseMan/TrackMan to use the 3/4 byte protocol
+@@ -1578,51 +1459,50 @@
+     * Changed after 1.14; why not having "I_mman" now?
+     */
+    if (type->fun==M_mman) {
+-      setspeed(fd, 1200, 1200, 0, flags); /* no write */
+-      write(fd, "*X", 2);
+-      setspeed(fd, 1200, opt_baud, 0, flags); /* no write */
+-      return type;
++      setspeed(dev->fd, 1200, 1200, 0, type->flags); /* no write */
++      write(dev->fd, "*X", 2);
++      setspeed(dev->fd, 1200, opt->baud, 0, type->flags); /* no write */
++      return 0;
+    }
+ 
+    if(type->fun==M_geni) {
+       gpm_report(GPM_PR_INFO,GPM_MESS_INIT_GENI);
+-      setspeed(fd, 1200, 9600, 1, flags); /* write */
+-      write(fd, ":" ,1); 
+-      write(fd, "E" ,1); /* setup tablet. relative mode, resolution... */
+-      write(fd, "@" ,1); /* setup tablet. relative mode, resolution... */
++      setspeed(dev->fd, 1200, 9600, 1, type->flags); /* write */
++      write(dev->fd, ":" ,1); 
++      write(dev->fd, "E" ,1); /* setup tablet. relative mode, resolution... */
++      write(dev->fd, "@" ,1); /* setup tablet. relative mode, resolution... */
+     }
+ 
+    if (type->fun==M_synaptics_serial) {
+       int packet_length;
+ 
+-      setspeed (fd, 1200, 1200, 1, flags);
+-      packet_length = syn_serial_init (fd);
+-      setspeed (fd, 1200, 9600, 1, flags);
++      setspeed (dev->fd, 1200, 1200, 1, type->flags);
++      packet_length = syn_serial_init (dev->fd);
++      setspeed (dev->fd, 1200, 9600, 1, type->flags);
+ 
+       type->packetlen = packet_length;
+       type->howmany   = packet_length;
+     }
+ 
+    if (type->fun==M_vsxxx_aa) {
+-      setspeed (fd, 4800, 4800, 0, flags); /* no write */
+-      write(fd, "R", 1); /* initialize a mouse; without getting an "R" */
++      setspeed (dev->fd, 4800, 4800, 0, type->flags); /* no write */
++      write(dev->fd, "R", 1); /* initialize a mouse; without getting an "R" */
+                          /* a mouse does not send a bytestream         */
+    }
+ 
+-   return type;
++   return 0;
+ }
+ 
+-static Gpm_Type* I_logi(int fd, unsigned short flags,
+-       struct Gpm_Type *type, int argc, char **argv)
++static int I_logi(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+    int i;
+    struct stat buf;
+    int busmouse;
+ 
+-   if (check_no_argv(argc, argv)) return NULL;
++   if (!check_no_options(type->name, opt->text, ',')) return -1;
+ 
+    /* is this a serial- or a bus- mouse? */
+-   if(fstat(fd,&buf)==-1) gpm_report(GPM_PR_OOPS,GPM_MESS_FSTAT);
++   if(fstat(dev->fd,&buf)==-1) gpm_report(GPM_PR_OOPS,GPM_MESS_FSTAT);
+    i=MAJOR(buf.st_rdev);
+    
+    /* I don't know why this is herein, but I remove it. I don't think a 
+@@ -1635,21 +1515,20 @@
+    type->howmany = busmouse ? 3 : 1;
+ 
+    /* change from any available speed to the chosen one */
+-   for (i=9600; i>=1200; i/=2) setspeed(fd, i, opt_baud, 1 /* write */, flags);
++   for (i=9600; i>=1200; i/=2) setspeed(dev->fd, i, opt->baud, 1 /* write */, type->flags);
+ 
+    /* this stuff is peculiar of logitech mice, also for the serial ones */
+-   write(fd, "S", 1);
+-   setspeed(fd, opt_baud, opt_baud, 1 /* write */,
++   write(dev->fd, "S", 1);
++   setspeed(dev->fd, opt->baud, opt->baud, 1 /* write */,
+       CS8 |PARENB |PARODD |CREAD |CLOCAL |HUPCL);
+ 
+    /* configure the sample rate */
+-   for (i=0;opt_sample<=sampletab[i].sample;i++) ;
+-   write(fd,sampletab[i].code,1);
+-   return type;
++   for (i=0;opt->sample<=sampletab[i].sample;i++) ;
++   write(dev->fd,sampletab[i].code,1);
++   return 0;
+ }
+ 
+-static Gpm_Type *I_wacom(int fd, unsigned short flags,
+-                         struct Gpm_Type *type, int argc, char **argv)
++static int I_wacom(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+ /* wacom graphire tablet */
+ #define UD_RESETBAUD     "\r$"      /* reset baud rate to default (wacom V) */
+@@ -1664,19 +1543,19 @@
+    { 
+       /* Init Wacom communication; this is modified from xf86Wacom.so module */
+       /* Set speed to 19200 */
+-      setspeed (fd, 1200, 19200, 0, B19200|CS8|CREAD|CLOCAL|HUPCL);
++      setspeed (dev->fd, 1200, 19200, 0, B19200|CS8|CREAD|CLOCAL|HUPCL);
+       /* Send Reset Baudrate Command */ 
+-      write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD));
++      write(dev->fd, UD_RESETBAUD, strlen(UD_RESETBAUD));
+       usleep(250000);   
+       /* Send Reset Command */
+-      write(fd, UD_RESET,     strlen(UD_RESET));
++      write(dev->fd, UD_RESET,     strlen(UD_RESET));
+       usleep(75000);
+       /* Set speed to 9600bps */
+-      setspeed (fd, 1200, 9600, 0, B9600|CS8|CREAD|CLOCAL|HUPCL);
++      setspeed (dev->fd, 1200, 9600, 0, B9600|CS8|CREAD|CLOCAL|HUPCL);
+       /* Send Reset Command */
+-      write(fd, UD_RESET, strlen(UD_RESET));
++      write(dev->fd, UD_RESET, strlen(UD_RESET));
+       usleep(250000);  
+-      write(fd, UD_STOP, strlen(UD_STOP));
++      write(dev->fd, UD_STOP, strlen(UD_STOP));
+       usleep(100000);
+    }
+ 
+@@ -1690,7 +1569,7 @@
+       struct timeval timeout;
+       fd_set readfds;
+       int err;
+-      FD_ZERO(&readfds);  FD_SET(fd, &readfds);
++      FD_ZERO(&readfds);  FD_SET(dev->fd, &readfds);
+       timeout.tv_sec = 0; timeout.tv_usec = 200000;
+       err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout);
+       return((err>0)?1:err);
+@@ -1706,11 +1585,11 @@
+        * Get Data to buffer until full or timeout.
+        * Give back 0 for timeout and !0 for buffer full
+        */
+-      if (cmd) write(fd,cmd,strlen(cmd));
++      if (cmd) write(dev->fd,cmd,strlen(cmd));
+       memset(buffer,0,sizeof(buffer)); p=buffer;
+       err=wait_wacom();
+       while (err != -1 && err && (p-buffer)<(sizeof(buffer)-1)) {
+-         p+= read(fd,p,(sizeof(buffer)-1)-(p-buffer));
++         p+= read(dev->fd,p,(sizeof(buffer)-1)-(p-buffer));
+          err=wait_wacom();
+       }
+       /* return 1 for buffer full */
+@@ -1728,13 +1607,14 @@
+     */
+ 
+    /* accept boolean options absolute and relative */
+-   static argv_helper optioninfo[] = {
+-         {"absolute",  ARGV_BOOL, u: {iptr: &WacomAbsoluteWanted}, value: !0},
+-         {"relative",  ARGV_BOOL, u: {iptr: &WacomAbsoluteWanted}, value:  0},
+-         {"",       ARGV_END} 
++   static struct option_helper optioninfo[] = {
++         {"absolute",  OPT_BOOL, u: {iptr: &WacomAbsoluteWanted}, value: !0},
++         {"relative",  OPT_BOOL, u: {iptr: &WacomAbsoluteWanted}, value:  0},
++         {"",          OPT_END} 
+    };
+-   parse_argv(optioninfo, argc, argv); 
+-   type->absolute = WacomAbsoluteWanted;
++   
++   parse_options(type->name, opt->text, ',', optioninfo); 
++   opt->absolute = WacomAbsoluteWanted;
+    reset_wacom();
+ 
+    /* "Flush" input queque */
+@@ -1756,7 +1636,7 @@
+    }
+    if(WacomModell >= (sizeof(wcmodell) / sizeof(struct WC_MODELL))) 
+       WacomModell=-1;
+-   gpm_report(GPM_PR_INFO,GPM_MESS_WACOM_MOD, type->absolute? 'A':'R',
++   gpm_report(GPM_PR_INFO,GPM_MESS_WACOM_MOD, opt->absolute? 'A':'R',
+                 (WacomModell==(-1))? "Unknown" : wcmodell[WacomModell].name,
+                 buffer+2);
+    
+@@ -1767,24 +1647,23 @@
+       wmaxx = (wmaxx-wcmodell[WacomModell].border);
+       wmaxy = (wmaxy-wcmodell[WacomModell].border);
+    }
+-   write(fd,UD_SENDCOORDS,4);
++   write(dev->fd,UD_SENDCOORDS,4);
+ 
+-   return type;
++   return 0;
+ }
+ 
+-static Gpm_Type *I_pnp(int fd, unsigned short flags,
+-             struct Gpm_Type *type, int argc, char **argv)
++static int I_pnp(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {  
+    struct termios tty;
+ 
+    /* accept "-o dtr", "-o rts" and "-o both" */
+-   if (option_modem_lines(fd, argc, argv)) return NULL;
++   if (option_modem_lines(dev->fd, type->name, opt->text)) return -1;
+ 
+    /*
+     * Just put the device to 1200 baud. Thanks to Francois Chastrette
+     * for his great help and debugging with his own pnp device.
+     */
+-   tcgetattr(fd, &tty);
++   tcgetattr(dev->fd, &tty);
+     
+    tty.c_iflag = IGNBRK | IGNPAR;
+    tty.c_oflag = 0;
+@@ -1792,15 +1671,15 @@
+    tty.c_line = 0;
+    tty.c_cc[VTIME] = 0;
+    tty.c_cc[VMIN] = 1;
+-   tty.c_cflag = flags | B1200;
+-   tcsetattr(fd, TCSAFLUSH, &tty); /* set parameters */
++   tty.c_cflag = type->flags | B1200;
++   tcsetattr(dev->fd, TCSAFLUSH, &tty); /* set parameters */
+ 
+    /*
+     * Don't read the silly initialization string. I don't want to see
+     * the vendor name: it is only propaganda, with no information.
+     */
+    
+-   return type;
++   return 0;
+ }
+ 
+ /*
+@@ -1848,8 +1727,7 @@
+ 
+ /* intellimouse, ps2 version: Ben Pfaff and Colin Plumb */
+ /* Autodetect: Steve Bennett */
+-static Gpm_Type *I_imps2(int fd, unsigned short flags, struct Gpm_Type *type,
+-                                                       int argc, char **argv)
++static int I_imps2(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+    int id;
+    static unsigned char basic_init[] = { GPM_AUX_ENABLE_DEV, GPM_AUX_SET_SAMPLE, 100 };
+@@ -1857,36 +1735,36 @@
+    static unsigned char ps2_init[] = { GPM_AUX_SET_SCALE11, GPM_AUX_ENABLE_DEV, GPM_AUX_SET_SAMPLE, 100, GPM_AUX_SET_RES, 3, };
+ 
+    /* Do a basic init in case the mouse is confused */
+-   write_to_mouse(fd, basic_init, sizeof (basic_init));
++   write_to_mouse(dev->fd, basic_init, sizeof (basic_init));
+ 
+    /* Now try again and make sure we have a PS/2 mouse */
+-   if (write_to_mouse(fd, basic_init, sizeof (basic_init)) != 0) {
++   if (write_to_mouse(dev->fd, basic_init, sizeof (basic_init)) != 0) {
+       gpm_report(GPM_PR_ERR,GPM_MESS_IMPS2_INIT);
+-      return(NULL);
++      return -1;
+    }
+ 
+    /* Try to switch to 3 button mode */
+-   if (write_to_mouse(fd, imps2_init, sizeof (imps2_init)) != 0) {
++   if (write_to_mouse(dev->fd, imps2_init, sizeof (imps2_init)) != 0) {
+       gpm_report(GPM_PR_ERR,GPM_MESS_IMPS2_FAILED);
+-      return(NULL);
++      return -1;
+    }
+ 
+    /* Read the mouse id */
+-   id = read_mouse_id(fd);
++   id = read_mouse_id(dev->fd);
+    if (id == GPM_AUX_ID_ERROR) {
+       gpm_report(GPM_PR_ERR,GPM_MESS_IMPS2_MID_FAIL);
+       id = GPM_AUX_ID_PS2;
+    }
+ 
+    /* And do the real initialisation */
+-   if (write_to_mouse(fd, ps2_init, sizeof (ps2_init)) != 0) {
++   if (write_to_mouse(dev->fd, ps2_init, sizeof (ps2_init)) != 0) {
+       gpm_report(GPM_PR_ERR,GPM_MESS_IMPS2_SETUP_FAIL);
+    }
+ 
+    if (id == GPM_AUX_ID_IMPS2) {
+    /* Really an intellipoint, so initialise 3 button mode (4 byte packets) */
+       gpm_report(GPM_PR_INFO,GPM_MESS_IMPS2_AUTO);
+-      return type;
++      return 0;
+    }
+    if (id != GPM_AUX_ID_PS2) {
+       gpm_report(GPM_PR_ERR,GPM_MESS_IMPS2_BAD_ID, id);
+@@ -1894,69 +1772,64 @@
+    else gpm_report(GPM_PR_INFO,GPM_MESS_IMPS2_PS2);
+ 
+    for (type=mice; type->fun; type++)
+-      if (strcmp(type->name, "ps2") == 0) return(type);
++      if (strcmp(type->name, "ps2") == 0) return 0;
+ 
+    /* ps2 was not found!!! */
+-   return(NULL);
++   return -1;
+ }
+ 
+ /*
+  * This works with Dexxa Optical Mouse, but because in X same initstring
+  * is named ExplorerPS/2 so I named it in the same way.
+  */
+-static Gpm_Type *I_exps2(int fd, unsigned short flags,
+-          struct Gpm_Type *type, int argc, char **argv)
++static int I_exps2(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+    static unsigned char s1[] = { 243, 200, 243, 200, 243, 80, };
+ 
+-   if (check_no_argv(argc, argv)) return NULL;
++   if (!check_no_options(type->name, opt->text, ',')) return -1;
+ 
+-   write (fd, s1, sizeof (s1));
++   write (dev->fd, s1, sizeof (s1));
+    usleep (30000);
+-   tcflush (fd, TCIFLUSH);
+-   return type;
++   tcflush (dev->fd, TCIFLUSH);
++   return 0;
+ }
+ 
+-static Gpm_Type *I_twid(int fd, unsigned short flags,
+-         struct Gpm_Type *type, int argc, char **argv)
++static int I_twid(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+ 
+-   if (check_no_argv(argc, argv)) return NULL;
++   if (!check_no_options(type->name, opt->text, ',')) return -1;
+ 
+-   if (twiddler_key_init() != 0) return NULL;
++   if (twiddler_key_init() != 0) return -1;
+    /*
+    * the twiddler is a serial mouse: just drop dtr
+    * and run at 2400 (unless specified differently) 
+    */
+-   if(opt_baud==DEF_BAUD) opt_baud = 2400;
+-   argv[1] = "dtr"; /* argv[1] is guaranteed to be NULL (this is dirty) */
+-   return I_serial(fd, flags, type, argc, argv);
++   if (opt->baud == DEF_BAUD) opt->baud = 2400;
++   opt->text = "dtr";
++   return I_serial(dev, opt, type);
+ }
+ 
+-static Gpm_Type *I_calus(int fd, unsigned short flags,
+-          struct Gpm_Type *type, int argc, char **argv)
++static int I_calus(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+-   if (check_no_argv(argc, argv)) return NULL;
++   if (!check_no_options(type->name, opt->text, ',')) return -1;
+ 
+-   if (opt_baud == 1200) opt_baud=9600; /* default to 9600 */
+-   return I_serial(fd, flags, type, argc, argv);
++   if (opt->baud == 1200) opt->baud = 9600; /* default to 9600 */
++   return I_serial(dev, opt, type);
+ }
+ 
+ /* synaptics touchpad, ps2 version: Henry Davies */
+-static Gpm_Type *I_synps2(int fd, unsigned short flags,
+-           struct Gpm_Type *type, int argc, char **argv)
++static int I_synps2(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+-   syn_ps2_init (fd);
+-   return type;
++   syn_ps2_init (dev->fd);
++   return 0;
+ }
+ 
+ 
+-static Gpm_Type *I_summa(int fd, unsigned short flags,
+-          struct Gpm_Type *type, int argc, char **argv) 
++static int I_summa(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type) 
+ {
+    void resetsumma()
+    {
+-      write(fd,0,1); /* Reset */
++      write(dev->fd,0,1); /* Reset */
+       usleep(400000); /* wait */
+    }
+    int waitsumma()
+@@ -1964,7 +1837,7 @@
+       struct timeval timeout;
+       fd_set readfds;
+       int err;
+-      FD_ZERO(&readfds);  FD_SET(fd, &readfds);
++      FD_ZERO(&readfds);  FD_SET(dev->fd, &readfds);
+       timeout.tv_sec = 0; timeout.tv_usec = 200000;
+       err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout);
+       return(err);
+@@ -1987,34 +1860,34 @@
+    char GEN_MODELL=0x7f;
+ 
+    /* Set speed to 9600bps */
+-   setspeed (fd, 1200, 9600, 1, B9600|CS8|CREAD|CLOCAL|HUPCL|PARENB|PARODD);  
++   setspeed (dev->fd, 1200, 9600, 1, B9600|CS8|CREAD|CLOCAL|HUPCL|PARENB|PARODD);  
+    resetsumma(); 
+  
+-   write(fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE));
++   write(dev->fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE));
+   
+    if (strstr(type->name,"acecad")!=NULL) summaid=11;
+ 
+    if (summaid<0) { /* Summagraphics test */
+       /* read the Summa Firm-ID */
+-      write(fd, SS_FIRMID, strlen(SS_FIRMID));
++      write(dev->fd, SS_FIRMID, strlen(SS_FIRMID));
+       err=waitsumma();
+       if (!((err == -1) || (!err))) {
+          summaid=10; /* Original Summagraphics */
+-         read(fd, buffer, 255); /* Read Firm-ID */
++         read(dev->fd, buffer, 255); /* Read Firm-ID */
+       }
+    }
+   
+    if (summaid<0) { /* Genius-test */
+       resetsumma();
+-      write(fd,GEN_MMSERIES,1); 
+-      write(fd,&GEN_MODELL,1); /* Read modell */
++      write(dev->fd,GEN_MMSERIES,1); 
++      write(dev->fd,&GEN_MODELL,1); /* Read modell */
+       err=waitsumma();
+       if (!((err == -1) || (!err))) { /* read Genius-ID */
+            err=waitsumma();
+          if (!((err == -1) || (!err))) {
+             err=waitsumma();
+             if (!((err == -1) || (!err))) {
+-               read(fd,&config,1);
++               read(dev->fd,&config,1);
+                summaid=(config[0] & 224) >> 5; /* genius tablet-id (0-7)*/
+             }
+          } 
+@@ -2024,30 +1897,29 @@
+    /* unknown tablet ?*/
+    if ((summaid<0) || (summaid==11)) { 
+       resetsumma(); 
+-      write(fd, SS_BINARY_FMT SS_PROMPT_MODE, 3);
++      write(dev->fd, SS_BINARY_FMT SS_PROMPT_MODE, 3);
+    }
+ 
+    /* read tablet size */
+    err=waitsumma();  
+-   if (!((err == -1) || (!err))) read(fd,buffer,sizeof(buffer));
+-   write(fd,SS_READCONFIG,1);
+-   read(fd,&config,5);
++   if (!((err == -1) || (!err))) read(dev->fd,buffer,sizeof(buffer));
++   write(dev->fd,SS_READCONFIG,1);
++   read(dev->fd,&config,5);
+    summamaxx=(config[2]<<7 | config[1])-(SUMMA_BORDER*2);
+    summamaxy=(config[4]<<7 | config[3])-(SUMMA_BORDER*2);
+   
+-   write(fd,SS_ABSOLUTE SS_STREAM_MODE SS_UPPER_ORIGIN,3);
+-   if (summaid<0) write(fd,SS_500LPI SS_TABID0 SS_BINARY_FMT,4);
++   write(dev->fd,SS_ABSOLUTE SS_STREAM_MODE SS_UPPER_ORIGIN,3);
++   if (summaid<0) write(dev->fd,SS_500LPI SS_TABID0 SS_BINARY_FMT,4);
+ 
+-   return type;
++   return 0;
+ }
+ 
+-static Gpm_Type *I_mtouch(int fd, unsigned short flags,
+-           struct Gpm_Type *type, int argc, char **argv)
++static int I_mtouch(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+    struct termios tty;
+ 
+    /* Set speed to 9600bps (copied from I_summa, above :) */
+-   tcgetattr(fd, &tty);
++   tcgetattr(dev->fd, &tty);
+    tty.c_iflag = IGNBRK | IGNPAR;
+    tty.c_oflag = 0;
+    tty.c_lflag = 0;
+@@ -2055,18 +1927,17 @@
+    tty.c_cc[VTIME] = 0;
+    tty.c_cc[VMIN] = 1;
+    tty.c_cflag = B9600|CS8|CREAD|CLOCAL|HUPCL;
+-   tcsetattr(fd, TCSAFLUSH, &tty);
++   tcsetattr(dev->fd, TCSAFLUSH, &tty);
+ 
+ 
+    /* Turn it to "format tablet" and "mode stream" */
+-   write(fd,"\001MS\r\n\001FT\r\n",10);
++   write(dev->fd,"\001MS\r\n\001FT\r\n",10);
+   
+-   return type;
++   return 0;
+ }
+ 
+ /* simple initialization for the gunze touchscreen */
+-static Gpm_Type *I_gunze(int fd, unsigned short flags,
+-           struct Gpm_Type *type, int argc, char **argv)
++static int I_gunze(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+    struct termios tty;
+    FILE *f;
+@@ -2075,29 +1946,29 @@
+ 
+    #define GUNZE_CALIBRATION_FILE SYSCONFDIR "/gpm-calibration"
+    /* accept a few options */
+-   static argv_helper optioninfo[] = {
+-      {"smooth",   ARGV_INT, u: {iptr: &gunze_avg}},
+-      {"debounce", ARGV_INT, u: {iptr: &gunze_debounce}},
++   static struct option_helper optioninfo[] = {
++      {"smooth",   OPT_INT, u: {iptr: &gunze_avg}},
++      {"debounce", OPT_INT, u: {iptr: &gunze_debounce}},
+       /* FIXME: add corner tapping */
+-      {"",       ARGV_END}
++      {"",         OPT_END}
+    };
+-   parse_argv(optioninfo, argc, argv);
++   parse_options(type->name, opt->text, ',', optioninfo);
+     
+    /* check that the baud rate is valid */
+-   if (opt_baud == DEF_BAUD) opt_baud = 19200; /* force 19200 as default */
+-   if (opt_baud != 9600 && opt_baud != 19200) {
+-      gpm_report(GPM_PR_ERR,GPM_MESS_GUNZE_WRONG_BAUD,option.progname, argv[0]);
+-      opt_baud = 19200;
++   if (opt->baud == DEF_BAUD) opt->baud = 19200; /* force 19200 as default */
++   if (opt->baud != 9600 && opt->baud != 19200) {
++      gpm_report(GPM_PR_ERR, GPM_MESS_GUNZE_WRONG_BAUD, option.progname, type->name);
++      opt->baud = 19200;
+    }
+-   tcgetattr(fd, &tty);
++   tcgetattr(dev->fd, &tty);
+    tty.c_iflag = IGNBRK | IGNPAR;
+    tty.c_oflag = 0;
+    tty.c_lflag = 0;
+    tty.c_line = 0;
+    tty.c_cc[VTIME] = 0;
+    tty.c_cc[VMIN] = 1;
+-   tty.c_cflag = (opt_baud == 9600 ? B9600 : B19200) |CS8|CREAD|CLOCAL|HUPCL;
+-   tcsetattr(fd, TCSAFLUSH, &tty);
++   tty.c_cflag = (opt->baud == 9600 ? B9600 : B19200) |CS8|CREAD|CLOCAL|HUPCL;
++   tcsetattr(dev->fd, TCSAFLUSH, &tty);
+ 
+    /* FIXME: try to find some information about the device */
+ 
+@@ -2120,19 +1991,18 @@
+       gunze_calib[0] = gunze_calib[1] = 128; /* 1/8 */
+       gunze_calib[2] = gunze_calib[3] = 896; /* 7/8 */
+    }
+-   return type;
++   return 0;
+ }
+ 
+ /*  Genius Wizardpad tablet  --  Matt Kimball (mkimball@xmission.com)  */
+-static Gpm_Type *I_wp(int fd, unsigned short flags,
+-            struct Gpm_Type *type, int argc, char **argv)
++static int I_wp(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type)
+ {
+    struct termios tty;
+    char tablet_info[256];
+    int count, pos, size;
+ 
+    /* Set speed to 9600bps (copied from I_summa, above :) */
+-   tcgetattr(fd, &tty);
++   tcgetattr(dev->fd, &tty);
+    tty.c_iflag = IGNBRK | IGNPAR;
+    tty.c_oflag = 0;
+    tty.c_lflag = 0;
+@@ -2140,22 +2010,22 @@
+    tty.c_cc[VTIME] = 0;
+    tty.c_cc[VMIN] = 1;
+    tty.c_cflag = B9600|CS8|CREAD|CLOCAL|HUPCL;
+-   tcsetattr(fd, TCSAFLUSH, &tty);
++   tcsetattr(dev->fd, TCSAFLUSH, &tty);
+ 
+    /*  Reset the tablet (':') and put it in remote mode ('S') so that
+      it isn't sending anything to us.  */
+-   write(fd, ":S", 2);
+-   tcsetattr(fd, TCSAFLUSH, &tty);
++   write(dev->fd, ":S", 2);
++   tcsetattr(dev->fd, TCSAFLUSH, &tty);
+ 
+    /*  Query the model of the tablet  */
+-   write(fd, "T", 1);
++   write(dev->fd, "T", 1);
+    sleep(1);
+-   count = read(fd, tablet_info, 255);
++   count = read(dev->fd, tablet_info, 255);
+ 
+    /*  The tablet information should start with "KW" followed by the rest of
+      the model number.  If it isn't there, it probably isn't a WizardPad.  */
+-   if(count < 2) return NULL;
+-   if(tablet_info[0] != 'K' || tablet_info[1] != 'W') return NULL;
++   if(count < 2) return -1;
++   if(tablet_info[0] != 'K' || tablet_info[1] != 'W') return -1;
+ 
+    /*  Now, we want the width and height of the tablet.  They should be 
+      of the form "X###" and "Y###" where ### is the number of units of
+@@ -2177,9 +2047,9 @@
+    }
+ 
+    /*  Set the tablet to stream mode with 180 updates per sec.  ('O')  */
+-   write(fd, "O", 1);
++   write(dev->fd, "O", 1);
+ 
+-   return type;
++   return 0;
+ }
+ 
+ /*========================================================================*/
+@@ -2241,7 +2111,7 @@
+                                 {0x80, 0x80, 0x80, 0x00}, 6, 6, 0, 0, 0},
+ #ifdef HAVE_LINUX_INPUT_H
+    {"evdev", "Linux Event Device",
+-            "", M_evdev, I_empty, STD_FLG,
++            "", M_evdev, I_evdev, STD_FLG,
+                         {0x00, 0x00, 0x00, 0x00} , 16, 16, 0, 0, NULL},
+ #endif /* HAVE_LINUX_INPUT_H */
+    {"exps2",   "IntelliMouse Explorer (ps2) - 3 buttons, wheel unused",
+diff -urN gpm-1.20.1/src/optparser.c gpm/src/optparser.c
+--- gpm-1.20.1/src/optparser.c	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/optparser.c	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,155 @@
++/*
++ * optparser.c - GPM mouse options parser
++ *
++ * Copyright (C) 1993        Andrew Haylett <ajh@gec-mrc.co.uk>
++ * Copyright (C) 1994-2000   Alessandro Rubini <rubini@linux.it>
++ * Copyright (C) 1998,1999   Ian Zimmerman <itz@rahul.net>
++ * Copyright (C) 2001,2002   Nico Schottelius <nicos@pcsystems.de>
++ * Copyright (C) 2003        Dmitry Torokhov <dtor@mail.ru>
++ *
++ *   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>
++#include <string.h>
++#include <stdlib.h>
++#include <ctype.h>
++
++#include "headers/gpmInt.h"
++#include "headers/message.h"
++#include "headers/optparser.h"
++
++int parse_options(const char *proto, const char *opts, char sep, struct option_helper *info)
++{
++   int len, n, n_opts = 0, errors = 0;
++   long l;
++   struct option_helper *p;
++   char *s, *t, *str;
++   int base; /* for strtol */
++
++   for (p = info; p->type != OPT_END; p++)
++      p->present = 0; 
++
++   if (!opts)
++      return 0;
++   
++   if (!(str = strdup(opts)))
++      gpm_report(GPM_PR_OOPS, GPM_MESS_ALLOC_FAILED);
++
++   /* split input string */   
++   for (s = str, n = 1; sep && (s = strchr(s, sep)); s++, n++)
++        *s = '\0';
++   
++   for (s = str; n; s += strlen(s) + 1, n--) {
++      if (strlen(s) == 0)
++         continue;
++      
++      for (p = info; p->type != OPT_END; p++) {
++         len = strlen(p->name);
++         if (!strncmp(p->name, s, len) && !isalnum(s[len]))
++            break;
++      }
++      if (p->type == OPT_END) { /* not found */
++         gpm_report(GPM_PR_ERR, "%s: Uknown option \"%s\" for protocol \"%s\"\n",
++                    option.progname, s, proto);
++         errors++;
++         continue;
++      }
++      if (p->present) {
++         gpm_report(GPM_PR_ERR, "%s: option \"%s\" has already been seen, ignored (\"%s\")\n",
++                    option.progname, s, proto);
++         continue;
++      }
++      p->present = 1;
++      n_opts++;
++      /* Found. Look for trailing stuff, if any */
++      s += len;
++      while (*s && isspace(*s)) s++; /* skip spaces */
++      if (*s == '=') s++; /* skip equal */
++      while (*s && isspace(*s)) s++; /* skip other spaces */
++
++      /* Now parse what s is */
++      base = 0;
++      switch(p->type) {
++         case OPT_BOOL:
++            if (*s) {
++               gpm_report(GPM_PR_ERR, GPM_MESS_OPTION_NO_ARG, option.progname, p->name, s);
++               errors++;
++            }
++            *(p->u.iptr) = p->value;
++            break;
++
++         case OPT_DEC:
++            base = 10; /* and fall through */
++
++         case OPT_INT:
++            if (*s == '\0') {
++               gpm_report(GPM_PR_ERR, GPM_MESS_MISSING_ARG, option.progname, p->name);
++            } else {
++               l = strtol(s, &t, base);
++               if (*t) {
++                  gpm_report(GPM_PR_ERR, GPM_MESS_INVALID_ARG, option.progname, s, p->name);
++                  errors++;
++                  break;
++               }
++               *(p->u.iptr) = (int)l;
++            }
++            break;
++
++         case OPT_STRING:
++            if (*s == '\0')
++               gpm_report(GPM_PR_ERR, GPM_MESS_MISSING_ARG, option.progname, p->name);
++            else
++               *(p->u.sptr) = strdup(s);
++            break;
++
++         case OPT_END: /* let's please "-Wall" */
++            break;
++      }
++   } /* for i in argc */
++   
++   free(str);
++   
++   if (errors) {
++      gpm_report(GPM_PR_ERR,GPM_MESS_CONT_WITH_ERR, option.progname);
++      return -errors;
++   }
++   return n_opts;
++}
++
++int check_no_options(const char *proto, const char *opts, char sep)
++{
++   static struct option_helper info[] = {
++      { "", OPT_END }
++   };
++   
++   return parse_options(proto, opts, sep, info) == 0;
++}
++
++int is_option_present(struct option_helper *info, const char *name)
++{
++   struct option_helper *p;
++   int len;
++   
++   for (p = info; p->type != OPT_END; p++) {
++      len = strlen(p->name);
++      if (!strncmp(p->name, name, len) && !isalnum(name[len]))
++         return p->present;
++   }
++   
++   gpm_report(GPM_PR_ERR, "%s: Uknown option \"%s\"\n", option.progname, name);
++   return 0;
++}
++
+diff -urN gpm-1.20.1/src/prog/mouse-test.c gpm/src/prog/mouse-test.c
+--- gpm-1.20.1/src/prog/mouse-test.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/prog/mouse-test.c	2003-10-02 01:22:42.000000000 -0500
+@@ -50,22 +50,9 @@
+ #define max(a,b) ((a)>(b)?(a):(b))
+ #endif
+ 
+-
+-/* this material is needed to pass options to mice.c */
+-struct mouse_features mymouse = {
+-   DEF_TYPE, DEF_DEV, DEF_SEQUENCE,
+-   DEF_BAUD, DEF_SAMPLE, DEF_DELTA, DEF_ACCEL, DEF_SCALE, DEF_SCALE /*scaley*/,
+-   DEF_TIME, DEF_CLUSTER, DEF_THREE, DEF_GLIDEPOINT_TAP,
+-   (char *)NULL /* extra */,
+-   (Gpm_Type *)NULL,
+-   -1 /* fd */
+-};
+-
+ /* and this is a workaroud */
+ struct winsize win;
+ 
+-struct mouse_features *which_mouse=&mymouse;
+-
+ char *progname;
+ char *consolename;
+ int devcount=0;
+@@ -78,9 +65,9 @@
+ 
+ struct device {
+    char *name;
+-   int fd;
++   struct micedev mdev;
+    struct device *next;
+-};  
++} *devlist;
+ 
+ static int message(void)
+ {
+@@ -148,47 +135,48 @@
+ /*----------------------------------------------------------------------------- 
+    Place the description here.
+  -----------------------------------------------------------------------------*/
+-struct device **gpm_makedev(struct device **current, char *name)
++void gpm_makedev(char *name)
+ {
+-   int fd; int modes;
++   struct device *dev;
++   int fd;
++   int modes;
++   
+    if ((fd=open(name,O_RDWR|O_NONBLOCK))==-1) {
+       perror(name);
+-      return current;
+-   }
+-   modes = fcntl(fd, F_GETFL);
+-   if (0 > fcntl(fd, F_SETFL, modes & ~O_NONBLOCK)) {
+-      close(fd);
+-      perror(name);
+-      return current;
++   } else {
++      modes = fcntl(fd, F_GETFL);
++      if (0 > fcntl(fd, F_SETFL, modes & ~O_NONBLOCK)) {
++         close(fd);
++         perror(name);
++      } else {
++         dev = malloc(sizeof(struct device));
++         if (!dev) gpm_report(GPM_PR_OOPS,"malloc()");
++         dev->name=strdup(name);
++         if (!dev->name) gpm_report(GPM_PR_OOPS,"malloc()");
++         dev->mdev.fd=fd;
++         dev->mdev.private = NULL;
++         dev->next=devlist;
++         devlist = dev;
++         devcount++;
++      }
+    }
+-
+-   *current=malloc(sizeof(struct device));
+-   if (!*current) gpm_report(GPM_PR_OOPS,"malloc()");
+-   (*current)->name=strdup(name);
+-   if (!(*current)->name) gpm_report(GPM_PR_OOPS,"malloc()");
+-   (*current)->fd=fd;
+-   (*current)->next=NULL;
+-   devcount++;
+-   return &((*current)->next);
+ }
+ 
+-Gpm_Type *(*I_serial)(int fd, unsigned short flags, struct Gpm_Type *type,
+-		      int argc, char **argv);
++int (*I_serial)(struct micedev *dev, struct miceopt *opt, struct Gpm_Type *type);
+ 
+ 
+ /*----------------------------------------------------------------------------- 
+    Place the description here.
+  -----------------------------------------------------------------------------*/
+-int mousereopen(int oldfd, char *name, Gpm_Type *type)
++int mousereopen(struct micedev *dev, char *name, Gpm_Type *type, struct miceopt *opts)
+ {
+-   int fd;
+    if (!type) type=mice+1; /* ms */
+-   close(oldfd);
++   close(dev->fd);
+    usleep(100000);
+-   fd=open(name,O_RDWR);
+-   if (fd < 0) gpm_report(GPM_PR_OOPS,name);
+-   (*I_serial)(fd,type->flags,type,1,&type->name); /* ms initialization */
+-   return fd;
++   dev->fd=open(name,O_RDWR);
++   if (dev->fd < 0) gpm_report(GPM_PR_OOPS,name);
++   I_serial(dev, opts, type); /* ms initialization */
++   return dev->fd;
+ }
+ 
+ int noneofthem(void)
+@@ -281,10 +269,9 @@
+ {
+    struct item *list=NULL;
+    struct item **nextitem;
+-   struct device *devlist=NULL;
+-   struct device **nextdev;
++   struct device *nextdev;
+    Gpm_Type *cursor;
+-   int i, mousefd;
++   int i;
+    char *mousename;
+ #define BUFLEN 512
+    char buf[BUFLEN];
+@@ -294,6 +281,9 @@
+    int trial, readamount,packetsize,got;
+    int baudtab[4]={1200,9600,4800,2400};
+ #define BAUD(i) (baudtab[(i)%4])
++   struct miceopt opt = {0};
++   struct micedev mdev = {0};
++
+    consolename = Gpm_get_console();
+ 
+    if (!isatty(fileno(stdin))) {
+@@ -306,8 +296,8 @@
+ 
+    /* init the list of possible devices */
+ 
+-   for (nextdev=&devlist, i=1; i<argc; i++)
+-      nextdev=gpm_makedev(nextdev,argv[i]);
++   for (i=1; i<argc; i++)
++      gpm_makedev(argv[i]);
+ 
+    if (argc==1) { /* no cmdline, get all devices */
+       FILE *f;
+@@ -320,7 +310,7 @@
+       if (!f) gpm_report(GPM_PR_OOPS,"popen()");
+       while (fgets(s,64,f)) {
+          s[strlen(s)-1]='\0'; /* trim '\n' */
+-         nextdev=gpm_makedev(nextdev,s);
++         gpm_makedev(s);
+       }
+       pclose(f);
+    }
+@@ -345,19 +335,18 @@
+ 
+       /* BUG */ /* Logitech initialization is not performed */
+ 
+-      opt_baud=BAUD(trial);
+-      printf("\r\nTrying with %i baud\r\n",opt_baud);
++      opt.baud=BAUD(trial);
++      printf("\r\nTrying with %i baud\r\n",opt.baud);
+       trial++;
+ 
+       FD_ZERO(&devSet); FD_ZERO(&gotSet);
+       FD_SET(fileno(stdin),&devSet); maxfd=fileno(stdin);
+       printf("\r\n The possible device nodes are:\r\n");
+-      for (nextdev=&devlist; *nextdev; nextdev=&((*nextdev)->next)) {
+-         printf("\t%s\r\n", (*nextdev)->name);
+-         FD_SET((*nextdev)->fd,&devSet);
+-         maxfd=max((*nextdev)->fd,maxfd);
+-         (*I_serial)((*nextdev)->fd,(mice+1)->flags,mice+1,
+-		  1, &(mice+1)->name); /* try ms mode */
++      for (nextdev=devlist; nextdev; nextdev=nextdev->next) {
++         printf("\t%s\r\n", nextdev->name);
++         FD_SET(nextdev->mdev.fd, &devSet);
++         maxfd=max(nextdev->mdev.fd,maxfd);
++         I_serial(&nextdev->mdev, &opt, mice+1); /* try ms mode */
+       }
+ 
+       savSet=devSet;
+@@ -379,43 +368,43 @@
+             getchar();
+             break;
+          }
+-         for (nextdev=&devlist; *nextdev; nextdev=&((*nextdev)->next))
+-	         if (FD_ISSET((*nextdev)->fd,&devSet)) {
++         for (nextdev=devlist; nextdev; nextdev=nextdev->next)
++	         if (FD_ISSET(nextdev->mdev.fd,&devSet)) {
+ 	            gotthem++;
+-	            FD_CLR((*nextdev)->fd,&savSet);
+-	            FD_SET((*nextdev)->fd,&gotSet);
++	            FD_CLR(nextdev->mdev.fd,&savSet);
++	            FD_SET(nextdev->mdev.fd,&gotSet);
+ 	         }
+       }
+-      if (gotthem) for (nextdev=&devlist; *nextdev; /* nothing */ ) {
+-	      cur=*nextdev;
+-	      if (!FD_ISSET(cur->fd,&gotSet)) {
++      if (gotthem) for (nextdev=devlist; nextdev; /* nothing */ ) {
++	      cur=nextdev;
++	      if (!FD_ISSET(cur->mdev.fd,&gotSet)) {
+ 	         printf("removing \"%s\" from the list\r\n",cur->name);
+-	         *nextdev=cur->next;
+-	         close(cur->fd);
++	         nextdev=cur->next;
++	         close(cur->mdev.fd);
+ 	         free(cur->name);
+ 	         free(cur);
+ 	         devcount--;
+ 	      } else {
+-	         read(cur->fd,buf,80); /* flush */
+-	         nextdev=&(cur->next); /* follow list */
++	         read(cur->mdev.fd,buf,80); /* flush */
++	         nextdev=cur->next; /* follow list */
+ 	      }
+ 	   }
+     
+    } /* devcount>1 */
+ 
+-   mousefd=devlist->fd;
++   mdev=devlist->mdev;
+    mousename=devlist->name;
+    free(devlist);
+    printf("\r\nOk, so your mouse device is \"%s\"\r\n",mousename);
+ 
+    /* now close and reopen it, complete with initialization */
+-   opt_baud=BAUD(0);
+-   mousefd=mousereopen(mousefd,mousename,NULL);
+-  
++   opt.baud=BAUD(0);
++   mousereopen(&mdev, mousename, NULL,&opt);
++   
+    FD_ZERO(&checkSet);
+-   FD_SET(mousefd,&checkSet);
++   FD_SET(mdev.fd,&checkSet);
+    FD_SET(fileno(stdin),&checkSet);
+-   maxfd=max(mousefd,fileno(stdin));
++   maxfd=max(mdev.fd, fileno(stdin));
+ 
+ /*====================================== Identify mouse type */
+   
+@@ -440,7 +429,7 @@
+    printf("\r\nNow please press and release your left mouse button,\r\n"
+ 	 "one time only\r\n\r\n");
+ 
+-   i=read(mousefd,buf,1);
++   i=read(mdev.fd, buf, 1);
+    if (i==-1 && errno==EINVAL)
+       readamount=3;
+    else
+@@ -466,7 +455,7 @@
+       else
+          nextitem=&(cur->next);
+    }
+-   read(mousefd,buf,BUFLEN); /* flush */
++   read(mdev.fd, buf, BUFLEN); /* flush */
+ 
+ /*====================================== Packet size - second step */
+ 
+@@ -484,12 +473,12 @@
+    while (packetsize==1) {
+       int success3=0,success5=0;
+ 	
+-      opt_baud=BAUD(trial);
+-      printf("\tBaud rate is %i\r\n",opt_baud);
+-      mousefd=mousereopen(mousefd,mousename,NULL);
++      opt.baud=BAUD(trial);
++      printf("\tBaud rate is %i\r\n",opt.baud);
++      mousereopen(&mdev, mousename,NULL, &opt);
+ 	
+       printf("\r\n==> Detecting the packet size\r\n");
+-      got=eventlist(mousefd,buf,BUFLEN,GPM_B_LEFT,readamount);
++      got=eventlist(mdev.fd,buf,BUFLEN,GPM_B_LEFT,readamount);
+ 	
+       /* try three -- look at repeating arrays of 6 bytes */
+       for (i=0;i<got-12;i++)
+@@ -512,8 +501,7 @@
+       trial++;
+    }
+ 
+-/*====================================== Use that info to discard protocols */
+-  
++/*====================================== Use that info to discard protocols */ 
+    for (nextitem=&list; *nextitem; /* nothing */) {
+       struct item *cur=*nextitem;
+       int packetheads=0;
+@@ -530,7 +518,7 @@
+          if ( ((buf[i]  &(cur->this->proto)[0]) == (cur->this->proto)[1])
+ 	      && ((buf[i+1]&(cur->this->proto)[2]) == (cur->this->proto)[3]) ) {
+ 	         packetheads++;
+-	         if ((*(cur->this->fun))(&event,buf+i)==-1) {
++	         if ((*(cur->this->fun))(&mdev, &opt, buf+i, &event)==-1) {
+                packetheads--;
+                continue;
+             }
+@@ -594,7 +582,7 @@
+  * First trial: remove the "-t ms" extension if spurious buttons come in
+  */
+ 
+-   got=eventlist(mousefd,buf,BUFLEN,0,readamount);
++   got=eventlist(mdev.fd,buf,BUFLEN,0,readamount);
+    pending=0;
+    for (nextitem=&list; *nextitem; /* nothing */) {
+       struct item *cur=*nextitem;
+@@ -604,7 +592,7 @@
+       for (i=0;i<got;i++) {
+          if ( ((buf[i]  &(cur->this->proto)[0]) == (cur->this->proto)[1])
+             && ((buf[i+1]&(cur->this->proto)[2]) == (cur->this->proto)[3]) ) {
+-               if ((*(cur->this->fun))(&event,buf+i)==-1) continue;
++               if ((*(cur->this->fun))(&mdev, &opt, buf+i, &event)==-1) continue;
+                i+=packetsize-1;
+                if (event.buttons) pending--;
+          }
+@@ -624,8 +612,8 @@
+  */
+ 
+    printf("\r\n==> Looking for '-t mman'and enhanced ms\r\n");
+-   mousefd=mousereopen(mousefd,mousename, mice /* mman */);
+-   got=eventlist(mousefd,buf,BUFLEN,GPM_B_MIDDLE,readamount);
++   mousereopen(&mdev, mousename, mice /* mman */, &opt);
++   got=eventlist(mdev.fd, buf, BUFLEN, GPM_B_MIDDLE, readamount);
+ 
+    /* if it uses the 4-byte protocol, find it in a rude way */
+    for (pending=0,i=0;i<got-16;i++)
+@@ -646,7 +634,7 @@
+       for (i=0;i<got;i++) {
+          if ( ((buf[i]  &(cur->this->proto)[0]) == (cur->this->proto)[1])
+             && ((buf[i+1]&(cur->this->proto)[2]) == (cur->this->proto)[3]) ) {
+-               if ((*(cur->this->fun))(&event,buf+i)==-1) continue;
++               if ((*(cur->this->fun))(&mdev,&opt,buf+i,&event)==-1) continue;
+                i+=packetsize-1;
+                if (event.buttons && event.buttons!=GPM_B_MIDDLE) pending--;
+ 	            if (event.buttons==GPM_B_MIDDLE) pending++;
+@@ -677,16 +665,16 @@
+       char *Xtognames[3]={"'ClearDTR' and 'ClearRTS'","'ClearDTR'","'ClearRTS'"}; 
+       int alllines,lines, index;
+ 
+-      ioctl(mousefd, TIOCMGET, &alllines);
++      ioctl(mdev.fd, TIOCMGET, &alllines);
+ 
+       printf("\r\nSome mice change protocol to three-buttons-aware if some\r\n"
+ 		   "\r\ncontrol lines are toggled after opening\r\n");
+       for (index=0;index<3;index++) {
+-         mousereopen(mousefd,mousename,NULL);
++         mousereopen(&mdev, mousename, NULL, &opt);
+          lines = alllines & ~toggle[index];
+-         ioctl(mousefd, TIOCMSET, &lines);
++         ioctl(mdev.fd, TIOCMSET, &lines);
+          printf("\r\n==> Trying with '-o %s'\r\n",tognames[index]);
+-         got=eventlist(mousefd,buf,BUFLEN,GPM_B_MIDDLE,readamount);
++         got=eventlist(mdev.fd, buf, BUFLEN, GPM_B_MIDDLE, readamount);
+     
+          /* if it uses the 5-byte protocol, find it in a rude way */
+          for (pending=0,i=0;i<got-20;i++)
+@@ -717,7 +705,7 @@
+ 	
+    getchar();
+ 
+-   got=eventlist(mousefd,buf,BUFLEN,GPM_B_MIDDLE,readamount);
++   got=eventlist(mdev.fd,buf,BUFLEN,GPM_B_MIDDLE,readamount);
+ 
+    /* if it uses the 5-byte protocol, find it in a rude way */
+    for (pending=0,i=0;i<got-20;i++)
+diff -urN gpm-1.20.1/src/report.c gpm/src/report.c
+--- gpm-1.20.1/src/report.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/report.c	2003-10-02 01:22:42.000000000 -0500
+@@ -31,6 +31,7 @@
+ 
+ #include "headers/gpmInt.h"
+ #include "headers/message.h"
++#include "headers/console.h"
+ 
+ /*
+  * gpm_report
+@@ -70,7 +71,7 @@
+ 
+ void gpm_report(int line, char *file, int stat, char *text, ... )
+ {
+-   FILE *console = NULL;
++   FILE *f = NULL;
+    va_list ap;
+ 
+    va_start(ap,text);
+@@ -138,11 +139,11 @@
+                syslog(LOG_DAEMON | LOG_WARNING, GPM_STRING_WARN);
+                vsyslog(LOG_DAEMON | LOG_WARNING, text, ap);
+ #endif               
+-               if((console = fopen(GPM_SYS_CONSOLE,"a")) != NULL) {
+-                  fprintf(console,GPM_STRING_WARN);
+-                  vfprintf(console,text,ap);
+-                  fprintf(console,"\n");
+-                  fclose(console);
++               if ((f = fopen(GPM_SYS_CONSOLE, "a")) != NULL) {
++                  fprintf(f, GPM_STRING_WARN);
++                  vfprintf(f, text, ap);
++                  fprintf(f, "\n");
++                  fclose(f);
+                }   
+                break;
+  
+@@ -151,18 +152,18 @@
+                syslog(LOG_DAEMON | LOG_ERR, GPM_STRING_ERR);
+                vsyslog(LOG_DAEMON | LOG_ERR, text, ap);
+ #endif               
+-               if((console = fopen(GPM_SYS_CONSOLE,"a")) != NULL) {
+-                  fprintf(console,GPM_STRING_ERR);
+-                  vfprintf(console,text,ap);
+-                  fprintf(console,"\n");
+-                  fclose(console);
++               if ((f = fopen(GPM_SYS_CONSOLE, "a")) != NULL) {
++                  fprintf(f, GPM_STRING_ERR);
++                  vfprintf(f, text, ap);
++                  fprintf(f, "\n");
++                  fclose(f);
+                }
+ 
+-               if((console = fopen(option.consolename,"a")) != NULL) {
+-                  fprintf(console,GPM_STRING_ERR);
+-                  vfprintf(console,text,ap);
+-                  fprintf(console,"\n");
+-                  fclose(console);
++               if ((f = fopen(console.device, "a")) != NULL) {
++                  fprintf(f, GPM_STRING_ERR);
++                  vfprintf(f, text, ap);
++                  fprintf(f, "\n");
++                  fclose(f);
+                }
+                break;
+ 
+@@ -184,24 +185,24 @@
+       case GPM_RUN_DEBUG:
+          switch(stat) {
+             case GPM_STAT_INFO:
+-               console = stdout;
+-               fprintf(console,GPM_STRING_INFO); break;
++               f = stdout;
++               fprintf(f, GPM_STRING_INFO); break;
+             case GPM_STAT_WARN:
+-               console = stderr;
+-               fprintf(console,GPM_STRING_WARN); break;
++               f = stderr;
++               fprintf(f, GPM_STRING_WARN); break;
+             case GPM_STAT_ERR:
+-               console = stderr;
+-               fprintf(console,GPM_STRING_ERR); break;
++               f = stderr;
++               fprintf(f, GPM_STRING_ERR); break;
+             case GPM_STAT_DEBUG:
+-               console = stderr;
+-               fprintf(console,GPM_STRING_DEBUG); break;
++               f = stderr;
++               fprintf(f, GPM_STRING_DEBUG); break;
+             case GPM_STAT_OOPS:
+-               console = stderr;
+-               fprintf(console,GPM_STRING_OOPS); break;
++               f = stderr;
++               fprintf(f, GPM_STRING_OOPS); break;
+          }
+ 
+-         vfprintf(console,text,ap);
+-         fprintf(console,"\n");
++         vfprintf(f, text, ap);
++         fprintf(f, "\n");
+          
+          if(stat == GPM_STAT_OOPS) exit(1);
+ 
+diff -urN gpm-1.20.1/src/selection.c gpm/src/selection.c
+--- gpm-1.20.1/src/selection.c	1969-12-31 19:00:00.000000000 -0500
++++ gpm/src/selection.c	2003-10-02 01:22:42.000000000 -0500
+@@ -0,0 +1,156 @@
++/*
++ * console.c - GPM console and selection/paste handling
++ *
++ * Copyright (C) 1993        Andreq Haylett <ajh@gec-mrc.co.uk>
++ * Copyright (C) 1994-1999   Alessandro Rubini <rubini@linux.it>
++ * Copyright (C) 1998        Ian Zimmerman <itz@rahul.net>
++ * Copyright (c) 2001,2002   Nico Schottelius <nico@schottelius.org>
++ * Copyright (c) 2003        Dmitry Torokhov <dtor@mail.ru>
++ *
++ *   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>
++#include <stdlib.h>
++#include <string.h>        /* strerror(); ?!?  */
++#include <errno.h>
++#include <unistd.h>        /* select(); */
++#include <time.h>          /* time() */
++#include <sys/fcntl.h>     /* O_RDONLY */
++#include <sys/stat.h>      /* mkdir()  */
++#include <asm/types.h>     /* __u32 */
++
++#include <linux/vt.h>      /* VT_GETSTATE */
++#include <sys/kd.h>        /* KDGETMODE */
++#include <termios.h>       /* winsize */
++
++#include "headers/gpmInt.h"
++#include "headers/message.h"
++#include "headers/console.h"
++#include "headers/selection.h"
++
++struct sel_options sel_opts = { 0, 0, DEF_PTRDRAG };
++static time_t last_selection_time;
++
++/*-------------------------------------------------------------------*/
++static void selection_copy(int x1, int y1, int x2, int y2, int mode)
++{
++/*
++ * The approach in "selection" causes a bus error when run under SunOS 4.1
++ * due to alignment problems...
++ */
++   unsigned char buf[6 * sizeof(short)];
++   unsigned short *arg = (unsigned short *)buf + 1;
++   int fd;
++
++   buf[sizeof(short) - 1] = 2;  /* set selection */
++
++   arg[0] = (unsigned short)x1;
++   arg[1] = (unsigned short)y1;
++   arg[2] = (unsigned short)x2;
++   arg[3] = (unsigned short)y2;
++   arg[4] = (unsigned short)mode;
++
++   if ((fd = open_console(O_WRONLY)) < 0)
++      gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN_CON);
++
++   gpm_report(GPM_PR_DEBUG, "ctl %i, mode %i", (int)*buf, arg[4]);
++   if (ioctl(fd, TIOCLINUX, buf + sizeof(short) - 1) < 0)
++      gpm_report(GPM_PR_OOPS,GPM_MESS_IOCTL_TIOCLINUX);
++   close(fd);
++
++   if (mode < 3) {
++      sel_opts.aged = 0;
++      last_selection_time = time(0);
++   }
++}
++
++/*-------------------------------------------------------------------*/
++static void selection_paste(void)
++{
++   char c = 3;
++   int fd;
++
++   if (!sel_opts.aged && 
++      sel_opts.age_limit != 0 &&
++      last_selection_time + sel_opts.age_limit < time(0)) {
++      sel_opts.aged = 1;
++   }
++
++   if (sel_opts.aged) {
++      gpm_report(GPM_PR_DEBUG, GPM_MESS_SKIP_PASTE);
++   } else {
++      fd = open_console(O_WRONLY);
++      if (ioctl(fd, TIOCLINUX, &c) < 0)
++         gpm_report(GPM_PR_OOPS, GPM_MESS_IOCTL_TIOCLINUX);
++      close(fd);
++   }
++}
++
++/*-------------------------------------------------------------------*/
++void do_selection(Gpm_Event *event, int three_button_mode)
++{
++   static int x1 = 1, y1 = 1;
++   int x2, y2;
++
++   x2 = event->x; y2 = event->y;
++   switch(GPM_BARE_EVENTS(event->type)) {
++      case GPM_MOVE:
++         if (x2 < 1) x2++; else if (x2 > console.max_x) x2--;
++         if (y2 < 1) y2++; else if (y2 > console.max_y) y2--;
++         selection_copy(x2, y2, x2, y2, 3); /* just highlight pointer */
++         break;
++
++      case GPM_DRAG:
++         if (event->buttons == GPM_B_LEFT) {
++            switch(event->margin) { /* fix margins */
++               case GPM_TOP: x2 = 1; y2++; break;
++               case GPM_BOT: x2 = console.max_x; y2--; break;
++               case GPM_RGT: x2--; break;
++               case GPM_LFT: y2 <= y1 ? x2++ : (x2 = console.max_x, y2--); break;
++               default: break;
++            }
++            selection_copy(x1, y1, x2, y2, event->clicks);
++            if (event->clicks >= sel_opts.ptrdrag && !event->margin) /* pointer */
++               selection_copy(x2, y2, x2, y2, 3);
++         } /* if */
++         break;
++
++      case GPM_DOWN:
++         switch (event->buttons) {
++            case GPM_B_LEFT:
++               x1 = x2; y1 = y2;
++               selection_copy(x1, y1, x2, y2, event->clicks); /* start selection */
++               break;
++
++            case GPM_B_MIDDLE:
++               selection_paste();
++               break;
++
++            case GPM_B_RIGHT:
++               if (three_button_mode == 1)
++                  selection_copy(x1, y1, x2, y2, event->clicks);
++               else
++                  selection_paste();
++               break;
++         }
++   } /* switch above */
++}
++
++/*-------------------------------------------------------------------*/
++void selection_disable_paste(void)
++{
++   sel_opts.aged = 1;
++}
+diff -urN gpm-1.20.1/src/server_tools.c gpm/src/server_tools.c
+--- gpm-1.20.1/src/server_tools.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/server_tools.c	2003-10-02 01:22:42.000000000 -0500
+@@ -21,151 +21,80 @@
+  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+  ********/
+ 
++#include <string.h>
++#include <stdlib.h> /* malloc() */
++#include <sys/fcntl.h>
++
+ #include "headers/gpmInt.h"
+ #include "headers/message.h"
+ 
+-#include <stdlib.h> /* malloc() */
++struct micetab *micelist;
+ 
+-/* DESCR:   add this to the list of mice. initialization follows later */
+-/* RETURN:  - */
++/* DESCR:   allocate a new mouse and to the list of mice. initialization follows later */
++/* RETURN:  new mouse structure */
+ /* COMMENT: does error handling and exiting itself */
+-void add_mouse(int type, char *value)
++struct micetab *add_mouse(void)
+ {
+-   struct micetab *tmp = option.micelist;
++   struct micetab *mouse;
+ 
+-   /* PREAMBLE for all work: */
+-   /* -m /dev/misc/psaux -t ps2 [ -o options ] */
++   gpm_report(GPM_PR_DEBUG, "adding mouse device");
++   if (!(mouse = malloc(sizeof(struct micetab))))
++      gpm_report(GPM_PR_OOPS, GPM_MESS_NO_MEM);
++
++   memset(mouse, 0, sizeof(struct micetab));
++
++   mouse->dev.timeout = -1;
++
++   mouse->options.sequence = NULL;
++   mouse->options.sample = DEF_SAMPLE;
++   mouse->options.delta = DEF_DELTA;
++   mouse->options.accel = DEF_ACCEL;
++   mouse->options.scalex = DEF_SCALE;
++   mouse->options.scaley = DEF_SCALE;
++   mouse->options.time = DEF_TIME;
++   mouse->options.cluster = DEF_CLUSTER;
++   mouse->options.three_button = DEF_THREE;
++   mouse->options.glidepoint_tap = DEF_GLIDEPOINT_TAP;
++   mouse->options.text = NULL;
+ 
+-   switch(type) {
++   mouse->next = micelist;
++   micelist = mouse;
+ 
+-      /*---------------------------------------------------------------------*/
+-      /********************** -m mousedevice *********************************/
+-      /*---------------------------------------------------------------------*/
+-
+-      case GPM_ADD_DEVICE:
+-
+-         /* first invocation */
+-         if(option.micelist == NULL) {
+-            gpm_report(GPM_PR_DEBUG,"adding mouse device: %s",value);
+-            option.micelist = (struct micetab *) malloc(sizeof(struct micetab));
+-            if(!option.micelist) gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
+-            option.micelist->next      = NULL;
+-            option.micelist->device    = value;
+-            option.micelist->protocol  = NULL;
+-            option.micelist->options   = NULL;
+-            return;
+-         }
+-         
+-         /* find actual mouse */
+-         while(tmp->device != NULL && tmp->protocol != NULL && tmp->next !=NULL)
+-            tmp = tmp->next;
+-
+-         gpm_report(GPM_PR_DEBUG,"finished searching");
+-
+-         /* found end of micelist, add new mouse */
+-         if(tmp->next == NULL && tmp->protocol != NULL) {
+-            gpm_report(GPM_PR_DEBUG,"next mouse making");
+-            tmp->next = (struct micetab *) malloc(sizeof(struct micetab));
+-            if(!tmp) gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
+-            tmp->next      = NULL;
+-            tmp->device    = value;
+-            tmp->protocol  = NULL;
+-            tmp->options   = NULL;
+-            return;
+-         } else gpm_report(GPM_PR_OOPS,GPM_MESS_FIRST_DEV);
+-         
+-         //} else if(tmp->device != NULL && tmp->protocol == NULL)
+-         // gpm_report(GPM_PR_OOPS,GPM_MESS_FIRST_DEV); /* -m -m */
+-
+-         
+-         break;
+-
+-      /*---------------------------------------------------------------------*/
+-      /************************* -t type / protocol **************************/
+-      /*---------------------------------------------------------------------*/
+-
+-      case GPM_ADD_TYPE:
+-         if(option.micelist == NULL) gpm_report(GPM_PR_OOPS,GPM_MESS_FIRST_DEV);
+-         
+-         /* skip to next mouse, where either device or protocol is missing */
+-         while(tmp->device != NULL && tmp->protocol != NULL && tmp->next !=NULL)
+-            tmp = tmp->next;
+-         
+-         /* check whether device (-m) is there, if so, write protocol */
+-         if(tmp->device == NULL) gpm_report(GPM_PR_OOPS,GPM_MESS_FIRST_DEV);
+-         else {
+-            gpm_report(GPM_PR_DEBUG,"adding mouse type: %s",value);
+-            tmp->protocol = value;
+-            option.no_mice++;          /* finally we got our mouse */
+-         }
+-
+-         break;
+-
+-      /*---------------------------------------------------------------------*/
+-      /*************************** -o options ********************************/
+-      /*---------------------------------------------------------------------*/
+-
+-      case GPM_ADD_OPTIONS:
+-         if(option.micelist == NULL) gpm_report(GPM_PR_OOPS,GPM_MESS_FIRST_DEV);
+-
+-         /* look for the last mouse */
+-         tmp = option.micelist;
+-         while(tmp->next != NULL) tmp = tmp->next;
+-
+-         /* if -m or -t are missing exit */
+-         if(tmp->device == NULL || tmp->protocol == NULL)
+-            gpm_report(GPM_PR_OOPS,GPM_MESS_FIRST_DEV);
+-         else {
+-            gpm_report(GPM_PR_DEBUG,"adding mouse options: %s",value);
+-            tmp->options = value;
+-         }   
+-         break;
+-   }
++   return mouse;
+ }
+ 
+-/* DESCR:   mice initialization. currently print mice. */
+-/* RETURN:  0 - failed to init one or more devices 
+-            1 - init was fine */
++/* DESCR:   mice initialization. calls appropriate init functions. */
+ /* COMMENT: does error handling and exiting itself */
+-int init_mice(struct micetab *micelist)
++void init_mice(void)
+ {
+-   struct micetab *tmp = micelist;
++   struct micetab *mouse;
++   
++   for (mouse = micelist; mouse; mouse = mouse->next) {
++      if (!strcmp(mouse->device, "-"))
++         mouse->dev.fd = 0; /* use stdin */
++      else if ((mouse->dev.fd = open(mouse->device, O_RDWR | O_NDELAY)) < 0)
++         gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN, mouse->device);
+    
+-   while(tmp != NULL) {           /* there are still mice to init */
+-      gpm_report(GPM_PR_DEBUG,"initialize %s with proto %s",tmp->device,tmp->protocol);
+-      if(tmp->options != NULL) {
+-         gpm_report(GPM_PR_DEBUG,"and options %s",tmp->options);
+-      }
+-      tmp = tmp->next;
++      /* and then reset the flag */
++      fcntl(mouse->dev.fd, F_SETFL, fcntl(mouse->dev.fd, F_GETFL) & ~O_NDELAY);
++   
++      /* init the device, and use the return value as new mouse type */
++      if (mouse->type->init)
++         if (mouse->type->init(&mouse->dev, &mouse->options, mouse->type))
++            gpm_report(GPM_PR_OOPS, GPM_MESS_MOUSE_INIT);
+    }
+-
+-   gpm_report(GPM_PR_DEBUG,"finished initialization");
+-   return 1;
+ }
+ 
+ /* DESCR:   when leaving, we should reset mice to their normal state */
+-/* RETURN:  0 - failed to reset one or more devices 
+-            1 - reset was fine */
+ /* COMMENT: does error handling and exiting itself */
+-int reset_mice(struct micetab *micelist)
++void cleanup_mice(void)
+ {
+-   struct micetab *tmp = micelist;
+-   struct micetab *end = tmp;
+-
+-   while(tmp != NULL) { /* FIXME! I never get NULL, as free()d before */
+-      end = tmp;
+-      while(tmp->next != NULL) {       /* set end to the last mouse */
+-         end = tmp;
+-         tmp = tmp->next;
+-      }
+-
+-      gpm_report(GPM_PR_DEBUG,"reset: %s with proto %s",end->device,end->protocol);
+-      if(tmp->options != NULL) {
+-         gpm_report(GPM_PR_DEBUG,"and options %s",end->options);
+-      }
+-      free(end);                       /* be clean() */
+-      tmp = micelist;                  /* reset to the first mice again */
++   struct micetab *tmp;
++   
++   while ((tmp = micelist)) {
++      if (micelist->dev.private)
++         free(micelist->dev.private);
++      micelist = micelist->next;
++      free(tmp);
+    }   
+-
+-   return 1;
+ }
+diff -urN gpm-1.20.1/src/special.c gpm/src/special.c
+--- gpm-1.20.1/src/special.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/special.c	2003-10-02 01:22:42.000000000 -0500
+@@ -37,6 +37,7 @@
+ #include <sys/param.h>
+ 
+ #include "headers/gpmInt.h"
++#include "headers/console.h"
+ 
+ /*
+  * This function is only called at button press, to avoid unnecessary
+@@ -78,7 +79,7 @@
+     return 1;
+ 
+   /* devfs change */
+-  consolef=fopen(option.consolename,"w");
++  consolef = fopen(console.device, "w");
+   if (!consolef) consolef=stderr;
+   if (event->type & GPM_TRIPLE) /* just triggered: make noise and return */
+     {
+@@ -153,7 +154,7 @@
+     case 0: /* child */
+       close(0); close(1); close(2);
+       open(GPM_NULL_DEV,O_RDONLY); /* stdin  */
+-      open(option.consolename,O_WRONLY); /* stdout */
++      open(console.device, O_WRONLY); /* stdout */
+       dup(1);                     /* stderr */
+       for (i=3;i<OPEN_MAX; i++) close(i);
+       execl("/bin/sh","sh","-c",command,(char *)NULL);
+diff -urN gpm-1.20.1/src/startup.c gpm/src/startup.c
+--- gpm-1.20.1/src/startup.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/startup.c	2003-10-02 01:22:42.000000000 -0500
+@@ -26,6 +26,7 @@
+ #include <string.h>     /* strlen() */
+ #include <errno.h>      /* errno */
+ #include <unistd.h>     /* unlink,geteuid */
++#include <signal.h>
+ #include <sys/types.h>  /* geteuid, mknod */
+ #include <sys/stat.h>   /* mknod */
+ #include <fcntl.h>      /* mknod */
+@@ -34,11 +35,13 @@
+ 
+ #include "headers/gpmInt.h"
+ #include "headers/message.h"
++#include "headers/console.h"
++#include "headers/selection.h"
+ 
+ /* what todo atexit */
+ static void gpm_exited(void)
+ {
+-   gpm_report(GPM_PR_DEBUG,GPM_MESS_REMOVE_FILES, GPM_NODE_PID, GPM_NODE_CTL);
++   gpm_report(GPM_PR_DEBUG, GPM_MESS_REMOVE_FILES, GPM_NODE_PID, GPM_NODE_CTL);
+    unlink(GPM_NODE_PID);
+    unlink(GPM_NODE_CTL);
+ }
+@@ -48,34 +51,12 @@
+    extern struct options option;
+    extern int errno;
+ 
+-   int i,opt;
+-
+-   static struct {
+-      char *in;
+-      char *out;
+-   } seq[] = {
+-      {"123","01234567"},
+-      {"132","02134657"},
+-      {"213","01452367"}, /* warning: these must be readable as integers... */
+-      {"231","02461357"},
+-      {"312","04152637"},
+-      {"321","04261537"},
+-      {NULL,NULL}
+-   };
+-   
+    /* basic settings */
+    option.run_status    = GPM_RUN_STARTUP;      /* 10,9,8,... let's go */
+    option.autodetect    = 0;                    /* no mouse autodection */
+    option.progname      = argv[0];              /* who we are */
+-   option.consolename   = Gpm_get_console();    /* get consolename */
+-
+-   /* basic2: are not necessary for oops()ing, if not root */
+-   option.no_mice       = 0;                    /* counts -m + -t */
+-   option.micelist      = NULL;                 /* no mice found yet */
+-   option.repeater      = 0;                    /* repeat data */
+-   option.repeater_type = NULL;                 /* type of */
+-
+ 
++   get_console_name();
+    cmdline(argc, argv);                         /* parse command line */
+ 
+    if (geteuid() != 0) gpm_report(GPM_PR_OOPS,GPM_MESS_ROOT); /* root or exit */
+@@ -87,54 +68,18 @@
+    /****************** OLD CODE from gpn.c ***********************/
+    
+    openlog(option.progname, LOG_PID,
+-                  option.run_status != GPM_RUN_DEBUG ? LOG_DAEMON : LOG_USER);
+-   loadlut(opt_lut);
+-
+-   if (option.repeater) {
+-      if(mkfifo(GPM_NODE_FIFO,0666) && errno!=EEXIST)
+-         gpm_report(GPM_PR_OOPS,GPM_MESS_CREATE_FIFO,GPM_NODE_FIFO);
+-      if((fifofd=open(GPM_NODE_FIFO, O_RDWR|O_NONBLOCK)) < 0)
+-         gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN, GPM_NODE_FIFO);
+-   }
+-
+-   /* duplicate initialization */
+-   for (i=1; i <= 1+opt_double; i++) {
+-      which_mouse=mouse_table+i; /* used to access options */
+-      if (opt_accel < 1) exit(usage("acceleration"));
+-      if (opt_delta < 2) exit(usage("delta"));
+-      if (strlen(opt_sequence) != 3 || atoi(opt_sequence)<100)
+-         exit(usage("sequence"));
+-      if (opt_glidepoint_tap > 3) exit(usage("glidepoint tap button"));
+-      if (opt_glidepoint_tap)
+-         opt_glidepoint_tap=GPM_B_LEFT >> (opt_glidepoint_tap-1);
+-
+-      /* choose the sequence */
+-      for (opt=0; seq[opt].in && strcmp(seq[opt].in,opt_sequence); opt++) ;
+-      if(!seq[opt].in) exit(usage("button sequence"));
+-      opt_sequence=strdup(seq[opt].out); /* I can rewrite on it */
+-
+-      /* look for the mouse type */
+-      m_type = find_mouse_by_name(opt_type);
+-      if (!m_type) /* not found */
+-         exit(M_listTypes());
+-   }
++           option.run_status != GPM_RUN_DEBUG ? LOG_DAEMON : LOG_USER);
+ 
+-   /* Check repeater status */
+-   if (option.repeater) {
+-      if (strcmp(option.repeater_type,"raw") == 0)
+-         opt_rawrep = 1;
+-      else {
+-         /* look for the type */
+-         repeated_type = find_mouse_by_name(option.repeater_type);
++   console_load_lut();
+ 
+-         if(!repeated_type) exit(M_listTypes()); /* not found */
+-
+-         if (!(repeated_type->repeat_fun)) /* unsupported translation */
+-            gpm_report(GPM_PR_OOPS,GPM_MESS_NO_REPEAT,option.repeater_type);
+-      }
++   if (repeater.raw || repeater.type) {
++      if (mkfifo(GPM_NODE_FIFO, 0666) && errno != EEXIST)
++         gpm_report(GPM_PR_OOPS, GPM_MESS_CREATE_FIFO, GPM_NODE_FIFO);
++      if ((repeater.fd = open(GPM_NODE_FIFO, O_RDWR|O_NONBLOCK)) < 0)
++         gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN, GPM_NODE_FIFO);
+    }
+ 
+-   if(option.run_status == GPM_RUN_STARTUP ) { /* else is debugging */
++   if(option.run_status == GPM_RUN_STARTUP) { /* else is debugging */
+       /* goto background and become a session leader (Stefan Giessler) */  
+       switch(fork()) {
+          case -1: gpm_report(GPM_PR_OOPS,GPM_MESS_FORK_FAILED);   /* error  */
+@@ -152,13 +97,63 @@
+    /* is changing to root needed, because of relative paths ? or can we just
+     * remove and ignore it ?? FIXME */
+    if (chdir("/") < 0) gpm_report(GPM_PR_OOPS,GPM_MESS_CHDIR_FAILED);
+-
+    
+-   //return mouse_table[1].fd; /* the second is handled in the main() */
++   atexit(gpm_exited);                          /* call gpm_exited at the end */
++}
+ 
+-   /****************** OLD CODE from gpn.c  END ***********************/
++/* itz Sat Sep 12 10:30:05 PDT 1998 this function used to mix two
++   completely different things; opening a socket to a running daemon
++   and checking that a running daemon existed.  Ugly. */
++/* rewritten mostly on 20th of February 2002 - nico */   
++void check_uniqueness(void)
++{
++   FILE *fp    =  0;
++   int old_pid = -1;
+ 
+-   init_mice(option.micelist);                  /* reads option.micelist */
+-   atexit(gpm_exited);                          /* call gpm_exited at the end */
++   if ((fp = fopen(GPM_NODE_PID, "r")) != NULL) {
++      fscanf(fp, "%d", &old_pid);
++      if (kill(old_pid, 0) == -1) {
++         gpm_report(GPM_PR_INFO,GPM_MESS_STALE_PID, GPM_NODE_PID);
++         unlink(GPM_NODE_PID);
++      } else /* we are really running, exit asap! */ 
++         gpm_report(GPM_PR_OOPS, GPM_MESS_ALREADY_RUN, old_pid);
++   }
++   /* now try to sign ourself */
++   if ((fp = fopen(GPM_NODE_PID,"w")) != NULL) {
++      fprintf(fp,"%d\n",getpid());
++      fclose(fp);
++   } else {
++      gpm_report(GPM_PR_OOPS,GPM_MESS_NOTWRITE,GPM_NODE_PID);
++   }
++}
+ 
++/* itz Sat Sep 12 10:55:51 PDT 1998 Added this as replacement for the
++   unwanted functionality in check_uniqueness. */
++void kill_gpm(void)
++{
++   int old_pid;
++   FILE* fp = fopen(GPM_NODE_PID, "r");
++ 
++   /* if we cannot find the old pid file, leave */
++   if (fp == NULL) gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN, GPM_NODE_PID);
++  
++   /* else read the pid */
++   if (fscanf(fp, "%d", &old_pid) != 1)
++      gpm_report(GPM_PR_OOPS, GPM_MESS_READ_PROB, GPM_NODE_PID);
++   fclose(fp);
++
++   gpm_report(GPM_PR_DEBUG, GPM_MESS_KILLING, old_pid);
++
++   /* first check if we run */
++   if (kill(old_pid,0) == -1) {
++      gpm_report(GPM_PR_INFO, GPM_MESS_STALE_PID, GPM_NODE_PID);
++      unlink(GPM_NODE_PID);
++   }
++   /* then kill us (not directly, but the other instance ... ) */
++   if (kill(old_pid, SIGTERM) == -1)
++      gpm_report(GPM_PR_OOPS, GPM_MESS_CANT_KILL, old_pid);
++ 
++   gpm_report(GPM_PR_INFO, GPM_MESS_KILLED, old_pid);
++   exit(0);
+ }
++
+diff -urN gpm-1.20.1/src/synaptics.c gpm/src/synaptics.c
+--- gpm-1.20.1/src/synaptics.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/synaptics.c	2003-10-02 01:22:42.000000000 -0500
+@@ -865,7 +865,7 @@
+ static int           scrolling_speed_timer = 0;
+ static int           scrolling_amount_left = 0;   /* Tells how much to scroll up or down */
+ 
+-
++static int           mouse_fd;      
+ 
+ 
+ 
+@@ -882,6 +882,7 @@
+ ** which makes reading the debug data harder, only dump the report if it is different 
+ ** than the previously dumped.
+ */
++#if DEBUG_REPORTS
+ static void tp_dump_report_data (report_type report,
+ 				 int edges,
+ 				 Gpm_Event* state) 
+@@ -934,7 +935,7 @@
+ 	      (multi_finger_pressure>4500 && multi_finger_xy>50000? 'f':' '));
+ 
+ }
+-
++#endif
+ 
+ /* syn_dump_info
+ **
+@@ -1158,8 +1159,8 @@
+ 	status = GPM_B_NOT_SET;
+ 	break;
+       case Reset_Touchpad_Action:
+-	syn_ps2_reset(which_mouse->fd);
+-	syn_ps2_absolute_mode(which_mouse->fd);
++	syn_ps2_reset(mouse_fd);
++	syn_ps2_absolute_mode(mouse_fd);
+ 	status = GPM_B_NOT_SET;
+ 	break;
+       case Toggle_Four_Way_Button_Action:
+@@ -2950,10 +2951,8 @@
+ 	     data [0],data [1],data [2],data [3],data [4],data [5]);
+ 
+   if (reset_on_error_enabled) {
+-    /* Hack to get the fd: which_mouse is the current mouse,
+-       and as the synaptic code is called, it is the current mouse. */
+-    syn_ps2_reset(which_mouse->fd);
+-    syn_ps2_absolute_mode(which_mouse->fd);
++    syn_ps2_reset(mouse_fd);
++    syn_ps2_absolute_mode(mouse_fd);
+   }
+   
+   report->left        = 0;
+@@ -3108,7 +3107,7 @@
+ **
+ ** Process the touchpad 6 byte report.
+ */
+-void syn_process_serial_data (Gpm_Event *state,
++void syn_process_serial_data (int fd, Gpm_Event *state,
+ 			      unsigned char *data) 
+ {
+   /* initialize the state */
+@@ -3116,6 +3115,8 @@
+   state->dx      = 0;
+   state->dy      = 0;
+ 
++  mouse_fd = fd; /* cheat */
++  
+   syn_serial_translate_data (data, &cur_report);
+   if (wmode_enabled){
+     syn_process_wmode_report(&cur_report);
+@@ -3196,7 +3197,7 @@
+ **
+ ** Process the touchpad 6 byte report.
+ */
+-void syn_process_ps2_data (Gpm_Event *state,
++void syn_process_ps2_data (int fd, Gpm_Event *state,
+ 			   unsigned char *data) 
+ {
+   /*   gpm_report(GPM_PR_DEBUG,"Data %02x %02x %02x %02x %02x %02x",data[0],data[1],data[2],data[3],data[4],data[5]); */
+@@ -3206,6 +3207,7 @@
+   state->dx      = 0;
+   state->dy      = 0;
+ 
++  mouse_fd = fd; /* cheat */
+ 
+   if (wmode_enabled) {
+     syn_ps2_translate_wmode_data (data, &cur_report);
+diff -urN gpm-1.20.1/src/tools.c gpm/src/tools.c
+--- gpm-1.20.1/src/tools.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/tools.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,93 +0,0 @@
+-/*
+- * tools.c - tools which are needed by client and server
+- *
+- * Copyright (c) 2001 	     Nico Schottelius <nico@schottelius.org>
+- *
+- *   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> /* NULL */
+-#include <string.h>
+-#include <stdlib.h>
+-#include <sys/types.h>  /* these three are */
+-#include <sys/stat.h>   /* needed for      */
+-#include <unistd.h>     /* stat() */
+-
+-#include "headers/gpmInt.h"   /* only used for some defines */
+-#include "headers/message.h"
+-
+-/*****************************************************************************
+- * check, whether devfs is used or not.
+- * See /usr/src/linux/Documentation/filesystems/devfs/ for details.
+- * Returns: the name of the console (/dev/tty0 or /dev/vc/0)
+- *****************************************************************************/
+-char *Gpm_get_console( void )
+-{
+-
+-   char *back = NULL, *tmp = NULL;
+-   struct stat buf;
+-
+-   /* first try the devfs device, because in the next time this will be
+-    * the preferred one. If that fails, take the old console */
+-   
+-   /* Check for open new console */
+-   if (stat(GPM_DEVFS_CONSOLE,&buf) == 0)
+-      tmp = GPM_DEVFS_CONSOLE;
+-  
+-   /* Failed, try OLD console */
+-   else if(stat(GPM_OLD_CONSOLE,&buf) == 0)
+-      tmp = GPM_OLD_CONSOLE;
+-  
+-   if(tmp != NULL)
+-      if((back = malloc(strlen(tmp) + sizeof(char)) ) != NULL)
+-         strcpy(back,tmp);
+-
+-   return(back);
+-}
+-
+-/* what's the english name for potenz ? */
+-int Gpm_x_high_y(int base, int pot_y)
+-{
+-   int val = 1;
+-   
+-   if(pot_y == 0) val = 1;
+-   else if(pot_y  < 0) val = 0;     /* ugly hack ;) */
+-   else while(pot_y > 0) {
+-      val = val * base;
+-      pot_y--;
+-   }   
+-   return val;
+-}   
+-      
+-/* return characters needed to display int */
+-int Gpm_cnt_digits(int number)
+-{
+-   /* 0-9 = 1        10^0 <-> (10^1)-1
+-    * 10 - 99 = 2    10^1 <-> (10^2)-1
+-    * 100 - 999 = 3  10^2 <-> (10^3)-1
+-    * 1000 - 9999 = 4 ...  */
+-   
+-   int ret = 0, num = 0;
+-
+-   /* non negative, please */
+-   if(number < 0) number *= -1;
+-   else if(number == 0) ret = 1;
+-   else while(number > num) {
+-      ret++;
+-      num = (Gpm_x_high_y(10,ret) - 1);
+-   }   
+-
+-   return(ret);
+-}      
+diff -urN gpm-1.20.1/src/twiddler.c gpm/src/twiddler.c
+--- gpm-1.20.1/src/twiddler.c	2002-12-24 17:57:16.000000000 -0500
++++ gpm/src/twiddler.c	2003-10-02 01:22:42.000000000 -0500
+@@ -54,6 +54,7 @@
+ #include "headers/gpm.h"
+ #include "headers/gpmInt.h"
+ #include "headers/message.h"
++#include "headers/console.h"
+ #include "headers/twiddler.h"
+ 
+ 
+@@ -134,17 +135,6 @@
+    int (*fun)(char *string);
+ };
+ 
+-
+-/* The same silly function as in gpm.c */
+-static inline int open_console(const int mode)
+-{
+-   int fd;
+-   extern struct options option;
+-   if ((fd=open(option.consolename, mode)) < 0) gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN,option.consolename);
+-   return fd;
+-}
+-
+-
+ /*===================================================================*/
+ /*              This part deals with pushing keys                  */
+ 
+@@ -175,7 +165,7 @@
+ int twiddler_exec(char *s)
+ {
+    int pid;
+-   extern struct options option;
++   
+    switch(pid=fork()) {
+       case -1: return -1;
+       case 0:
+@@ -184,7 +174,7 @@
+          close(2); /* very rude! */
+       
+          open(GPM_NULL_DEV,O_RDONLY);
+-         open(option.consolename,O_WRONLY);
++         open(console.device, O_WRONLY);
+          dup(1);
+          execl("/bin/sh", "sh", "-c", s, NULL);
+          exit(1); /* shouldn't happen */
diff --git a/source/a/gpm/gpm.SlackBuild b/source/a/gpm/gpm.SlackBuild
new file mode 100755
index 000000000..b0352fe89
--- /dev/null
+++ b/source/a/gpm/gpm.SlackBuild
@@ -0,0 +1,149 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+# by: volkerdi@slackware.com
+
+VERSION=1.20.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-5}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-gpm
+
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf gpm-$VERSION
+tar xjvf $CWD/gpm-$VERSION.tar.bz2
+cd gpm-$VERSION
+sed -i -e "s/OPEN_MAX/NR_OPEN/" $(grep -lr OPEN_MAX *)
+chown -R root:root .
+find . \
+  \( -perm 700 -o -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/gpm-evdev-cumulative.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm.evdevmakefile.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-math.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-weak-wgetch.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-nodebug.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-gpmopen.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-idie.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-subscript.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-input.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-consolename.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-multilib.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-no-console-error.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-lib-silent.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1.send-noise-to-syslogs.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gpm-1.20.1-input-defines.diff.gz | patch -p1 --verbose || exit 1
+
+autoconf
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  $ARCH-slackware-linux
+
+make || exit 1
+zcat $CWD/inputattach.c.gz > inputattach.c
+gcc $SLKCFLAGS -o inputattach inputattach.c || exit
+
+mkdir -p $PKG/usr/bin $PKG/etc/rc.d
+cat inputattach > $PKG/usr/bin/inputattach
+( cd src
+  mkdir -p $PKG/usr/sbin
+  cat gpm > $PKG/usr/sbin/gpm
+  cat prog/disable-paste > $PKG/usr/bin/disable-paste
+  cat prog/gpm-root > $PKG/usr/bin/gpm-root
+  cat prog/hltest > $PKG/usr/bin/hltest
+  cat prog/mev > $PKG/usr/bin/mev
+  cat prog/mouse-test > $PKG/usr/bin/mouse-test
+  mkdir -p $PKG/usr/include
+  cp headers/gpm.h $PKG/usr/include/gpm.h
+  chmod 644 $PKG/usr/include/gpm.h
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} $PKG/lib${LIBDIRSUFFIX}
+  cat lib/libgpm.a > $PKG/usr/lib${LIBDIRSUFFIX}/libgpm.a
+  cat lib/libgpm.so.1.19.0 > $PKG/lib${LIBDIRSUFFIX}/libgpm.so.1.19.0
+  chmod 755 $PKG/lib${LIBDIRSUFFIX}/libgpm.so.1.19.0
+)
+( cd conf
+  mkdir -p $PKG/etc
+  cat gpm-root.conf > $PKG/etc/gpm-root.conf
+  cat gpm-syn.conf > $PKG/etc/gpm-syn.conf
+  cat gpm-twiddler.conf > $PKG/etc/gpm-twiddler.conf
+)
+( cd contrib/emacs
+  mkdir -p $PKG/usr/share/emacs/site-lisp
+  cat t-mouse.el > $PKG/usr/share/emacs/site-lisp/t-mouse.el
+)
+mkdir -p $PKG/usr/doc/gpm-$VERSION
+cp -a \
+  BUGS COPYING Changelog Changes MANIFEST README TODO \
+  $PKG/usr/doc/gpm-$VERSION
+( cd doc
+  for page in *.1 *.7 *.8 ; do
+    CHAPTER=`echo $page | cut -f 2 -d .`
+    mkdir -p $PKG/usr/man/man$CHAPTER
+    cat $page | gzip -9c > $PKG/usr/man/man${CHAPTER}/$page.gz
+  done
+  mkdir -p $PKG/usr/info
+  cat gpm.info | gzip -9c > $PKG/usr/info/gpm.info.gz
+  cp -a \
+    Announce FAQ HACK_GPM README* \
+    $PKG/usr/doc/gpm-$VERSION
+)
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  ln -sf ../../lib${LIBDIRSUFFIX}/libgpm.so.1 libgpm.so )
+( cd $PKG/lib${LIBDIRSUFFIX} ; ln -sf libgpm.so.1.19.0 libgpm.so.1 )
+zcat $CWD/mouseconfig.gz > $PKG/usr/sbin/mouseconfig
+chmod 755 $PKG/usr/bin/* $PKG/usr/sbin/*
+mkdir -p $PKG/var/log/setup
+zcat $CWD/setup.mouse.gz > $PKG/var/log/setup/setup.mouse
+chmod 755 $PKG/var/log/setup/setup.mouse
+( 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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/gpm-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/gpm/gpm.evdevmakefile.patch b/source/a/gpm/gpm.evdevmakefile.patch
new file mode 100644
index 000000000..bd56c3aab
--- /dev/null
+++ b/source/a/gpm/gpm.evdevmakefile.patch
@@ -0,0 +1,11 @@
+--- ./src/Makefile.in.orig	2006-02-07 15:24:17.000000000 -0600
++++ ./src/Makefile.in	2006-02-07 15:26:03.000000000 -0600
+@@ -12,7 +12,7 @@
+ include $(top_builddir)/Makefile.include
+ 
+ # Main portion: regular build rules
+-MICESRC = mice.c twiddler.c synaptics.c @EVDEV_SRCS@
++MICESRC = mice.c twiddler.c synaptics.c evdev.c
+ 
+ GSRC = main.c gpm.c gpn.c special.c startup.c server_tools.c console.c \
+        selection.c client.c optparser.c $(MICESRC)
diff --git a/source/a/gpm/inputattach.c b/source/a/gpm/inputattach.c
new file mode 100644
index 000000000..c47fad137
--- /dev/null
+++ b/source/a/gpm/inputattach.c
@@ -0,0 +1,472 @@
+/*
+ * $Id: inputattach.c,v 1.21 2002/07/10 22:34:01 vojtech Exp $
+ *
+ *  Copyright (c) 1999-2000 Vojtech Pavlik
+ *
+ *  Sponsored by SuSE
+ *
+ *  Twiddler support Copyright (c) 2001 Arndt Schoenewald
+ *  Sponsored by Quelltext AG (http://www.quelltext-ag.de), Dortmund, Germany
+ */
+
+/*
+ * Input line discipline attach program
+ */
+
+/*
+ * 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
+ * 
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
+ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ */
+
+#include <linux/serio.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <termios.h>
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+
+int readchar(int fd, unsigned char *c, int timeout)
+{
+	struct timeval tv;
+	fd_set set;
+	
+	tv.tv_sec = 0;
+	tv.tv_usec = timeout * 1000;
+
+	FD_ZERO(&set);
+	FD_SET(fd, &set);
+
+	if (!select(fd+1, &set, NULL, NULL, &tv)) return -1;
+	if (read(fd, c, 1) != 1) return -1;
+
+	return 0;
+}
+
+
+
+void setline(int fd, int flags, int speed)
+{
+	struct termios t;
+
+	tcgetattr(fd, &t);
+
+	t.c_cflag = flags | CREAD | HUPCL | CLOCAL;
+	t.c_iflag = IGNBRK | IGNPAR;
+	t.c_oflag = 0;
+	t.c_lflag = 0;
+	t.c_cc[VMIN ] = 1;
+	t.c_cc[VTIME] = 0;
+
+	cfsetispeed(&t, speed);
+	cfsetospeed(&t, speed);
+
+	tcsetattr(fd, TCSANOW, &t);
+}
+
+int logitech_command(int fd, char *c)
+{
+	int i;
+	unsigned char d;
+	for (i = 0; c[i]; i++) {
+		write(fd, c + i, 1);
+		if (readchar(fd, &d, 1000))
+			return -1;
+		if (c[i] != d)
+			return -1;
+	}
+	return 0;
+}
+
+int magellan_init(int fd, long *id, long *extra)
+{
+	write(fd, "m3\rpBB\rz\r", 9);
+	return 0;
+}
+
+int warrior_init(int fd, long *id, long *extra)
+{
+	if (logitech_command(fd, "*S")) return -1;
+	setline(fd, CS8, B4800);
+	return 0;
+}
+
+int spaceball_waitchar(int fd, unsigned char c, unsigned char *d, int timeout)
+{
+	unsigned char b = 0;
+
+	while (!readchar(fd, &b, timeout)) {
+		if (b == 0x0a) continue;
+		*d++ = b;
+		if (b == c) break;
+	}
+
+	*d = 0;
+
+	return -(b != c);
+}
+
+int spaceball_waitcmd(int fd, char c, char *d)
+{
+	int i;
+
+	for (i = 0; i < 8; i++) {
+		if (spaceball_waitchar(fd, 0x0d, d, 1000))
+			return -1;
+		if (d[0] == c)
+			return 0;
+	}
+
+	return -1;
+}
+
+int spaceball_cmd(int fd, char *c, char *d)
+{
+	int i;
+
+	for (i = 0; c[i]; i++)
+		write(fd, c + i, 1);
+	write(fd, "\r", 1);
+
+	i = spaceball_waitcmd(fd, toupper(c[0]), d);
+
+	return i;
+}
+
+#define SPACEBALL_1003		1
+#define SPACEBALL_2003B		3
+#define SPACEBALL_2003C		4
+#define SPACEBALL_3003C		7
+#define SPACEBALL_4000FLX	8
+#define SPACEBALL_4000FLX_L 	9
+
+int spaceball_init(int fd, long *id, long *extra)
+{
+	char r[64];
+
+	if (spaceball_waitchar(fd, 0x11, r, 4000) ||
+	    spaceball_waitchar(fd, 0x0d, r, 1000))
+		return -1;
+
+	if (spaceball_waitcmd(fd, '@', r))
+		return -1; 
+
+	if (strncmp("@1 Spaceball alive", r, 18))
+		return -1;
+
+	if (spaceball_waitcmd(fd, '@', r))
+		return -1; 
+
+	if (spaceball_cmd(fd, "hm", r))
+		return -1;
+
+	if (!strncmp("Hm2003B", r, 7))
+		*id = SPACEBALL_2003B;
+	if (!strncmp("Hm2003C", r, 7))
+		*id = SPACEBALL_2003C;
+	if (!strncmp("Hm3003C", r, 7))
+		*id = SPACEBALL_3003C;
+
+	if (!strncmp("HvFirmware", r, 10)) {
+
+		if (spaceball_cmd(fd, "\"", r))
+			return -1;
+
+		if (strncmp("\"1 Spaceball 4000 FLX", r, 21))
+			return -1;
+
+		if (spaceball_waitcmd(fd, '"', r))
+			return -1; 
+
+		if (strstr(r, " L "))
+			*id = SPACEBALL_4000FLX_L;
+		else
+			*id = SPACEBALL_4000FLX;
+
+		if (spaceball_waitcmd(fd, '"', r))
+			return -1; 
+
+		if (spaceball_cmd(fd, "YS", r))
+        	        return -1;
+
+		if (spaceball_cmd(fd, "M", r))
+        	        return -1;
+
+		return 0;
+	}
+
+	if (spaceball_cmd(fd, "P@A@A", r) ||
+	    spaceball_cmd(fd, "FT@", r)   ||
+	    spaceball_cmd(fd, "MSS", r))
+		return -1;
+
+	return 0;
+}
+
+int stinger_init(int fd, long *id, long *extra)
+{
+	int i;
+	unsigned char c;
+	unsigned char *response = "\r\n0600520058C272";
+
+	if (write(fd, " E5E5", 5) != 5)		/* Enable command */
+		return -1; 
+
+	for (i = 0; i < 16; i++)		/* Check for Stinger */
+		if (readchar(fd, &c, 200) || (c != response[i])) 
+			return -1;
+
+	return 0;
+}
+
+int mzp_init(int fd, long *id, long *extra)
+{
+	if (logitech_command(fd, "*X*q")) return -1;
+	setline(fd, CS8, B9600);
+	return 0;
+}
+
+int newton_init(int fd, long *id, long *extra)
+{
+  int i;
+  unsigned char c;
+  unsigned char response[35] =
+  { 0x16, 0x10, 0x02, 0x64, 0x5f, 0x69, 0x64, 0x00,
+    0x00, 0x00, 0x0c, 0x6b, 0x79, 0x62, 0x64, 0x61,
+    0x70, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x01, 0x6e,
+    0x6f, 0x66, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x10,
+    0x03, 0xdd, 0xe7 };
+
+  for (i = 0; i < 35; i++)
+    if (readchar(fd, &c, 400) || (c != response[i]))
+      return -1;
+
+  return 0;
+}
+
+int twiddler_init(int fd, long *id, long *extra)
+{
+	unsigned char c[10];
+	int count, line;
+
+	/* Turn DTR off, otherwise the Twiddler won't send any data. */
+	if (ioctl(fd, TIOCMGET, &line)) return -1;
+	line &= ~TIOCM_DTR;
+	if (ioctl(fd, TIOCMSET, &line)) return -1;
+
+	/* Check whether the device on the serial line is the Twiddler.
+	 *
+	 * The Twiddler sends data packets of 5 bytes which have the following
+	 * properties: the MSB is 0 on the first and 1 on all other bytes, and
+	 * the high order nibble of the last byte is always 0x8.
+	 *
+	 * We read and check two of those 5 byte packets to be sure that we
+	 * are indeed talking to a Twiddler. */
+
+	/* Read at most 5 bytes until we find one with the MSB set to 0 */
+	for (count = 0; count < 5; count++) {
+		if (readchar(fd, c+0, 500)) return -1;
+		if ((c[0] & 0x80) == 0) break;
+	}
+
+	if (count == 5) {
+		/* Could not find header byte in data stream */
+		return -1;
+	}
+
+	/* Read remaining 4 bytes plus the full next data packet */
+	for (count = 1; count < 10; count++) {
+		if (readchar(fd, c+count, 500)) return -1;
+	}
+
+	/* Check whether the bytes of both data packets obey the rules */
+	for (count = 1; count < 10; count++) {
+		if ((count % 5 == 0 && (c[count] & 0x80) != 0)
+		    || (count % 5 == 4 && (c[count] & 0xF0) != 0x80)
+		    || (count % 5 != 0 && (c[count] & 0x80) != 0x80)) {
+		    	/* Invalid byte in data packet */
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int dump_init(int fd, long *id, long *extra)
+{
+	unsigned char c, o = 0;
+
+	c = 0x80;
+
+	if (write(fd, &c, 1) != 1)         /* Enable command */
+                return -1;
+
+	while (1)
+		if (!readchar(fd, &c, 1)) {
+			printf("%02x (%c) ", c, ((c > 32) && (c < 127)) ? c : 'x');
+			o = 1;
+		} else {
+			if (o) {
+				printf("\n");
+				o = 0;
+			}
+		}
+}
+
+struct input_types {
+	char name[16];
+	char name2[16];
+	int speed;
+	int flags;
+	unsigned long type;
+	unsigned long extra;
+	int flush;
+	int (*init)(int fd, long *id, long *extra);
+};
+
+struct input_types input_types[] = {
+
+{ "--sunkbd",		"-skb",		B1200, CS8,			SERIO_SUNKBD,	0x00,	1,	NULL },
+{ "--spaceorb",		"-orb",		B9600, CS8,			SERIO_SPACEORB,	0x00,	1,	NULL },
+{ "--spaceball",	"-sbl",		B9600, CS8,			SERIO_SPACEBALL,0x00,	0,	spaceball_init },
+{ "--magellan",		"-mag",		B9600, CS8 | CSTOPB | CRTSCTS,	SERIO_MAGELLAN,	0x00,	1,	magellan_init },
+{ "--warrior",		"-war",		B1200, CS7 | CSTOPB,		SERIO_WARRIOR,	0x00,	1,	warrior_init },
+{ "--stinger",		"-sting",	B1200, CS8,			SERIO_STINGER,	0x00,	1,	stinger_init },
+{ "--mousesystems",	"-msc",		B1200, CS8,			SERIO_MSC,	0x01,	1,	NULL },
+{ "--sunmouse",		"-sun",		B1200, CS8,			SERIO_SUN,	0x01,	1,	NULL },
+{ "--microsoft",	"-bare",	B1200, CS7,			SERIO_MS,	0x00,	1,	NULL },
+{ "--mshack",		"-ms",		B1200, CS7,			SERIO_MS,	0x01,	1,	NULL },
+{ "--mouseman",		"-mman",	B1200, CS7,			SERIO_MP,	0x01,	1,	NULL },
+{ "--intellimouse",	"-ms3",		B1200, CS7,			SERIO_MZ,	0x11,	1,	NULL },
+{ "--mmwheel",		"-mmw",		B1200, CS7 | CSTOPB,		SERIO_MZP,	0x13,	1,	mzp_init },
+{ "--iforce",		"-ifor",	B38400, CS8,			SERIO_IFORCE,	0x00,	0,	NULL },
+{ "--newtonkbd",        "-newt",        B9600, CS8,                     SERIO_NEWTON,	0x00,   0,      newton_init },
+{ "--h3600ts",          "-ipaq",     	B115200, CS8,                   SERIO_H3600,	0x00,   0,      NULL },
+{ "--stowawaykbd",      "-ipaqkbd",     B115200, CS8,                   SERIO_STOWAWAY, 0x00,   0,      NULL },
+{ "--ps2serkbd",	"-ps2ser",	B1200, CS8,			SERIO_PS2SER,	0x00,	1,	NULL },
+#if 0
+{ "--twiddler",		"-twid",	B2400, CS8,			SERIO_TWIDKBD,	0x00,	0,	twiddler_init },
+{ "--twiddler-joy",	"-twidjoy",	B2400, CS8,			SERIO_TWIDJOY,	0x00,	0,	twiddler_init },
+{ "--ipod-remote",	"-ipod",	B9600, CS8,			SERIO_IPOD_REM,	0x00,	0,	NULL },
+#endif
+{ "--dump",		"-dump",	B2400, CS8, 			0,		0x00,	0,	dump_init },
+{ "", "", 0, 0 }
+
+};
+
+int main(int argc, char **argv)
+{
+	unsigned long devt;
+	int ldisc;
+        int type;
+	long id, extra;
+        int fd;
+	char c;
+
+        if (argc < 2 || argc > 4 || (argc == 4 && strcmp(argv[3], "--daemon")) || !strcmp("--help", argv[1])) {
+                puts("");
+                puts("Usage: inputttach <mode> <device>");
+                puts("");
+                puts("Modes:");
+                puts("  --sunkbd        -skb   Sun Type 4 and Type 5 keyboards");
+                puts("  --spaceorb      -orb   SpaceOrb 360 / SpaceBall Avenger");
+		puts("  --spaceball     -sbl   SpaceBall 2003 / 3003 / 4000 FLX");
+                puts("  --magellan      -mag   Magellan / SpaceMouse");
+                puts("  --warrior       -war   WingMan Warrior");
+		puts("  --stinger       -stng  Gravis Stinger");
+		puts("  --mousesystems  -msc   3-button Mouse Systems mice");
+		puts("  --sunmouse      -sun   3-button Sun mice");
+		puts("  --microsoft     -bare  2-button Microsoft mice");
+		puts("  --mshack        -ms    3-button mice in Microsoft mode");
+		puts("  --mouseman      -mman  3-button Logitech and Genius mice");
+		puts("  --intellimouse  -ms3   Microsoft IntelliMouse");
+		puts("  --mmwheel       -mmw   Logitech mice with 4-5 buttons or wheel");
+		puts("  --iforce        -ifor  I-Force joysticks and wheels");
+                puts("  --h3600ts       -ipaq  Ipaq h3600 touchscreen");
+		puts("  --stowawaykbd   -ipaqkbd  Stowaway keyboard");
+		puts("  --ps2serkbd     -ps2ser PS/2 via serial keyboard");
+#if 0
+		puts("  --twiddler      -twid   Handykey Twiddler chording keyboard");
+		puts("  --twiddler-joy  -twidjoy  Handykey Twiddler used as a joystick");
+		puts("  --ipod-remote   -ipod  iPod remote control");
+#endif
+		puts("");
+                return 1;
+        }
+
+        for (type = 0; input_types[type].speed; type++) {
+                if (!strncasecmp(argv[1], input_types[type].name, 16) ||
+			!strncasecmp(argv[1], input_types[type].name2, 16))
+                        break;
+        }
+
+	if (!input_types[type].speed) {
+		fprintf(stderr, "inputattach: invalid mode\n");
+		return 1;
+	}
+
+	if ((fd = open(argv[2], O_RDWR | O_NOCTTY | O_NONBLOCK)) < 0) {
+		perror("inputattach");
+		return 1;
+	}
+
+	setline(fd, input_types[type].flags, input_types[type].speed);
+
+	if (input_types[type].flush)
+		while (!readchar(fd, &c, 100));
+
+	id = 0;
+	extra = input_types[type].extra;
+
+	if (input_types[type].init && input_types[type].init(fd, &id, &extra)) {
+		fprintf(stderr, "inputattach: device initialization failed\n");
+		return 1;
+	}
+
+	ldisc = N_MOUSE;
+	if(ioctl(fd, TIOCSETD, &ldisc)) {
+		fprintf(stderr, "inputattach: can't set line discipline\n"); 
+		return 1;
+	}
+
+	devt = SERIO_RS232 | input_types[type].type | (id << 8) | (extra << 16);
+
+	if(ioctl(fd, SPIOCSTYPE, &devt)) {
+		fprintf(stderr, "inputattach: can't set device type\n");
+		return 1;
+	}
+	
+	if (argc == 4 && !strcmp(argv[3],"--daemon"))
+		daemon(0,0);
+
+	read(fd, NULL, 0);
+
+	ldisc = 0;
+	ioctl(fd, TIOCSETD, &ldisc);
+	close(fd);
+
+	return 0;
+}
diff --git a/source/a/gpm/mouseconfig b/source/a/gpm/mouseconfig
new file mode 100644
index 000000000..4e9575f51
--- /dev/null
+++ b/source/a/gpm/mouseconfig
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Starts the Slackware mouse configuration menu, where you can set your
+# /dev/mouse link and configure gpm.
+COLOR=on
+export COLOR
+cd / 
+/bin/sh /var/log/setup/setup.mouse /
diff --git a/source/a/gpm/setup.mouse b/source/a/gpm/setup.mouse
new file mode 100644
index 000000000..dcdc6a8f9
--- /dev/null
+++ b/source/a/gpm/setup.mouse
@@ -0,0 +1,154 @@
+#!/bin/sh
+#BLURB="Configure the console mouse support (GPM)."
+T_PX=$1
+TMP=/var/log/setup/tmp
+GPM=/usr/sbin/gpm
+# If the mouse is USB, we can autodetect it:
+if [ -r /proc/bus/usb/devices ]; then
+ if cat /proc/bus/usb/devices | grep usb_mouse 1> /dev/null 2> /dev/null ; then
+  MOUSE_TYPE=usb
+  MTYPE="imps2"
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf input/mice mouse )
+ fi
+fi
+
+if [ "$MOUSE_TYPE" = "" ]; then
+ dialog --title "MOUSE CONFIGURATION" --default-item "imps2" --menu \
+"This part of the configuration \
+process will create a /dev/mouse link pointing to your default mouse device.  \
+You can change the /dev/mouse link later if the mouse doesn't work, or if \
+you switch to a different type of pointing device.  We will also use the \
+information about the mouse to set the correct protocol for gpm, the Linux \
+mouse server.  Please select a mouse type \
+from the list below:" 20 76 8 \
+ "ps2" "PS/2 port mouse (most desktops and laptops)" \
+ "usb" "USB connected mouse" \
+ "imps2" "Microsoft PS/2 Intellimouse" \
+ "exps2" "Intellimouse Explorer PS/2" \
+ "bare" "2 button Microsoft compatible serial mouse" \
+ "ms" "3 button Microsoft compatible serial mouse" \
+ "mman" "Logitech serial MouseMan and similar devices" \
+ "msc" "MouseSystems serial (most 3 button serial mice)" \
+ "pnp" "Plug and Play (serial mice that do not work with ms)" \
+ "ms3" "Microsoft serial Intellimouse" \
+ "netmouse" "Genius Netmouse on PS/2 port" \
+ "logi" "Some serial Logitech devices" \
+ "logim" "Make serial Logitech behave like msc" \
+ "atibm" "ATI XL busmouse (mouse card)" \
+ "inportbm" "Microsoft busmouse (mouse card)" \
+ "logibm" "Logitech busmouse (mouse card)" \
+ "ncr" "A pointing pen (NCR3125) on some laptops" \
+ "twid" "Twiddler keyboard, by HandyKey Corp" \
+ "genitizer" "Genitizer tablet (relative mode)" \
+ "js" "Use a joystick as a mouse" \
+ "wacom" "Wacom serial graphics tablet" \
+ 2> $TMP/mtype
+ if [ ! $? = 0 ]; then
+  rm -f $TMP/mtype
+  exit
+ fi
+ if [ -f $TMP/mtype ]; then
+  MOUSE_TYPE="`cat $TMP/mtype`"
+ else
+  unset MOUSE_TYPE
+ fi
+ rm -f $TMP/mtype
+ if [ "$MOUSE_TYPE" = "bare" -o "$MOUSE_TYPE" = "ms" \
+ -o "$MOUSE_TYPE" = "mman" -o "$MOUSE_TYPE" = "msc" \
+ -o "$MOUSE_TYPE" = "genitizer" \
+ -o "$MOUSE_TYPE" = "pnp" -o "$MOUSE_TYPE" = "ms3" \
+ -o "$MOUSE_TYPE" = "logi" -o "$MOUSE_TYPE" = "logim" \
+ -o "$MOUSE_TYPE" = "wacom" -o "$MOUSE_TYPE" = "twid" ]; then
+  dialog --title "SELECT SERIAL PORT" --menu "Your mouse requires a \
+serial port.  Which one would you like to use?" 12 50 4 \
+  "/dev/ttyS0" "(COM1: under DOS)" \
+  "/dev/ttyS1" "(COM2: under DOS)" \
+  "/dev/ttyS2" "(COM3: under DOS)" \
+  "/dev/ttyS3" "(COM4: under DOS)" 2> $TMP/mport
+  if [ ! $? = 0 ]; then
+   rm -f $TMP/mport
+   exit
+  fi
+  MDEVICE="`cat $TMP/mport`"
+  SHORT_MDEVICE=`basename $MDEVICE`
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf $SHORT_MDEVICE mouse )
+  # For the serial mice, the protocol is the same as the mouse type:
+  MTYPE=$MOUSE_TYPE
+  rm -f $TMP/mport
+ elif [ "$MOUSE_TYPE" = "ps2" ]; then
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf psaux mouse )
+  MTYPE="ps2"
+ elif [ "$MOUSE_TYPE" = "ncr" ]; then
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf psaux mouse )
+  MTYPE="ncr"
+ elif [ "$MOUSE_TYPE" = "exps2" ]; then
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf psaux mouse )
+  MTYPE="exps2"
+ elif [ "$MOUSE_TYPE" = "imps2" ]; then
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf psaux mouse )
+  MTYPE="imps2"
+ elif [ "$MOUSE_TYPE" = "logibm" ]; then
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf logibm mouse )
+  MTYPE="ps2"
+ elif [ "$MOUSE_TYPE" = "atibm" ]; then
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf atibm mouse )
+  MTYPE="ps2"
+ elif [ "$MOUSE_TYPE" = "inportbm" ]; then
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf inportbm mouse )
+  MTYPE="bm"
+ elif [ "$MOUSE_TYPE" = "js" ]; then
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf js0 mouse )
+  MTYPE="js"
+ elif [ "$MOUSE_TYPE" = "usb" ]; then
+  ( cd $T_PX/dev ; rm -f mouse ; ln -sf input/mice mouse )
+  MTYPE="imps2"
+ fi
+fi
+
+# OK, we know enough now to create a sample rc.gpm:
+cat << EOF > $T_PX/etc/rc.d/rc.gpm-sample
+#!/bin/sh
+# Start/stop/restart the GPM mouse server:
+
+if [ "\$1" = "stop" ]; then
+  echo "Stopping gpm..."
+  $GPM -k
+elif [ "\$1" = "restart" ]; then
+  echo "Restarting gpm..."
+  $GPM -k
+  sleep 1
+  $GPM -m /dev/mouse -t $MTYPE
+else # assume \$1 = start:
+  echo "Starting gpm:  $GPM -m /dev/mouse -t $MTYPE"
+  $GPM -m /dev/mouse -t $MTYPE
+fi
+
+# There is another way to run GPM, where it acts as a repeater outputting a
+# virtual MouseSystems mouse on /dev/gpmdata.  This is useful for feeding
+# gpm's data to X, especially if you've got a busmouse (in that situation X
+# and gpm may not coexist without using a repeater).  To try running a GPM
+# repeater for X, change the gpm command line to look like this:
+# $GPM -R msc -m /dev/mouse -t $MTYPE
+# Then, make sure that the mouse configuration in your XF86Config file refers
+# to the repeater device (/dev/gpmdata) and a MouseSystems mouse type.  If you
+# edit the file directly, you'll want the lines to look like this (minus the
+# comment marks '#' shown here, of course):
+#Section "Pointer"
+#    Protocol    "MouseSystems"
+#    Device      "/dev/gpmdata"
+
+EOF
+chmod 755 $T_PX/etc/rc.d/rc.gpm-sample
+# Now ask if this should be the new rc.gpm:
+ dialog --title "GPM CONFIGURATION" --yesno \
+"The gpm program allows you to cut and paste text on\n\
+the virtual consoles using a mouse.  If you choose to\n\
+run it at boot time, this line will be added to your\n\
+/etc/rc.d/rc.gpm:\n\
+\n\
+  $GPM -m /dev/mouse -t $MTYPE \n\
+\n\
+Shall we load the gpm program at boot time?" 12 58 
+ if [ $? = 0 ]; then
+   mv $T_PX/etc/rc.d/rc.gpm-sample $T_PX/etc/rc.d/rc.gpm
+ fi
diff --git a/source/a/gpm/slack-desc b/source/a/gpm/slack-desc
new file mode 100644
index 000000000..17774f10e
--- /dev/null
+++ b/source/a/gpm/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------------------------------------------------------|
+gpm: gpm (general purpose mouse server)
+gpm:
+gpm: The general purpose mouse server, or gpm, allows you to use the mouse
+gpm: to cut and paste text from the screen.  It also acts as a mouse 
+gpm: server for applications running on the Linux console, such as the
+gpm: Midnight Commander file manager. 
+gpm:
+gpm: NOTE:  This program may cause problems when you start X on systems 
+gpm: that do not use a serial mouse.  If you get an 'unable to open mouse 
+gpm: device' error from X, disable /etc/rc.d/rc.gpm.
+gpm:
diff --git a/source/a/grep/grep.SlackBuild b/source/a/grep/grep.SlackBuild
new file mode 100755
index 000000000..1b2ac8e7e
--- /dev/null
+++ b/source/a/grep/grep.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Copyright 2005-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:-2.5.4}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-grep
+
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf grep-$VERSION
+tar xvf $CWD/grep-$VERSION.tar.bz2 || exit 1
+cd grep-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --bindir=/bin \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-perl-regexp \
+  --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
+
+# ****************************************************************************
+# Makefile installs different binaries for each of grep, egrep, and fgrep
+# This is how we used to do it...
+#( cd $PKG/bin
+#  rm -f egrep ; ln -sf grep egrep
+#  rm -f fgrep ; ln -sf grep fgrep
+#)
+# ****************************************************************************
+
+# Make symlinks in /usr/bin:
+mkdir -p $PKG/usr/bin
+( cd $PKG/usr/bin
+  ln -sf ../../bin/grep .
+  ln -sf ../../bin/egrep .
+  ln -sf ../../bin/fgrep .
+)
+
+# Compress man pages
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+# Compress info pages
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/grep-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+  $PKG/usr/doc/grep-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/grep-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/grep/slack-desc b/source/a/grep/slack-desc
new file mode 100644
index 000000000..fe831013e
--- /dev/null
+++ b/source/a/grep/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------------------------------------------------------|
+grep: grep (print lines matching a pattern)
+grep:
+grep: This is GNU grep, the "fastest grep in the west" (we hope).  Grep
+grep: searches through textual input for lines which contain a match to a
+grep: specified pattern and then prints the matching lines.
+grep:
+grep:
+grep:
+grep:
+grep:
+grep:
diff --git a/source/a/gzip/gzip.SlackBuild b/source/a/gzip/gzip.SlackBuild
new file mode 100755
index 000000000..c2719ebd3
--- /dev/null
+++ b/source/a/gzip/gzip.SlackBuild
@@ -0,0 +1,146 @@
+#!/bin/sh
+# Copyright 2006-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.
+
+PKGNAM=gzip
+VERSION=${VERSION:-1.3.12}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+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"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION
+
+# 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 {} \;
+
+# The following command renames the internal implementation of futimens
+# to gl_futimens as newer versions of Glibc provide an incompatible version:
+sed -i -e "s/futimens/gl_&/" $(grep -lr futimens *)
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --bindir=/bin \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make -j4 || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# The ncompress package already has this:
+rm -f $PKG/bin/uncompress
+
+# 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
+)
+
+# Fix locations:
+#( cd $PKG
+  #mkdir bin
+  #mv usr/bin/gzip bin
+  #( cd bin ; rm -rf gunzip )
+  #( cd bin ; ln -sf gzip gunzip )
+  #( cd bin ; rm -rf zcat )
+  #( cd bin ; ln -sf gzip zcat )
+  #( cd usr/bin ; rm -rf gzip )
+  #( cd usr/bin ; ln -sf ../../bin/gzip gzip )
+  #( cd usr/bin ; rm -rf gunzip )
+  #( cd usr/bin ; ln -sf ../../bin/gunzip gunzip )
+  #( cd usr/bin ; rm -rf zcat )
+  #( cd usr/bin ; ln -sf ../../bin/zcat zcat )
+  #( cd usr/bin ; rm -rf zcmp )
+  #( cd usr/bin ; ln -sf zdiff zcmp )
+  #( cd usr/bin ; rm -rf zegrep )
+  #( cd usr/bin ; ln -sf zgrep zegrep )
+  #( cd usr/bin ; rm -rf zfgrep )
+  #( cd usr/bin ; ln -sf zgrep zfgrep )
+#)
+
+mkdir -p $PKG/usr/bin
+( cd $PKG/bin
+  for file in * ; do
+    ( cd $PKG/usr/bin ; ln -sf ../../bin/$file . )
+  done
+)
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING INSTALL NEWS README README-alpha THANKS TODO \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $TMP/package-${PKGNAM}
+makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.tgz
+
diff --git a/source/a/gzip/slack-desc b/source/a/gzip/slack-desc
new file mode 100644
index 000000000..ef26d586e
--- /dev/null
+++ b/source/a/gzip/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------------------------------------------------------|
+gzip: gzip (file compression utility)
+gzip:
+gzip: Gzip reduces the size of the named files using Lempel-Ziv coding
+gzip: (LZ77).  Whenever possible, each file is replaced by one with the
+gzip: extension .gz, while keeping the same ownership modes, access and
+gzip: modification times.
+gzip:
+gzip:
+gzip:
+gzip:
+gzip:
diff --git a/source/a/hdparm/hdparm.SlackBuild b/source/a/hdparm/hdparm.SlackBuild
new file mode 100755
index 000000000..293b1cf87
--- /dev/null
+++ b/source/a/hdparm/hdparm.SlackBuild
@@ -0,0 +1,66 @@
+#!/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:-9.3}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:--j7}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-hdparm
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf hdparm-$VERSION
+tar xvf $CWD/hdparm-$VERSION.tar.bz2 || exit 1
+cd hdparm-$VERSION || exit 1
+chown -R root:root .
+make $NUMJOBS || make || exit 1
+mkdir -p $PKG/sbin
+cat hdparm > $PKG/sbin/hdparm
+chmod 755 $PKG/sbin/hdparm
+mkdir -p $PKG/usr/sbin
+( cd $PKG/usr/sbin
+  ln -sf ../../sbin/hdparm .
+)
+mkdir -p $PKG/usr/man/man8
+cat hdparm.8 | gzip -9c > $PKG/usr/man/man8/hdparm.8.gz
+mkdir -p $PKG/usr/doc/hdparm-$VERSION
+cp -a \
+  LICENSE.TXT README.acoustic hdparm.lsm contrib \
+  $PKG/usr/doc/hdparm-$VERSION
+# I'm also not sure why I'm putting a binary in the docs, but...
+rm -f $PKG/usr/doc/hdparm-$VERSION/contrib/fix_standby.c
+
+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/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/hdparm-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/hdparm/slack-desc b/source/a/hdparm/slack-desc
new file mode 100644
index 000000000..dc846e073
--- /dev/null
+++ b/source/a/hdparm/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------------------------------------------------------|
+hdparm: hdparm (read/set hard drive parameters)
+hdparm:
+hdparm: hdparm provides a command line interface to various hard disk ioctls
+hdparm: supported by the Linux ATA/IDE device driver subsystem.  This may be
+hdparm: required to enable higher-performing disk modes.
+hdparm:
+hdparm: hdparm was written by Mark Lord.
+hdparm:
+hdparm:
+hdparm:
+hdparm:
diff --git a/source/a/infozip/infozip.SlackBuild b/source/a/infozip/infozip.SlackBuild
new file mode 100755
index 000000000..900c4f95d
--- /dev/null
+++ b/source/a/infozip/infozip.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=6.0
+ZIP=3.0
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-infozip
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf zip$(echo $ZIP | tr -d .)
+tar xvf $CWD/zip$(echo $ZIP | tr -d .).tar.?z* || exit 1
+cd zip$(echo $ZIP | tr -d .)
+chown -R root:root .
+mkdir -p $PKG/usr/doc/zip-$ZIP
+cp -a BUGS CHANGES INSTALL LICENSE README* TODO US* WHATSNEW WHERE \
+      $PKG/usr/doc/zip-$ZIP
+chmod 644 $PKG/usr/doc/zip-$ZIP/*
+make -f unix/Makefile generic_gcc || exit 1
+mkdir -p $PKG/usr/bin
+cat zip > $PKG/usr/bin/zip
+cat zipnote > $PKG/usr/bin/zipnote
+cat zipsplit > $PKG/usr/bin/zipsplit
+cat zipcloak > $PKG/usr/bin/zipcloak
+mkdir -p $PKG/usr/man/man1
+for page in man/zip.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$(basename $page).gz
+done
+
+cd $TMP
+rm -rf unzip$(echo $VERSION | tr -d .)
+tar xvf $CWD/unzip$(echo $VERSION | tr -d .).tar.?z* || exit 1
+cd unzip$(echo $VERSION | tr -d .)
+chown -R root:root .
+mkdir -p $PKG/usr/doc/unzip-$VERSION
+cp -a BUGS COPYING* Contents History.* INSTALL LICENSE README ToDo WHERE \
+      $PKG/usr/doc/unzip-$VERSION
+chmod 644 $PKG/usr/doc/unzip-$VERSION/*
+make -f unix/Makefile generic || exit 1
+cat unzip > $PKG/usr/bin/unzip
+cat unzipsfx > $PKG/usr/bin/unzipsfx
+cat funzip > $PKG/usr/bin/funzip
+cat unix/zipgrep > $PKG/usr/bin/zipgrep
+( cd $PKG/usr/bin ; ln -sf unzip zipinfo )
+chmod 755 $PKG/usr/bin/*
+cd man
+for page in funzip.1 unzip.1 unzipsfx.1 zipgrep.1 zipinfo.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
+done
+cd ..
+( 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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/infozip-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/zip-$ZIP
+  rm -rf $TMP/unzip-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/a/infozip/slack-desc b/source/a/infozip/slack-desc
new file mode 100644
index 000000000..92e643160
--- /dev/null
+++ b/source/a/infozip/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------------------------------------------------------|
+infozip: infozip (Info-ZIP's zip and unzip utilities)
+infozip:
+infozip: zip is a compression and file packaging utility for Unix, VMS, MSDOS,
+infozip: OS/2, Windows NT, Minix, Atari and Macintosh, Amiga and Acorn RISC OS.
+infozip: It is analogous to a combination of the UNIX commands tar(1) and
+infozip: compress(1) and is compatible with PKZIP (Phil Katz's ZIP).  A
+infozip: companion program (unzip(1L)), unpacks zip archives.
+infozip:
+infozip:
+infozip:
+infozip:
diff --git a/source/a/inotify-tools/inotify-tools.SlackBuild b/source/a/inotify-tools/inotify-tools.SlackBuild
new file mode 100755
index 000000000..82e807fce
--- /dev/null
+++ b/source/a/inotify-tools/inotify-tools.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+PKGNAM=inotify-tools
+VERSION=${VERSION:-3.13}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+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.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION
+
+# 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 \
+  --docdir=/usr/doc/${PKGNAM}-${VERSION}/html \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make -j4 || 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-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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION}
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  $PKG/usr/doc/${PKGNAM}-${VERSION}
+# Get rid of html api documentation:
+rm -rf $PKG/usr/doc/${PKGNAM}-${VERSION}/html
+
+mkdir -p $PKG/install
+#zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/inotify-tools/slack-desc b/source/a/inotify-tools/slack-desc
new file mode 100644
index 000000000..f5cb8c6e8
--- /dev/null
+++ b/source/a/inotify-tools/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------------------------------------------------------|
+inotify-tools: inotify-tools (command line utilities for inotify)
+inotify-tools:
+inotify-tools: inotify-tools is a set of command-line programs for Linux providing a
+inotify-tools: simple interface to inotify.  These programs can be used to monitor
+inotify-tools: and act upon filesystem events.
+inotify-tools:
+inotify-tools: For more information see the inotifywait and inotifywatch man pages.
+inotify-tools:
+inotify-tools: inotify-tools home: http://inotify-tools.sourceforge.net/
+inotify-tools:
+inotify-tools:
diff --git a/source/a/jfsutils/jfsutils.SlackBuild b/source/a/jfsutils/jfsutils.SlackBuild
new file mode 100755
index 000000000..d97ebcb62
--- /dev/null
+++ b/source/a/jfsutils/jfsutils.SlackBuild
@@ -0,0 +1,96 @@
+#!/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:-1.1.14}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-jfsutils
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf jfsutils-$VERSION
+tar xvf $CWD/jfsutils-$VERSION.tar.?z* || exit 1
+cd jfsutils-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --disable-dependency-tracking \
+  --build=$ARCH-slackware-linux
+
+make
+
+mkdir -p $PKG/sbin
+cat fsck/jfs_fsck > $PKG/sbin/jfs_fsck
+( cd $PKG/sbin ; ln -sf jfs_fsck fsck.jfs )
+cat mkfs/jfs_mkfs > $PKG/sbin/jfs_mkfs
+( cd $PKG/sbin ; ln -sf jfs_mkfs mkfs.jfs )
+cat logdump/jfs_logdump > $PKG/sbin/jfs_logdump
+cat fscklog/jfs_fscklog > $PKG/sbin/jfs_fscklog
+cat xpeek/jfs_debugfs > $PKG/sbin/jfs_debugfs
+cat tune/jfs_tune > $PKG/sbin/jfs_tune
+chmod 755 $PKG/sbin/*
+
+mkdir -p $PKG/usr/man/man8
+for file in `find . -name "*.8"` ; do
+  cat $file | gzip -9c > $PKG/usr/man/man8/`basename $file`.gz
+done
+( cd $PKG/usr/man/man8
+  ln -sf jfs_fsck.8.gz fsck.jfs.8.gz
+  ln -sf jfs_mkfs.8.gz mkfs.jfs.8.gz
+)
+
+mkdir -p $PKG/usr/doc/jfsutils-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog NEWS README \
+  $PKG/usr/doc/jfsutils-$VERSION
+
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/jfsutils-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/jfsutils/slack-desc b/source/a/jfsutils/slack-desc
new file mode 100644
index 000000000..d9c52dd2b
--- /dev/null
+++ b/source/a/jfsutils/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------------------------------------------------------|
+jfsutils: jfsutils (IBM JFS utilities)
+jfsutils:
+jfsutils: Utilities for managing IBM's Journaled File System (JFS) under Linux:
+jfsutils:   jfs_debugfs - shell-type JFS file system editor.
+jfsutils:   jfs_fsck - check and repair a JFS formatted device.
+jfsutils:   jfs_fscklog - extract a JFS fsck service log into a file.
+jfsutils:   jfs_logdump - dump a JFS formatted device's journal log.
+jfsutils:   jfs_mkfs - create a JFS formatted partition.
+jfsutils:   jfs_tune - adjust tunable file system parameters on JFS.
+jfsutils:
+jfsutils:
diff --git a/source/a/kbd/kbd.SlackBuild b/source/a/kbd/kbd.SlackBuild
new file mode 100755
index 000000000..7ac0b142f
--- /dev/null
+++ b/source/a/kbd/kbd.SlackBuild
@@ -0,0 +1,177 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+PKGNAM=kbd
+VERSION=1.15
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+NUMJOBS=${NUMJOBS:--j4}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-kbd
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+
+# Add some extra fonts:
+( cd $PKG ; explodepkg $CWD/sources/extraf.tgz )
+
+# Extract source:
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.bz2
+cd $PKGNAM-$VERSION
+
+# Make sure ownerships and permissions are sane:
+chown -R root:root .
+find . -perm 666 -exec chmod 644 {} \;
+find . -perm 664 -exec chmod 644 {} \;
+find . -perm 600 -exec chmod 644 {} \;
+find . -perm 444 -exec chmod 644 {} \;
+find . -perm 400 -exec chmod 644 {} \;
+find . -perm 440 -exec chmod 644 {} \;
+find . -perm 777 -exec chmod 755 {} \;
+find . -perm 775 -exec chmod 755 {} \;
+find . -perm 511 -exec chmod 755 {} \;
+find . -perm 711 -exec chmod 755 {} \;
+find . -perm 555 -exec chmod 755 {} \;
+
+# Apply patches:
+# These are taken from Fedora's SRPM:
+zcat $CWD/sources/kbd-1.15-po.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/sources/kbd-1.15-keycodes-man.patch | patch -p1 --verbose || exit 1
+zcat $CWD/sources/kbd-1.15-sparc.patch | patch -p1 --verbose || exit 1
+zcat $CWD/sources/kbd-1.15-unicode_start.patch | patch -p1 --verbose || exit 1
+zcat $CWD/sources/kbd-1.15-resizecon-x86_64.patch | patch -p1 --verbose || exit 1
+zcat $CWD/sources/kbd-1.15-quiet_doc.patch | patch -p1 --verbose || exit 1
+
+# This is from Fedora's spec file:
+# 7-bit maps are obsolete; so are non-euro maps
+( cd data/keymaps/i386
+  mv qwerty/fi.map qwerty/fi-old.map
+  cp -fav qwerty/fi-latin9.map qwerty/fi.map
+  cp -fav qwerty/pt-latin9.map qwerty/pt.map
+  cp -fav qwerty/sv-latin1.map qwerty/se-latin1.map
+  mv -fv azerty/fr.map azerty/fr-old.map
+  cp -fav azerty/fr-latin9.map azerty/fr.map
+  cp -fav azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
+
+  # Rename conflicting keymaps
+  mv -fv dvorak/no.map dvorak/no-dvorak.map
+  mv -fv fgGIod/trf.map fgGIod/trf-fgGIod.map
+  mv -fv olpc/es.map olpc/es-olpc.map
+  mv -fv olpc/pt.map olpc/pt-olpc.map
+  mv -fv qwerty/cz.map qwerty/cz-qwerty.map )
+
+# Apply a euro fix for the nl.map from alienBOB:
+zcat $CWD/sources/nl.euro.diff.gz | patch -p1 || exit 1
+
+# Configure:
+./configure \
+   --prefix=/usr \
+   --localedir=/usr/share/locale/ \
+   --mandir=/usr/man \
+   --docdir=/usr/doc/$PKGNAM-$VERSION \
+   --datadir=/usr/share/kbd \
+   --enable-nls || exit 1
+
+# Build:
+make $NUMJOBS || exit 1
+
+# Install into package:
+make install DESTDIR=$PKG || exit 1
+# This is where it's always been in Slackware, so let's move it back:
+( cd $PKG
+  mkdir -vpm755 bin
+  mv -fv usr/bin/loadkeys bin/
+  cd usr/bin ; ln -vsf ../../bin/loadkeys . )
+
+# ro_win.map.gz is useless
+rm -fv $PKG/usr/share/kbd/keymaps/i386/qwerty/ro_win.map.gz
+
+# The rhpl keyboard layout table is indexed by kbd layout names, so we need a
+# Korean keyboard
+ln -vfs us.map.gz $PKG/usr/share/kbd/keymaps/i386/qwerty/ko.map.gz
+
+# Install the setup script that will be run from the Slackware installer:
+mkdir -pm755 $PKG/var/log/setup
+install -vpm755 $CWD/setup.setconsolefont $PKG/var/log/setup/
+install -vpm755 $CWD/setconsolefont $PKG/usr/bin/
+
+# Copy docs:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  ChangeLog COPYING README doc/* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+rm -f $PKG/usr/doc/$PKGNAM-$VERSION/kbd.FAQ.sgml
+
+# Additional keymaps:
+# This is the keymap for Speakup (http://linux-speakup.org) users:
+cat $CWD/sources/speakupmap.map.gz > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakupmap.map.gz
+# Another keymap for Speakup from Thomas Ward, for JFW users.
+tar xvf $CWD/sources/speakup-jfw.tar.gz
+( cd speakup-jfw
+  cat speakup-jfw.map | gzip -9c > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakup-jfw.map.gz
+  cat readme > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakup-jfw.readme )
+
+# Create the default run control script which will set the
+# console font to the default:
+mkdir -pm755 $PKG/etc/rc.d
+cat << EOF > $PKG/etc/rc.d/rc.font.new
+#!/bin/sh
+#
+# This selects your default screen font from among the ones in
+# /usr/share/kbd/consolefonts.
+#
+setfont -v
+EOF
+chmod 755 $PKG/etc/rc.d/rc.font.new
+
+# Create package post-install script:
+mkdir -p $PKG/install
+cat << EOF > $PKG/install/doinst.sh
+#if [ -r etc/rc.d/rc.font ]; then
+#  rm -f etc/rc.d/rc.font.new
+#else
+#  mv etc/rc.d/rc.font.new etc/rc.d/rc.font
+#fi
+EOF
+
+# Compress man pages:
+( cd $PKG/usr/man
+  find . -name "*.?" -type f | xargs gzip -9
+)
+
+# Install package description:
+install -vpm644 $CWD/slack-desc $PKG/install/
+
+# 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
+)
+
+cd $PKG
+makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+#EOF
diff --git a/source/a/kbd/setconsolefont b/source/a/kbd/setconsolefont
new file mode 100644
index 000000000..d4cfb875a
--- /dev/null
+++ b/source/a/kbd/setconsolefont
@@ -0,0 +1,384 @@
+#!/bin/sh
+
+# 06-May-2009
+# Updated by Stuart Winter <mozes@slackware.com>
+# Run 'setfont' in a chroot.  This makes setfont work
+# correctly in the installer.
+
+if [ "$TMP" = "" ]; then
+  TMP=/var/log/setup/tmp
+fi
+
+load_font() {
+  if [ ! -z "$T_PX" ]; then
+    CHROOT="chroot $T_PX"
+  fi
+
+  $CHROOT setfont $*
+  if [ ! $? = 0 ]; then
+    if [ -r $T_PX/usr/share/kbd/consolefonts/$1 ]; then
+      $CHROOT setfont $T_PX/usr/share/kbd/consolefonts/$* 1> /dev/null 2> /dev/null
+    elif [ -r $T_PX/usr/lib/kbd/consolefonts/$1 ]; then
+      $CHROOT setfont $T_PX/usr/lib/kbd/consolefonts/$* 1> /dev/null 2> /dev/null
+    elif [ -r /var/adm/mount/live/usr/lib/kbd/consolefonts/$1 ]; then
+      $CHROOT setfont /var/adm/mount/live/usr/lib/kbd/consolefonts/$* 1> /dev/null 2> /dev/null
+    else # load default font
+      $CHROOT setfont
+    fi
+  fi
+}
+
+# Determine effective root path:
+if [ -r $TMP/SeTT_PX ]; then
+  T_PX="`cat $TMP/SeTT_PX`"
+elif [ ! "$1" = "" ]; then
+  T_PX=$1
+else
+  T_PX=/
+fi
+
+if [ ! "$COLOR" = "off" -o -r $TMP/SeTcolor -o -r /tmp/SeTcolor ]; then # use color menus
+  if [ ! "$1" = "" ]; then
+    dialog --title "CONSOLE FONT CONFIGURATION" --defaultno --yesno "Would you like to try \
+out some custom screen fonts?" 5 60
+    if [ $? = 1 ]; then
+      exit
+    fi
+  fi
+  REPLY=`mktemp -q $TMP/temp.XXXXXX`
+  FONT="161.cp.gz -16"
+  while [ 0 ]; do
+    dialog --default-item "$FONT" --title "SELECT A SCREEN FONT" --menu "Select one of the following \
+custom fonts. If you decide you like it, you can make it your new default \
+screen font. You'll be able to try as many of these as you like." 21 65 12 \
+"161.cp.gz -16" "" \
+"162.cp.gz -16" "" \
+"163.cp.gz -16" "" \
+"164.cp.gz -16" "" \
+"165.cp.gz -16" "" \
+"737.cp.gz -16" "" \
+"880.cp.gz -16" "" \
+"928.cp.gz -16" "" \
+"972.cp.gz -16" "" \
+"Agafari-12.psfu.gz" "" \
+"Agafari-14.psfu.gz" "" \
+"Agafari-16.psfu.gz" "" \
+"Cyr_a8x14.psfu.gz" "" \
+"Cyr_a8x16.psfu.gz" "" \
+"Cyr_a8x8.psfu.gz" "" \
+"Goha-12.psfu.gz" "" \
+"Goha-14.psfu.gz" "" \
+"Goha-16.psfu.gz" "" \
+"GohaClassic-12.psfu.gz" "" \
+"GohaClassic-14.psfu.gz" "" \
+"GohaClassic-16.psfu.gz" "" \
+"Lat2-Terminus16.psfu.gz" "" \
+"LatArCyrHeb-08.psfu.gz" "" \
+"LatArCyrHeb-14.psfu.gz" "" \
+"LatArCyrHeb-16+.psfu.gz" "" \
+"LatArCyrHeb-16.psfu.gz" "" \
+"LatArCyrHeb-19.psfu.gz" "" \
+"Mik_8x16.gz" "" \
+"UniCyrExt_8x16.psf.gz" "" \
+"UniCyr_8x14.psf.gz" "" \
+"UniCyr_8x16.psf.gz" "" \
+"UniCyr_8x8.psf.gz" "" \
+"alt-8x14.gz" "" \
+"alt-8x16.gz" "" \
+"alt-8x8.gz" "" \
+"altc-8x16.gz" "" \
+"aply16.psf.gz" "" \
+"arm8.fnt.gz" "" \
+"b.fnt.gz" "" \
+"c.fnt.gz" "" \
+"cp1250.psfu.gz" "" \
+"cp850-8x14.psfu.gz" "" \
+"cp850-8x16.psfu.gz" "" \
+"cp850-8x8.psfu.gz" "" \
+"cp857.08.gz" "" \
+"cp857.14.gz" "" \
+"cp857.16.gz" "" \
+"cp865-8x14.psfu.gz" "" \
+"cp865-8x16.psfu.gz" "" \
+"cp865-8x8.psfu.gz" "" \
+"cp866-8x14.psf.gz" "" \
+"cp866-8x16.psf.gz" "" \
+"cp866-8x8.psf.gz" "" \
+"cybercafe.fnt.gz" "" \
+"cyr-sun16.psfu.gz" "" \
+"default8x16.psfu.gz" "" \
+"default8x9.psfu.gz" "" \
+"drdos8x14.psfu.gz" "" \
+"drdos8x16.psfu.gz" "" \
+"drdos8x6.psfu.gz" "" \
+"drdos8x8.psfu.gz" "" \
+"gr737a-8x8.psfu.gz" "" \
+"gr737a-9x14.psfu.gz" "" \
+"gr737a-9x16.psfu.gz" "" \
+"gr737b-8x11.psfu.gz" "" \
+"gr737b-9x16-medieval.psfu.gz" "" \
+"gr737c-8x14.psfu.gz" "" \
+"gr737c-8x16.psfu.gz" "" \
+"gr737c-8x6.psfu.gz" "" \
+"gr737c-8x7.psfu.gz" "" \
+"gr737c-8x8.psfu.gz" "" \
+"gr737d-8x16.psfu.gz" "" \
+"gr928-8x16-thin.psfu.gz" "" \
+"gr928-9x14.psfu.gz" "" \
+"gr928-9x16.psfu.gz" "" \
+"gr928a-8x14.psfu.gz" "" \
+"gr928a-8x16.psfu.gz" "" \
+"gr928b-8x14.psfu.gz" "" \
+"gr928b-8x16.psfu.gz" "" \
+"greek-polytonic.psfu.gz" "" \
+"iso01-12x22.psfu.gz" "" \
+"iso01.08.gz" "" \
+"iso01.14.gz" "" \
+"iso01.16.gz" "" \
+"iso02-12x22.psfu.gz" "" \
+"iso02.08.gz" "" \
+"iso02.14.gz" "" \
+"iso02.16.gz" "" \
+"iso03.08.gz" "" \
+"iso03.14.gz" "" \
+"iso03.16.gz" "" \
+"iso04.08.gz" "" \
+"iso04.14.gz" "" \
+"iso04.16.gz" "" \
+"iso05.08.gz" "" \
+"iso05.14.gz" "" \
+"iso05.16.gz" "" \
+"iso06.08.gz" "" \
+"iso06.14.gz" "" \
+"iso06.16.gz" "" \
+"iso07.14.gz" "" \
+"iso07.16.gz" "" \
+"iso07u-16.psfu.gz" "" \
+"iso08.08.gz" "" \
+"iso08.14.gz" "" \
+"iso08.16.gz" "" \
+"iso09.08.gz" "" \
+"iso09.14.gz" "" \
+"iso09.16.gz" "" \
+"iso10.08.gz" "" \
+"iso10.14.gz" "" \
+"iso10.16.gz" "" \
+"koi8-14.psf.gz" "" \
+"koi8c-8x16.gz" "" \
+"koi8r-8x14.gz" "" \
+"koi8r-8x16.gz" "" \
+"koi8r-8x8.gz" "" \
+"koi8r.8x8.psfu.gz" "" \
+"koi8u_8x14.psfu.gz" "" \
+"koi8u_8x16.psfu.gz" "" \
+"koi8u_8x8.psfu.gz" "" \
+"lat0-08.psfu.gz" "" \
+"lat0-10.psfu.gz" "" \
+"lat0-12.psfu.gz" "" \
+"lat0-14.psfu.gz" "" \
+"lat0-16.psfu.gz" "" \
+"lat1-08.psfu.gz" "" \
+"lat1-10.psfu.gz" "" \
+"lat1-12.psfu.gz" "" \
+"lat1-14.psfu.gz" "" \
+"lat1-16.psfu.gz" "" \
+"lat2-08.psfu.gz" "" \
+"lat2-10.psfu.gz" "" \
+"lat2-12.psfu.gz" "" \
+"lat2-14.psfu.gz" "" \
+"lat2-16.psfu.gz" "" \
+"lat2a-16.psfu.gz" "" \
+"lat4-08.psfu.gz" "" \
+"lat4-10.psfu.gz" "" \
+"lat4-12.psfu.gz" "" \
+"lat4-14.psfu.gz" "" \
+"lat4-16+.psfu.gz" "" \
+"lat4-16.psfu.gz" "" \
+"lat4-19.psfu.gz" "" \
+"lat4a-08.psfu.gz" "" \
+"lat4a-10.psfu.gz" "" \
+"lat4a-12.psfu.gz" "" \
+"lat4a-14.psfu.gz" "" \
+"lat4a-16+.psfu.gz" "" \
+"lat4a-16.psfu.gz" "" \
+"lat4a-19.psfu.gz" "" \
+"lat5-12.psfu.gz" "" \
+"lat5-14.psfu.gz" "" \
+"lat5-16.psfu.gz" "" \
+"lat7-14.psfu.gz" "" \
+"lat7a-14.psfu.gz" "" \
+"lat7a-16.psf.gz" "" \
+"lat9-08.psf.gz" "" \
+"lat9-10.psf.gz" "" \
+"lat9-12.psf.gz" "" \
+"lat9-14.psf.gz" "" \
+"lat9-16.psf.gz" "" \
+"lat9u-08.psfu.gz" "" \
+"lat9u-10.psfu.gz" "" \
+"lat9u-12.psfu.gz" "" \
+"lat9u-14.psfu.gz" "" \
+"lat9u-16.psfu.gz" "" \
+"lat9v-08.psfu.gz" "" \
+"lat9v-10.psfu.gz" "" \
+"lat9v-12.psfu.gz" "" \
+"lat9v-14.psfu.gz" "" \
+"lat9v-16.psfu.gz" "" \
+"lat9w-08.psfu.gz" "" \
+"lat9w-10.psfu.gz" "" \
+"lat9w-12.psfu.gz" "" \
+"lat9w-14.psfu.gz" "" \
+"lat9w-16.psfu.gz" "" \
+"m.fnt.gz" "" \
+"ml.fnt.gz" "" \
+"mod_d.fnt.gz" "" \
+"mod_s.fnt.gz" "" \
+"mr.fnt.gz" "" \
+"mu.fnt.gz" "" \
+"r.fnt.gz" "" \
+"rl.fnt.gz" "" \
+"ro.fnt.gz" "" \
+"ruscii_8x16.psfu.gz" "" \
+"ruscii_8x8.psfu.gz" "" \
+"s.fnt.gz" "" \
+"sc.fnt.gz" "" \
+"scrawl_s.fnt.gz" "" \
+"scrawl_w.fnt.gz" "" \
+"sd.fnt.gz" "" \
+"sun12x22.psfu.gz" "" \
+"t.fnt.gz" "" \
+"t850b.fnt.gz" "" \
+"tcvn8x16.psf.gz" "" \
+"viscii10-8x16.psfu.gz" "" \
+2> $REPLY
+    if [ ! $? = 0 ]; then
+      load_font
+      exit
+    fi
+    FONT=`cat $REPLY`
+    rm -f $REPLY
+    load_font $FONT
+    dialog --title "SET AS DEFAULT FONT" --yesno "Well, what do you think? \
+If you'd like to make this your default font, select YES. You can change \
+the default font any time by typing 'setconsolefont' or by editing \
+/etc/rc.d/rc.font. If you don't \
+like this font, select NO, and you'll be returned to the font selection \
+menu. If you decide you want to stick with the default font, hit ESC or \
+CANCEL once you get to that menu." 11 60
+    if [ $? = 0 ]; then
+      cat << EOF > $T_PX/etc/rc.d/rc.font
+#!/bin/sh
+#
+# This selects your default screen font from among the ones in
+# /usr/share/kbd/consolefonts.
+#
+setfont -v $FONT
+EOF
+      chmod 755 $T_PX/etc/rc.d/rc.font
+      exit
+    else
+      load_font
+    fi
+  done
+else # no color!
+  echo
+  echo -n "Would you like to try out some custom screen fonts ([y]es, [n]o)? "
+  read YESNO;
+  if [ "$YESNO" = "n" ]; then
+    exit
+  fi
+  while [ 0 ]; do
+    cat << EOF
+
+SELECT A SCREEN FONT.  Your choices are:
+161.cp.gz 162.cp.gz 163.cp.gz 164.cp.gz 165.cp.gz 737.cp.gz 880.cp.gz 928.cp.gz
+972.cp.gz Agafari-12.psfu.gz Agafari-14.psfu.gz Agafari-16.psfu.gz
+Cyr_a8x14.psfu.gz Cyr_a8x16.psfu.gz Cyr_a8x8.psfu.gz Goha-12.psfu.gz
+Goha-14.psfu.gz Goha-16.psfu.gz GohaClassic-12.psfu.gz GohaClassic-14.psfu.gz
+GohaClassic-16.psfu.gz Lat2-Terminus16.psfu.gz LatArCyrHeb-08.psfu.gz
+LatArCyrHeb-14.psfu.gz LatArCyrHeb-16+.psfu.gz LatArCyrHeb-16.psfu.gz
+LatArCyrHeb-19.psfu.gz Mik_8x16.gz UniCyrExt_8x16.psf.gz UniCyr_8x14.psf.gz
+UniCyr_8x16.psf.gz UniCyr_8x8.psf.gz alt-8x14.gz alt-8x16.gz alt-8x8.gz
+altc-8x16.gz aply16.psf.gz arm8.fnt.gz b.fnt.gz c.fnt.gz cp1250.psfu.gz
+cp850-8x14.psfu.gz cp850-8x16.psfu.gz cp850-8x8.psfu.gz cp857.08.gz cp857.14.gz
+cp857.16.gz cp865-8x14.psfu.gz cp865-8x16.psfu.gz cp865-8x8.psfu.gz
+cp866-8x14.psf.gz cp866-8x16.psf.gz cp866-8x8.psf.gz cybercafe.fnt.gz
+cyr-sun16.psfu.gz default8x16.psfu.gz default8x9.psfu.gz drdos8x14.psfu.gz
+drdos8x16.psfu.gz drdos8x6.psfu.gz drdos8x8.psfu.gz gr737a-8x8.psfu.gz
+gr737a-9x14.psfu.gz gr737a-9x16.psfu.gz gr737b-8x11.psfu.gz
+gr737b-9x16-medieval.psfu.gz gr737c-8x14.psfu.gz gr737c-8x16.psfu.gz
+gr737c-8x6.psfu.gz gr737c-8x7.psfu.gz gr737c-8x8.psfu.gz gr737d-8x16.psfu.gz
+gr928-8x16-thin.psfu.gz gr928-9x14.psfu.gz gr928-9x16.psfu.gz
+gr928a-8x14.psfu.gz gr928a-8x16.psfu.gz gr928b-8x14.psfu.gz gr928b-8x16.psfu.gz
+greek-polytonic.psfu.gz iso01-12x22.psfu.gz iso01.08.gz iso01.14.gz iso01.16.gz
+iso02-12x22.psfu.gz iso02.08.gz iso02.14.gz iso02.16.gz iso03.08.gz iso03.14.gz
+iso03.16.gz iso04.08.gz iso04.14.gz iso04.16.gz iso05.08.gz iso05.14.gz
+iso05.16.gz iso06.08.gz iso06.14.gz iso06.16.gz iso07.14.gz iso07.16.gz
+iso07u-16.psfu.gz iso08.08.gz iso08.14.gz iso08.16.gz iso09.08.gz iso09.14.gz
+iso09.16.gz iso10.08.gz iso10.14.gz iso10.16.gz koi8-14.psf.gz koi8c-8x16.gz
+koi8r-8x14.gz koi8r-8x16.gz koi8r-8x8.gz koi8r.8x8.psfu.gz koi8u_8x14.psfu.gz
+koi8u_8x16.psfu.gz koi8u_8x8.psfu.gz lat0-08.psfu.gz lat0-10.psfu.gz
+lat0-12.psfu.gz lat0-14.psfu.gz lat0-16.psfu.gz lat1-08.psfu.gz lat1-10.psfu.gz
+lat1-12.psfu.gz lat1-14.psfu.gz lat1-16.psfu.gz lat2-08.psfu.gz lat2-10.psfu.gz
+lat2-12.psfu.gz lat2-14.psfu.gz lat2-16.psfu.gz lat2a-16.psfu.gz lat4-08.psfu.gz
+lat4-10.psfu.gz lat4-12.psfu.gz lat4-14.psfu.gz lat4-16+.psfu.gz lat4-16.psfu.gz
+lat4-19.psfu.gz lat4a-08.psfu.gz lat4a-10.psfu.gz lat4a-12.psfu.gz
+lat4a-14.psfu.gz lat4a-16+.psfu.gz lat4a-16.psfu.gz lat4a-19.psfu.gz
+lat5-12.psfu.gz lat5-14.psfu.gz lat5-16.psfu.gz lat7-14.psfu.gz lat7a-14.psfu.gz
+lat7a-16.psf.gz lat9-08.psf.gz lat9-10.psf.gz lat9-12.psf.gz lat9-14.psf.gz
+lat9-16.psf.gz lat9u-08.psfu.gz lat9u-10.psfu.gz lat9u-12.psfu.gz
+lat9u-14.psfu.gz lat9u-16.psfu.gz lat9v-08.psfu.gz lat9v-10.psfu.gz
+lat9v-12.psfu.gz lat9v-14.psfu.gz lat9v-16.psfu.gz lat9w-08.psfu.gz
+lat9w-10.psfu.gz lat9w-12.psfu.gz lat9w-14.psfu.gz lat9w-16.psfu.gz m.fnt.gz
+ml.fnt.gz mod_d.fnt.gz mod_s.fnt.gz mr.fnt.gz mu.fnt.gz r.fnt.gz rl.fnt.gz
+ro.fnt.gz ruscii_8x16.psfu.gz ruscii_8x8.psfu.gz s.fnt.gz sc.fnt.gz
+scrawl_s.fnt.gz scrawl_w.fnt.gz sd.fnt.gz sun12x22.psfu.gz t.fnt.gz t850b.fnt.gz
+tcvn8x16.psf.gz viscii10-8x16.psfu.gz
+
+EOF
+    echo -n "Which font would you like (or ENTER to quit)? "
+    read FONT;
+    if [ "$FONT" = "" ]; then
+      load_font
+      echo
+      exit
+    fi
+    if [ ! -r $T_PX/usr/share/kbd/consolefonts/$FONT -a ! -r \
+         /var/adm/mount/usr/share/kbd/consolefonts/$FONT ]; then
+      cat << EOF
+
+Sorry, I couldn't find that font. Try again.
+
+EOF
+    fi
+    load_font $FONT
+    cat << EOF
+
+SET AS DEFAULT FONT
+
+Well, what do you think? If you'd like to make this your default font, select
+YES. You can change the default font any time by typing 'setconsolefont' or by 
+editing /etc/rc.d/rc.font. If you don't like this font, select NO, and you'll
+be able to select a different one. If you decide you want to stick with the
+default font, hit RETURN once you return to the font selection menu.
+
+EOF
+    echo -n "Would you like to have this font loaded by default ([y]es, [n]o)? "
+    read DEF
+    if [ "$DEF" = "YES" -o "$DEF" = "y" ]; then
+      cat << EOF > $T_PX/etc/rc.d/rc.font
+#!/bin/sh
+#
+# This selects your default screen font from among the ones in
+# /usr/share/kbd/consolefonts.
+#
+setfont -v $FONT
+EOF
+      chmod 755 $T_PX/etc/rc.d/rc.font
+      echo
+      exit
+    else
+     load_font
+    fi
+    echo
+  done
+fi
diff --git a/source/a/kbd/setup.setconsolefont b/source/a/kbd/setup.setconsolefont
new file mode 100644
index 000000000..615cbaab0
--- /dev/null
+++ b/source/a/kbd/setup.setconsolefont
@@ -0,0 +1,10 @@
+#!/bin/sh
+#BLURB="Select a font for the console"
+
+# These platforms are headless so we don't need to configure
+# this package.
+#
+# Silently exit if we find ourselves on one of these platforms
+egrep -q "SheevaPlug" /proc/cpuinfo > /dev/null 2>&1 && exit
+
+sh usr/bin/setconsolefont $*
diff --git a/source/a/kbd/slack-desc b/source/a/kbd/slack-desc
new file mode 100644
index 000000000..d912c1126
--- /dev/null
+++ b/source/a/kbd/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------------------------------------------------------|
+kbd: kbd (keyboard maps and console fonts)
+kbd:
+kbd: Load and save keyboard mappings.  Needed if you are not using the US
+kbd: keyboard map.  This package also contains utilities to change your
+kbd: console fonts - if you install it you'll get a menu later on that lets
+kbd: you select from many different fonts.  If you like one, you can make
+kbd: it your default font.  A new default font can be chosen at any time by
+kbd: typing 'setconsolefont'.
+kbd:
+kbd:
+kbd:
diff --git a/source/a/kbd/sources/kbd-1.15-keycodes-man.patch b/source/a/kbd/sources/kbd-1.15-keycodes-man.patch
new file mode 100644
index 000000000..d18a8c8b5
--- /dev/null
+++ b/source/a/kbd/sources/kbd-1.15-keycodes-man.patch
@@ -0,0 +1,52 @@
+diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
+--- kbd-1.15/man/man1/showkey.1_old	2008-03-13 17:46:23.000000000 +0100
++++ kbd-1.15/man/man1/showkey.1	2008-12-10 12:31:38.000000000 +0100
+@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar
+ to know the scan codes sent by various keys it is better to boot a
+ 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0
+ that tells the 2.6 kernel to return the actual scan codes.
++
++.SH NOTES
++The raw scan codes are available only on AT and PS/2 keyboards,
++and even then they are disabled unless the
++.B atkbd.softraw=0
++kernel parameter is used.
++When the raw scan codes are not available, the kernel uses a fixed built-in
++table to produce scan codes from keycodes.  Thus,
++.BR setkeycodes (8)
++can affect the output of
++.B showkey
++in scan code dump mode.
++
+ .SH "SEE ALSO"
+ .BR loadkeys (1),
+ .BR dumpkeys (1),
+diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8
+--- kbd-1.15/man/man8/setkeycodes.8_old	2008-12-10 12:31:56.000000000 +0100
++++ kbd-1.15/man/man8/setkeycodes.8	2008-12-10 12:37:36.000000000 +0100
+@@ -41,6 +41,10 @@ to showkey(1), the command
+ will assign the keycode 112 to it, and then loadkeys(1) can be used
+ to define the function of this key.
+ 
++USB keyboards have standardized keycodes and
++.B setkeycodes
++doesn't affect them at all.
++
+ .SH "2.6 KERNELS"
+ In 2.6 kernels key codes lie in the range 1-255, instead of 1-127.
+ (It might be best to confine oneself to the range 1-239.)
+@@ -54,6 +58,14 @@ None.
+ .SH BUGS
+ The keycodes of X have nothing to do with those of Linux.
+ Unusual keys can be made visible under Linux, but not under X.
++
++.B setkeycodes
++affects only the "first" input device
++that has modifiable scancode-to-keycode mapping.
++If there is more than one such device,
++.B setkeycodes
++cannot change the mapping of other devices than the "first" one.
++
+ .SH "SEE ALSO"
+ .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
+ 
diff --git a/source/a/kbd/sources/kbd-1.15-po.patch b/source/a/kbd/sources/kbd-1.15-po.patch
new file mode 100644
index 000000000..0221f60c9
--- /dev/null
+++ b/source/a/kbd/sources/kbd-1.15-po.patch
@@ -0,0 +1,31 @@
+diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in
+--- kbd-1.15/po/Makefile.in_old	2008-10-23 21:03:59.000000000 +0200
++++ kbd-1.15/po/Makefile.in	2008-12-09 15:35:58.000000000 +0100
+@@ -4,10 +4,10 @@ srcdir = @srcdir@
+ 
+ prefix        = @prefix@
+ datarootdir   = @datarootdir@
+-datadir       = @datadir@
+-localedir     = $(DESTDIR)$(datadir)/locale
+-gnulocaledir  = $(DESTDIR)$(datadir)/locale
+-gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
++datadir       = $(DESTDIR)@datadir@
++localedir     = $(DESTDIR)@localedir@
++gnulocaledir  = $(DESTDIR)@localedir@
++gettextsrcdir = $(datadir)/gettext/po
+ 
+ FOREIGN       = @FOREIGN@
+ HAVE_XGETTEXT = @HAVE_XGETTEXT@
+@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL)
+ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+ 
+ # Enter here all .po files
+-POFILES =  cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \
++POFILES =  cs.po da.po de.po el.po es.po fr.po nl.po pl.po \
+  ro.po ru.po sv.po tr.po
+ # the same but with .gmo
+-GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \
++GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \
+  pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
+ 
+ CATALOGS = $(GMOFILES)
diff --git a/source/a/kbd/sources/kbd-1.15-quiet_doc.patch b/source/a/kbd/sources/kbd-1.15-quiet_doc.patch
new file mode 100644
index 000000000..eca867b85
--- /dev/null
+++ b/source/a/kbd/sources/kbd-1.15-quiet_doc.patch
@@ -0,0 +1,34 @@
+diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in
+--- kbd-1.15/man/man1/loadkeys.1.in_old	2008-10-23 21:03:59.000000000 +0200
++++ kbd-1.15/man/man1/loadkeys.1.in	2009-03-05 13:11:08.000000000 +0100
+@@ -19,6 +19,8 @@ loadkeys \- load keyboard translation ta
+ ] [
+ .I -m --mktable
+ ] [
++.I -q --quiet
++] [
+ .I -s --clearstrings
+ ] [
+ .I -v --verbose
+@@ -148,6 +150,10 @@ command (and does not modify the current
+ .B loadkeys
+ prints its version number and a short usage message to the programs
+ standard error output and exits.
++.TP
++.B \-q \-\-quiet
++.B loadkeys
++suppresses all normal output.
+ .SH WARNING
+ Note that anyone having read access to
+ .B /dev/console
+diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c
+--- kbd-1.15/src/loadkeys.c_old	2008-10-23 21:03:59.000000000 +0200
++++ kbd-1.15/src/loadkeys.c	2009-03-05 13:09:00.000000000 +0100
+@@ -1966,6 +1966,7 @@ usage(void) {
+ "  -d --default       load \"%s\"\n"
+ "  -h --help          display this help text\n"
+ "  -m --mktable       output a \"defkeymap.c\" to stdout\n"
++"  -q --quiet         suppress all normal output\n"
+ "  -s --clearstrings  clear kernel string table\n"
+ "  -u --unicode       implicit conversion to Unicode\n"
+ "  -v --verbose       report the changes\n"), PACKAGE_VERSION, DEFMAP);
diff --git a/source/a/kbd/sources/kbd-1.15-resizecon-x86_64.patch b/source/a/kbd/sources/kbd-1.15-resizecon-x86_64.patch
new file mode 100644
index 000000000..5e8350a86
--- /dev/null
+++ b/source/a/kbd/sources/kbd-1.15-resizecon-x86_64.patch
@@ -0,0 +1,15 @@
+diff -up kbd-1.15/configure_old kbd-1.15/configure
+--- kbd-1.15/configure_old	2009-01-08 15:11:04.000000000 +0100
++++ kbd-1.15/configure	2009-01-08 15:11:45.000000000 +0100
+@@ -7637,8 +7637,9 @@ fi
+ 
+ 
+ case $host_cpu in
+-	i?86*) RESIZECONS_PROGS=yes ;;
+-	*)     RESIZECONS_PROGS=no ;;
++	i?86*)   RESIZECONS_PROGS=yes ;;
++	x86_64*) RESIZECONS_PROGS=yes ;;
++	*)       RESIZECONS_PROGS=no ;;
+ esac
+  if test "$RESIZECONS_PROGS" = "yes"; then
+   RESIZECONS_PROGS_TRUE=
diff --git a/source/a/kbd/sources/kbd-1.15-sparc.patch b/source/a/kbd/sources/kbd-1.15-sparc.patch
new file mode 100644
index 000000000..a858a253a
--- /dev/null
+++ b/source/a/kbd/sources/kbd-1.15-sparc.patch
@@ -0,0 +1,97 @@
+diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8
+--- kbd-1.15/man/man8/kbdrate.8_old	2008-12-10 14:20:33.000000000 +0100
++++ kbd-1.15/man/man8/kbdrate.8	2008-12-10 14:41:10.000000000 +0100
+@@ -22,7 +22,7 @@ Using
+ without any options will reset the repeat rate to 10.9 characters per second (cps)
+ and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
+ These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
+-to 5 cps and the delay to 200 ms.
++to 20 cps and the delay to 200 ms.
+ 
+ .SH OPTIONS
+ .TP
+@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa
+ .I /etc/rc.local
+ .br
+ .I /dev/port
++.br
++.I /dev/kbd
+diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
+--- kbd-1.15/src/kbdrate.c_old	2008-12-10 14:00:25.000000000 +0100
++++ kbd-1.15/src/kbdrate.c	2008-12-10 14:20:11.000000000 +0100
+@@ -77,7 +77,6 @@ beats rebuilding the kernel!
+ 
+ #ifdef __sparc__
+ #include <asm/param.h>
+-#include <asm/kbio.h>
+ #endif
+ 
+ #ifndef KDKBDREP
+@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500, 
+ 
+ static int
+ KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
++#if defined(KDKBDREP) && !defined(__sparc__)
+ 	/*
+ 	 * This ioctl is defined in <linux/kd.h> but is not
+ 	 * implemented anywhere - must be in some m68k patches.
++         * We cannot blindly try unimplemented ioctls on sparc64 -
++         * the 32<->64bit transition layer does not like it.
+ 	 * Since 2.4.9 also on i386.
+-	 */
++         */
++
+ 	struct my_kbd_repeat kbdrep_s;
+ 
+ 	/* don't change, just test */
+@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
+ 			rate, kbdrep_s.delay );
+ 
+ 	return 1;			/* success! */
++#else /* no KDKBDREP or __sparc__ */
++        return 0;
++#endif /* KDKBDREP */
+ }
+ 
+ static int
+@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) {
+ int
+ main( int argc, char **argv ) {
+ #ifdef __sparc__
+-	double      rate = 5.0;      /* Default rate */
++        double      rate = 20.0;      /* Default rate */
+ 	int         delay = 200;     /* Default delay */
+ #else
+ 	double      rate = 10.9;     /* Default rate */
+@@ -272,7 +278,9 @@ main( int argc, char **argv ) {
+ 
+ 
+ 	/* The ioport way */
++        /* The ioport way - will crash on sparc */
+ 
++#ifndef __sparc__
+ 	for (i = 0; i < RATE_COUNT; i++)
+ 		if (rate * 10 >= valid_rates[i]) {
+ 			value &= 0x60;
+@@ -335,5 +343,7 @@ main( int argc, char **argv ) {
+ 			valid_rates[value & 0x1f] / 10.0,
+ 			valid_delays[ (value & 0x60) >> 5 ] );
+ 
++#endif
++
+ 	return 0;
+ }
+diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c
+--- kbd-1.15/src/setleds.c_old	2008-12-10 14:00:02.000000000 +0100
++++ kbd-1.15/src/setleds.c	2008-12-10 14:00:16.000000000 +0100
+@@ -14,10 +14,6 @@
+ #include "nls.h"
+ #include "version.h"
+ 
+-#ifdef __sparc__
+-#include <asm/kbio.h>
+-#endif
+-
+ static void
+ usage(void)
+ {
diff --git a/source/a/kbd/sources/kbd-1.15-unicode_start.patch b/source/a/kbd/sources/kbd-1.15-unicode_start.patch
new file mode 100644
index 000000000..d3dab3fe3
--- /dev/null
+++ b/source/a/kbd/sources/kbd-1.15-unicode_start.patch
@@ -0,0 +1,21 @@
+diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start
+--- kbd-1.15/src/unicode_start_old	2009-01-08 13:34:10.000000000 +0100
++++ kbd-1.15/src/unicode_start	2009-01-08 14:02:12.000000000 +0100
+@@ -72,6 +72,9 @@ stty iutf8
+ # have a Unicode map attached, or explicitly specified, e.g.,
+ # by giving `def.uni' as a second argument.
+ 
++DEFAULT_UNICODE_FONT=LatArCyrHeb-16
++# Also drdos8x16 is a good candidate.
++
+ case "$#" in
+ 	2)
+ 		setfont "$1" -u "$2"
+@@ -80,6 +83,7 @@ case "$#" in
+ 		setfont "$1"
+ 		;;
+ 	0)
++		setfont $DEFAULT_UNICODE_FONT
+ 		;;
+ 	*)
+ 		echo "usage: unicode_start [font [unicode map]]"
diff --git a/source/a/kbd/sources/kbd-1.15.tar.bz2.sign b/source/a/kbd/sources/kbd-1.15.tar.bz2.sign
new file mode 100644
index 000000000..39388b383
--- /dev/null
+++ b/source/a/kbd/sources/kbd-1.15.tar.bz2.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
+
+iD8DBQBJj684yGugalF9Dw4RAqQuAJ9fBsk3RWp6BT4UWHjceFn5YuEBygCff3dW
+qo/ACrIhyBx/eiZEpao8N4o=
+=0zxS
+-----END PGP SIGNATURE-----
diff --git a/source/a/kbd/sources/nl.euro.diff b/source/a/kbd/sources/nl.euro.diff
new file mode 100644
index 000000000..655a7e228
--- /dev/null
+++ b/source/a/kbd/sources/nl.euro.diff
@@ -0,0 +1,10 @@
+--- ./data/keymaps/i386/qwerty/nl.map.orig	2004-01-03 09:01:22.000000000 -0800
++++ ./data/keymaps/i386/qwerty/nl.map	2004-05-29 21:16:31.000000000 -0700
+@@ -12,6 +12,7 @@
+ keymaps 0-6,8-9,12
+ alt_is_meta
+ include "qwerty-layout"
++  altgr        keycode  18 = euro
+   altgr        keycode  19 = paragraph
+   altgr        keycode  31 = ssharp
+   altgr        keycode  44 = guillemotleft
diff --git a/source/a/kbd/sources/speakupmap.map b/source/a/kbd/sources/speakupmap.map
new file mode 100644
index 000000000..9c73e35df
--- /dev/null
+++ b/source/a/kbd/sources/speakupmap.map
@@ -0,0 +1,308 @@
+# us.map
+# with some additions from quinlan@spectrum.cs.bucknell.edu (Daniel Quinlan)
+# 14 Mar 1994
+keymaps 0-2,4-6,8,9,12,13
+keycode   1 = Escape           Escape          
+	alt     keycode   1 = Meta_Escape     
+keycode   2 = one              exclam          
+	alt     keycode   2 = Meta_one        
+	alt shift keycode 2 = Meta_exclam
+keycode   3 = two              at               at              
+	control keycode   3 = nul        
+	control shift keycode 3 = nul     
+	alt     keycode   3 = Meta_two        
+	alt shift keycode 3 = Meta_at
+keycode   4 = three            numbersign      
+	control keycode   4 = Escape          
+	alt     keycode   4 = Meta_three      
+	alt shift keycode 4 = Meta_numbersign
+keycode   5 = four             dollar           dollar          
+	control keycode   5 = Control_backslash
+	alt     keycode   5 = Meta_four      
+	alt shift keycode 5 = Meta_dollar 
+keycode   6 = five             percent         
+	control keycode   6 = Control_bracketright
+	alt     keycode   6 = Meta_five  
+	alt shift keycode 6 = Meta_percent     
+keycode   7 = six              asciicircum     
+	control keycode   7 = Control_asciicircum
+	alt     keycode   7 = Meta_six    
+	alt shift keycode 7 = Meta_asciicircum    
+keycode   8 = seven            ampersand        braceleft       
+	control keycode   8 = Control_underscore
+	alt     keycode   8 = Meta_seven      
+keycode   9 = eight            asterisk         bracketleft     
+	control keycode   9 = Delete          
+	alt     keycode   9 = Meta_eight      
+keycode  10 = nine             parenleft        bracketright    
+	alt     keycode  10 = Meta_nine       
+keycode  11 = zero             parenright       braceright      
+	alt     keycode  11 = Meta_zero       
+keycode  12 = minus            underscore       backslash       
+	control keycode  12 = Control_underscore
+	control shift keycode 12 = Control_underscore
+	alt     keycode  12 = Meta_minus      
+keycode  13 = equal            plus            
+	alt     keycode  13 = Meta_equal      
+keycode  14 = Delete           Delete          
+	alt     keycode  14 = Meta_Delete     
+keycode  15 = Tab              Tab             
+	alt     keycode  15 = Meta_Tab        
+keycode  16 = q               
+keycode  17 = w               
+keycode  18 = e               
+keycode  19 = r               
+keycode  20 = t               
+keycode  21 = y               
+keycode  22 = u               
+keycode  23 = i               
+keycode  24 = o               
+keycode  25 = p               
+keycode  26 = bracketleft      braceleft       
+	control keycode  26 = Escape          
+	alt     keycode  26 = Meta_bracketleft
+	alt shift keycode 26 = Meta_braceleft
+keycode  27 = bracketright     braceright       asciitilde      
+	control keycode  27 = Control_bracketright
+	alt     keycode  27 = Meta_bracketright
+	alt shift keycode 27 = Meta_braceright
+keycode  28 = Return          
+	alt     keycode  28 = 0x080d          
+keycode  29 = Control         
+keycode  30 = a               
+keycode  31 = s               
+keycode  32 = d               
+keycode  33 = f               
+keycode  34 = g               
+keycode  35 = h               
+keycode  36 = j               
+keycode  37 = k               
+keycode  38 = l               
+keycode  39 = semicolon        colon           
+	alt     keycode  39 = Meta_semicolon  
+keycode  40 = apostrophe       quotedbl        
+	control keycode  40 = Control_g       
+	alt     keycode  40 = Meta_apostrophe 
+keycode  41 = grave            asciitilde      
+	control keycode  41 = nul             
+	alt     keycode  41 = Meta_grave      
+keycode  42 = Shift           
+keycode  43 = backslash        bar             
+	control keycode  43 = Control_backslash
+	alt     keycode  43 = Meta_backslash  
+	alt shift keycode 43 = Meta_bar
+keycode  44 = z               
+keycode  45 = x               
+keycode  46 = c               
+keycode  47 = v               
+keycode  48 = b               
+keycode  49 = n               
+keycode  50 = m               
+keycode  51 = comma            less            
+	alt     keycode  51 = Meta_comma      
+	alt shift keycode 51 = Meta_less
+keycode  52 = period           greater         
+	alt     keycode  52 = Meta_period     
+	alt shift keycode 52 = Meta_greater
+keycode  53 = slash            question        
+	control keycode  53 = Delete          
+	alt     keycode  53 = Meta_slash      
+keycode  54 = Shift           
+keycode  55 = 0x0d26     
+#keycode  55 = KP_Multiply     
+	altgr	keycode 55 = 0x0406
+keycode  56 = Alt             
+keycode  57 = space            space           
+	control keycode  57 = nul             
+	alt     keycode  57 = Meta_space      
+keycode  58 = Caps_Lock       
+keycode  59 = F1               F11              Console_13      
+	control keycode  59 = F1              
+	alt     keycode  59 = Console_1       
+	control	alt     keycode  59 = Console_1       
+keycode  60 = F2               F12              Console_14      
+	control keycode  60 = F2              
+	alt     keycode  60 = Console_2       
+	control	alt     keycode  60 = Console_2       
+keycode  61 = F3               F13              Console_15      
+	control keycode  61 = F3              
+	alt     keycode  61 = Console_3       
+	control	alt     keycode  61 = Console_3       
+keycode  62 = F4               F14              Console_16      
+	control keycode  62 = F4              
+	alt     keycode  62 = Console_4       
+	control	alt     keycode  62 = Console_4       
+keycode  63 = F5               F15              Console_17      
+	control keycode  63 = F5              
+	alt     keycode  63 = Console_5       
+	control	alt     keycode  63 = Console_5       
+keycode  64 = F6               F16              Console_18      
+	control keycode  64 = F6              
+	alt     keycode  64 = Console_6       
+	control	alt     keycode  64 = Console_6       
+keycode  65 = F7               F17              Console_19      
+	control keycode  65 = F7              
+	alt     keycode  65 = Console_7       
+	control	alt     keycode  65 = Console_7       
+keycode  66 = F8               F18              Console_20      
+	control keycode  66 = F8              
+	alt     keycode  66 = Console_8       
+	control	alt     keycode  66 = Console_8       
+keycode  67 = F9               F19              Console_21      
+	control keycode  67 = F9              
+	alt     keycode  67 = Console_9       
+	control	alt     keycode  67 = Console_9       
+keycode  68 = F10              F20              Console_22      
+	control keycode  68 = F10             
+	alt     keycode  68 = Console_10      
+	control	alt     keycode  68 = Console_10      
+keycode  69 = Num_Lock        
+keycode  70 = Scroll_Lock      Show_Memory      Show_Registers  
+	control keycode  70 = Show_State      
+	alt     keycode  70 = Scroll_Lock     
+keycode  71 = 0x0d0b
+		altgr	keycode 71 = 0x0d0f
+#keycode  71 = KP_7            
+	alt     keycode  71 = Ascii_7         
+keycode  72 = 0x0d0a
+	altgr keycode 72 = 0x0d20
+#keycode  72 = KP_8            
+	alt     keycode  72 = Ascii_8         
+keycode  73 = 0x0d0c
+		altgr	keycode 73 = 0x0d0d
+#keycode  73 = KP_9            
+	alt     keycode  73 = Ascii_9         
+keycode  74 = 0x0d1e
+	altgr keycode 74 = 0x0d24
+keycode  75 = 0x0d08
+	altgr keycode 75 = 0x0d22
+#keycode  75 = KP_4            
+	alt     keycode  75 = Ascii_4         
+keycode  76 = 0x0d07
+#keycode  76 = KP_5            
+	altgr	keycode  76 = 0x0d12
+	alt     keycode  76 = Ascii_5         
+keycode  77 = 0x0d09
+	altgr keycode 77 = 0x0d23
+#keycode  77 = KP_6            
+	alt     keycode  77 = Ascii_6         
+#keycode  78 = KP_Add          
+keycode  78 = 0x0d14
+	altgr keycode 78 = 0x0d21
+keycode  79 = 0x0d05	
+#keycode  79 = KP_1            
+	altgr	keycode 79 = 0x0d10
+	alt     keycode  79 = Ascii_1         
+keycode  80 = 0x0d04
+#keycode  80 = KP_2            
+	altgr	keycode  80 = 0x0d11
+	alt     keycode  80 = Ascii_2         
+keycode  81 = 0x0d06		
+	altgr 	keycode 81 = 0x0d0e
+#keycode  81 = KP_3            
+	alt     keycode  81 = Ascii_3         
+#keycode  82 = 0x0d14
+keycode  82 = AltGr
+#keycode  82 = KP_0            
+	alt     keycode  82 = Ascii_0         
+#keycode  83 = KP_Period       
+keycode  83 = 0x0d1b
+	altgr	keycode 83 = 0x0d1d
+	altgr   control keycode  83 = Boot            
+	control alt     keycode  83 = Boot            
+keycode  84 = Last_Console    
+keycode  85 =
+keycode  86 = less             greater          bar             
+	alt     keycode  86 = Meta_less       
+keycode  87 = F11              F11              Console_23      
+	control keycode  87 = F11             
+	alt     keycode  87 = Console_11      
+	control	alt     keycode  87 = Console_11      
+keycode  88 = F12              F12              Console_24      
+	control keycode  88 = F12             
+	alt     keycode  88 = Console_12      
+	control	alt     keycode  88 = Console_12      
+keycode  89 =
+keycode  90 =
+keycode  91 =
+keycode  92 =
+keycode  93 =
+keycode  94 =
+keycode  95 =
+keycode  96 = 0x0d03
+	altgr	keycode 96 = 0x0d1c
+#keycode  96 = KP_Enter        
+keycode  97 = Control         
+keycode  98 = 0x0d27
+#keycode  98 = KP_Divide       
+	altgr	keycode  98 = 0x0d28
+#keycode  99 = Control_backslash
+keycode 99 = 0x0d25
+	control keycode  99 = Control_backslash
+	alt     keycode  99 = Control_backslash
+keycode 100 = Alt           
+keycode 101 = Break           
+keycode 102 = Find            
+keycode 103 = Up              
+keycode 104 = Prior           
+	shift   keycode 104 = Scroll_Backward 
+keycode 105 = Left            
+        alt     keycode 105 = Decr_Console
+keycode 106 = Right
+        alt     keycode 106 = Incr_Console
+keycode 107 = Select          
+keycode 108 = Down            
+keycode 109 = Next            
+	shift   keycode 109 = Scroll_Forward  
+keycode 110 = Insert          
+keycode 111 = Remove          
+	altgr   control keycode 111 = Boot            
+	control alt     keycode 111 = Boot            
+keycode 112 =
+keycode 113 =
+keycode 114 =
+keycode 115 =
+keycode 116 =
+keycode 117 =
+keycode 118 =
+keycode 119 =
+keycode 120 =
+keycode 121 =
+keycode 122 =
+keycode 123 =
+keycode 124 =
+keycode 125 =
+keycode 126 =
+keycode 127 =
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string F21 = ""
+string F22 = ""
+string F23 = ""
+string F24 = ""
+string F25 = ""
+string F26 = ""
diff --git a/source/a/less/less.SlackBuild b/source/a/less/less.SlackBuild
new file mode 100755
index 000000000..643359571
--- /dev/null
+++ b/source/a/less/less.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Copyright 2005-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.
+
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-less
+
+VERSION=${VERSION:-418}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "armel" ]; then
+  SLKCFLAGS="-O2 -march=armv4t"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf less-$VERSION
+tar xvf $CWD/less-$VERSION.tar.bz2 || exit 1
+cd less-$VERSION
+zcat $CWD/less.sysconfdir.diff.gz | patch -p1 --verbose || 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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --mandir=/usr/man
+
+make $NUMJOBS || make || exit 1
+
+mkdir -p $PKG/usr/bin
+cat less > $PKG/usr/bin/less
+cat lesskey > $PKG/usr/bin/lesskey
+cat lessecho > $PKG/usr/bin/lessecho
+zcat $CWD/lesspipe.sh.gz > $PKG/usr/bin/lesspipe.sh
+chmod 755 $PKG/usr/bin/*
+
+( 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
+)
+
+mkdir -p $PKG/usr/doc/less-$VERSION
+cp -a \
+  COPYING* LICENSE README NEWS \
+  $PKG/usr/doc/less-$VERSION
+
+mkdir -p $PKG/usr/man/man1
+for page in less.nro lesskey.nro ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/`basename $page .nro`.1.gz
+done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/less-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/less/less.sysconfdir.diff b/source/a/less/less.sysconfdir.diff
new file mode 100644
index 000000000..25c5bb584
--- /dev/null
+++ b/source/a/less/less.sysconfdir.diff
@@ -0,0 +1,15 @@
+--- ./less.nro.orig	Mon May 27 17:14:24 2002
++++ ./less.nro	Mon May 27 17:14:46 2002
+@@ -947,10 +947,10 @@
+ Otherwise,
+ .I less 
+ looks in a standard place for the system-wide lesskey file:
+-On Unix systems, the system-wide lesskey file is /usr/local/etc/sysless.
++On Unix systems, the system-wide lesskey file is /etc/sysless.
+ (However, if 
+ .I less 
+-was built with a different sysconf directory than /usr/local/etc,
++was built with a different sysconf directory than /etc,
+ that directory is where the sysless file is found.)
+ On MS-DOS and Windows systems, the system-wide lesskey file is c:\\_sysless.
+ On OS/2 systems, the system-wide lesskey file is c:\\sysless.ini.
diff --git a/source/a/less/lesspipe.sh b/source/a/less/lesspipe.sh
new file mode 100644
index 000000000..2d660522d
--- /dev/null
+++ b/source/a/less/lesspipe.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Copyright 1997, 1998, 1999, 2000  Patrick Volkerding, Moorhead, MN, USA
+# Copyright 2001, 2002  Slackware Linux, Inc, Concord, CA, USA
+# Copyright 2006, 2009  Patrick 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.
+#
+
+# This is a preprocessor for 'less'.  It is used when this environment
+# variable is set:   LESSOPEN="|lesspipe.sh %s"
+
+lesspipe() {
+  case "$1" in
+  *.tar) tar tvvf "$1" 2>/dev/null ;;
+  *.tgz | *.tar.gz | *.tar.Z | *.tar.z | *.tar.bz2 | *.tbz ) tar tvvf "$1" 2>/dev/null ;;
+  *.tlz | *.tar.lzma ) lzma -dc "$1" 2> /dev/null | tar tvvf - 2> /dev/null ;;
+  *.txz | *.tar.xz ) xz -dc "$1" 2> /dev/null | tar tvvf - 2> /dev/null ;;
+  *.zip) unzip -l "$1" 2>/dev/null ;;
+  *.rpm) rpm -qpvl "$1" 2>/dev/null ;;
+  *.rar) # check if rar is installed first
+    if which rar 1> /dev/null ; then
+      `which rar` t "$1" 
+    fi ;;
+  *.1|*.2|*.3|*.4|*.5|*.6|*.7|*.8|*.9|*.n|*.man) # *roff src?
+    if file -L "$1" | grep roff 1> /dev/null ; then
+      nroff -S -mandoc "$1"
+    fi ;;
+  *.1.gz|*.2.gz|*.3.gz|*.4.gz|*.5.gz|*.6.gz|*.7.gz|*.8.gz|*.9.gz|*.n.gz|*.man.gz) # compressed *roff src?
+    if gzip -dc "$1" | file - | grep roff 1> /dev/null ; then
+      gzip -dc "$1" | nroff -S -mandoc -
+    fi ;;
+  *.1.bz2|*.2.bz2|*.3.bz2|*.4.bz2|*.5.bz2|*.6.bz2|*.7.bz2|*.8.bz2|*.9.bz2|*.n.bz2|*.man.bz2) # compressed *roff src?
+    if bzip2 -dc "$1" | file - | grep roff 1> /dev/null ; then
+      bzip2 -dc "$1" | nroff -S -mandoc -
+    fi ;;
+  *.gz) gzip -dc "$1"  2>/dev/null ;;
+  *.bz2) bzip2 -dc "$1" 2>/dev/null ;;
+  *.lzma) lzma -dc "$1" 2>/dev/null ;;
+  *.xz) xz -dc "$1" 2>/dev/null ;;
+#  *) FILE=`file -L "$1"` ; # Check to see if binary, if so -- view with 'strings'
+#    FILE1=`echo $FILE | cut -d ' ' -f 2`
+#    FILE2=`echo $FILE | cut -d ' ' -f 3`
+#    if [ "$FILE1" = "Linux/i386" -o "$FILE2" = "Linux/i386" \
+#         -o "$FILE1" = "ELF" -o "$FILE2" = "ELF" ]; then
+#      strings "$1"
+#    fi ;;
+  esac
+}
+
+lesspipe "$1"
diff --git a/source/a/less/slack-desc b/source/a/less/slack-desc
new file mode 100644
index 000000000..bbf440f9a
--- /dev/null
+++ b/source/a/less/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------------------------------------------------------|
+less: less (file pager)
+less:
+less: Less is a paginator similar to more (1), but which allows backward
+less: movement in the file as well as forward movement. Also, less does not
+less: have to read the entire input file before starting, so with large
+less: input files it starts up faster than text editors like vi (1). 
+less:
+less: Less was written by Mark Nudelman.
+less:
+less:
+less:
diff --git a/source/a/lha/lha.SlackBuild b/source/a/lha/lha.SlackBuild
new file mode 100755
index 000000000..fb333362f
--- /dev/null
+++ b/source/a/lha/lha.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=114i
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-lha
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf lha-114i
+tar xzvf $CWD/lha-114i.tar.gz
+cd lha-114i
+zcat $CWD/lha_1.14i-10.1.diff.gz | patch -p1 --verbose || exit 1
+patch -p0 < debian/patch.paul
+patch -p0 < debian/patch.multibyte
+patch -p0 < debian/patch.CAN-2004-0234_0235
+patch -p0 < debian/patch.header-overflow
+patch -p1 < debian/patch.redhat-sec2
+patch -p1 < debian/patch.CVE-2006-4335-CVE-2006-4337-CVE-2006-4338
+chown -R root:root .
+make || exit 1
+mkdir -p $PKG/usr/bin
+cat src/lha > $PKG/usr/bin/lha
+chmod 755 $PKG/usr/bin/lha
+mkdir -p $PKG/usr/man/man1
+cat debian/lha.1 | gzip -9 > $PKG/usr/man/man1/lha.1.gz
+mkdir -p $PKG/usr/man/jp/man1
+cat man/lha.man | gzip -9 > $PKG/usr/man/jp/man1/lha.1.gz
+mkdir -p $PKG/usr/doc/lha-114i
+cp -a \
+  change-${VERSION}.txt \
+  $PKG/usr/doc/lha-${VERSION}
+mkdir -p $PKG/usr/doc/lha-${VERSION}/jp
+cp -a *.euc \
+  $PKG/usr/doc/lha-${VERSION}/jp
+chmod 644 $PKG/usr/man/jp/man1/*
+
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/lha-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/lha/lha_1.14i-10.1.diff b/source/a/lha/lha_1.14i-10.1.diff
new file mode 100644
index 000000000..cc32c4a67
--- /dev/null
+++ b/source/a/lha/lha_1.14i-10.1.diff
@@ -0,0 +1,5901 @@
+--- lha-1.14i.orig/src/lha_macro.h
++++ lha-1.14i/src/lha_macro.h
+@@ -7,7 +7,7 @@
+ /*	Ver. 1.14g	modified   						2000.05.06	T.OKAMOTO		*/
+ /* ------------------------------------------------------------------------ */
+ 
+-#define LHA_VERSION "lha for unix version 1.14g"
++#define LHA_VERSION "lha for unix version 1.14i"
+ 
+ /* Most of System V, define SYSTIME_HAS_NO_TM */
+ #ifdef	SYSTIME_HAS_NO_TM
+--- lha-1.14i.orig/man/lha.n
++++ lha-1.14i/man/lha.n
+@@ -9,7 +9,7 @@
+ ]
+ .I archive_file
+ [
+-.I flie
++.I file
+ \&.\|.\|. ]
+ .br
+ .B lha
+--- lha-1.14i.orig/man/lha.man
++++ lha-1.14i/man/lha.man
+@@ -1,324 +1,224 @@
++LHA(N)                     LHa for UNIX Users Manual                    LHA(N)
+ 
+ 
+-LHA(N)              Unix Programmer's Manual               LHA(N)
+ 
++NNAAMMEE ̾̾¾Î¾Î
++       LHa - ¹â°µ½Ì¥¢¡¼¥«¥¤¥Ð
+ 
+-NNNAAAMMMEEE ̾̾̾¾Î¾Î¾Î
+-     LHa - ¹â°µ½Ì¥¢¡¼¥«¥¤¥Ð
++SSYYNNOOPPSSIISS ·Á·Á¼°¼°
++       llhhaa kkeeyy [ mmooddiiffiieerrss ] _a_r_c_h_i_v_e___f_i_l_e [ _f_i_l_e ... ]
++       llhhaa _a_r_c_h_i_v_e___f_i_l_e
+ 
+-SSSYYYNNNOOOPPPSSSIIISSS ·Á·Á·Á¼°¼°¼°
+-     lllhhhaaa kkkeeeyyy [ mmmooodddiiifffiiieeerrrsss ] _a_r_c_h_i_v_e__f_i_l_e [ _f_l_i_e ... ]
+-     lllhhhaaa _a_r_c_h_i_v_e__f_i_l_e
++DDEESSCCRRIIPPTTIIOONN ²ò²òÀâÀâ
++       LLHHaa ¤Ï¸úΨ¤Î¹â¤¤°µ½Ìµ¡Ç½¤ò»ý¤Ä¥Õ¥¡¥¤¥ë¥¢¡¼¥«¥¤¥Ð¤Ç¤¹¡£
++       kkeeyy ¤Ëµ¡Ç½Ê¸»ú¤ò»ØÄꤷ¡¢file ¤ÎÄɲᢹ¹¿·¡¢Ãê½Ð¡¢ºï½ü¡¢°ìÍ÷ɽ¼¨¤Ê¤É¤ò¹Ô
++       ¤Ê¤¤¤Þ¤¹¡£°ú¿ô¤Ë archive_file ¤Î¤ß¤ò»ØÄꤷ¤¿¾ì¹ç¤Ë¤Ï¡¢µ¡Ç½Ê¸»ú¤Ë l ¤ò»Ø
++       Äꤷ¤¿¤Î¤ÈƱÅù¤ÎÆ°ºî¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
++       µ¡Ç½Ê¸»ú¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£
+ 
+-DDDEEESSSCCCRRRIIIPPPTTTIIIOOONNN ²ò²ò²òÀâÀâÀâ
+-     LLLHHHaaa ¤Ï¸úΨ¤Î¹â¤¤°µ½Ìµ¡Ç½¤ò»ý¤Ä¥Õ¥¡¥¤¥ë¥¢¡¼¥«¥¤¥Ð¤Ç¤¹¡£
+-     kkkeeeyyy  ¤Ëµ¡Ç½Ê¸»ú¤ò»ØÄꤷ¡¢file   ¤ÎÄɲᢹ¹¿·¡¢Ãê½Ð¡¢ºï½ü¡¢°ì
+-     Í÷ɽ¼¨¤Ê¤É¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£°ú¿ô¤Ë  archive_file  ¤Î¤ß¤ò»ØÄꤷ¤¿
+-     ¾ì¹ç¤Ë¤Ï¡¢µ¡Ç½Ê¸»ú¤Ë  l   ¤ò»ØÄꤷ¤¿¤Î¤ÈƱÅù¤ÎÆ°ºî¤ò¹Ô¤Ê¤¤¤Þ
+-     ¤¹¡£
+-     µ¡Ç½Ê¸»ú¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£
++       aa       Äɲá£file ¤ò archive_file ¤ËÄɲä·¤Þ¤¹¡£ file ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç
++               ¤¢¤ì¤Ð¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Þ¤Þ¤ì¤ë¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤ÆÄɲä·¤Þ¤¹¡£
+ 
+-     aaa       Äɲá£file ¤ò archive_file  ¤ËÄɲä·¤Þ¤¹¡£file  ¤¬¥Ç
+-             ¥£¥ì¥¯¥È¥ê¤Ç¤¢¤ì¤Ð¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Þ¤Þ¤ì¤ë¥Õ¥¡
+-             ¥¤¥ë¤ò¤¹¤Ù¤ÆÄɲä·¤Þ¤¹¡£
++       uu       ¹¹¿·¡£file ¤¬ archive_file ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢¤â¤·¤¯¤Ï³ÊǼ¤µ
++               ¤ì¤Æ¤¤¤ë¤â¤Î¤¬¸Å¤±¤ì¤Ð¡¢file ¤ò archive_file ¤ËÄɲä·¤Þ¤¹¡£
+ 
+-     uuu       ¹¹¿·¡£file  ¤¬  archive_file  ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢
+-             ¤â¤·¤¯¤Ï³ÊǼ¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤¬¸Å¤±¤ì¤Ð¡¢file        ¤ò
+-             archive_file ¤ËÄɲä·¤Þ¤¹¡£
++       ll ¤Þ¤Þ¤¿¤¿¤Ï¤Ï vv
++               °ìÍ÷ɽ¼¨¡£archive_file ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë file ¤Î¾ðÊó¤ò°ìÍ÷ɽ¼¨¤·
++               ¤Þ¤¹¡£file ¤Î»ØÄ꤬¤Ê¤±¤ì¤Ð archive_file Æâ¤ÎÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¾ð
++               Êó ¤ò ɽ ¼¨¤·¤Þ¤¹¡£ v ¤ò»ØÄꤹ¤ë¤È l ¤è¤ê¤â¾Ü¤·¤¤¾ðÊó¤òɽ¼¨¤·¤Þ
++               ¤¹¡£
+ 
+-     lll ¤Þ¤Þ¤Þ¤¿¤¿¤¿¤Ï¤Ï¤Ï vvv
+-             °ìÍ÷ɽ¼¨¡£archive_file  ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë  file  ¤Î¾ð
+-             Êó¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£file            ¤Î»ØÄ꤬¤Ê¤±¤ì¤Ð
+-             archive_file    Æâ¤ÎÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¾ðÊó¤òɽ¼¨¤·¤Þ¤¹
+-             ¡£v ¤ò»ØÄꤹ¤ë¤È l ¤è¤ê¤â¾Ü¤·¤¤¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
++       xx ¤Þ¤Þ¤¿¤¿¤Ï¤Ï ee
++               Ãê½Ð¡£archive_file ¤«¤é file ¤òÃê½Ð¤·¤Þ¤¹¡£file ¤Î»ØÄ꤬¤Ê¤± ¤ì
++               ¤Ð  archive_file Æâ¤ÎÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤òÃê½Ð¤·¤Þ¤¹¡£Ãê½Ð¤¹¤Ù¤­¥Õ¥¡
++               ¥¤¥ë¤¬¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢½Å¤Í½ñ¤­¤·¤Æ¤¤¤¤¤«¤ÎÌ䤤¹ç ¤ï
++               ¤»¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
+ 
+-     xxx ¤Þ¤Þ¤Þ¤¿¤¿¤¿¤Ï¤Ï¤Ï eee
+-             Ãê½Ð¡£archive_file ¤«¤é file  ¤òÃê½Ð¤·¤Þ¤¹¡£file  ¤Î
+-             »ØÄ꤬¤Ê¤±¤ì¤Ð  archive_file  Æâ¤ÎÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤òÃê
+-             ½Ð¤·¤Þ¤¹¡£Ãê½Ð¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤ë¾ì
+-             ¹ç¤Ë¤Ï¡¢½Å¤Í½ñ¤­¤·¤Æ¤¤¤¤¤«¤ÎÌ䤤¹ç¤ï¤»¤ò¹Ô¤Ê¤¤¤Þ¤¹
+-             ¡£
++       pp       ÆâÍÆɽ¼¨¡£archive_file ¤«¤é file ¤ÎÆâÍƤò¼è¤ê½Ð¤·¡¢É¸½à½ÐÎϤؤÈ
++               ½ÐÎϤ·¤Þ¤¹¡£file ¤Î»ØÄ꤬¤Ê¤±¤ì¤Ð¡¢Á´¤Æ¤ÎÆâÍƤò½ÐÎϤ·¤Þ¤¹¡£
+ 
+-     ppp       ÆâÍÆɽ¼¨¡£archive_file  ¤«¤é  file  ¤ÎÆâÍƤò¼è¤ê½Ð¤·
+-             ¡¢É¸½à½ÐÎϤؤȽÐÎϤ·¤Þ¤¹¡£file    ¤Î»ØÄ꤬¤Ê¤±¤ì¤Ð¡¢
+-             Á´¤Æ¤ÎÆâÍƤò½ÐÎϤ·¤Þ¤¹¡£
++       dd       ºï½ü¡£archive_file ¤«¤é file ¤òºï½ü¤·¤Þ¤¹¡£
+ 
+-     ddd       ºï½ü¡£archive_file ¤«¤é file ¤òºï½ü¤·¤Þ¤¹¡£
++       mm       °ÜÆ°¡£file ¤ò archive_file ¤ËÄɲä·¤¿¸å¡¢file ¤òºï½ü¤·¤Þ¤¹¡£ ¤³
++               ¤ì ¤Ï¡¢key ¤Ë a ¤ò¡¢modifiers ¤Ë d ¤ò»ØÄꤷ¤¿»þ¤ÈƱ¤¸Æ°ºî¤ò¹Ô¤Ê
++               ¤¤¤Þ¤¹¡£
+ 
+-     mmm       °ÜÆ°¡£file ¤ò archive_file  ¤ËÄɲä·¤¿¸å¡¢file  ¤òºï
+-             ½ü¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢key  ¤Ë  a ¤ò¡¢modifiers ¤Ë d ¤ò»Ø
+-             Äꤷ¤¿»þ¤ÈƱ¤¸Æ°ºî¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
++       cc       ¿·µ¬ºîÀ®¡£archive_file ¤ò¿·¤¿¤ËºîÀ®¤·¡¢file ¤òÄɲä·¤Þ¤¹¡£
+ 
++       µ¡Ç½Êѹ¹Ê¸»ú modifiers ¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ key ¤ÎÆ°ºî¤Î¾ÜºÙ¤òÊѹ¹ ¤¹
++       ¤ë ¤³ ¤È ¤¬¤Ç¤­¤Þ¤¹¡£modifiers ¤Ï¡¢°Ê²¼¤ÎÃ椫¤éÊ£¿ô»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ
++       ¤¹¡£
+ 
+-                        January 14,1997                         1
+ 
+ 
++       qq<<nnuumm>>  ɽ¼¨¤ÎÍÞÀ©¡£ÂÐÏÃŪ¤Ê¥á¥Ã¥»¡¼¥¸¤Îɽ¼¨¤òÍÞÀ©¤·¤Þ¤¹¡£ <num> ¤ÎÃͤË
++               ¤è¤Ã¤Æ¡¢INDICATOR ¤Îɽ¼¨ÊýË¡¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£
+ 
+-LHA(N)              Unix Programmer's Manual               LHA(N)
++                      qq00 oooo........ ¤Î¤Îɽɽ¼¨¼¨¤ò¤ò¹Ô¹Ô¤Ê¤Ê¤¦¤¦¡£¡£
+ 
++                      qq11 ¥Õ¥Õ¥¡¥¡¥¤¥¤¥ë¥ë̾̾ɽɽ¼¨¼¨¤Î¤Î¤ß¤ß¹Ô¹Ô¤Ê¤Ê¤¦¤¦¡£¡£
+ 
+-     ccc       ¿·µ¬ºîÀ®¡£archive_file  ¤ò¿·¤¿¤ËºîÀ®¤·¡¢file  ¤òÄɲÃ
+-             ¤·¤Þ¤¹¡£
++                      qq22 ²¿²¿¤â¤âɽɽ¼¨¼¨¤·¤·¤Ê¤Ê¤¤¤¤¡£¡£
+ 
+-     µ¡Ç½Êѹ¹Ê¸»ú modifiers ¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ  key  ¤ÎÆ°ºî¤Î
+-     ¾ÜºÙ¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£modifiers   ¤Ï¡¢°Ê²¼¤ÎÃ椫¤éÊ£
+-     ¿ô»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++               ¤Ê¤ª¡¢ÃͤòÆþÎϤ·¤Ê¤«¤Ã¤¿ºÝ¤Ë¤Ï¡¢q2 ¤ÈƱÅù¤Ë¤Ê¤ê¤Þ¤¹¡£
+ 
++       vv       ɽ¼¨¤Î¾éĹ²½¡£É½¼¨¤¹¤ë¥á¥Ã¥»¡¼¥¸¤ò¾éŤˤ·¤Þ¤¹¡£
+ 
++       nn        ¼Â¹Ô¤·¤Ê¤¤¡£¼ÂºÝ¤Î¹¹¿·¤äÃê½Ð¤ÎÆ°ºî¤ò¹Ô¤Ê¤¤¤Þ¤»¤ó¡£¼Â¹ÔÆâÍƤγÎ
++               ǧ¤Î¤¿¤á¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+ 
+-     qqq<<<nnnuuummm>>>  ɽ¼¨¤ÎÍÞÀ©¡£ÂÐÏÃŪ¤Ê¥á¥Ã¥»¡¼¥¸¤Îɽ¼¨¤òÍÞÀ©¤·¤Þ¤¹¡£
+-             <num>  ¤ÎÃͤˤè¤Ã¤Æ¡¢INDICATOR  ¤Îɽ¼¨ÊýË¡¤òÊѹ¹¤Ç¤­
+-             ¤Þ¤¹¡£
++       ff       ¶¯À©Åª¤Ê¼Â¹Ô¡£¥Õ¥¡¥¤¥ë¤ÎÃê½Ð»þ¤Ë¡¢Â¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤Îºï½ü³Îǧ ¤ò
++               ¹Ô¤Ê¤ï¤º¶¯À©Åª¤Ëºï½ü¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
+ 
+-             qqq000 oooooo............ ¤Î¤Î¤Îɽɽɽ¼¨¼¨¼¨¤ò¤ò¤ò¹Ô¹Ô¹Ô¤Ê¤Ê¤Ê¤¦¤¦¤¦¡£¡£¡£
++       tt       ¥Æ¥­¥¹¥È¥â¡¼¥É¤Ë¤è¤ë³ÊǼ,Ãê½Ð¡£¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ø¤Î¥Õ¥¡¥¤¥ë¤Î
++               ³ÊǼ»þ¤Ë¤Ï¡¢ UNIX ¤«¤é MS-DOS ¤Ø¤Î²þ¹Ô¥³¡¼¥ÉÊÑ´¹¤ò¹Ô¤Ê¤¤¤Þ ¤¹¡£
++               ¥Õ¥¡¥¤¥ë¤ÎÃê½Ð»þ¤Ë¤ÏµÕ¤Ë¡¢MS-DOS ¤«¤é UNIX ¤Ø¤Î²þ¹Ô¥³¡¼¥ÉÊÑ´¹¤ò
++               ¹Ô¤Ê¤¤¤Þ¤¹¡£
+ 
+-             qqq111 ¥Õ¥Õ¥Õ¥¡¥¡¥¡¥¤¥¤¥¤¥ë¥ë¥ë̾̾̾ɽɽɽ¼¨¼¨¼¨¤Î¤Î¤Î¤ß¤ß¤ß¹Ô¹Ô¹Ô¤Ê¤Ê¤Ê¤¦¤¦¤¦¡£¡£¡£
++       oo{{nnuumm}}  LHarc ¸ß´¹¥¢¡¼¥«¥¤¥Ö¤ÎÀ¸À®¡¢¤Þ¤¿¤Ï°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤ò»ØÄꤹ ¤ë¡£
++               µ¡Ç½Ê¸»ú a, u, m ¤È¶¦¤Ë»ØÄꤷ¡¢Ãê½Ð»þ¤Ë¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
+ 
+-             qqq222 ²¿²¿²¿¤â¤â¤âɽɽɽ¼¨¼¨¼¨¤·¤·¤·¤Ê¤Ê¤Ê¤¤¤¤¤¤¡£¡£¡£
++                      oo LLHHaarrcc ¸ß¸ß´¹´¹¥¢¥¢¡¼¡¼¥«¥«¥¤¥¤¥Ö¥Ö¤Î¤ÎÀ¸À¸À®À®¤ò¤ò¹Ô¹Ô¤¦¤¦¡£¡£
+ 
+-             ¤Ê¤ª¡¢ÃͤòÆþÎϤ·¤Ê¤«¤Ã¤¿ºÝ¤Ë¤Ï¡¢q2    ¤ÈƱÅù¤Ë¤Ê¤ê¤Þ
+-             ¤¹¡£
++                      ¸Å ¤¤ ·Á ¼° ¤Î ¥¢¡¼ ¥«¥¤¥Ö¤òÀ¸À®¤·¤Þ¤¹¡£°µ½Ì¥¢¥ë¥´¥ê¥º¥à
++                      ¤Ï-lh1-¤ò»ÈÍѤ·¤Þ¤¹¡£
+ 
+-     vvv       ɽ¼¨¤Î¾éĹ²½¡£É½¼¨¤¹¤ë¥á¥Ã¥»¡¼¥¸¤ò¾éŤˤ·¤Þ¤¹¡£
++               oo55 °µ°µ½Ì½Ì¥¢¥¢¥ë¥ë¥´¥´¥ê¥ê¥º¥º¥à¥à¤Ë¤Ë --llhh55-- ¤ò¤ò»È»ÈÍÑÍѤ¹¤¹¤ë¤ë¡£¡£
+ 
+-     nnn       ¼Â¹Ô¤·¤Ê¤¤¡£¼ÂºÝ¤Î¹¹¿·¤äÃê½Ð¤ÎÆ°ºî¤ò¹Ô¤Ê¤¤¤Þ¤»¤ó¡£
+-             ¼Â¹ÔÆâÍƤγÎǧ¤Î¤¿¤á¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++               oo66 °µ°µ½Ì½Ì¥¢¥¢¥ë¥ë¥´¥´¥ê¥ê¥º¥º¥à¥à¤Ë¤Ë --llhh66-- ¤ò¤ò»È»ÈÍÑÍѤ¹¤¹¤ë¤ë¡£¡£
+ 
+-     fff       ¶¯À©Åª¤Ê¼Â¹Ô¡£¥Õ¥¡¥¤¥ë¤ÎÃê½Ð»þ¤Ë¡¢Â¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë
+-             ¤Îºï½ü³Îǧ¤ò¹Ô¤Ê¤ï¤º¶¯À©Åª¤Ëºï½ü¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
++               LHA¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¤Ï¡¢-lh6-¤ÇÀ¸À®¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤ÏÃê½Ð¤Ç¤­¤Ê ¤¤
++               ¶² ¤ì ¤¬ ¤¢¤ë¤Î¤Ç¡¢¥¢¡¼¥«¥¤¥Ö¤òÇÛÉÛ¤¹¤ëºÝ¤Ë¤ÏÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
++               MSDOSÈǤÎÀµµ¬ÇÛÉÛÈÇ¤Ç¤Ï -lh6- ¤ÎÀ¸À®¤Ï¹Ô¤¤¤Þ¤»¤ó¡£¤Þ¤¿¡¢MSDOSÈÇ
++               LHA  version  2.5x  °Ê¹ß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï -lh6- ¤ÎÃê½Ð¤Î¤ß¤Ç¤­¤Þ
++               ¤¹¡£
+ 
+-     ttt       ¥Æ¥­¥¹¥È¥â¡¼¥É¤Ë¤è¤ë³ÊǼ,Ãê½Ð¡£¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë
+-             ¤Ø¤Î¥Õ¥¡¥¤¥ë¤Î³ÊǼ»þ¤Ë¤Ï¡¢UNIX  ¤«¤é  MS-DOS  ¤Ø¤Î²þ
+-             ¹Ô¥³¡¼¥ÉÊÑ´¹¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤ÎÃê½Ð»þ¤Ë¤ÏµÕ¤Ë
+-             ¡¢MS-DOS  ¤«¤é  UNIX  ¤Ø¤Î²þ¹Ô¥³¡¼¥ÉÊÑ´¹¤ò¹Ô¤Ê¤¤¤Þ¤¹
+-             ¡£
++       ww==<<//ddiirr>>
++               ³ÊǼ¤ª¤è¤ÓÃê½Ð»þ¤Î¥ï¡¼¥¯Íѥǥ£¥ì¥¯¥È¥ê »Ø Äê¡£ ¥Ç ¥Õ¥© ¥ë ¥È ¤Ç
++               ¤Ï¡¢/tmp  ¤Ç¤¹¤¬¡¢/tmp ¤ÎÂ礭¤µ°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤¹¤ëºÝ¤Ë¤Ïɬ
++               ÍפǤ¹¡£
+ 
+-     ooo{{{nnnuuummm}}}  LHarc   ¸ß´¹¥¢¡¼¥«¥¤¥Ö¤ÎÀ¸À®¡¢¤Þ¤¿¤Ï°µ½Ì¥¢¥ë¥´¥ê¥º¥à
+-             ¤ò»ØÄꤹ¤ë¡£µ¡Ç½Ê¸»ú  a,  u,  m ¤È¶¦¤Ë»ØÄꤷ¡¢Ãê½Ð»þ
+-             ¤Ë¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
++       dd       ¥Õ¥¡¥¤¥ë³ÊǼ¸å¤Î¥Õ¥¡¥¤¥ë¤Îºï½ü¡£µ¡Ç½Ê¸»ú a, ¤â¤·¤¯¤Ï u ¤È¶¦¤ËÍÑ
++               ¤¤¡¢ ¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ø¤Î¥Õ¥¡¥¤¥ë¤Î³ÊǼ¤Î¸å¤Ë¥Õ¥¡¥¤¥ë¤òºï½ü¤·
++               ¤Þ¤¹¡£ u ¤ËÉղä·¤¿¾ì¹ç¡¢¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ÎÆâÍƤÎÊý¤¬¿·¤·¤¤»þ
++               ¤Ë ¥Õ¥¡ ¥¤ ¥ë¤¬³ÊǼ¤µ¤ì¤º¤Ëºï½ü¤µ¤ì¤ë¤³¤È¤Ë¤Ê¤ë¤Î¤ÇÃí°Õ¤·¤Æ²¼¤µ
++               ¤¤¡£
+ 
+-             ooo LLLHHHaaarrrccc ¸ß¸ß¸ß´¹´¹´¹¥¢¥¢¥¢¡¼¡¼¡¼¥«¥«¥«¥¤¥¤¥¤¥Ö¥Ö¥Ö¤Î¤Î¤ÎÀ¸À¸À¸À®À®À®¤ò¤ò¤ò¹Ô¹Ô¹Ô¤¦¤¦¤¦¡£¡£¡£
++       ii       Ãê½Ð»þ¤Î¥Ç¥£¥ì¥¯¥È¥ê̾¤Î̵¸ú²½¡£Ãê½Ð»þ¤Ë¥Ç¥£¥ì¥¯¥È¥ê̾¤ò̵¸ú ¤Ë
++               ¤·¤Þ¤¹¡£
+ 
+-                  ¸Å¤¤·Á¼°¤Î¥¢¡¼¥«¥¤¥Ö¤òÀ¸À®¤·¤Þ¤¹¡£°µ½Ì¥¢¥ë¥´
+-                  ¥ê¥º¥à¤Ï-lh1-¤ò»ÈÍѤ·¤Þ¤¹¡£
++       zz        Èó °µ ½Ì³ÊǼ¡£¥¢¡¼¥«¥¤¥Ö¤Ø¤Î¥Õ¥¡¥¤¥ë¤Î³ÊǼ»þ¤Ë°µ½Ì¤ò¹Ô¤Ê¤¤¤Þ¤»
++               ¤ó¡£¤¹¤Ç¤Ë°µ½Ì¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤Æ°µ½Ì¸úΨ¤ò˾¤á¤Ê¤¤¾ì¹ç¤Ê¤É¤Ë»ÈÍÑ ¤·
++               ¤Þ¤¹¡£Ãê½Ð»þ¤Ë¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
+ 
++       gg       [generic]¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¡£ UNIX ÍѤÎÉղþðÊó¤ò»ý¤¿¤Ê¤¤¥¢¡¼¥«¥¤
++               ¥Ö¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£Ãê½Ð»þ¤Ë¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
+ 
++       00//11//22   ¥Ø¥Ã¥À¥ì¥Ù¥ë»ØÄê¡£¥¢¡¼¥«¥¤¥Ö¤ÎÆâÉôɽ¸½¤Î·Á¼°¤ò»ØÄꤷ ¤Þ ¤¹¡£ ¥Ç
++               ¥Õ¥© ¥ë¥È¤Ç¤Ï 1 ¤Ç¤¹¡£0 ¤Ï LHarc ¤ÇÍÑ°Õ¤µ¤ì¤Æ¤¤¤¿¸Å¤¤·Á¼°¤Ç¤¹¡£
++               ¾­Íè¤Ï 2 ¤Î·Á¼°¤ËÅý°ì¤µ¤ì¤ë¤è¤¦¤Ç¤¹¡£¤³¤ì¤Ï¥Õ¥¡¥¤¥ë¤Î³ÊǼ»þ¤Î¤ß
++               Í­¸ú¤Ç¤¹¡£¥Õ¥¡¥¤¥ë¤ÎÃê½Ð»þ¤Ë¤Ï¼«Æ°Åª¤Ë·Á¼°¤òȽÃǤ·½èÍý¤·¤Þ¤¹¡£
+ 
+-                        January 14,1997                         2
++       _a_r_c_h_i_v_e___f_i_l_e ¤Ë¤Ï¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
+ 
++       _a_r_c_h_i_v_e___f_i_l_e  ¤Ë _- ¤È½ñ¤¯¤³¤È¤Ë¤è¤Ã¤Æ¡¢¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤òɸ½àÆþ½ÐÎϤË
++       ¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£ ttaarr(1) ¤Î¤è¤¦¤Ë¡¢¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¡¢¹¹¿·»þ¤Ë¤Ïɸ ½à
++       ½ÐÎϤˡ¢¥¢¡¼¥«¥¤¥Ö¤«¤é¤Î¥Õ¥¡¥¤¥ë¤ÎÃê½Ð»þ¤Ë¤Ïɸ½àÆþÎϤˤʤê¤Þ¤¹¡£
+ 
++       Ãê ½Ð»þ¤Ë _a_r_c_h_i_v_e___f_i_l_e ¤¬Â¸ºß¤·¤Ê¤¤»þ¤Ë¤Ï¥µ¥Õ¥£¥Ã¥¯¥¹ ..llzzhh ¤ò¥Õ¥¡¥¤¥ë̾
++       ¤Î¸å¤í¤ËÉղä·¤ÆÃê½Ð¤ò»î¤ß¤Þ¤¹¡£
++       Æä˵¬Äê¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢±¿ÍѾ奵¥Õ¥£¥Ã¥¯¥¹¤È¤·¤Æ ..llzzhh ¤òÍѤ¤¤ë¤Î¤¬Ë¾ ¤Þ
++       ¤· ¤¤¤È»×¤¤¤Þ¤¹¡£ÆüËܰʳ°¤Ç¤Ï ..llhhaa ¤ò»ÈÍѤ·¤Æ¤¤¤ë¥±¡¼¥¹¤¬¤¢¤ë¤½¤¦¤Ç¤¹¤Î
++       ¤Ç¡¢Å¬µ¹Ä´À°¤·¤Æ²¼¤µ¤¤¡£:-)
++       ¥µ¥Õ¥£¥Ã¥¯¥¹¤¬ ccoomm ¤â¤·¤¯¤Ï ..eexxee ¤Î¾ì¹ç¤Ë¤Ï¡¢MS-DOS ÈǤǺîÀ®¤µ¤ì¤¿ _S_F_X(
++       ¼«¸ÊŸ³«µ¡Ç½ÉÕ¤­¤Î°µ½Ì¥Õ¥¡¥¤¥ë) ·Á¼°¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤·¡¢Âбþ¤·¤Þ¤¹¡£
++       ¥µ ¥Õ¥£¥Ã¥¯¥¹¤¬ ..xx ¤Î¾ì¹ç¤Ë¤Ï¡¢ÆüËÜÀ½ SHARP X68000 ¤Î OS, Human68k ÈǤÇ
++       ºîÀ®¤µ¤ì¤¿ SFX ·Á¼°¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤·Âбþ¤·¤Þ¤¹¡£
++       SFX ·Á¼°¤Î¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ËÂФ·¤ÆÄɲääºï½ü¤ò¹Ô¤Ã¤¿ ¾ì ¹ç ¤Ë ¤Ï¡¢ ¥µ
++       ¥Õ¥£¥Ã¥¯¥¹¤ò ..llzzhh ¤ËÊѹ¹¤·¡¢SFX ¤Î¾ðÊó¤òºï½ü¤·¤Þ¤¹¡£
+ 
+-LHA(N)              Unix Programmer's Manual               LHA(N)
+ 
++FFIILLEESS ¥Õ¥Õ¥¡¥¡¥¤¥¤¥ë¥ë
++       *.lzh          - LHa/LHarc ¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë
++       *.bak          - ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
++       /tmp/lh*       - ¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë
++       *.com *.exe    - MS-DOS SFX ¥Õ¥¡¥¤¥ë
++       *.x            - Human68k SFX ¥Õ¥¡¥¤¥ë
+ 
+-             ooo555 °µ°µ°µ½Ì½Ì½Ì¥¢¥¢¥¢¥ë¥ë¥ë¥´¥´¥´¥ê¥ê¥ê¥º¥º¥º¥à¥à¥à¤Ë¤Ë¤Ë ---lllhhh555- ¤ò¤ò¤ò»È»È»ÈÍÑÍÑÍѤ¹¤¹¤¹¤ë¤ë¤ë¡£¡£¡£
+ 
+-             ooo666 °µ°µ°µ½Ì½Ì½Ì¥¢¥¢¥¢¥ë¥ë¥ë¥´¥´¥´¥ê¥ê¥ê¥º¥º¥º¥à¥à¥à¤Ë¤Ë¤Ë ---lllhhh666- ¤ò¤ò¤ò»È»È»ÈÍÑÍÑÍѤ¹¤¹¤¹¤ë¤ë¤ë¡£¡£¡£
++SSEEEE AALLSSOO ´Ø´ØϢϢ¹à¹àÌÜÌÜ
++       ttaarr(1), aarr(1), ccoommpprreessss(1)
+ 
+-             LHA¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¤Ï¡¢-lh6-¤ÇÀ¸À®¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï
+-             Ãê½Ð¤Ç¤­¤Ê¤¤¶²¤ì¤¬¤¢¤ë¤Î¤Ç¡¢¥¢¡¼¥«¥¤¥Ö¤òÇÛÉÛ¤¹¤ëºÝ
+-             ¤Ë¤ÏÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£MSDOSÈǤÎÀµµ¬ÇÛÉÛÈÇ¤Ç¤Ï  -lh6-
+-             ¤ÎÀ¸À®¤Ï¹Ô¤¤¤Þ¤»¤ó¡£¤Þ¤¿¡¢MSDOSÈÇ  LHA  version 2.5x
+-             °Ê¹ß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï -lh6- ¤ÎÃê½Ð¤Î¤ß¤Ç¤­¤Þ¤¹¡£
++DDIISSTTRRIIBBUUTTIIOONN ºÆºÆÇÛÇÛÉÛÉۤˤˤĤĤ¤¤¤¤Æ¤Æ
++       °Ê²¼¤Î¾ò·ï¤Ç¡¢ºÆÇÛÉÛ¡¢Å¾ºÜ¡¢²þÊѤòµö²Ä¤·¤Þ¤¹¡£
+ 
+-     www===<<<///dddiiirrr>>>
+-             ³ÊǼ¤ª¤è¤ÓÃê½Ð»þ¤Î¥ï¡¼¥¯Íѥǥ£¥ì¥¯¥È¥ê»ØÄê¡£¥Ç¥Õ¥©
+-             ¥ë¥È¤Ç¤Ï¡¢/tmp  ¤Ç¤¹¤¬¡¢/tmp  ¤ÎÂ礭¤µ°Ê¾å¤Î¥Õ¥¡¥¤¥ë
+-             ¤ò³ÊǼ¤¹¤ëºÝ¤Ë¤ÏɬÍפǤ¹¡£
++       1.     Ãøºî¸¢É½¼¨¤òºï½ü¤·¤Ê¤¤¤³¤È¡£
+ 
+-     ddd       ¥Õ¥¡¥¤¥ë³ÊǼ¸å¤Î¥Õ¥¡¥¤¥ë¤Îºï½ü¡£µ¡Ç½Ê¸»ú  a,  ¤â¤·¤¯
+-             ¤Ï   u  ¤È¶¦¤ËÍѤ¤¡¢¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ø¤Î¥Õ¥¡¥¤¥ë¤Î
+-             ³ÊǼ¤Î¸å¤Ë¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹¡£u   ¤ËÉղä·¤¿¾ì¹ç¡¢
+-             ¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ÎÆâÍƤÎÊý¤¬¿·¤·¤¤»þ¤Ë¥Õ¥¡¥¤¥ë¤¬
+-             ³ÊǼ¤µ¤ì¤º¤Ëºï½ü¤µ¤ì¤ë¤³¤È¤Ë¤Ê¤ë¤Î¤ÇÃí°Õ¤·¤Æ²¼¤µ¤¤
+-             ¡£
++       2.     ÇÛÉÛÆâÍƤˤĤ¤¤Æ¤Ï¡¢
+ 
+-     iii       Ãê½Ð»þ¤Î¥Ç¥£¥ì¥¯¥È¥ê̾¤Î̵¸ú²½¡£Ãê½Ð»þ¤Ë¥Ç¥£¥ì¥¯¥È
+-             ¥ê̾¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
++              a.      ÇÛ Éۤκݤ˸ºß¤¹¤ëÆâÍÆ(¤¹¤Ê¤ï¤Á¥½¡¼¥¹¥³¡¼¥É¡¢¥É¥­¥å¥á¥ó
++                     ¥È¡¢¥×¥í¥°¥é¥Þ¡¼¤Ø¤Î¼ê°ú¤­¤Ê¤É)¤¬ºÆÇÛÉÛ¤µ¤ì¤¿¤â¤Î¤ÎÃæ¤Ëɬ
++                     ¤º ¸ ºß ¤¹¤ë¤³¤È¡£²þÊѤµ¤ì¤Æ¤¤¤ë¤Ê¤é¤Ð¡¢¤½¤ì¤òÌÀ¼¨¤·¤¿¥É
++                     ¥­¥å¥á¥ó¥È¤òÍÑ°Õ¤¹¤ë¤³¤È¡£
+ 
+-     zzz       È󰵽̳ÊǼ¡£¥¢¡¼¥«¥¤¥Ö¤Ø¤Î¥Õ¥¡¥¤¥ë¤Î³ÊǼ»þ¤Ë°µ½Ì¤ò
+-             ¹Ô¤Ê¤¤¤Þ¤»¤ó¡£¤¹¤Ç¤Ë°µ½Ì¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤Æ°µ½Ì¸úΨ¤ò˾
+-             ¤á¤Ê¤¤¾ì¹ç¤Ê¤É¤Ë»ÈÍѤ·¤Þ¤¹¡£Ãê½Ð»þ¤Ë¤Ï̵»ë¤µ¤ì¤Þ¤¹
+-             ¡£
++              b.     LHa ¤ËÂФ¹¤ëÉղòÁÃͤ¬ÉÕ¤±¤é¤ì¤ÆºÆÇÛÉÛ¤µ¤ì¤ë¾ì¹ç¤Ë¤Ï¤½ ¤ì
++                     ¤é ¤â¤Ç¤­¤ë¤À¤±´Þ¤á¤ë¤è¤¦ÅØÎϤ¹¤ë¤³¤È¡£¤Þ¤¿¡¢¤½¤ÎºÝ¤Ë¤ÏÉÕ
++                     ²Ã²ÁÃͤ¬ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¤³¤È¤òÌÀ¼¨¤·¤¿¥É¥­¥å¥á¥ó¥È¤òÍÑ°Õ ¤¹
++                     ¤ë¤³¤È¡£
+ 
+-     ggg       [generic]¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¡£UNIX   ÍѤÎÉղþðÊó¤ò»ý¤¿
+-             ¤Ê¤¤¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£Ãê½Ð»þ¤Ë¤Ï̵»ë
+-             ¤µ¤ì¤Þ¤¹¡£
++              c.     ¥Ð¥¤¥Ê¥ê¤Î¤ß¤ÎÇÛÉۤϵö¤µ¤ì¤Ê¤¤¡£(ÉղòÁÃͤΤâ¤Î¤â´Þ¤à)
+ 
+-     000///111///222   ¥Ø¥Ã¥À¥ì¥Ù¥ë»ØÄê¡£¥¢¡¼¥«¥¤¥Ö¤ÎÆâÉôɽ¸½¤Î·Á¼°¤ò»ØÄê
+-             ¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï 1 ¤Ç¤¹¡£0 ¤Ï  LHarc  ¤ÇÍÑ°Õ¤µ
+-             ¤ì¤Æ¤¤¤¿¸Å¤¤·Á¼°¤Ç¤¹¡£¾­Íè¤Ï   2  ¤Î·Á¼°¤ËÅý°ì¤µ¤ì¤ë
+-             ¤è¤¦¤Ç¤¹¡£¤³¤ì¤Ï¥Õ¥¡¥¤¥ë¤Î³ÊǼ»þ¤Î¤ßÍ­¸ú¤Ç¤¹¡£¥Õ¥¡
+-             ¥¤¥ë¤ÎÃê½Ð»þ¤Ë¤Ï¼«Æ°Åª¤Ë·Á¼°¤òȽÃǤ·½èÍý¤·¤Þ¤¹¡£
++       3.     ºÇ¿·ÈǤÎÇÛÉÛ¤Ë̳¤á¤ë¤³¤È¡£(µÁ̳¤Ï¤Ê¤¤)
+ 
+-     _a_r_c_h_i_v_e__f_i_l_e ¤Ë¤Ï¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
++              Ãí.     ¤Ê¤ª¡¢¥Í¥Ã¥È¤Ç¤ÎÇÛÉդϼ«Í³¤Ç¤¢¤ë¤¬¡¢¥Í¥Ã¥È¤Ë¥¢¥¯¥»¥¹¤Ç¤­
++                     ¤Ê¤¤Êý¡Ê»¨»ï¤ª¤è¤Ó¡¢ CD-ROM ¤Ê¤É¤Ë¤è¤ë¡ËÇÛÉդϡ¢ÇÛÉÕÁ° ¤Ë
++                     ¤³ ¤Á¤é¤Ë E-Mail ¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£ÇÛÉÕÁ°¤Ë½ÐÍè¤Ê¤¤ºÝ¤Ë¤Ï¡¢
++                     ¸åÆüɬ¤º E-Mail ¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
+ 
+-     _a_r_c_h_i_v_e__f_i_l_e  ¤Ë-   ¤È½ñ¤¯¤³¤È¤Ë¤è¤Ã¤Æ¡¢¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ò
+-     ɸ½àÆþ½ÐÎϤˤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£tttaaarrr(1)    ¤Î¤è¤¦¤Ë¡¢¥¢¡¼¥«¥¤
+-     ¥Ö¤ÎºîÀ®¡¢¹¹¿·»þ¤Ë¤Ïɸ½à½ÐÎϤˡ¢¥¢¡¼¥«¥¤¥Ö¤«¤é¤Î¥Õ¥¡¥¤¥ë¤Î
++       4.     ¤³¤Î¥×¥í¥°¥é¥à¤Î¸ºß¤ä»ÈÍѤ·¤¿¤³¤È¤Ë¤è¤Ã¤ÆÀ¸¤¸¤¿Â»³²¤ÏÁ´¤¯Êݾڤ·
++              ¤Ê¤¤¡£
+ 
++       5.     ºî¼Ô¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËÉÔÈ÷¤¬¤¢¤Ã¤Æ¤â¡¢¤½¤ì¤òÄûÀµ¤¹¤ëµÁ̳¤òÉé¤ï
++              ¤Ê¤¤¡£
+ 
+-                        January 14,1997                         3
++       6.     ¤³¤Î¥×¥í¥°¥é¥à¤Î°ìÉô¡¢¤Þ¤¿¤ÏÁ´Éô¤ò¾¤Î¥×¥í¥°¥é¥à¤ËÁȤ߹þ¤ó¤ÇÍøÍÑ
++              ¤· ¤Æ¤â¤«¤Þ¤ï¤Ê¤¤¡£¤³¤Î¾ì¹ç¡¢¤½¤Î¥×¥í¥°¥é¥à¤Ï LHa ¤Ç¤Ï¤Ê¤¯¡¢ LHa
++              ¤È̾¾è¤Ã¤Æ¤Ï¤¤¤±¤Ê¤¤¡£
+ 
++       7.     ¾¦ÍøÍѤ˴ؤ·¤Æ¤Ï¡¢¾åµ­¤Î¾ò·ï¤Ë²Ã¤¨¡¢²¼µ­¤Î¾ò·ï¤Î¤â¤È¤Ë¤³¤ì¤òǧ¤á
++              ¤ë¡£
+ 
++              a.     ¤³¤Î¥×¥í¥°¥é¥à¤ò¥á¥¤¥ó¤È¤¹¤ë¾¦ÍøÍѤ϶ػߤ¹¤ë¡£
+ 
+-LHA(N)              Unix Programmer's Manual               LHA(N)
++              b.      ¾¦ÍøÍѤÎÁê¼ê¤¬¤³¤Î¥×¥í¥°¥é¥à¤Î»ÈÍѼԤȤ·¤ÆÉÔŬÀÚ¤ÈȽÃǤ·
++                     ¤¿¾ì¹ç¤Ë¤ÏÇÛÉÛ¤·¤Ê¤¤¡£
+ 
++              c.     ¥¤¥ó¥¹¥È¡¼¥ë¤Î¼êÃʤȤ·¤Æ»ÈÍѤ¹¤ë¾ì¹ç¡¢¤³¤Î¥×¥í¥°¥é¥à¤ò »È
++                     ¤¦ ¤³ ¤È ¤òÁê¼ê¤Ë¶¯À©¤·¤Ê¤¤¡£¤³¤Î¾ì¹ç¡¢¾¦ÍøÍѼԤ¬ºî¶È¤ò¹Ô
++                     ¤¦¡£¤Þ¤¿¡¢¤½¤Î¤È¤­¤Î»³²¤Ï¡¢¾¦ÍøÍѼԤ¬Á´ÀÕǤ¤òÉ餦¡£
+ 
+-     Ãê½Ð»þ¤Ë¤Ïɸ½àÆþÎϤˤʤê¤Þ¤¹¡£
++              d.     ¾¦ÍøÍѤòÉղòÁÃͤȤ·¤Æ¹Ô¤¤¤³¤Î¥×¥í¥°¥é¥à¤ò»ÈÍѤ¹¤ë¾ì ¹ç¡¢
++                     ¾¦ÍøÍѼԤϡ¢¤½¤Î¥µ¥Ý¡¼¥È¤ò¹Ô¤¦¡£
+ 
+-     Ãê½Ð»þ¤Ë_a_r_c_h_i_v_e__f_i_l_e  ¤¬Â¸ºß¤·¤Ê¤¤»þ¤Ë¤Ï¥µ¥Õ¥£¥Ã¥¯¥¹...lllzzzhhh  ¤ò
+-     ¥Õ¥¡¥¤¥ë̾¤Î¸å¤í¤ËÉղä·¤ÆÃê½Ð¤ò»î¤ß¤Þ¤¹¡£
+-     Æä˵¬Äê¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢±¿ÍѾ奵¥Õ¥£¥Ã¥¯¥¹¤È¤·¤Æ...lllzzzhhh    ¤òÍÑ
+-     ¤¤¤ë¤Î¤¬Ë¾¤Þ¤·¤¤¤È»×¤¤¤Þ¤¹¡£ÆüËܰʳ°¤Ç¤Ï  ...lllhhhaaa  ¤ò»ÈÍѤ·¤Æ¤¤
+-     ¤ë¥±¡¼¥¹¤¬¤¢¤ë¤½¤¦¤Ç¤¹¤Î¤Ç¡¢Å¬µ¹Ä´À°¤·¤Æ²¼¤µ¤¤¡£:-)
+-     ¥µ¥Õ¥£¥Ã¥¯¥¹¤¬cccooommm ¤â¤·¤¯¤Ï...eeexxxeee  ¤Î¾ì¹ç¤Ë¤Ï¡¢MS-DOS  ÈǤǺîÀ®
+-     ¤µ¤ì¤¿_S_F_X(¼«¸ÊŸ³«µ¡Ç½ÉÕ¤­¤Î°µ½Ì¥Õ¥¡¥¤¥ë)   ·Á¼°¤«¤É¤¦¤«¤ò¥Á
+-     ¥§¥Ã¥¯¤·¡¢Âбþ¤·¤Þ¤¹¡£
+-     ¥µ¥Õ¥£¥Ã¥¯¥¹¤¬...xxx  ¤Î¾ì¹ç¤Ë¤Ï¡¢ÆüËÜÀ½  SHARP  X68000  ¤Î  OS,
+-     Human68k  ÈǤǺîÀ®¤µ¤ì¤¿  SFX ·Á¼°¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤·Âбþ¤·
+-     ¤Þ¤¹¡£
+-     SFX   ·Á¼°¤Î¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ËÂФ·¤ÆÄɲääºï½ü¤ò¹Ô¤Ã¤¿¾ì¹ç
+-     ¤Ë¤Ï¡¢¥µ¥Õ¥£¥Ã¥¯¥¹¤ò...lllzzzhhh   ¤ËÊѹ¹¤·¡¢SFX  ¤Î¾ðÊó¤òºï½ü¤·¤Þ¤¹
+-     ¡£
+ 
+-FFFIIILLLEEESSS ¥Õ¥Õ¥Õ¥¡¥¡¥¡¥¤¥¤¥¤¥ë¥ë¥ë
+-     *.lzh          - LHa/LHarc ¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë
+-     *.bak          - ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
+-     /tmp/lh*       - ¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë
+-     *.com *.exe    - MS-DOS SFX ¥Õ¥¡¥¤¥ë
+-     *.x            - Human68k SFX ¥Õ¥¡¥¤¥ë
++ºÇºÇ¸å¸å¤Ë¤Ë((FFrroomm YY..TTaaggaawwaa))
++       LZHUF   Ë¡¤Î´ðÁäȤʤä¿ LZARI Ë¡¤òȯɽ¤·¤Æ¤¯¤À¤µ¤Ã¤¿±ü¼À²É§»á¡¢¤½¤ì¤ò
++       NIFTY-Serve ¤Ë¾Ò²ð¤·¡¢¤Þ¤¿¡¢LArc ¤Îºî¼Ô¤Ç¤â¤¢¤ë»°ÌÚÏÂɧ»á¡¢¤Þ¤¿¡¢¤³¤ì¤é
++       ¤Î Í× °ø ¤«¤é LZHUF Ë¡µÚ¤Ó¡¢MS-DOS ÈÇ LHarc ¤òºîÀ®¤·¤¿µÈºê±ÉÂٻᡢLHarc
++       UNIX ¤Î³«È¯¤Ë¶¨ÎϤ·¤¿¿Íã¡¢¤³¤³¤í¤è¤¯¥á¥Ã¥»¡¼¥¸¤Î¶¶ÅϤ·¤ò¤·¤Æ¤¯¤ì¤¿Àкê
++       °ìÌÀ»á(MIX ID:k.ishi)¡¢¤Þ¤¿¡¢¤¤¤í¤¤¤í¤Ê¥ì¥Ý¡¼¥È¤ò¤¯¤ì¤¿¤ß¤Ê¤µ¤ó¡¢¤½¤ì¤ò
++       Ãæ·Ñ¤·¤Æ¤¯¤À¤µ¤Ã¤¿¿¹¸ø°ìϺ»á (MIX ID:kmori)¤Ë´¶¼Õ¤·¤Þ¤¹¡£
+ 
+-SSSEEEEEE AAALLLSSSOOO ´Ø´Ø´ØϢϢϢ¹à¹à¹àÌÜÌÜÌÜ
+-     tttaaarrr(1), aaarrr(1), cccooommmppprrreeessssss(1)
+ 
+-DDDIIISSSTTTRRRIIIBBBUUUTTTIIIOOONNN ºÆºÆºÆÇÛÇÛÇÛÉÛÉÛÉۤˤˤˤĤĤĤ¤¤¤¤¤¤Æ¤Æ¤Æ
++ºÇºÇ¸å¸å¤Ë¤Ë((FFrroomm MMaassaarruu OOkkii))
++       ¾åµ­¤ÎÊý¡¹¤Ï¤â¤Á¤í¤ó¡¢²Ã¤¨¤Æ LHarc UNIX ¤òºîÀ®¤·¤¿ Y.Tagawa »á¡¢¤½¤ì ¤ò
++       OSK   ¤Ë°Ü¿¢¤·µÈºê»á¤Î LHx ¤Î¥¢¥ë¥´¥ê¥º¥à¤òÁȤ߹þ¤ó¤À H.S »á¡¢ JUNET ¤Î
++       LHa for UNIX MailingList ¤Ë¤Æ¶¨ÎϤ·¤Æ¤¯¤À¤µ¤Ã¤¿¤ß¤Ê¤µ¤ó¤Ë´¶¼ÕÃפ·¤Þ¤¹¡£
+ 
+-     °Ê²¼¤Î¾ò·ï¤Ç¡¢ºÆÇÛÉÛ¡¢Å¾ºÜ¡¢²þÊѤòµö²Ä¤·¤Þ¤¹¡£
++ºÇºÇ¸å¸å¤Ë¤Ë((FFrroomm NNoobbuuttaakkaa WWaattaazzaakkii))
++       ¤³¤Î¥×¥í¥°¥é¥à¤ÎºîÀ®¤Ë¤«¤«¤ï¤Ã¤¿Êý¡¹¡¢¤µ¤é¤Ë¤³¤³¤Þ¤Ç LHa ¤ò»Å¾å¤²¤Æ¤¯¤À
++       ¤µ¤Ã¤¿ ²­¾¡»á¤Ë´¶¼ÕÃפ·¤Þ¤¹¡£
+ 
+-     1.      Ãøºî¸¢É½¼¨¤òºï½ü¤·¤Ê¤¤¤³¤È¡£
+ 
+-     2.      ÇÛÉÛÆâÍƤˤĤ¤¤Æ¤Ï¡¢
+-
+-     a.      ÇÛÉۤκݤ˸ºß¤¹¤ëÆâÍÆ(¤¹¤Ê¤ï¤Á¥½¡¼¥¹¥³¡¼¥É¡¢¥É¥­
+-             ¥å¥á¥ó¥È¡¢¥×¥í¥°¥é¥Þ¡¼¤Ø¤Î¼ê°ú¤­¤Ê¤É)¤¬ºÆÇÛÉÛ¤µ¤ì
+-             ¤¿¤â¤Î¤ÎÃæ¤Ëɬ¤ºÂ¸ºß¤¹¤ë¤³¤È¡£²þÊѤµ¤ì¤Æ¤¤¤ë¤Ê¤é¤Ð
+-             ¡¢¤½¤ì¤òÌÀ¼¨¤·¤¿¥É¥­¥å¥á¥ó¥È¤òÍÑ°Õ¤¹¤ë¤³¤È¡£
+-
+-     b.      LHa   ¤ËÂФ¹¤ëÉղòÁÃͤ¬ÉÕ¤±¤é¤ì¤ÆºÆÇÛÉÛ¤µ¤ì¤ë¾ì¹ç¤Ë
+-             ¤Ï¤½¤ì¤é¤â¤Ç¤­¤ë¤À¤±´Þ¤á¤ë¤è¤¦ÅØÎϤ¹¤ë¤³¤È¡£¤Þ¤¿¡¢
+-             ¤½¤ÎºÝ¤Ë¤ÏÉղòÁÃͤ¬ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¤³¤È¤òÌÀ¼¨¤·¤¿¥É
+-             ¥­¥å¥á¥ó¥È¤òÍÑ°Õ¤¹¤ë¤³¤È¡£
+-
+-
+-
+-                        January 14,1997                         4
+-
+-
+-
+-LHA(N)              Unix Programmer's Manual               LHA(N)
+-
+-
+-     c.      ¥Ð¥¤¥Ê¥ê¤Î¤ß¤ÎÇÛÉۤϵö¤µ¤ì¤Ê¤¤¡£(ÉղòÁÃͤΤâ¤Î¤â
+-             ´Þ¤à)
+-
+-     3.      ºÇ¿·ÈǤÎÇÛÉÛ¤Ë̳¤á¤ë¤³¤È¡£(µÁ̳¤Ï¤Ê¤¤)
+-
+-     Ãí.     ¤Ê¤ª¡¢¥Í¥Ã¥È¤Ç¤ÎÇÛÉդϼ«Í³¤Ç¤¢¤ë¤¬¡¢¥Í¥Ã¥È¤Ë¥¢¥¯¥»
+-             ¥¹¤Ç¤­¤Ê¤¤Êý¡Ê»¨»ï¤ª¤è¤Ó¡¢CD-ROM    ¤Ê¤É¤Ë¤è¤ë¡ËÇÛÉÕ
+-             ¤Ï¡¢ÇÛÉÕÁ°¤Ë¤³¤Á¤é¤Ë  E-Mail  ¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£ÇÛÉÕÁ°
+-             ¤Ë½ÐÍè¤Ê¤¤ºÝ¤Ë¤Ï¡¢¸åÆüɬ¤º E-Mail ¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
+-
+-     4.      ¤³¤Î¥×¥í¥°¥é¥à¤Î¸ºß¤ä»ÈÍѤ·¤¿¤³¤È¤Ë¤è¤Ã¤ÆÀ¸¤¸¤¿Â»
+-             ³²¤ÏÁ´¤¯Êݾڤ·¤Ê¤¤¡£
+-
+-     5.      ºî¼Ô¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËÉÔÈ÷¤¬¤¢¤Ã¤Æ¤â¡¢¤½¤ì¤òÄûÀµ
+-             ¤¹¤ëµÁ̳¤òÉé¤ï¤Ê¤¤¡£
+-
+-     6.      ¤³¤Î¥×¥í¥°¥é¥à¤Î°ìÉô¡¢¤Þ¤¿¤ÏÁ´Éô¤ò¾¤Î¥×¥í¥°¥é¥à¤Ë
+-             ÁȤ߹þ¤ó¤ÇÍøÍѤ·¤Æ¤â¤«¤Þ¤ï¤Ê¤¤¡£¤³¤Î¾ì¹ç¡¢¤½¤Î¥×¥í
+-             ¥°¥é¥à¤Ï LHa ¤Ç¤Ï¤Ê¤¯¡¢LHa ¤È̾¾è¤Ã¤Æ¤Ï¤¤¤±¤Ê¤¤¡£
+-
+-     7.      ¾¦ÍøÍѤ˴ؤ·¤Æ¤Ï¡¢¾åµ­¤Î¾ò·ï¤Ë²Ã¤¨¡¢²¼µ­¤Î¾ò·ï¤Î¤â
+-             ¤È¤Ë¤³¤ì¤òǧ¤á¤ë¡£
+-
+-     a.      ¤³¤Î¥×¥í¥°¥é¥à¤ò¥á¥¤¥ó¤È¤¹¤ë¾¦ÍøÍѤ϶ػߤ¹¤ë¡£
+-
+-     b.      ¾¦ÍøÍѤÎÁê¼ê¤¬¤³¤Î¥×¥í¥°¥é¥à¤Î»ÈÍѼԤȤ·¤ÆÉÔŬÀÚ¤È
+-             ȽÃǤ·¤¿¾ì¹ç¤Ë¤ÏÇÛÉÛ¤·¤Ê¤¤¡£
+-
+-     c.      ¥¤¥ó¥¹¥È¡¼¥ë¤Î¼êÃʤȤ·¤Æ»ÈÍѤ¹¤ë¾ì¹ç¡¢¤³¤Î¥×¥í¥°¥é
+-             ¥à¤ò»È¤¦¤³¤È¤òÁê¼ê¤Ë¶¯À©¤·¤Ê¤¤¡£¤³¤Î¾ì¹ç¡¢¾¦ÍøÍѼÔ
+-             ¤¬ºî¶È¤ò¹Ô¤¦¡£¤Þ¤¿¡¢¤½¤Î¤È¤­¤Î»³²¤Ï¡¢¾¦ÍøÍѼԤ¬Á´
+-             ÀÕǤ¤òÉ餦¡£
+-
+-     d.      ¾¦ÍøÍѤòÉղòÁÃͤȤ·¤Æ¹Ô¤¤¤³¤Î¥×¥í¥°¥é¥à¤ò»ÈÍѤ¹¤ë
+-             ¾ì¹ç¡¢¾¦ÍøÍѼԤϡ¢¤½¤Î¥µ¥Ý¡¼¥È¤ò¹Ô¤¦¡£
+-
+-ºÇºÇºÇ¸å¸å¸å¤Ë¤Ë¤Ë(((FFFrrrooommm YYY...TTTaaagggaaawwwaaa)))
+-     LZHUF  Ë¡¤Î´ðÁäȤʤä¿  LZARI  Ë¡¤òȯɽ¤·¤Æ¤¯¤À¤µ¤Ã¤¿±ü¼À²
+-     ɧ»á¡¢¤½¤ì¤ò  NIFTY-Serve  ¤Ë¾Ò²ð¤·¡¢¤Þ¤¿¡¢LArc ¤Îºî¼Ô¤Ç¤â¤¢
+-     ¤ë»°ÌÚÏÂɧ»á¡¢¤Þ¤¿¡¢¤³¤ì¤é¤ÎÍ×°ø¤«¤é  LZHUF   Ë¡µÚ¤Ó¡¢MS-DOS
+-     ÈÇ  LHarc  ¤òºîÀ®¤·¤¿µÈºê±ÉÂٻᡢLHarc UNIX ¤Î³«È¯¤Ë¶¨ÎϤ·¤¿
+-     ¿Íã¡¢¤³¤³¤í¤è¤¯¥á¥Ã¥»¡¼¥¸¤Î¶¶ÅϤ·¤ò¤·¤Æ¤¯¤ì¤¿Àкê°ìÌÀ»á(MIX
+-     ID:k.ishi)¡¢¤Þ¤¿¡¢¤¤¤í¤¤¤í¤Ê¥ì¥Ý¡¼¥È¤ò¤¯¤ì¤¿¤ß¤Ê¤µ¤ó¡¢¤½¤ì
+-     ¤òÃæ·Ñ¤·¤Æ¤¯¤À¤µ¤Ã¤¿¿¹¸ø°ìϺ»á  (MIX   ID:kmori)¤Ë´¶¼Õ¤·¤Þ¤¹
+-     ¡£
+-
+-
+-                        January 14,1997                         5
+-
+-
+-
+-LHA(N)              Unix Programmer's Manual               LHA(N)
+-
+-
+-ºÇºÇºÇ¸å¸å¸å¤Ë¤Ë¤Ë(((FFFrrrooommm MMMaaasssaaarrruuu OOOkkkiii)))
+-     ¾åµ­¤ÎÊý¡¹¤Ï¤â¤Á¤í¤ó¡¢²Ã¤¨¤Æ LHarc UNIX ¤òºîÀ®¤·¤¿  Y.Tagawa
+-     »á¡¢¤½¤ì¤ò  OSK  ¤Ë°Ü¿¢¤·µÈºê»á¤Î LHx ¤Î¥¢¥ë¥´¥ê¥º¥à¤òÁȤ߹þ
+-     ¤ó¤À H.S »á¡¢JUNET ¤Î LHa for  UNIX  MailingList  ¤Ë¤Æ¶¨ÎϤ·
+-     ¤Æ¤¯¤À¤µ¤Ã¤¿¤ß¤Ê¤µ¤ó¤Ë´¶¼ÕÃפ·¤Þ¤¹¡£
+-
+-ºÇºÇºÇ¸å¸å¸å¤Ë¤Ë¤Ë(((FFFrrrooommm NNNooobbbuuutttaaakkkaaa WWWaaatttaaazzzaaakkkiii)))
+-     ¤³¤Î¥×¥í¥°¥é¥à¤ÎºîÀ®¤Ë¤«¤«¤ï¤Ã¤¿Êý¡¹¡¢¤µ¤é¤Ë¤³¤³¤Þ¤Ç     LHa
+-     ¤ò»Å¾å¤²¤Æ¤¯¤À¤µ¤Ã¤¿ ²­¾¡»á¤Ë´¶¼ÕÃפ·¤Þ¤¹¡£
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-                        January 14,1997                         6
+ 
++                                January 14,1997                         LHA(N)
+--- lha-1.14i.orig/Makefile
++++ lha-1.14i/Makefile
+@@ -20,7 +20,7 @@
+ 
+ #MACHINE     = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
+ #MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DHAVE_TM_ZONE -DSYSV_SYSTEM_DIR
+-MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME
++MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME -DMULTIBYTE_CHAR
+ 
+ #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
+ OPTIMIZE	= -O2 -DSUPPORT_LH7 -DMKSTEMP
+--- lha-1.14i.orig/debian/patch.multibyte
++++ lha-1.14i/debian/patch.multibyte
+@@ -0,0 +1,145 @@
++diff -Nuar src.old/header.c src/header.c
++--- src.old/header.c	Fri Oct  6 02:36:03 2000
+++++ src/header.c	Fri Jul 19 16:46:41 2002
++@@ -82,6 +82,7 @@
++ 	register int    i;
++ 
++ #ifdef MULTIBYTE_CHAR
+++	if (multibyte_mode == TRUE) {
++ 	for (i = 0; i < len; i++) {
++ 		if (MULTIBYTE_FIRST_P(name[i]) &&
++ 		    MULTIBYTE_SECOND_P(name[i + 1]))
++@@ -91,6 +92,14 @@
++ 		else if (!noconvertcase && isupper(name[i]))
++ 			name[i] = tolower(name[i]);
++ 	}
+++	} else {
+++	for (i = 0; i < len; i++) {
+++		if (name[i] == '\\')
+++			name[i] = '/';
+++		else if (!noconvertcase && isupper(name[i]))
+++			name[i] = tolower(name[i]);
+++	}
+++	}
++ #else
++ 	for (i = 0; i < len; i++) {
++ 		if (name[i] == '\\')
++@@ -111,6 +120,7 @@
++ 	boolean         lower_case_used = FALSE;
++ 
++ #ifdef MULTIBYTE_CHAR
+++	if (multibyte_mode == TRUE) {
++ 	for (i = 0; i < len; i++) {
++ 		if (MULTIBYTE_FIRST_P(name[i]) &&
++ 		    MULTIBYTE_SECOND_P(name[i + 1]))
++@@ -128,6 +138,19 @@
++ 			name[i] = '/';
++ 		else if (!noconvertcase && !lower_case_used && isupper(name[i]))
++ 			name[i] = tolower(name[i]);
+++	}
+++	} else {
+++	for (i = 0; i < len; i++)
+++		if (islower(name[i])) {
+++			lower_case_used = TRUE;
+++			break;
+++		}
+++	for (i = 0; i < len; i++) {
+++		if (name[i] == '\\')
+++			name[i] = '/';
+++		else if (!noconvertcase && !lower_case_used && isupper(name[i]))
+++			name[i] = tolower(name[i]);
+++	}
++ 	}
++ #else
++ 	for (i = 0; i < len; i++)
++diff -Nuar src.old/lha.h src/lha.h
++--- src.old/lha.h	Fri Jul 19 17:22:13 2002
+++++ src/lha.h	Fri Jul 19 17:18:05 2002
++@@ -101,6 +101,9 @@
++ #ifdef EUC
++ EXTERN boolean	euc_mode;
++ #endif
+++#ifdef MULTIBYTE_CHAR
+++EXTERN boolean	multibyte_mode;
+++#endif
++ 
++ /* list command flags */
++ EXTERN boolean  verbose_listing;
++diff -Nuar src.old/lharc.c src/lharc.c
++--- src.old/lharc.c	Fri Oct  6 02:33:34 2000
+++++ src/lharc.c	Fri Jul 19 16:56:03 2002
++@@ -101,6 +101,10 @@
++ 	euc_mode		= FALSE;
++ #endif
++ 
+++#ifdef MULTIBYTE_CHAR
+++	multibyte_mode		= FALSE;
+++#endif
+++
++ /* view command flags */
++ 	verbose_listing = FALSE;
++ 
++@@ -177,6 +181,11 @@
++                                      e  TEXT code convert from/to EUC\n\
++ ");
++ #endif
+++#ifdef MULTIBYTE_CHAR
+++	fprintf(stderr, "\
+++                                     y  filename multibyte convert\n\
+++");
+++#endif
++ 	exit(1);
++ }
++ 
++@@ -308,6 +317,11 @@
++ 		case 'e':
++ 			text_mode = TRUE;
++ 			euc_mode = TRUE;
+++			break;
+++#endif
+++#ifdef MULTIBYTE_CHAR
+++		case 'y':
+++			multibyte_mode = TRUE;
++ 			break;
++ #endif
++ 		case 'n':
++diff -Nuar src.old/util.c src/util.c
++--- src.old/util.c	Wed Oct  4 23:57:38 2000
+++++ src/util.c	Fri Jul 19 16:49:23 2002
++@@ -113,18 +113,29 @@
++ #endif
++ 	for (p = path; (c = *p) != 0; p++) {
++ #ifdef MULTIBYTE_CHAR
++-		if (kflg) {
++-			kflg = 0;
+++		if (multibyte_mode == TRUE) {
+++			if (kflg) {
+++				kflg = 0;
+++			} else if (MULTIBYTE_FIRST_P(c)) {
+++				kflg = 1;
+++			} else {
+++				if (c == '\\' || c == DELIM || c == DELIM2) {
+++					*p = delim;
+++					path = p + 1;
+++				}
+++			}
+++		} else {
+++			if (c == '\\' || c == DELIM || c == DELIM2) {
+++				*p = delim;
+++				path = p + 1;
+++			}
++ 		}
++-		else if (MULTIBYTE_FIRST_P(c)) {
++-			kflg = 1;
++-		}
++-		else
++-#endif
+++#else
++ 		if (c == '\\' || c == DELIM || c == DELIM2) {
++ 			*p = delim;
++ 			path = p + 1;
++ 		}
+++#endif
++ 	}
++ 	return path;
++ }
+--- lha-1.14i.orig/debian/README.Debian
++++ lha-1.14i/debian/README.Debian
+@@ -0,0 +1,6 @@
++lha for DEBIAN
++----------------------
++
++LHa for UNIX
++
++Atsushi KAMOSHIDA <kamop@post1.com>, Sun, 13 Apr 1997 17:52:59 +0900
+--- lha-1.14i.orig/debian/org/lha.h
++++ lha-1.14i/debian/org/lha.h
+@@ -0,0 +1,322 @@
++/* ------------------------------------------------------------------------ */
++/* LHa for UNIX    Archiver Driver											*/
++/*																			*/
++/*		Modified          		Nobutaka Watazaki							*/
++/*																			*/
++/*	Ver. 1.14 	Soruce All chagned				1995.01.14	N.Watazaki		*/
++/*	Ver. 1.14i 	Modified and bug fixed			2000.10.06	t.okamoto   	*/
++/* ------------------------------------------------------------------------ */
++/*
++	Included...
++		lharc.h		interface.h		slidehuf.h
++*/
++#include <stdio.h>
++#include <errno.h>
++#include <ctype.h>
++#include <sys/types.h>
++#include <sys/file.h>
++#include <sys/stat.h>
++
++#include <signal.h>
++
++#include "lha_macro.h"
++
++struct encode_option {
++#if defined(__STDC__) || defined(AIX)
++	void            (*output) ();
++	void            (*encode_start) ();
++	void            (*encode_end) ();
++#else
++	int             (*output) ();
++	int             (*encode_start) ();
++	int             (*encode_end) ();
++#endif
++};
++
++struct decode_option {
++	unsigned short  (*decode_c) ();
++	unsigned short  (*decode_p) ();
++#if defined(__STDC__) || defined(AIX)
++	void            (*decode_start) ();
++#else
++	int             (*decode_start) ();
++#endif
++};
++
++/* ------------------------------------------------------------------------ */
++/*	LHa File Type Definition												*/
++/* ------------------------------------------------------------------------ */
++struct string_pool {
++	int             used;
++	int             size;
++	int             n;
++	char           *buffer;
++};
++
++typedef struct LzHeader {
++	unsigned char   header_size;
++	char            method[METHOD_TYPE_STRAGE];
++	long            packed_size;
++	long            original_size;
++	long            last_modified_stamp;
++	unsigned char   attribute;
++	unsigned char   header_level;
++	char            name[256];
++	unsigned short  crc;
++	boolean         has_crc;
++	unsigned char   extend_type;
++	unsigned char   minor_version;
++
++	/* extend_type == EXTEND_UNIX  and convert from other type. */
++	time_t          unix_last_modified_stamp;
++	unsigned short  unix_mode;
++	unsigned short  unix_uid;
++	unsigned short  unix_gid;
++}  LzHeader;
++
++struct interfacing {
++	FILE			*infile;
++	FILE			*outfile;
++	unsigned long   original;
++	unsigned long   packed;
++	int             dicbit;
++	int             method;
++};
++
++
++/* ------------------------------------------------------------------------ */
++/*	Option switch variable													*/
++/* ------------------------------------------------------------------------ */
++/* command line options (common options) */
++EXTERN boolean  quiet;
++EXTERN boolean  text_mode;
++EXTERN boolean  verbose;
++EXTERN boolean  noexec;		/* debugging option */
++EXTERN boolean  force;
++EXTERN boolean  prof;
++EXTERN boolean  delete_after_append;
++EXTERN int		compress_method;
++EXTERN int		header_level;
++/* EXTERN int		quiet_mode; */   /* 1996.8.13 t.okamoto */
++#ifdef EUC
++EXTERN boolean	euc_mode;
++#endif
++
++/* list command flags */
++EXTERN boolean  verbose_listing;
++
++/* extract/print command flags */
++EXTERN boolean  output_to_stdout;
++
++/* add/update/delete command flags */
++EXTERN boolean  new_archive;
++EXTERN boolean  update_if_newer;
++EXTERN boolean  generic_format;
++
++EXTERN boolean	remove_temporary_at_error;
++EXTERN boolean	recover_archive_when_interrupt;
++EXTERN boolean	remove_extracting_file_when_interrupt;
++EXTERN boolean	get_filename_from_stdin;
++EXTERN boolean	ignore_directory;
++EXTERN boolean	verify_mode;
++
++/* Indicator flag */
++EXTERN int		quiet_mode;
++
++/* ------------------------------------------------------------------------ */
++/*	Globale Variable														*/
++/* ------------------------------------------------------------------------ */
++EXTERN char		**cmd_filev;
++EXTERN int      cmd_filec;
++
++EXTERN char		*archive_name;
++EXTERN char     expanded_archive_name[FILENAME_LENGTH];
++EXTERN char     temporary_name[FILENAME_LENGTH];
++EXTERN char     backup_archive_name[FILENAME_LENGTH];
++
++EXTERN char		*reading_filename, *writting_filename;
++
++/* 1996.8.13 t.okamoto */
++#if 0
++EXTERN boolean  remove_temporary_at_error;
++EXTERN boolean  recover_archive_when_interrupt;
++EXTERN boolean  remove_extracting_file_when_interrupt;
++#endif
++
++EXTERN int      archive_file_mode;
++EXTERN int      archive_file_gid;
++
++EXTERN struct	interfacing interface;
++EXTERN node		*next;
++/* EXTERN unsigned short crc; */  /* 1996.8.13 t.okamoto */
++
++EXTERN int      noconvertcase; /* 2000.10.6 */
++
++/* slide.c */
++EXTERN int      unpackable;
++EXTERN unsigned long origsize, compsize;
++EXTERN unsigned short dicbit;
++EXTERN unsigned short maxmatch;
++EXTERN unsigned long count;
++EXTERN unsigned long loc;			/* short -> long .. Changed N.Watazaki */
++EXTERN unsigned char *text;
++EXTERN int		prev_char;
++
++/* huf.c */
++#ifndef LHA_MAIN_SRC  /* t.okamoto 96/2/20 */
++EXTERN unsigned short left[], right[];
++EXTERN unsigned char c_len[], pt_len[];
++EXTERN unsigned short c_freq[], c_table[], c_code[];
++EXTERN unsigned short p_freq[], pt_table[], pt_code[], t_freq[];
++#endif
++
++/* append.c */
++#ifdef NEED_INCREMENTAL_INDICATOR
++EXTERN long		indicator_count;
++EXTERN long		indicator_threshold;
++#endif
++
++/* crcio.c */
++EXTERN FILE		*infile, *outfile;
++EXTERN unsigned short crc, bitbuf;
++EXTERN int      dispflg;
++EXTERN long		reading_size;
++
++/* from dhuf.c */
++EXTERN unsigned int n_max;
++
++/* lhadd.c */
++EXTERN FILE		*temporary_fp;
++
++/* ------------------------------------------------------------------------ */
++/*	Functions																*/
++/* ------------------------------------------------------------------------ */
++/* from lharc.c */
++extern int		patmatch();
++
++extern void		interrupt();
++
++extern void		message();
++extern void		warning();
++extern void		error();
++extern void		fatal_error();
++
++extern boolean	need_file();
++extern int		inquire();
++extern FILE		*xfopen();
++
++extern boolean	find_files();
++extern void		free_files();
++
++extern void		init_sp();
++extern void		add_sp();
++extern void		finish_sp();
++extern void		free_sp();
++extern void		cleaning_files();
++
++extern void		build_temporary_name();
++extern void		build_backup_file_name();
++extern void		build_standard_archive_name();
++
++extern FILE		*open_old_archive();
++extern void		init_header();
++extern boolean	get_header();
++extern boolean	archive_is_msdos_sfx1();
++extern boolean	skip_msdos_sfx1_code();
++extern void		write_header();
++extern void		write_archive_tail();
++extern void		copy_old_one();
++extern unsigned char *convdelim();
++extern long		copyfile();
++
++extern void		cmd_list(), cmd_extract(), cmd_add(), cmd_delete();
++
++extern boolean	ignore_directory;
++extern boolean	compress_method;
++extern boolean	verify_mode;
++
++extern char		*extract_directory;
++
++/* from slide.c */
++
++extern int		encode_alloc();
++extern void		encode();
++extern void		decode();
++
++/* from append.c */
++extern void     start_indicator();
++extern void     finish_indicator();
++extern void     finish_indicator2();
++
++/* slide.c */
++extern void     output_st1();
++extern unsigned char *alloc_buf();
++extern void     encode_start_st1();
++extern void     encode_end_st1();
++extern unsigned short decode_c_st1();
++extern unsigned short decode_p_st1();
++extern void     decode_start_st1();
++
++/* from shuf.c */
++extern void     decode_start_st0();
++extern void     encode_p_st0( /* unsigned short j */ );
++extern void     encode_start_fix();
++extern void     decode_start_fix();
++extern unsigned short decode_c_st0();
++extern unsigned short decode_p_st0();
++
++/* from dhuf.c */
++extern void     start_c_dyn();
++extern void     decode_start_dyn();
++extern unsigned short decode_c_dyn();
++extern unsigned short decode_p_dyn();
++extern void     output_dyn( /* int code, unsigned int pos */ );
++extern void     encode_end_dyn();
++
++extern int      decode_lzhuf();
++
++/* from larc.c */
++
++extern unsigned short decode_c_lzs();
++extern unsigned short decode_p_lzs();
++extern unsigned short decode_c_lz5();
++extern unsigned short decode_p_lz5();
++extern void			  decode_start_lzs();
++extern void			  decode_start_lz5();
++
++extern void	make_table(	/* int nchar, uchar bitlen[], int tablebits,
++							ushort table[] */ );
++
++/* from maketree.c */
++/*
++ * void make_code(short n, uchar len[], ushort code[]); short make_tree(short
++ * nparm, ushort freqparm[], uchar lenparm[], ushort codeparam[]);
++ */
++extern void		make_code( /* int n, uchar len[], ushort code[] */ );
++extern short	make_tree( /* int nparm, ushort freqparm[], uchar lenparm[],
++								ushort codeparam[] */ );
++
++/* from crcio.c */
++extern void				make_crctable();
++extern unsigned short	calccrc( /* uchar *p, uint n */ );
++extern void				fillbuf( /* uchar n */ );
++extern unsigned short	getbits( /* uchar n */ );
++extern void				putcode( /* uchar n, ushort x */ );
++extern void				putbits( /* uchar n, ushort x */ );
++extern int				fread_crc( /* uchar *p, int n, FILE *f */ );
++extern void				fwrite_crc( /* uchar *p, int n, FILE *f */ );
++extern void				init_getbits();
++extern void				init_putbits();
++extern void     		make_crctable();
++extern unsigned 		short calccrc();
++
++/* from lhadd.c */
++extern int		encode_lzhuf();
++extern int      encode_stored_crc();
++
++/* Local Variables: */
++/* mode:c */
++/* tab-width:4 */
++/* End: */
++
++
+--- lha-1.14i.orig/debian/org/header.c
++++ lha-1.14i/debian/org/header.c
+@@ -0,0 +1,875 @@
++/* ------------------------------------------------------------------------ */
++/* LHa for UNIX    															*/
++/*				header.c -- header manipulate functions						*/
++/*																			*/
++/*		Modified          		Nobutaka Watazaki							*/
++/*																			*/
++/*	Original												Y.Tagawa		*/
++/*	modified									1991.12.16	M.Oki			*/
++/*	Ver. 1.10  Symbolic Link added				1993.10.01	N.Watazaki		*/
++/*	Ver. 1.13b Symbolic Link Bug Fix			1994.08.22	N.Watazaki		*/
++/*	Ver. 1.14  Source All chagned				1995.01.14	N.Watazaki		*/
++/*  Ver. 1.14i bug fixed						2000.10.06  t.okamoto       */
++/* ------------------------------------------------------------------------ */
++#include "lha.h"
++
++/* ------------------------------------------------------------------------ */
++static char    *get_ptr;
++/* ------------------------------------------------------------------------ */
++int
++calc_sum(p, len)
++	register char  *p;
++	register int    len;
++{
++	register int    sum;
++
++	for (sum = 0; len; len--)
++		sum += *p++;
++
++	return sum & 0xff;
++}
++
++/* ------------------------------------------------------------------------ */
++static unsigned short
++get_word()
++{
++	int             b0, b1;
++
++	b0 = get_byte();
++	b1 = get_byte();
++	return (b1 << 8) + b0;
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++put_word(v)
++	unsigned int    v;
++{
++	put_byte(v);
++	put_byte(v >> 8);
++}
++
++/* ------------------------------------------------------------------------ */
++static long
++get_longword()
++{
++	long            b0, b1, b2, b3;
++
++	b0 = get_byte();
++	b1 = get_byte();
++	b2 = get_byte();
++	b3 = get_byte();
++	return (b3 << 24) + (b2 << 16) + (b1 << 8) + b0;
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++put_longword(v)
++	long            v;
++{
++	put_byte(v);
++	put_byte(v >> 8);
++	put_byte(v >> 16);
++	put_byte(v >> 24);
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++msdos_to_unix_filename(name, len)
++	register char  *name;
++	register int    len;
++{
++	register int    i;
++
++#ifdef MULTIBYTE_CHAR
++	for (i = 0; i < len; i++) {
++		if (MULTIBYTE_FIRST_P(name[i]) &&
++		    MULTIBYTE_SECOND_P(name[i + 1]))
++			i++;
++		else if (name[i] == '\\')
++			name[i] = '/';
++		else if (!noconvertcase && isupper(name[i]))
++			name[i] = tolower(name[i]);
++	}
++#else
++	for (i = 0; i < len; i++) {
++		if (name[i] == '\\')
++			name[i] = '/';
++		else if (!noconvertcase && isupper(name[i]))
++			name[i] = tolower(name[i]);
++	}
++#endif
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++generic_to_unix_filename(name, len)
++	register char  *name;
++	register int    len;
++{
++	register int    i;
++	boolean         lower_case_used = FALSE;
++
++#ifdef MULTIBYTE_CHAR
++	for (i = 0; i < len; i++) {
++		if (MULTIBYTE_FIRST_P(name[i]) &&
++		    MULTIBYTE_SECOND_P(name[i + 1]))
++			i++;
++		else if (islower(name[i])) {
++			lower_case_used = TRUE;
++			break;
++		}
++	}
++	for (i = 0; i < len; i++) {
++		if (MULTIBYTE_FIRST_P(name[i]) &&
++		    MULTIBYTE_SECOND_P(name[i + 1]))
++			i++;
++		else if (name[i] == '\\')
++			name[i] = '/';
++		else if (!noconvertcase && !lower_case_used && isupper(name[i]))
++			name[i] = tolower(name[i]);
++	}
++#else
++	for (i = 0; i < len; i++)
++		if (islower(name[i])) {
++			lower_case_used = TRUE;
++			break;
++		}
++	for (i = 0; i < len; i++) {
++		if (name[i] == '\\')
++			name[i] = '/';
++		else if (!noconvertcase && !lower_case_used && isupper(name[i]))
++			name[i] = tolower(name[i]);
++	}
++#endif
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++macos_to_unix_filename(name, len)
++	register char  *name;
++	register int    len;
++{
++	register int    i;
++
++	for (i = 0; i < len; i++) {
++		if (name[i] == ':')
++			name[i] = '/';
++		else if (name[i] == '/')
++			name[i] = ':';
++	}
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++unix_to_generic_filename(name, len)
++	register char  *name;
++	register int    len;
++{
++	register int    i;
++
++	for (i = 0; i < len; i++) {
++		if (name[i] == '/')
++			name[i] = '\\';
++		else if (islower(name[i]))
++			name[i] = toupper(name[i]);
++	}
++}
++
++/* ------------------------------------------------------------------------ */
++/*																			*/
++/* Generic stamp format:						 							*/
++/*																			*/
++/* 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16							*/
++/* |<-------- year ------->|<- month ->|<-- day -->|						*/
++/*																			*/
++/* 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0							*/
++/* |<--- hour --->|<---- minute --->|<- second*2 ->|						*/
++/*																			*/
++/* ------------------------------------------------------------------------ */
++
++/*
++ * NOTE : If you don't have `gettimeofday(2)', or your gettimeofday(2)
++ * returns bogus timezone information, try FTIME, MKTIME, TIMELOCAL or TZSET.
++ */
++
++/* choose one */
++#if defined(MKTIME)
++#ifdef TIMELOCAL
++#undef TIMELOCAL
++#endif
++#endif				/* defined(MKTIME) */
++
++#if defined(MKTIME) || defined(TIMELOCAL)
++#ifdef TZSET
++#undef TZSET
++#endif
++#endif				/* defined(MKTIME) || defined(TIMELOCAL) */
++
++#if defined(MKTIME) || defined(TIMELOCAL) || defined(TZSET)
++#ifdef FTIME
++#undef FTIME
++#endif
++#endif
++
++#if defined(MKTIME) || defined(TIMELOCAL) || defined(TZSET) || defined(FTIME)
++#ifdef GETTIMEOFDAY
++#undef GETTIMEOFDAY
++#endif
++#else
++#ifndef GETTIMEOFDAY
++#define GETTIMEOFDAY		/* use gettimeofday() */
++#endif
++#endif
++
++#ifdef FTIME
++#include <sys/timeb.h>
++#endif
++
++/*
++ * You may define as : #define TIMEZONE_HOOK		\ extern long
++ * timezone ;	\ extern void tzset();
++ */
++#ifdef TIMEZONE_HOOK
++TIMEZONE_HOOK
++/* Which do you like better, `TIMEZONE_HOOK' or `TIMEZONE_HOOK;' ? */
++#endif
++
++#if defined(TZSET) && defined(_MINIX)
++extern long     timezone;		/* not defined in time.h */
++#endif
++
++/* ------------------------------------------------------------------------ */
++#if defined(FTIME) || defined(GETTIMEOFDAY) || defined(TZSET)
++static long
++gettz()
++#ifdef TZSET
++{
++	tzset();
++	return timezone;
++}
++#endif
++
++/* ------------------------------------------------------------------------ */
++#if !defined(TZSET) && defined(FTIME)
++{
++	struct timeb    buf;
++
++	ftime(&buf);
++	return buf.timezone * 60L;
++}
++#endif
++
++/* ------------------------------------------------------------------------ */
++#if !defined(TZSET) && !defined(FTIME)	/* maybe defined(GETTIMEOFDAY) */
++{
++#ifdef HAVE_TM_ZONE
++	time_t tt;
++
++	time(&tt);
++	return -localtime(&tt)->tm_gmtoff;
++#else /* HAVE_TM_ZONE */
++	struct timeval  tp;
++	struct timezone tzp;
++	gettimeofday(&tp, &tzp);/* specific to 4.3BSD */
++	/*
++	 * return (tzp.tz_minuteswest * 60L + (tzp.tz_dsttime != 0 ? 60L *
++	 * 60L : 0));
++	 */
++	return (tzp.tz_minuteswest * 60L);
++#endif /* HAVE_TM_ZONE */
++}
++#endif
++#endif				/* defined(FTIME) || defined(GETTIMEOFDAY) ||
++				 * defined(TZSET) */
++
++/* ------------------------------------------------------------------------ */
++#ifdef NOT_USED
++static struct tm *
++msdos_to_unix_stamp_tm(a)
++	long            a;
++{
++	static struct tm t;
++
++	t.tm_sec = (a & 0x1f) * 2;
++	t.tm_min = (a >> 5) & 0x3f;
++	t.tm_hour = (a >> 11) & 0x1f;
++	t.tm_mday = (a >> 16) & 0x1f;
++	t.tm_mon = ((a >> 16 + 5) & 0x0f) - 1;
++	t.tm_year = ((a >> 16 + 9) & 0x7f) + 80;
++	return &t;
++}
++#endif
++
++/* ------------------------------------------------------------------------ */
++static          time_t
++generic_to_unix_stamp(t)
++	long            t;
++#if defined(MKTIME) || defined(TIMELOCAL)
++{
++	struct tm       dostm;
++
++	/*
++	 * special case:  if MSDOS format date and time were zero, then we
++	 * set time to be zero here too.
++	 */
++	if (t == 0)
++		return (time_t) 0;
++
++	dostm.tm_sec = (t & 0x1f) * 2;
++	dostm.tm_min = t >> 5 & 0x3f;
++	dostm.tm_hour = t >> 11 & 0x1f;
++	dostm.tm_mday = t >> 16 & 0x1f;
++	dostm.tm_mon = (t >> 16 + 5 & 0x0f) - 1;	/* 0..11 */
++	dostm.tm_year = (t >> 16 + 9 & 0x7f) + 80;
++#if 0
++	dostm.tm_isdst = 0;	/* correct? */
++#endif
++	dostm.tm_isdst = -1;    /* correct? */
++#ifdef MKTIME
++	return (time_t) mktime(&dostm);
++#else				/* maybe defined(TIMELOCAL) */
++	return (time_t) timelocal(&dostm);
++#endif
++}
++
++#else				/* defined(MKTIME) || defined(TIMELOCAL) */
++{
++	int             year, month, day, hour, min, sec;
++	long            longtime;
++	static unsigned int dsboy[12] = {0, 31, 59, 90, 120, 151,
++	181, 212, 243, 273, 304, 334};
++	unsigned int    days;
++
++	/*
++	 * special case:  if MSDOS format date and time were zero, then we
++	 * set time to be zero here too.
++	 */
++	if (t == 0)
++		return (time_t) 0;
++
++	year = ((int) (t >> 16 + 9) & 0x7f) + 1980;
++	month = (int) (t >> 16 + 5) & 0x0f;	/* 1..12 means Jan..Dec */
++	day = (int) (t >> 16) & 0x1f;	/* 1..31 means 1st,...31st */
++
++	hour = ((int) t >> 11) & 0x1f;
++	min = ((int) t >> 5) & 0x3f;
++	sec = ((int) t & 0x1f) * 2;
++
++	/* Calculate days since 1970.01.01 */
++	days = (365 * (year - 1970) +	/* days due to whole years */
++		(year - 1970 + 1) / 4 +	/* days due to leap years */
++		dsboy[month - 1] +	/* days since beginning of this year */
++		day - 1);	/* days since beginning of month */
++
++	if ((year % 4 == 0) &&
++		(year % 100 != 0 || year % 400 == 0) &&		/* 1999.5.24 t.oka */
++	    (month >= 3))	/* if this is a leap year and month */
++		days++;		/* is March or later, add a day */
++
++	/* Knowing the days, we can find seconds */
++	longtime = (((days * 24) + hour) * 60 + min) * 60 + sec;
++	longtime += gettz();	/* adjust for timezone */
++
++	/* LONGTIME is now the time in seconds, since 1970/01/01 00:00:00.  */
++	return (time_t) longtime;
++}
++#endif				/* defined(MKTIME) || defined(TIMELOCAL) */
++
++/* ------------------------------------------------------------------------ */
++static long
++unix_to_generic_stamp(t)
++	time_t          t;
++{
++	struct tm      *tm = localtime(&t);
++
++	return ((((long) (tm->tm_year - 80)) << 25) +
++		(((long) (tm->tm_mon + 1)) << 21) +
++		(((long) tm->tm_mday) << 16) +
++		(long) ((tm->tm_hour << 11) +
++			(tm->tm_min << 5) +
++			(tm->tm_sec / 2)));
++}
++
++/* ------------------------------------------------------------------------ */
++/* build header functions													*/
++/* ------------------------------------------------------------------------ */
++boolean
++get_header(fp, hdr)
++	FILE           *fp;
++	register LzHeader *hdr;
++{
++	int             header_size;
++	int             name_length;
++	char            data[LZHEADER_STRAGE];
++	char            dirname[FILENAME_LENGTH];
++	int             dir_length = 0;
++	int             checksum;
++	int             i;
++	char           *ptr;
++	int				extend_size;
++	int				dmy;
++
++	bzero(hdr, sizeof(LzHeader));
++
++	if (((header_size = getc(fp)) == EOF) || (header_size == 0)) {
++		return FALSE;	/* finish */
++	}
++
++	if (fread(data + I_HEADER_CHECKSUM,
++		  sizeof(char), header_size - 1, fp) < header_size - 1) {
++		fatal_error("Invalid header (LHarc file ?)");
++		return FALSE;	/* finish */
++	}
++	setup_get(data + I_HEADER_LEVEL);
++	hdr->header_level = get_byte();
++	if (hdr->header_level != 2 &&
++	    fread(data + header_size, sizeof(char), 2, fp) < 2) {
++		fatal_error("Invalid header (LHarc file ?)");
++		return FALSE;	/* finish */
++	}
++
++	if (hdr->header_level >= 3) {
++		fatal_error("Unknown level header");
++		return FALSE;
++	}
++
++	setup_get(data + I_HEADER_CHECKSUM);
++	checksum = get_byte();
++
++	if (hdr->header_level == 2) {
++		hdr->header_size = header_size + checksum*256;
++	} else {
++		hdr->header_size = header_size;
++	}
++	bcopy(data + I_METHOD, hdr->method, METHOD_TYPE_STRAGE);
++	setup_get(data + I_PACKED_SIZE);
++	hdr->packed_size = get_longword();
++	hdr->original_size = get_longword();
++	hdr->last_modified_stamp = get_longword();
++	hdr->attribute = get_byte();
++
++	if ((hdr->header_level = get_byte()) != 2) {
++		if (calc_sum(data + I_METHOD, header_size) != checksum)
++			warning("Checksum error (LHarc file?)", "");
++		name_length = get_byte();
++		for (i = 0; i < name_length; i++)
++			hdr->name[i] = (char) get_byte();
++		hdr->name[name_length] = '\0';
++	}
++	else {
++		hdr->unix_last_modified_stamp = hdr->last_modified_stamp;
++		name_length = 0;
++	}
++
++	/* defaults for other type */
++	hdr->unix_mode = UNIX_FILE_REGULAR | UNIX_RW_RW_RW;
++	hdr->unix_gid = 0;
++	hdr->unix_uid = 0;
++
++	if (hdr->header_level == 0) {
++		extend_size = header_size - name_length -22;
++		if (extend_size < 0) {
++			if (extend_size == -2) {
++				hdr->extend_type = EXTEND_GENERIC;
++				hdr->has_crc = FALSE;
++			} else {
++				fatal_error("Unkonwn header (lha file?)");
++				return FALSE;
++			}
++		} else {
++			hdr->has_crc = TRUE;
++			hdr->crc = get_word();
++		}
++
++		if (extend_size >= 1) {
++			hdr->extend_type = get_byte();
++			extend_size--;
++		}
++		if (hdr->extend_type == EXTEND_UNIX) {
++			if (extend_size >= 11) {
++				hdr->minor_version = get_byte();
++				hdr->unix_last_modified_stamp = (time_t) get_longword();
++				hdr->unix_mode = get_word();
++				hdr->unix_uid = get_word();
++				hdr->unix_gid = get_word();
++				extend_size -= 11;
++			} else {
++				hdr->extend_type = EXTEND_GENERIC;
++			}
++		}
++		while (extend_size-- > 0)
++			dmy = get_byte();
++		if (hdr->extend_type == EXTEND_UNIX)
++			return TRUE;
++	} else if (hdr->header_level == 1) {
++		hdr->has_crc = TRUE;
++		extend_size = header_size - name_length-25;
++		hdr->crc = get_word();
++		hdr->extend_type = get_byte();
++		while (extend_size-- > 0)
++			dmy = get_byte();
++	} else { /* level 2 */
++		hdr->has_crc = TRUE;
++		hdr->crc = get_word();
++		hdr->extend_type = get_byte();
++	}		
++
++	if (hdr->header_level > 0) {
++		/* Extend Header */
++		if (hdr->header_level != 2)
++			setup_get(data + hdr->header_size);
++		ptr = get_ptr;
++		while ((header_size = get_word()) != 0) {
++			if (hdr->header_level != 2 &&
++			((data + LZHEADER_STRAGE - get_ptr < header_size) ||
++			 fread(get_ptr, sizeof(char), header_size, fp) < header_size)) {
++				fatal_error("Invalid header (LHa file ?)");
++				return FALSE;
++			}
++			switch (get_byte()) {
++			case 0:
++				/*
++				 * header crc
++				 */
++				setup_get(get_ptr + header_size - 3);
++				break;
++			case 1:
++				/*
++				 * filename
++				 */
++				for (i = 0; i < header_size - 3; i++)
++					hdr->name[i] = (char) get_byte();
++				hdr->name[header_size - 3] = '\0';
++				name_length = header_size - 3;
++				break;
++			case 2:
++				/*
++				 * directory
++				 */
++				for (i = 0; i < header_size - 3; i++)
++					dirname[i] = (char) get_byte();
++				dirname[header_size - 3] = '\0';
++				convdelim(dirname, DELIM);
++				dir_length = header_size - 3;
++				break;
++			case 0x40:
++				/*
++				 * MS-DOS attribute
++				 */
++				if (hdr->extend_type == EXTEND_MSDOS ||
++				    hdr->extend_type == EXTEND_HUMAN ||
++				    hdr->extend_type == EXTEND_GENERIC)
++					hdr->attribute = get_word();
++				break;
++			case 0x50:
++				/*
++				 * UNIX permission
++				 */
++				if (hdr->extend_type == EXTEND_UNIX)
++					hdr->unix_mode = get_word();
++				break;
++			case 0x51:
++				/*
++				 * UNIX gid and uid
++				 */
++				if (hdr->extend_type == EXTEND_UNIX) {
++					hdr->unix_gid = get_word();
++					hdr->unix_uid = get_word();
++				}
++				break;
++			case 0x52:
++				/*
++				 * UNIX group name
++				 */
++				setup_get(get_ptr + header_size - 3);
++				break;
++			case 0x53:
++				/*
++				 * UNIX user name
++				 */
++				setup_get(get_ptr + header_size - 3);
++				break;
++			case 0x54:
++				/*
++				 * UNIX last modified time
++				 */
++				if (hdr->extend_type == EXTEND_UNIX)
++					hdr->unix_last_modified_stamp = (time_t) get_longword();
++				break;
++			default:
++				/*
++				 * other headers
++				 */
++				setup_get(get_ptr + header_size - 3);
++				break;
++			}
++		}
++		if (hdr->header_level != 2 && get_ptr - ptr != 2) {
++			hdr->packed_size -= get_ptr - ptr - 2;
++			hdr->header_size += get_ptr - ptr - 2;
++		}
++	}
++
++	switch (hdr->extend_type) {
++	case EXTEND_MSDOS:
++		msdos_to_unix_filename(hdr->name, name_length);
++		msdos_to_unix_filename(dirname, dir_length);
++	case EXTEND_HUMAN:
++		if (hdr->header_level == 2)
++			hdr->unix_last_modified_stamp = hdr->last_modified_stamp;
++		else
++			hdr->unix_last_modified_stamp =
++				generic_to_unix_stamp(hdr->last_modified_stamp);
++		break;
++
++#ifdef OSK
++	case EXTEND_OS68K:
++	case EXTEND_XOSK:
++#endif
++	case EXTEND_UNIX:
++		break;
++
++	case EXTEND_MACOS:
++		macos_to_unix_filename(hdr->name, name_length);
++		/* macos_to_unix_filename(dirname, dir_length); */
++		hdr->unix_last_modified_stamp =
++			generic_to_unix_stamp(hdr->last_modified_stamp);
++		break;
++
++	default:
++		generic_to_unix_filename(hdr->name, name_length);
++		generic_to_unix_filename(dirname, dir_length);
++		if (hdr->header_level == 2)
++			hdr->unix_last_modified_stamp = hdr->last_modified_stamp;
++		else
++			hdr->unix_last_modified_stamp =
++				generic_to_unix_stamp(hdr->last_modified_stamp);
++	}
++
++	if (dir_length) {
++		strcat(dirname, hdr->name);
++		strcpy(hdr->name, dirname);
++		name_length += dir_length;
++	}
++
++	return TRUE;
++}
++
++/* ------------------------------------------------------------------------ */
++void
++init_header(name, v_stat, hdr)
++	char           *name;
++	struct stat    *v_stat;
++	LzHeader       *hdr;
++{
++	int             len;
++
++	if (compress_method == LZHUFF5_METHOD_NUM)  /* Changed N.Watazaki */
++		bcopy(LZHUFF5_METHOD, hdr->method, METHOD_TYPE_STRAGE);
++	else if (compress_method)
++		bcopy(LZHUFF1_METHOD, hdr->method, METHOD_TYPE_STRAGE);
++	else
++		bcopy(LZHUFF0_METHOD, hdr->method, METHOD_TYPE_STRAGE);
++
++	hdr->packed_size = 0;
++	hdr->original_size = v_stat->st_size;
++	hdr->last_modified_stamp = unix_to_generic_stamp(v_stat->st_mtime);
++	hdr->attribute = GENERIC_ATTRIBUTE;
++	hdr->header_level = header_level;
++	strcpy(hdr->name, name);
++	len = strlen(name);
++	hdr->crc = 0x0000;
++	hdr->extend_type = EXTEND_UNIX;
++	hdr->unix_last_modified_stamp = v_stat->st_mtime;
++	/* since 00:00:00 JAN.1.1970 */
++#ifdef NOT_COMPATIBLE_MODE
++	/* Please need your modification in this space. */
++#else
++	hdr->unix_mode = v_stat->st_mode;
++#endif
++
++	hdr->unix_uid = v_stat->st_uid;
++	hdr->unix_gid = v_stat->st_gid;
++
++	if (is_directory(v_stat)) {
++		bcopy(LZHDIRS_METHOD, hdr->method, METHOD_TYPE_STRAGE);
++		hdr->attribute = GENERIC_DIRECTORY_ATTRIBUTE;
++		hdr->original_size = 0;
++		if (len > 0 && hdr->name[len - 1] != '/')
++			strcpy(&hdr->name[len++], "/");
++	}
++
++#ifdef S_IFLNK	
++	if (is_symlink(v_stat)) {
++		char	lkname[257];
++		int		len;	
++		bcopy(LZHDIRS_METHOD, hdr->method, METHOD_TYPE_STRAGE);
++		hdr->attribute = GENERIC_DIRECTORY_ATTRIBUTE;
++		hdr->original_size = 0;
++		len = readlink(name, lkname, 256);
++		lkname[len] = (char)'\0';
++		sprintf(hdr->name, "%s|%s", hdr->name, lkname);
++	}
++#endif
++	if (generic_format)
++		unix_to_generic_filename(hdr->name, len);
++}
++
++/* ------------------------------------------------------------------------ */
++/* Write unix extended header or generic header. */
++void
++write_header(nafp, hdr)
++	FILE           *nafp;
++	LzHeader       *hdr;
++{
++	int             header_size;
++	int             name_length;
++	char            data[LZHEADER_STRAGE];
++	char           *p;
++	char           *headercrc_ptr;
++
++	bzero(data, LZHEADER_STRAGE);
++	bcopy(hdr->method, data + I_METHOD, METHOD_TYPE_STRAGE);
++	setup_put(data + I_PACKED_SIZE);
++	put_longword(hdr->packed_size);
++	put_longword(hdr->original_size);
++
++	if (hdr->header_level == HEADER_LEVEL2)
++		put_longword((long) hdr->unix_last_modified_stamp);
++	else
++		put_longword(hdr->last_modified_stamp);
++
++	switch (hdr->header_level) {
++	case HEADER_LEVEL0:
++		put_byte(hdr->attribute);
++		break;
++	case HEADER_LEVEL1:
++	case HEADER_LEVEL2:
++		put_byte(0x20);
++		break;
++	}
++
++	put_byte(hdr->header_level);
++
++	convdelim(hdr->name, DELIM2);
++	if (hdr->header_level != HEADER_LEVEL2) {
++		if (p = (char *) rindex(hdr->name, DELIM2))
++			name_length = strlen(++p);
++		else
++			name_length = strlen(hdr->name);
++		put_byte(name_length);
++		bcopy(p ? p : hdr->name, data + I_NAME, name_length);
++		setup_put(data + I_NAME + name_length);
++	}
++
++	put_word(hdr->crc);
++	if (header_level == HEADER_LEVEL0) {
++		if (generic_format) {
++			header_size = I_GENERIC_HEADER_BOTTOM - 2 + name_length;
++			data[I_HEADER_SIZE] = header_size;
++			data[I_HEADER_CHECKSUM] = calc_sum(data + I_METHOD, header_size);
++		} else {
++			/* write old-style extend header */
++			put_byte(EXTEND_UNIX);
++			put_byte(CURRENT_UNIX_MINOR_VERSION);
++			put_longword((long) hdr->unix_last_modified_stamp);
++			put_word(hdr->unix_mode);
++			put_word(hdr->unix_uid);
++			put_word(hdr->unix_gid);
++			header_size = I_UNIX_EXTEND_BOTTOM - 2 + name_length;
++			data[I_HEADER_SIZE] = header_size;
++			data[I_HEADER_CHECKSUM] = calc_sum(data + I_METHOD, header_size);
++		}
++	} else {
++		/* write extend header. */
++		char           *ptr;
++
++		if (generic_format)
++			put_byte(0x00);
++		else
++			put_byte(EXTEND_UNIX);
++
++		ptr = put_ptr;
++		if (hdr->header_level == HEADER_LEVEL2) {
++			/* write common header */
++			put_word(5);
++			put_byte(0x00);
++			headercrc_ptr = put_ptr;
++			put_word(0x0000);
++		}
++
++		if (generic_format) {
++			header_size = put_ptr - data;	/* +2 for last 0x0000 */
++		} else {
++			put_word(5);
++			if (hdr->header_level == HEADER_LEVEL1)
++				header_size = put_ptr - data - 2;
++			put_byte(0x50);	/* permission */
++			put_word(hdr->unix_mode);
++			put_word(7);
++			put_byte(0x51);	/* gid and uid */
++			put_word(hdr->unix_gid);
++			put_word(hdr->unix_uid);
++
++			if (p = (char *) rindex(hdr->name, DELIM2)) {
++				int             i;
++
++				name_length = p - hdr->name + 1;
++				put_word(name_length + 3);
++				put_byte(2);	/* dirname */
++				for (i = 0; i < name_length; i++)
++					put_byte(hdr->name[i]);
++			}
++		}		/* if generic .. */
++
++		if (header_level != HEADER_LEVEL2) {
++			if (!generic_format) {
++				put_word(7);
++				put_byte(0x54);	/* time stamp */
++				put_longword(hdr->unix_last_modified_stamp);
++			}
++			hdr->packed_size += put_ptr - ptr;
++			ptr = put_ptr;
++			setup_put(data + I_PACKED_SIZE);
++			put_longword(hdr->packed_size);
++			put_ptr = ptr;
++			data[I_HEADER_SIZE] = header_size;
++			data[I_HEADER_CHECKSUM] = calc_sum(data + I_METHOD, header_size);
++		} else {		/* header level 2 */
++			int             i;
++			if (p = (char *) rindex(hdr->name, DELIM2))
++				name_length = strlen(++p);
++			else {
++				p = hdr->name;
++				name_length = strlen(hdr->name);
++			}
++			put_word(name_length + 3);
++			put_byte(1);	/* filename */
++			for (i = 0; i < name_length; i++)
++				put_byte(*p++);
++		}		/* if he.. != HEAD_LV2 */
++		header_size = put_ptr - data;
++	}
++
++	if (header_level == HEADER_LEVEL2) {
++		unsigned short  hcrc;
++		setup_put(data + I_HEADER_SIZE);
++		put_word(header_size + 2);
++		/* common header */
++		hcrc = calc_header_crc(data, (unsigned int) header_size + 2);
++		setup_put(headercrc_ptr);
++		put_word(hcrc);
++	}
++
++	if (fwrite(data, sizeof(char), header_size + 2, nafp) == 0)
++		fatal_error("Cannot write to temporary file");
++
++	convdelim(hdr->name, DELIM);
++}
++
++/* Local Variables: */
++/* mode:c */
++/* tab-width:4 */
++/* compile-command:"gcc -c header.c" */
++/* End: */
+--- lha-1.14i.orig/debian/org/lharc.c
++++ lha-1.14i/debian/org/lharc.c
+@@ -0,0 +1,1135 @@
++/* ------------------------------------------------------------------------ */
++/* LHa for UNIX    															*/
++/*				lharc.c -- append to archive								*/
++/*																			*/
++/*		Copyright (C) MCMLXXXIX Yooichi.Tagawa								*/
++/*		Modified          		Nobutaka Watazaki							*/
++/*							Thanks to H.Yoshizaki. (MS-DOS LHarc)			*/
++/*																			*/
++/*  Ver. 0.00  Original							1988.05.23  Y.Tagawa		*/
++/*  Ver. 0.01  Alpha Version (for 4.2BSD)		1989.05.28  Y.Tagawa		*/
++/*  Ver. 0.02  Alpha Version Rel.2				1989.05.29  Y.Tagawa		*/
++/*  Ver. 0.03  Release #3  Beta Version			1989.07.02  Y.Tagawa		*/
++/*  Ver. 0.03a Debug							1989.07.03  Y.Tagawa		*/
++/*  Ver. 0.03b Modified							1989.07.13  Y.Tagawa		*/
++/*  Ver. 0.03c Debug (Thanks to void@rena.dit.junet)						*/
++/*												1989.08.09  Y.Tagawa		*/
++/*  Ver. 0.03d Modified (quiet and verbose)		1989.09.14  Y.Tagawa		*/
++/*  V1.00  Fixed								1989.09.22  Y.Tagawa		*/
++/*  V1.01  Bug Fixed							1989.12.25  Y.Tagawa		*/
++/*																			*/
++/*  DOS-Version Original LHx V C2.01 		(C) H.Yohizaki					*/
++/*																			*/
++/*  V2.00  UNIX Lharc + DOS LHx -> OSK LHx		1990.11.01  Momozou			*/
++/*  V2.01  Minor Modified						1990.11.24  Momozou			*/
++/*																			*/
++/*  Ver. 0.02  LHx for UNIX						1991.11.18  M.Oki			*/
++/*  Ver. 0.03  LHa for UNIX						1991.12.17  M.Oki			*/
++/*  Ver. 0.04  LHa for UNIX	beta version		1992.01.20  M.Oki			*/
++/*  Ver. 1.00  LHa for UNIX	Fixed				1992.03.19  M.Oki			*/
++/*																			*/
++/*  Ver. 1.10  for Symblic Link					1993.06.25  N.Watazaki		*/
++/*  Ver. 1.11  for Symblic Link	Bug Fixed		1993.08.18  N.Watazaki		*/
++/*  Ver. 1.12  for File Date Check				1993.10.28  N.Watazaki		*/
++/*  Ver. 1.13  Bug Fixed (Idicator calcurate)	1994.02.21  N.Watazaki		*/
++/*  Ver. 1.13a Bug Fixed (Sym. Link delete)		1994.03.11  N.Watazaki		*/
++/*	Ver. 1.13b Bug Fixed (Sym. Link delete)		1994.07.29  N.Watazaki		*/
++/*	Ver. 1.14  Source All chagned				1995.01.14	N.Watazaki		*/
++/*	Ver. 1.14b,c  Bug Fixed                     1996.03.07  t.okamoto		*/
++/*  Ver. 1.14d Version up                       1997.01.12  t.okamoto       */
++/*  Ver. 1.14g Bug Fixed                        2000.05.06  t.okamoto       */
++/*  Ver. 1.14i Modified                         2000.10.06  t.okamoto       */
++/* ------------------------------------------------------------------------ */
++#define LHA_MAIN_SRC
++
++#include "lha.h"
++
++/* ------------------------------------------------------------------------ */
++/*								PROGRAM										*/
++/* ------------------------------------------------------------------------ */
++static int      cmd = CMD_UNKNOWN;
++
++/* 1996.8.13 t.okamoto */
++#if 0
++char          **cmd_filev;
++int             cmd_filec;
++
++char           *archive_name;
++char            expanded_archive_name[FILENAME_LENGTH];
++char            temporary_name[FILENAME_LENGTH];
++char            backup_archive_name[FILENAME_LENGTH];
++#endif
++
++/* static functions */
++static void     sort_files();
++static void		print_version();
++
++char		    *extract_directory = NULL;
++char		  **xfilev;
++int             xfilec = 257;
++
++/* 1996.8.13 t.okamoto */
++#if 0
++char           *writting_filename;
++char           *reading_filename;
++
++int             archive_file_mode;
++int             archive_file_gid;
++#endif
++/* ------------------------------------------------------------------------ */
++static void
++init_variable()		/* Added N.Watazaki */
++{
++/* options */
++	quiet			= FALSE;
++	text_mode		= FALSE;
++	verbose			= FALSE;
++	noexec			= FALSE;	/* debugging option */
++	force			= FALSE;
++	prof			= FALSE;
++#ifndef SUPPORT_LH7
++	compress_method = LZHUFF5_METHOD_NUM;
++#endif
++#ifdef SUPPORT_LH7
++	compress_method = LZHUFF7_METHOD_NUM;
++#endif
++
++	header_level	= HEADER_LEVEL1;
++	quiet_mode		= 0;
++
++#ifdef EUC
++	euc_mode		= FALSE;
++#endif
++
++/* view command flags */
++	verbose_listing = FALSE;
++
++/* extract command flags */
++	output_to_stdout = FALSE;
++
++/* append command flags */
++	new_archive			= FALSE;
++	update_if_newer		= FALSE;
++	delete_after_append = FALSE;
++	generic_format		= FALSE;
++
++	remove_temporary_at_error 				= FALSE;
++	recover_archive_when_interrupt			= FALSE;
++	remove_extracting_file_when_interrupt	= FALSE;
++	get_filename_from_stdin					= FALSE;
++	ignore_directory						= FALSE;
++	verify_mode								= FALSE;
++
++	noconvertcase							= FALSE;
++
++	extract_directory = NULL;
++	xfilec = 257;
++}
++
++/* ------------------------------------------------------------------------ */
++/* NOTES :			Text File Format										*/
++/* GENERATOR		NewLine													*/
++/* [generic]		0D 0A													*/
++/* [MS-DOS]			0D 0A													*/
++/* [OS9][MacOS]		0D														*/
++/* [UNIX]			0A														*/
++/* ------------------------------------------------------------------------ */
++static void
++print_tiny_usage_and_exit()
++{
++	fprintf(stderr, "\
++LHarc    for UNIX  V 1.02  Copyright(C) 1989  Y.Tagawa\n\
++LHx      for MSDOS V C2.01 Copyright(C) 1990  H.Yoshizaki\n\
++LHx(arc) for OSK   V 2.01  Modified     1990  Momozou\n\
++LHa      for UNIX  V 1.00  Copyright(C) 1992  Masaru Oki\n\
++LHa      for UNIX  V 1.14  Modified     1995  Nobutaka Watazaki\n\
++LHa      for UNIX  V 1.14i Modified     2000  Tsugio Okamoto\n\
++");
++	fprintf(stderr, "\
++usage: lha [-]{axelvudmcp[q[num]][vnfodizg012]}[w=<dir>] archive_file [file...]\n\
++commands:                           options:\n\
++ a   Add(or replace) to archive      q{num} quiet (num:quiet mode)\n\
++ x,e EXtract from archive            v  verbose\n\
++ l,v List / Verbose List             n  not execute\n\
++ u   Update newer files to archive   f  force (over write at extract)\n\
++ d   Delete from archive             t  FILES are TEXT file\n");
++#ifdef SUPPORT_LH7
++	fprintf(stderr, "\
++ m   Move to archive (means 'ad')    o[567] compression method (a/u)\n\
++");
++#endif
++#ifndef SUPPORT_LH7
++	fprintf(stderr, "\
++ m   Move to archive (means 'ad')    o  use LHarc compatible method (a/u)\n\
++");
++#endif
++	fprintf(stderr, "\
++ c   re-Construct new archive        w=<dir> specify extract directory (a/u/m/x/e)\n\
++ p   Print to STDOUT from archive    d  delete FILES after (a/u/c)\n\
++ t   Test file CRC in archive        i  ignore directory path (x/e)\n\
++                                     z  files not compress (a/u)\n\
++                                     g  Generic format (for compatibility)\n\
++                                        or not convert case when extracting\n\
++                                     0/1/2 header level (a/u)\n\
++");
++#ifdef EUC
++	fprintf(stderr, "\
++                                     e  TEXT code convert from/to EUC\n\
++");
++#endif
++	exit(1);
++}
++
++/* ------------------------------------------------------------------------ */
++int
++main(argc, argv)
++	int             argc;
++	char           *argv[];
++{
++	char           *p, inpbuf[256];
++
++	int i;
++	int  ac;
++	char **av, *m;
++
++	init_variable();		/* Added N.Watazaki */
++
++	ac = argc;
++	av = (char **)malloc( sizeof(char*)*argc );
++	if (av == NULL) fatal_error("not enough memory\n");
++	for (i=0; i<argc; i++) {
++	  if ((av[i] = strdup( argv[i] )) == NULL)
++		fatal_error("not enough memory\n");
++	}
++
++	if (ac < 2)
++		print_tiny_usage_and_exit();
++
++	if (strcmp(av[1], "--version") == 0) {
++		print_version();
++		exit(1);
++	}
++
++	if (ac < 3) {
++		cmd = CMD_LIST;
++		av--; /* argv--; */ /* 1999.7.18 */
++		ac++; /* argc++; */
++		goto work;
++	}
++
++	m = av[1];
++
++	if (m[0] == '-')
++		m++;
++	/* commands */
++	switch (*m) {
++	case 'x':
++	case 'e':
++		cmd = CMD_EXTRACT;
++		break;
++
++	case 'p':
++		output_to_stdout = TRUE;
++		cmd = CMD_EXTRACT;
++		break;
++
++	case 'c':
++		new_archive = TRUE;
++		cmd = CMD_ADD;
++		break;
++
++	case 'a':
++		cmd = CMD_ADD;
++		break;
++
++	case 'd':
++		cmd = CMD_DELETE;
++		break;
++
++	case 'u':
++		update_if_newer = TRUE;
++		cmd = CMD_ADD;
++		break;
++
++	case 'm':
++		delete_after_append = TRUE;
++		cmd = CMD_ADD;
++		break;
++
++	case 'v':
++		verbose_listing = TRUE;
++		cmd = CMD_LIST;
++		break;
++
++	case 'l':
++		cmd = CMD_LIST;
++		break;
++
++	case 't':
++		cmd = CMD_EXTRACT;
++		verify_mode = TRUE;
++		break;
++
++	default:
++		print_tiny_usage_and_exit();
++
++	}
++
++	/* options */
++	/* p = &argv[1][1]; */
++	p = m+1;
++	while ( *p != 0 ) {
++		switch ((*p++)) {
++		case 'q':
++			switch (*p) {
++			case '0':
++			case '1':
++				quiet_mode = *p - '0';
++				++p;
++				break;
++			case '2':
++			default:
++				quiet = TRUE;
++				break;
++			}
++		case 'f':
++			force = TRUE;
++			break;
++		case 'p':
++			prof = TRUE;
++			break;
++		case 'v':
++			verbose = TRUE;
++			break;
++		case 't':
++			text_mode = TRUE;
++			break;
++#ifdef EUC
++		case 'e':
++			text_mode = TRUE;
++			euc_mode = TRUE;
++			break;
++#endif
++		case 'n':
++			noexec = TRUE;
++			break;
++		case 'g':
++			generic_format = TRUE;
++			noconvertcase = TRUE;
++			header_level = 0;
++			break;
++		case 'd':
++			delete_after_append = TRUE;
++			break;
++		case 'o':
++			switch (*p) {
++			case 0:
++				compress_method = LZHUFF1_METHOD_NUM;
++				header_level = 0;
++				break;
++			case '5':
++				compress_method = LZHUFF5_METHOD_NUM;
++				p++;
++				break;
++#ifdef SUPPORT_LH7
++			case '6':
++				compress_method = LZHUFF6_METHOD_NUM;
++				p++;
++				break;
++			case '7':
++				compress_method = LZHUFF7_METHOD_NUM;
++				p++;
++				break;
++#endif
++			default:
++				fprintf(stderr, "LHa: error option o%c\n", p[-1]);
++				exit(1);
++			}
++			break;
++		case 'z':
++			compress_method = LZHUFF0_METHOD_NUM;	/* Changed N.Watazaki */
++			break;
++		case 'i':
++			ignore_directory = TRUE;
++			break;
++		case 'w':
++			if (*p == '=')
++				p++;
++			extract_directory = p;
++			while (*p)
++				p++;
++			break;
++		case '0':
++			header_level = HEADER_LEVEL0;
++			break;
++		case '1':
++			header_level = HEADER_LEVEL1;
++			break;
++		case '2':
++			header_level = HEADER_LEVEL2;
++			break;
++		default:
++			fprintf(stderr, "LHa: Unknown option '%c'.\n", p[-1]);
++			exit(1);
++		}
++	}
++
++work:
++	/* archive file name */
++	archive_name = av[2];
++
++	if (!strcmp(archive_name, "-")) {
++		if (!isatty(1) && cmd == CMD_ADD)
++			quiet = TRUE;
++	}
++	else {
++		if (ac == 3 && !isatty(0)) { /* 1999.7.18 */
++			get_filename_from_stdin = TRUE;
++		}
++	}
++
++	/* target file name */
++	if (get_filename_from_stdin) {
++		cmd_filec = 0;
++		if ((xfilev = (char **) malloc(sizeof(char *) * xfilec)) == NULL)
++			fatal_error("Virtual memory exhausted\n");
++		while (fgets(inpbuf, sizeof(inpbuf), stdin)) {
++		    /* delete \n if it exist */
++			i=0; p=inpbuf;
++			while (i < sizeof(inpbuf) && p != 0) {
++			    if (*p == '\n') {
++				    *p = 0;
++					break;
++				}
++				p++; i++;
++			}
++
++			if (cmd_filec >= xfilec) {
++				xfilec += 256;
++				cmd_filev = (char **) realloc(xfilev,
++						   sizeof(char *) * xfilec);
++				if (cmd_filev == NULL)
++					fatal_error("Virtual memory exhausted\n");
++				xfilev = cmd_filev;
++			}
++			if (strlen(inpbuf) < 1)
++				continue;
++			if ((xfilev[cmd_filec++] = (char *) strdup(inpbuf)) == NULL)
++				fatal_error("Virtual memory exhausted\n");
++		}
++		xfilev[cmd_filec] = NULL;
++		cmd_filev = xfilev;
++	} else {
++		cmd_filec = ac - 3;
++		cmd_filev = av + 3;
++	}
++	sort_files();
++
++	/* make crc table */
++	make_crctable();
++
++	switch (cmd) {
++	case CMD_EXTRACT:
++		cmd_extract();
++		break;
++	case CMD_ADD:
++		cmd_add();
++		break;
++	case CMD_LIST:
++		cmd_list();
++		break;
++	case CMD_DELETE:
++		cmd_delete();
++		break;
++	}
++
++#ifdef USE_PROF
++	if (!prof)
++		exit(0);
++#endif
++
++	return 0;
++}
++
++
++/* ------------------------------------------------------------------------ */
++/* */
++/* ------------------------------------------------------------------------ */
++
++/* ------------------------------------------------------------------------ */
++static void
++print_version()
++{
++	fprintf(stderr, "%s\n", LHA_VERSION);
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++message_1(title, subject, name)
++	char           *title, *subject, *name;
++{
++	fprintf(stderr, "LHa: %s%s ", title, subject);
++	fflush(stderr);
++
++	if (errno == 0)
++		fprintf(stderr, "%s\n", name);
++	else
++		perror(name);
++}
++
++/* ------------------------------------------------------------------------ */
++void
++message(subject, name)
++	char           *subject, *name;
++{
++	message_1("", subject, name);
++}
++
++/* ------------------------------------------------------------------------ */
++void
++warning(subject, name)
++	char           *subject, *name;
++{
++	message_1("Warning: ", subject, name);
++}
++
++/* ------------------------------------------------------------------------ */
++void
++error(subject, msg)
++	char           *subject, *msg;
++{
++	message_1("Error: ", subject, msg);
++}
++
++/* ------------------------------------------------------------------------ */
++void
++fatal_error(msg)
++	char           *msg;
++{
++	message_1("Fatal error:", "", msg);
++
++	if (remove_temporary_at_error)
++		unlink(temporary_name);
++
++	exit(1);
++}
++
++/* ------------------------------------------------------------------------ */
++void
++write_error()
++{
++	fatal_error(writting_filename);
++}
++
++/* ------------------------------------------------------------------------ */
++void
++read_error()
++{
++	fatal_error(reading_filename);
++}
++
++/* ------------------------------------------------------------------------ */
++void
++interrupt(signo)
++	int             signo;
++{
++	errno = 0;
++	message("Interrupted\n", "");
++
++	if (temporary_fp)
++		fclose(temporary_fp);
++	unlink(temporary_name);
++	if (recover_archive_when_interrupt)
++		rename(backup_archive_name, archive_name);
++	if (remove_extracting_file_when_interrupt) {
++		errno = 0;
++		message("Removing", writting_filename);
++		unlink(writting_filename);
++	}
++	signal(SIGINT, SIG_DFL);
++	signal(SIGHUP, SIG_DFL);
++	kill(getpid(), signo);
++}
++
++/* ------------------------------------------------------------------------ */
++/*																			*/
++/* ------------------------------------------------------------------------ */
++static int
++sort_by_ascii(a, b)
++	char          **a, **b;
++{
++	register char  *p, *q;
++	register int    c1, c2;
++
++	p = *a, q = *b;
++	if (generic_format) {
++		do {
++			c1 = *(unsigned char *) p++;
++			c2 = *(unsigned char *) q++;
++			if (!c1 || !c2)
++				break;
++			if (islower(c1))
++				c1 = toupper(c1);
++			if (islower(c2))
++				c2 = toupper(c2);
++		}
++		while (c1 == c2);
++		return c1 - c2;
++	}
++	else {
++		while (*p == *q && *p != '\0')
++			p++, q++;
++		return *(unsigned char *) p - *(unsigned char *) q;
++	}
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++sort_files()
++{
++	if (cmd_filec > 1)
++		qsort(cmd_filev, cmd_filec, sizeof(char *), sort_by_ascii);
++}
++
++/* ------------------------------------------------------------------------ */
++char           *
++xmalloc(size)
++	int             size;
++{
++	char           *p = (char *) malloc(size);
++	if (!p)
++		fatal_error("Not enough memory");
++	return p;
++}
++
++/* ------------------------------------------------------------------------ */
++char           *
++xrealloc(old, size)
++	char           *old;
++	int             size;
++{
++	char           *p = (char *) realloc(old, size);
++	if (!p)
++		fatal_error("Not enough memory");
++	return p;
++}
++
++/* ------------------------------------------------------------------------ */
++/*								STRING POOL									*/
++/* ------------------------------------------------------------------------ */
++/*
++  string pool :
++	+-------------+-------------+------+-------------+----------+
++	| N A M E 1 \0| N A M E 2 \0| .... | N A M E n \0|			|
++	+-------------+-------------+------+-------------+----------+
++	  ^ ^		 ^ buffer+0 buffer+used buffer+size
++
++  vector :
++	+---------------+---------------+------------- -----------------+
++	| pointer to	| pointer to	| pointer to   ...  pointer to	|
++	|  stringpool	|  N A M E 1	|  N A M E 2   ...   N A M E n	|
++	+---------------+---------------+-------------     -------------+
++	^ malloc base      returned
++*/
++
++/* ------------------------------------------------------------------------ */
++void
++init_sp(sp)
++	struct string_pool *sp;
++{
++	sp->size = 1024 - 8;	/* any ( >=0 ) */
++	sp->used = 0;
++	sp->n = 0;
++	sp->buffer = (char *) xmalloc(sp->size * sizeof(char));
++}
++
++/* ------------------------------------------------------------------------ */
++void
++add_sp(sp, name, len)
++	struct string_pool *sp;
++	char           *name;	/* stored '\0' at tail */
++	int             len;	/* include '\0' */
++{
++	while (sp->used + len > sp->size) {
++		sp->size *= 2;
++		sp->buffer = (char *) xrealloc(sp->buffer, sp->size * sizeof(char));
++	}
++	bcopy(name, sp->buffer + sp->used, len);
++	sp->used += len;
++	sp->n++;
++}
++
++/* ------------------------------------------------------------------------ */
++void
++finish_sp(sp, v_count, v_vector)
++	register struct string_pool *sp;
++	int            *v_count;
++	char         ***v_vector;
++{
++	int             i;
++	register char  *p;
++	char          **v;
++
++	v = (char **) xmalloc((sp->n + 1) * sizeof(char *));
++	*v++ = sp->buffer;
++	*v_vector = v;
++	*v_count = sp->n;
++	p = sp->buffer;
++	for (i = sp->n; i; i--) {
++		*v++ = p;
++		if (i - 1)
++			p += strlen(p) + 1;
++	}
++}
++
++/* ------------------------------------------------------------------------ */
++void
++free_sp(vector)
++	char          **vector;
++{
++	vector--;
++	free(*vector);		/* free string pool */
++	free(vector);
++}
++
++
++/* ------------------------------------------------------------------------ */
++/*							READ DIRECTORY FILES							*/
++/* ------------------------------------------------------------------------ */
++static          boolean
++include_path_p(path, name)
++	char           *path, *name;
++{
++	char           *n = name;
++	while (*path)
++		if (*path++ != *n++)
++			return (path[-1] == '/' && *n == '\0');
++	return (*n == '/' || (n != name && path[-1] == '/' && n[-1] == '/'));
++}
++
++/* ------------------------------------------------------------------------ */
++void
++cleaning_files(v_filec, v_filev)
++	int            *v_filec;
++	char         ***v_filev;
++{
++	char           *flags;
++	struct stat     stbuf;
++
++	register char **filev = *v_filev;
++	register int    filec = *v_filec;
++	register char  *p;
++	register int    i, j;
++
++	if (filec == 0)
++		return;
++
++	flags = xmalloc(filec * sizeof(char));
++
++	/* flags & 0x01 :	1: ignore */
++	/* flags & 0x02 :	1: directory, 0 : regular file */
++	/* flags & 0x04 :	1: need delete */
++
++	
++	for (i = 0; i < filec; i++)
++		if (GETSTAT(filev[i], &stbuf) < 0) {
++			flags[i] = 0x04;
++			fprintf(stderr,
++			 "LHa: Cannot access \"%s\", ignored.\n", filev[i]);
++		}
++		else {
++			if (is_regularfile(&stbuf))
++				flags[i] = 0x00;
++			else if (is_directory(&stbuf))
++				flags[i] = 0x02;
++#ifdef S_IFLNK
++			else if (is_symlink(&stbuf)) /* t.okamoto */
++				flags[i] = 0x00;
++#endif			
++			else {
++				flags[i] = 0x04;
++				fprintf(stderr,
++					"LHa: Cannot archive \"%s\", ignored.\n", filev[i]);
++			}
++		}
++	errno = 0;
++
++	for (i = 0; i < filec; i++) {
++		p = filev[i];
++		if ((flags[i] & 0x07) == 0x00) {	/* regular file, not
++							 * deleted/ignored */
++			for (j = i + 1; j < filec; j++) {
++				if ((flags[j] & 0x07) == 0x00) {	/* regular file, not
++									 * deleted/ignored */
++					if (STREQU(p, filev[j]))
++						flags[j] = 0x04;	/* delete */
++				}
++			}
++		}
++		else if ((flags[i] & 0x07) == 0x02) {	/* directory, not
++							 * deleted/ignored */
++			for (j = i + 1; j < filec; j++) {
++				if ((flags[j] & 0x07) == 0x00) {	/* regular file, not
++									 * deleted/ignored */
++					if (include_path_p(p, filev[j]))
++						flags[j] = 0x04;	/* delete */
++				}
++				else if ((flags[j] & 0x07) == 0x02) {	/* directory, not
++									 * deleted/ignored */
++					if (include_path_p(p, filev[j]))
++						flags[j] = 0x04;	/* delete */
++				}
++			}
++		}
++	}
++
++	for (i = j = 0; i < filec; i++) {
++		if ((flags[i] & 0x04) == 0) {
++			if (i != j)
++				filev[j] = filev[i];
++			j++;
++		}
++	}
++	*v_filec = j;
++
++	free(flags);
++}
++
++/* ------------------------------------------------------------------------ */
++#ifdef NODIRECTORY
++/* please need your imprementation */
++boolean
++find_files(name, v_filec, v_filev)
++	char           *name;
++	int            *v_filec;
++	char         ***v_filev;
++{
++	return FALSE;		/* DUMMY */
++}
++
++/* ------------------------------------------------------------------------ */
++void
++free_files(filec, filev)
++	int             filec;
++	char          **filev;
++{
++	/* do nothing */
++}
++/* ------------------------------------------------------------------------ */
++#else
++boolean
++find_files(name, v_filec, v_filev)
++	char           *name;
++	int            *v_filec;
++	char         ***v_filev;
++{
++	struct string_pool sp;
++	char            newname[FILENAME_LENGTH];
++	int             len, n;
++	DIR            *dirp;
++	DIRENTRY       *dp;
++	struct stat     tmp_stbuf, arc_stbuf, fil_stbuf;
++
++	strcpy(newname, name);
++	len = strlen(name);
++	if (len > 0 && newname[len - 1] != '/')
++		newname[len++] = '/';
++
++	dirp = opendir(name);
++	if (!dirp)
++		return FALSE;
++
++	init_sp(&sp);
++
++	GETSTAT(temporary_name, &tmp_stbuf);
++	GETSTAT(archive_name, &arc_stbuf);
++
++	for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
++		n = NAMLEN(dp);
++		strncpy(newname + len, dp->d_name, n);
++		newname[len + n] = '\0';
++		if (GETSTAT(newname, &fil_stbuf) < 0)
++			continue;
++#ifdef NO_INODE
++		if ( dp->d_name[0] != '.' ||
++			(n != 1 &&
++			 (dp->d_name[1] != '.' ||
++			  n != 2))  ) {
++			add_sp(&sp, newname, len+n+1);
++		}
++#else		
++		if ((dp->d_ino != 0) &&
++		/* exclude '.' and '..' */
++		    ((dp->d_name[0] != '.') ||
++		     ((n != 1) &&
++		      ((dp->d_name[1] != '.') ||
++		       (n != 2)))) &&
++		    ((tmp_stbuf.st_dev != fil_stbuf.st_dev ||
++		      tmp_stbuf.st_ino != fil_stbuf.st_ino) &&
++		     (arc_stbuf.st_dev != fil_stbuf.st_dev ||
++		      arc_stbuf.st_ino != fil_stbuf.st_ino))) {
++			add_sp(&sp, newname, len + n + 1);
++		}
++#endif
++	}
++	closedir(dirp);
++	finish_sp(&sp, v_filec, v_filev);
++	if (*v_filec > 1)
++		qsort(*v_filev, *v_filec, sizeof(char *), sort_by_ascii);
++	cleaning_files(v_filec, v_filev);
++
++	return TRUE;
++}
++
++/* ------------------------------------------------------------------------ */
++void
++free_files(filec, filev)
++	int             filec;
++	char          **filev;
++{
++	free_sp(filev);
++}
++#endif
++/* ------------------------------------------------------------------------ */
++/*																			*/
++/* ------------------------------------------------------------------------ */
++/* Build temporary file name and store to TEMPORARY_NAME */
++void
++build_temporary_name()
++{
++#ifdef TMP_FILENAME_TEMPLATE
++	/* "/tmp/lhXXXXXX" etc. */
++	if (extract_directory == NULL) {
++		strcpy(temporary_name, TMP_FILENAME_TEMPLATE);
++	}
++	else {
++		sprintf(temporary_name, "%s/lhXXXXXX", extract_directory);
++	}
++#ifdef MKSTEMP
++	mkstemp(temporary_name);
++#else
++	mktemp(temporary_name);
++#endif
++#else
++	char           *p, *s;
++
++	strcpy(temporary_name, archive_name);
++	for (p = temporary_name, s = (char *) 0; *p; p++)
++		if (*p == '/')
++			s = p;
++	strcpy((s ? s + 1 : temporary_name), "lhXXXXXX");
++#ifdef MKSTEMP
++	mkstemp(temporary_name);
++#else
++	mktemp(temporary_name);
++#endif
++#endif
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++modify_filename_extention(buffer, ext)
++	char           *buffer;
++	char           *ext;
++{
++	register char  *p, *dot;
++
++	for (p = buffer, dot = (char *) 0; *p; p++) {
++		if (*p == '.')
++			dot = p;
++		else if (*p == '/')
++			dot = (char *) 0;
++	}
++
++	if (dot)
++		p = dot;
++
++	strcpy(p, ext);
++}
++
++/* ------------------------------------------------------------------------ */
++/* build backup file name */
++void
++build_backup_name(buffer, original)
++	char           *buffer;
++	char           *original;
++{
++	strcpy(buffer, original);
++	modify_filename_extention(buffer, BACKUPNAME_EXTENTION);	/* ".bak" */
++}
++
++/* ------------------------------------------------------------------------ */
++void
++build_standard_archive_name(buffer, orginal)
++	char           *buffer;
++	char           *orginal;
++{
++	strcpy(buffer, orginal);
++	modify_filename_extention(buffer, ARCHIVENAME_EXTENTION);	/* ".lzh" */
++}
++
++/* ------------------------------------------------------------------------ */
++/*																			*/
++/* ------------------------------------------------------------------------ */
++boolean
++need_file(name)
++	char           *name;
++{
++	int             i;
++
++	if (cmd_filec == 0)
++		return TRUE;
++
++	for (i = 0; i < cmd_filec; i++) {
++		if (patmatch(cmd_filev[i], name, 0))
++			return TRUE;
++	}
++
++	return FALSE;
++}
++
++FILE           *
++xfopen(name, mode)
++	char           *name, *mode;
++{
++	FILE           *fp;
++
++	if ((fp = fopen(name, mode)) == NULL)
++		fatal_error(name);
++
++	return fp;
++}
++
++/* ------------------------------------------------------------------------ */
++/*																			*/
++/* ------------------------------------------------------------------------ */
++static          boolean
++open_old_archive_1(name, v_fp)
++	char           *name;
++	FILE          **v_fp;
++{
++	FILE           *fp;
++	struct stat     stbuf;
++
++	if (stat(name, &stbuf) >= 0 &&
++	    is_regularfile(&stbuf) &&
++	    (fp = fopen(name, READ_BINARY)) != NULL) {
++		*v_fp = fp;
++		archive_file_gid = stbuf.st_gid;
++		archive_file_mode = stbuf.st_mode;
++		return TRUE;
++	}
++
++	*v_fp = NULL;
++	archive_file_gid = -1;
++	return FALSE;
++}
++
++/* ------------------------------------------------------------------------ */
++FILE           *
++open_old_archive()
++{
++	FILE           *fp;
++	char           *p;
++
++	if (!strcmp(archive_name, "-")) {
++		if (cmd == CMD_EXTRACT || cmd == CMD_LIST)
++			return stdin;
++		else
++			return NULL;
++	}
++	if (p = (char *) rindex(archive_name, '.')) {
++		if (strucmp(".LZH", p) == 0
++		    || strucmp(".LZS", p) == 0
++		    || strucmp(".COM", p) == 0	/* DOS SFX */
++		    || strucmp(".EXE", p) == 0
++		    || strucmp(".X", p) == 0	/* HUMAN SFX */
++		    || strucmp(".BAK", p) == 0) {	/* for BackUp */
++			open_old_archive_1(archive_name, &fp);
++			return fp;
++		}
++	}
++
++	if (open_old_archive_1(archive_name, &fp))
++		return fp;
++	sprintf(expanded_archive_name, "%s.lzh", archive_name);
++	if (open_old_archive_1(expanded_archive_name, &fp)) {
++		archive_name = expanded_archive_name;
++		return fp;
++	}
++	/*
++	 * if ( (errno&0xffff)!=E_PNNF ) { archive_name =
++	 * expanded_archive_name; return NULL; }
++	 */
++	sprintf(expanded_archive_name, "%s.lzs", archive_name);
++	if (open_old_archive_1(expanded_archive_name, &fp)) {
++		archive_name = expanded_archive_name;
++		return fp;
++	}
++	/*
++	 * if ( (errno&0xffff)!=E_PNNF ) { archive_name =
++	 * expanded_archive_name; return NULL; }
++	 */
++	/*
++	 * sprintf( expanded_archive_name , "%s.lzh",archive_name);
++	 * archive_name = expanded_archive_name;
++	 */
++	return NULL;
++}
++
++/* ------------------------------------------------------------------------ */
++int
++inquire(msg, name, selective)
++	char           *msg, *name, *selective;
++{
++	char            buffer[1024];
++	char           *p;
++
++	for (;;) {
++		fprintf(stderr, "%s %s ", name, msg);
++		fflush(stderr);
++
++		fgets(buffer, 1024, stdin);
++
++		for (p = selective; *p; p++)
++			if (buffer[0] == *p)
++				return p - selective;
++	}
++	/* NOTREACHED */
++}
++
++/* ------------------------------------------------------------------------ */
++void
++write_archive_tail(nafp)
++	FILE           *nafp;
++{
++	putc(0x00, nafp);
++}
++
++/* ------------------------------------------------------------------------ */
++void
++copy_old_one(oafp, nafp, hdr)
++	FILE           *oafp, *nafp;
++	LzHeader       *hdr;
++{
++	if (noexec) {
++		fseek(oafp, (long) (hdr->header_size + 2) + hdr->packed_size, SEEK_CUR);
++	}
++	else {
++		reading_filename = archive_name;
++		writting_filename = temporary_name;
++		if (hdr->header_level != 2) {
++			copyfile(oafp, nafp,
++					 (long) (hdr->header_size + 2) + hdr->packed_size, 0);
++		} else {
++			copyfile(oafp, nafp,
++					 (long) (hdr->header_size) + hdr->packed_size, 0);
++		}
++	}
++}
++
++/* Local Variables: */
++/* mode:c */
++/* tab-width:4 */
++/* compile-command:"gcc -c lharc.c" */
++/* End: */
+--- lha-1.14i.orig/debian/org/util.c
++++ lha-1.14i/debian/org/util.c
+@@ -0,0 +1,375 @@
++/* ------------------------------------------------------------------------ */
++/* LHa for UNIX    															*/
++/*				util.c -- LHarc Util										*/
++/*																			*/
++/*		Modified          		Nobutaka Watazaki							*/
++/*																			*/
++/*	Ver. 1.14 	Source All chagned				1995.01.14	N.Watazaki		*/
++/*  Ver. 1.14e  Support for sfx archives		1999.05.28	T.Okamoto       */
++/* ------------------------------------------------------------------------ */
++#include "lha.h"
++/*
++ * util.c - part of LHa for UNIX Feb 26 1992 modified by Masaru Oki Mar  4
++ * 1992 modified by Masaru Oki #ifndef USESTRCASECMP added. Mar 31 1992
++ * modified by Masaru Oki #ifdef NOMEMSET added.
++ */
++#include <errno.h>
++
++/* ------------------------------------------------------------------------ */
++extern unsigned short crc;
++extern int      quiet;
++/* ------------------------------------------------------------------------ */
++long
++copyfile(f1, f2, size, crc_flg)	/* return: size of source file */
++	FILE           *f1;
++	FILE           *f2;
++	long            size;
++	int             crc_flg;/* 0: no crc, 1: crc check, 2: extract, 3:
++				 * append */
++{
++	unsigned short  xsize;
++	char           *buf;
++	long            rsize = 0;
++
++	if ((buf = (char *) malloc(BUFFERSIZE)) == NULL)
++		fatal_error("virtual memory exhausted.\n");
++	crc = 0;
++	if ((crc_flg == 2 || crc_flg) && text_mode)
++		init_code_cache();
++	while (size > 0) {
++		/* read */
++		if (crc_flg == 3 && text_mode) {
++			xsize = fread_txt(buf, BUFFERSIZE, f1);
++			if (xsize == 0)
++				break;
++			if (ferror(f1)) {
++				fatal_error("file read error\n");
++			}
++		}
++		else {
++			xsize = (size > BUFFERSIZE) ? BUFFERSIZE : size;
++			if (fread(buf, 1, xsize, f1) != xsize) {
++				fatal_error("file read error\n");
++			}
++		}
++		/* write */
++		if (f2) {
++			if (crc_flg == 2 && text_mode) {
++				if (fwrite_txt(buf, xsize, f2)) {
++					fatal_error("file write error\n");
++				}
++			}
++			else {
++				if (fwrite(buf, 1, xsize, f2) != xsize) {
++					fatal_error("file write error\n");
++				}
++			}
++		}
++		/* calculate crc */
++		if (crc_flg) {
++			calccrc(buf, xsize);
++		}
++		rsize += xsize;
++		if (crc_flg != 3 || !text_mode)
++			size -= xsize;
++	}
++	free(buf);
++	return rsize;
++}
++
++/* ------------------------------------------------------------------------ */
++int
++encode_stored_crc(ifp, ofp, size, original_size_var, write_size_var)
++	FILE           *ifp, *ofp;
++	long            size;
++	long           *original_size_var;
++	long           *write_size_var;
++{
++	int             save_quiet;
++
++	save_quiet = quiet;
++	quiet = 1;
++	size = copyfile(ifp, ofp, size, 3);
++	*original_size_var = *write_size_var = size;
++	quiet = save_quiet;
++	return crc;
++}
++
++/* ------------------------------------------------------------------------ */
++/*	convert path delimit
++	erreturns *filename														*/
++/* ------------------------------------------------------------------------ */
++unsigned char  *
++convdelim(path, delim)
++	unsigned char  *path;
++	unsigned char   delim;
++{
++	unsigned char   c;
++	unsigned char  *p;
++#ifdef MULTIBYTE_CHAR
++	int             kflg;
++
++	kflg = 0;
++#endif
++	for (p = path; (c = *p) != 0; p++) {
++#ifdef MULTIBYTE_CHAR
++		if (kflg) {
++			kflg = 0;
++		}
++		else if (MULTIBYTE_FIRST_P(c)) {
++			kflg = 1;
++		}
++		else
++#endif
++		if (c == '\\' || c == DELIM || c == DELIM2) {
++			*p = delim;
++			path = p + 1;
++		}
++	}
++	return path;
++}
++
++/* ------------------------------------------------------------------------ */
++/* If TRUE, archive file name is msdos SFX file name. */
++boolean
++archive_is_msdos_sfx1(name)
++	char           *name;
++{
++	int             len = strlen(name);
++
++	return ((len >= 4) &&
++		(strucmp(".COM", name + len - 4) == 0 ||
++		 strucmp(".EXE", name + len - 4) == 0)) ||
++		((len >= 2) &&
++		 (strucmp(".x", name + len - 2) == 0));
++}
++
++/* ------------------------------------------------------------------------ */
++/* skip SFX header */
++boolean
++skip_msdos_sfx1_code(fp)
++	FILE           *fp;
++{
++	unsigned char   buffer[MAXSFXCODE];
++	unsigned char  *p, *q;
++	int             n;
++
++	n = fread(buffer, sizeof(char), MAXSFXCODE, fp);
++
++	for (p = buffer + 2, q = buffer + n - /* 5 */ (I_HEADER_LEVEL+1)-2; p < q; p++) {
++		/* found "-l??-" keyword (as METHOD type string) */
++		if (p[0] == '-' && p[1] == 'l' && p[4] == '-') {
++			/* size and checksum validate check */
++			if ( (p[I_HEADER_LEVEL-2] == 0 || p[I_HEADER_LEVEL-2] == 0)
++				&& p[I_HEADER_SIZE-2] > 20
++				&& p[I_HEADER_CHECKSUM-2] == calc_sum(p, p[-2])) {
++					fseek(fp, ((p - 2) - buffer) - n, SEEK_CUR);
++				return TRUE;
++			} else if (p[I_HEADER_LEVEL-2] == 2 && p[I_HEADER_SIZE-2] >= 24
++					   && p[I_ATTRIBUTE-2] == 0x20) {
++				fseek(fp, ((p - 2) - buffer) - n, SEEK_CUR);
++				return TRUE;
++			}
++		}
++	}
++
++	fseek(fp, -n, SEEK_CUR);
++	return FALSE;
++}
++
++/*
++ * strdup(3)
++ */
++
++/* ------------------------------------------------------------------------ */
++#ifdef NOSTRDUP
++char           *
++strdup(buf)
++	char           *buf;
++{
++	char           *p;
++
++	if ((p = (char *) malloc(strlen(buf) + 1)) == NULL)
++		return NULL;
++	strcpy(p, buf);
++	return p;
++}
++#endif
++
++/*
++ * memmove( char *dst , char *src , size_t cnt )
++ */
++
++/* ------------------------------------------------------------------------ */
++#if defined(NOBSTRING) && !defined(__STDC__)
++void           *
++memmove(dst, src, cnt)
++	register char  *dst, *src;
++	register int    cnt;
++{
++	if (dst == src)
++		return dst;
++	if (src > dst) {
++		while (--cnt >= 0)
++			*dst++ = *src++;
++	}
++	else {
++		dst += cnt;
++		src += cnt;
++		while (--cnt >= 0)
++			*--dst = *--src;
++	}
++	return dst;
++}
++#endif
++
++/*
++ * rename - change the name of file 91.11.02 by Tomohiro Ishikawa
++ * (ishikawa@gaia.cow.melco.CO.JP) 92.01.20 little modified (added #ifdef) by
++ * Masaru Oki 92.01.28 added mkdir() and rmdir() by Tomohiro Ishikawa
++ */
++
++#if defined(NOFTRUNCATE) && !defined(_MINIX)
++
++/* ------------------------------------------------------------------------ */
++int
++rename(from, to)
++	char           *from, *to;
++{
++	struct stat     s1, s2;
++	extern int      errno;
++
++	if (stat(from, &s1) < 0)
++		return (-1);
++	/* is 'FROM' file a directory? */
++	if ((s1.st_mode & S_IFMT) == S_IFDIR) {
++		errno = ENOTDIR;
++		return (-1);
++	}
++	if (stat(to, &s2) >= 0) {	/* 'TO' exists! */
++		/* is 'TO' file a directory? */
++		if ((s2.st_mode & S_IFMT) == S_IFDIR) {
++			errno = EISDIR;
++			return (-1);
++		}
++		if (unlink(to) < 0)
++			return (-1);
++	}
++	if (link(from, to) < 0)
++		return (-1);
++	if (unlink(from) < 0)
++		return (-1);
++	return (0);
++}
++#endif				/* NOFTRUNCATE */
++/* ------------------------------------------------------------------------ */
++
++#ifdef	NOMKDIR
++#ifndef	MKDIRPATH
++#define	MKDIRPATH	"/bin/mkdir"
++#endif
++#ifndef	RMDIRPATH
++#define	RMDIRPATH	"/bin/rmdir"
++#endif
++int
++rmdir(path)
++	char           *path;
++{
++	int             stat, rtn = 0;
++	char           *cmdname;
++	if ((cmdname = (char *) malloc(strlen(RMDIRPATH) + 1 + strlen(path) + 1))
++	    == 0)
++		return (-1);
++	strcpy(cmdname, RMDIRPATH);
++	*(cmdname + strlen(RMDIRPATH)) = ' ';
++	strcpy(cmdname + strlen(RMDIRPATH) + 1, path);
++	if ((stat = system(cmdname)) < 0)
++		rtn = -1;	/* fork or exec error */
++	else if (stat) {	/* RMDIR command error */
++		errno = EIO;
++		rtn = -1;
++	}
++	free(cmdname);
++	return (rtn);
++}
++
++/* ------------------------------------------------------------------------ */
++int
++mkdir(path, mode)
++	char           *path;
++	int             mode;
++{
++	int             child, stat;
++	char           *cmdname, *cmdpath = MKDIRPATH;
++	if ((cmdname = (char *) strrchr(cmdpath, '/')) == (char *) 0)
++		cmdname = cmdpath;
++	if ((child = fork()) < 0)
++		return (-1);	/* fork error */
++	else if (child) {	/* parent process */
++		while (child != wait(&stat))	/* ignore signals */
++			continue;
++	}
++	else {			/* child process */
++		int             maskvalue;
++		maskvalue = umask(0);	/* get current umask() value */
++		umask(maskvalue | (0777 & ~mode));	/* set it! */
++		execl(cmdpath, cmdname, path, (char *) 0);
++		/* never come here except execl is error */
++		return (-1);
++	}
++	if (stat != 0) {
++		errno = EIO;	/* cannot get error num. */
++		return (-1);
++	}
++	return (0);
++}
++#endif
++
++/*
++ * strucmp modified: Oct 29 1991 by Masaru Oki
++ */
++
++#ifndef USESTRCASECMP
++static int
++my_toupper(n)
++	register int    n;
++{
++	if (n >= 'a' && n <= 'z')
++		return n & (~('a' - 'A'));
++	return n;
++}
++
++/* ------------------------------------------------------------------------ */
++int
++strucmp(s, t)
++	register char  *s, *t;
++{
++	while (my_toupper(*s++) == my_toupper(*t++))
++		if (!*s || !*t)
++			break;
++	if (!*s && !*t)
++		return 0;
++	return 1;
++}
++#endif
++
++/* ------------------------------------------------------------------------ */
++#ifdef NOMEMSET
++/* Public Domain memset(3) */
++char           *
++memset(s, c, n)
++	char           *s;
++	int             c, n;
++{
++	char           *p = s;
++	while (n--)
++		*p++ = (char) c;
++	return s;
++}
++#endif
++
++/* Local Variables: */
++/* mode:c */
++/* tab-width:4 */
++/* compile-command:"gcc -c util.c" */
++/* End: */
+--- lha-1.14i.orig/debian/org/lhext.c
++++ lha-1.14i/debian/org/lhext.c
+@@ -0,0 +1,425 @@
++/* ------------------------------------------------------------------------ */
++/* LHa for UNIX    															*/
++/*				lhext.c -- LHarc extract									*/
++/*																			*/
++/*		Copyright (C) MCMLXXXIX Yooichi.Tagawa								*/
++/*		Modified          		Nobutaka Watazaki							*/
++/*																			*/
++/*  Ver. 0.00  Original								1988.05.23  Y.Tagawa	*/
++/*  Ver. 1.00  Fixed								1989.09.22  Y.Tagawa	*/
++/*  Ver. 0.03  LHa for UNIX							1991.12.17  M.Oki		*/
++/*  Ver. 1.12  LHa for UNIX							1993.10.01	N.Watazaki	*/
++/*  Ver. 1.13b Symbolic Link Update Bug Fix			1994.06.21	N.Watazaki	*/
++/*	Ver. 1.14  Source All chagned					1995.01.14	N.Watazaki	*/
++/*  Ver. 1.14e bugfix                               1999.04.30  T.Okamoto   */
++/* ------------------------------------------------------------------------ */
++#include "lha.h"
++/* ------------------------------------------------------------------------ */
++static int      skip_flg = FALSE;	/* FALSE..No Skip , TRUE..Skip */
++static char	   *methods[] =
++{
++	LZHUFF0_METHOD, LZHUFF1_METHOD, LZHUFF2_METHOD, LZHUFF3_METHOD,
++	LZHUFF4_METHOD, LZHUFF5_METHOD, LZHUFF6_METHOD, LZHUFF7_METHOD,
++	LARC_METHOD, LARC5_METHOD, LARC4_METHOD,
++	LZHDIRS_METHOD,
++	NULL
++};
++
++/* ------------------------------------------------------------------------ */
++static          boolean
++inquire_extract(name)
++	char           *name;
++{
++	struct stat     stbuf;
++
++	skip_flg = FALSE;
++	if (stat(name, &stbuf) >= 0) {
++		if (!is_regularfile(&stbuf)) {
++			error("Already exist (not a file)", name);
++			return FALSE;
++		}
++
++		if (noexec) {
++			printf("EXTRACT %s but file is exist.\n", name);
++			return FALSE;
++		}
++		else if (!force) {
++			if (!isatty(0))
++				return FALSE;
++
++			switch (inquire("OverWrite ?(Yes/[No]/All/Skip)", name, "YyNnAaSs\n")) {
++			case 0:
++			case 1:/* Y/y */
++				break;
++			case 2:
++			case 3:/* N/n */
++			case 8:/* Return */
++				return FALSE;
++			case 4:
++			case 5:/* A/a */
++				force = TRUE;
++				break;
++			case 6:
++			case 7:/* S/s */
++				skip_flg = TRUE;
++				break;
++			}
++		}
++	}
++	if (noexec)
++		printf("EXTRACT %s\n", name);
++
++	return TRUE;
++}
++
++/* ------------------------------------------------------------------------ */
++static          boolean
++make_parent_path(name)
++	char           *name;
++{
++	char            path[FILENAME_LENGTH];
++	struct stat     stbuf;
++	register char  *p;
++
++	/* make parent directory name into PATH for recursive call */
++	strcpy(path, name);
++	for (p = path + strlen(path); p > path; p--)
++		if (p[-1] == '/') {
++			*--p = '\0';
++			break;
++		}
++
++	if (p == path) {
++		message("Why?", "ROOT");
++		return FALSE;	/* no more parent. */
++	}
++
++	if (GETSTAT(path, &stbuf) >= 0) {
++		if (is_directory(&stbuf))
++			return TRUE;
++		error("Not a directory", path);
++		return FALSE;
++	}
++	errno = 0;
++
++	if (verbose)
++		printf("Making directory \"%s\".\n", path);
++
++	if (mkdir(path, 0777) >= 0)	/* try */
++		return TRUE;	/* successful done. */
++	errno = 0;
++
++	if (!make_parent_path(path))
++		return FALSE;
++
++	if (mkdir(path, 0777) < 0) {	/* try again */
++		message("Cannot make directory", path);
++		return FALSE;
++	}
++
++	return TRUE;
++}
++
++/* ------------------------------------------------------------------------ */
++static FILE    *
++open_with_make_path(name)
++	char           *name;
++{
++	FILE           *fp;
++
++	if ((fp = fopen(name, WRITE_BINARY)) == NULL) {
++		errno = 0;
++		if (!make_parent_path(name) ||
++		    (fp = fopen(name, WRITE_BINARY)) == NULL)
++			error("Cannot extract", name);
++		errno = 0;
++	}
++	return fp;
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++adjust_info(name, hdr)
++	char           *name;
++	LzHeader       *hdr;
++{
++	time_t          utimebuf[2];
++
++	/* adjust file stamp */
++	utimebuf[0] = utimebuf[1] = hdr->unix_last_modified_stamp;
++
++	if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_SYMLINK)
++		utime(name, utimebuf);
++
++	if (hdr->extend_type == EXTEND_UNIX
++	    || hdr->extend_type == EXTEND_OS68K
++	    || hdr->extend_type == EXTEND_XOSK) {
++#ifdef NOT_COMPATIBLE_MODE
++		Please need your modification in this space.
++#else
++		if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_SYMLINK)
++			chmod(name, hdr->unix_mode);
++#endif
++		if (!getuid()) {
++#ifndef HAVE_NO_LCHOWN
++			if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK)
++				lchown(name, hdr->unix_uid, hdr->unix_gid);
++			else
++#endif /* HAVE_NO_LCHWON */
++				chown(name, hdr->unix_uid, hdr->unix_gid);
++		}
++		errno = 0;
++	}
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++extract_one(afp, hdr)
++	FILE           *afp;	/* archive file */
++	LzHeader       *hdr;
++{
++	FILE           *fp;	/* output file */
++	struct stat     stbuf;
++	char            name[257];
++	int             crc;
++	int             method;
++	boolean         save_quiet, save_verbose, up_flag;
++	char           *q = hdr->name, c;
++
++	if (ignore_directory && rindex(hdr->name, '/')) {
++		q = (char *) rindex(hdr->name, '/') + 1;
++	}
++	else {
++		if (*q == '/') {
++			q++;
++			/*
++			 * if OSK then strip device name
++			 */
++			if (hdr->extend_type == EXTEND_OS68K
++			    || hdr->extend_type == EXTEND_XOSK) {
++				do
++					c = (*q++);
++				while (c && c != '/');
++				if (!c || !*q)
++					q = ".";	/* if device name only */
++			}
++		}
++	}
++
++	if (extract_directory)
++		sprintf(name, "%s/%s", extract_directory, q);
++	else
++		strcpy(name, q);
++
++
++	/* LZHDIRS_METHOD¤ò»ý¤Ä¥Ø¥Ã¥À¤ò¥Á¥§¥Ã¥¯¤¹¤ë */
++	/* 1999.4.30 t.okamoto */
++	for (method = 0;; method++) {
++		if (methods[method] == NULL) {
++			error("Unknown method skiped ...", name);
++			return;
++		}
++		if (bcmp(hdr->method, methods[method], 5) == 0)
++			break;
++	}
++
++	if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_REGULAR
++		&& method != LZHDIRS_METHOD_NUM) {
++#if 0
++		for (method = 0;; method++) {
++			if (methods[method] == NULL) {
++				error("Unknown method skiped ...", name);
++				return;
++			}
++			if (bcmp(hdr->method, methods[method], 5) == 0)
++				break;
++		}
++#endif
++
++		reading_filename = archive_name;
++		writting_filename = name;
++		if (output_to_stdout || verify_mode) {
++			if (noexec) {
++				printf("%s %s\n", verify_mode ? "VERIFY" : "EXTRACT", name);
++				if (afp == stdin) {
++					int             i = hdr->packed_size;
++					while (i--)
++						fgetc(afp);
++				}
++				return;
++			}
++
++			save_quiet = quiet;
++			save_verbose = verbose;
++			if (!quiet && output_to_stdout) {
++				printf("::::::::\n%s\n::::::::\n", name);
++				quiet = TRUE;
++				verbose = FALSE;
++			}
++			else if (verify_mode) {
++				quiet = FALSE;
++				verbose = TRUE;
++			}
++
++			crc = decode_lzhuf
++				(afp, stdout, hdr->original_size, hdr->packed_size, name, method);
++			quiet = save_quiet;
++			verbose = save_verbose;
++		}
++		else {
++			if (skip_flg == FALSE)  {
++				up_flag = inquire_extract(name);
++				if (up_flag == FALSE && force == FALSE) {
++					return;
++				}
++			}
++
++			if (skip_flg == TRUE) {	/* if skip_flg */
++				if (stat(name, &stbuf) == 0 && force != TRUE) {
++					if (stbuf.st_mtime >= hdr->unix_last_modified_stamp) {
++						if (quiet != TRUE)
++							printf("%s : Skipped...\n", name);
++						return;
++					}
++				}
++			}
++			if (noexec) {
++				if (afp == stdin) {
++					int i = hdr->packed_size;
++					while (i--)
++						fgetc(afp);
++				}
++				return;
++			}
++
++			signal(SIGINT, interrupt);
++			signal(SIGHUP, interrupt);
++
++			unlink(name);
++			errno = 0;
++			remove_extracting_file_when_interrupt = TRUE;
++
++			if ((fp = open_with_make_path(name)) != NULL) {
++				crc = decode_lzhuf
++					(afp, fp, hdr->original_size, hdr->packed_size, name, method);
++				fclose(fp);
++			}
++			remove_extracting_file_when_interrupt = FALSE;
++			signal(SIGINT, SIG_DFL);
++			signal(SIGHUP, SIG_DFL);
++
++			if (!fp)
++				return;
++		}
++
++		errno = 0;
++		if (hdr->has_crc && crc != hdr->crc)
++			error("CRC error", name);
++	}
++	else if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_DIRECTORY
++			 || (hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK
++			 || method == LZHDIRS_METHOD_NUM) {
++		/* ¢¬¤³¤ì¤Ç¡¢Symblic Link ¤Ï¡¢Âç¾æÉפ«¡© */
++		if (!ignore_directory && !verify_mode) {
++			if (noexec) {
++				if (quiet != TRUE)
++					printf("EXTRACT %s (directory)\n", name);
++				return;
++			}
++			/* NAME has trailing SLASH '/', (^_^) */
++			if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK) {
++				char            buf[256], *bb1, *bb2;
++				int             l_code;
++				strcpy(buf, name);
++				bb1 = strtok(buf, "|");
++				bb2 = strtok(NULL, "|");
++
++#ifdef S_IFLNK
++				if (skip_flg == FALSE)  {
++					up_flag = inquire_extract(name);
++					if (up_flag == FALSE && force == FALSE) {
++						return;
++					}
++				} else {
++					if (GETSTAT(bb1, &stbuf) == 0 && force != TRUE) {
++						if (stbuf.st_mtime >= hdr->unix_last_modified_stamp) {
++							if (quiet != TRUE)
++								printf("%s : Skipped...\n", bb1);
++							return;
++						}
++					}
++				}
++
++				unlink(bb1);
++				l_code = symlink(bb2, bb1);
++				if (l_code < 0) {
++					if (quiet != TRUE)
++						warning("Can't make Symbolic Link : ");
++				}
++				if (quiet != TRUE) {
++					printf("Symbolic Link %s -> %s\n", bb1, bb2);
++				}
++				strcpy(name, bb1);	/* Symbolic's name set */
++#else
++				sprintf(buf, "%s -> %s", bb1, bb2);
++				warning("Can't make Symbolic Link", buf);
++				return;
++#endif
++			} else { /* make directory */
++				if (!output_to_stdout && !make_parent_path(name))
++					return;
++			}
++		}
++	}
++	else {
++		error("Unknown information", name);
++	}
++
++	if (!output_to_stdout)
++		adjust_info(name, hdr);
++}
++
++/* ------------------------------------------------------------------------ */
++/* EXTRACT COMMAND MAIN														*/
++/* ------------------------------------------------------------------------ */
++void
++cmd_extract()
++{
++	LzHeader        hdr;
++	long            pos;
++	FILE           *afp;
++
++	/* open archive file */
++	if ((afp = open_old_archive()) == NULL)
++		fatal_error(archive_name);
++
++	if (archive_is_msdos_sfx1(archive_name))
++		skip_msdos_sfx1_code(afp);
++
++	/* extract each files */
++	while (get_header(afp, &hdr)) {
++		if (need_file(hdr.name)) {
++			pos = ftell(afp);
++			extract_one(afp, &hdr);
++			fseek(afp, pos + hdr.packed_size, SEEK_SET);
++		} else {
++			if (afp != stdin)
++				fseek(afp, hdr.packed_size, SEEK_CUR);
++			else {
++				int             i = hdr.packed_size;
++				while (i--)
++					fgetc(afp);
++			}
++		}
++	}
++
++	/* close archive file */
++	fclose(afp);
++
++	return;
++}
++
++/* Local Variables: */
++/* mode:c */
++/* tab-width:4 */
++/* End: */
+--- lha-1.14i.orig/debian/org/lha_macro.h
++++ lha-1.14i/debian/org/lha_macro.h
+@@ -0,0 +1,420 @@
++/* ------------------------------------------------------------------------ */
++/* LHa for UNIX    Archiver Driver	macro define							*/
++/*																			*/
++/*		Modified          		Nobutaka Watazaki							*/
++/*																			*/
++/*	Ver. 1.14	Soruce All chagned				1995.01.14	N.Watazaki		*/
++/*	Ver. 1.14g	modified   						2000.05.06	T.OKAMOTO		*/
++/* ------------------------------------------------------------------------ */
++
++#define LHA_VERSION "lha for unix version 1.14i"
++
++/* Most of System V, define SYSTIME_HAS_NO_TM */
++#ifdef	SYSTIME_HAS_NO_TM
++#include <time.h>
++#else
++#include <sys/time.h>
++#endif	/* SYSTIME_HAS_NO_TM */
++
++/* ------------------------------------------------------------------------ */
++/*	Directory Access Stuff													*/
++/* ------------------------------------------------------------------------ */
++#ifndef NODIRECTORY
++#ifdef SYSV_SYSTEM_DIR
++
++#include <dirent.h>
++
++#define DIRENTRY	struct dirent
++#define NAMLEN(p)	strlen (p->d_name)
++
++#else	/* not SYSV_SYSTEM_DIR */
++
++#ifdef NONSYSTEM_DIR_LIBRARY
++#include "lhdir.h"
++#else
++#include <sys/dir.h>
++#endif	/* not NONSYSTEM_DIR_LIBRARY */
++
++#define DIRENTRY		struct direct
++#define NAMLEN(p)		p->d_namlen
++
++#endif	/* not SYSV_SYSTEM_DIR */
++#endif  /* NODIRECTORY */
++
++/* ------------------------------------------------------------------------ */
++/*	Other Define															*/
++/* ------------------------------------------------------------------------ */
++/* Not support 'void' */
++#ifdef NOVOID
++#define void
++#endif
++
++#ifndef SEEK_SET
++#define SEEK_SET		0
++#define SEEK_CUR		1
++#define SEEK_END		2
++#endif	/* SEEK_SET
++
++
++/* non-integral functions */
++extern struct tm *localtime();
++extern char    *getenv();
++
++#ifndef _MINIX
++#ifndef __STDC__
++extern char    *malloc();
++extern char    *realloc();
++#endif
++#endif
++
++/* external variables */
++extern int      errno;
++
++#define	FALSE			0
++#define TRUE			1
++typedef int				boolean;
++
++/* used by qsort() for alphabetic-sort */
++#define STRING_COMPARE(a,b)		strcmp((a),(b))
++
++#define FILENAME_LENGTH	1024
++
++/* ------------------------------------------------------------------------ */
++/* YOUR CUSTOMIZIES															*/
++/* ------------------------------------------------------------------------ */
++
++#ifndef ARCHIVENAME_EXTENTION
++#define ARCHIVENAME_EXTENTION	".lzh"
++#endif
++#ifndef BACKUPNAME_EXTENTION
++#define BACKUPNAME_EXTENTION	".bak"
++#endif
++#ifndef TMP_FILENAME_TEMPLATE
++#define TMP_FILENAME_TEMPLATE	"/tmp/lhXXXXXX"
++#endif
++
++#define SJC_FIRST_P(c)			\
++  (((unsigned char)(c) >= 0x80) &&	\
++   (((unsigned char)(c) < 0xa0) ||	\
++    ((unsigned char)(c) >= 0xe0) &&	\
++    ((unsigned char)(c) < 0xfd)))
++#define SJC_SECOND_P(c)			\
++  (((unsigned char)(c) >= 0x40) &&	\
++   ((unsigned char)(c) < 0xfd) &&	\
++   ((unsigned char)(c) != 0x7f))
++
++#ifdef MULTIBYTE_CHAR
++#define MULTIBYTE_FIRST_P	SJC_FIRST_P
++#define MULTIBYTE_SECOND_P	SJC_SECOND_P
++#endif				/* MULTIBYTE_CHAR */
++
++/* ------------------------------------------------------------------------ */
++/*	LHa File Definitions													*/
++/* ------------------------------------------------------------------------ */
++#ifdef S_IFLNK
++#define GETSTAT lstat
++#else
++#define GETSTAT stat
++#endif
++
++#ifdef LHA_MAIN_SRC
++#define EXTERN
++#else
++#define EXTERN				extern
++#endif	/* LHA_MAIN_SRC */
++
++#define LZHUFF0_METHOD			"-lh0-"
++#define LZHUFF1_METHOD			"-lh1-"
++#define LZHUFF2_METHOD			"-lh2-"
++#define LZHUFF3_METHOD			"-lh3-"
++#define LZHUFF4_METHOD			"-lh4-"
++#define LZHUFF5_METHOD			"-lh5-"
++#define LZHUFF6_METHOD			"-lh6-"
++#define LZHUFF7_METHOD			"-lh7-"
++#define LARC_METHOD				"-lzs-"
++#define LARC5_METHOD			"-lz5-"
++#define LARC4_METHOD			"-lz4-"
++#define LZHDIRS_METHOD			"-lhd-"
++
++#define METHOD_TYPE_STRAGE		5
++
++/* Added N.Watazaki ..V */
++#define LZHUFF0_METHOD_NUM		0
++#define LZHUFF1_METHOD_NUM		1
++#define LZHUFF2_METHOD_NUM		2
++#define LZHUFF3_METHOD_NUM		3
++#define LZHUFF4_METHOD_NUM		4
++#define LZHUFF5_METHOD_NUM		5
++#define LZHUFF6_METHOD_NUM		6
++#define LZHUFF7_METHOD_NUM		7
++#define LARC_METHOD_NUM			8
++#define LARC5_METHOD_NUM		9
++#define LARC4_METHOD_NUM		10
++#define LZHDIRS_METHOD_NUM		11
++/* Added N.Watazaki ..^ */
++
++#define I_HEADER_SIZE			0
++#define I_HEADER_CHECKSUM		1
++#define I_METHOD				2
++#define I_PACKED_SIZE			7
++#define I_ORIGINAL_SIZE			11
++#define I_LAST_MODIFIED_STAMP	15
++#define I_ATTRIBUTE				19
++#define I_HEADER_LEVEL			20
++#define I_NAME_LENGTH			21
++#define I_NAME					22
++
++#define I_CRC						22	/* + name_length */
++#define I_EXTEND_TYPE				24	/* + name_length */
++#define I_MINOR_VERSION				25	/* + name_length */
++#define I_UNIX_LAST_MODIFIED_STAMP	26	/* + name_length */
++#define I_UNIX_MODE					30	/* + name_length */
++#define I_UNIX_UID					32	/* + name_length */
++#define I_UNIX_GID					34	/* + name_length */
++#define I_UNIX_EXTEND_BOTTOM		36	/* + name_length */
++
++#define I_GENERIC_HEADER_BOTTOM		I_EXTEND_TYPE
++
++#define EXTEND_GENERIC			0
++#define EXTEND_UNIX				'U'
++#define EXTEND_MSDOS			'M'
++#define EXTEND_MACOS			'm'
++#define EXTEND_OS9				'9'
++#define EXTEND_OS2				'2'
++#define EXTEND_OS68K			'K'
++#define EXTEND_OS386			'3'	/* OS-9000??? */
++#define EXTEND_HUMAN			'H'
++#define EXTEND_CPM				'C'
++#define EXTEND_FLEX				'F'
++#define EXTEND_RUNSER			'R'
++
++/* this OS type is not official */
++
++#define EXTEND_TOWNSOS			'T'
++#define EXTEND_XOSK				'X'
++
++/*---------------------------------------------------------------------------*/
++
++#define GENERIC_ATTRIBUTE				0x20
++#define GENERIC_DIRECTORY_ATTRIBUTE		0x10
++#define HEADER_LEVEL0					0x00
++#define HEADER_LEVEL1					0x01
++#define HEADER_LEVEL2					0x02
++
++#define CURRENT_UNIX_MINOR_VERSION		0x00
++
++#define DELIM		('/')
++#define DELIM2		(0xff)
++#define DELIMSTR	"/"
++
++#define OSK_RW_RW_RW			0000033
++#define OSK_FILE_REGULAR		0000000
++#define OSK_DIRECTORY_PERM		0000200
++#define OSK_SHARED_PERM			0000100
++#define OSK_OTHER_EXEC_PERM		0000040
++#define OSK_OTHER_WRITE_PERM	0000020
++#define OSK_OTHER_READ_PERM		0000010
++#define OSK_OWNER_EXEC_PERM		0000004
++#define OSK_OWNER_WRITE_PERM	0000002
++#define OSK_OWNER_READ_PERM		0000001
++
++#define UNIX_FILE_TYPEMASK		0170000
++#define UNIX_FILE_REGULAR		0100000
++#define UNIX_FILE_DIRECTORY		0040000
++#define UNIX_FILE_SYMLINK		0120000
++#define UNIX_SETUID				0004000
++#define UNIX_SETGID				0002000
++#define UNIX_STYCKYBIT			0001000
++#define UNIX_OWNER_READ_PERM	0000400
++#define UNIX_OWNER_WRITE_PERM	0000200
++#define UNIX_OWNER_EXEC_PERM	0000100
++#define UNIX_GROUP_READ_PERM	0000040
++#define UNIX_GROUP_WRITE_PERM	0000020
++#define UNIX_GROUP_EXEC_PERM	0000010
++#define UNIX_OTHER_READ_PERM	0000004
++#define UNIX_OTHER_WRITE_PERM	0000002
++#define UNIX_OTHER_EXEC_PERM	0000001
++#define UNIX_RW_RW_RW			0000666
++
++#define LZHEADER_STRAGE			4096
++
++#define MAX_INDICATOR_COUNT		64
++
++typedef short   				node;
++
++/* ------------------------------------------------------------------------ */
++/*	Slide relation															*/
++/* ------------------------------------------------------------------------ */
++#if defined(__STDC__) || defined(AIX)
++
++#include <limits.h>
++
++#else
++
++#ifndef CHAR_BIT
++#define CHAR_BIT  8
++#endif
++
++#ifndef UCHAR_MAX
++#define UCHAR_MAX				((1<<(sizeof(unsigned char)*8))-1)
++#endif
++
++#ifndef USHRT_MAX
++#define USHRT_MAX				((1<<(sizeof(unsigned short)*8))-1)
++#endif
++
++#ifndef SHRT_MAX
++#define SHRT_MAX				((1<<(sizeof(short)*8-1))-1)
++#endif
++
++#ifndef SHRT_MIN
++#define SHRT_MIN				(SHRT_MAX-USHRT_MAX)
++#endif
++
++#ifndef ULONG_MAX
++#define ULONG_MAX	((1<<(sizeof(unsigned long)*8))-1)
++#endif
++
++#ifndef LONG_MAX
++#define LONG_MAX	((1<<(sizeof(long)*8-1))-1)
++#endif
++
++#ifndef LONG_MIN
++#define LONG_MIN	(LONG_MAX-ULONG_MAX)
++#endif
++
++#endif	/* not __STDC__ */
++
++/* ------------------------------------------------------------------------ */
++/*	FILE Attribute															*/
++/* ------------------------------------------------------------------------ */
++#define is_directory(statp)		(((statp)->st_mode & S_IFMT) == S_IFDIR)
++#define is_symlink(statp)		(((statp)->st_mode & S_IFMT) == S_IFLNK)
++#define is_regularfile(statp)	(((statp)->st_mode & S_IFMT) == S_IFREG)
++
++#ifdef MSDOS
++#define WRITE_BINARY	"wb"
++#define READ_BINARY		"rb"
++#else
++#define WRITE_BINARY	"w"
++#define READ_BINARY		"r"
++#endif
++
++/* ------------------------------------------------------------------------ */
++/*	Memory and String function												*/
++/* ------------------------------------------------------------------------ */
++#include <string.h>
++
++#ifdef NOINDEX
++#define index			strchr
++#define rindex			strrchr
++#endif	/* NOINDEX */
++
++#ifdef NOBSTRING
++#define bcmp(a,b,n)		memcmp ((a),(b),(n))
++#define bzero(d,n)		memset((d),0,(n))
++#define bcopy(s,d,n)	memmove((d),(s),(n))
++#endif	/* NOBSTRING */
++
++#ifdef USESTRCASECMP
++#define strucmp(p,q)	strcasecmp((p),(q))
++#endif
++
++/* ------------------------------------------------------------------------ */
++/* Individual macro define													*/
++/* ------------------------------------------------------------------------ */
++
++/* from crcio.c */
++#define CRCPOLY			0xA001		/* CRC-16 */
++#define UPDATE_CRC(c)	crc = crctable[(crc ^ (c)) & 0xFF] ^ (crc >> CHAR_BIT)
++
++/* dhuf.c */
++#define N_CHAR      (256 + 60 - THRESHOLD + 1)
++#define TREESIZE_C  (N_CHAR * 2)
++#define TREESIZE_P  (128 * 2)
++#define TREESIZE    (TREESIZE_C + TREESIZE_P)
++#define ROOT_C      0
++#define ROOT_P      TREESIZE_C
++
++/* header.c */
++#define setup_get(PTR)	(get_ptr = (PTR))
++#define get_byte()		(*get_ptr++ & 0xff)
++#define put_ptr			get_ptr
++#define setup_put(PTR)	(put_ptr = (PTR))
++#define put_byte(c)		(*put_ptr++ = (char)(c))
++
++/* huf.c */
++#define NP			(MAX_DICBIT + 1)
++#define NT			(USHRT_BIT + 3)
++#if 0
++#define PBIT		4		/* smallest integer such that (1 << PBIT) > * NP */
++#define TBIT 		5		/* smallest integer such that (1 << TBIT) > * NT */
++#endif
++
++#define PBIT		5		/* smallest integer such that (1 << PBIT) > * NP */
++#define TBIT 		5		/* smallest integer such that (1 << TBIT) > * NT */
++
++#define NC 			(UCHAR_MAX + MAXMATCH + 2 - THRESHOLD)
++
++/*		#if NT > NP #define NPT NT #else #define NPT NP #endif	*/
++#define NPT			0x80
++
++/* larc.c */
++#define MAGIC0		18
++#define MAGIC5		19
++
++/* lharc.c */
++#define CMD_UNKNOWN	0
++#define CMD_EXTRACT	1
++#define CMD_ADD		2
++#define CMD_LIST	3
++#define CMD_DELETE	4
++
++#define STREQU(a,b)	(((a)[0] == (b)[0]) ? (strcmp ((a),(b)) == 0) : FALSE)
++
++/* shuf.c */
++#define N1			286				/* alphabet size */
++#define N2			(2 * N1 - 1)	/* # of nodes in Huffman tree */
++#define EXTRABITS	8				/* >= log2(F-THRESHOLD+258-N1) */
++#define BUFBITS		16				/* >= log2(MAXBUF) */
++#define LENFIELD	4				/* bit size of length field for tree output */
++
++/* util.c */
++#define BUFFERSIZE	2048
++#define MAXSFXCODE	1024*64
++
++#ifndef NULL
++#define NULL		(char *)0
++#endif
++
++/* slide.c */
++/*
++#define PERCOLATE  1
++#define NIL        0
++#define HASH(p, c) ((p) + ((c) << hash1) + hash2)
++*/
++
++/* slide.c */
++#ifdef SUPPORT_LH7
++#define MAX_DICBIT			16      /* lh7 use 16bits */
++#endif
++
++#ifndef SUPPORT_LH7
++#define MAX_DICBIT			15      /* lh6 use 15bits */
++#endif
++
++#define MAX_DICSIZ			(1 << MAX_DICBIT)
++#define MATCHBIT			8	/* bits for MAXMATCH - THRESHOLD */
++#define MAXMATCH			256	/* formerly F (not more than UCHAR_MAX + 1) */
++#define THRESHOLD			3	/* choose optimal value */
++
++/* from huf.c */
++
++/* alphabet = {0, 1, 2, ..., NC - 1} */
++#define CBIT				9	/* $\lfloor \log_2 NC \rfloor + 1$ */
++#define USHRT_BIT			16	/* (CHAR_BIT * sizeof(ushort)) */
++
++/* Local Variables: */
++/* mode:c */
++/* tab-width:4 */
++/* End: */
+--- lha-1.14i.orig/debian/org/lhlist.c
++++ lha-1.14i/debian/org/lhlist.c
+@@ -0,0 +1,348 @@
++/* ------------------------------------------------------------------------ */
++/* LHa for UNIX    															*/
++/*				lhlist.c -- LHarc list										*/
++/*																			*/
++/*		Copyright (C) MCMLXXXIX Yooichi.Tagawa								*/
++/*		Modified          		Nobutaka Watazaki							*/
++/*																			*/
++/*  Ver. 0.00	Original						1988.05.23  Y.Tagawa		*/
++/*  Ver. 1.00	Fixed							1989.09.22  Y.Tagawa		*/
++/*  Ver. 1.01	Bug Fix for month name			1989.12.25  Y.Tagawa		*/
++/*  Ver. 1.10	Changed list format				1993.10.01	N.Watazaki		*/
++/*	Ver. 1.14	Source All chagned				1995.01.14	N.Watazaki		*/
++/*	Ver. 1.14e	Bug Fix for many problems		1999.05.25  T.Okamoto       */
++/* ------------------------------------------------------------------------ */
++#include "lha.h"
++
++/* ------------------------------------------------------------------------ */
++static long     packed_size_total;
++static long     original_size_total;
++static int      list_files;
++
++/* ------------------------------------------------------------------------ */
++/* Print Stuff																*/
++/* ------------------------------------------------------------------------ */
++/* need 14 or 22 (when verbose_listing is TRUE) column spaces */
++static void
++print_size(packed_size, original_size)
++	long            packed_size, original_size;
++{
++	if (verbose_listing)
++		printf("%7d ", packed_size);
++
++	printf("%7d ", original_size);
++
++	if (original_size == 0L)
++		printf("******");
++	else	/* Changed N.Watazaki */
++		printf("%5.1f%%", packed_size * 100.0 / original_size);
++}
++
++/* ------------------------------------------------------------------------ */
++/* need 12 or 17 (when verbose_listing is TRUE) column spaces */
++static void
++print_stamp(t)
++	time_t          t;
++{
++	static boolean  got_now = FALSE;
++	static time_t   now;
++	static unsigned int threshold;
++	static char     t_month[12 * 3 + 1] = "JanFebMarAprMayJunJulAugSepOctNovDec";
++	struct tm      *p;
++
++	if (t == 0) {
++		printf("            ");	/* 12 spaces */
++		return;
++	}
++
++	if (!got_now) {
++		now = time((time_t *) 0);
++		p = localtime(&now);
++		threshold = p->tm_year * 12 + p->tm_mon - 6;
++		got_now = TRUE;
++	}
++
++	p = localtime(&t);
++
++	if (p->tm_year * 12 + p->tm_mon > threshold)
++		printf("%.3s %2d %02d:%02d",
++		&t_month[p->tm_mon * 3], p->tm_mday, p->tm_hour, p->tm_min);
++	else
++		printf("%.3s %2d  %04d",
++		    &t_month[p->tm_mon * 3], p->tm_mday, p->tm_year + 1900);
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++print_bar()
++{
++	char           *p, *q;
++	/* 17+1+(0 or 7+1)+7+1+6+1+(0 or 1+4)+(12 or 17)+1+20 */
++	/* 12345678901234567_  1234567_123456  _123456789012   1234 */
++
++	if (verbose_listing) {
++		p = "- ------ ---------- ";
++		q = " -------------";
++	}
++	else {
++		p = " ";
++		q = " --------------------";
++	}
++
++	if (verbose)
++		q = "";
++
++	printf("---------- ----------- ------- ------%s------------%s\n", p, q);
++}
++
++/* ------------------------------------------------------------------------ */
++/*																			*/
++/* ------------------------------------------------------------------------ */
++static void
++list_header()
++{
++	char           *p, *q;
++
++	if (verbose_listing) {
++		p = "PACKED    SIZE  RATIO METHOD CRC";
++		q = "          NAME";
++	}
++	else {
++		p = "  SIZE  RATIO";
++		q = "           NAME";
++	}
++
++	if (verbose)
++		q = "";
++
++	printf(" PERMSSN    UID  GID    %s     STAMP%s\n", p, q);
++#if 0
++	printf(" PERMSSN  UID GID %s   SIZE  RATIO%s %s    STAMP%s%s\n",
++	       verbose_listing ? " PACKED " : "",	/* 8,0 */
++	       verbose_listing ? "  CRC" : "",	/* 5,0 */
++	       verbose_listing ? "  " : "",	/* 2,0 */
++	       verbose_listing ? "      " : "   ",	/* 6,3 */
++	       verbose ? "" : " NAME");
++#endif
++	print_bar();
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++list_one(hdr)
++	register LzHeader *hdr;
++{
++	register int    mode;
++	register char  *p;
++	char            method[6];
++	char modebits[11];
++
++	if (verbose)
++		printf("%s\n", hdr->name);
++
++	strncpy(method, hdr->method, 5);
++	method[5] = '\0';
++
++	switch (mode = hdr->extend_type) {
++	case EXTEND_UNIX:
++		mode = hdr->unix_mode;
++
++		if (mode & UNIX_FILE_DIRECTORY)
++			modebits[0] = 'd';
++		else if ((mode & UNIX_FILE_SYMLINK) == UNIX_FILE_SYMLINK)
++			modebits[0] = 'l';
++		else
++			modebits[0] = '-';
++		modebits[1] = ((mode & UNIX_OWNER_READ_PERM) ? 'r' : '-');
++		modebits[2] = ((mode & UNIX_OWNER_WRITE_PERM) ? 'w' : '-');
++		modebits[3] = (mode & UNIX_SETUID) ? 's' :
++			((mode & UNIX_OWNER_EXEC_PERM) ? 'x' : '-');
++		modebits[4] = ((mode & UNIX_GROUP_READ_PERM) ? 'r' : '-');
++		modebits[5] = ((mode & UNIX_GROUP_WRITE_PERM) ? 'w' : '-');
++		modebits[6] = (mode & UNIX_SETGID) ? 's' :
++			((mode & UNIX_GROUP_EXEC_PERM) ? 'x' : '-');
++		modebits[7] = ((mode & UNIX_OTHER_READ_PERM) ? 'r' : '-');
++		modebits[8] = ((mode & UNIX_OTHER_WRITE_PERM) ? 'w' : '-');
++		modebits[9] = (mode & UNIX_STYCKYBIT) ? 't' :
++			((mode & UNIX_OTHER_EXEC_PERM) ? 'x' : '-');
++		modebits[10] = 0;
++
++		printf("%s %5d/%-5d ", modebits,
++		       hdr->unix_uid, hdr->unix_gid);
++		break;
++	case EXTEND_OS68K:
++	 /**/ case EXTEND_XOSK:/**/
++		mode = hdr->unix_mode;
++		printf("%c%c%c%c%c%c%c%c %5d/%-5d",
++		       ((mode & OSK_DIRECTORY_PERM) ? 'd' : '-'),
++		       ((mode & OSK_SHARED_PERM) ? 's' : '-'),
++		       ((mode & OSK_OTHER_EXEC_PERM) ? 'e' : '-'),
++		       ((mode & OSK_OTHER_WRITE_PERM) ? 'w' : '-'),
++		       ((mode & OSK_OTHER_READ_PERM) ? 'r' : '-'),
++		       ((mode & OSK_OWNER_EXEC_PERM) ? 'e' : '-'),
++		       ((mode & OSK_OWNER_WRITE_PERM) ? 'w' : '-'),
++		       ((mode & OSK_OWNER_READ_PERM) ? 'r' : '-'),
++		       hdr->unix_uid, hdr->unix_gid);
++		break;
++	default:
++		switch (hdr->extend_type) {	/* max 18 characters */
++		case EXTEND_GENERIC:
++			p = "[generic]";
++			break;
++		case EXTEND_CPM:
++			p = "[CP/M]";
++			break;
++		case EXTEND_FLEX:
++			p = "[FLEX]";
++			break;
++		case EXTEND_OS9:
++			p = "[OS-9]";
++			break;
++		case EXTEND_OS68K:
++			p = "[OS-9/68K]";
++			break;
++		case EXTEND_MSDOS:
++			p = "[MS-DOS]";
++			break;
++		case EXTEND_MACOS:
++			p = "[Mac OS]";
++			break;
++		case EXTEND_OS2:
++			p = "[OS/2]";
++			break;
++		case EXTEND_HUMAN:
++			p = "[Human68K]";
++			break;
++		case EXTEND_OS386:
++			p = "[OS-386]";
++			break;
++		case EXTEND_RUNSER:
++			p = "[Runser]";
++			break;
++#ifdef EXTEND_TOWNSOS
++			/* This ID isn't fixed */
++		case EXTEND_TOWNSOS:
++			p = "[TownsOS]";
++			break;
++#endif
++			/* Ouch!  Please customize it's ID.  */
++		default:
++			p = "[unknown]";
++			break;
++		}
++		printf("%-23.23s", p);
++		break;
++	}
++
++	print_size(hdr->packed_size, hdr->original_size);
++
++	if (verbose_listing)
++		if (hdr->has_crc)
++			printf(" %s %04x", method, hdr->crc);
++		else
++			printf(" %s ****", method);
++
++	printf(" ");
++	print_stamp(hdr->unix_last_modified_stamp);
++
++	if (!verbose)
++		if ((mode & UNIX_FILE_SYMLINK) != UNIX_FILE_SYMLINK)
++			printf(" %s", hdr->name);
++		else {
++			char            buf[256], *b1, *b2;
++			strcpy(buf, hdr->name);
++			b1 = strtok(buf, "|");
++			b2 = strtok(NULL, "|");
++			printf(" %s -> %s", b1, b2);
++		}
++
++	if (verbose)
++		printf(" [%d]", hdr->header_level);
++	printf("\n");
++
++}
++
++/* ------------------------------------------------------------------------ */
++static void
++list_tailer()
++{
++	struct stat     stbuf;
++
++	print_bar();
++
++	printf(" Total %9d file%c ",
++	       list_files, (list_files == 1) ? ' ' : 's');
++	print_size(packed_size_total, original_size_total);
++	printf(" ");
++
++	if (verbose_listing)
++		printf("           ");
++
++	if (stat(archive_name, &stbuf) < 0)
++		print_stamp((time_t) 0);
++	else
++		print_stamp(stbuf.st_mtime);
++
++	printf("\n");
++}
++
++/* ------------------------------------------------------------------------ */
++/* LIST COMMAND MAIN														*/
++/* ------------------------------------------------------------------------ */
++void
++cmd_list()
++{
++	FILE           *afp;
++	LzHeader        hdr;
++	int             i;
++
++	/* initialize total count */
++	packed_size_total = 0L;
++	original_size_total = 0L;
++	list_files = 0;
++
++	/* open archive file */
++	if ((afp = open_old_archive()) == NULL) {
++		error(archive_name, "");
++		exit(1);
++	}
++	if (archive_is_msdos_sfx1(archive_name))
++		skip_msdos_sfx1_code(afp);
++
++	/* print header message */
++	if (!quiet)
++		list_header();
++
++	/* print each file information */
++	while (get_header(afp, &hdr)) {
++		if (need_file(hdr.name)) {
++			list_one(&hdr);
++			list_files++;
++			packed_size_total += hdr.packed_size;
++			original_size_total += hdr.original_size;
++		}
++
++		if (afp != stdin)
++			fseek(afp, hdr.packed_size, SEEK_CUR);
++		else {
++			i = hdr.packed_size;
++			while (i--)
++				fgetc(afp);
++		}
++	}
++
++	/* close archive file */
++	fclose(afp);
++
++	/* print tailer message */
++	if (!quiet)
++		list_tailer();
++
++	return;
++}
++
++/* Local Variables: */
++/* mode:c */
++/* tab-width:4 */
++/* compile-command:"gcc -c lhlist.c" */
++/* End: */
+--- lha-1.14i.orig/debian/changelog
++++ lha-1.14i/debian/changelog
+@@ -0,0 +1,178 @@
++lha (1.14i-10.1) unstable; urgency=high
++
++  * Security NMU for vulnerabilities inherited from GNU Gzip:
++    [CVE-2006-4335 CVE-2006-4337 CVE-2006-4338]
++
++ -- Moritz Muehlenhoff <jmm@debian.org>  Wed, 13 Dec 2006 20:21:32 +0100
++
++lha (1.14i-10) unstable; urgency=high
++
++  * debian/patch.redhat-sec2: Add one more security patch to fix:
++      - CAN-2004-0771 (-w working directory option buffer overflow)
++        http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0771
++      - CAN-2004-0769 (buffer overflow can be executed arbitrary code
++        via long pathnames in headers, another issue of bug fixed in -9)
++        http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0769
++      - CAN-2004-0745 (execute arbitrary commands via a directory with
++        shell metacharacters in its name.)
++        http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0745
++      - CAN-2004-0694 (reserved number)
++        http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0694
++    taken from RedHat patch.  (Closes: #279870)
++  * man/lha.n: Fix typo "flie" instead of "file".  (Closes: #277545)
++
++ -- GOTO Masanori <gotom@debian.org>  Sat, 13 Nov 2004 15:31:22 +0900
++
++lha (1.14i-9) unstable; urgency=high
++
++  * debian/patch.header-overflow: Add fix another lha buffer overflow
++    problem.  It warns when hitting an archive which includes
++    long directory name with option l, v, x.  See:
++      http://lw.ftw.zamosc.pl/lha-exploit.txt
++      http://www.securityfocus.com/archive/1/363418
++      http://bugs.gentoo.org/show_bug.cgi?id=51285
++    Thanks to Lukasz Wojtow <lw@wszia.edu.pl> for pointing this problem.
++
++ -- GOTO Masanori <gotom@debian.org>  Wed, 16 Jun 2004 09:51:06 +0900
++
++lha (1.14i-8) unstable; urgency=high
++
++  * debian/patch.CAN-2004-0234_0235: Add fix CAN-2004-0235 symlink part
++    patches.  (Closes: #247355, #247357)
++
++ -- GOTO Masanori <gotom@debian.org>  Sat,  8 May 2004 02:24:57 +0900
++
++lha (1.14i-7) unstable; urgency=high
++
++  * debian/patch.CAN-2004-ulf: Add to fix CAN-2004-0234 (buffer overflows),
++    CAN-2004-0235 (directory traversal).  See:
++    http://marc.theaimsgroup.com/?l=full-disclosure&m=108345064008698&w=2
++  * debian/control: Change my mail address.
++
++ -- GOTO Masanori <gotom@debian.org>  Thu,  6 May 2004 15:13:14 +0900
++
++lha (1.14i-6) unstable; urgency=low
++
++  * debian/copyright: Added more copyright license statement, translated
++    by Osamu Aoki <debian@aokiconsulting.com>.
++  * debian/copyright: Added good summary of upstream author, investigated by
++    Osamu Aoki <debian@aokiconsulting.com> and 
++    Tatsuya Kinoshita <tats@iris.ne.jp>.
++  * debian/header-e.doc: Added English version of header.doc (LHa header
++    structure format document) translated by Osamu Aoki
++    <debian@aokiconsulting.com>.
++
++ -- GOTO Masanori <gotom@debian.or.jp>  Tue, 27 Aug 2002 13:08:22 +0900
++
++lha (1.14i-5) unstable; urgency=low
++
++  * debian/patch.multibyte: Add multibyte character mode option 'y'.
++    You can use multibyte filename especially SHIFTJIS code 
++    with this option.
++
++ -- GOTO Masanori <gotom@debian.or.jp>  Fri, 19 Jul 2002 16:57:11 +0900
++
++lha (1.14i-4) unstable; urgency=low
++
++  * debian/copyright: add original/translated license statement
++    (closes: Bug#144582).
++
++ -- GOTO Masanori <gotom@debian.or.jp>  Wed,  1 May 2002 09:53:24 +0900
++
++lha (1.14i-3) unstable; urgency=low
++
++  * fix lha reports a wrong version number (closes: Bug#135199).
++
++ -- GOTO Masanori <gotom@debian.or.jp>  Sun,  3 Mar 2002 21:38:46 +0900
++
++lha (1.14i-2) unstable; urgency=low
++
++  * Applied the patch not to get compiling warning message.
++    Patched by Paul Slootman <paul@wurtel.net>. (Closes: #109634).
++
++ -- GOTO Masanori <gotom@debian.or.jp>  Thu, 23 Aug 2001 00:26:53 +0900
++
++lha (1.14i-1) unstable; urgency=low
++
++  * New upstream release (Closes: #62256).
++  * New maintainer.
++  * Updated Standards-version 3.5.2.
++  * Use build this package with dh_*.
++  * New upstream version is ready for -lh7- format (Closes: #67592).
++  * Japanese manual is now included (Closes: #49245).
++  * Unclosed Bugs (No copyright file is included) 
++    has just re-closed (Closes: #48748).
++
++ -- GOTO Masanori <gotom@debian.or.jp>  Sun, 22 Jul 2001 13:11:50 +0900
++
++lha (1.14e-2) unstable; urgency=low
++
++  * Moved /usr/man/* and /usr/doc/* under /usr/share. Closes: #80759.
++  * Updated Standards-version, fixed lintian warnings.
++
++ -- Steve McIntyre <stevem@chiark.greenend.org.uk>  Sun, 21 Jan 2001 17:35:52 +0000
++
++lha (1.14e-0) unstable; urgency=low
++
++  * New upstream release. Thanks to Jiro Iwamoto <iwamot@maroon.plala.or.jp> for pointing this out.
++
++ -- Steve McIntyre <stevem@chiark.greenend.org.uk>  Sun, 25 Jul 1999 23:05:24 +0100
++
++lha (1.14d-1) unstable; urgency=low
++
++  * Fixed manpage - no need to specify "-b" for command line help. Closes bug #33328.
++
++ -- Steve McIntyre <stevem@chiark.greenend.org.uk>  Sun, 14 Feb 1999 16:24:44 +0000
++
++lha (1.14d-0) unstable; urgency=low
++
++  * New upstream release. Thanks to Tomohiro KUBOTA <kubota@kubota.rcpom.osaka-u.ac.jp> for pointing this out.
++
++ -- Steve McIntyre <stevem@chiark.greenend.org.uk>  Sat, 16 Jan 1999 21:54:37 +0000
++
++lha (1.14c-1) frozen unstable; urgency=low
++
++  * New man page, supplied by Martin Schulze <joey@finlandia.Infodrom.North.DE>. Fixes Bug#27195.
++
++ -- Steve McIntyre <stevem@chiark.greenend.org.uk>  Sun, 18 Oct 1998 13:53:12 +0100
++
++lha (1.14c-0) unstable; urgency=low
++
++  * New upstream release. Thanks to Atsushi KAMOSHIDA <kamop@debian.or.jp> for pointing this out.
++
++ -- Steve McIntyre <stevem@chiark.greenend.org.uk>  Sat, 15 Aug 1998 14:16:19 +0100
++
++lha (1.00-6) unstable; urgency=low
++
++  * New maintainer.
++
++ -- Steve McIntyre <stevem@chiark.greenend.org.uk>  Mon, 12 Jan 1998 00:09:12 +0000
++
++lha (1.00-5) unstable; urgency=low, closes=16756
++
++  * Corrected Standards-Version to 2.3.0.1 (Bug#16756)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Fri, 9 Jan 1998 02:08:03 +0100
++
++lha (1.00-4) unstable; urgency=low
++
++  * Compiled against libc6 (Bug#11696)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Wed, 31 Dec 1997 20:51:38 +0100
++
++lha (1.00-3) unstable; urgency=low
++
++  * Corrected manpage (Bug#7980)
++  
++  * New maintainer address
++
++ -- Martin Schulze <joey@namib.north.de>  Mon, 28 Apr 1997 13:10:10 +0200
++
++lha (1.00-2) unstable; urgency=low
++
++  * Installed ChangeLog files
++  
++  * Converted into new packaging scheme
++
++ -- Martin Schulze <joey@namib.north.de>  Sun, 23 Feb 1997 12:22:13 +0100
++
+--- lha-1.14i.orig/debian/lha.1
++++ lha-1.14i/debian/lha.1
+@@ -0,0 +1,139 @@
++		  .\" lha - LZH un-archiver
++.\" Copyright (c) 1996  Martin Schulze <joey@namib.north.de>
++.\" 
++.\" This manual page 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., 675 Mass Ave, Cambridge, MA 02139, USA.
++.\"
++.\" This manpage is written especially for Debian GNU/Linux.
++.\"
++.\" LHarc    for UNIX  V 1.02  Copyright(C) 1989  Y.Tagawa     
++.\" LHx      for MSDOS V C2.01 Copyright(C) 1990  H.Yoshizaki  
++.\" LHx(arc) for OSK   V 2.01  Modified     1990  Momozou      
++.\" LHa      for UNIX  V 1.00  Copyright(C) 1992  Masaru Oki   
++.\" 
++.\" Additions by Joerg Boehnke <joerg@oggi.oche.de>
++.\" 
++.TH LHA 1 "22 Sept, 1998" "Debian GNU/Linux" "Archiver"
++.SH NAME
++LHa \- LZH un-archiver
++.SH SYNOPSIS
++.B lha
++.B key
++[
++.B -
++]
++.B {axelvudmcp}
++[
++.B qvnfodizg012
++]
++[
++.B w=<dir>
++]
++.I archive_file
++[
++.I flie
++\&.\|.\|. ]
++.br
++.B lha
++.I archive_file
++.SH DESCRIPTION
++The
++.B lha
++program displays or extracts the contents of a LZH archive.
++
++For a list of commands, please refer to the executable.  It will
++display a list of valid commands and modifiers if you omit any
++parameter.
++
++.TP
++commands:
++                           
++.B a
++Add(or replace) to archive
++
++.B x,e
++EXtract from archive
++    
++.B l,v
++List / Verbose List        
++         
++.B u        
++Update newer files to archive  
++
++.B d
++Delete from archive        
++         
++.B m
++Move to archive (means 'ad')   
++
++.B c        
++re-Construct new archive       
++
++.B p        
++Print to STDOUT from archive   
++
++.B t        
++Test file CRC in archive
++
++.TP
++options: 
++                                
++.B q
++quiet                                
++
++.B v
++verbose                              
++
++.B n
++not execute                          
++
++.B f
++force (over write at extract)        
++
++.B t
++FILES are TEXT file                  
++
++.B o 
++use LHarc compatible method (a/u)    
++
++.B w=<dir>
++specify extract directory (x/e) 
++
++.B d
++delete FILES after (a/u/c)           
++
++.B i
++ignore directory path (x/e)          
++
++.B z
++files not compress (a/u)             
++
++.B g  
++[Generic] format (for compatibility) 
++
++.B 0/1/2 
++header level (a/u)                
++
++.B e  
++TEXT code convert from/to EUC        
++
++.B y
++filename multibyte convert
++
++.SH BUGS
++
++This manpage is poor, it really should be improved, but the original
++is in Japanese.
++
++Try lha without any command line arguments to get help
+--- lha-1.14i.orig/debian/rules
++++ lha-1.14i/debian/rules
+@@ -0,0 +1,115 @@
++#!/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=3
++
++configure: configure-stamp
++configure-stamp:
++	dh_testdir
++	# Add here commands to configure the package.
++	
++	patch -p0 < debian/patch.paul
++	patch -p0 < debian/patch.multibyte
++	patch -p0 < debian/patch.CAN-2004-0234_0235
++	patch -p0 < debian/patch.header-overflow
++	patch -p1 < debian/patch.redhat-sec2
++	patch -p1 < debian/patch.CVE-2006-4335-CVE-2006-4337-CVE-2006-4338
++
++	touch configure-stamp
++
++build: configure-stamp build-stamp
++build-stamp:
++	dh_testdir
++
++	# Add here commands to compile the package.
++	$(MAKE)
++	#/usr/bin/docbook-to-man debian/lha.sgml > lha.1
++
++	touch build-stamp
++
++clean:
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp configure-stamp
++
++	# Add here commands to clean up after the build process.
++	-$(MAKE) clean
++
++	# delete copied docs.
++	rm -f MACHINES MACHINES2 PROBLEMS README
++	rm -f header.doc debian/lha.euc.1.gz debian/lha.1.gz
++	cp debian/org/lha.h src/lha.h
++	cp debian/org/header.c src/header.c
++	cp debian/org/lharc.c src/lharc.c
++	cp debian/org/util.c src/util.c
++	cp debian/org/lhext.c src/lhext.c
++	cp debian/org/lhlist.c src/lhlist.c
++	cp debian/org/lha_macro.h src/lha_macro.h
++
++	dh_clean
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	# Add here commands to install the package into debian/lha.
++	# $(MAKE) install BINDIR=$(CURDIR)/debian/lha/usr/bin \
++	#		MANDIR=$(CURDIR)/debian/lha/usr/share/man \
++	#		MANSECT=1
++	install -m 755 src/lha $(CURDIR)/debian/lha/usr/bin
++
++	# Copy the filenames without the .euc extension
++	cp MACHINES.euc MACHINES 
++	cp MACHINES2.euc MACHINES2
++	cp PROBLEMS.euc PROBLEMS 
++	cp README.euc README 
++	cp header.doc.euc header.doc
++
++	gzip -9 -c man/lha.n > debian/lha.euc.1.gz
++	gzip -9 -c debian/lha.1 > debian/lha.1.gz
++	install -m 644 debian/lha.euc.1.gz $(CURDIR)/debian/lha/usr/share/man/ja/man1/lha.1.gz
++	install -m 644 debian/lha.1.gz $(CURDIR)/debian/lha/usr/share/man/man1/lha.1.gz
++
++# Build architecture-independent files here.
++binary-indep: build install
++# We have nothing to do by default.
++
++# Build architecture-dependent files here.
++binary-arch: build install
++	dh_testdir
++	dh_testroot
++#	dh_installdebconf	
++	dh_installdocs
++	dh_installexamples
++	dh_installmenu
++#	dh_installlogrotate
++#	dh_installemacsen
++#	dh_installpam
++#	dh_installmime
++#	dh_installinit
++#	dh_installcron
++#	dh_installman
++#	dh_installinfo
++#	dh_undocumented
++	dh_installchangelogs CHANGES.euc
++	dh_link
++	dh_strip
++	dh_compress
++	dh_fixperms
++#	dh_makeshlibs
++	dh_installdeb
++#	dh_perl
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install configure
+--- lha-1.14i.orig/debian/dirs
++++ lha-1.14i/debian/dirs
+@@ -0,0 +1,3 @@
++usr/bin
++usr/share/man/man1
++usr/share/man/ja/man1/
+--- lha-1.14i.orig/debian/copyright
++++ lha-1.14i/debian/copyright
+@@ -0,0 +1,172 @@
++This package was debianized by Atsushi KAMOSHIDA kamop@post1.com on
++Sun, 13 Apr 1997 17:52:59 +0900.
++
++It was downloaded from http://www2m.biglobe.ne.jp/~dolphin/lha/lha.htm
++
++Upstream Authors: 
++
++      LHarc 0.01-1.00:   Yooichi Tagawa (LHa code taken from here, 1988-1989)
++     	  Nikkei-mix ID: y.tagawa (Now this is defunct BBS, Licensing term
++     	  in manual page come from his licence for lharc)
++     	  His new web page seems to be www2s.biglibe.ne.jp/~yex/
++     	  yooedit2001@yahoo.co.jp is the contact e-mail address for another
++     	  software.  Page updated at least July/2001
++     	  
++      LHa   0.01-1.00:   Masaru Oki     (LHa original author, 1991-1992)
++     	  E-Mail address: oki@netbsd.org
++     
++      LHa   1.10-1.14:   Nobutaka Watazaki (Last official release? 1993-1995)
++	  ALICE-NET       ALS00595    Nasty
++	  E-Mail          JBD02514@niftyserve.or.jp
++	  E-Mail          femcs@mbox.kyoto-inet.or.jp
++	  NIFTY-Serve     JBD02514
++	  E-Mail address: watazaki@shimadzu.co.jp
++	  E-Mail address: watazaki@shimadzusd.co.jp
++     	  
++      Lha   1.14a-1.14e: Tsugio Okamoto <tsugio@muc.biglobe.ne.jp> (1996-2000)
++     
++
++Copyright:
++
++Original Source Code License Statement:
++
++   /*    Copyright (C) MCMLXXXIX Yooichi.Tagawa                      */
++   /*    Modified                Nobutaka Watazaki                   */
++   /*                   Thanks to H.Yoshizaki. (MS-DOS LHarc)        */
++
++
++Original Authors License Statement (from man/lha.man, in Japanese
++EUC-JP):
++
++   ºÆÇÛÉۤˤĤ¤¤Æ
++       °Ê²¼¤Î¾ò·ï¤Ç¡¢ºÆÇÛÉÛ¡¢Å¾ºÜ¡¢²þÊѤòµö²Ä¤·¤Þ¤¹¡£
++
++       1.     Ãøºî¸¢É½¼¨¤òºï½ü¤·¤Ê¤¤¤³¤È¡£
++
++       2.     ÇÛÉÛÆâÍƤˤĤ¤¤Æ¤Ï¡¢
++
++              a.     ÇÛÉۤκݤ˸ºß¤¹¤ëÆâÍÆ(¤¹¤Ê¤ï¤Á ¥½¡¼ ¥¹ ¥³¡¼
++                     ¥É¡¢ ¥É ¥­¥å¥á¥ó¥È¡¢¥×¥í¥°¥é¥Þ¡¼¤Ø¤Î¼ê°ú¤­¤Ê
++                     ¤É)¤¬ºÆÇÛÉÛ¤µ¤ì¤¿¤â¤Î¤ÎÃæ¤Ëɬ¤ºÂ¸ºß ¤¹ ¤ë ¤³
++                     ¤È¡£ ²þ ÊѤµ¤ì¤Æ¤¤¤ë¤Ê¤é¤Ð¡¢¤½¤ì¤òÌÀ¼¨¤·¤¿¥É
++                     ¥­¥å¥á¥ó¥È¤òÍÑ°Õ¤¹¤ë¤³¤È¡£
++
++              b.     LHa ¤ËÂФ¹¤ëÉղòÁÃͤ¬ÉÕ¤±¤é¤ì¤ÆºÆÇÛÉÛ¤µ¤ì¤ë
++                     ¾ì¹ç¤Ë¤Ï¤½¤ì¤é¤â¤Ç¤­¤ë¤À¤±´Þ¤á¤ë¤è¤¦ÅØÎϤ¹¤ë
++                     ¤³¤È¡£¤Þ¤¿¡¢¤½¤ÎºÝ¤Ë¤ÏÉղòÁÃͤ¬ÉÕ¤±¤é¤ì¤Æ¤¤
++                     ¤ë¤³¤È¤òÌÀ¼¨¤·¤¿¥É¥­¥å¥á¥ó¥È¤òÍÑ°Õ¤¹¤ë¤³¤È¡£
++
++              c.     ¥Ð¥¤¥Ê¥ê¤Î¤ß¤ÎÇÛÉۤϵö¤µ¤ì¤Ê¤¤¡£(ÉղòÁÃÍ ¤Î
++                     ¤â¤Î¤â´Þ¤à)
++
++       3.     ºÇ¿·ÈǤÎÇÛÉÛ¤Ë̳¤á¤ë¤³¤È¡£(µÁ̳¤Ï¤Ê¤¤)
++
++              Ãí.    ¤Ê¤ª¡¢¥Í¥Ã¥È¤Ç¤ÎÇÛÉդϼ«Í³¤Ç¤¢¤ë¤¬¡¢¥Í¥Ã¥È¤Ë
++                     ¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤Êý¡Ê»¨»ï¤ª¤è¤Ó¡¢ CDROM ¤Ê ¤É
++                     ¤Ë ¤è¤ë¡ËÇÛÉդϡ¢ÇÛÉÕÁ°¤Ë¤³¤Á¤é¤Ë EMail ¤ò¤ª
++                     ´ê¤¤¤·¤Þ¤¹¡£ÇÛÉÕÁ°¤Ë½ÐÍè¤Ê¤¤ºÝ¤Ë¤Ï¡¢¸åÆüɬ¤º
++                     EMail ¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
++
++       4.      ¤³¤Î¥×¥í¥°¥é¥à¤Î¸ºß¤ä»ÈÍѤ·¤¿¤³¤È¤Ë¤è¤Ã¤ÆÀ¸¤¸¤¿Â»
++              ³²¤ÏÁ´¤¯Êݾڤ·¤Ê¤¤¡£
++
++       5.     ºî¼Ô¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËÉÔÈ÷¤¬¤¢¤Ã¤Æ¤â¡¢¤½¤ì¤òÄû Àµ
++              ¤¹¤ëµÁ̳¤òÉé¤ï¤Ê¤¤¡£
++
++       6.      ¤³¤Î¥×¥í¥°¥é¥à¤Î°ìÉô¡¢¤Þ¤¿¤ÏÁ´Éô¤ò¾¤Î¥×¥í¥°¥é¥à¤Ë
++              ÁȤ߹þ¤ó¤ÇÍøÍѤ·¤Æ¤â¤«¤Þ¤ï¤Ê¤¤¡£¤³¤Î¾ì¹ç¡¢¤½¤Î¥× ¥í
++              ¥°¥é¥à¤Ï LHa ¤Ç¤Ï¤Ê¤¯¡¢ LHa ¤È̾¾è¤Ã¤Æ¤Ï¤¤¤±¤Ê¤¤¡£
++
++       7.      ¾¦ÍøÍѤ˴ؤ·¤Æ¤Ï¡¢¾åµ­¤Î¾ò·ï¤Ë²Ã¤¨¡¢²¼µ­¤Î¾ò·ï¤Î¤â
++              ¤È¤Ë¤³¤ì¤òǧ¤á¤ë¡£
++
++              a.     ¤³¤Î¥×¥í¥°¥é¥à¤ò¥á¥¤¥ó¤È¤¹¤ë¾¦ÍøÍÑ¤Ï¶Ø »ß ¤¹
++                     ¤ë¡£
++
++              b.     ¾¦ÍøÍѤÎÁê¼ê¤¬¤³¤Î¥×¥í¥°¥é¥à¤Î»ÈÍѼԤȤ·¤ÆÉÔ
++                     ŬÀÚ¤ÈȽÃǤ·¤¿¾ì¹ç¤Ë¤ÏÇÛÉÛ¤·¤Ê¤¤¡£
++
++              c.     ¥¤¥ó¥¹¥È¡¼¥ë¤Î¼êÃʤȤ·¤Æ»ÈÍѤ¹¤ë¾ì¹ç¡¢¤³¤Î¥×
++                     ¥í¥°¥é¥à¤ò»È¤¦¤³¤È¤òÁê¼ê¤Ë¶¯À©¤·¤Ê¤¤¡£¤³¤Î¾ì
++                     ¹ç¡¢¾¦ÍøÍѼԤ¬ºî¶È¤ò¹Ô¤¦¡£¤Þ¤¿¡¢¤½¤Î¤È¤­¤Î»
++                     ³²¤Ï¡¢¾¦ÍøÍѼԤ¬Á´ÀÕǤ¤òÉ餦¡£
++
++              d.     ¾¦ÍøÍѤòÉղòÁÃͤȤ·¤Æ¹Ô¤¤¤³¤Î¥×¥í¥°¥é¥à¤ò»È
++                     ÍѤ¹¤ë¾ì¹ç¡¢¾¦ÍøÍѼԤϡ¢¤½¤Î¥µ¥Ý¡¼¥È¤ò¹Ô¤¦¡£
++
++
++Original Authors License Statement (from man/lha.man, translated by
++Osamu Aoki <debian@aokiconsulting.com>):
++
++   Permission is given for redistribution, copy, and modification provided
++   following conditions are met.
++   
++   1. Do not remove copyright clause.
++   2. Distribution shall conform:
++    a. The content of redistribution (i.e., source code, documentation,
++       and reference guide for programmers) shall include original contents.
++       If contents are modified, the document clearly indicating
++       the fact of modification must be included.
++    b. If LHa is redistributed with added values, you must put your best
++       effort to include them (Translator comment: If read literally,
++       original Japanese was unclear what "them" means here.  But
++       undoubtedly this "them" means source code for the added value
++       portion and this is a typical Japanese sloppy writing style to
++       abbreviate as such)  Also the document clearly indicating that
++       added value was added must be included. 
++    c. Binary only distribution is not allowed (including added value
++       ones.)
++   3. You need to put effort to distribute the latest version (This is not
++      your duty).
++   
++      NB: Distribution on Internet is free.  Please notify me by e-mail or
++      other means prior to the distribution if distribution is done through
++      non-Internet media (Magazine, CDROM etc.)  If not, make sure to Email
++      me later.
++   
++   4. Any damage caused by the existence and use of this program will not
++      be compensated.
++   
++   5. Author will not be responsible to correct errors even if program is
++      defective.
++   
++   6. This program, either as a part of this or as a whole of this, may be
++      included into other programs.  In this case, that program is not LHa
++      and can not call itself LHa.
++   
++   7. For commercial use, in addition to above conditions, following
++      condition needs to be met.
++   
++      a.  The program whose content is mainly this program can not be used
++          commercially.
++      b.  If the recipient of commercial use deems inappropriate as a
++          program user, you must not distribute.
++      c.  If used as a method for the installation, you must not force
++          others to use this program.  In this case, commercial user will
++          perform its work while taking full responsibility of its outcome.
++      d.  If added value is done under the commercial use by using this
++          program, commercial user shall provide its support.
++
++
++(Osamu Aoki also comments:
++   Here "commercial" may be interpreted as "for-fee".  "Added value" seems
++   to mean "feature enhancement".  )
++
++
++License Statement by Tsugio Okamoto (in Japanese EUC-JP):
++
++   ¤Ê¤ª¡¢¥Í¥Ã¥È¤Ç¤ÎÇÛÉդϼ«Í³¤Ç¤¹¤¬¡¢¥Í¥Ã¥È¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤Êý¡Ê»¨»ï¤ª¤è¤Ó¡¢
++   CD-ROM ¤Ê¤É¤Ë¤è¤ë¡Ë¤Ø¤ÎÇÛÉդϡ¢ÇÛÉÕÁ°¤Ë¤³¤Á¤é¤Ë Inter-Net ¤ÎÊý¤ËE-Mail
++   ¤ò ¤ª´ê¤¤¤·¤Þ¤¹¡£ ¤É¤³¤½¤³¤Ë¡¢·ÇºÜ¤¹¤ë¤È¤¤¤¦»Ý¤¬¤¢¤ì¤Ð·ë¹½¤Ç¤¹¤Î¤Ç¡£
++   ¤Þ¤¿¡¢¤½¤ì¤â½ÐÍè¤Ê¤¤ºÝ¤Ë¤Ï¡¢¸åÆü E-Mail ¤òɬ¤º¤ª´ê¤¤¤·¤Þ¤¹¡£
++
++
++Translated License Statement by Tsugio Okamoto (translated by
++GOTO Masanori <gotom@debian.org>):
++
++   It's free to distribute on the network, but if you distribute for
++   the people who cannot access the network (by magazine or CD-ROM),
++   please send E-Mail (Inter-Net address) to the author before the
++   distribution. That's well where this software is appeard.
++   If you cannot do, you must send me the E-Mail later.
++
+--- lha-1.14i.orig/debian/control
++++ lha-1.14i/debian/control
+@@ -0,0 +1,13 @@
++Source: lha
++Section: non-free/utils
++Priority: optional
++Maintainer: GOTO Masanori <gotom@debian.org>
++Build-Depends: debhelper (>> 4.0.0)
++Standards-Version: 3.6.0
++
++Package: lha
++Architecture: any
++Depends: ${shlibs:Depends}
++Description: lzh archiver
++ The famous lzh archiver, known from DOS.  When mixing DOS and Unix
++ you might need it.  (Especially for fido <--> rfc conversions.)
+--- lha-1.14i.orig/debian/docs
++++ lha-1.14i/debian/docs
+@@ -0,0 +1,10 @@
++README.euc
++change-114e.txt
++change-114g.txt
++change-114h.txt
++change-114i.txt
++MACHINES
++MACHINES2
++PROBLEMS
++header.doc
++debian/header-e.doc
+--- lha-1.14i.orig/debian/patch.paul
++++ lha-1.14i/debian/patch.paul
+@@ -0,0 +1,10 @@
++--- src/lha.h	Thu Oct  5 19:35:38 2000
+++++ src/lha.h	Wed Aug 22 15:49:55 2001
++@@ -16,6 +16,7 @@
++ #include <sys/types.h>
++ #include <sys/file.h>
++ #include <sys/stat.h>
+++#include <stdlib.h>
++ 
++ #include <signal.h>
++
+--- lha-1.14i.orig/debian/header-e.doc
++++ lha-1.14i/debian/header-e.doc
+@@ -0,0 +1,189 @@
++/* header.doc (In English) */
++Header structure used in LHa for UNIX              Mar. 2, 1992, Masaru Oki.
++(Translated by Osamu Aoki)
++
++----------------------------------------------------------------
++This version, as a transitional mreasure, uses level-1 as default value while
++offering 3 types of header types. In the future, I plan to use level-2 which
++has no limit on number of characters for the path mname.
++
++  A. Spec for header
++
++Basic part
++-----------------------------------------------------------------------------
++        level-0                 level-1                 level-2
++-----------------------------------------------------------------------------
++      1 header size           1 header size           2 total header size
++      1 header sum            1 header sum
++      5 method ID             5 method ID             5 method ID
++      4 packed size           4 skip size             4 packed size
++      4 original size         4 original size         4 original size
++      2 time                  2 time                  4 time(UNIX type)
++      2 date                  2 date
++      1 attribute             1 0x20                  1 RESERVED
++      1 level 0x00            1 level 0x01            1 level 0x02
++      1 name length           1 name length
++      ? pathname              ? filename
++      2 file crc              2 file crc              2 file crc
++      . ........              1 OS ID 'U'             1 OS ID 'U'
++                              . ........
++                              2 next-header size      2 next-header size
++    *************************************************************************
++     24 + ?                  27 + ?                  26
++
++Extension part
++-----------------------------------------------------------------------------
++                              1 ext-type              1 ext-type
++                              . ........              . ........
++                              2 next-header size      2 next-header size
++  
++-----------------------------------------------------------------------------
++
++    a. Types of header
++
++      level-0 header
++          Same format as conventional LHarc, LArc.  Separator for directory
++	  name is '\' as default.
++
++      level-1 header
++          This header is used as default. Archive type -lh0 made with -x0 can
++	  be unfrozen by LHarc but there will be no checking on CRC.
++
++      level-2 header
++          Header for supporting long file names.  I would like to standarize
++	  on this format in the future.  Please follow this if you wish to
++	  make utilities related ti LH.
++
++    b. method ID for freeze/unfreeze
++
++      * these methods are freeze/unfreeze, others are unfreeze only
++
++      -lh0- * no compression
++
++      -lh1- * 4k sliding dictionary(max 60 bytes) + dynamic Huffman
++              + fixed encoding of position
++
++      -lh2-   8k sliding dictionary(max 256 bytes) + dynamic Huffman
++
++      -lh3-   8k sliding dictionary(max 256 bytes) + static Huffman
++
++      -lh4- * 4k sliding dictionary(max 256 bytes) + static Huffman
++              + improved encoding of position and trees
++
++      -lh5- * 8k sliding dictionary(max 256 bytes) + static Huffman
++              + improved encoding of position and trees
++
++      -lh6-   32k sliding dictionary(max 256 bytes) + static Huffman
++			  + improved encoding of position and trees
++
++      -lh7-   64k sliding dictionary(max 256 bytes) + static Huffman
++			  + improved encoding of position and trees
++
++      -lzs-   2k sliding dictionary(max 17 bytes)
++
++      -lz4-   no compression
++
++      -lz5-   4k sliding dictionary(max 17 bytes)
++
++    c. About OS ID
++
++      Following OS ID are reserved.
++
++        MS-DOS  'M'
++        OS/2    '2'
++        OS9     '9'
++        OS/68K  'K'
++        OS/386  '3'
++        HUMAN   'H'
++        UNIX    'U'
++        CP/M    'C'
++        FLEX    'F'
++        Mac     'm'
++        Runser  'R'
++
++  B. Extension
++
++    a. OS independent (0x00 - 0x3f)
++
++        common header
++         1 0x00
++         2 header crc
++       ( 1 information )
++         2 next-header size
++
++        filename header
++         1 0x01
++         ? filename
++         2 next-header size
++
++        dirname header
++         1 0x02
++         ? dirname
++         2 next-header size
++
++        comment header
++         1 0x3f
++         ? comments
++         2 next-header size
++
++(Above portion, from lhx.doc by Mr. Yoshizaki)
++----------------------------------------------------------------
++LHa for UNIX : specification for extension header
++
++* Category of machine specific information (Information to be recorded)
++	Followings are UNIX specific information which requires to be recorded
++	(1) Permission
++	(2) GID,UID
++	(3) Group name, User name
++	(4) Last change time (UNIX time)
++
++* Type of machine specific information (ext-type)
++	First 1 byte of extension header contain value to distinguish types of
++	the infoemation. Foe UNIX specific information,  0x50 - 0x54 will be
++	used.
++
++* Method to store 
++	Above categories (1) - (4) will be different type.
++	
++
++	(1) Pemission
++		size	value
++		1	0x50
++		2	Valur of permission
++		2	next-header size
++
++	(2)GID,UID
++		size	value
++		1	0x51
++		2	GID
++		2	UID
++		2	next-header size
++
++	(3)-1 Group name
++		1	0x52
++		?	Group name string
++		2	next-header size
++
++	(3)-2 user name
++		1	0x53
++		?	User name string
++		2	next-header size
++
++	(4) Last change time (for header_level1)
++		1	0x54
++		4	UNIX time
++		2	next-header size
++
++* Implimentation of LHa for UNIX ver 1.14 (Watazaki)
++	Above (3) is not supported
++	Group name and user name specified by (3) is not used to make an
++	archive thus ignored during expansion.
++	Also (4) is contained only in level-1 archive.
++----------------------------------------------------------------
++That's all folks :)
++
++Partially modified by
++Nobutaka Watazaki
++watazaki@shimadzu.co.jp
++
++
+--- lha-1.14i.orig/debian/patch.CAN-2004-0234_0235
++++ lha-1.14i/debian/patch.CAN-2004-0234_0235
+@@ -0,0 +1,85 @@
++--- src/header.c.old	2000-10-05 19:36:03.000000000 +0200
+++++ src/header.c	2004-04-17 23:55:54.000000000 +0200
++@@ -538,6 +538,10 @@
++ 				/*
++ 				 * filename
++ 				 */
+++				if (header_size >= 256) {
+++				  fprintf(stderr, "Possible buffer overflow hack attack, type #1\n");
+++				  exit(109);
+++				}
++ 				for (i = 0; i < header_size - 3; i++)
++ 					hdr->name[i] = (char) get_byte();
++ 				hdr->name[header_size - 3] = '\0';
++@@ -547,6 +551,10 @@
++ 				/*
++ 				 * directory
++ 				 */
+++				if (header_size >= FILENAME_LENGTH) {
+++				  fprintf(stderr, "Possible buffer overflow hack attack, type #2\n");
+++				  exit(110);
+++				}
++ 				for (i = 0; i < header_size - 3; i++)
++ 					dirname[i] = (char) get_byte();
++ 				dirname[header_size - 3] = '\0';
++--- src/lhext.c.old	2000-10-04 16:57:38.000000000 +0200
+++++ src/lhext.c	2004-04-18 01:27:44.000000000 +0200
++@@ -190,8 +190,13 @@
++ 		q = (char *) rindex(hdr->name, '/') + 1;
++ 	}
++ 	else {
+++		if (is_directory_traversal(q)) {
+++		  fprintf(stderr, "Possible directory traversal hack attempt in %s\n", q);
+++		  exit(111);
+++		}
+++
++ 		if (*q == '/') {
++-			q++;
+++			while (*q == '/') { q++; }
++ 			/*
++ 			 * if OSK then strip device name
++ 			 */
++@@ -419,6 +424,33 @@
++ 	return;
++ }
++ 
+++int
+++is_directory_traversal(char *string)
+++{
+++  unsigned int type = 0; /* 0 = new, 1 = only dots, 2 = other chars than dots */
+++  char *temp;
+++
+++  temp = string;
+++
+++  while (*temp != 0) {
+++    if (temp[0] == '/') {
+++      if (type == 1) { return 1; }
+++      type = 0;
+++      temp++;
+++      continue;
+++    }
+++
+++    if ((temp[0] == '.') && (type < 2))
+++      type = 1;
+++    if (temp[0] != '.')
+++      type = 2;
+++
+++    temp++;
+++  } /* while */
+++
+++  return (type == 1);
+++}
+++
++ /* Local Variables: */
++ /* mode:c */
++ /* tab-width:4 */
++--- src/lhext.c.symlink	2000-10-04 10:57:38.000000000 -0400
+++++ src/lhext.c	2003-05-19 22:55:57.000000000 -0400
++@@ -351,6 +351,7 @@ extract_one(afp, hdr)
++ 				}
++ 
++ 				unlink(bb1);
+++				make_parent_path(bb1);
++ 				l_code = symlink(bb2, bb1);
++ 				if (l_code < 0) {
++ 					if (quiet != TRUE)
+--- lha-1.14i.orig/debian/patch.header-overflow
++++ lha-1.14i/debian/patch.header-overflow
+@@ -0,0 +1,21 @@
++--- src/header.c	2002-07-19 17:23:58.000000000 +0900
+++++ src/header.c	2004-06-16 09:49:23.000000000 +0900
++@@ -648,8 +648,17 @@
++ 	}
++ 
++ 	if (dir_length) {
+++		if ((dir_length + name_length) > sizeof(dirname)) {
+++			fprintf(stderr, "Insufficient buffer size\n");
+++			exit(112);
+++		}
++ 		strcat(dirname, hdr->name);
++-		strcpy(hdr->name, dirname);
+++
+++		if ((dir_length + name_length) > sizeof(hdr->name)) {
+++			fprintf(stderr, "Insufficient buffer size\n");
+++			exit(112);
+++		}
+++		strncpy(hdr->name, dirname, sizeof(hdr->name));
++ 		name_length += dir_length;
++ 	}
++ 
+--- lha-1.14i.orig/debian/patch.redhat-sec2
++++ lha-1.14i/debian/patch.redhat-sec2
+@@ -0,0 +1,196 @@
++diff -urNp lha-114i.orig/src/lha_macro.h lha-114i/src/lha_macro.h
++--- lha-114i.orig/src/lha_macro.h	2004-08-03 15:53:56.000000000 -0500
+++++ lha-114i/src/lha_macro.h	2004-08-03 15:54:05.000000000 -0500
++@@ -53,7 +53,7 @@
++ #define SEEK_SET		0
++ #define SEEK_CUR		1
++ #define SEEK_END		2
++-#endif	/* SEEK_SET
+++#endif	/* SEEK_SET */
++ 
++ 
++ /* non-integral functions */
++diff -urNp lha-114i.orig/src/lharc.c lha-114i/src/lharc.c
++--- lha-114i.orig/src/lharc.c	2004-08-03 15:53:56.000000000 -0500
+++++ lha-114i/src/lharc.c	2004-08-03 15:54:05.000000000 -0500
++@@ -830,9 +830,10 @@ find_files(name, v_filec, v_filev)
++ 	DIRENTRY       *dp;
++ 	struct stat     tmp_stbuf, arc_stbuf, fil_stbuf;
++ 
++-	strcpy(newname, name);
+++	strncpy(newname, name, sizeof(newname));
+++	newname[sizeof(newname)-1] = 0;
++ 	len = strlen(name);
++-	if (len > 0 && newname[len - 1] != '/')
+++	if (len > 0 && newname[len - 1] != '/' && len < (sizeof(newname)-1))
++ 		newname[len++] = '/';
++ 
++ 	dirp = opendir(name);
++@@ -846,6 +847,11 @@ find_files(name, v_filec, v_filev)
++ 
++ 	for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
++ 		n = NAMLEN(dp);
+++		if (len >= (sizeof(newname)-1) ||
+++				(len+n) >= (sizeof(newname)-1) ||
+++					 n  <= 0                   ||
+++				(len+n) <= 0)
+++			break;
++ 		strncpy(newname + len, dp->d_name, n);
++ 		newname[len + n] = '\0';
++ 		if (GETSTAT(newname, &fil_stbuf) < 0)
++@@ -903,7 +909,8 @@ build_temporary_name()
++ 		strcpy(temporary_name, TMP_FILENAME_TEMPLATE);
++ 	}
++ 	else {
++-		sprintf(temporary_name, "%s/lhXXXXXX", extract_directory);
+++		snprintf(temporary_name, sizeof(temporary_name),
+++			"%s/lhXXXXXX", extract_directory);
++ 	}
++ #ifdef MKSTEMP
++ 	mkstemp(temporary_name);
++@@ -913,10 +920,16 @@ build_temporary_name()
++ #else
++ 	char           *p, *s;
++ 
++-	strcpy(temporary_name, archive_name);
+++	strncpy(temporary_name, archive_name, sizeof(temporary_name));
+++	temporary_name[sizeof(temporary_name)-1] = 0;
++ 	for (p = temporary_name, s = (char *) 0; *p; p++)
++ 		if (*p == '/')
++ 			s = p;
+++
+++	if( sizeof(temporary_name) - ((size_t) (s-temporary_name)) - 1
+++		<= strlen("lhXXXXXX"))
+++			exit(-1);
+++
++ 	strcpy((s ? s + 1 : temporary_name), "lhXXXXXX");
++ #ifdef MKSTEMP
++ 	mkstemp(temporary_name);
++@@ -1052,7 +1065,8 @@ open_old_archive()
++ 
++ 	if (open_old_archive_1(archive_name, &fp))
++ 		return fp;
++-	sprintf(expanded_archive_name, "%s.lzh", archive_name);
+++	snprintf(expanded_archive_name, sizeof(expanded_archive_name),
+++		"%s.lzh", archive_name);
++ 	if (open_old_archive_1(expanded_archive_name, &fp)) {
++ 		archive_name = expanded_archive_name;
++ 		return fp;
++@@ -1061,7 +1075,8 @@ open_old_archive()
++ 	 * if ( (errno&0xffff)!=E_PNNF ) { archive_name =
++ 	 * expanded_archive_name; return NULL; }
++ 	 */
++-	sprintf(expanded_archive_name, "%s.lzs", archive_name);
+++	snprintf(expanded_archive_name, sizeof(expanded_archive_name),
+++		"%s.lzs", archive_name);
++ 	if (open_old_archive_1(expanded_archive_name, &fp)) {
++ 		archive_name = expanded_archive_name;
++ 		return fp;
++diff -urNp lha-114i.orig/src/lhext.c lha-114i/src/lhext.c
++--- lha-114i.orig/src/lhext.c	2004-08-03 15:53:56.000000000 -0500
+++++ lha-114i/src/lhext.c	2004-08-03 15:55:40.000000000 -0500
++@@ -82,7 +82,8 @@ make_parent_path(name)
++ 	register char  *p;
++ 
++ 	/* make parent directory name into PATH for recursive call */
++-	strcpy(path, name);
+++	memset(path, 0, sizeof(path));
+++	strncpy(path, name, sizeof(path)-1);
++ 	for (p = path + strlen(path); p > path; p--)
++ 		if (p[-1] == '/') {
++ 			*--p = '\0';
++@@ -212,9 +213,11 @@ extract_one(afp, hdr)
++ 	}
++ 
++ 	if (extract_directory)
++-		sprintf(name, "%s/%s", extract_directory, q);
++-	else
++-		strcpy(name, q);
+++		snprintf(name, sizeof(name), "%s/%s", extract_directory, q);
+++	else {
+++		strncpy(name, q, sizeof(name));
+++		name[sizeof(name) - 1] = '\0';
+++	}
++ 
++ 
++ 	/* LZHDIRS_METHOD�����ĥإå��������å����� */
++@@ -335,7 +338,8 @@ extract_one(afp, hdr)
++ 			if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK) {
++ 				char            buf[256], *bb1, *bb2;
++ 				int             l_code;
++-				strcpy(buf, name);
+++				strncpy(buf, name, sizeof(buf));
+++				buf[sizeof(buf)-1] = 0;
++ 				bb1 = strtok(buf, "|");
++ 				bb2 = strtok(NULL, "|");
++ 
++@@ -365,9 +369,10 @@ extract_one(afp, hdr)
++ 				if (quiet != TRUE) {
++ 					printf("Symbolic Link %s -> %s\n", bb1, bb2);
++ 				}
++-				strcpy(name, bb1);	/* Symbolic's name set */
+++				strncpy(name, bb1, 255);	/* Symbolic's name set */
+++				name[255] = 0;
++ #else
++-				sprintf(buf, "%s -> %s", bb1, bb2);
+++				sprintf(buf, sizeof(buf), "%s -> %s", bb1, bb2);
++ 				warning("Can't make Symbolic Link", buf);
++ 				return;
++ #endif
++diff -urNp lha-114i.orig/src/lhlist.c lha-114i/src/lhlist.c
++--- lha-114i.orig/src/lhlist.c	2004-08-03 15:53:56.000000000 -0500
+++++ lha-114i/src/lhlist.c	2004-08-03 15:54:05.000000000 -0500
++@@ -250,7 +250,8 @@ list_one(hdr)
++ 			printf(" %s", hdr->name);
++ 		else {
++ 			char            buf[256], *b1, *b2;
++-			strcpy(buf, hdr->name);
+++			strncpy(buf, hdr->name, sizeof(buf));
+++			buf[sizeof(buf)-1] = 0;
++ 			b1 = strtok(buf, "|");
++ 			b2 = strtok(NULL, "|");
++ 			printf(" %s -> %s", b1, b2);
++diff -urNp lha-114i.orig/src/util.c lha-114i/src/util.c
++--- lha-114i.orig/src/util.c	2004-08-03 15:53:56.000000000 -0500
+++++ lha-114i/src/util.c	2004-08-03 15:54:05.000000000 -0500
++@@ -276,21 +276,27 @@ rmdir(path)
++ 	char           *path;
++ {
++ 	int             stat, rtn = 0;
++-	char           *cmdname;
++-	if ((cmdname = (char *) malloc(strlen(RMDIRPATH) + 1 + strlen(path) + 1))
++-	    == 0)
+++	pid_t           child;
+++
+++
+++	/* XXX thomas: shell meta chars in path could exec commands */
+++	/* therefore we should avoid using system() */
+++	if ((child = fork()) < 0)
+++		return (-1);    /* fork error */
+++	else if (child) {       /* parent process */
+++		while (child != wait(&stat))    /* ignore signals */
+++			continue;
+++	}
+++	else {                  /* child process */
+++		execl(RMDIRPATH, "rmdir", path, (char *) 0);
+++		/* never come here except execl is error */
++ 		return (-1);
++-	strcpy(cmdname, RMDIRPATH);
++-	*(cmdname + strlen(RMDIRPATH)) = ' ';
++-	strcpy(cmdname + strlen(RMDIRPATH) + 1, path);
++-	if ((stat = system(cmdname)) < 0)
++-		rtn = -1;	/* fork or exec error */
++-	else if (stat) {	/* RMDIR command error */
++-		errno = EIO;
++-		rtn = -1;
++ 	}
++-	free(cmdname);
++-	return (rtn);
+++	if (stat != 0) {
+++		errno = EIO;    /* cannot get error num. */
+++		return (-1);
+++	}
+++	return (0);
++ }
++ 
++ /* ------------------------------------------------------------------------ */
+--- lha-1.14i.orig/debian/patch.CVE-2006-4335-CVE-2006-4337-CVE-2006-4338
++++ lha-1.14i/debian/patch.CVE-2006-4335-CVE-2006-4337-CVE-2006-4338
+@@ -0,0 +1,137 @@
++diff -aur lha-1.14i.orig/src/huf.c lha-1.14i/src/huf.c
++--- lha-1.14i.orig/src/huf.c	2000-10-05 19:35:49.000000000 +0200
+++++ lha-1.14i/src/huf.c	2006-12-11 10:07:31.000000000 +0100
++@@ -332,7 +332,7 @@
++ 	}
++ 	else {
++ 		i = 0;
++-		while (i < n) {
+++		while (i < MIN(n, NPT)) {
++ 			c = bitbuf >> (16 - 3);
++ 			if (c == 7) {
++ 				unsigned short  mask = 1 << (16 - 4);
++@@ -345,7 +345,7 @@
++ 			pt_len[i++] = c;
++ 			if (i == i_special) {
++ 				c = getbits(2);
++-				while (--c >= 0)
+++				while (--c >= 0 && i < NPT)
++ 					pt_len[i++] = 0;
++ 			}
++ 		}
++@@ -370,7 +370,7 @@
++ 			c_table[i] = c;
++ 	} else {
++ 		i = 0;
++-		while (i < n) {
+++		while (i < MIN(n,NC)) {
++ 			c = pt_table[bitbuf >> (16 - 8)];
++ 			if (c >= NT) {
++ 				unsigned short  mask = 1 << (16 - 9);
++@@ -380,7 +380,7 @@
++ 					else
++ 						c = left[c];
++ 					mask >>= 1;
++-				} while (c >= NT);
+++				} while (c >= NT && (mask || c != left[c])); /* CVE-2006-4338 */
++ 			}
++ 			fillbuf(pt_len[c]);
++ 			if (c <= 2) {
++@@ -427,7 +427,7 @@
++ 			else
++ 				j = left[j];
++ 			mask >>= 1;
++-		} while (j >= NC);
+++		} while (j >= NC && (mask || j != left[j])); /* CVE-2006-4338 */
++ 		fillbuf(c_len[j] - 12);
++ 	}
++ 	return j;
++@@ -451,7 +451,7 @@
++ 			else
++ 				j = left[j];
++ 			mask >>= 1;
++-		} while (j >= np);
+++		} while (j >= np && (mask || j != left[j])); /* CVE-2006-4338 */
++ 		fillbuf(pt_len[j] - 8);
++ 	}
++ 	if (j != 0)
++Only in lha-1.14i/src: huf.c~
++diff -aur lha-1.14i.orig/src/lha_macro.h lha-1.14i/src/lha_macro.h
++--- lha-1.14i.orig/src/lha_macro.h	2006-12-11 09:43:54.000000000 +0100
+++++ lha-1.14i/src/lha_macro.h	2006-12-11 09:55:42.000000000 +0100
++@@ -408,6 +408,8 @@
++ #define MAXMATCH			256	/* formerly F (not more than UCHAR_MAX + 1) */
++ #define THRESHOLD			3	/* choose optimal value */
++ 
+++#define MIN(a,b) ((a) <= (b) ? (a) : (b))
+++
++ /* from huf.c */
++ 
++ /* alphabet = {0, 1, 2, ..., NC - 1} */
++Only in lha-1.14i/src: lha_macro.h~
++diff -aur lha-1.14i.orig/src/maketbl.c lha-1.14i/src/maketbl.c
++--- lha-1.14i.orig/src/maketbl.c	2000-10-04 16:57:38.000000000 +0200
+++++ lha-1.14i/src/maketbl.c	2006-12-11 09:59:51.000000000 +0100
++@@ -32,8 +32,15 @@
++ 	}
++ 
++ 	/* count */
++-	for (i = 0; i < nchar; i++)
++-		count[bitlen[i]]++;
+++	for (i = 0; i < nchar; i++) {
+++		if (bitlen[i] > 16) {
+++		/* CVE-2006-4335 */
+++		error("Bad table (case a)");
+++		exit(1);
+++	}
+++	else
+++		count[bitlen[i]]++;
+++	}
++ 
++ 	/* calculate first code */
++ 	total = 0;
++@@ -41,8 +48,11 @@
++ 		start[i] = total;
++ 		total += weight[i] * count[i];
++ 	}
++-	if ((total & 0xffff) != 0)
++-		error("make_table()", "Bad table (5)\n");
+++
+++	if ((total & 0xffff) != 0 || tablebits > 16) { /* 16 for weight below */
+++		error("make_table(): Bad table (case b)");
+++		exit(1);
+++	}
++ 
++ 	/* shift data for make table. */
++ 	m = 16 - tablebits;
++@@ -53,7 +63,7 @@
++ 
++ 	/* initialize */
++ 	j = start[tablebits + 1] >> m;
++-	k = 1 << tablebits;
+++	k = MIN(1 << tablebits, 4096);
++ 	if (j != 0)
++ 		for (i = j; i < k; i++)
++ 			table[i] = 0;
++@@ -66,12 +76,19 @@
++ 		l = start[k] + weight[k];
++ 		if (k <= tablebits) {
++ 			/* code in table */
+++		l = MIN(l, 4096);
++ 			for (i = start[k]; i < l; i++)
++ 				table[i] = j;
++ 		}
++ 		else {
++ 			/* code not in table */
++-			p = &table[(i = start[k]) >> m];
+++			i = start[k];
+++			if ((i >> m) > 4096) {
+++			/* CVE-2006-4337 */
+++			error("Bad table (case c)");
+++			exit(1);
+++			}
+++			p = &table[i >> m];
++ 			i <<= tablebits;
++ 			n = k - tablebits;
++ 			/* make tree (n length) */
++Only in lha-1.14i/src: maketbl.c~
diff --git a/source/a/lha/slack-desc b/source/a/lha/slack-desc
new file mode 100644
index 000000000..75c1dd43a
--- /dev/null
+++ b/source/a/lha/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------------------------------------------------------|
+lha: lha (LHa archive utility)
+lha:
+lha: LHa is an archiving and compressing utility written by Tsugio Okamoto.
+lha:
+lha:
+lha:
+lha:
+lha:
+lha:
+lha:
+lha:
diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild
new file mode 100755
index 000000000..197f33843
--- /dev/null
+++ b/source/a/lilo/lilo.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=${VERSION:-22.8}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-14}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-lilo
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf lilo-$VERSION
+tar xvf $CWD/lilo-$VERSION.src.tar.gz || exit 1
+cd lilo-$VERSION
+chown -R root:root .
+
+make || exit 1
+make install ROOT=$PKG
+
+# Add a Slackware logo boot menu (sorry, couldn't resist):
+if [ "$ARCH" = "x86_64" -a -f $CWD/slack64.bmp ]; then
+  cp -a $CWD/slack64.bmp $PKG/boot/slack.bmp
+else
+  cp -a $CWD/slack.bmp $PKG/boot
+fi
+chmod 644 $PKG/boot/slack.bmp
+
+# We don't need to add this empty directory:
+rmdir $PKG/etc
+
+# Add Slackware's 'liloconfig' utility:
+mkdir -p $PKG/sbin
+cp -a $CWD/liloconfig $PKG/sbin/liloconfig
+chmod 755 $PKG/sbin/liloconfig
+mkdir -p $PKG/var/log/setup
+cp -a $CWD/setup.liloconfig $PKG/var/log/setup/setup.liloconfig
+cp -a $CWD/text.lilohelp $PKG/var/log/setup/text.lilohelp
+chmod 755 $PKG/var/log/setup/setup.liloconfig
+chmod 644 $PKG/var/log/setup/text.lilohelp
+chown root:root \
+   $PKG/var/log/setup/setup.liloconfig $PKG/var/log/setup/text.lilohelp
+
+rm -rf $PKG/usr/doc/lilo-$VERSION
+mkdir -p $PKG/usr/doc/lilo-$VERSION
+cp -a CHANGES COPYING COPYRIGHT INCOMPAT QuickInst READM* doc sample \
+  $PKG/usr/doc/lilo-$VERSION
+if [ -r $CWD/lilo-$VERSION.lsm ]; then
+  cp -a $CWD/lilo-$VERSION.lsm $PKG/usr/doc/lilo-$VERSION
+fi
+if [ -r $CWD/lilo-$VERSION.announce.txt ]; then
+  cp -a $CWD/lilo-$VERSION.announce.txt $PKG/usr/doc/lilo-$VERSION
+fi
+
+mv $PKG/usr/share/man $PKG/usr
+rmdir $PKG/usr/share
+gzip -9 $PKG/usr/man/man?/*.?
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/lilo-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/lilo/liloconfig b/source/a/lilo/liloconfig
new file mode 100644
index 000000000..e786e7522
--- /dev/null
+++ b/source/a/lilo/liloconfig
@@ -0,0 +1,1165 @@
+#!/bin/sh
+#
+# Copyright 1994, 1998, 1999 Patrick Volkerding, Moorhead, Minnesota USA
+# Copyright 2002, 2003  Slackware Linux, Inc, Concord, CA
+# Copyright 2007, 2008  Patrick 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.
+#
+TMP=/var/log/setup/tmp
+CONSOLETYPE=standard
+unset UTFVT
+
+# Set the OS root directory (called T_PX for some unknown reason).
+# If an argument is given to this script and it is a directory, it
+# is taken to be the root directory.  First though, we check for a
+# directory named $T_PX, and that gets the first priority.
+if [ ! -d "$T_PX" ]; then
+  if [ ! "$1" = "" ]; then
+    if [ -d "$1" ]; then
+      T_PX="$1"
+    fi
+  else
+    # Are we on the installer image?
+    if [ -r /usr/lib/setup/SeTpartitions ]; then
+      T_PX=/mnt
+    # Or, are we on a running system?
+    elif [ -r /etc/slackware-version ]; then
+      T_PX=/
+    # One more installer-likely thing:
+    elif [ -r /usr/lib/setup/setup ]; then
+      T_PX=/mnt
+    else
+      # We will have to assume we've on an installed and running system.
+      T_PX=/
+    fi
+  fi
+fi
+
+# If there's no boot_message.txt, start the header for one now:
+if [ ! -r $T_PX/boot/boot_message.txt ]; then
+ cat << EOF > $T_PX/boot/boot_message.txt
+
+Welcome to the LILO Boot Loader!
+
+Please enter the name of the partition you would like to boot
+at the prompt below.  The choices are:
+
+EOF
+fi
+
+# The default install location may be set here:
+DEFAULT=" --default-item MBR "
+
+# This is a different 'probe' than the function below.
+PROBE() {
+  if [ -x /sbin/probe ]; then
+    /sbin/probe -l
+  elif fdisk -l | grep "Disk /dev/ide" 1> /dev/null 2> /dev/null ; then # no devfs yet
+    for devs in /dev/hda /dev/hdb /dev/hdc /dev/hdd /dev/hde /dev/hdf /dev/hdg \
+      /dev/hdh /dev/hdi /dev/hdj /dev/hdk /dev/hdl /dev/hdm /dev/hdn /dev/hdo /dev/hdp \
+      /dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf /dev/sdg /dev/sdh /dev/sdi \
+      /dev/sdj /dev/sdk /dev/sdl /dev/sdm /dev/sdn /dev/sdo /dev/sdp ; do
+      fdisk -l $devs 2> /dev/null
+    done
+  elif fdisk -l | grep "Disk /dev/scsi" 1> /dev/null 2> /dev/null ; then # no devfs yet
+    for devs in /dev/hda /dev/hdb /dev/hdc /dev/hdd /dev/hde /dev/hdf /dev/hdg \
+      /dev/hdh /dev/hdi /dev/hdj /dev/hdk /dev/hdl /dev/hdm /dev/hdn /dev/hdo /dev/hdp \
+      /dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf /dev/sdg /dev/sdh /dev/sdi \
+      /dev/sdj /dev/sdk /dev/sdl /dev/sdm /dev/sdn /dev/sdo /dev/sdp ; do
+      fdisk -l $devs 2> /dev/null
+    done
+  elif [ -z "`fdisk -l`" ]; then
+    for devs in /dev/hda /dev/hdb /dev/hdc /dev/hdd /dev/hde /dev/hdf /dev/hdg \
+      /dev/hdh /dev/hdi /dev/hdj /dev/hdk /dev/hdl /dev/hdm /dev/hdn /dev/hdo /dev/hdp \
+      /dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf /dev/sdg /dev/sdh /dev/sdi \
+      /dev/sdj /dev/sdk /dev/sdl /dev/sdm /dev/sdn /dev/sdo /dev/sdp ; do
+      fdisk -l $devs 2> /dev/null
+    done
+  else # We got output without /dev/ide or /dev/scsi, so it can probably be trusted:
+    fdisk -l 2> /dev/null
+  fi
+}
+
+# Function to ask if the Slackware logo boot screen should be used.
+ask_boot_splash() {
+  dialog --title "OPTIONAL SLACKWARE LOGO BOOT SCREEN" \
+  --yesno \
+"Would you like to use a boot screen with the Slackware logo \
+against a black background?  If you answer no here, the standard \
+LILO menu will be used.\n\
+" 7 65 2> $TMP/reply
+  RETVAL=$?
+  return $RETVAL
+}
+
+boot_bmp() {
+  cat << EO_BMP
+# Boot BMP Image.
+# Bitmap in BMP format: 640x480x8
+  bitmap = /boot/slack.bmp
+# Menu colors (foreground, background, shadow, highlighted
+# foreground, highlighted background, highlighted shadow):
+  bmp-colors = 255,0,255,0,255,0
+# Location of the option table: location x, location y, number of
+# columns, lines per column (max 15), "spill" (this is how many
+# entries must be in the first column before the next begins to
+# be used.  We don't specify it here, as there's just one column.
+  bmp-table = 60,6,1,16
+# Timer location x, timer location y, foreground color,
+# background color, shadow color.
+  bmp-timer = 65,27,0,255
+EO_BMP
+}
+
+# Menu to check if we want to use VESA framebuffer support:
+use_framebuffer() {
+if cat /proc/devices | grep "29 fb" 1> /dev/null ; then
+  dialog --title "CONFIGURE LILO TO USE FRAME BUFFER CONSOLE?" \
+  --default-item 1024x768x256 \
+  --menu "Looking at /proc/devices, it seems your kernel has support for \
+the Linux frame buffer console.  If we enable this in /etc/lilo.conf, it \
+will allow more rows and columns of text on the screen and give you a cool \
+penguin logo at boot time.  However, the frame buffer text console is \
+slower than a standard text console.  In addition, not every video card \
+or monitor supports all of these video modes.  Would you like to use the \
+frame buffer console, or the standard Linux console?" 0 0 0 \
+  "standard" "Use the standard Linux console (the safe choice)" \
+  "640x480x256" "Frame buffer console, 640x480x256" \
+  "800x600x256" "Frame buffer console, 800x600x256" \
+  "1024x768x256" "Frame buffer console, 1024x768x256" \
+  "640x480x32k" "Frame buffer console, 640x480x32k" \
+  "800x600x32k" "Frame buffer console, 800x600x32k" \
+  "1024x768x32k" "Frame buffer console, 1024x768x32k" \
+  "640x480x64k" "Frame buffer console, 640x480x64k" \
+  "800x600x64k" "Frame buffer console, 800x600x64k" \
+  "1024x768x64k" "Frame buffer console, 1024x768x64k" \
+  2> $TMP/reply
+  if [ $? = 1 -o $? = 255 ]; then
+    exit
+  fi
+# Frame buffer modes above 1024x768 look terrible except
+# on LCD panels, and 32 bit color is slow.  Since we don't
+# even need to run a framebuffer console to run framebuffer
+# X anymore, these modes aren't of much real use.
+#  "1280x1024x256" "Frame buffer console, 1280x1024x256" \
+#  "1600x1200x256" "Frame buffer console, 1600x1200x256" \
+#  "1280x1024x32k" "Frame buffer console, 1280x1024x32k" \
+#  "1600x1200x32k" "Frame buffer console, 1600x1200x32k" \
+#  "1280x1024x64k" "Frame buffer console, 1280x1024x64k" \
+#  "1600x1200x64k" "Frame buffer console, 1600x1200x64k" \
+#  "640x480x16m" "Frame buffer console, 640x480x16.8m" \
+#  "800x600x16m" "Frame buffer console, 800x600x16.8m" \
+#  "1024x768x16m" "Frame buffer console, 1024x768x16.8m" \
+#  "1280x1024x16m" "Frame buffer console, 1280x1024x16.8m" \
+#  "1600x1200x16m" "Frame buffer console, 1600x1200x16.8m"
+  CONSOLETYPE="`cat $TMP/reply`"
+  if [ "$CONSOLETYPE" = "1600x1200x16m" ]; then
+    CONSOLENUM=799
+  elif [ "$CONSOLETYPE" = "1600x1200x64k" ]; then
+    CONSOLENUM=798
+  elif [ "$CONSOLETYPE" = "1600x1200x32k" ]; then
+    CONSOLENUM=797
+  elif [ "$CONSOLETYPE" = "1600x1200x256" ]; then
+    CONSOLENUM=796
+  elif [ "$CONSOLETYPE" = "1280x1024x16m" ]; then
+    CONSOLENUM=795
+  elif [ "$CONSOLETYPE" = "1280x1024x64k" ]; then
+    CONSOLENUM=794
+  elif [ "$CONSOLETYPE" = "1280x1024x32k" ]; then
+    CONSOLENUM=793
+  elif [ "$CONSOLETYPE" = "1280x1024x256" ]; then
+    CONSOLENUM=775
+  elif [ "$CONSOLETYPE" = "1024x768x16m" ]; then
+    CONSOLENUM=792
+  elif [ "$CONSOLETYPE" = "1024x768x64k" ]; then
+    CONSOLENUM=791
+  elif [ "$CONSOLETYPE" = "1024x768x32k" ]; then
+    CONSOLENUM=790
+  elif [ "$CONSOLETYPE" = "1024x768x256" ]; then
+    CONSOLENUM=773
+  elif [ "$CONSOLETYPE" = "800x600x16m" ]; then
+    CONSOLENUM=789
+  elif [ "$CONSOLETYPE" = "800x600x64k" ]; then
+    CONSOLENUM=788
+  elif [ "$CONSOLETYPE" = "800x600x32k" ]; then
+    CONSOLENUM=787
+  elif [ "$CONSOLETYPE" = "800x600x256" ]; then
+    CONSOLENUM=771
+  elif [ "$CONSOLETYPE" = "640x480x16m" ]; then
+    CONSOLENUM=786
+  elif [ "$CONSOLETYPE" = "640x480x64k" ]; then
+    CONSOLENUM=785
+  elif [ "$CONSOLETYPE" = "640x480x32k" ]; then
+    CONSOLENUM=784
+  elif [ "$CONSOLETYPE" = "640x480x256" ]; then
+    CONSOLENUM=769
+  fi
+fi
+}
+
+# A function to ask for append= parameters. 
+ask_append() {
+ dialog --title "OPTIONAL LILO append=\"<kernel parameters>\" LINE" --inputbox \
+"Some systems might require extra parameters to be passed to the kernel. \
+If you needed to pass parameters to the kernel when you booted the Slackware \
+bootdisk, you'll probably want to enter the same ones here.  Most \
+systems won't require any extra parameters.  If you don't need any, just \
+hit ENTER to continue.\n\
+" 12 72 2> $TMP/reply
+ RETVAL=$?
+ return $RETVAL
+}
+
+ask_utf() {
+ if [ "$(uname -r | cut -f 3 -d .)" -gt "23" ]; then
+ dialog --defaultno --title "USE UTF-8 TEXT CONSOLE?" --yesno \
+"Beginning with the 2.6.24 kernel, the text consoles default to UTF-8 mode.  \
+Unless you are using a UTF-8 locale (\$LANG setting), using the old default \
+of a non-UTF text console is safer until some issues with various console \
+programs are addressed.  This option has no effect on the use of UTF-8 with X.  \
+\"No\" is the safe choice here." 10 70
+ fi
+}
+
+# This function scans for bootable partitions (making some assumptions along
+# the way which may or may not be correct, but usually work), and sets up
+# LILO in either the superblock, or the MBR.
+simplelilo()
+{
+ use_framebuffer;
+
+ ask_append;
+ if [ $? = 1 -o $? = 255 ]; then
+  APPEND=""
+ fi
+ APPEND="`cat $TMP/reply`"
+
+ ask_utf;
+ if [ $? = 1 -o $? = 255 ]; then
+  UTFVT="vt.default_utf8=0"
+ else
+  UTFVT="vt.default_utf8=1"
+ fi
+
+ if PROBE -l | grep 'OS/2 Boot Manager' 1> /dev/null 2> /dev/null ; then
+  dialog --title "OS/2 BOOT MANAGER FOUND" --yesno \
+  "Your system appears to have Boot Manager, a boot menu system provided \
+with OS/2 and Partition Magic.  If you like, we can install a very simple \
+LILO boot block at the start of your Linux partition.  Then, you can \
+add the partition to the Boot Manager menu, and you'll be able to use \
+Boot Manager to boot Linux.  Would you like to install LILO in a Boot \
+Manager compatible way?" 11 65
+  FLAG=$?
+  if [ ! $FLAG = 0 -a ! $FLAG = 1 ]; then
+   exit 1
+  fi
+  if [ $FLAG = 0 ]; then # yes, use BM
+   if [ -r $T_PX/etc/lilo.conf ]; then
+    mv $T_PX/etc/lilo.conf $T_PX/etc/lilo.conf.orig
+   fi
+   cat << EOF > $T_PX/etc/lilo.conf
+# LILO configuration file
+# generated by 'liloconfig'
+#
+# Start LILO global section
+#
+EOF
+   if [ ! "$APPEND" = "" -o ! "$UTFVT" = "" ]; then
+     echo "# Append any additional kernel parameters:" >> $T_PX/etc/lilo.conf
+     echo "append=\"$APPEND $UTFVT\"" >> $T_PX/etc/lilo.conf
+   fi
+   cat << EOF >> $T_PX/etc/lilo.conf
+boot = $ROOT_DEVICE
+#delay = 5
+EOF
+   if [ "$CONSOLETYPE" = "standard" ]; then
+     cat << EOF >> $T_PX/etc/lilo.conf
+vga = normal
+EOF
+   else
+     cat << EOF >> $T_PX/etc/lilo.conf
+# VESA framebuffer at $CONSOLETYPE
+vga = $CONSOLENUM
+EOF
+   fi
+   cat << EOF >> $T_PX/etc/lilo.conf
+# End LILO global section
+# Linux root partition section
+image = $KERNEL
+ root = $ROOT_DEVICE
+ label = Linux
+ read-only
+# End root Linux partition section
+EOF
+   installcolor;
+   return
+  fi # Use Boot Manager
+ fi # Boot Manager detected
+ # If we got here, we either don't have boot manager or don't want to use it
+ dialog --title "SELECT LILO DESTINATION" $DEFAULT --menu \
+"LILO can be installed to a variety of places:\n\
+\n\
+  1. The superblock of your root Linux partition.  (which could\n\
+     be made the bootable partition with Windows or Linux fdisk, or\n\
+     booted with a program like OS/2 Boot Manager)\n\
+  2. A formatted floppy disk.\n\
+  3. The Master Boot Record of your first hard drive.\n\
+\n\
+Options 1 and 2 are the safest, but option 1 does require a little\n\
+extra work later (setting the partition bootable with fdisk).\n\
+Which option would you like?" \
+ 20 72 3 \
+ "Root" "Install to superblock (not for use with XFS)" \
+ "Floppy" "Install to a formatted floppy in /dev/fd0 (A:)" \
+ "MBR" "Install to Master Boot Record" \
+ 2> $TMP/reply
+ if [ $? = 1 -o $? = 255 ]; then
+  exit
+ fi
+ TG="`cat $TMP/reply`"
+ rm -r $TMP/reply
+ if [ "$TG" = "MBR" ]; then
+  MBR_TARGET=/dev/sda
+  echo $MBR_TARGET > $TMP/LILOMBR
+  cat /proc/partitions | while read LINE ; do
+   MAJOR="`echo $LINE | cut -f 1 -d ' '`"
+   MINOR="`echo $LINE | cut -f 2 -d ' '`"
+   if [ ! "$MINOR" = "0" -a ! "$MINOR" = "64" ]; then # ignore whole devices to weed out CD drives
+    if [ "$MAJOR" = "3" ]; then
+     MBR_TARGET=/dev/hda
+     echo $MBR_TARGET > $TMP/LILOMBR
+    elif [ "$MAJOR" = "22" -a ! "$MBR_TARGET" = "/dev/hda" ]; then
+     MBR_TARGET=/dev/hdc
+     echo $MBR_TARGET > $TMP/LILOMBR
+    elif [ "$MAJOR" = "33" -a ! "$MBR_TARGET" = "/dev/hda" -a ! "$MBR_TARGET" = "/dev/hdc" ]; then
+     MBR_TARGET=/dev/hde
+     echo $MBR_TARGET > $TMP/LILOMBR
+    elif [ "$MAJOR" = "34" -a ! "$MBR_TARGET" = "/dev/hda" -a ! "$MBR_TARGET" = "/dev/hdc" -a ! "$MBR_TARGET" = "/dev/hde" ]; then
+     MBR_TARGET=/dev/hdg
+     echo $MBR_TARGET > $TMP/LILOMBR
+    fi
+   fi
+  done
+  LILO_TARGET=`cat $TMP/LILOMBR`
+ elif [ "$TG" = "Root" ]; then
+  LILO_TARGET=`echo $ROOT_DEVICE`
+ elif [ "$TG" = "Floppy" ]; then
+  LILO_TARGET="/dev/fd0"
+ fi
+ cat << EOF > $T_PX/etc/lilo.conf
+# LILO configuration file
+# generated by 'liloconfig'
+#
+# Start LILO global section
+EOF
+ if [ ! "$APPEND" = "" -o ! "$UTFVT" = "" ]; then
+  echo "# Append any additional kernel parameters:" >> $T_PX/etc/lilo.conf
+  echo "append=\"$APPEND $UTFVT\"" >> $T_PX/etc/lilo.conf
+ fi
+ cat << EOF >> $T_PX/etc/lilo.conf
+boot = $LILO_TARGET
+
+# Boot BMP Image.
+# Bitmap in BMP format: 640x480x8
+  bitmap = /boot/slack.bmp
+# Menu colors (foreground, background, shadow, highlighted
+# foreground, highlighted background, highlighted shadow):
+  bmp-colors = 255,0,255,0,255,0
+# Location of the option table: location x, location y, number of
+# columns, lines per column (max 15), "spill" (this is how many
+# entries must be in the first column before the next begins to
+# be used.  We don't specify it here, as there's just one column.
+  bmp-table = 60,6,1,16
+# Timer location x, timer location y, foreground color,
+# background color, shadow color.
+  bmp-timer = 65,27,0,255
+
+# Standard menu.
+# Or, you can comment out the bitmap menu above and 
+# use a boot message with the standard menu:
+#message = /boot/boot_message.txt
+
+# Wait until the timeout to boot (if commented out, boot the
+# first entry immediately):
+prompt
+# Timeout before the first entry boots.
+# This is given in tenths of a second, so 600 for every minute:
+timeout = 1200
+# Override dangerous defaults that rewrite the partition table:
+change-rules
+  reset
+EOF
+ if [ "$CONSOLETYPE" = "standard" ]; then
+   cat << EOF >> $T_PX/etc/lilo.conf
+# Normal VGA console
+vga = normal
+# VESA framebuffer console @ 1024x768x64k
+# vga=791
+# VESA framebuffer console @ 1024x768x32k
+# vga=790
+# VESA framebuffer console @ 1024x768x256
+# vga=773
+# VESA framebuffer console @ 800x600x64k
+# vga=788
+# VESA framebuffer console @ 800x600x32k
+# vga=787
+# VESA framebuffer console @ 800x600x256
+# vga=771
+# VESA framebuffer console @ 640x480x64k
+# vga=785
+# VESA framebuffer console @ 640x480x32k
+# vga=784
+# VESA framebuffer console @ 640x480x256
+# vga=769
+EOF
+ else
+   cat << EOF >> $T_PX/etc/lilo.conf
+# VESA framebuffer console @ $CONSOLETYPE
+vga = $CONSOLENUM
+# Normal VGA console
+# vga = normal
+# VESA framebuffer console @ 1024x768x64k
+# vga=791
+# VESA framebuffer console @ 1024x768x32k
+# vga=790
+# VESA framebuffer console @ 1024x768x256
+# vga=773
+# VESA framebuffer console @ 800x600x64k
+# vga=788
+# VESA framebuffer console @ 800x600x32k
+# vga=787
+# VESA framebuffer console @ 800x600x256
+# vga=771
+# VESA framebuffer console @ 640x480x64k
+# vga=785
+# VESA framebuffer console @ 640x480x32k
+# vga=784
+# VESA framebuffer console @ 640x480x256
+# vga=769
+EOF
+ fi
+cat << EOF >> $T_PX/etc/lilo.conf
+# End LILO global section
+EOF
+ # OK, now let's look for Windows partitions:
+ DOSP="`PROBE -l | grep "DOS
+Win
+W95
+FAT12
+FAT16
+HPFS" | grep -v "Ext'd" | grep -v "Extend" | sort`"
+ DOSP="`echo $DOSP | cut -f 1 -d ' '`"
+ if [ ! "$DOSP" = "" ]; then
+  TABLE="`echo $DOSP | cut -b1-8`"
+  cat << EOF >> $T_PX/etc/lilo.conf
+# Windows bootable partition config begins
+other = $DOSP
+  label = Windows
+  table = $TABLE
+# Windows bootable partition config ends
+EOF
+  echo "Windows  -  (Windows FAT/NTFS partition)" >> $T_PX/boot/boot_message.txt
+ fi
+ # Next, we search for Linux partitions:
+ LNXP="`PROBE -l | grep "Linux$"`" 
+ LNXP="`echo $LNXP | cut -f 1 -d ' ' | sort`"
+ if [ ! "$LNXP" = "" ]; then
+  cat << EOF >> $T_PX/etc/lilo.conf
+# Linux bootable partition config begins
+image = $KERNEL
+  root = $ROOT_DEVICE
+  label = Linux
+  read-only
+# Linux bootable partition config ends
+EOF
+  echo "Linux    -  (Linux partition)" >> $T_PX/boot/boot_message.txt
+ fi
+# DEAD CODE, BUT IN CASE OS/2 MAKES A COMEBACK!
+# # OK, hopefully we can remember how to deal with OS/2 :^)
+# OS2P="`PROBE -l | grep "HPFS"`"
+# OS2P="`echo $OS2P | cut -f 1 -d ' ' | sort`"
+# if [ ! "$OS2P" = "" ]; then
+#  TABLE="`echo $OS2P | cut -b1-8`"
+#  if [ "$TABLE" = "/dev/hda" ]; then
+#   cat << EOF >> $T_PX/etc/lilo.conf
+## OS/2 bootable partition config begins
+#other = $OS2P
+#  label = OS2
+#  table = $TABLE
+## OS/2 bootable partition config ends
+#EOF
+#  else
+#    cat << EOF >> $T_PX/etc/lilo.conf
+## OS/2 bootable partition config begins
+#other = $OS2P
+#  label = OS2
+#  table = $TABLE
+#  loader = /boot/os2_d.b
+##  map-drive = 0x80
+##   to = 0x81
+##  map-drive = 0x81
+##   to = 0x80
+## OS/2 bootable partition config ends
+#EOF
+#   echo "OS2     - OS/2 Warp (HPFS partition)" >> $T_PX/boot/boot_message.txt
+#  fi
+# fi
+ echo >> $T_PX/boot/boot_message.txt
+ # Done, now we must install lilo:
+ installcolor;
+}
+
+checkp_text()
+{
+ if [ ! -r $1 ]; then
+  echo
+  echo "I can't find a device named '$1'!"
+  echo
+  echo -n "Are you sure you want to use this device name [y]es, [n]o? "
+  read use_device;
+  if [ ! "$use_device" = "y" ]; then
+   return 1;
+  fi
+  return 0;
+ fi
+}
+
+checkp_dialog()
+{
+ if [ ! -r $1 ]; then
+  dialog --title "DEVICE FILE NOT FOUND" --yesno "I can't find a \
+device named '$1'. Are you sure you want to use this device \
+name?" 7 60
+  return $?;
+ fi
+}
+
+installcolor()
+{
+ dialog --infobox "\nInstalling the Linux Loader..." 5 40
+ if [ "$T_PX" = "/" ]; then
+  lilo 1> /dev/null 2> /etc/lilo-error.$$
+  SUCCESS=$?
+ else
+  lilo -r $T_PX -m /boot/map -C /etc/lilo.conf 1> /dev/null 2> /etc/lilo-error.$$
+  SUCCESS=$?
+ fi
+ if [ ! "$SUCCESS" = "0" ]; then # edit file to try lba32 mode:
+  cat $T_PX/etc/lilo.conf | while read line ; do
+   echo $line
+   if [ "$line" = "# Start LILO global section" ] ; then
+     echo "lba32 # Allow booting past 1024th cylinder with a recent BIOS"
+   fi
+  done > $T_PX/etc/lilo.conf.lba32
+  mv $T_PX/etc/lilo.conf.lba32 $T_PX/etc/lilo.conf
+  if [ "$T_PX" = "/" ]; then
+   lilo 1> /dev/null 2> /etc/lilo-error.$$
+   SUCCESS=$?
+  else
+   lilo -r $T_PX -m /boot/map -C /etc/lilo.conf 1> /dev/null 2> /etc/lilo-error.$$
+   SUCCESS=$?
+  fi
+ fi
+ sleep 1
+ if [ ! "$SUCCESS" = "0" ]; then # some LILO error occured
+  echo >> /etc/lilo-error.$$
+cat << EOF >> /etc/lilo-error.$$
+Sorry, but the attempt to install LILO has returned an error, so LILO \
+has not been correctly installed.  You'll have to use a bootdisk \
+to start your \
+machine instead.  It should still be possible to get LILO working by \
+editing the /etc/lilo.conf and reinstalling LILO manually.  See the \
+LILO man page and documentation in /usr/doc/lilo/ for more help.  \
+The error message may be seen above.
+EOF
+  dialog --msgbox "$(cat /etc/lilo-error.$$)" 0 0
+ fi
+}
+
+installtext()
+{
+ echo "Installing the Linux Loader..."
+ if [ "$T_PX" = "/" ]; then
+  lilo
+  SUCCESS=$?
+ else
+  lilo -r $T_PX -m /boot/map -C /etc/lilo.conf
+  SUCCESS=$?
+ fi
+ if [ ! "$SUCCESS" = "0" ]; then # try lba32 mode:
+  cat $T_PX/etc/lilo.conf | while read line ; do
+   echo $line
+   if [ "$line" = "# Start LILO global section" ] ; then
+     echo "lba32 # Allow booting past 1024th cylinder with a recent BIOS"
+   fi
+  done > $T_PX/etc/lilo.conf.lba32
+  mv $T_PX/etc/lilo.conf.lba32 $T_PX/etc/lilo.conf
+  if [ "$T_PX" = "/" ]; then
+   lilo 1> /dev/null 2> /dev/null
+   SUCCESS=$?
+  else
+   lilo -r $T_PX -m /boot/map -C /etc/lilo.conf 1> /dev/null 2> /dev/null
+   SUCCESS=$?
+  fi
+ fi
+ sleep 1
+ if [ ! "$SUCCESS" = "0" ]; then # some LILO error occured
+  cat << EOF
+
+LILO INSTALL ERROR # $SUCCESS
+
+Sorry, but the attempt to install LILO has returned an error, so LILO
+has not been correctly installed.  You'll have to use a bootdisk to
+start your machine instead.  It should still be possible to get LILO
+working by editing the /etc/lilo.conf and reinstalling LILO manually.
+See the LILO man page and documentation in /usr/doc/lilo/ for more
+help.
+
+EOF
+ fi
+}
+
+# 'probe()' borrowed from LILO QuickInst.
+probe()
+{
+ [ ! -z "`dd if=$1 bs=1 count=1 2>/dev/null | tr '\0' x`" ]
+ return
+}
+
+# Figure out if we're installing from the hard drive
+if [ -r $TMP/SeTT_PX ]; then
+ T_PX="`cat $TMP/SeTT_PX`"
+else
+ if [ "$T_PX" = "" -a ! "$1" = "" ]; then
+  T_PX=$1
+ else
+  T_PX=/
+ fi
+fi
+HDR="no" # this means the header section of /etc/lilo.conf has not yet
+         # been configured
+LNX="no" # this means no Linux partition has been defined as bootable
+         # through LILO. Both of these must change to "yes" before LILO will
+         # install from this script.
+# Determine the root partition (such as /dev/hda2)
+ROOT_DEVICE=$2
+if [ "$ROOT_DEVICE" = "" ]; then
+ if [ -r $TMP/SeTrootdev ]; then
+  ROOT_DEVICE="`cat $TMP/SeTrootdev`"
+ else
+  ROOT_DEVICE="`mount | cut -f 1 -d " " | sed -n "1 p"`"
+ fi
+fi
+# Figure out where the kernel is:
+ARCHTYPE=i386
+if [ -r $T_PX/vmlinuz ]; then
+  KERNEL=/vmlinuz
+elif [ -r $T_PX/boot/vmlinuz ]; then
+  KERNEL=/boot/vmlinuz
+elif [ -r $T_PX/usr/src/linux/arch/$ARCHTYPE/boot/bzImage ]; then
+  KERNEL=/usr/src/linux/arch/$ARCHTYPE/boot/bzImage
+elif [ -r $T_PX/usr/src/linux/arch/$ARCHTYPE/boot/zImage ]; then
+  KERNEL=/usr/src/linux/arch/$ARCHTYPE/boot/zImage
+else
+  exit 99 # no kernel?  guess you couldn't read.  bye bye.
+fi
+
+ # If we're installing from the umsdos.gz rootdisk, suggest skipping LILO:
+ if [ ! "$T_PX" = "/" ]; then
+   if mount | grep " on /mnt " | grep umsdos 1> /dev/null 2> /dev/null ; then
+     dialog --title "SKIP LILO CONFIGURATION? (RECOMMENDED)" --yesno "Since \
+you are installing to a FAT partition, it's suggested that you do not \
+configure LILO at this time.  (Instead, use your bootdisk.  For booting \
+off the hard drive from MS-DOS, you can use Loadlin.  You'll find \
+Loadlin on your hard drive in \LINUX\ROOT) Skip LILO configuration \
+(highly recommended)?" 10 70
+     if [ $? = 0 ]; then
+       exit
+     fi 
+   fi
+ fi
+ # OK, now let's see if we should automate things:
+ dialog --title "INSTALL LILO" --menu "LILO (Linux Loader) is a generic \
+boot loader.  There's a simple installation which tries to automatically \
+set up LILO to boot Linux (also Windows if found).  For \
+more advanced users, the expert option offers more control over the \
+installation process.  Since LILO does not work in all cases (and can \
+damage partitions if incorrectly installed), there's the third (safe) \
+option, which is to skip installing LILO for now.  You can always install \
+it later with the 'liloconfig' command.  Which option would you like?" \
+ 18 67 3 \
+ "simple" "Try to install LILO automatically" \
+ "expert" "Use expert lilo.conf setup menu" \
+ "skip" "Do not install LILO" 2> $TMP/reply
+ if [ $? = 1 -o $? = 255 ]; then
+  exit
+ fi
+ REPLY="`cat $TMP/reply`"
+ rm -f $TMP/reply
+ if [ "$REPLY" = "skip" ]; then
+  exit
+ elif [ "$REPLY" = "simple" ]; then
+  # Do simple LILO setup
+  simplelilo
+  exit
+ fi
+ # drop through to last option: (use the expert menus)
+ while [ 0 ]; do
+  dialog --title "EXPERT LILO INSTALLATION" --menu \
+"This menu directs the creation of the LILO config file, lilo.conf. \
+To install, you make a new LILO configuration file by creating a new header \
+and then adding one or more bootable partitions to the file. Once you've done \
+this, you can select the install option. Alternately, if you already have an \
+/etc/lilo.conf, you may reinstall using that. If you make a mistake, you can \
+always start over by choosing 'Begin'. \
+Which option would you like?" 21 73 8 \
+"Begin" "Start LILO configuration with a new LILO header" \
+"Linux" "Add a Linux partition to the LILO config" \
+"Windows" "Add a Windows FAT or NTFS partition to the LILO config" \
+"Install" "Install LILO" \
+"Recycle" "Reinstall LILO using the existing lilo.conf" \
+"Skip" "Skip LILO installation and exit this menu" \
+"View" "View your current /etc/lilo.conf" \
+"Help" "Read the Linux Loader HELP file"  2> $TMP/reply
+  if [ $? = 1 -o $? = 255 ]; then
+   REPLY="Skip"
+  else
+   REPLY="`cat $TMP/reply`"
+  fi
+  rm -r $TMP/reply
+  if [ "$REPLY" = "Begin" ]; then
+   ask_append;
+   if [ $? = 1 -o $? = 255 ]; then
+    APPEND=""
+    HDR="no"
+    continue;
+   else
+    APPEND="`cat $TMP/reply`"
+   fi
+   ask_utf;
+   if [ $? = 1 -o $? = 255 ]; then
+    UTFVT="vt.default_utf8=0"
+   else
+    UTFVT="vt.default_utf8=1"
+   fi
+   use_framebuffer;
+   dialog --title "SELECT LILO TARGET LOCATION" $DEFAULT --menu "LILO can be installed \
+to a variety of places:  \
+the superblock of your root Linux partition (which could then be made the \
+bootable partition with fdisk), a formatted floppy disk, \
+or the master boot record of your first hard drive.  If you're using \
+a boot system such as Boot Manager, you should use the "Root" \
+selection.  Please pick a target location:" 15 65 3 \
+"Root" "Install to superblock (not for use with XFS)" \
+"Floppy" "Use a formatted floppy disk in the boot drive" \
+"MBR" "Use the Master Boot Record (possibly unsafe)" \
+2> $TMP/reply
+   if [ $? = 1 -o $? = 255 ]; then
+    HDR="no"
+    continue;
+   else
+    LNX="no"
+    TG="`cat $TMP/reply`"
+   fi
+   rm -r $TMP/reply
+   if [ "$TG" = "MBR" ]; then
+    MBR_TARGET=/dev/sda
+    echo $MBR_TARGET > $TMP/LILOMBR
+    cat /proc/partitions | while read LINE ; do
+     MAJOR="`echo $LINE | cut -f 1 -d ' '`"
+     MINOR="`echo $LINE | cut -f 2 -d ' '`"
+     if [ ! "$MINOR" = "0" -a ! "$MINOR" = "64" ]; then # ignore whole devices to weed out CD drives
+      if [ "$MAJOR" = "3" ]; then
+       MBR_TARGET=/dev/hda
+       echo $MBR_TARGET > $TMP/LILOMBR
+      elif [ "$MAJOR" = "22" -a ! "$MBR_TARGET" = "/dev/hda" ]; then
+       MBR_TARGET=/dev/hdc
+       echo $MBR_TARGET > $TMP/LILOMBR
+      elif [ "$MAJOR" = "33" -a ! "$MBR_TARGET" = "/dev/hda" -a ! "$MBR_TARGET" = "/dev/hdc" ]; then
+       MBR_TARGET=/dev/hde
+       echo $MBR_TARGET > $TMP/LILOMBR
+      elif [ "$MAJOR" = "34" -a ! "$MBR_TARGET" = "/dev/hda" -a ! "$MBR_TARGET" = "/dev/hdc" -a ! "$MBR_TARGET" = "/dev/hde" ]; then
+       MBR_TARGET=/dev/hdg
+       echo $MBR_TARGET > $TMP/LILOMBR
+      fi
+     fi
+    done
+    LILO_TARGET=`cat $TMP/LILOMBR`
+    dialog --title "CONFIRM LOCATION TO INSTALL LILO" --inputbox \
+"The auto-detected location to install the LILO boot block is shown below.  \
+If you need to make any changes, you can make them below.  Otherwise, hit \
+ENTER to accept the target location shown." 11 60 $LILO_TARGET 2> $TMP/reply
+    if [ $? = 0 ]; then
+      LILO_TARGET="`cat $TMP/reply`"
+    fi
+    rm -f $TMP/reply
+   elif [ "$TG" = "Root" ]; then
+    LILO_TARGET=`echo $ROOT_DEVICE`
+   elif [ "$TG" = "Floppy" ]; then
+    LILO_TARGET="/dev/fd0"    
+   else
+    HDR="no"
+    continue;
+   fi
+   dialog --title "CHOOSE LILO TIMEOUT" --menu "At boot time, how long would \
+you like LILO to wait for you to select an operating system?  If you \
+let LILO time out, it will boot the first OS in the configuration file by \
+default." 13 74 4 \
+"None" "Don't wait at all - boot straight into the first OS" \
+"5" "5 seconds" \
+"30" "30 seconds" \
+"Forever" "Present a prompt and wait until a choice is made" 2> $TMP/reply
+   if [ $? = 1 -o $? = 255 ]; then
+    HDR="no"
+    continue;
+   else
+    TIMEOUT="`cat $TMP/reply`"
+   fi
+   rm -r $TMP/reply
+   if [ "$TIMEOUT" = "None" ]; then 
+    PROMPT="#prompt"
+    TIMEOUT="#timeout = 5"
+   elif [ "$TIMEOUT" = "5" ]; then
+    PROMPT="prompt"
+    TIMEOUT="timeout = 50"
+   elif [ "$TIMEOUT" = "30" ]; then
+    PROMPT="prompt"
+    TIMEOUT="timeout = 300" 
+   elif [ "$TIMEOUT" = "Forever" ]; then
+    PROMPT="prompt"
+    TIMEOUT="#timeout = 300"
+   else
+    HDR="no"
+    continue;
+   fi
+   cat << EOF > $TMP/lilo.conf
+# LILO configuration file
+# generated by 'liloconfig'
+#
+# Start LILO global section
+boot = $LILO_TARGET
+#compact        # faster, but won't work on all systems.
+EOF
+   # Boot splash
+   if [ "$PROMPT" = "prompt" ]; then
+    if ask_boot_splash ; then
+     boot_bmp >> $TMP/lilo.conf
+     cat << EOF >> $TMP/lilo.conf
+# Standard menu.
+# Or, you can comment out the bitmap menu above and
+# use a boot message with the standard menu:
+#message = /boot/boot_message.txt
+
+EOF
+    fi
+   else
+    cat << EOF >> $TMP/lilo.conf
+# Standard menu.
+message = /boot/boot_message.txt
+
+EOF
+   fi
+   if [ ! "$APPEND" = "" -o ! "$UTFVT" = "" ]; then
+     echo "# Append any additional kernel parameters:" >> $TMP/lilo.conf
+     echo "append=\"$APPEND $UTFVT\"" >> $TMP/lilo.conf
+   fi
+   cat << EOF >> $TMP/lilo.conf
+$PROMPT
+$TIMEOUT
+EOF
+   if [ "$CONSOLETYPE" = "standard" ]; then
+     cat << EOF >> $TMP/lilo.conf
+# Normal VGA console
+vga = normal
+# VESA framebuffer console @ 1024x768x64k
+# vga=791
+# VESA framebuffer console @ 1024x768x32k
+# vga=790
+# VESA framebuffer console @ 1024x768x256
+# vga=773
+# VESA framebuffer console @ 800x600x64k
+# vga=788
+# VESA framebuffer console @ 800x600x32k
+# vga=787
+# VESA framebuffer console @ 800x600x256
+# vga=771
+# VESA framebuffer console @ 640x480x64k
+# vga=785
+# VESA framebuffer console @ 640x480x32k
+# vga=784
+# VESA framebuffer console @ 640x480x256
+# vga=769
+EOF
+   else
+     cat << EOF >> $TMP/lilo.conf
+# VESA framebuffer console @ $CONSOLETYPE
+vga = $CONSOLENUM
+# Normal VGA console
+# vga = normal
+# VESA framebuffer console @ 1024x768x64k
+# vga=791
+# VESA framebuffer console @ 1024x768x32k
+# vga=790
+# VESA framebuffer console @ 1024x768x256
+# vga=773
+# VESA framebuffer console @ 800x600x64k
+# vga=788
+# VESA framebuffer console @ 800x600x32k
+# vga=787
+# VESA framebuffer console @ 800x600x256
+# vga=771
+# VESA framebuffer console @ 640x480x64k
+# vga=785
+# VESA framebuffer console @ 640x480x32k
+# vga=784
+# VESA framebuffer console @ 640x480x256
+# vga=769
+EOF
+   fi
+   cat << EOF >> $TMP/lilo.conf
+# ramdisk = 0     # paranoia setting
+# End LILO global section
+EOF
+    HDR="yes"
+  elif [ "$REPLY" = "Linux" ]; then
+   if [ "$HDR" = "yes" ]; then
+    echo "These are your Linux partitions:" > $TMP/tmpmsg
+    echo >> $TMP/tmpmsg
+    echo "   Device Boot      Start         End      Blocks   Id  System" >> $TMP/tmpmsg
+    PROBE -l | grep "Linux$" | sort >> $TMP/tmpmsg
+    echo >> $TMP/tmpmsg
+    echo "Which one would you like LILO to boot?" >> $TMP/tmpmsg
+    dialog --title "SELECT LINUX PARTITION" --no-collapse --inputbox \
+"`cat $TMP/tmpmsg`" 21 74 2> $TMP/reply
+    if [ $? = 1 -o $? = 255 ]; then
+     rm $TMP/tmpmsg
+     continue
+    fi
+    rm $TMP/tmpmsg
+    LINUX_PART="`cat $TMP/reply`"
+    checkp_dialog $LINUX_PART
+    if [ ! $? = 0 ]; then
+     continue;
+    fi
+    dialog --title "SELECT PARTITION NAME" --inputbox \
+"Now you must select a short, unique name for this partition. \
+You'll use this name if you specify a partition to boot at the \
+LILO prompt. 'Linux' might not be a bad choice. THIS MUST BE A \
+SINGLE WORD." 11 60 2> $TMP/reply
+    if [ $? = 1 -o $? = 255 ]; then
+     continue
+    fi
+    LABEL="`cat $TMP/reply`"
+    cat << EOF >> $TMP/lilo.conf
+# Linux bootable partition config begins
+image = $KERNEL
+  root = $LINUX_PART
+  label = $LABEL
+  read-only  # Partitions should be mounted read-only for checking
+# Linux bootable partition config ends
+EOF
+   else
+    dialog --title "CAN'T ADD LINUX PARTITION" --msgbox "You can't add \
+partitions unless you start over with a new LILO header." 6 60
+    continue
+   fi
+   LNX="yes"
+  # MORE OS/2 DEAD CODE...  DOESN'T HURT.
+  # THIS ITEM HAS LONG BEEN REMOVED FROM THE MENU...
+  elif [ "$REPLY" = "OS/2" ]; then
+   if [ "$HDR" = "yes" ]; then
+    echo "These are possibly OS/2 partitions. They will be treated" > $TMP/tmpmsg
+    echo "as such if you install them using this menu." >> $TMP/tmpmsg
+    echo >> $TMP/tmpmsg
+    echo "   Device Boot      Start         End      Blocks   Id  System" >> $TMP/tmpmsg
+    PROBE -l | grep DOS | sort >> $TMP/tmpmsg
+    PROBE -l | grep HPFS | sort >> $TMP/tmpmsg
+    echo >> $TMP/tmpmsg
+    echo "Which one would you like LILO to boot?" >> $TMP/tmpmsg
+    dialog --title "SELECT OS/2 PARTITION" --no-collapse --inputbox \
+"`cat $TMP/tmpmsg`" 20 74 2> $TMP/reply
+    if [ $? = 1 -o $? = 255 ]; then
+     rm $TMP/tmpmsg
+     continue
+    fi
+    rm $TMP/tmpmsg
+    OS_2_PART="`cat $TMP/reply`"
+    checkp_dialog $OS_2_PART
+    if [ ! $? = 0 ]; then
+     continue;
+    fi
+    dialog --title "SELECT PARTITION NAME" --inputbox \
+"Now you must select a short, unique name for this partition. \
+You'll use this name if you specify a partition to boot at the \
+LILO prompt. 'OS/2' might not be a bad choice. THIS MUST BE A \
+SINGLE WORD."  11 60 2> $TMP/reply
+    if [ $? = 1 -o $? = 255 ]; then
+     continue
+    fi
+    LABEL="`cat $TMP/reply`"
+    TABLE="`echo $OS_2_PART | cut -b1-8`"
+    if [ "`echo $TABLE | cut -b6-8`" = "hda" ]; then
+     cat << EOF >> $TMP/lilo.conf
+# OS/2 bootable partition config begins
+other = $OS_2_PART
+  label = $LABEL
+  table = $TABLE
+# OS/2 bootable partition config ends
+EOF
+    else
+     cat << EOF >> $TMP/lilo.conf
+# OS/2 bootable partition config begins
+other = $OS_2_PART
+  label = $LABEL
+  table = $TABLE
+  loader = /boot/os2_d.b
+#  map-drive = 0x80
+#   to = 0x81
+#  map-drive = 0x81
+#   to = 0x80
+# OS/2 bootable partition config ends
+EOF
+    fi
+   else
+    dialog --title "CAN'T ADD OS/2 PARTITION" --msgbox "You can't add \
+partitions unless you start over with a new LILO header." 6 60
+    continue
+   fi
+   LNX="yes"
+  elif [ "$REPLY" = "Windows" ]; then
+   if [ "$HDR" = "yes" ]; then
+    echo "These are possibly Windows or DOS partitions. They will be treated" > $TMP/tmpmsg
+    echo "as such if you install them using this menu." >> $TMP/tmpmsg
+    echo >> $TMP/tmpmsg
+    echo "   Device Boot      Start         End      Blocks   Id  System" >> $TMP/tmpmsg
+    PROBE -l | grep "DOS
+Win
+W95
+FAT12
+FAT16
+HPFS" | grep -v "Ext'd" | grep -v "Extend" | sort >> $TMP/tmpmsg
+    echo >> $TMP/tmpmsg
+    echo "Which one would you like LILO to boot?" >> $TMP/tmpmsg
+    dialog --title "SELECT WINDOWS PARTITION" --no-collapse --inputbox \
+"`cat $TMP/tmpmsg`" 20 74 2> $TMP/reply
+    if [ $? = 1 -o $? = 255 ]; then
+     rm $TMP/tmpmsg
+     continue
+    fi
+    rm $TMP/tmpmsg
+    DOSPART="`cat $TMP/reply`"
+    checkp_dialog $DOSPART
+    if [ ! $? = 0 ]; then
+     continue;
+    fi
+    dialog --title "SELECT PARTITION NAME" --inputbox \
+"Now you must select a short, unique name for this partition. \
+You'll use this name if you specify a partition to boot at the \
+LILO prompt. 'Windows' might not be a bad choice. THIS MUST BE A \
+SINGLE WORD." 11 60 2> $TMP/reply
+    if [ $? = 1 -o $? = 255 ]; then
+     continue
+    fi
+    LABEL="`cat $TMP/reply`"
+    unset USE_LOADER
+    TABLE="`echo $DOSPART | cut -b1-8`"
+    if [ "`echo $TABLE | cut -b6-8`" = "hda" ]; then
+     USE_LOADER="no"
+    fi
+    if [ "`echo $TABLE | cut -b6-8`" = "sda" ]; then
+     if probe /dev/hda; then
+      USE_LOADER="yes"
+     else
+      USE_LOADER="no"
+     fi
+    fi
+    if [ "$USE_LOADER" = "no" ]; then
+     cat << EOF >> $TMP/lilo.conf
+# Windows bootable partition config begins
+other = $DOSPART
+  label = $LABEL
+  table = $TABLE
+# Windows bootable partition config ends
+EOF
+    else
+     cat << EOF >> $TMP/lilo.conf
+# Windows bootable partition config begins
+other = $DOSPART
+  label = $LABEL
+#  map-drive = 0x80
+#   to = 0x81
+#  map-drive = 0x81
+#   to = 0x80
+  table = $TABLE
+# Windows bootable partition config ends
+EOF
+    fi
+   else
+    dialog --title "CAN'T ADD WINDOWS PARTITION" --msgbox "You can't add \
+partitions unless you start over with a new LILO header." 6 60
+    continue
+   fi
+   LNX="yes"
+  elif [ "$REPLY" = "Install" -o "$REPLY" = "Recycle" ]; then
+   if [ "$REPLY" = "Recycle" -a -r $T_PX/etc/lilo.conf ]; then
+    LNX="yes"
+   fi
+   if [ "$LNX" = "no" ]; then
+    dialog --title "CAN'T INSTALL LILO" --msgbox "LILO could not be \
+installed. If you have not created a LILO configuration file by defining \
+a new header and adding at least one bootable partition to it, you must do \
+so before installing LILO. If you were attempting to use an existing LILO \
+configuration file, it could not be found. Try making a new one." 9 70
+    continue
+   else
+    if [ "$REPLY" = "Install" ]; then
+     if [ -r $TMP/lilo.conf ]; then
+      if [ -r $T_PX/etc/lilo.conf ]; then
+       mv $T_PX/etc/lilo.conf $T_PX/etc/lilo.conf.bak
+      fi
+      cp $TMP/lilo.conf $T_PX/etc/lilo.conf
+      chmod 644 $T_PX/etc/lilo.conf
+     fi
+    fi    
+    installcolor;
+   fi
+   rm -f $TMP/tmpmsg $TMP/reply
+   break
+  elif [ "$REPLY" = "Skip" ]; then
+   rm -f $TMP/tmpmsg $TMP/reply
+   break
+  elif [ "$REPLY" = "View" ]; then
+   if [ -r $TMP/lilo.conf ]; then
+    dialog --title "YOUR NEW /etc/lilo.conf" --textbox "$TMP/lilo.conf" 22 70
+   else
+    if [ -r /mnt/etc/lilo.conf ]; then
+     dialog --title "YOUR OLD /etc/lilo.conf" --textbox "/mnt/etc/lilo.conf" 22 70
+    elif [ "$T_PX" = "/" -a -r /etc/lilo.conf ]; then
+     dialog --title "YOUR OLD /etc/lilo.conf" --textbox "/etc/lilo.conf" 22 70
+    else
+     dialog --title "NO CONFIG FILE FOUND" --msgbox "Sorry, but you don't \
+have a LILO configuration file that can be viewed." 6 60
+    fi
+   fi
+  elif [ "$REPLY" = "Help" ]; then
+   dialog --title "LILO INSTALLATION HELP" --textbox "$T_PX/var/log/setup/text.lilohelp" 22 68
+  fi
+ done
+
diff --git a/source/a/lilo/setup.liloconfig b/source/a/lilo/setup.liloconfig
new file mode 100644
index 000000000..0b9798542
--- /dev/null
+++ b/source/a/lilo/setup.liloconfig
@@ -0,0 +1,3 @@
+#!/bin/sh
+#BLURB="Set up LILO to boot Linux (and other OSes) from your hard drive"
+sh sbin/liloconfig $*
diff --git a/source/a/lilo/slack-desc b/source/a/lilo/slack-desc
new file mode 100644
index 000000000..db5daf651
--- /dev/null
+++ b/source/a/lilo/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------------------------------------------------------|
+lilo: lilo (Linux Loader)
+lilo:
+lilo: Generic Boot Loader for Linux ('LInux LOader') by Werner Almesberger.
+lilo: LILO boots Linux from your hard drive. It can also boot other
+lilo: operating systems such as MS-DOS and OS/2, and can even boot DOS from
+lilo: the second hard drive. LILO comes with utilities and documentation
+lilo: that make it easier to install, such as 'liloconfig' and 'QuickStart'.
+lilo: NOTE: Installing boot loaders is inherently dangerous. Be sure to have
+lilo: some means to boot your system from a different media if you install
+lilo: LILO on your hard disk.
+lilo:
diff --git a/source/a/lilo/slack.bmp b/source/a/lilo/slack.bmp
new file mode 100644
index 000000000..3dd5652a8
--- /dev/null
+++ b/source/a/lilo/slack.bmp
diff --git a/source/a/lilo/slack.dat b/source/a/lilo/slack.dat
new file mode 100644
index 000000000..73c557e61
--- /dev/null
+++ b/source/a/lilo/slack.dat
@@ -0,0 +1,7 @@
+#
+# generated companion file to:
+#
+bitmap = slack.bmp
+bmp-table = 60,6;1,16,16,4
+bmp-colors = 255,0,;0,255,
+bmp-timer = 65,28;255,0,
diff --git a/source/a/lilo/slack64.bmp b/source/a/lilo/slack64.bmp
new file mode 100644
index 000000000..464e4683e
--- /dev/null
+++ b/source/a/lilo/slack64.bmp
diff --git a/source/a/lilo/text.lilohelp b/source/a/lilo/text.lilohelp
new file mode 100644
index 000000000..9f06bf785
--- /dev/null
+++ b/source/a/lilo/text.lilohelp
@@ -0,0 +1,100 @@
+
+Slackware LILO Installation HELP file
+
+WARNING: As they say in the LILO docs, installing boot 
+loaders is inherently dangerous. Be careful out there!
+
+These are the options you can use at the Slackware LILO
+install menu:
+
+1. Start LILO configuration with a new LILO header.
+
+   This choice allows you to start a new configuration 
+   file, /etc/lilo.conf, with no OS's entered into it 
+   (yet).
+
+   You'll first be asked if you want to use an optional
+   append="...." line. If you didn't need to use extra 
+   parameters at the bootkernel prompt, then you can
+   probably just hit ENTER here.
+
+   You will be asked where you want to install LILO. This
+   can be your Master Boot Record, your root partition's
+   superblock (for OS/2's Boot Manager), or to a 
+   formatted floppy disk. 
+   
+   Next, you'll be asked if you want a delay before 
+   booting the first OS in your lilo.conf file. This delay
+   allows you to hit left-shift and boot any OS in the 
+   lilo.conf file by typing in the label you've given it.
+
+   Once you've started a new lilo.conf, you must add at 
+   least one OS to it before you can install LILO.
+
+2. Menu choices to add Linux, OS/2, and DOS to the lilo.conf.
+
+   These all pretty much work the same way. You'll be asked 
+   which partition you want to make bootable (answer 
+   /dev/hda1 or whatever partition you wish to use), and 
+   you'll also be asked to assign a label to the partition.
+   The label can be any short word such as "Linux" or "OS/2"
+   that you'll type in later to boot that partition. The boot
+   prompt is not case-sensitive, so the user can type LINUX or
+   os/2 later on and it will match the labels Linux and OS/2.
+
+3. Install LILO
+   
+   Once you've looked at your new config file and are 
+   satisfied with the way it looks, pick this choice to 
+   install LILO and leave the LILO installation menu.
+
+
+Other options:
+
+  -- Recycle (Reinstall) using your original /etc/lilo.conf.
+
+   If you already have an /etc/lilo.conf, and you just need to
+   refresh lilo then you don't need to reconstruct your 
+   lilo.conf.  Just use this menu choice to reinstall LILO 
+   using the existing /etc/lilo.conf.
+
+
+  -- View your current /etc/lilo.conf
+
+   If you haven't begun building a new lilo.conf, this choice
+   will let you take a look at the existing one in /etc on your
+   root Linux partition. 
+
+   If you have begun constructing a new lilo.conf, this option
+   will let you view the progress on that.
+
+
+ -- Skip LILO installation and exit this menu
+
+  This option skips LILO installation. Use this if you don't 
+  want to install LILO, or if you've already installed it and 
+  don't need to reinstall. You have to reinstall LILO whenever
+  you change your Linux kernel.
+
+ -- Help - Read the Linux Loader HELP file 
+ 
+  I hope you found it helpful! :^)
+
+
+-----------
+
+Other LILO information:
+
+  LILO on the Master Boot Record can be removed easily. 
+  MS-DOS's fdisk has a /MBR option that restores the master
+  boot record. You can actually restore your original boot 
+  sector from the copy LILO makes in /boot, as well. This is
+  the best way to go about it. See the LILO docs for more 
+  information. There is also a '-u' flag to LILO that restores
+  the boot sector from the backup copy.  Again, see the LILO
+  docs for detailed info.
+
+Good luck!
+
+--- end of LILO help
+
diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild
new file mode 100755
index 000000000..6b6284b7c
--- /dev/null
+++ b/source/a/logrotate/logrotate.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=${VERSION:-3.7.4}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-logrotate
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_logrotate.tar.gz
+
+cd $TMP
+rm -rf logrotate-$VERSION
+tar xzvf $CWD/logrotate-$VERSION.tar.gz
+cd logrotate-$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/logrotate.slackware.diff.gz | patch -p1
+make clean
+make || exit 1
+strip logrotate
+cat logrotate > $PKG/usr/sbin/logrotate
+cat logrotate.8 | gzip -9c > $PKG/usr/man/man8/logrotate.8.gz
+mkdir -p $PKG/usr/doc/logrotate-$VERSION
+cp -a \
+  CHANGES COPYING READM* \
+  $PKG/usr/doc/logrotate-$VERSION
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/logrotate-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/logrotate-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff
new file mode 100644
index 000000000..77b8aad6b
--- /dev/null
+++ b/source/a/logrotate/logrotate.slackware.diff
@@ -0,0 +1,49 @@
+diff -u -r --new-file logrotate-3.7.4.orig/config.c logrotate-3.7.4/config.c
+--- logrotate-3.7.4.orig/config.c	2006-07-24 07:08:04.000000000 -0500
++++ logrotate-3.7.4/config.c	2006-09-21 01:07:50.000000000 -0500
+@@ -29,7 +29,7 @@
+ #define isblank(c) 	( (c) == ' ' || (c) == '\t' ) ? 1 : 0
+ #endif
+ 
+-static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v",
++static char *defTabooExts[] = { ".new", ".rpmsave", ".rpmorig", "~", ",v",
+     ".rpmnew", ".swp"
+ };
+ static int defTabooCount = sizeof(defTabooExts) / sizeof(char *);
+diff -u -r --new-file logrotate-3.7.4.orig/config.h logrotate-3.7.4/config.h
+--- logrotate-3.7.4.orig/config.h	2005-11-12 13:07:56.000000000 -0600
++++ logrotate-3.7.4/config.h	2006-09-21 01:08:02.000000000 -0500
+@@ -36,5 +36,5 @@
+ #endif
+ 
+ #ifndef STATEFILE
+-#define STATEFILE "/var/lib/logrotate.status"
++#define STATEFILE "/var/lib/logrotate/status"
+ #endif
+diff -u -r --new-file logrotate-3.7.4.orig/logrotate.8 logrotate-3.7.4/logrotate.8
+--- logrotate-3.7.4.orig/logrotate.8	2006-05-17 09:46:51.000000000 -0500
++++ logrotate-3.7.4/logrotate.8	2006-09-21 01:07:14.000000000 -0500
+@@ -1,4 +1,4 @@
+-.TH LOGROTATE 8 "Wed Nov 5 2002" "Red Hat Linux" "System Administrator's Manual"
++.TH LOGROTATE 8 "Wed Nov 5 2002" "Linux" "System Administrator's Manual"
+ .SH NAME
+ logrotate \- rotates, compresses, and mails system logs
+ .SH SYNOPSIS
+@@ -410,7 +410,7 @@
+ for information on the taboo extensions). If a + precedes the list of
+ extensions, the current taboo extension list is augmented, otherwise it
+ is replaced. At startup, the taboo extension list 
+-contains .rpmorig, .rpmsave, ,v, .swp, .rpmnew, and ~.
++contains .new, .rpmorig, .rpmsave, ,v, .swp, .rpmnew, and ~.
+ 
+ .TP
+ \fBweekly\fR
+@@ -427,7 +427,7 @@
+ .SH FILES
+ .PD 0
+ .TP 27
+-\fI/var/lib/logrotate.status\fR
++\fI/var/lib/logrotate/status\fR
+ Default state file.
+ .TP 27
+ \fI/etc/logrotate.conf\fR
diff --git a/source/a/logrotate/slack-desc b/source/a/logrotate/slack-desc
new file mode 100644
index 000000000..2a1c76a5d
--- /dev/null
+++ b/source/a/logrotate/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------------------------------------------------------|
+logrotate: logrotate (system log rotation tool)
+logrotate:
+logrotate: The logrotate utility is designed to simplify the administration
+logrotate: of log files on a system which generates a lot of log files.
+logrotate: Logrotate allows for the automatic rotation compression, removal
+logrotate: and mailing of log files.  Logrotate can be set to handle a log
+logrotate: file daily, weekly, monthly or when the log file gets to a certain
+logrotate: size.  Normally, logrotate runs as a daily cron job.
+logrotate:
+logrotate:
+logrotate:
diff --git a/source/a/lvm2/doinst.sh b/source/a/lvm2/doinst.sh
new file mode 100644
index 000000000..261294a91
--- /dev/null
+++ b/source/a/lvm2/doinst.sh
@@ -0,0 +1,13 @@
+#!/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 etc/lvm/lvm.conf.new
diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild
new file mode 100755
index 000000000..f0f630d89
--- /dev/null
+++ b/source/a/lvm2/lvm2.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=2.02.40
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-lvm2
+
+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
+
+rm -rf $PKG
+mkdir -p $PKG
+cd $TMP
+rm -rf LVM2.$VERSION
+tar xvf $CWD/LVM2.$VERSION.tar.bz2
+cd LVM2.$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --disable-readline \
+  --enable-cmdlib \
+  --enable-dmeventd \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --enable-static_link \
+  --with-lvm1=internal
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+mv $PKG/etc/lvm/lvm.conf $PKG/etc/lvm/lvm.conf.new
+
+( 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
+)
+
+mkdir -p $PKG/usr/doc/LVM2.$VERSION
+cp -a \
+  COPYING* INSTALL README* VERSION WHATS_NEW \
+  $PKG/usr/doc/LVM2.$VERSION
+
+# 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
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/lvm2-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/lvm2/slack-desc b/source/a/lvm2/slack-desc
new file mode 100644
index 000000000..72dc87aee
--- /dev/null
+++ b/source/a/lvm2/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------------------------------------------------------|
+lvm2: lvm2 (Logical Volume Manager version 2)
+lvm2:
+lvm2: Heinz Mauelshagen's LVM (Logical Volume Manager) for Linux.
+lvm2: LVM adds an additional layer between the physical peripherals and the
+lvm2: low-level I/O interface to get a logical view of disks.  This allows
+lvm2: the concatenation of several disks (so-called physical volumes or PVs)
+lvm2: to form a storage pool (so-called Volume Group or VG) with allocation
+lvm2: units called physical extents (called PE).  With LVM, you can extend,
+lvm2: resize, or relocate storage dynamically.
+lvm2:
+lvm2:
diff --git a/source/a/mdadm/doinst.sh b/source/a/mdadm/doinst.sh
new file mode 100644
index 000000000..a6a71c731
--- /dev/null
+++ b/source/a/mdadm/doinst.sh
@@ -0,0 +1,12 @@
+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/mdadm.conf.new
diff --git a/source/a/mdadm/mdadm-2.6.4.tar.bz2.sign b/source/a/mdadm/mdadm-2.6.4.tar.bz2.sign
new file mode 100644
index 000000000..36b614805
--- /dev/null
+++ b/source/a/mdadm/mdadm-2.6.4.tar.bz2.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBHGC8JyGugalF9Dw4RArGIAJ9W38h+Mb/c62Ia6kn+TiDfd8ZxJQCfXEY8
+FdGihwdJnxz8cK3+VC4rmZs=
+=+YBi
+-----END PGP SIGNATURE-----
diff --git a/source/a/mdadm/mdadm.SlackBuild b/source/a/mdadm/mdadm.SlackBuild
new file mode 100755
index 000000000..45cc83b31
--- /dev/null
+++ b/source/a/mdadm/mdadm.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=2.6.4
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mdadm
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf mdadm-$VERSION
+tar xjvf $CWD/mdadm-$VERSION.tar.bz2
+cd mdadm-$VERSION
+
+# Build this static... it's small enough.
+zcat $CWD/mdadm.static.small.diff.gz | patch -p1 --verbose --backup --suffix=.orig || 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 clean || exit 1
+make || exit 1
+#make mdadm.static
+make install DESTDIR=$PKG || exit 1
+#cat mdadm.static > $PKG/sbin/mdadm
+mv $PKG/usr/share/man $PKG/usr
+rmdir $PKG/usr/share
+mkdir -p $PKG/etc
+cat mdadm.conf-example > $PKG/etc/mdadm.conf.new
+gzip -9 $PKG/usr/man/man?/*.?
+mkdir -p $PKG/usr/doc/mdadm-$VERSION
+cp -a \
+  ANNOUNCE-$VERSION COPYING* ChangeLog INSTALL TODO \
+  $PKG/usr/doc/mdadm-$VERSION
+( 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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+cd $PKG
+makepkg -l y -c n $TMP/mdadm-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/mdadm/mdadm.static.small.diff b/source/a/mdadm/mdadm.static.small.diff
new file mode 100644
index 000000000..6be02fda5
--- /dev/null
+++ b/source/a/mdadm/mdadm.static.small.diff
@@ -0,0 +1,20 @@
+--- ./Makefile.orig	2006-06-15 19:21:52.000000000 -0500
++++ ./Makefile	2006-06-25 00:28:24.000000000 -0500
+@@ -39,7 +39,7 @@
+ 
+ CC = $(CROSS_COMPILE)gcc
+ CXFLAGS = -ggdb
+-CWFLAGS = -Wall -Werror -Wstrict-prototypes
++CWFLAGS = -Wall -Werror -Wstrict-prototypes -Os
+ 
+ ifdef DEBIAN
+ CPPFLAGS= -DDEBIAN
+@@ -55,7 +55,7 @@
+ CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS)
+ 
+ # If you want a static binary, you might uncomment these
+-# LDFLAGS = -static
++LDFLAGS = -static
+ # STRIP = -s
+ 
+ INSTALL = /usr/bin/install
diff --git a/source/a/mdadm/slack-desc b/source/a/mdadm/slack-desc
new file mode 100644
index 000000000..984da7f3d
--- /dev/null
+++ b/source/a/mdadm/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------------------------------------------------------|
+mdadm: mdadm (manage RAID arrays)
+mdadm:
+mdadm: mdadm is a utility program for creating, managing, and monitoring
+mdadm: Linux MD (Software RAID) devices.  Unlike the older raidtools
+mdadm: package, mdadm is a single program (which should make it easier to
+mdadm: use).
+mdadm:
+mdadm: mdadm was written by Neil Brown.  Development of mdadm is sponsored
+mdadm: by CSE@UNSW (The School of Computer Science and Engineering at
+mdadm: The University of New South Wales).
+mdadm:
diff --git a/source/a/minicom/config.sub-x86_64.diff b/source/a/minicom/config.sub-x86_64.diff
new file mode 100644
index 000000000..fa89bb3c1
--- /dev/null
+++ b/source/a/minicom/config.sub-x86_64.diff
@@ -0,0 +1,20 @@
+--- ./config.sub.orig	1998-04-26 17:20:59.000000000 +0400
++++ ./config.sub	2007-08-30 09:48:46.000000000 +0400
+@@ -129,7 +129,7 @@
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+-	tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm \
++	tahoe | i[345]86 | x86_64 | i860 | m68k | m68000 | m88k | ns32k | arm \
+ 		| arme[lb] | pyramid \
+ 		| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
+ 		| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
+@@ -144,7 +144,7 @@
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+-	vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \
++	vax-* | tahoe-* | i[345]86-* | x86_64-* | i860-* | m68k-* | m68000-* | m88k-* \
+ 	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
+ 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
+ 	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
diff --git a/source/a/minicom/doinst.sh b/source/a/minicom/doinst.sh
new file mode 100644
index 000000000..f667412ed
--- /dev/null
+++ b/source/a/minicom/doinst.sh
@@ -0,0 +1,15 @@
+#!/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 etc/minicom.users.new
+config etc/minirc.dfl.new
+rm -f etc/minicom.users.new etc/minirc.dfl.new
diff --git a/source/a/minicom/lrzsz_0.12.21-4.diff b/source/a/minicom/lrzsz_0.12.21-4.diff
new file mode 100644
index 000000000..01c721571
--- /dev/null
+++ b/source/a/minicom/lrzsz_0.12.21-4.diff
@@ -0,0 +1,3019 @@
+--- lrzsz-0.12.21.orig/Makefile.in
++++ lrzsz-0.12.21/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated automatically by automake 1.4a from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
+ 
+ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+@@ -46,10 +46,9 @@
+ AUTOHEADER = @AUTOHEADER@
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-INSTALL_STRIP_FLAG =
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -106,13 +105,13 @@
+ 
+ DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
+ INSTALL Makefile.am Makefile.in NEWS Specfile.in THANKS TODO acconfig.h \
+-acinclude.m4 aclocal.m4 config.guess config.h.in configure configure.in \
+-install-sh missing mkinstalldirs systype.in
++acinclude.m4 aclocal.m4 config.guess config.h.in config.sub configure \
++configure.in install-sh missing mkinstalldirs systype.in
+ 
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+@@ -298,7 +297,7 @@
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -340,7 +339,7 @@
+ all-am: Makefile $(SCRIPTS) config.h
+ all-redirect: all-recursive-am
+ install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 
+--- lrzsz-0.12.21.orig/aclocal.m4
++++ lrzsz-0.12.21/aclocal.m4
+@@ -1,4 +1,4 @@
+-dnl aclocal.m4 generated automatically by aclocal 1.4a
++dnl aclocal.m4 generated automatically by aclocal 1.4
+ 
+ dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+@@ -117,8 +117,6 @@
+ 
+ AC_DEFUN(AM_INIT_AUTOMAKE,
+ [AC_REQUIRE([AC_PROG_INSTALL])
+-dnl We require 2.13 because we rely on SHELL being computed by configure.
+-AC_PREREQ([2.13])
+ PACKAGE=[$1]
+ AC_SUBST(PACKAGE)
+ VERSION=[$2]
+--- lrzsz-0.12.21.orig/configure
++++ lrzsz-0.12.21/configure
+@@ -703,7 +703,6 @@
+ fi
+ 
+ 
+-
+ PACKAGE=lrzsz
+ 
+ VERSION=0.12.21rc
+@@ -723,7 +722,7 @@
+ 
+ missing_dir=`cd $ac_aux_dir && pwd`
+ echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+-echo "configure:727: checking for working aclocal" >&5
++echo "configure:726: checking for working aclocal" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -736,7 +735,7 @@
+ fi
+ 
+ echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+-echo "configure:740: checking for working autoconf" >&5
++echo "configure:739: 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.
+@@ -749,7 +748,7 @@
+ fi
+ 
+ echo $ac_n "checking for working automake""... $ac_c" 1>&6
+-echo "configure:753: checking for working automake" >&5
++echo "configure:752: checking for working automake" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -762,7 +761,7 @@
+ fi
+ 
+ echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+-echo "configure:766: checking for working autoheader" >&5
++echo "configure:765: 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.
+@@ -775,7 +774,7 @@
+ fi
+ 
+ echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+-echo "configure:779: checking for working makeinfo" >&5
++echo "configure:778: 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.
+@@ -926,7 +925,7 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:930: checking for $ac_word" >&5
++echo "configure:929: 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
+@@ -956,7 +955,7 @@
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:960: checking for $ac_word" >&5
++echo "configure:959: 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
+@@ -1007,7 +1006,7 @@
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1011: checking for $ac_word" >&5
++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
+@@ -1039,7 +1038,7 @@
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1042: 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.
+@@ -1050,12 +1049,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1054 "configure"
++#line 1053 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1058: \"$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
+@@ -1081,12 +1080,12 @@
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1084: 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:1090: checking whether we are using GNU C" >&5
++echo "configure:1089: 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
+@@ -1095,7 +1094,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$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
+@@ -1114,7 +1113,7 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1117: 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
+@@ -1146,7 +1145,7 @@
+ fi
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1150: checking how to run the C preprocessor" >&5
++echo "configure:1149: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1161,13 +1160,13 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1165 "configure"
++#line 1164 "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:1171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1170: \"$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
+   :
+@@ -1178,13 +1177,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1182 "configure"
++#line 1181 "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:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1187: \"$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
+   :
+@@ -1195,13 +1194,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 1199 "configure"
++#line 1198 "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:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1204: \"$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
+   :
+@@ -1235,13 +1234,13 @@
+ fi
+ if test $ac_cv_prog_gcc = yes; then
+     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+-echo "configure:1239: checking whether ${CC-cc} needs -traditional" >&5
++echo "configure:1238: checking whether ${CC-cc} needs -traditional" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     ac_pattern="Autoconf.*'x'"
+   cat > conftest.$ac_ext <<EOF
+-#line 1245 "configure"
++#line 1244 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ Autoconf TIOCGETP
+@@ -1259,7 +1258,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat > conftest.$ac_ext <<EOF
+-#line 1263 "configure"
++#line 1262 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ Autoconf TCGETA
+@@ -1283,7 +1282,7 @@
+ # 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:1287: checking for $ac_word" >&5
++echo "configure:1286: 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
+@@ -1311,7 +1310,7 @@
+ fi
+ 
+ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+-echo "configure:1315: checking for POSIXized ISC" >&5
++echo "configure:1314: checking for POSIXized ISC" >&5
+ if test -d /etc/conf/kconfig.d &&
+   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+ then
+@@ -1332,9 +1331,9 @@
+ fi
+ 
+ echo $ac_n "checking for AIX""... $ac_c" 1>&6
+-echo "configure:1336: checking for AIX" >&5
++echo "configure:1335: checking for AIX" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 1338 "configure"
++#line 1337 "configure"
+ #include "confdefs.h"
+ #ifdef _AIX
+   yes
+@@ -1357,17 +1356,17 @@
+ 
+ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
+-echo "configure:1361: checking for minix/config.h" >&5
++echo "configure:1360: checking for minix/config.h" >&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 1366 "configure"
++#line 1365 "configure"
+ #include "confdefs.h"
+ #include <minix/config.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1370: \"$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*
+@@ -1408,7 +1407,7 @@
+ 
+ 
+ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
+-echo "configure:1412: checking for ${CC-cc} option to accept ANSI C" >&5
++echo "configure:1411: checking for ${CC-cc} option to accept ANSI C" >&5
+ if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1424,7 +1423,7 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   cat > conftest.$ac_ext <<EOF
+-#line 1428 "configure"
++#line 1427 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -1461,7 +1460,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   am_cv_prog_cc_stdc="$ac_arg"; break
+ else
+@@ -1487,7 +1486,7 @@
+ 
+ 
+ echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
+-echo "configure:1491: checking for function prototypes" >&5
++echo "configure:1490: checking for function prototypes" >&5
+ if test "$am_cv_prog_cc_stdc" != no; then
+   echo "$ac_t""yes" 1>&6
+   cat >> confdefs.h <<\EOF
+@@ -1500,12 +1499,12 @@
+   U=_ ANSI2KNR=./ansi2knr
+   # Ensure some checks needed by ansi2knr itself.
+   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1504: checking for ANSI C header files" >&5
++echo "configure:1503: 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 1509 "configure"
++#line 1508 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1513,7 +1512,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1516: \"$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*
+@@ -1530,7 +1529,7 @@
+ 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 1534 "configure"
++#line 1533 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1548,7 +1547,7 @@
+ 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 1552 "configure"
++#line 1551 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1569,7 +1568,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1573 "configure"
++#line 1572 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1580,7 +1579,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -1607,17 +1606,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1611: checking for $ac_hdr" >&5
++echo "configure:1610: 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 1616 "configure"
++#line 1615 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1620: \"$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*
+@@ -1646,12 +1645,12 @@
+ fi
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:1650: checking for working const" >&5
++echo "configure:1649: 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 1655 "configure"
++#line 1654 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -1700,7 +1699,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -1721,21 +1720,21 @@
+ fi
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:1725: checking for inline" >&5
++echo "configure:1724: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat > conftest.$ac_ext <<EOF
+-#line 1732 "configure"
++#line 1731 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -1786,7 +1785,7 @@
+ esac
+ 
+ echo $ac_n "checking for syslog in -lsocket""... $ac_c" 1>&6
+-echo "configure:1790: checking for syslog in -lsocket" >&5
++echo "configure:1789: checking for syslog in -lsocket" >&5
+ ac_lib_var=`echo socket'_'syslog | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1794,7 +1793,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1798 "configure"
++#line 1797 "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
+@@ -1805,7 +1804,7 @@
+ syslog()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1808: \"$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
+@@ -1833,7 +1832,7 @@
+ fi
+ 
+ echo $ac_n "checking for syslog in -lbe""... $ac_c" 1>&6
+-echo "configure:1837: checking for syslog in -lbe" >&5
++echo "configure:1836: checking for syslog in -lbe" >&5
+ ac_lib_var=`echo be'_'syslog | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1841,7 +1840,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbe  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1845 "configure"
++#line 1844 "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
+@@ -1852,7 +1851,7 @@
+ syslog()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1855: \"$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
+@@ -1880,7 +1879,7 @@
+ fi
+ 
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:1884: checking for gethostbyname in -lnsl" >&5
++echo "configure:1883: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1888,7 +1887,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1892 "configure"
++#line 1891 "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
+@@ -1899,7 +1898,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1902: \"$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
+@@ -1928,12 +1927,12 @@
+ 
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1932: checking for ANSI C header files" >&5
++echo "configure:1931: 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 1937 "configure"
++#line 1936 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1941,7 +1940,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1944: \"$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*
+@@ -1958,7 +1957,7 @@
+ 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 1962 "configure"
++#line 1961 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1976,7 +1975,7 @@
+ 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 1980 "configure"
++#line 1979 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1997,7 +1996,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2001 "configure"
++#line 2000 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -2008,7 +2007,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -2035,17 +2034,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2039: checking for $ac_hdr" >&5
++echo "configure:2038: 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 2044 "configure"
++#line 2043 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2048: \"$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*
+@@ -2076,17 +2075,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2080: checking for $ac_hdr" >&5
++echo "configure:2079: 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 2085 "configure"
++#line 2084 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2089: \"$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*
+@@ -2116,17 +2115,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2120: checking for $ac_hdr" >&5
++echo "configure:2119: 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 2125 "configure"
++#line 2124 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2129: \"$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*
+@@ -2156,17 +2155,17 @@
+ 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
++echo "configure:2159: 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"
++#line 2164 "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; }
++{ (eval echo configure:2169: \"$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*
+@@ -2196,17 +2195,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2200: checking for $ac_hdr" >&5
++echo "configure:2199: 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 2205 "configure"
++#line 2204 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2209: \"$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*
+@@ -2234,12 +2233,12 @@
+ 
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:2238: checking for size_t" >&5
++echo "configure:2237: 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 2243 "configure"
++#line 2242 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2267,12 +2266,12 @@
+ fi
+ 
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+-echo "configure:2271: checking for mode_t" >&5
++echo "configure:2270: checking for mode_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2276 "configure"
++#line 2275 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2300,12 +2299,12 @@
+ fi
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:2304: checking for off_t" >&5
++echo "configure:2303: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2309 "configure"
++#line 2308 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2334,12 +2333,12 @@
+ 
+ 
+ echo $ac_n "checking for speed_t""... $ac_c" 1>&6
+-echo "configure:2338: checking for speed_t" >&5
++echo "configure:2337: checking for speed_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_speed_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2343 "configure"
++#line 2342 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2389,12 +2388,12 @@
+ fi
+ 
+ echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
+-echo "configure:2393: checking for st_rdev in struct stat" >&5
++echo "configure:2392: checking for st_rdev in struct stat" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2398 "configure"
++#line 2397 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -2402,7 +2401,7 @@
+ struct stat s; s.st_rdev;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_st_rdev=yes
+ else
+@@ -2423,12 +2422,12 @@
+ fi
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:2427: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:2426: 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 2432 "configure"
++#line 2431 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -2437,7 +2436,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -2459,12 +2458,12 @@
+ 
+ 
+ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
+-echo "configure:2463: checking for socklen_t" >&5
++echo "configure:2462: checking for socklen_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2468 "configure"
++#line 2467 "configure"
+ #include "confdefs.h"
+ 
+ #include "confdefs.h"
+@@ -2480,7 +2479,7 @@
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_socklen_t=yes
+ else
+@@ -2505,12 +2504,12 @@
+ fi
+ 
+ echo $ac_n "checking whether sys/time.h and sys/select.h may both be included""... $ac_c" 1>&6
+-echo "configure:2509: checking whether sys/time.h and sys/select.h may both be included" >&5
++echo "configure:2508: checking whether sys/time.h and sys/select.h may both be included" >&5
+ if eval "test \"`echo '$''{'lrzsz_cv_header_sys_select'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2514 "configure"
++#line 2513 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -2519,7 +2518,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   lrzsz_cv_header_sys_select=yes
+ else
+@@ -2540,12 +2539,12 @@
+ fi
+ 
+ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+-echo "configure:2544: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:2543: checking whether struct tm is in sys/time.h or time.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2549 "configure"
++#line 2548 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -2553,7 +2552,7 @@
+ struct tm *tp; tp->tm_sec;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm=time.h
+ else
+@@ -2575,19 +2574,19 @@
+ 
+ 
+ echo $ac_n "checking for errno declaration""... $ac_c" 1>&6
+-echo "configure:2579: checking for errno declaration" >&5
++echo "configure:2578: checking for errno declaration" >&5
+ if eval "test \"`echo '$''{'lrzsz_cv_decl_errno'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2584 "configure"
++#line 2583 "configure"
+ #include "confdefs.h"
+ #include <errno.h>
+ int main() {
+ int i = errno; errno = 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   lrzsz_cv_decl_errno=yes
+ else
+@@ -2610,7 +2609,7 @@
+ 
+ if test $cross_compiling = no ; then
+ 	echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
+-echo "configure:2614: checking whether setvbuf arguments are reversed" >&5
++echo "configure:2613: checking whether setvbuf arguments are reversed" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2618,7 +2617,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2622 "configure"
++#line 2621 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -2632,7 +2631,7 @@
+   exit(0);			/* Non-reversed systems segv here.  */
+ }
+ EOF
+-if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -2657,12 +2656,12 @@
+ 
+ fi
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:2661: checking return type of signal handlers" >&5
++echo "configure:2660: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2666 "configure"
++#line 2665 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -2679,7 +2678,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -2701,17 +2700,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2705: checking for $ac_hdr" >&5
++echo "configure:2704: 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 2710 "configure"
++#line 2709 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2714: \"$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*
+@@ -2740,12 +2739,12 @@
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2744: checking for $ac_func" >&5
++echo "configure:2743: 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 2749 "configure"
++#line 2748 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2768,7 +2767,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2771: \"$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
+@@ -2793,7 +2792,7 @@
+ done
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:2797: checking for working mmap" >&5
++echo "configure:2796: checking for working mmap" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2801,7 +2800,7 @@
+   ac_cv_func_mmap_fixed_mapped=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2805 "configure"
++#line 2804 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Haertel and Jim Avera for this test.
+@@ -2941,7 +2940,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+@@ -2966,19 +2965,19 @@
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+-echo "configure:2970: checking for working alloca.h" >&5
++echo "configure:2969: checking for working alloca.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2975 "configure"
++#line 2974 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_header_alloca_h=yes
+ else
+@@ -2999,12 +2998,12 @@
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:3003: checking for alloca" >&5
++echo "configure:3002: checking for alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3008 "configure"
++#line 3007 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -3032,7 +3031,7 @@
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_alloca_works=yes
+ else
+@@ -3064,12 +3063,12 @@
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:3068: checking whether alloca needs Cray hooks" >&5
++echo "configure:3067: checking whether alloca needs Cray hooks" >&5
+ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3073 "configure"
++#line 3072 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -3094,12 +3093,12 @@
+ if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3098: checking for $ac_func" >&5
++echo "configure:3097: 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 3103 "configure"
++#line 3102 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3122,7 +3121,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3125: \"$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
+@@ -3149,7 +3148,7 @@
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:3153: checking stack direction for C alloca" >&5
++echo "configure:3152: checking stack direction for C alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3157,7 +3156,7 @@
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3161 "configure"
++#line 3160 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -3176,7 +3175,7 @@
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:3180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_stack_direction=1
+ else
+@@ -3198,7 +3197,7 @@
+ fi
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 3202 "configure"
++#line 3201 "configure"
+ #include "confdefs.h"
+ #include <utime.h>
+ EOF
+@@ -3216,12 +3215,12 @@
+ for ac_func in gettimeofday settimeofday
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3220: checking for $ac_func" >&5
++echo "configure:3219: 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 3225 "configure"
++#line 3224 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3244,7 +3243,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3247: \"$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
+@@ -3271,12 +3270,12 @@
+ for ac_func in strchr memcpy select vprintf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3275: checking for $ac_func" >&5
++echo "configure:3274: 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 3280 "configure"
++#line 3279 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3299,7 +3298,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3302: \"$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
+@@ -3326,12 +3325,12 @@
+ for ac_func in times rdchk utime syslog siginterrupt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3330: checking for $ac_func" >&5
++echo "configure:3329: 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 3335 "configure"
++#line 3334 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3354,7 +3353,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3357: \"$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
+@@ -3381,12 +3380,12 @@
+ for ac_func in mkdir mktime strerror strstr strdup strtoul strtol strpbrk
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3385: checking for $ac_func" >&5
++echo "configure:3384: 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 3390 "configure"
++#line 3389 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3409,7 +3408,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3412: \"$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
+@@ -3438,12 +3437,12 @@
+ for ac_func in stpcpy strftime vasprintf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3442: checking for $ac_func" >&5
++echo "configure:3441: 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 3447 "configure"
++#line 3446 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3466,7 +3465,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3469: \"$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
+@@ -3494,12 +3493,12 @@
+ 
+ 
+ echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
+-echo "configure:3498: checking for getopt_long" >&5
++echo "configure:3497: checking for getopt_long" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3503 "configure"
++#line 3502 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getopt_long(); below.  */
+@@ -3522,7 +3521,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_getopt_long=yes"
+ else
+@@ -3552,12 +3551,12 @@
+ 
+ 
+ echo $ac_n "checking for ftime""... $ac_c" 1>&6
+-echo "configure:3556: checking for ftime" >&5
++echo "configure:3555: checking for ftime" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_ftime'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3561 "configure"
++#line 3560 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char ftime(); below.  */
+@@ -3580,7 +3579,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_ftime=yes"
+ else
+@@ -3595,7 +3594,7 @@
+ if eval "test \"`echo '$ac_cv_func_'ftime`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking that ftime works correctly""... $ac_c" 1>&6
+-echo "configure:3599: checking that ftime works correctly" >&5
++echo "configure:3598: checking that ftime works correctly" >&5
+ if eval "test \"`echo '$''{'lrzsz_cv_sys_ftime_ok'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3603,7 +3602,7 @@
+   lrzsz_cv_sys_ftime_ok=runtime
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3607 "configure"
++#line 3606 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -3632,7 +3631,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   lrzsz_cv_sys_ftime_ok=yes
+ else
+@@ -3666,20 +3665,20 @@
+ 
+ 
+ echo $ac_n "checking for timezone variable""... $ac_c" 1>&6
+-echo "configure:3670: checking for timezone variable" >&5
++echo "configure:3669: checking for timezone variable" >&5
+ if eval "test \"`echo '$''{'libquark_cv_var_timezone'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 3676 "configure"
++#line 3675 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int main() {
+ return(int)(timezone/2);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   libquark_cv_var_timezone=yes
+ else
+@@ -3705,13 +3704,13 @@
+ 	:
+ else
+ 	echo $ac_n "checking for $lookup_facility""... $ac_c" 1>&6
+-echo "configure:3709: checking for $lookup_facility" >&5
++echo "configure:3708: checking for $lookup_facility" >&5
+ 	if eval "test \"`echo '$''{'lrzsz_cv_lookup_facility'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ 		cat > conftest.$ac_ext <<EOF
+-#line 3715 "configure"
++#line 3714 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYSLOG_H
+@@ -3763,17 +3762,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3767: checking for $ac_hdr" >&5
++echo "configure:3766: 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 3772 "configure"
++#line 3771 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3776: \"$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*
+@@ -3803,12 +3802,12 @@
+ strdup __argz_count __argz_stringify __argz_next
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3807: checking for $ac_func" >&5
++echo "configure:3806: 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 3812 "configure"
++#line 3811 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3831,7 +3830,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3834: \"$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
+@@ -3860,12 +3859,12 @@
+      for ac_func in stpcpy
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3864: checking for $ac_func" >&5
++echo "configure:3863: 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 3869 "configure"
++#line 3868 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3888,7 +3887,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3891: \"$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
+@@ -3922,19 +3921,19 @@
+ 
+    if test $ac_cv_header_locale_h = yes; then
+     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:3926: checking for LC_MESSAGES" >&5
++echo "configure:3925: checking for LC_MESSAGES" >&5
+ if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3931 "configure"
++#line 3930 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+ return LC_MESSAGES
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_val_LC_MESSAGES=yes
+ else
+@@ -3955,7 +3954,7 @@
+     fi
+   fi
+    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+-echo "configure:3959: checking whether NLS is requested" >&5
++echo "configure:3958: checking whether NLS is requested" >&5
+         # Check whether --enable-nls or --disable-nls was given.
+ if test "${enable_nls+set}" = set; then
+   enableval="$enable_nls"
+@@ -3975,7 +3974,7 @@
+ EOF
+ 
+       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
+-echo "configure:3979: checking whether included gettext is requested" >&5
++echo "configure:3978: checking whether included gettext is requested" >&5
+       # Check whether --with-included-gettext or --without-included-gettext was given.
+ if test "${with_included_gettext+set}" = set; then
+   withval="$with_included_gettext"
+@@ -3994,17 +3993,17 @@
+ 
+ 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+-echo "configure:3998: checking for libintl.h" >&5
++echo "configure:3997: checking for libintl.h" >&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 4003 "configure"
++#line 4002 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4007: \"$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*
+@@ -4021,19 +4020,19 @@
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
+-echo "configure:4025: checking for gettext in libc" >&5
++echo "configure:4024: checking for gettext in libc" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4030 "configure"
++#line 4029 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ int main() {
+ return (int) gettext ("")
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gettext_libc=yes
+ else
+@@ -4049,7 +4048,7 @@
+ 
+ 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+ 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
+-echo "configure:4053: checking for bindtextdomain in -lintl" >&5
++echo "configure:4052: checking for bindtextdomain in -lintl" >&5
+ ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4057,7 +4056,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4061 "configure"
++#line 4060 "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
+@@ -4068,7 +4067,7 @@
+ bindtextdomain()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4071: \"$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
+@@ -4084,12 +4083,12 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
+-echo "configure:4088: checking for gettext in libintl" >&5
++echo "configure:4087: checking for gettext in libintl" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
+-echo "configure:4093: checking for gettext in -lintl" >&5
++echo "configure:4092: checking for gettext in -lintl" >&5
+ ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4097,7 +4096,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4101 "configure"
++#line 4100 "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
+@@ -4108,7 +4107,7 @@
+ gettext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4111: \"$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
+@@ -4147,7 +4146,7 @@
+ 	      # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4151: checking for $ac_word" >&5
++echo "configure:4150: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4181,12 +4180,12 @@
+ 		for ac_func in dcgettext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4185: checking for $ac_func" >&5
++echo "configure:4184: 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 4190 "configure"
++#line 4189 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4209,7 +4208,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4212: \"$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
+@@ -4236,7 +4235,7 @@
+ 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4240: checking for $ac_word" >&5
++echo "configure:4239: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4272,7 +4271,7 @@
+ 		# Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4276: checking for $ac_word" >&5
++echo "configure:4275: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4304,7 +4303,7 @@
+ fi
+ 
+ 		cat > conftest.$ac_ext <<EOF
+-#line 4308 "configure"
++#line 4307 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -4312,7 +4311,7 @@
+ 			       return _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   CATOBJEXT=.gmo
+ 		   DATADIRNAME=share
+@@ -4335,7 +4334,7 @@
+ 
+         if test "$CATOBJEXT" = "NONE"; then
+ 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
+-echo "configure:4339: checking whether catgets can be used" >&5
++echo "configure:4338: checking whether catgets can be used" >&5
+ 	  # Check whether --with-catgets or --without-catgets was given.
+ if test "${with_catgets+set}" = set; then
+   withval="$with_catgets"
+@@ -4348,7 +4347,7 @@
+ 
+ 	  if test "$nls_cv_use_catgets" = "yes"; then
+ 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
+-echo "configure:4352: checking for main in -li" >&5
++echo "configure:4351: checking for main in -li" >&5
+ ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4356,14 +4355,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-li  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4360 "configure"
++#line 4359 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4366: \"$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
+@@ -4391,12 +4390,12 @@
+ fi
+ 
+ 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
+-echo "configure:4395: checking for catgets" >&5
++echo "configure:4394: checking for catgets" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4400 "configure"
++#line 4399 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char catgets(); below.  */
+@@ -4419,7 +4418,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_catgets=yes"
+ else
+@@ -4441,7 +4440,7 @@
+ 	       # Extract the first word of "gencat", so it can be a program name with args.
+ set dummy gencat; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4445: checking for $ac_word" >&5
++echo "configure:4444: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4477,7 +4476,7 @@
+ 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4481: checking for $ac_word" >&5
++echo "configure:4480: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4514,7 +4513,7 @@
+ 		   # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4518: checking for $ac_word" >&5
++echo "configure:4517: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4549,7 +4548,7 @@
+ 		 # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4553: checking for $ac_word" >&5
++echo "configure:4552: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4607,7 +4606,7 @@
+         # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4611: checking for $ac_word" >&5
++echo "configure:4610: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4641,7 +4640,7 @@
+         # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4645: checking for $ac_word" >&5
++echo "configure:4644: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4677,7 +4676,7 @@
+         # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4681: checking for $ac_word" >&5
++echo "configure:4680: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4770,7 +4769,7 @@
+        LINGUAS=
+      else
+        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+-echo "configure:4774: checking for catalogs to be installed" >&5
++echo "configure:4773: checking for catalogs to be installed" >&5
+        NEW_LINGUAS=
+        for lang in ${LINGUAS=$ALL_LINGUAS}; do
+          case "$ALL_LINGUAS" in
+@@ -4798,17 +4797,17 @@
+    if test "$CATOBJEXT" = ".cat"; then
+      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
+-echo "configure:4802: checking for linux/version.h" >&5
++echo "configure:4801: checking for linux/version.h" >&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 4807 "configure"
++#line 4806 "configure"
+ #include "confdefs.h"
+ #include <linux/version.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4811: \"$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*
+--- lrzsz-0.12.21.orig/debian/changelog
++++ lrzsz-0.12.21/debian/changelog
+@@ -0,0 +1,80 @@
++lrzsz (0.12.21-4) unstable; urgency=low
++
++  * Updated for Standards-Version: 3.5.2.
++  * Added touch stamp-h.in before make invocation in order to stop
++    autoheader from running.
++
++ -- Josip Rodin <jrodin@jagor.srce.hr>  Sun, 25 Mar 2001 19:48:18 +0200
++
++lrzsz (0.12.21-3) unstable; urgency=low
++
++  * Newish upstream version, (990823 in CVS).
++  * Updated for Policy 3.x.
++  * Misc. fixes for debian/*.
++
++ -- Josip Rodin <jrodin@jagor.srce.hr>  Sun, 19 Sep 1999 17:55:38 +0200
++
++lrzsz (0.12.21-2) unstable; urgency=low
++
++  * Removed definition of strstr, advised by upstream maintainer, to
++    get it to compile on glibc2.1, as John Goerzen and Bart Warmerdam
++    noticed (fixes: #39429 #39812).
++
++ -- Josip Rodin <jrodin@jagor.srce.hr>  Sun, 20 Jun 1999 21:38:07 +0200
++
++lrzsz (0.12.21-1) unstable; urgency=low
++
++  * New upstream version (990604 in CVS).
++  * Cleaned up the diff by removing unneeded .deps/ files and not changing
++    aclocal et al.
++
++ -- Josip Rodin <jrodin@jagor.srce.hr>  Sun,  6 Jun 1999 21:01:50 +0200
++
++lrzsz (0.12.20-2) unstable; urgency=low
++
++  * Don't install ansi2knr.1 manpage, closing bug #33121
++
++ -- Josip Rodin <jrodin@jagor.srce.hr>  Sun,  7 Feb 1999 01:32:31 +0100
++
++lrzsz (0.12.20-1) unstable; urgency=low
++
++  * New maintainer.
++  * Althought version number doesn't indicate that, this version is
++    today's CVS snapshot from ftp://tirka.ohse.de/uwe/cvs-trees
++  * This release fixes following bugs: #8373 #11208 #16170 #16744 #17210.
++  * Package is lintian clean.
++
++ -- Josip Rodin <jrodin@jagor.srce.hr>  Sun,  7 Feb 1999 01:32:31 +0100
++
++lrzsz (0.12.17) unstable; urgency=low
++
++  * sorry, see ../ChangeLog. automagically generated debian/changelog
++
++ -- Uwe Ohse <uwe@ohse.de>  Mon, 02 Jun 1997 10:06:05 +0200
++
++lrzsz (0.12.16) unstable; urgency=low
++
++  * sorry, see ../ChangeLog. changelog is here just to make
++    dpkg happy.
++  * initial release
++
++ -- Uwe Ohse <uwe@ohse.de>  Sun, 2 Jun 1997 21:00:00 +0200
++
++lrzsz (0.12b-1.1) unstable; urgency=low
++
++  * Non-maintainer release.
++  * Libc6 compile.
++
++ -- Martin Mitchell <martin@debian.org>  Sat, 18 Oct 1997 01:58:54 +1000
++
++lrzsz (0.12b-1) unstable; urgency=low
++
++  * Converted to new source packaging format.
++  * New upstream version.
++
++ -- Michael Alan Dorman <mdorman@calder.med.miami.edu>  Tue, 17 Sep 1996 13:39:23 -0400
++
++Local variables:
++mode: debian-changelog
++add-log-mailing-address: "jrodin@jagor.srce.hr"
++End:
+--- lrzsz-0.12.21.orig/debian/control
++++ lrzsz-0.12.21/debian/control
+@@ -0,0 +1,18 @@
++Source: lrzsz
++Section: comm
++Priority: optional
++Maintainer: Josip Rodin <jrodin@jagor.srce.hr>
++Standards-Version: 3.5.2
++Build-Depends: debhelper
++
++Package: lrzsz
++Architecture: any
++Depends: ${shlibs:Depends}
++Suggests: minicom
++Description: Tools for zmodem/xmodem/ymodem file transfer
++ Lrzsz is a cosmetically modified zmodem/ymodem/xmodem package built
++ from the public-domain version of Chuck Forsberg's rzsz package.
++ .
++ These programs use error correcting protocols ({z,x,y}modem) to send
++ (sz, sx, sb) and receive (rz, rx, rb) files over a dial-in serial port
++ from a variety of programs running under various operating systems.
+--- lrzsz-0.12.21.orig/debian/copyright
++++ lrzsz-0.12.21/debian/copyright
+@@ -0,0 +1,31 @@
++This is the lrzsz Debian GNU/Linux package. It was first maintained by
++Michael Alan Dorman <mdorman@debian.org>, with help of Martin Mitchell
++and current upstream maintainer, Uwe Ohse <uwe@ohse.de>.
++
++Current maintainer is Josip Rodin <jrodin@jagor.srce.hr>
++
++Original source was downloaded from: ftp://tirka.ohse.de/uwe/
++
++Copyright (C) until 1988 Chuck Forsberg (Omen Technology INC)
++Copyright (C) 1994 Matt Porter, Michael D. Black
++Copyright (C) 1996, 1997 Uwe Ohse
++
++Please note that credit should be given to Chuck Forsberg (rzsz) and
++Stephen Satchell/Satchell Evaluations (crc routines) for this package.
++
++  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; version 2 dated June, 1991.
++
++  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.
++
++On Debian systems, the complete text of the GNU General Public License
++can be found in /usr/share/common-licenses/GPL file.
+--- lrzsz-0.12.21.orig/debian/rules
++++ lrzsz-0.12.21/debian/rules
+@@ -0,0 +1,60 @@
++#!/usr/bin/make -f
++# Derived from debhelper/dh_make example.
++
++#export DH_VERBOSE=1
++tmp := $(CURDIR)/debian/tmp
++
++CFLAGS := -O2
++ifneq "$(findstring debug,$(DEB_BUILD_OPTIONS))" ""
++CFLAGS += -g
++endif
++
++build: build-stamp
++build-stamp:
++	dh_testdir
++	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
++          --mandir='$${prefix}/share/man' --program-transform-name=s/l//
++	touch stamp-h.in # to stop autoheader from running
++	$(MAKE)
++	touch $@
++
++clean:
++	dh_testdir
++	dh_testroot
++	[ ! -f Makefile ] || $(MAKE) distclean
++	dh_clean build-stamp
++
++install: build-stamp
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++	$(MAKE) install prefix=$(tmp)/usr
++
++binary-indep:
++# We have nothing to do, no architecture independent packages here.
++
++binary-arch: build install
++	dh_testdir
++	dh_testroot
++	dh_installdocs NEWS README README.cvs README.isdn4linux TODO
++#	dh_installmanpages ansi2knr.1
++	dh_installchangelogs ChangeLog
++ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" ""
++	dh_strip
++endif
++	dh_compress
++	cd $(tmp)/usr/share/man/man1 ; \
++           ln -s rz.1.gz rb.1.gz ; \
++           ln -s rz.1.gz rx.1.gz ; \
++           ln -s sz.1.gz sb.1.gz ; \
++           ln -s sz.1.gz sx.1.gz
++	dh_fixperms
++	dh_installdeb
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install
+--- lrzsz-0.12.21.orig/lib/Makefile.in
++++ lrzsz-0.12.21/lib/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated automatically by automake 1.4a from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
+ 
+ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+@@ -46,10 +46,9 @@
+ AUTOHEADER = @AUTOHEADER@
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-INSTALL_STRIP_FLAG =
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -127,7 +126,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ DEP_FILES =  .deps/alloca.P .deps/error.P .deps/getopt.P .deps/getopt1.P \
+ .deps/long-options.P .deps/mkdir.P .deps/mktime.P .deps/stpcpy.P \
+@@ -282,7 +281,7 @@
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -343,7 +342,7 @@
+ all-am: Makefile $(ANSI2KNR) $(LIBRARIES) $(HEADERS)
+ all-redirect: all-am
+ install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+ 
+ 
+--- lrzsz-0.12.21.orig/man/Makefile.in
++++ lrzsz-0.12.21/man/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated automatically by automake 1.4a from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
+ 
+ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+@@ -46,10 +46,9 @@
+ AUTOHEADER = @AUTOHEADER@
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-INSTALL_STRIP_FLAG =
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -106,7 +105,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+@@ -173,7 +172,7 @@
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -202,7 +201,7 @@
+ all-am: Makefile $(MANS)
+ all-redirect: all-am
+ install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+ 	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1
+ 
+--- lrzsz-0.12.21.orig/po/lrzsz.pot
++++ lrzsz-0.12.21/po/lrzsz.pot
+@@ -6,7 +6,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 1999-08-22 21:00+0200\n"
++"POT-Creation-Date: 1999-09-19 19:34+0200\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+@@ -14,311 +14,311 @@
+ "Content-Type: text/plain; charset=CHARSET\n"
+ "Content-Transfer-Encoding: ENCODING\n"
+ 
+-#: src/lsz.c:228
++#: src/lsz.c:227
+ msgid "io_mode(,2) in rbsb.c not implemented\n"
+ msgstr ""
+ 
+-#: src/lrz.c:196 src/lsz.c:230
++#: src/lrz.c:195 src/lsz.c:229
+ #, c-format
+ msgid "caught signal %d; exiting"
+ msgstr ""
+ 
+-#: src/lsz.c:400
++#: src/lsz.c:399
+ msgid "command tries"
+ msgstr ""
+ 
+-#: src/lsz.c:422
++#: src/lsz.c:421
+ msgid "packetlength"
+ msgstr ""
+ 
+-#: src/lsz.c:427
++#: src/lsz.c:426
+ #, c-format
+ msgid "packetlength out of range 24..%ld"
+ msgstr ""
+ 
+-#: src/lsz.c:436
++#: src/lsz.c:435
+ msgid "framelength"
+ msgstr ""
+ 
+-#: src/lsz.c:441
++#: src/lsz.c:440
+ #, c-format
+ msgid "framelength out of range 32..%ld"
+ msgstr ""
+ 
+-#: src/lrz.c:318 src/lsz.c:450
++#: src/lrz.c:317 src/lsz.c:449
+ msgid "min_bps"
+ msgstr ""
+ 
+-#: src/lsz.c:452
++#: src/lsz.c:451
+ msgid "min_bps must be >= 0"
+ msgstr ""
+ 
+-#: src/lrz.c:324 src/lsz.c:458
++#: src/lrz.c:323 src/lsz.c:457
+ msgid "min_bps_time"
+ msgstr ""
+ 
+-#: src/lrz.c:326 src/lsz.c:460
++#: src/lrz.c:325 src/lsz.c:459
+ msgid "min_bps_time must be > 1"
+ msgstr ""
+ 
+-#: src/lrz.c:342 src/lsz.c:484
++#: src/lrz.c:341 src/lsz.c:483
+ msgid "hour to large (0..23)"
+ msgstr ""
+ 
+-#: src/lrz.c:344 src/lsz.c:486
++#: src/lrz.c:343 src/lsz.c:485
+ msgid "unparsable stop time\n"
+ msgstr ""
+ 
+-#: src/lrz.c:348 src/lsz.c:490
++#: src/lrz.c:347 src/lsz.c:489
+ msgid "minute to large (0..59)"
+ msgstr ""
+ 
+-#: src/lrz.c:358 src/lrz.c:365 src/lsz.c:500 src/lsz.c:507
++#: src/lrz.c:357 src/lrz.c:364 src/lsz.c:499 src/lsz.c:506
+ msgid "stop time to small"
+ msgstr ""
+ 
+-#: src/lrz.c:363 src/lsz.c:505
++#: src/lrz.c:362 src/lsz.c:504
+ msgid "stop-at"
+ msgstr ""
+ 
+-#: src/lrz.c:394 src/lsz.c:516
++#: src/lrz.c:393 src/lsz.c:515
+ msgid "timeout"
+ msgstr ""
+ 
+-#: src/lrz.c:396 src/lsz.c:518
++#: src/lrz.c:395 src/lsz.c:517
+ msgid "timeout out of range 10..1000"
+ msgstr ""
+ 
+-#: src/lrz.c:412 src/lsz.c:526
++#: src/lrz.c:411 src/lsz.c:525
+ msgid "security violation: can't do that under restricted shell\n"
+ msgstr ""
+ 
+-#: src/lrz.c:402 src/lsz.c:533
++#: src/lrz.c:401 src/lsz.c:532
+ msgid "window size"
+ msgstr ""
+ 
+-#: src/lrz.c:427 src/lrz.c:434 src/lsz.c:556 src/lsz.c:563
++#: src/lrz.c:426 src/lrz.c:433 src/lsz.c:555 src/lsz.c:562
+ msgid "cannot turnoff syslog"
+ msgstr ""
+ 
+-#: src/lrz.c:449 src/lsz.c:571
++#: src/lrz.c:448 src/lsz.c:570
+ msgid "startup delay"
+ msgstr ""
+ 
+-#: src/lrz.c:465 src/lrz.c:483 src/lrz.c:760 src/lrz.c:1122 src/lrz.c:1244
+-#: src/lrz.c:1292 src/lrz.c:1309 src/lrz.c:1324 src/lrz.c:1423 src/lsz.c:580
+-#: src/lsz.c:596 src/lsz.c:693 src/lsz.c:828 src/lsz.c:1061
++#: src/lrz.c:464 src/lrz.c:482 src/lrz.c:759 src/lrz.c:1121 src/lrz.c:1243
++#: src/lrz.c:1291 src/lrz.c:1308 src/lrz.c:1323 src/lrz.c:1422 src/lsz.c:579
++#: src/lsz.c:595 src/lsz.c:692 src/lsz.c:827 src/lsz.c:1060
+ #: src/zreadline.c:127
+ msgid "out of memory"
+ msgstr ""
+ 
+-#: src/lrz.c:475 src/lsz.c:592
++#: src/lrz.c:474 src/lsz.c:591
+ msgid "this program was never intended to be used setuid\n"
+ msgstr ""
+ 
+-#: src/lsz.c:612 src/lsz.c:627
++#: src/lsz.c:611 src/lsz.c:626
+ msgid "need at least one file to send"
+ msgstr ""
+ 
+-#: src/lsz.c:629
++#: src/lsz.c:628
+ msgid "Can't send command in restricted mode\n"
+ msgstr ""
+ 
+-#: src/lrz.c:527 src/lsz.c:656
++#: src/lrz.c:526 src/lsz.c:655
+ msgid "hostname too long\n"
+ msgstr ""
+ 
+-#: src/lrz.c:542 src/lsz.c:671
++#: src/lrz.c:541 src/lsz.c:670
+ msgid "illegal server address\n"
+ msgstr ""
+ 
+-#: src/lsz.c:710
++#: src/lsz.c:709
+ msgid "can read only one file from stdin"
+ msgstr ""
+ 
+-#: src/lrz.c:574 src/lsz.c:803
++#: src/lrz.c:573 src/lsz.c:802
+ msgid "Transfer incomplete\n"
+ msgstr ""
+ 
+-#: src/lrz.c:576 src/lsz.c:805
++#: src/lrz.c:575 src/lsz.c:804
+ msgid "Transfer complete\n"
+ msgstr ""
+ 
+-#: src/lsz.c:838
++#: src/lsz.c:837
+ #, c-format
+ msgid "send_pseudo %s: cannot open tmpfile %s: %s"
+ msgstr ""
+ 
+-#: src/lsz.c:851
++#: src/lsz.c:850
+ #, c-format
+ msgid "send_pseudo %s: cannot lstat tmpfile %s: %s"
+ msgstr ""
+ 
+-#: src/lsz.c:859
++#: src/lsz.c:858
+ #, c-format
+ msgid "send_pseudo %s: avoiding symlink trap"
+ msgstr ""
+ 
+-#: src/lsz.c:870
++#: src/lsz.c:869
+ #, c-format
+ msgid "send_pseudo %s: cannot write to tmpfile %s: %s"
+ msgstr ""
+ 
+-#: src/lsz.c:879
++#: src/lsz.c:878
+ #, c-format
+ msgid "send_pseudo %s: failed"
+ msgstr ""
+ 
+-#: src/lsz.c:882
++#: src/lsz.c:881
+ #, c-format
+ msgid "send_pseudo %s: ok"
+ msgstr ""
+ 
+-#: src/lsz.c:916
++#: src/lsz.c:915
+ #, c-format
+ msgid "Answering TIMESYNC at %s"
+ msgstr ""
+ 
+-#: src/lsz.c:921
++#: src/lsz.c:920
+ msgid "timezone"
+ msgstr ""
+ 
+-#: src/lsz.c:924
++#: src/lsz.c:923
+ msgid "timezone unknown"
+ msgstr ""
+ 
+-#: src/lsz.c:953
++#: src/lsz.c:952
+ msgid "Can't open any requested files."
+ msgstr ""
+ 
+-#: src/lsz.c:1009
++#: src/lsz.c:1008
+ #, c-format
+ msgid "security violation: not allowed to upload from %s"
+ msgstr ""
+ 
+-#: src/lrz.c:1384 src/lsz.c:1027
++#: src/lrz.c:1383 src/lsz.c:1026
+ #, c-format
+ msgid "cannot open %s"
+ msgstr ""
+ 
+-#: src/lsz.c:1082
++#: src/lsz.c:1081
+ #, c-format
+ msgid "is not a file: %s"
+ msgstr ""
+ 
+-#: src/lsz.c:1115 src/lsz.c:1130
++#: src/lsz.c:1114 src/lsz.c:1129
+ #, c-format
+ msgid "%s/%s: error occured"
+ msgstr ""
+ 
+-#: src/lsz.c:1119
++#: src/lsz.c:1118
+ #, c-format
+ msgid "skipped: %s"
+ msgstr ""
+ 
+-#: src/lsz.c:1122
++#: src/lsz.c:1121
+ #, c-format
+ msgid "%s/%s: skipped"
+ msgstr ""
+ 
+-#: src/lsz.c:1149
++#: src/lsz.c:1148
+ #, c-format
+ msgid "Bytes Sent:%7ld   BPS:%-8ld                        \n"
+ msgstr ""
+ 
+-#: src/lsz.c:1178
++#: src/lsz.c:1177
+ #, c-format
+ msgid "Sending %s, %ld blocks: "
+ msgstr ""
+ 
+-#: src/lsz.c:1181
++#: src/lsz.c:1180
+ msgid "Give your local XMODEM receive command now."
+ msgstr ""
+ 
+-#: src/lsz.c:1224
++#: src/lsz.c:1223
+ #, c-format
+ msgid "Sending: %s\n"
+ msgstr ""
+ 
+-#: src/lsz.c:1267
++#: src/lsz.c:1266
+ msgid "Timeout on pathname"
+ msgstr ""
+ 
+-#: src/lsz.c:1314
++#: src/lsz.c:1313
+ msgid "Receiver Cancelled"
+ msgstr ""
+ 
+-#: src/lsz.c:1340
++#: src/lsz.c:1339
+ msgid "No ACK on EOT"
+ msgstr ""
+ 
+-#: src/lsz.c:1361
++#: src/lsz.c:1360
+ #, c-format
+ msgid "Xmodem sectors/kbytes sent: %3d/%2dk"
+ msgstr ""
+ 
+-#: src/lsz.c:1363
++#: src/lsz.c:1362
+ #, c-format
+ msgid "Ymodem sectors/kbytes sent: %3d/%2dk"
+ msgstr ""
+ 
+-#: src/lsz.c:1395
++#: src/lsz.c:1394
+ msgid "Cancelled"
+ msgstr ""
+ 
+-#: src/lsz.c:1399
++#: src/lsz.c:1398
+ msgid "Timeout on sector ACK"
+ msgstr ""
+ 
+-#: src/lsz.c:1404
++#: src/lsz.c:1403
+ msgid "NAK on sector"
+ msgstr ""
+ 
+-#: src/lsz.c:1410
++#: src/lsz.c:1409
+ msgid "Got burst for sector ACK"
+ msgstr ""
+ 
+-#: src/lsz.c:1412
++#: src/lsz.c:1411
+ #, c-format
+ msgid "Got %02x for sector ACK"
+ msgstr ""
+ 
+-#: src/lsz.c:1424
++#: src/lsz.c:1423
+ msgid "Retry Count Exceeded"
+ msgstr ""
+ 
+-#: src/lrz.c:596 src/lsz.c:1502
++#: src/lrz.c:595 src/lsz.c:1501
+ #, c-format
+ msgid "Try `%s --help' for more information.\n"
+ msgstr ""
+ 
+-#: src/lrz.c:601 src/lsz.c:1507
++#: src/lrz.c:600 src/lsz.c:1506
+ #, c-format
+ msgid "%s version %s\n"
+ msgstr ""
+ 
+-#: src/lsz.c:1510
++#: src/lsz.c:1509
+ #, c-format
+ msgid "Usage: %s [options] file ...\n"
+ msgstr ""
+ 
+-#: src/lsz.c:1512
++#: src/lsz.c:1511
+ #, c-format
+ msgid "   or: %s [options] -{c|i} COMMAND\n"
+ msgstr ""
+ 
+-#: src/lsz.c:1513
++#: src/lsz.c:1512
+ msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n"
+ msgstr ""
+ 
+-#: src/lrz.c:607 src/lsz.c:1515
++#: src/lrz.c:606 src/lsz.c:1514
+ msgid ""
+ "    (X) = option applies to XMODEM only\n"
+ "    (Y) = option applies to YMODEM only\n"
+ "    (Z) = option applies to ZMODEM only\n"
+ msgstr ""
+ 
+-#: src/lsz.c:1521
++#: src/lsz.c:1520
+ msgid ""
+ "  -+, --append                append to existing destination file (Z)\n"
+ "  -2, --twostop               use 2 stop bits\n"
+@@ -345,7 +345,7 @@
+ "  -M, --min-bps-time N          for at least N seconds (default: 120)\n"
+ msgstr ""
+ 
+-#: src/lsz.c:1546
++#: src/lsz.c:1545
+ msgid ""
+ "  -n, --newer                 send file if source newer (Z)\n"
+ "  -N, --newer-or-longer       send file if source newer or longer (Z)\n"
+@@ -371,64 +371,64 @@
+ "short options use the same arguments as the long ones\n"
+ msgstr ""
+ 
+-#: src/lsz.c:1768
++#: src/lsz.c:1767
+ msgid "got ZRQINIT"
+ msgstr ""
+ 
+-#: src/lrz.c:1079 src/lrz.c:1772 src/lsz.c:1774
++#: src/lrz.c:1078 src/lrz.c:1771 src/lsz.c:1773
+ msgid "got ZCAN"
+ msgstr ""
+ 
+-#: src/lsz.c:1991
++#: src/lsz.c:1990
+ #, c-format
+ msgid "blklen now %d\n"
+ msgstr ""
+ 
+-#: src/lsz.c:2053
++#: src/lsz.c:2052
+ #, c-format
+ msgid "zsendfdata: bps rate %ld below min %ld"
+ msgstr ""
+ 
+-#: src/lsz.c:2070
++#: src/lsz.c:2069
+ msgid "zsendfdata: reached stop time"
+ msgstr ""
+ 
+-#: src/lsz.c:2080
++#: src/lsz.c:2079
+ #, c-format
+ msgid "Bytes Sent:%7ld/%7ld   BPS:%-8ld ETA %02d:%02d  "
+ msgstr ""
+ 
+-#: src/lsz.c:2223
++#: src/lsz.c:2222
+ #, c-format
+ msgid "calc_blklen: reduced to %d due to error\n"
+ msgstr ""
+ 
+-#: src/lsz.c:2256
++#: src/lsz.c:2255
+ #, c-format
+ msgid "calc_blklen: returned old value %d due to low bpe diff\n"
+ msgstr ""
+ 
+-#: src/lsz.c:2258
++#: src/lsz.c:2257
+ #, c-format
+ msgid "calc_blklen: old %ld, new %ld, d %ld\n"
+ msgstr ""
+ 
+-#: src/lsz.c:2267
++#: src/lsz.c:2266
+ #, c-format
+ msgid "calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n"
+ msgstr ""
+ 
+-#: src/lsz.c:2278
++#: src/lsz.c:2277
+ #, c-format
+ msgid "calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n"
+ msgstr ""
+ 
+-#: src/lsz.c:2290
++#: src/lsz.c:2289
+ #, c-format
+ msgid "calc_blklen: returned %d as best\n"
+ msgstr ""
+ 
+-#: src/lsz.c:2486
++#: src/lsz.c:2485
+ #, c-format
+ msgid ""
+ "\n"
+@@ -444,7 +444,7 @@
+ msgid "Sender Canceled"
+ msgstr ""
+ 
+-#: src/lrz.c:1002 src/zm.c:586 src/zm.c:645
++#: src/lrz.c:1001 src/zm.c:586 src/zm.c:645
+ msgid "TIMEOUT"
+ msgstr ""
+ 
+@@ -470,40 +470,40 @@
+ msgid "Retry %d: "
+ msgstr ""
+ 
+-#: src/lrz.c:382
++#: src/lrz.c:381
+ msgid "don't have settimeofday, will not set time\n"
+ msgstr ""
+ 
+-#: src/lrz.c:386
++#: src/lrz.c:385
+ msgid "not running as root (this is good!), can not set time\n"
+ msgstr ""
+ 
+-#: src/lrz.c:441
++#: src/lrz.c:440
+ msgid "bytes_per_error"
+ msgstr ""
+ 
+-#: src/lrz.c:443
++#: src/lrz.c:442
+ msgid "bytes-per-error should be >100"
+ msgstr ""
+ 
+-#: src/lrz.c:455
++#: src/lrz.c:454
+ msgid "O_SYNC not supported by the kernel"
+ msgstr ""
+ 
+-#: src/lrz.c:497 src/lrz.c:499
++#: src/lrz.c:496 src/lrz.c:498
+ msgid "garbage on commandline"
+ msgstr ""
+ 
+-#: src/lrz.c:604
++#: src/lrz.c:603
+ #, c-format
+ msgid "Usage: %s [options] [filename.if.xmodem]\n"
+ msgstr ""
+ 
+-#: src/lrz.c:605
++#: src/lrz.c:604
+ msgid "Receive files with ZMODEM/YMODEM/XMODEM protocol\n"
+ msgstr ""
+ 
+-#: src/lrz.c:612
++#: src/lrz.c:611
+ msgid ""
+ "  -+, --append                append to existing files\n"
+ "  -a, --ascii                 ASCII transfer (change CR/LF to LF)\n"
+@@ -543,152 +543,152 @@
+ "short options use the same arguments as the long ones\n"
+ msgstr ""
+ 
+-#: src/lrz.c:676
++#: src/lrz.c:675
+ #, c-format
+ msgid "%s waiting to receive."
+ msgstr ""
+ 
+-#: src/lrz.c:730 src/lrz.c:1806
++#: src/lrz.c:729 src/lrz.c:1805
+ #, c-format
+ msgid "\rBytes received: %7ld/%7ld   BPS:%-6ld                \r\n"
+ msgstr ""
+ 
+-#: src/lrz.c:772
++#: src/lrz.c:771
+ #, c-format
+ msgid "%s: ready to receive %s"
+ msgstr ""
+ 
+-#: src/lrz.c:799
++#: src/lrz.c:798
+ #, c-format
+ msgid "\rBytes received: %7ld   BPS:%-6ld                \r\n"
+ msgstr ""
+ 
+-#: src/lrz.c:825
++#: src/lrz.c:824
+ #, c-format
+ msgid ""
+ "\r\n"
+ "%s: %s removed.\r\n"
+ msgstr ""
+ 
+-#: src/lrz.c:856
++#: src/lrz.c:855
+ msgid "Pathname fetch returned EOT"
+ msgstr ""
+ 
+-#: src/lrz.c:903
++#: src/lrz.c:902
+ msgid "Received dup Sector"
+ msgstr ""
+ 
+-#: src/lrz.c:917
++#: src/lrz.c:916
+ msgid "Sync Error"
+ msgstr ""
+ 
+-#: src/lrz.c:965
++#: src/lrz.c:964
+ msgid "CRC"
+ msgstr ""
+ 
+-#: src/lrz.c:976
++#: src/lrz.c:975
+ msgid "Checksum"
+ msgstr ""
+ 
+-#: src/lrz.c:979
++#: src/lrz.c:978
+ msgid "Sector number garbled"
+ msgstr ""
+ 
+-#: src/lrz.c:991
++#: src/lrz.c:990
+ msgid "Sender Cancelled"
+ msgstr ""
+ 
+-#: src/lrz.c:1005
++#: src/lrz.c:1004
+ #, c-format
+ msgid "Got 0%o sector header"
+ msgstr ""
+ 
+-#: src/lrz.c:1113
++#: src/lrz.c:1112
+ #, c-format
+ msgid "file name ends with a /, skipped: %s\n"
+ msgstr ""
+ 
+-#: src/lrz.c:1127
++#: src/lrz.c:1126
+ #, c-format
+ msgid "zmanag=%d, Lzmanag=%d\n"
+ msgstr ""
+ 
+-#: src/lrz.c:1128
++#: src/lrz.c:1127
+ #, c-format
+ msgid "zconv=%d\n"
+ msgstr ""
+ 
+-#: src/lrz.c:1192 src/lrz.c:1226
++#: src/lrz.c:1191 src/lrz.c:1225
+ #, c-format
+ msgid "file exists, skipped: %s\n"
+ msgstr ""
+ 
+-#: src/lrz.c:1267
++#: src/lrz.c:1266
+ #, c-format
+ msgid "TIMESYNC: here %ld, remote %ld, diff %ld seconds\n"
+ msgstr ""
+ 
+-#: src/lrz.c:1276
++#: src/lrz.c:1275
+ #, c-format
+ msgid "TIMESYNC: cannot set time: %s\n"
+ msgstr ""
+ 
+-#: src/lrz.c:1296
++#: src/lrz.c:1295
+ msgid "Topipe"
+ msgstr ""
+ 
+-#: src/lrz.c:1314
++#: src/lrz.c:1313
+ #, c-format
+ msgid "Receiving: %s\n"
+ msgstr ""
+ 
+-#: src/lrz.c:1545
++#: src/lrz.c:1544
+ #, c-format
+ msgid "Blocks received: %d"
+ msgstr ""
+ 
+-#: src/lrz.c:1599
++#: src/lrz.c:1598
+ #, c-format
+ msgid "%s: %s exists\n"
+ msgstr ""
+ 
+-#: src/lrz.c:1612 src/lrz.c:1620
++#: src/lrz.c:1611 src/lrz.c:1619
+ #, c-format
+ msgid "%s:\tSecurity Violation"
+ msgstr ""
+ 
+-#: src/lrz.c:1730
++#: src/lrz.c:1729
+ msgid "remote command execution requested"
+ msgstr ""
+ 
+-#: src/lrz.c:1737
++#: src/lrz.c:1736
+ msgid "not executed"
+ msgstr ""
+ 
+-#: src/lrz.c:1768
++#: src/lrz.c:1767
+ msgid "got ZRINIT"
+ msgstr ""
+ 
+-#: src/lrz.c:1817
++#: src/lrz.c:1816
+ msgid "Skipped"
+ msgstr ""
+ 
+ #. too bad
+-#: src/lrz.c:2049
++#: src/lrz.c:2048
+ #, c-format
+ msgid "rzfile: bps rate %ld below min %ld"
+ msgstr ""
+ 
+ #. too bad
+-#: src/lrz.c:2064
++#: src/lrz.c:2063
+ msgid "rzfile: reached stop time"
+ msgstr ""
+ 
+-#: src/lrz.c:2071
++#: src/lrz.c:2070
+ #, c-format
+ msgid "\rBytes received: %7ld/%7ld   BPS:%-6ld ETA %02d:%02d  "
+ msgstr ""
+ 
+-#: src/lrz.c:2215
++#: src/lrz.c:2214
+ msgid "file close error"
+ msgstr ""
+--- lrzsz-0.12.21.orig/src/Makefile.in
++++ lrzsz-0.12.21/src/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated automatically by automake 1.4a from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
+ 
+ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+@@ -45,10 +45,9 @@
+ AUTOHEADER = @AUTOHEADER@
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-INSTALL_STRIP_FLAG =
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -132,7 +131,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ DEP_FILES =  .deps/canit.P .deps/crctab.P .deps/lrz.P .deps/lsyslog.P \
+ .deps/lsz.P .deps/protname.P .deps/rbsb.P .deps/tcp.P .deps/timing.P \
+@@ -167,8 +166,8 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+-	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -292,7 +291,7 @@
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -353,7 +352,7 @@
+ all-am: Makefile $(ANSI2KNR) $(PROGRAMS) $(HEADERS)
+ all-redirect: all-am
+ install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+ 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
+ 
+--- lrzsz-0.12.21.orig/src/lrz.c
++++ lrzsz-0.12.21/src/lrz.c
+@@ -44,7 +44,6 @@
+ #ifndef STRICT_PROTOTYPES
+ extern time_t time();
+ extern char *strerror();
+-extern char *strstr();
+ #endif
+ 
+ #ifndef HAVE_ERRNO_DECLARATION
+--- lrzsz-0.12.21.orig/src/lsz.c
++++ lrzsz-0.12.21/src/lsz.c
+@@ -53,7 +53,6 @@
+ #ifndef STRICT_PROTOTYPES
+ extern time_t time();
+ extern char *strerror();
+-extern char *strstr();
+ #endif
+ 
+ #ifndef HAVE_ERRNO_DECLARATION
+--- lrzsz-0.12.21.orig/testsuite/Makefile.in
++++ lrzsz-0.12.21/testsuite/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated automatically by automake 1.4a from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
+ 
+ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+@@ -46,10 +46,9 @@
+ AUTOHEADER = @AUTOHEADER@
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-INSTALL_STRIP_FLAG =
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -103,7 +102,7 @@
+ DIST_COMMON =  Makefile.am Makefile.in
+ 
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ EXPECT = expect
+ RUNTEST = runtest
+@@ -133,7 +132,7 @@
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    cp -pr $$/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -192,7 +191,7 @@
+ all-am: Makefile
+ all-redirect: all-am
+ install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+ 
+ 
diff --git a/source/a/minicom/minicom.SlackBuild b/source/a/minicom/minicom.SlackBuild
new file mode 100755
index 000000000..c9249f64b
--- /dev/null
+++ b/source/a/minicom/minicom.SlackBuild
@@ -0,0 +1,134 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=2.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-minicom
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# minicom
+cd $TMP
+rm -rf minicom-$VERSION
+tar xzvf $CWD/minicom-$VERSION.tar.gz
+cd minicom-$VERSION
+chown -R root:root .
+find . -perm 777 -exec chmod 755 {} \;
+find . -perm 664 -exec chmod 644 {} \;
+# Fix re-declaration of BC in termcap.h
+zcat $CWD/wintcap.diff.gz | patch -p1 --verbose || exit 1
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc
+make -j3
+make install DESTDIR=$PKG
+mkdir -p $PKG/etc
+zcat $CWD/minicom.users.gz > $PKG/etc/minicom.users.new
+zcat $CWD/minirc.dfl.gz > $PKG/etc/minirc.dfl.new
+gzip -9 $PKG/usr/man/man?/*.?
+mkdir -p $PKG/usr/doc/minicom-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING ChangeLog FILE_ID.DIZ INSTALL NEWS README TODO \
+  doc \
+  $PKG/usr/doc/minicom-$VERSION
+
+# lzrz
+# If autoconf causes failure here (which it probably will),
+# remove it temporarily and the build should work fine...
+cd $TMP
+tar xzvf $CWD/lrzsz_0.12.21.orig.tar.gz
+cd lrzsz-990823
+# Make x86_64 a valid machine type (thanks to Fred Emmott)
+zcat $CWD/config.sub-x86_64.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/lrzsz_0.12.21-4.diff.gz | patch -p1 --verbose || exit 1
+chown -R root:root .
+./configure \
+  --prefix=/usr \
+  $ARCH-slackware-linux
+make -j3
+cd src
+cat lrz > $PKG/usr/bin/lrz
+cat lsz > $PKG/usr/bin/lsz
+chmod 755 $PKG/usr/bin/l*z
+cd ../man
+for page in lrz.1 lsz.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
+done
+echo '.so man1/lrz.1' | gzip -9c > $PKG/usr/man/man1/rz.1.gz
+echo '.so man1/lsz.1' | gzip -9c > $PKG/usr/man/man1/sz.1.gz
+cd ../po
+mkdir -p $PKG/usr/share/locale/de/LC_MESSAGES
+cat de.gmo > $PKG/usr/share/locale/de/LC_MESSAGES/lrzsz.mo
+cd ..
+mkdir -p $PKG/usr/doc/lrzsz-0.12.21
+cp -a ABOUT-NLS AUTHORS COMPATABILITY COPYING INSTALL NEWS README-alpha \
+  README.cvs README.gettext README.isdn4linux README.systems \
+  README.tests THANKS TODO $PKG/usr/doc/lrzsz-0.12.21
+
+
+( cd $PKG
+  ( cd usr/bin ; rm -rf rx )
+  ( cd usr/bin ; ln -sf  rz rx )
+  ( cd usr/bin ; rm -rf rb )
+  ( cd usr/bin ; ln -sf  rz rb )
+  ( cd usr/bin ; rm -rf sb )
+  ( cd usr/bin ; ln -sf  sz sb )
+  ( cd usr/bin ; rm -rf sx )
+  ( cd usr/bin ; ln -sf  sz sx )
+  ( cd usr/bin ; rm -rf rz )
+  ( cd usr/bin ; ln -sf lrz rz )
+  ( cd usr/bin ; rm -rf lrb )
+  ( cd usr/bin ; ln -sf lrz lrb )
+  ( cd usr/bin ; rm -rf lrx )
+  ( cd usr/bin ; ln -sf lrz lrx )
+  ( cd usr/bin ; rm -rf sz )
+  ( cd usr/bin ; ln -sf lsz sz )
+  ( cd usr/bin ; rm -rf lsb )
+  ( cd usr/bin ; ln -sf lsz lsb )
+  ( cd usr/bin ; rm -rf lrx )
+  ( cd usr/bin ; ln -sf lsz lrx )
+  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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+
+cd $PKG
+makepkg -l y -c n $TMP/minicom-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/minicom/minicom.users b/source/a/minicom/minicom.users
new file mode 100644
index 000000000..509d86f41
--- /dev/null
+++ b/source/a/minicom/minicom.users
@@ -0,0 +1,36 @@
+# $Id: minicom.users,v 1.1.1.1 1999/12/18 11:18:51 misiek Exp $
+# Minicom.users	  Access file for the minicom program.
+#
+# Format:	  Either just one username per line, or
+#		  a username followed by one or more
+#		  configuration-names. The name of the
+#		  default configuration is "dfl". The maximum
+#                 significant line length is 70 characters.
+#
+# Location:	  The minicom library directory, probably
+#		  /etc or /var/lib/minicom or whatever.
+#
+# Notes:          If you don't install this file in the
+#                 specified location, everybody will have
+#                 access to minicom.
+#
+#                 This doesn't matter if minicom isn't installed
+#                 setuid root since access will then be based
+#                 on the permissions set on the serial port.
+#
+
+#
+# Who may use minicom?
+#
+# User		[line]	[..line]
+#
+
+# Everyone has access to all configurations.
+ALL
+
+## The rest are examples.
+## # Erik only has access to the default configuration
+## erik		dfl
+## 
+## # minicom has access to the default configuration, and configuration 'tty5'.
+## minicom		dfl	tty5
diff --git a/source/a/minicom/minirc.dfl b/source/a/minicom/minirc.dfl
new file mode 100644
index 000000000..42e9d8fe4
--- /dev/null
+++ b/source/a/minicom/minirc.dfl
@@ -0,0 +1 @@
+# Machine-generated file - use "minicom -s" to change parameters.
diff --git a/source/a/minicom/slack-desc b/source/a/minicom/slack-desc
new file mode 100644
index 000000000..67d1878c9
--- /dev/null
+++ b/source/a/minicom/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------------------------------------------------------|
+minicom: minicom (communications package)
+minicom:
+minicom: Minicom - a full featured menu-driven communications package similar
+minicom: to the DOS program 'Telix'.  Also includes sz/rz - utilities used to
+minicom: upload and download files using the Zmodem protocol.
+minicom:
+minicom:
+minicom:
+minicom:
+minicom:
+minicom:
diff --git a/source/a/minicom/wintcap.diff b/source/a/minicom/wintcap.diff
new file mode 100644
index 000000000..40d005b3f
--- /dev/null
+++ b/source/a/minicom/wintcap.diff
@@ -0,0 +1,44 @@
+--- minicom-2.1/src/window.c.orig	2003-05-17 00:06:26.000000000 +0400
++++ minicom-2.1/src/window.c	2007-08-26 11:21:04.000000000 +0400
+@@ -62,7 +62,7 @@
+ static char *CS, *SF, *SR, *VB, *BL;
+ static char *VE, *VI, *KS, *KE;
+ static char *CD, *CL, *IC, *DC;
+-static char *BC, *CR, *NL;
++static char *BCs, *CR, *NL;
+ #if ST_LINE
+ static char *TS, *FS, *DS;
+ #endif
+@@ -322,8 +322,8 @@
+   else if (NL != CNULL && x == 0 && x == curx && y == cury + 1)
+ 	outstr(NL);
+ #endif
+-  else if (BC != CNULL && y == cury && x == curx - 1)
+-  	outstr(BC);
++  else if (BCs != CNULL && y == cury && x == curx - 1)
++  	outstr(BCs);
+   else	
+   	outstr(tgoto(CM, x, y));
+   curx = x;
+@@ -1918,7 +1918,7 @@
+   CL = tgetstr("cl", &_tptr);
+   IC = tgetstr("ic", &_tptr);
+   DC = tgetstr("dc", &_tptr);
+-  BC = tgetstr("bc", &_tptr);
++  BCs = tgetstr("bc", &_tptr);
+   CR = tgetstr("cr", &_tptr);
+   NL = tgetstr("nl", &_tptr);
+   AC = tgetstr("ac", &_tptr);
+@@ -1967,10 +1967,10 @@
+   _has_am = tgetflag("am");
+   _mv_standout = tgetflag("ms");
+   if (tgetflag("bs")) {
+-    if (BC == CNULL) BC = "\b";
++    if (BCs == CNULL) BCs = "\b";
+   } 
+   else
+-    BC = CNULL;	
++    BCs = CNULL;	
+ 
+   /* Special IBM box-drawing characters */
+   D_UL  = 201;
diff --git a/source/a/mkinitrd/README.initrd b/source/a/mkinitrd/README.initrd
new file mode 100644
index 000000000..f027fa276
--- /dev/null
+++ b/source/a/mkinitrd/README.initrd
@@ -0,0 +1,100 @@
+
+Slackware initrd mini HOWTO
+by Patrick Volkerding, volkerdi@slackware.com
+Wed Jun 17 01:49:18 CDT 2009
+
+This document describes how to create and install an initrd, which may be 
+required to use the 2.6 kernel.  Also see "man mkinitrd".
+
+1.  What is an initrd?
+2.  Why to I need an initrd?
+3.  How do I build the initrd?
+4.  Now that I've built an initrd, how do I use it?
+
+
+1.  What is an initrd?
+
+Initrd stands for "initial ramdisk".  An initial ramdisk is a very small 
+Linux filesystem that is loaded into RAM and mounted as the kernel boots, 
+and before the main root filesystem is mounted.
+
+2.  Why do I need an initrd?
+
+The usual reason to use an initrd is because you need to load kernel 
+modules before mounting the root partition.  Usually these modules are 
+required to support the filesystem used by the root partition (ext3, 
+reiserfs, xfs), or perhaps the controller that the hard drive is attached 
+to (SCSI, RAID, etc).  Essentially, there are so many different options 
+available in modern Linux kernels that it isn't practical to try to ship 
+many different kernels to try to cover everyone's needs.  It's a lot more 
+flexible to ship a generic kernel and a set of kernel modules for it.
+
+3.  How do I build the initrd?
+
+The easiest way to make the initrd is to use the mkinitrd script included 
+in Slackware's mkinitrd package.  We'll walk through the process of 
+upgrading to the generic 2.6.29.5 Linux kernel using the packages
+found in Slackware's slackware/a/ directory.
+
+First, make sure the kernel, kernel modules, and mkinitrd package are 
+installed (the current version numbers might be a little different, so 
+this is just an example):
+
+  installpkg kernel-generic-2.6.29.5-i686-1.tgz
+  installpkg kernel-modules-2.6.29.5-i686-1.tgz
+  installpkg mkinitrd-1.1.0-i486-1.tgz
+
+Change into the /boot directory:
+
+  cd /boot
+
+Now you'll want to run "mkinitrd".  I'm using reiserfs for my root
+filesystem, and since it's an IDE system the reiserfs module will be
+the only one I need to load:
+
+  mkinitrd -c -k 2.6.29.5 -m reiserfs
+
+This should do two things.  First, it will create a directory
+/boot/initrd-tree containing the initrd's filesystem.  Then it will
+create an initrd (/boot/initrd.gz) from this tree.  If you wanted to,
+you could make some additional changes in /boot/initrd-tree/ and
+then run mkinitrd again without options to rebuild the image.  That's
+optional, though, and only advanced users will need to think about that.
+
+Here's another example:  Build an initrd image using Linux 2.6.29.5
+kernel modules for a system with an ext3 root partition on /dev/hdb3.
+Note that you need the mbcache, jbd, and ext3 modules to use ext3:
+
+  mkinitrd -c -k 2.6.29.5 -m mbcache:jbd:ext3 -f ext3 -r /dev/hdb3
+
+
+4.  Now that I've built an initrd, how do I use it?
+
+Now that you've got an initrd (/boot/initrd.gz), you'll want to load
+it along with the kernel at boot time.  If you use LILO for your boot
+loader you'll need to edit /etc/lilo.conf and add a line to load the
+initrd.  Here's an example section of lilo.conf showing how this is
+done:
+
+# Linux bootable partition config begins
+image = /boot/vmlinuz-generic-2.6.29.5
+  initrd = /boot/initrd.gz
+  root = /dev/hda6
+  label = Lnx26295
+  read-only
+# Linux bootable partition config ends
+
+The initrd is loaded by the "initrd = /boot/initrd.gz" line.
+Just add the line right below the line for the kernel image you use.
+Save the file, and then run LILO again ('lilo' at the command line).
+You'll need to run lilo every time you edit lilo.conf or rebuild the
+initrd.
+
+Other bootloaders such as syslinux also support the use of an initrd.
+See the documentation for those programs for details on using an
+initrd with them.
+
+
+---------
+
+Have fun!
diff --git a/source/a/mkinitrd/archive/busybox-1.7.2.no-gc-sections.diff b/source/a/mkinitrd/archive/busybox-1.7.2.no-gc-sections.diff
new file mode 100644
index 000000000..e4f64367c
--- /dev/null
+++ b/source/a/mkinitrd/archive/busybox-1.7.2.no-gc-sections.diff
@@ -0,0 +1,11 @@
+--- ./Makefile.orig	2007-09-29 18:54:25.000000000 -0500
++++ ./Makefile	2007-11-27 15:35:42.000000000 -0600
+@@ -570,7 +570,7 @@
+ quiet_cmd_busybox__ ?= LINK    $@
+       cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \
+       -o $@ -Wl,-Map -Wl,$@.map \
+-      -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
++      -Wl,--warn-common -Wl,--sort-common \
+       -Wl,--start-group $(busybox-all) -Wl,--end-group \
+       $(LDLIBS)
+ 
diff --git a/source/a/mkinitrd/archive/busybox-1.7.2.remove_warning.diff b/source/a/mkinitrd/archive/busybox-1.7.2.remove_warning.diff
new file mode 100644
index 000000000..99257fc76
--- /dev/null
+++ b/source/a/mkinitrd/archive/busybox-1.7.2.remove_warning.diff
@@ -0,0 +1,20 @@
+--- ./applets/applets.c.orig	2007-09-16 13:48:10.000000000 -0500
++++ ./applets/applets.c	2007-10-04 22:07:47.000000000 -0500
+@@ -16,7 +16,7 @@
+ #include "busybox.h"
+ 
+ /* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
+-#if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__)
++/* #if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__) 
+ #warning Static linking against glibc produces buggy executables
+ #warning (glibc does not cope well with ld --gc-sections).
+ #warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
+@@ -24,7 +24,7 @@
+ #warning If you still want to do it, remove -Wl,--gc-sections
+ #warning from top-level Makefile and remove this warning.
+ #error Aborting compilation.
+-#endif
++#endif */
+ 
+ 
+ /* Declare <applet>_main() */
diff --git a/source/a/mkinitrd/archive/busybox-1.7.2.tar.bz2.sign b/source/a/mkinitrd/archive/busybox-1.7.2.tar.bz2.sign
new file mode 100644
index 000000000..19ac2fabe
--- /dev/null
+++ b/source/a/mkinitrd/archive/busybox-1.7.2.tar.bz2.sign
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+busybox-1.7.2.tar.bz2 released Sun, 30 Sep 2007 01:02:10 +0100
+
+MD5:  c91ec9756e2000073a9dd8fa9fc3f89e  busybox-1.7.2.tar.bz2
+SHA1: d9c618a7b104af4e70d623b1b6f3bc454405e12b  busybox-1.7.2.tar.bz2
+
+To verify this signature, you can obtain my public key
+from http://busybox.net/~vda/vda_pubkey.gpg
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFG/ueHR7cMVazJllsRAuBAAJ9r7SuXFQJCm/k0KZp39oDMsqBy7ACffZ9t
+r/kwDWTYEr7doIKcNINt+p0=
+=GHTs
+-----END PGP SIGNATURE-----
diff --git a/source/a/mkinitrd/archive/busybox-dot-config.1.11.2 b/source/a/mkinitrd/archive/busybox-dot-config.1.11.2
new file mode 100644
index 000000000..012350efa
--- /dev/null
+++ b/source/a/mkinitrd/archive/busybox-dot-config.1.11.2
@@ -0,0 +1,855 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.11.2
+# Tue Sep 23 23:25:46 2008
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+CONFIG_STATIC=y
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+
+#
+# Installation Options
+#
+CONFIG_INSTALL_NO_USR=y
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=64
+# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+# CONFIG_FEATURE_HWIB is not set
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
+CONFIG_BUNZIP2=y
+CONFIG_BZIP2=y
+CONFIG_CPIO=y
+CONFIG_FEATURE_CPIO_O=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
+CONFIG_GZIP=y
+CONFIG_RPM2CPIO=y
+# CONFIG_RPM is not set
+# CONFIG_FEATURE_RPM_BZ2 is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_GZIP=y
+CONFIG_FEATURE_TAR_BZIP2=y
+CONFIG_FEATURE_TAR_LZMA=y
+CONFIG_FEATURE_TAR_COMPRESS=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_UNCOMPRESS=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAL=y
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+CONFIG_FEATURE_DF_INODE=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+CONFIG_EXPAND=y
+CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+CONFIG_SPLIT=y
+CONFIG_FEATURE_SPLIT_FANCY=y
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_STTY=y
+CONFIG_SUM=y
+CONFIG_SYNC=y
+CONFIG_TAC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNEXPAND=y
+CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+CONFIG_FEATURE_WC_LARGE=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_KBD_MODE=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_FEATURE_DIFF_MINIMAL=y
+CONFIG_ED=y
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=10
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_HALT=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_FEATURE_CHECK_NAMES=y
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+CONFIG_LOGIN_SCRIPTS=y
+CONFIG_FEATURE_NOLOGIN=y
+# CONFIG_FEATURE_SECURETTY is not set
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_CRYPTPW=y
+CONFIG_CHPASSWD=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+CONFIG_DEPMOD=y
+# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set
+CONFIG_FEATURE_DEPMOD_ALIAS=y
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+CONFIG_FEATURE_OSF_LABEL=y
+CONFIG_FEATURE_FDISK_ADVANCED=y
+# CONFIG_FINDFS is not set
+CONFIG_FREERAMDISK=y
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_FEATURE_HEXDUMP_REVERSE=y
+CONFIG_HD=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MKSWAP=y
+CONFIG_FEATURE_MKSWAP_V0=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_VOLUMEID=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_HFS=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_ROMFS=y
+CONFIG_FEATURE_VOLUMEID_SYSV=y
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_READPROFILE=y
+CONFIG_RTCWAKE=y
+CONFIG_SCRIPT=y
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MTAB_SUPPORT=y
+
+#
+# Miscellaneous Utilities
+#
+CONFIG_ADJTIMEX=y
+CONFIG_BBCONFIG=y
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+CONFIG_FBSPLASH=y
+CONFIG_INOTIFYD=y
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_FLAGCS=y
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
+CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+CONFIG_RAIDAUTORUN=y
+CONFIG_READAHEAD=y
+CONFIG_RUNLEVEL=y
+CONFIG_RX=y
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_TIME=y
+CONFIG_TTYSIZE=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+CONFIG_ARP=y
+CONFIG_ARPING=y
+CONFIG_BRCTL=y
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+CONFIG_FAKEIDENTD=y
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFENSLAVE=y
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PSCAN=y
+CONFIG_ROUTE=y
+# CONFIG_SENDMAIL is not set
+# CONFIG_FETCHMAIL is not set
+CONFIG_SLATTACH=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_TELNETD=y
+CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
+# CONFIG_APP_UDHCPC is not set
+# CONFIG_FEATURE_UDHCPC_ARPING is not set
+# CONFIG_FEATURE_UDHCP_PORT is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_DHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_ZCIP=y
+CONFIG_TCPSVD=y
+CONFIG_UDPSVD=y
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_NMETER=y
+CONFIG_PGREP=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+CONFIG_PKILL=y
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_FEATURE_PS_TIME=y
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOPMEM=y
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+CONFIG_ASH_MAIL=y
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_CTTYHACK=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+CONFIG_SV=y
+CONFIG_SVLOGD=y
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+CONFIG_LPR=y
+# CONFIG_LPQ is not set
diff --git a/source/a/mkinitrd/archive/busybox-dot-config.1.12.0 b/source/a/mkinitrd/archive/busybox-dot-config.1.12.0
new file mode 100644
index 000000000..b462fe9a1
--- /dev/null
+++ b/source/a/mkinitrd/archive/busybox-dot-config.1.12.0
@@ -0,0 +1,857 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.12.0
+# Thu Sep 25 12:38:54 2008
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+CONFIG_STATIC=y
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+# CONFIG_PARSE is not set
+
+#
+# Installation Options
+#
+CONFIG_INSTALL_NO_USR=y
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=64
+# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+# CONFIG_FEATURE_HWIB is not set
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+CONFIG_FEATURE_SEAMLESS_Z=y
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
+CONFIG_BUNZIP2=y
+CONFIG_BZIP2=y
+CONFIG_CPIO=y
+CONFIG_FEATURE_CPIO_O=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+CONFIG_RPM2CPIO=y
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_UNCOMPRESS=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAL=y
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+CONFIG_FEATURE_DF_INODE=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+CONFIG_EXPAND=y
+CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+CONFIG_SPLIT=y
+CONFIG_FEATURE_SPLIT_FANCY=y
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_STTY=y
+CONFIG_SUM=y
+CONFIG_SYNC=y
+CONFIG_TAC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNEXPAND=y
+CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+CONFIG_FEATURE_WC_LARGE=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_KBD_MODE=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
+CONFIG_SETFONT=y
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+CONFIG_SHOWKEY=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_FEATURE_DIFF_MINIMAL=y
+CONFIG_ED=y
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=10
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_HALT=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_FEATURE_CHECK_NAMES=y
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+CONFIG_LOGIN_SCRIPTS=y
+CONFIG_FEATURE_NOLOGIN=y
+# CONFIG_FEATURE_SECURETTY is not set
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_CRYPTPW=y
+CONFIG_CHPASSWD=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_DEPMOD=y
+# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set
+CONFIG_FEATURE_DEPMOD_ALIAS=y
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+CONFIG_FEATURE_OSF_LABEL=y
+CONFIG_FEATURE_FDISK_ADVANCED=y
+# CONFIG_FINDFS is not set
+CONFIG_FREERAMDISK=y
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_FEATURE_HEXDUMP_REVERSE=y
+CONFIG_HD=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MKSWAP=y
+CONFIG_FEATURE_MKSWAP_V0=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_VOLUMEID=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_HFS=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_ROMFS=y
+CONFIG_FEATURE_VOLUMEID_SYSV=y
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_RDEV=y
+CONFIG_READPROFILE=y
+CONFIG_RTCWAKE=y
+CONFIG_SCRIPT=y
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MTAB_SUPPORT=y
+
+#
+# Miscellaneous Utilities
+#
+CONFIG_ADJTIMEX=y
+CONFIG_BBCONFIG=y
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+CONFIG_FBSPLASH=y
+CONFIG_INOTIFYD=y
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_FLAGCS=y
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
+CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+CONFIG_RAIDAUTORUN=y
+CONFIG_READAHEAD=y
+CONFIG_RUNLEVEL=y
+CONFIG_RX=y
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_TIME=y
+CONFIG_TTYSIZE=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+CONFIG_ARP=y
+CONFIG_ARPING=y
+CONFIG_BRCTL=y
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+CONFIG_FAKEIDENTD=y
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFENSLAVE=y
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_FEATURE_NETSTAT_PRG=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PSCAN=y
+CONFIG_ROUTE=y
+# CONFIG_SENDMAIL is not set
+# CONFIG_FETCHMAIL is not set
+CONFIG_SLATTACH=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_TELNETD=y
+CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
+# CONFIG_APP_UDHCPC is not set
+# CONFIG_FEATURE_UDHCPC_ARPING is not set
+# CONFIG_FEATURE_UDHCP_PORT is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_DHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_ZCIP=y
+CONFIG_TCPSVD=y
+CONFIG_UDPSVD=y
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_NMETER=y
+CONFIG_PGREP=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+CONFIG_PKILL=y
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_FEATURE_PS_TIME=y
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOPMEM=y
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+CONFIG_ASH_MAIL=y
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_CTTYHACK=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+CONFIG_SV=y
+CONFIG_SVLOGD=y
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+CONFIG_LPR=y
+# CONFIG_LPQ is not set
diff --git a/source/a/mkinitrd/archive/busybox-dot-config.1.12.1 b/source/a/mkinitrd/archive/busybox-dot-config.1.12.1
new file mode 100644
index 000000000..5987e0503
--- /dev/null
+++ b/source/a/mkinitrd/archive/busybox-dot-config.1.12.1
@@ -0,0 +1,857 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.12.1
+# Fri Nov  7 10:20:30 2008
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+CONFIG_STATIC=y
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+# CONFIG_PARSE is not set
+
+#
+# Installation Options
+#
+CONFIG_INSTALL_NO_USR=y
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=64
+# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+# CONFIG_FEATURE_HWIB is not set
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+CONFIG_FEATURE_SEAMLESS_Z=y
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
+CONFIG_BUNZIP2=y
+CONFIG_BZIP2=y
+CONFIG_CPIO=y
+CONFIG_FEATURE_CPIO_O=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+CONFIG_RPM2CPIO=y
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_UNCOMPRESS=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAL=y
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+CONFIG_FEATURE_DF_INODE=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+CONFIG_EXPAND=y
+CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+CONFIG_SPLIT=y
+CONFIG_FEATURE_SPLIT_FANCY=y
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_STTY=y
+CONFIG_SUM=y
+CONFIG_SYNC=y
+CONFIG_TAC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNEXPAND=y
+CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+CONFIG_FEATURE_WC_LARGE=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_KBD_MODE=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
+CONFIG_SETFONT=y
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+CONFIG_SHOWKEY=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_FEATURE_DIFF_MINIMAL=y
+CONFIG_ED=y
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=10
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_HALT=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_FEATURE_CHECK_NAMES=y
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+CONFIG_LOGIN_SCRIPTS=y
+CONFIG_FEATURE_NOLOGIN=y
+# CONFIG_FEATURE_SECURETTY is not set
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_CRYPTPW=y
+CONFIG_CHPASSWD=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_DEPMOD=y
+# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set
+CONFIG_FEATURE_DEPMOD_ALIAS=y
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+CONFIG_FEATURE_OSF_LABEL=y
+CONFIG_FEATURE_FDISK_ADVANCED=y
+CONFIG_FINDFS=y
+CONFIG_FREERAMDISK=y
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_FEATURE_HEXDUMP_REVERSE=y
+CONFIG_HD=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MKSWAP=y
+CONFIG_FEATURE_MKSWAP_V0=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_VOLUMEID=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_HFS=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_ROMFS=y
+CONFIG_FEATURE_VOLUMEID_SYSV=y
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_RDEV=y
+CONFIG_READPROFILE=y
+CONFIG_RTCWAKE=y
+CONFIG_SCRIPT=y
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MTAB_SUPPORT=y
+
+#
+# Miscellaneous Utilities
+#
+CONFIG_ADJTIMEX=y
+CONFIG_BBCONFIG=y
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+CONFIG_FBSPLASH=y
+CONFIG_INOTIFYD=y
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_FLAGCS=y
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
+CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+CONFIG_RAIDAUTORUN=y
+CONFIG_READAHEAD=y
+CONFIG_RUNLEVEL=y
+CONFIG_RX=y
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_TIME=y
+CONFIG_TTYSIZE=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+CONFIG_ARP=y
+CONFIG_ARPING=y
+CONFIG_BRCTL=y
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+CONFIG_FAKEIDENTD=y
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFENSLAVE=y
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_FEATURE_NETSTAT_PRG=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PSCAN=y
+CONFIG_ROUTE=y
+# CONFIG_SENDMAIL is not set
+# CONFIG_FETCHMAIL is not set
+CONFIG_SLATTACH=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_TELNETD=y
+CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
+# CONFIG_APP_UDHCPC is not set
+# CONFIG_FEATURE_UDHCPC_ARPING is not set
+# CONFIG_FEATURE_UDHCP_PORT is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_DHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_ZCIP=y
+CONFIG_TCPSVD=y
+CONFIG_UDPSVD=y
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_NMETER=y
+CONFIG_PGREP=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+CONFIG_PKILL=y
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_FEATURE_PS_TIME=y
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOPMEM=y
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+CONFIG_ASH_MAIL=y
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_CTTYHACK=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+CONFIG_SV=y
+CONFIG_SVLOGD=y
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+CONFIG_LPR=y
+# CONFIG_LPQ is not set
diff --git a/source/a/mkinitrd/archive/busybox-dot-config.1.7.2 b/source/a/mkinitrd/archive/busybox-dot-config.1.7.2
new file mode 100644
index 000000000..5b9c00b45
--- /dev/null
+++ b/source/a/mkinitrd/archive/busybox-dot-config.1.7.2
@@ -0,0 +1,753 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.7.2
+# Thu Oct  4 22:03:29 2007
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_NITPICK=y
+CONFIG_DESKTOP=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+CONFIG_STATIC=y
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_BUILD_AT_ONCE=y
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+
+#
+# Installation Options
+#
+CONFIG_INSTALL_NO_USR=y
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_FANCY_KEYS=y
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=64
+# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
+CONFIG_GZIP=y
+CONFIG_RPM2CPIO=y
+# CONFIG_RPM is not set
+# CONFIG_FEATURE_RPM_BZ2 is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+CONFIG_FEATURE_TAR_LZMA=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+CONFIG_FEATURE_TAR_COMPRESS=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_UNCOMPRESS=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+CONFIG_FEATURE_UNARCHIVE_TAPE=y
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAL=y
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+CONFIG_EXPAND=y
+CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+CONFIG_SPLIT=y
+CONFIG_FEATURE_SPLIT_FANCY=y
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_STTY=y
+CONFIG_SUM=y
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNEXPAND=y
+CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+CONFIG_FEATURE_WC_LARGE=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_FEATURE_DIFF_MINIMAL=y
+CONFIG_ED=y
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_HALT=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+CONFIG_LOGIN_SCRIPTS=y
+CONFIG_FEATURE_NOLOGIN=y
+# CONFIG_FEATURE_SECURETTY is not set
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_CRYPTPW=y
+CONFIG_CHPASSWD=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+CONFIG_FEATURE_OSF_LABEL=y
+CONFIG_FEATURE_FDISK_ADVANCED=y
+CONFIG_FREERAMDISK=y
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MKSWAP=y
+CONFIG_FEATURE_MKSWAP_V0=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_READPROFILE=y
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MTAB_SUPPORT=y
+
+#
+# Miscellaneous Utilities
+#
+CONFIG_ADJTIMEX=y
+CONFIG_BBCONFIG=y
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_EJECT=y
+CONFIG_LAST=y
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_FLAGCS=y
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
+CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+CONFIG_RAIDAUTORUN=y
+CONFIG_READAHEAD=y
+CONFIG_RUNLEVEL=y
+CONFIG_RX=y
+CONFIG_STRINGS=y
+CONFIG_SETSID=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_TIME=y
+CONFIG_TTYSIZE=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+CONFIG_ARP=y
+CONFIG_ARPING=y
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+CONFIG_FAKEIDENTD=y
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
+CONFIG_NAMEIF=y
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_PSCAN=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_ROUTE=y
+CONFIG_SLATTACH=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_TELNETD=y
+CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_APP_UDHCPC is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_ZCIP=y
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_NMETER=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+CONFIG_ASH_MAIL=y
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+CONFIG_CTTYHACK=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+CONFIG_SV=y
+CONFIG_SVLOGD=y
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+
+#
+# ipsvd utilities
+#
+CONFIG_TCPSVD=y
+CONFIG_UDPSVD=y
diff --git a/source/a/mkinitrd/busybox-1.12.1_inotify.diff b/source/a/mkinitrd/busybox-1.12.1_inotify.diff
new file mode 100644
index 000000000..151d16ce9
--- /dev/null
+++ b/source/a/mkinitrd/busybox-1.12.1_inotify.diff
@@ -0,0 +1,11 @@
+--- busybox-1.12.1.orig/miscutils/inotifyd.c	2008-11-07 01:39:21.000000000 +0000
++++ busybox-1.12.1/miscutils/inotifyd.c	2008-11-07 01:37:05.000000000 +0000
+@@ -28,7 +28,7 @@
+  */
+ 
+ #include "libbb.h"
+-#include <linux/inotify.h>
++#include <sys/inotify.h>
+ 
+ static volatile smallint signalled;
+ 
diff --git a/source/a/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config
new file mode 100644
index 000000000..5987e0503
--- /dev/null
+++ b/source/a/mkinitrd/busybox-dot-config
@@ -0,0 +1,857 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.12.1
+# Fri Nov  7 10:20:30 2008
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+CONFIG_STATIC=y
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+# CONFIG_PARSE is not set
+
+#
+# Installation Options
+#
+CONFIG_INSTALL_NO_USR=y
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=64
+# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+# CONFIG_FEATURE_HWIB is not set
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+CONFIG_FEATURE_SEAMLESS_Z=y
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
+CONFIG_BUNZIP2=y
+CONFIG_BZIP2=y
+CONFIG_CPIO=y
+CONFIG_FEATURE_CPIO_O=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+CONFIG_RPM2CPIO=y
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_UNCOMPRESS=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAL=y
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+CONFIG_FEATURE_DF_INODE=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+CONFIG_EXPAND=y
+CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+CONFIG_SPLIT=y
+CONFIG_FEATURE_SPLIT_FANCY=y
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_STTY=y
+CONFIG_SUM=y
+CONFIG_SYNC=y
+CONFIG_TAC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNEXPAND=y
+CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+CONFIG_FEATURE_WC_LARGE=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_KBD_MODE=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
+CONFIG_SETFONT=y
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+CONFIG_SHOWKEY=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_FEATURE_DIFF_MINIMAL=y
+CONFIG_ED=y
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=10
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_HALT=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_FEATURE_CHECK_NAMES=y
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+CONFIG_LOGIN_SCRIPTS=y
+CONFIG_FEATURE_NOLOGIN=y
+# CONFIG_FEATURE_SECURETTY is not set
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_CRYPTPW=y
+CONFIG_CHPASSWD=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_DEPMOD=y
+# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set
+CONFIG_FEATURE_DEPMOD_ALIAS=y
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+CONFIG_FEATURE_OSF_LABEL=y
+CONFIG_FEATURE_FDISK_ADVANCED=y
+CONFIG_FINDFS=y
+CONFIG_FREERAMDISK=y
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_FEATURE_HEXDUMP_REVERSE=y
+CONFIG_HD=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MKSWAP=y
+CONFIG_FEATURE_MKSWAP_V0=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_VOLUMEID=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_HFS=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_ROMFS=y
+CONFIG_FEATURE_VOLUMEID_SYSV=y
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_RDEV=y
+CONFIG_READPROFILE=y
+CONFIG_RTCWAKE=y
+CONFIG_SCRIPT=y
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MTAB_SUPPORT=y
+
+#
+# Miscellaneous Utilities
+#
+CONFIG_ADJTIMEX=y
+CONFIG_BBCONFIG=y
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+CONFIG_FBSPLASH=y
+CONFIG_INOTIFYD=y
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_FLAGCS=y
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
+CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+CONFIG_RAIDAUTORUN=y
+CONFIG_READAHEAD=y
+CONFIG_RUNLEVEL=y
+CONFIG_RX=y
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_TIME=y
+CONFIG_TTYSIZE=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+CONFIG_ARP=y
+CONFIG_ARPING=y
+CONFIG_BRCTL=y
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+CONFIG_FAKEIDENTD=y
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFENSLAVE=y
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_FEATURE_NETSTAT_PRG=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PSCAN=y
+CONFIG_ROUTE=y
+# CONFIG_SENDMAIL is not set
+# CONFIG_FETCHMAIL is not set
+CONFIG_SLATTACH=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_TELNETD=y
+CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
+# CONFIG_APP_UDHCPC is not set
+# CONFIG_FEATURE_UDHCPC_ARPING is not set
+# CONFIG_FEATURE_UDHCP_PORT is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_DHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_ZCIP=y
+CONFIG_TCPSVD=y
+CONFIG_UDPSVD=y
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_NMETER=y
+CONFIG_PGREP=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+CONFIG_PKILL=y
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_FEATURE_PS_TIME=y
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOPMEM=y
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+CONFIG_ASH_MAIL=y
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_CTTYHACK=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+CONFIG_SV=y
+CONFIG_SVLOGD=y
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+CONFIG_LPR=y
+# CONFIG_LPQ is not set
diff --git a/source/a/mkinitrd/init b/source/a/mkinitrd/init
new file mode 100755
index 000000000..0559932e9
--- /dev/null
+++ b/source/a/mkinitrd/init
@@ -0,0 +1,230 @@
+#!/bin/ash
+#
+# /init:  init script to load kernel modules from an initramfs
+#         This requires that your kernel supports initramfs!!!
+#
+# Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
+# Copyright 2007, 2008  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.
+
+
+# With a generic kernel, you need to load the modules needed to mount the
+# root partition.  This might mean a SCSI, RAID, or other drive controller
+# module, as well as the module to support the root filesystem.  Once the
+# root partition is mounted all the other modules will be available so you
+# don't need to load them here.
+#
+# Config files used by this script:
+#
+# /rootdev   Contains the name of the root device, such as: /dev/hda1 
+#
+# /rootfs    Contains the root filesystem type, such as: xfs
+#
+# /initrd-name    Contains the name of the initrd file.
+#
+# Optional:
+# /load_kernel_modules   A script that uses insmod to load the desired
+#            modules.  If this file is not present, all the modules
+#            in /lib/modules/`uname -r`/ will be loaded in the usual
+#            sorted order.  If you need to load the modules in a
+#            certain order, or if the modules need extra options,
+#            then use a load_kernel_modules script.
+#
+#            There's an example in here.  To actually use it, you'll
+#            need to make it executable:  
+#
+#                chmod 755 load_kernel_modules
+
+INITRD=`cat /initrd-name`
+ROOTDEV=`cat /rootdev`
+ROOTFS=`cat /rootfs`
+LUKSDEV=`cat /luksdev`
+RESUMEDEV=`cat /resumedev`
+WAIT=`cat /wait-for-root`
+KEYMAP=`cat /keymap`
+
+# Mount /proc and /sys:
+mount -n proc /proc -t proc
+mount -n sysfs /sys -t sysfs
+
+# Parse command line
+for ARG in `cat /proc/cmdline`; do
+  case $ARG in
+    rescue)
+      RESCUE=1
+    ;;
+    root=/dev/*)
+      ROOTDEV=`echo $ARG | cut -f2 -d=`
+    ;;
+    rootfs=*)
+      ROOTFS=`echo $ARG | cut -f2 -d=`
+    ;;
+    luksdev=/dev/*)
+      LUKSDEV=`echo $ARG | cut -f2 -d=`
+    ;;
+    waitforroot=*)
+      WAIT=`echo $ARG | cut -f2 -d=`
+    ;;
+    root=LABEL=*)
+      ROOTDEV=`echo $ARG | cut -f2- -d=`
+    ;;
+    resume=*)
+      RESUMEDEV=`echo $ARG | cut -f2 -d=`
+    ;;
+    0|1|2|3|4|5|6)
+      RUNLEVEL=$ARG
+    ;;
+  esac
+done
+
+# Load kernel modules:
+if [ ! -d /lib/modules/`uname -r` ]; then
+  echo "No kernel modules found for Linux `uname -r`."
+elif [ -x ./load_kernel_modules ]; then # use load_kernel_modules script:
+  echo "${INITRD}:  Loading kernel modules from initrd image:"
+  . ./load_kernel_modules
+else # load modules (if any) in order:
+  if ls /lib/modules/`uname -r`/*.*o 1> /dev/null 2> /dev/null ; then
+    echo "${INITRD}:  Loading kernel modules from initrd image:"
+    for module in /lib/modules/`uname -r`/*.*o ; do
+      insmod $module
+    done
+    unset module
+  fi
+fi
+
+# Sometimes the devices needs extra time to be available.
+# root on USB are good example of that.
+sleep $WAIT
+
+# If udevd is available, use it to generate block devices
+# else use mdev to read sysfs and generate the needed devices 
+if [ -x /sbin/udevd -a -x /sbin/udevadm ]; then
+  /sbin/udevd --daemon
+  /sbin/udevadm trigger --subsystem-match=block
+  /sbin/udevadm settle --timeout=10
+else
+  mdev -s
+fi
+
+# Load a custom keyboard mapping:
+if [ -n "$KEYMAP" ]; then
+  echo "${INITRD}:  Loading '$KEYMAP' keyboard mapping:"
+  tar xzOf /etc/keymaps.tar.gz ${KEYMAP}.bmap | loadkmap
+fi
+
+if [ "$RESCUE" = "" ]; then 
+  # Initialize RAID:
+  if [ -x /sbin/mdadm ]; then
+    /sbin/mdadm -E -s >/etc/mdadm.conf
+    /sbin/mdadm -A -s
+  fi
+  
+  # Find root device if a label was given:
+  if echo $ROOTDEV | grep -q "LABEL=" ; then
+    ROOTDEV=`findfs $ROOTDEV`
+  fi
+
+  # Make encrypted root partition available:
+  # The useable device will be under /dev/mapper/
+  # Three scenarios for the commandline exist:
+  # 1- ROOTDEV is on a LUKS volume, and LUKSDEV is a real block device
+  # 2- ROOTDEV is on a LVM volume, and LUKSDEV is a real block device
+  # 3- ROOTDEV is on a LUKS volume, and LUKSDEV is on a LVM volume
+  # Case (3) will have to wait until we initialize the LVM.
+  # Test if ROOTDEV is "/dev/someting" or just "something" - the first means
+  # ROOTDEV is on a LVM volume (scenario 2); we don't need to rewrite ROOTDEV.
+  # The second means that ROOTDEV is on a LUKS volume (scenario 1).
+  CRYPTDEV=""
+  if [ -x /sbin/cryptsetup ]; then
+    # If we find a LUKS device now, it is on a real block device: 
+    if /sbin/cryptsetup isLuks ${LUKSDEV} 1>/dev/null 2>/dev/null ; then
+      CRYPTDEV=$(basename $ROOTDEV)
+      echo "Unlocking LUKS crypt volume '${CRYPTDEV}' on device '$LUKSDEV':"
+      /sbin/cryptsetup luksOpen ${LUKSDEV} $CRYPTDEV </dev/systty >/dev/systty 2>&1
+      if [ "$CRYPTDEV" == "$ROOTDEV" ]; then # scenario 1
+        ROOTDEV="/dev/mapper/${CRYPTDEV}"
+      fi
+    fi
+  fi
+
+  # Initialize LVM:
+  if [ -x /sbin/vgscan ]; then
+    /sbin/vgscan --mknodes --ignorelockingfailure
+    sleep 10
+    /sbin/vgchange -ay --ignorelockingfailure
+  fi
+  
+  # Make encrypted root partition available (scenario 3):
+  # We have to handle cases here where the LUKS volume is created on a LV
+  if [ -x /sbin/cryptsetup ]; then
+    if /sbin/cryptsetup isLuks ${LUKSDEV} 1>/dev/null 2>/dev/null ; then
+      # Only act if we could not open the LUKS device before (i.e. is on a LV):
+      if [ "x$CRYPTDEV" == "x" ]; then
+        echo "Unlocking LUKS crypt volume '${ROOTDEV}' on device '$LUKSDEV':"
+        /sbin/cryptsetup luksOpen ${LUKSDEV} $ROOTDEV </dev/systty >/dev/systty 2>&1
+        ROOTDEV="/dev/mapper/${ROOTDEV}"
+      fi
+    fi
+  fi
+
+  # Resume state from swap
+  if [ "$RESUMEDEV" != "" ]; then
+    if ls -l $RESUMEDEV | grep -q "^l" ; then
+      RESUMEDEV=`ls -l $RESUMEDEV | awk '{ print $NF }'`
+    fi
+    echo "Trying to resume from $RESUMEDEV"
+    RESMAJMIN=`ls -l $RESUMEDEV | tr , : | awk '{ print $5$6 }'`
+    echo $RESMAJMIN > /sys/power/resume
+  fi
+  
+  # Switch to real root partition:
+  echo 0x0100 > /proc/sys/kernel/real-root-dev
+  mount -o ro -t $ROOTFS $ROOTDEV /mnt
+  
+  if [ ! -r /mnt/sbin/init ]; then
+    echo "ERROR:  No /sbin/init found on rootdev (or not mounted).  Trouble ahead."
+    echo "        You can try to fix it. Type 'exit' when things are done." 
+    echo
+    /bin/sh
+  fi
+else
+  echo "RESCUE mode"
+  echo
+  echo "        You can try to fix or rescue your system now. If you want"
+  echo "        to boot into your fixed system, mount your root filesystem"
+  echo "        read-only under /mnt:"
+  echo
+  echo "            # mount -o ro -t filesystem root_device /mnt"
+  echo
+  echo "        Type 'exit' when things are done."
+  echo
+  /bin/sh
+fi
+
+if ps axc | grep -q udevd ; then
+  killall udevd
+fi
+
+unset ERR
+umount /proc
+umount /sys
+echo "${INITRD}:  exiting"
+exec switch_root /mnt /sbin/init $RUNLEVEL
diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd
new file mode 100644
index 000000000..8f77725fe
--- /dev/null
+++ b/source/a/mkinitrd/mkinitrd
@@ -0,0 +1,494 @@
+#!/bin/sh
+# Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
+# Copyright 2004  Patrick J. Volkerding, Concord, CA, USA
+# Copyright 2007, 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.
+
+# Modified by Robby Workman <rworkman@slackware.com> 26 November 2007
+# to add support for mkinitrd.conf - No additional license terms added
+# Modified by Alan Hicks <alan@slackware.com> 27 November 2007 to enable
+# passing arguments to kernel modules - No additional license terms added
+# volkerdi - feel free to remove these :)
+# Modified by Eric Hameleers <alien@slackware.com> 3 April 2008
+# to add support custom keymaps - No additional license terms added
+# Modified by Patrick Volkerding <volkerdi@slackware.com> 17 Dec 2008
+# Added support to bail out if kernel modules are requested for a kernel
+# version that is not installed (thanks to Eric Hameleers), be more
+# verbose about showing modules added to the initrd (thanks to
+# Ellington Santos), and if "mount" returns /dev/root as the root device,
+# use readlink to resolve the device pointed to by the /dev/root
+# symlink, changed modprobe to use --ignore-install to avoid catching
+# custom "install" lines and causing /sbin/modprobe to be copied to the
+# initrd (thanks to Ken Milmore).
+# Of course, license terms remain unchanged.
+
+MKINITRD_VERSION=1.3.4
+
+print_usage() {
+  cat << EOF
+Usage: mkinitrd [OPTION]
+
+mkinitrd creates an initial ramdisk (actually an initramfs cpio+gzip
+archive) used to load kernel modules that are needed to mount the
+root filesystem, or other modules that might be needed before the
+root filesystem is available.  Other binaries may be added to the
+initrd, and the script is easy to modify.  Be creative.  :-)
+
+  -F      Use the contents of /etc/mkinitrd.conf (optional)
+          If this is used in conjunction with any other options passed
+          on the command line, the command-line options will override
+          the config file options.  See mkinitrd.conf(5) for details.
+  -c      Clear the existing initrd tree first
+  -f      Filesystem to use for root partition (must be used with -r)
+  --help  Display this message
+  -h      Device to resume from hibernation. Needs to be the name of
+          the swap partition holding the hibernation image.
+  -k      Kernel version to use
+  -l      Custom keymap to load. Like, 'nl' or 'de-latin1-nodeadkeys'
+  -m      A colon (:) delimited list of kernel modules to load.
+          Additional options may be added to use when loading the
+          kernel modules (but in this case the entire list must be
+          wrapped with double quotes).  Any dependencies of requested
+          modules will also be added to the initrd.
+  -o      Output image (default /boot/initrd.gz)
+  -r      Root partition device (must be used with -f)
+  -s      Initrd source tree (default /boot/initrd-tree/)
+  -w      Time to wait until all disks are detected
+  -C      Use cryptsetup to unlock the underlying device of an
+          encrypted root filesystem (must be used with '-r' parameter).
+          Two scenarios are possible. (1) root filesystem was created on the
+          encrypted disk/LVM partition, example:
+            -C /dev/sda2 -r cryptroot
+          where /dev/sda2 is the encrypted partition and
+          the actual root device name in /etc/fstab is:
+            /dev/mapper/cryptroot
+          (2) the encrypted partition contains a LVM volume which holds the
+          root filesystem, example:
+            -C /dev/sda2 -r /dev/vg/root
+          where /dev/sda2 is the encrypted partition and
+          the actual root device name in /etc/fstab is:
+            /dev/vg/root
+  -L      Add support for LVM partitions
+  -R      Add support for RAID partitions
+  -V      Display version number
+
+A simple example:  Build an initrd for a reiserfs root partition:
+
+  mkinitrd -c -m reiserfs
+
+Another example:  Build an initrd image using Linux 2.6.29.3-smp kernel
+modules for a system with an ext3 root partition on /dev/hdb3:
+
+  mkinitrd -c -k 2.6.29.3-smp -m mbcache:jbd:ext3 -f ext3 -r /dev/hdb3
+
+Note that if you are already logged in with /dev/hdb3 as your /
+partition, and it is running ext3, this command works just the same:
+
+  mkinitrd -c -m ext3
+
+If run without options, mkinitrd will rebuild an initrd image using
+the contents of the $SOURCE_TREE directory, or, if that directory
+does not exist it will be created and populated, and then mkinitrd
+will exit.
+
+EOF
+}
+
+create_new_source_tree() {
+  mkdir -p $SOURCE_TREE
+  # Make sure a kernel module directory exists:
+  mkdir -p $SOURCE_TREE/lib/modules/${KERNEL_VERSION}
+  # Add the initrd-tree skeleton:
+  ( cd $SOURCE_TREE ; tar xzf /usr/share/mkinitrd/initrd-tree.tar.gz )
+  # Make sure we have any block devices that might be needed:
+
+  SLOPPY_DEV_LIST=$(cat /proc/partitions)
+  for device in $SLOPPY_DEV_LIST ; do
+    if [ ! -r $SOURCE_TREE/dev/$device ]; then
+      if [ -b /dev/$device ]; then
+        if [ -L /dev/$device ]; then
+          cp -a --parents $(readlink -e /dev/$device) $SOURCE_TREE
+        fi
+        cp -a --parents /dev/$device $SOURCE_TREE
+      fi
+    fi
+  done
+}
+
+clear_source_tree() {
+  if [ -d "$SOURCE_TREE" ]; then
+    rm -rf $SOURCE_TREE
+  fi
+}
+
+build_initrd_image() {
+  # Make sure we have any block devices that might be needed:
+  SLOPPY_DEV_LIST=$(cat /proc/partitions)
+  for device in $SLOPPY_DEV_LIST ; do
+    if [ ! -r $SOURCE_TREE/dev/$device ]; then
+      if [ -b /dev/$device ]; then
+        if [ -L /dev/$device ]; then
+          cp -a --parents $(readlink -e /dev/$device) $SOURCE_TREE
+        fi
+        cp -a --parents /dev/$device $SOURCE_TREE
+      fi
+    fi
+  done
+  # Wrap the initrd as an initramfs image and move it into place:
+  ( cd $SOURCE_TREE
+    rm -f $OUTPUT_IMAGE
+    find . | cpio -o -H newc | gzip -9c > $OUTPUT_IMAGE
+  )
+}
+
+badconf_file() {
+  # This won't really help with what's *wrong* with the file,
+  # but it will at least give them a clue that there's a problem
+  echo "/etc/mkinitrd.conf is bad or does not exist."
+  echo "If the file does not exist, do not pass -F to mkinitrd."
+  exit 1
+}
+
+# If --help is given, print_usage and exit:
+if echo $* | grep -wq '\--help' ; then
+  print_usage
+  exit 0
+fi
+
+# If -V given, print version and exit:
+if echo $* | grep -wq '\-V' ; then
+  echo "mkinitrd version $MKINITRD_VERSION"
+  exit 0
+fi
+
+# Default values if these aren't previously set.
+# Might be set from config file or by -s and -o options too.
+SOURCE_TREE=${SOURCE_TREE:-/boot/initrd-tree}
+OUTPUT_IMAGE=${OUTPUT_IMAGE:-/boot/initrd.gz}
+KERNEL_VERSION=${KERNEL_VERSION:-"$(uname -r)"}
+
+# Default actions without options:
+if [ -z "$1" ]; then
+  # If the output tree doesn't exist, create it and then exit:
+  if [ ! -d $SOURCE_TREE ]; then
+    echo "Nothing found at location $SOURCE_TREE, so we will create an"
+    echo -n "initrd directory structure there... "
+    create_new_source_tree
+    echo "done."
+    echo
+    echo "Now cd to $SOURCE_TREE and install some modules in your"
+    echo "module directory (lib/modules/${KERNEL_VERSION}).  Then see init"
+    echo "for more information (there are a few other files to edit)."
+    echo "Finally, run mkinitrd again once the initrd-tree is ready,"
+    echo "and $OUTPUT_IMAGE will be created from it."
+    echo
+    exit 0
+  else
+    # If the source tree does exist, the default is to build the initrd
+    # image from it and then exit:
+    build_initrd_image
+    echo "$OUTPUT_IMAGE created."
+    echo "Be sure to run lilo again if you use it."
+    exit 0
+  fi
+fi # default no-option actions
+
+# Parse for the use config file option first or else the other command
+# line options can not override /etc/mkinitrd.conf. 
+for opt in "$@"; do
+  if [ $opt = "-F" ]; then
+      if [ -e /etc/mkinitrd.conf ]; then
+        . /etc/mkinitrd.conf || badconf_file
+      else
+        badconf_file
+      fi
+  fi
+done
+
+# Parse options:
+while [ ! -z "$1" ]; do
+  case $1 in
+    -c)
+      CLEAR_TREE=1
+      shift
+      ;;
+    -f)
+      ROOTFS="$2"
+      shift 2
+      ;;
+    -h)
+      RESUMEDEV="$2" 
+      shift 2
+      ;;
+    -k)
+      KERNEL_VERSION="$2"
+      shift 2
+      ;;
+    -l)
+      KEYMAP="$2"
+      shift 2
+      ;;
+    -m)
+      MODULE_LIST="$2"
+      shift 2
+      ;;
+    -o)
+      OUTPUT_IMAGE="$2"
+      if [ ! "$(echo $OUTPUT_IMAGE | cut -b1)" = "/" ]; then
+        OUTPUT_IMAGE=$(pwd)/$OUTPUT_IMAGE
+      fi
+      shift 2
+      ;;
+    -r)
+      ROOTDEV="$2"
+      shift 2
+      ;;
+    -s)
+      SOURCE_TREE="$2"
+      shift 2
+      ;;
+    -w)
+      WAIT="$2"
+      shift 2
+      ;;
+    -C)
+      CRYPT=1
+      LUKSDEV="$2"
+      shift 2
+      ;;
+    -L)
+      LVM=1
+      shift
+      ;;
+    -R)
+      RAID=1
+      shift
+      ;;
+    *) # unknown, prevent infinite loop
+      shift
+      ;;
+  esac
+done
+
+# If kernel modules are needed but the kernel version is absent, exit now:
+if [ ! -d /lib/modules/$KERNEL_VERSION ]; then
+  echo "ERROR: No /lib/modules/$KERNEL_VERSION kernel modules tree found for kernel \"$KERNEL_VERSION\""
+  exit 1
+fi
+
+# If clearing source tree was requested, do that first
+if [ "$CLEAR_TREE" = "1" ]; then
+  clear_source_tree
+fi
+
+# If there's no $SOURCE_TREE, make one now:
+if [ ! -d "$SOURCE_TREE" ]; then
+  create_new_source_tree
+fi
+
+# If $ROOTDEV and $ROOTFS are not set, assume we want the
+# values for the currently mounted /
+# (unless we find that values are already set in the initrd-tree):
+if [ -z "$ROOTDEV" -a -z "$(cat $SOURCE_TREE/rootdev 2> /dev/null)" ]; then
+  ROOTDEV=$(mount | grep ' on / ' | cut -f 1 -d ' ')
+  if [ "$ROOTDEV" = "/dev/root" ]; then # find real root device
+    ROOTDEV="/dev/$(readlink /dev/root)"
+  fi
+fi
+if [ -z "$ROOTFS" -a -z "$(cat $SOURCE_TREE/rootfs 2> /dev/null)" ]; then
+  ROOTFS=$(mount | grep ' on / ' | cut -f 5 -d ' ')
+fi
+# If needed, write them in the initrd-tree:
+if [ ! -z "$ROOTDEV" ]; then
+  echo $ROOTDEV > $SOURCE_TREE/rootdev
+fi
+if [ ! -z "$ROOTFS" ]; then
+  echo $ROOTFS > $SOURCE_TREE/rootfs
+fi
+
+# If $WAIT is not set, assume we need only one second
+# to have all devices done
+# (unless we find that value is already set in the initrd-tree):
+if [ -z "$WAIT" -a -z "$(cat $SOURCE_TREE/wait-for-root)" ]; then
+  WAIT=1
+fi
+if [ ! -z "$WAIT" ]; then
+  echo $WAIT > $SOURCE_TREE/wait-for-root
+fi
+
+# Useful to know which initrd is running:
+INITRD_NAME=$(basename $OUTPUT_IMAGE)
+echo $INITRD_NAME > $SOURCE_TREE/initrd-name
+
+# Fill /resumedev with the swap partition holding the hibernation image
+if [ ! -z "$RESUMEDEV" ]; then
+  echo $RESUMEDEV > $SOURCE_TREE/resumedev
+fi
+
+# Add custom keymap support if one was given
+if [ ! -z "$KEYMAP" ]; then
+  echo $KEYMAP > $SOURCE_TREE/keymap
+  cp /usr/share/mkinitrd/keymaps.tar.gz $SOURCE_TREE/etc/
+fi
+
+# If LUKSDEV was set in the config file, then we need to set CRYPT=1
+if [ ! -z "$LUKSDEV" ]; then
+  CRYPT=1
+fi
+
+# Include RAID support in initrd
+if [ ! -z "$RAID" ]; then
+  if [ -r /sbin/mdadm ]; then
+    mkdir -p $SOURCE_TREE/sbin
+    cp /sbin/mdadm $SOURCE_TREE/sbin/mdadm
+    chmod 755 $SOURCE_TREE/sbin/mdadm
+  else
+    echo "ERROR:  mdadm binary is missing, RAID support not installed"
+  fi
+fi
+
+# Include LVM support in initrd
+if [ ! -z "$LVM" ]; then
+  if [ -f /sbin/lvm.static ]; then
+    mkdir -p $SOURCE_TREE/sbin
+    cp /sbin/lvm.static $SOURCE_TREE/sbin/lvm.static
+    cp /sbin/dmsetup.static $SOURCE_TREE/sbin/dmsetup.static
+    ( cd $SOURCE_TREE/sbin
+      ln -s lvm.static vgchange 2>/dev/null
+      ln -s lvm.static vgscan 2>/dev/null )
+    if [ -z "${MODULE_LIST}" ] ; then
+      MODULE_LIST="dm-mod"
+    elif ! echo ${MODULE_LIST} | grep -q dm-mod ; then
+      MODULE_LIST="$MODULE_LIST:dm-mod"
+    fi
+  else
+    echo "LVM static binary is missing, LVM support isn't installed"
+  fi
+fi
+
+# Include cryptsetup (LUKS) support in initrd
+if [ ! -z "$CRYPT" ]; then
+  if [ -e /sbin/cryptsetup.static ]; then
+    mkdir -p $SOURCE_TREE/sbin
+    cp /sbin/cryptsetup.static $SOURCE_TREE/sbin/cryptsetup.static
+    ( cd $SOURCE_TREE/sbin
+      ln -s cryptsetup.static cryptsetup 2>/dev/null
+    )
+    cat << EOF > $SOURCE_TREE/sbin/udevadm
+#!/bin/sh
+sleep 3
+EOF
+    chmod 0755 $SOURCE_TREE/sbin/udevadm
+
+    if [ -z "${MODULE_LIST}" ] ; then
+      MODULE_LIST="dm-mod"
+    elif ! echo ${MODULE_LIST} | grep -q dm-mod ; then
+      MODULE_LIST="$MODULE_LIST:dm-mod"
+    fi
+    # Write the underlying luks device to the initrd-tree:
+    echo $LUKSDEV > $SOURCE_TREE/luksdev
+  else
+    echo "Cryptsetup static binary is missing, CRYPT support isn't installed"
+  fi
+fi
+
+# Make module directory:
+if [ ! -d $SOURCE_TREE/lib/modules/$KERNEL_VERSION ]; then
+  mkdir -p $SOURCE_TREE/lib/modules/$KERNEL_VERSION
+fi
+
+# If a module list was given, copy the modules into place:
+if [ ! -z "$MODULE_LIST" ]; then
+  if grep -q "#insmod /lib/modules/2.6.18.8-smp/reiserfs.ko" $SOURCE_TREE/load_kernel_modules ; then
+    rm -f $SOURCE_TREE/load_kernel_modules
+    touch $SOURCE_TREE/load_kernel_modules
+    chmod 755 $SOURCE_TREE/load_kernel_modules
+    echo "# This is a script used to load the kernel modules." >> $SOURCE_TREE/load_kernel_modules
+    echo "# To use it, chmod it 755, and then add the insmod" >> $SOURCE_TREE/load_kernel_modules
+    echo "# lines needed to load your modules, like this:" >> $SOURCE_TREE/load_kernel_modules
+    echo >> $SOURCE_TREE/load_kernel_modules
+  fi
+
+  # Count number of modules
+  # This INDEX number gives us an easy way to find individual
+  # modules and their arguments, as well as tells us how many
+  # times to run through the list
+  if ! echo $MODULE_LIST | grep ':' > /dev/null ; then  # only 1 module specified
+    INDEX=1
+  else
+    INDEX=1
+    while [ ! "$(echo "$MODULE_LIST" | cut -f $INDEX -d ':' )" = "" ]; do
+      INDEX=$(expr $INDEX + 1)
+    done
+    INDEX=$(expr $INDEX - 1)      # Don't include the null value
+  fi
+
+# Wrap everything in a while loop
+i=0
+while [ $i -ne $INDEX ]; do
+  i=$(( $i + 1 ))
+
+  # FULL_MOD is the module plus any arguments (if any)
+  # MODULE is the module name
+  # ARGS is any optional arguments to be passed to the kernel
+  FULL_MOD="$(echo "$MODULE_LIST" | cut -d ':' -f $i)"
+  MODULE="$(echo "$FULL_MOD" | cut -d ' ' -f 1 )"
+  # Test for arguments
+  if echo "$FULL_MOD" | grep ' ' > /dev/null; then
+    ARGS=" $(echo "$FULL_MOD" | cut -d ' ' -f 2- )"
+  else
+    unset ARGS
+  fi
+
+  # Get MODULE deps and prepare insmod lines
+  /sbin/modprobe --set-version $KERNEL_VERSION --show-depends --ignore-install $MODULE 2> /dev/null \
+    | grep "^insmod " | cut -f 2 -d ' ' | while read SRCMOD; do
+
+    if ! grep -q "$SRCMOD" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then
+      LINE="$(echo "insmod -v $SRCMOD" | sed -e "s/$KERNEL_VERSION/\$(uname -r)/")"
+
+      # Test to see if arguments should be passed
+      # Over-ride the previously defined LINE variable if so
+      if [ "$(basename $SRCMOD .ko)" = "$MODULE" ]; then
+        # SRCMOD and MODULE are same, ARGS can be passed
+        LINE="$LINE$ARGS"
+      fi
+
+    fi
+
+    if ! grep -qx "$LINE" $SOURCE_TREE/load_kernel_modules ; then
+      echo "$LINE" >> $SOURCE_TREE/load_kernel_modules
+    fi
+
+    if cp -a --parents $SRCMOD $SOURCE_TREE 2> /dev/null; then
+      echo "OK: $SRCMOD added."
+    else
+      echo "WARNING:  Could not find module \"$SRCMOD\""
+    fi
+
+  done
+
+done
+
+fi
+
+# And finally, build the initrd:
+build_initrd_image
+
diff --git a/source/a/mkinitrd/mkinitrd.8 b/source/a/mkinitrd/mkinitrd.8
new file mode 100644
index 000000000..5fa957218
--- /dev/null
+++ b/source/a/mkinitrd/mkinitrd.8
@@ -0,0 +1,194 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH MKINITRD 8 "04 March 2008" "Slackware Version 12.1"
+.SH NAME
+mkinitrd \- create or rebuilt an initrd (initial ramdisk) using initramfs (simple cpio+gzip).
+.SH SYNOPSIS
+.B mkinitrd
+[
+.B \-F
+]
+[
+.B \-c
+]
+[
+.B \-f filesystem
+]
+[
+.B \-h hibernate_partition
+]
+[
+.B \-k kernel_version
+]
+[
+.B \-m module1:module2:module3...
+]
+[
+.B \-o output_file
+]
+[
+.B \-r root_device
+]
+[
+.B \-s source_tree
+]
+[
+.B \-C crypt_device
+]
+[
+.B \-L
+]
+[
+.B \-R
+]
+[
+.B \-V
+]
+.SH DESCRIPTION
+.B mkinitrd
+is used to build an initial ramdisk.  An initial ramdisk is a very small
+set of files that are loaded into RAM and "mounted" (as initramfs doesn't
+actually use a filesystem) as the kernel boots (before the main root
+filesystem is mounted).  The usual reason to use an initrd is because
+you need to load kernel modules before mounting the root partition.
+Usually these modules are required to support the filesystem used by the
+root partition (ext3, reiserfs, xfs), or perhaps the controller that the
+hard drive is attached to (SCSI, RAID, etc).  Essentially, there are so many
+different options available in modern Linux kernels that it isn't practical
+to try to ship many different kernels to try to cover everyone's needs.
+It's a lot more flexible to ship a generic kernel and a set of kernel
+modules for it.
+.SH OPTIONS
+.TP
+.B \-F
+Use the contents of /etc/mkinitrd.conf as options to mkinitrd (optional).
+If this is used in conjunction with any other options passed on the command 
+line, the command-line options will override the config file options.  
+.br
+See mkinitrd.conf(5) for details.
+.TP
+.B \-c
+Clear the existing initrd tree (by default in /boot/initrd-tree/) first.
+If this is not done, running mkinitrd will add additional modules to the
+existing initrd.
+.TP
+.B \-f filesystem
+Specify the filesystem to use for the root partition.  If this isn't given,
+mount will usually figure it out.  This option must be used together with the
+\-r option in order to be beneficial.
+.TP
+.B \--help
+Display a help summary.
+.TP
+.B \-h hibernate_partition
+Specify the swap partition holding the hibernation image.
+.TP
+.B \-k kernel version
+Use kernel modules from the specified kernel version.  mkinitrd will look
+for them in /lib/modules/(kernel version).
+.TP
+.B \-l keymap
+Load an alternative keyboard mapping. All supported keyboard mappings
+can be found in /usr/share/mkinitrd/keymaps.tar.gz
+Leave the '.bmap' out when you supply this parameter. E.g. '-l nl' will 
+add support for dutch keyboard mapping to the initrd.
+.TP
+.B \-m module list
+This is a list of colon-delimited modules to build into the initrd.
+Any dependencies of requested modules will also be added to the initrd.
+Additional options may be added to use when loading the kernel modules
+(but in this case the entire list must be wrapped with double quotes). 
+.TP
+.B \-o output image
+The file to write the initrd to.  (default: /boot/initrd.gz)
+.TP
+.B \-r root partition
+Specify the device to be used as the root partition.  If this isn't given, the
+kernel default will be used (which is usually fine).  This option must be used
+together with the \-f option in order to be beneficial.
+.TP
+.B \-s source tree
+The directory to use as the source for the initrd.  (default: /boot/initrd-tree/)
+.TP
+.B \-w
+The -w option specifies how long to wait in seconds before assuming that all the
+drives are spun up and ready to go.
+.TP
+.B \-C
+Use cryptsetup to enable the underlying device of an encrypted root partition.
+Requires '-r' parameter.  Two scenarios are possible.
+.br
+(1) root filesystem was created on the encrypted disk/LVM partition, example:
+
+  -C /dev/sda2 -r cryptroot
+
+where /dev/sda2 is the encrypted partition and the actual root device name in /etc/fstab is:
+
+  /dev/mapper/cryptroot
+
+(2) the encrypted partition contains a LVM volume which holds the root filesystem, example:
+
+  -C /dev/sda2 -r /dev/vg/root
+
+where /dev/sda2 is the encrypted partition and the actual root device name in /etc/fstab is:
+
+  /dev/vg/root
+.TP
+.B \-L
+This option adds LVM support to the initrd, if the tools are
+available on the system.
+.TP
+.B \-R
+This option adds RAID support to the initrd, if a static mdadm binary is
+available on the system.
+.TP
+.B \-V
+Display version information and exit.
+.SH EXAMPLES
+A simple example:  Build an initrd for a reiserfs root partition:
+
+  mkinitrd -c -m reiserfs
+
+Another example:  Build an initrd image using Linux 2.6.24.5 kernel
+modules for a system with an ext3 root partition on /dev/hdb3:
+
+  mkinitrd -c -k 2.6.24.5 -m ext3 -f ext3 -r /dev/hdb3
+
+If run without options, mkinitrd will rebuild an initrd image using
+the contents of the $SOURCE_TREE directory, or, if that directory
+does not exist it will be created and populated, and then mkinitrd
+will exit.  These options are handy for building an initrd mostly
+by hand.  After creating /boot/initrd-tree/, you can add modules and
+edit files by hand, and then rerun mkinitrd to create the initrd.
+
+Once the initrd is created, you'll need to tell your boot loader
+to load it.  If you boot with LILO, you will need to add an initrd
+line to /etc/lilo.conf.  Here's a section of lilo.conf that shows
+how to set this up:
+
+ # Linux bootable partition config begins
+ image = /boot/vmlinuz-generic-2.6.24.5
+   initrd = /boot/initrd.gz
+   root = /dev/hda6
+   label = Linux26245
+   read-only
+ # Linux bootable partition config ends
+
+Once you've created the initrd and editing /etc/lilo.conf, you will
+need to run 'lilo' to write out the changed boot block.  The next
+time you reboot the initrd should be loaded along with the kernel.
+
+Have fun!
+
+.SH SEE ALSO
+mkinitrd.conf (5)
+
+.SH AUTHOR
+Patrick J. Volkerding <volkerdi@slackware.com>
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
new file mode 100755
index 000000000..10e70b997
--- /dev/null
+++ b/source/a/mkinitrd/mkinitrd.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Copyright 2007, 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=1.3.4
+BB=1.12.1
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:--j7}
+BUILD=${BUILD:-3}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mkinitrd
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf busybox-$BB
+tar xvf $CWD/busybox-$BB.tar.bz2 || exit 1
+cd busybox-$BB
+
+#zcat $CWD/busybox-${BB}.remove_warning.diff.gz | patch -p1 --verbose || exit 1
+#zcat $CWD/busybox-${BB}.no-gc-sections.diff.gz | patch -p1 --verbose || exit 1
+# Needed with 2.6.27 kernel:
+zcat $CWD/busybox-1.12.1_inotify.diff.gz | patch -p1 --verbose || exit 1
+
+chown -R root:root .
+sed -e \
+  's#^CONFIG_PREFIX=.*#CONFIG_PREFIX="'$PKG'/usr/share/mkinitrd/initrd-tree"#' \
+  $CWD/busybox-dot-config > .config
+make oldconfig
+make $NUMJOBS || make || exit 1
+
+mkdir -p $PKG/usr/share/mkinitrd/initrd-tree/{bin,sbin}
+make install || exit 1
+rm -f $PKG/usr/share/mkinitrd/initrd-tree/linuxrc
+
+# Copying additional files:
+cp $CWD/mkinitrd_command_generator.sh $PKG/usr/share/mkinitrd
+chmod 755 $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh
+cp $CWD/keymaps.tar.gz $PKG/usr/share/mkinitrd
+
+# Zip up the initrd-tree:
+( cd $PKG/usr/share/mkinitrd/initrd-tree
+  tar xf $CWD/_initrd-tree.tar.gz
+  cat $CWD/init > init
+  tar czf ../initrd-tree.tar.gz .
+)
+rm -rf $PKG/usr/share/mkinitrd/initrd-tree
+
+# Add busybox docs:
+mkdir -p $PKG/usr/doc/busybox-$BB
+cp -a AUTHORS INSTALL LICENSE README \
+  $PKG/usr/doc/busybox-$BB
+
+mkdir -p $PKG/sbin
+cat $CWD/mkinitrd > $PKG/sbin/mkinitrd
+chmod 755 $PKG/sbin/mkinitrd
+
+mkdir -p $PKG/usr/man/man{5,8}
+cat $CWD/mkinitrd.8 | gzip -9c > $PKG/usr/man/man8/mkinitrd.8.gz
+cat $CWD/mkinitrd.conf.5 | gzip -9c > $PKG/usr/man/man5/mkinitrd.conf.5.gz
+
+mkdir -p $PKG/etc
+cat $CWD/mkinitrd.conf.sample > $PKG/etc/mkinitrd.conf.sample
+
+mkdir -p $PKG/usr/doc/mkinitrd-$VERSION
+cp -a $CWD/README.initrd $PKG/usr/doc/mkinitrd-$VERSION
+
+( cd $PKG/usr/doc/mkinitrd-$VERSION
+  DATE="$(date)"
+  KERNEL_VERSION="$(uname -r)"
+  PACKAGE_VERSION="$(uname -r | tr - _)"
+  LILO_KERNEL_NAME="$(echo $(uname -r) | tr -d . | tr -d - )"
+  cat README.initrd | sed -e s/@DATE@/"$DATE"/ > README.initrd1
+  cat README.initrd1 | sed -e s/@KERNEL_VERSION@/"$KERNEL_VERSION"/ > README.initrd2
+  cat README.initrd2 | sed -e s/@PACKAGE_VERSION@/"$PACKAGE_VERSION"/ > README.initrd3
+  cat README.initrd3 | sed -e s/@LILO_KERNEL_NAME@/"$LILO_KERNEL_NAME"/ > README.initrd4
+  cat README.initrd4 | sed -e s/@MKINITRD_VERSION@/"$VERSION"/ > README.initrd5
+  cat README.initrd5 | sed -e s/@ARCH@/"$ARCH"/ > README.initrd6
+  cat README.initrd6 | sed -e s/@BUILD@/"$BUILD"/ > README.initrd
+  rm -f README.initrd{1,2,3,4,5,6}
+)
+chmod 644 $PKG/usr/doc/mkinitrd-$VERSION/*
+chown root:root $PKG/usr/doc/mkinitrd-$VERSION/*
+
+mkdir $PKG/boot
+( cd $PKG/boot
+  ln -sf /usr/doc/mkinitrd-$VERSION/README.initrd .
+)
+
+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/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/mkinitrd-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/mkinitrd/mkinitrd.conf.5 b/source/a/mkinitrd/mkinitrd.conf.5
new file mode 100644
index 000000000..5890e2462
--- /dev/null
+++ b/source/a/mkinitrd/mkinitrd.conf.5
@@ -0,0 +1,174 @@
+.\" mkinitrd.5   Robby Workman <rworkman@slackware.com>
+.\" 25 November 2007 "
+
+.TH MKINITRD.CONF 5 "05 Februrary 2008" "Slackware 12.1"
+.SH NAME 
+.B mkinitrd.conf(5)
+.SH SYNOPSIS
+.B mkinitrd.conf - optional configuration file for 
+.I mkinitrd(8)
+
+.SH DESCRIPTION
+The
+.I mkinitrd.conf
+file contains options to be passed to
+.I mkinitrd(8)
+on every run if mkinitrd is executed with the -F flag.  
+.br 
+It is intended as a fast and easy way for the system administrator to
+pass options to mkinitrd without having to type them on each execution.
+
+Options passed to 
+.I mkinitrd(8)
+on the command line will override any
+values set in the config file.
+
+.SH OPTIONS AND SYNTAX
+
+All options are in the format of OPTION="value"
+.br
+Unset variables have no effect.
+
+.TP 5
+.I SOURCE_TREE
+This is the location for the initrd's source tree.
+.br
+Defaults to "/boot/initrd-tree"
+
+.TP 5
+.I CLEAR_TREE
+This option specifies whether to clear the initrd source tree prior to
+creating the initrd. 
+.br
+This requires a value of either "0" or "1" where 0=no and 1=yes
+.br
+Examples:
+.br
+CLEAR_TREE="0"		# Do not clear initrd tree first
+.br
+CLEAR_TREE="1"		# Clear initrd tree first
+
+It is recommended to leave this unset and pass "-c" on the command line
+when clearing the tree is desired.  Clearing the tree is not desirable
+if you wish to build support for more than one kernel into the initrd
+image.
+
+.TP 5
+.I OUTPUT_IMAGE
+This is the location for the initrd image that is created.
+.br
+Defaults to "/boot/initrd.gz"
+
+.TP 5
+.I KERNEL_VERSION
+This is the kernel version for which the initrd should be created.
+.br
+Defaults to "$(uname -r)"
+
+.TP 5
+.I KEYMAP
+This is the custom keyboard map that should be loaded instead of the
+default 'us' keymap.
+.br
+The file /usr/share/mkinitrd/keymaps.tar.gz contains all possible keymaps
+to choose from (omit the '.bmap' extension in the mkinitrd command)
+.br
+Example: KEYMAP="nl"
+
+.TP 5
+.I MODULE_LIST
+This should be a colon-separated list of modules you wish to be included
+in the initrd image.  
+.br
+Example: MODULE_LIST="ext3:mbcache:jbd"
+
+If you have loadtime options that you need to specify when loading kernel
+modules, those can be added here as well.
+.br
+Example: MODULE_LIST="module1:module2 option=1:module3"
+
+.TP 5
+.I LUKSDEV
+When using cryptsetup with an encrypted root partition, use this variable to 
+define the *actual* device name of the encrypted root partition and define the
+*mapped* device name as ROOTDEV.
+.br
+For example, if your actual root device name in /etc/fstab is:
+.br
+.I /dev/mapper/cryptroot
+on 
+.I /dev/sda2
+
+Then you'll need to set:
+.br
+LUKSDEV="/dev/sda2"
+.br
+ROOTDEV="cryptroot"
+
+.TP 5
+.I ROOTDEV
+The device on which your root filesystem is located.
+.br
+Example: ROOTDEV="/dev/sda2"
+
+If you are using cryptsetup and an encrypted root filesystem, be sure to
+read the option above for LUKSDEV or Bad Things will happen.
+
+.TP 5
+.I ROOTFS
+The filesystem type of your root filesystem
+.br
+Example: ROOTFS="ext3"
+
+.TP 5
+.I RAID
+This option adds the mdadm binary to the initrd to support RAID.
+Additional modules may be required, depending on your kernel
+configuration.  If you wish to add LVM support to the initrd, then
+set this to 1; otherwise, leave it unset or set it to 0.
+.br
+Examples:
+.br
+RAID="0"          # Do not add RAID support to initrd
+.br
+RAID="1"          # Add RAID support to initrd
+
+.TP 5
+.I LVM
+This option adds support for LVM partitions into the initrd.
+If you wish to add LVM support to the initrd, then set this to 1;
+otherwise, leave it unset or set it to 0.
+.br
+Examples:
+.br
+LVM="0"          # Do not add LVM support to initrd
+.br
+LVM="1"          # Add LVM support to initrd
+
+.TP 5
+.I WAIT
+This defines the time to wait, in seconds, until all disks are detected.
+.br
+This is useful for allowing extra time that might be needed for slow usb disks or systems with large amounts of storage to become ready.
+.br
+If not defined, the default is 1 second.
+
+.TP 5
+.I RESUMEDEV
+The swap partition holding your hibernation image.
+.br
+Example: RESUMEDEV="/dev/sda2"
+
+.SH FILES
+.I /etc/mkinitrd.conf
+.br
+See /etc/mkinitrd.conf.sample
+
+.SH "SEE ALSO"
+.BR mkinitrd "(8)"
+
+.SH BUGS
+None known :-)
+
+.SH MISCELLANEOUS
+Support for mkinitrd.conf was added in mkinitrd-1.3.0
diff --git a/source/a/mkinitrd/mkinitrd.conf.sample b/source/a/mkinitrd/mkinitrd.conf.sample
new file mode 100644
index 000000000..29e56f5f0
--- /dev/null
+++ b/source/a/mkinitrd/mkinitrd.conf.sample
@@ -0,0 +1,16 @@
+# mkinitrd.conf.sample
+# See "man mkinitrd.conf" for details on the syntax of this file
+#
+#SOURCE_TREE="/boot/initrd-tree"
+#CLEAR_TREE="0"
+#OUTPUT_IMAGE="/boot/initrd.gz"
+#KERNEL_VERSION="$(uname -r)"
+#KEYMAP="us"
+#MODULE_LIST="ext3"
+#LUKSDEV="/dev/hda1"
+#ROOTDEV="/dev/hda1"
+#ROOTFS="ext3"
+#RESUMEDEV="/dev/hda2"
+#RAID="0"
+#LVM="0"
+#WAIT="1"
diff --git a/source/a/mkinitrd/mkinitrd_command_generator.sh b/source/a/mkinitrd/mkinitrd_command_generator.sh
new file mode 100644
index 000000000..d3cdfb731
--- /dev/null
+++ b/source/a/mkinitrd/mkinitrd_command_generator.sh
@@ -0,0 +1,842 @@
+#!/bin/sh
+# $Id: mkinitrd_command_generator.sh,v 1.40 2008/12/18 23:32:56 eha Exp eha $
+# Copyright 2008, 2009 by Eric Hameleers <alien@slackware.com>, Eindhoven, Netherlands
+# Copyright 2008, 2009 by PiterPUNK <piterpunk@slackware.com>, Sao Paulo, SP, Brazil
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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.
+# -----------------------------------------------------------------------------
+#
+# Create an initrd which fits the system.
+# Take into account the use of LVM/LUKS/RAID.
+# Find out about any hardware drivers the system may need in an initrd when
+# booting from a generic lightweight kernel.
+#
+# -----------------------------------------------------------------------------
+
+# The script's revision number will be displayed in the help text:
+REV=$( echo "$Revision: 1.40 $" | cut -d' '  -f2 )
+
+# Define some essential parameter values:
+USING_LVM=""
+USING_LUKS=""
+USING_RAID=""
+MLIST=""
+REALDEV=""   # The device that contains the LUKS volume
+BASEDEV=""   # Lowest level device (raw block device or RAID volume)
+
+FSTAB=${FSTAB:-"/etc/fstab"} # so we can test with alternate fstab files
+
+# These are needed by -c and -i options:
+SOURCE_TREE=${SOURCE_TREE:-"/boot/initrd-tree"}
+CLEAR_TREE=${CLEAR_TREE:-1}
+KEYMAP=${KEYMAP:-"us"}
+WAIT=${WAIT:-1}
+
+# A basic explanation of the commandline parameters:
+basic_usage() {
+  cat <<-EOT
+	
+	*** $(basename $0) revision $REV ***
+	Usage:
+	  $(basename $0) [ options ] [ kernel_filename ]
+	Options:
+	  -a <"additional params">  Additional parameters to pass to mkinitrd.
+	  -c | --conf               Show a suitable mkinitrd configuration file.
+	  -h | --help               Show this help.
+	  -i | --interactive        Navigate through menus instead of using
+	                            commandline arguments.  
+	  --longhelp                Show more detailed information/examples.
+	  -k <kernelversion>        Use specific kernel version.
+	  -m <"additional mods">    Additional modules to pass to mkinitrd,
+	                            separated by colons (:).
+	  -l | --lilo               Only show lilo.conf section
+	                            (requires a kernel_filename).
+	  -r | --run                Only show 'mkinitrd' command.
+	EOT
+}
+
+# More of a tutorial here:
+extended_usage() {
+  cat <<-EOT
+	
+	This script is useful in situations where you require an initrd image
+	to boot your computer.
+	For instance, when booting a kernel that does not have support for your
+	storage or root filesystem built in (such as the Slackware 'generic'
+	kernels').
+	
+	* When you run the script without parameters, it will examine your
+	running system, your current kernel version and will output an example
+	of a 'mkinitrd' commandline that you can use to generate an initrd
+	image containing enough driver support to boot the computer.
+	
+	* You can make it more specific: when you add the filename of a kernel
+	as parameter to the script, it will determine the kernel version from
+	that kernel, and also give an example of the lines that you should add
+	to your '/etc/lilo.conf' file.
+	
+	* If you want your initrd image to have a custom name instead of the
+	default '/boot/initrd.gz' you can add it as another parameter to the
+	script, as follows:
+	
+	  $(basename $0) -a "-o /boot/custom.gz"
+	
+	The arguments to the '-a' parameter will be used as additional arguments
+	to the 'mkinitrd' command.
+	
+	* If you need additional modules in the initrd image, apart from what
+	the script determines, you can pass then to the script using the '-m'
+	parameter as follows:
+	
+	  $(basename $0) -m "uhci-hcd:usbhid"
+	
+	The above example adds support for USB keyboards to the initrd - you
+	may need that if you have encrypted your root partition and need to
+	enter a passphrase using a USB keyboard.
+	
+	* Instead of copying and pasting the script's output, you can create
+	an initrd by directly executing the output, like in this example:
+	
+	EOT
+
+  echo "  \$($(basename $0) --run /boot/vmlinuz-generic-smp-2.6.24.5-smp)"
+
+  cat <<-EOT
+	
+	That used the '-r' or '--run' switch to make the script only write
+	the 'mkinitrd' commandline to the terminal.
+	
+	* When you want to add a section for a specific kernel to
+	'/etc/lilo.conf' directly, use the '-l' or '--lilo' switch and use a
+	command like in this example:
+	
+	EOT
+
+  echo "  $(basename $0) --lilo /boot/vmlinuz-generic-smp-2.6.24.5-smp >>/etc/lilo.conf"
+
+  cat <<-EOT
+	
+	That command will result in the following lines being added to your
+	'/etc/lilo.conf' file (example for my hardware):
+	
+	  # Linux bootable partition config begins
+	  # initrd created with 'mkinitrd -c -k 2.6.24.5-smp -m ata_generic:pata_amd:mbcache:jbd:ext3 -f ext3 -r /dev/hda7'
+	  image = /boot/vmlinuz-generic-smp-2.6.24.5-smp
+	    initrd = /boot/initrd.gz
+	    root = /dev/hda7
+	    label = 2.6.24.5-smp
+	    read-only
+	  # Linux bootable partition config ends
+	
+	The last two examples show how easy it is to configure your computer
+	for the use of an initrd if you need one. The only thing left to do
+	afterwards is running 'lilo'.
+	
+	EOT
+}
+
+# Find the device that holds the root partition:
+get_root_device() {
+  if [ -e $FSTAB ]; then
+    RD=$(cat $FSTAB | tr '\t' ' ' | tr -s ' ' | grep ' / ' | cut -f1 -d' ')
+    if [ "$(echo $RD | cut -f1 -d=)" = "LABEL" -o "$(echo $RD | cut -f1 -d=)" = "UUID" ]; then
+      DKEY=$(echo $RD | cut -f1 -d=)
+      # The value can be LABEL=foo or LABEL='foo' or LABEL="foo"
+      DVAL=$(echo $RD | cut -f2 -d= | tr -d "'\042")
+      RD=$(/sbin/blkid | grep -w $DKEY | grep -w $DVAL | cut -f1 -d:)
+    fi
+  else
+    RD=$(grep -m1 "^/dev/.*[[:blank:]]/[[:blank:]]" /proc/mounts | cut -f1 -d' ')
+  fi
+  echo $RD
+}
+
+# Get the root fs information:
+get_rootfs_type() {
+  if $(type vol_id 1>/dev/null 2>&1) ; then
+    vol_id $ROOTDEV | grep ID_FS_TYPE | cut -f2 -d=
+  else
+    # Alternatively, use:
+    cat $FSTAB | tr '\t' ' ' | tr -s ' ' | grep ' / ' | cut -f3 -d' ' 
+  fi
+}
+
+# Add the module(s) needed for the root filesystem:
+add_rootfs_module() {
+  local FSMOD
+  FSMOD=$(/sbin/modprobe --set-version $KVER --show-depends ${ROOTFS} 2>/dev/null | while read LINE; do
+    echo $(basename $(echo $LINE | cut -d' ' -f2) .ko )
+  done)
+  if [ -n "$FSMOD" ]; then
+     [ -n "$MLIST" ] && echo "$MLIST:$(echo $FSMOD | tr ' ' ':')" \
+                    || echo $FSMOD | tr ' ' ':'
+  fi
+}
+
+# Determine the list of kernel modules needed to support the root device:
+determine_blockdev_drivers() {
+  # Walk the /sys tree to find kernel modules that are
+  # required for our storage devices.
+  # Thanks to PiterPUNK for this piece of code.
+  local MLIST
+  MLIST=$(for i in $(find /sys/block -name "device" -exec ls -l {} \; | sed -ne 's:.*/\(devices.*\)/[a-zA-Z]\+[.0-9]\+/.*:/sys/\1:p' | sort -u); do
+    for j in $(find $i -name "modalias"); do
+      /sbin/modprobe --set-version $KVER --show-depends $(cat $j) 2>/dev/null | while read LINE ; do
+        echo $(basename $(echo $LINE | cut -d' ' -f2) .ko )
+      done
+    done
+  done)
+  MLIST=$( echo $MLIST | tr ' ' ':' )
+  echo $MLIST
+}
+
+# Search for USB keyboards:
+function add_usb_keyboard() {
+  local USBMOD
+  if cat /proc/bus/input/devices | sed -e 's/^$/\$/g' | \
+     tr "\n$" " \n" | grep -q " Phys=.*usb.* .*Handlers=.*kbd.*B:"; then
+     USBMOD="usbhid"
+     [ -n "$MLIST" ] && MLIST="$MLIST:$USBMOD" \
+                     || MLIST="$USBMOD"
+  fi
+  echo $MLIST
+}
+
+# Determine what USB Host Controller is in use
+function add_usb_hcd() {
+  local USBMOD
+  for i in `ls -Ld /sys/module/*_hcd/drivers/*`; do 
+    if ls -L $i | grep -q "[0-9a-f]*:" ; then
+      USBMOD=$( echo $i | cut -f4 -d/ | tr "_" "-")
+      [ -n "$MLIST" ] && MLIST="$MLIST:$USBMOD" \
+                      || MLIST="$USBMOD"
+    fi
+  done
+  echo $MLIST
+}
+
+# Is the root partition on a (combination of) LVM/LUKS volume?
+check_luks_lvm_raid() {
+  if $( lvdisplay -c $ROOTDEV 1>/dev/null 2>/dev/null ); then
+    # Our root partition is on a LV:
+    USING_LVM=1
+    # Search the Physical Volume of our Logical Volume:
+    MYVG=$( echo $(lvdisplay -c $ROOTDEV) | cut -d: -f2 )
+    for LINE in $(pvdisplay -c) ; do
+      VG=$(echo $LINE | cut -d: -f2)
+      [ "$VG" = "$MYVG" ] && break
+    done 
+    PV=$(echo $LINE | cut -d: -f1)
+    # Check if there is a LUKS device underneath:
+    if $( cryptsetup status $PV 1>/dev/null 2>/dev/null ) ; then
+      # Our root partition's LV  is on a LUKS volume:
+      USING_LUKS=1
+      REALDEV=$( cryptsetup status $PV | grep 'device: ' | tr -d ' ' | cut -d: -f2 )
+      BASEDEV=$REALDEV
+    else
+      BASEDEV=$PV
+    fi
+  elif $( cryptsetup status $ROOTDEV 1>/dev/null 2>/dev/null ) ; then
+    # Our root device is on a LUKS volume:
+    USING_LUKS=1
+    REALDEV=$( cryptsetup status $ROOTDEV | grep 'device: ' | tr -d ' ' | cut -d: -f2 )
+    ROOTDEV=$(basename $ROOTDEV)
+    # Check for LVM:
+    for LV in $(lvdisplay -c | tr -d ' ' | cut -f1 -d:) ; do
+      # Note: cryptsetup shows the real device, whereas 
+      # lvdisplay requires the /dev/<myvg>/... symlink to the real device.
+      if [ "$(readlink $LV)" = "$REALDEV" ]; then
+        REALDEV=$LV
+        break
+      fi
+    done
+    if $( lvdisplay -c $REALDEV 1>/dev/null 2>/dev/null ); then
+      # Our root partition's LUKS device is on a LV:
+      USING_LVM=1
+      # Search the Physical Volume of our Logical Volume:
+      MYVG=$( echo $(lvdisplay -c $REALDEV) | cut -d: -f2 )
+      for LINE in $(pvdisplay -c) ; do
+        VG=$(echo $LINE | cut -d: -f2)
+        [ "$VG" = "$MYVG" ] && break
+      done 
+      PV=$(echo $LINE | cut -d: -f1)
+      BASEDEV=$PV
+    else
+      BASEDEV=$REALDEV
+    fi
+  else
+    BASEDEV=$ROOTDEV
+  fi
+
+  # Finally, we should check if base device is
+  #   a real block device or a RAID volume:
+  for MD in  $(cat /proc/mdstat | grep -w active | cut -d' ' -f1) ; do
+    if [ "$BASEDEV" = "/dev/$MD" ]; then
+      USING_RAID=1
+      break
+    fi
+  done
+}
+
+# Before we start
+[ -x /bin/id ] && CMD_ID="/bin/id" || CMD_ID="/usr/bin/id"
+if [ "$($CMD_ID -u)" != "0" ]; then
+  echo "You need to be root to run $(basename $0)."
+  exit 1
+fi
+
+# Parse the commandline parameters:
+while [ ! -z "$1" ]; do
+  case $1 in
+    --longhelp)
+      basic_usage
+      extended_usage
+      exit 0
+      ;;
+    -a)
+      MKINIT_PARAMS=$2
+      shift 2
+      ;;
+    -c|--conf)
+      [ -n "$EMIT" ] && { echo "Do not mix incompatible parameters!"; exit 1; }
+      EMIT="conf"
+      shift
+      ;;
+    -h|--help)
+      basic_usage
+      exit 0
+      ;;
+    -i|--interactive)
+      INTERACTIVE=1
+      shift
+      ;;
+    -k)
+      KVER=$2
+      shift 2
+      ;;
+    -m)
+      MKINIT_MODS=$2
+      shift 2
+      ;;
+    -l|--lilo)
+      [ -n "$EMIT" ] && { echo "Do not mix incompatible parameters!"; exit 1; }
+      EMIT="lilo"
+      shift
+      ;;
+    -L|--fromlilo)
+      FROMLILO=1
+      shift
+      ;;
+    -r|--run)
+      [ -n "$EMIT" ] && { echo "Do not mix incompatible parameters!"; exit 1; }
+      EMIT="run"
+      shift
+      ;;
+    -R|--rootdev)
+      ROOTDEV=$2
+      shift 2
+      ;;
+    -*)
+      echo "Unsupported parameter '$1'!"
+      exit 1
+      ;;
+    *) # Everything else but switches (which start with '-') follows:
+      if [ -f $1 ]; then
+        KFILE=$1
+        # Construction of KFILE's full filename:
+        KFILEPATH=$(cd $(dirname $KFILE) && pwd)
+        if [ -L $KFILE ]; then
+          KFILE=$(readlink $KFILE)
+        else
+          KFILE=$(basename $KFILE)
+        fi
+        KFILE=${KFILEPATH}/$KFILE
+        if [ -z "$(file $KFILE | grep 'Linux kernel x86 boot')" ]; then
+          echo "File '$KFILE' does not look like it is a kernel file!"
+          exit 1
+        fi
+      else
+        echo "File $1 not found!"
+        exit 1
+      fi   
+      shift
+      ;;
+  esac
+done
+
+# Determine what to show as output (other options may have set EMIT already)
+EMIT=${EMIT:-"all"}
+
+# An EMIT value of 'lilo' requires a kernel filename as script parameter:
+if [ "$EMIT" = "lilo" ]; then
+  if [ -z "$KFILE" ]; then
+    echo "A kernel_filename is required with the '-l|--lilo' option!"
+    exit 1
+  fi
+fi
+
+# Determine kernel version to use,
+# and check if modules for this kernel are actually present:
+if [ -z "$KVER" ]; then
+  if [ -n "$KFILE" ]; then
+    KVER="$(strings $KFILE | grep '(.*@.*) #' | cut -f1 -d' ')"
+  else
+    KVER="$(uname -r)"
+  fi
+fi
+if [ ! -d /lib/modules/$KVER ]; then
+  echo "Modules for kernel $KVER aren't installed."
+  exit 1
+fi  
+
+# Determine whether the user passed an alternate filename for the initrd:
+if [ -n "$MKINIT_PARAMS" ]; then
+  SRCHLIST="$MKINIT_PARAMS"
+  for ELEM in $MKINIT_PARAMS ; do
+    SRCHLIST=$(echo $SRCHLIST | cut -d' ' -f2-) # cut ELEM from the list
+    if [ "$ELEM" = "-o" ]; then
+      IMGFILE=$(echo $SRCHLIST | cut -d' ' -f1)
+      break
+    fi
+  done
+fi
+IMGFILE=${IMGFILE:-"/boot/initrd.gz"}
+
+# Get information about the root device / root filesystem:
+ROOTDEV=${ROOTDEV:-$(get_root_device)}
+ROOTFS=$(get_rootfs_type)
+
+# Determine the list of kernel modules needed to support the root device:
+MLIST=$(determine_blockdev_drivers)
+
+# Determine if a USB keyboard is in use and include usbhid to module list
+MLIST=$(add_usb_keyboard)
+
+# If we use any USB module, try to determine the Host Controller
+if echo $MLIST | grep -q "usb"; then
+  MLIST=$(add_usb_hcd)
+fi
+
+# Check what combination of LUKS/LVM/RAID we have to support:
+# This sets values for USING_LUKS, USING_LVM, USING_RAID, REALDEV and BASEDEV.
+check_luks_lvm_raid
+
+# This is the interactive part:
+if [ "$INTERACTIVE" = "1" ];  then
+  if [ "$FROMLILO" != "1" ]; then
+    dialog --stdout --title "WELCOME TO MKINITRD COMMAND GENERATOR" --msgbox "\
+The main goal of this utility is to create a good initrd to \
+fit your needs.  It can detect what kernel you are running, \
+what is your root device, root filesystem, if you use encryption, \
+LVM, RAID, etc. \
+\n\n\
+Usually the probed values are OK and they will be the \
+defaults in all subsequent dialogs, but maybe you want \
+to change something. \n\
+If in doubt, leave the defaults." 0 0 
+
+    KVER=$( ls -d1 --indicator-style=none /lib/modules/* | \
+      awk -F/ -vVER=$KVER '{ 
+                            if ( VER == $NF ) { 
+                              ONOFF="on" 
+                            } else { 
+                              ONOFF="off" 
+                            } ; printf("%s \"\" %s\n",$NF,ONOFF) }' | \
+      xargs dialog --stdout --title "CHOOSE KERNEL VERSION" \
+                   --default-item $KVER --radiolist "\
+Please, select the kernel version you want to create this initrd for." 0 0 4 )
+    [ -z "$KVER" ] && exit 1
+
+    OLDROOTDEV=$ROOTDEV
+    ROOTDEV=$( dialog --stdout --title "SELECT ROOT DEVICE" --inputbox "\
+Enter your root device. Root device is the one where your '/' filesystem \
+is mounted." 0 0 "$ROOTDEV" )
+    [ -z "$ROOTDEV" ] && exit 1
+
+    # We need to re-check our defaults in case the user changed the default
+    # value for ROOTDEV:
+    [ "$OLDROOTDEV" != "$ROOTDEV" ] && check_luks_lvm_raid
+    ROOTFS=$(get_rootfs_type)
+
+    ROOTFS=$( dialog --stdout --title "SELECT ROOT FILESYSTEM" --inputbox "\
+Enter the type of your root filesystem." 0 0 "$ROOTFS" )
+    [ -z "$ROOTFS" ] && exit 1
+  fi
+
+  MLIST=$(add_rootfs_module)
+
+  LLR=$( dialog --stdout --title "LVM/LUKS/RAID" --checklist "\
+Do you use some of those in your root filesystem?  \
+If this is the case, please select one or more options." 12 45 3 \
+"LVM" "Logical Volume Manager" $([ "$USING_LVM" = "1" ] && echo on || echo off) \
+"LUKS" "Linux Unified Key Setup" $([ "$USING_LUKS" = "1" ] && echo on || echo off) \
+"RAID" "Linux Software RAID" $([ "$USING_RAID" = "1" ] && echo on || echo off)) 
+
+  if [ "$?" != "0" ]; then
+    exit 1
+  fi
+
+  echo $LLR | grep -q LUKS && USING_LUKS="1"
+  echo $LLR | grep -q LVM && USING_LVM="1"
+  echo $LLR | grep -q RAID && USING_RAID="1"
+
+  if [ "$USING_LUKS" = "1" ]; then
+    REALDEV=$( dialog --stdout --title "LUKS ROOT DEVICE" --inputbox "\
+Please, enter your LUKS root device:" 0 0 "$REALDEV" )
+    [ -z "$REALDEV" ] && exit 1
+  fi
+fi
+
+# Step out of the interactive loop for a moment. The next block needs to be
+# executed in all cases.
+
+# We need to 'undouble' the MLIST array. Some people report that walking the
+# /sys tree produces duplicate modules in the list.
+# The awk command elimitates doubles without changing the order:
+MLIST=$( echo $MLIST | tr ':' '\n' | awk '!x[$0]++' | tr '\n' ' ' )
+MLIST=$( echo $MLIST | tr ' ' ':' )
+MLIST=$(echo ${MLIST%:}) # To weed out a trailing ':' which was reported once.
+
+# Back to the interactive part:
+
+if [ "$INTERACTIVE" = "1" ];  then
+  MLIST=$( dialog --stdout --title "INITRD'S MODULE LIST" --inputbox "\
+The list here shows all modules needed to support your root filesystem \
+and boot from it.  But you can change the list to use some alternative \
+or additional modules.  If you don't know what to do, the default is safe." \
+0 0 "$MLIST" )
+  if [ "$?" != "0" ]; then
+    exit 1
+  fi
+
+  EXTRA=$( dialog --stdout --title "EXTRA CONFIGURATION" --checklist "\
+Now is your chance for some additional configuration.  All of these \
+configurations are optional and you can stick to the defaults." 11 72 3 \
+"KEYMAP" "Select keyboard layout (default: US)" \
+			   $([ $USING_LUKS = 1 ] && echo on || echo off) \
+"RESUMEDEV" "Select device for 'suspend-to-disk' feature" off \
+"WAIT" "Add delay to allow detection of slow disks at boot" off)
+  if [ "$?" != "0" ]; then
+    exit 1
+  fi
+
+  if echo $EXTRA | grep -q KEYMAP ; then
+    KEYMAP=$( dialog --stdout --title "KEYBOARD LAYOUT SELECTION" \
+      --cancel-label "Skip" \
+      --menu "You may select one of the following keyboard layouts. \
+If you do not select a keyboard map, 'us.map' \
+(the US keyboard layout) is the default.  Use the UP/DOWN \
+arrow keys and PageUp/PageDown to scroll \
+through the whole list of choices." \
+22 55 11 \
+"qwerty/us.map" "" \
+"azerty/azerty.map" "" \
+"azerty/be-latin1.map" "" \
+"azerty/fr-latin0.map" "" \
+"azerty/fr-latin1.map" "" \
+"azerty/fr-latin9.map" "" \
+"azerty/fr-old.map" "" \
+"azerty/fr-pc.map" "" \
+"azerty/fr.map" "" \
+"azerty/wangbe.map" "" \
+"azerty/wangbe2.map" "" \
+"dvorak/ANSI-dvorak.map" "" \
+"dvorak/dvorak-l.map" "" \
+"dvorak/dvorak-r.map" "" \
+"dvorak/dvorak.map" "" \
+"dvorak/no-dvorak.map" "" \
+"fgGIod/tr_f-latin5.map" "" \
+"fgGIod/trf-fgGIod.map" "" \
+"olpc/es-olpc.map" "" \
+"olpc/pt-olpc.map" "" \
+"qwerty/bg-cp1251.map" "" \
+"qwerty/bg-cp855.map" "" \
+"qwerty/bg_bds-cp1251.map" "" \
+"qwerty/bg_bds-utf8.map" "" \
+"qwerty/bg_pho-cp1251.map" "" \
+"qwerty/bg_pho-utf8.map" "" \
+"qwerty/br-abnt.map" "" \
+"qwerty/br-abnt2.map" "" \
+"qwerty/br-latin1-abnt2.map" "" \
+"qwerty/br-latin1-us.map" "" \
+"qwerty/by-cp1251.map" "" \
+"qwerty/by.map" "" \
+"qwerty/bywin-cp1251.map" "" \
+"qwerty/cf.map" "" \
+"qwerty/cz-cp1250.map" "" \
+"qwerty/cz-lat2-prog.map" "" \
+"qwerty/cz-lat2.map" "" \
+"qwerty/cz-qwerty.map" "" \
+"qwerty/defkeymap.map" "" \
+"qwerty/defkeymap_V1.0.map" "" \
+"qwerty/dk-latin1.map" "" \
+"qwerty/dk.map" "" \
+"qwerty/emacs.map" "" \
+"qwerty/emacs2.map" "" \
+"qwerty/es-cp850.map" "" \
+"qwerty/es.map" "" \
+"qwerty/et-nodeadkeys.map" "" \
+"qwerty/et.map" "" \
+"qwerty/fi-latin1.map" "" \
+"qwerty/fi-latin9.map" "" \
+"qwerty/fi-old.map" "" \
+"qwerty/fi.map" "" \
+"qwerty/gr-pc.map" "" \
+"qwerty/gr.map" "" \
+"qwerty/hu101.map" "" \
+"qwerty/il-heb.map" "" \
+"qwerty/il-phonetic.map" "" \
+"qwerty/il.map" "" \
+"qwerty/is-latin1-us.map" "" \
+"qwerty/is-latin1.map" "" \
+"qwerty/it-ibm.map" "" \
+"qwerty/it.map" "" \
+"qwerty/it2.map" "" \
+"qwerty/jp106.map" "" \
+"qwerty/kazakh.map" "" \
+"qwerty/kyrgyz.map" "" \
+"qwerty/la-latin1.map" "" \
+"qwerty/lt.baltic.map" "" \
+"qwerty/lt.l4.map" "" \
+"qwerty/lt.map" "" \
+"qwerty/mk-cp1251.map" "" \
+"qwerty/mk-utf.map" "" \
+"qwerty/mk.map" "" \
+"qwerty/mk0.map" "" \
+"qwerty/nl.map" "" \
+"qwerty/nl2.map" "" \
+"qwerty/no-latin1.map" "" \
+"qwerty/no.map" "" \
+"qwerty/pc110.map" "" \
+"qwerty/pl.map" "" \
+"qwerty/pl1.map" "" \
+"qwerty/pl2.map" "" \
+"qwerty/pl3.map" "" \
+"qwerty/pl4.map" "" \
+"qwerty/pt-latin1.map" "" \
+"qwerty/pt-latin9.map" "" \
+"qwerty/pt.map" "" \
+"qwerty/ro.map" "" \
+"qwerty/ro_std.map" "" \
+"qwerty/ru-cp1251.map" "" \
+"qwerty/ru-ms.map" "" \
+"qwerty/ru-yawerty.map" "" \
+"qwerty/ru.map" "" \
+"qwerty/ru1.map" "" \
+"qwerty/ru2.map" "" \
+"qwerty/ru3.map" "" \
+"qwerty/ru4.map" "" \
+"qwerty/ru_win.map" "" \
+"qwerty/ruwin_alt-CP1251.map" "" \
+"qwerty/ruwin_alt-KOI8-R.map" "" \
+"qwerty/ruwin_alt-UTF-8.map" "" \
+"qwerty/ruwin_cplk-CP1251.map" "" \
+"qwerty/ruwin_cplk-KOI8-R.map" "" \
+"qwerty/ruwin_cplk-UTF-8.map" "" \
+"qwerty/ruwin_ct_sh-CP1251.map" "" \
+"qwerty/ruwin_ct_sh-KOI8-R.map" "" \
+"qwerty/ruwin_ct_sh-UTF-8.map" "" \
+"qwerty/ruwin_ctrl-CP1251.map" "" \
+"qwerty/ruwin_ctrl-KOI8-R.map" "" \
+"qwerty/ruwin_ctrl-UTF-8.map" "" \
+"qwerty/se-fi-ir209.map" "" \
+"qwerty/se-fi-lat6.map" "" \
+"qwerty/se-ir209.map" "" \
+"qwerty/se-lat6.map" "" \
+"qwerty/se-latin1.map" "" \
+"qwerty/sk-prog-qwerty.map" "" \
+"qwerty/sk-qwerty.map" "" \
+"qwerty/speakup-jfw.map" "" \
+"qwerty/speakupmap.map" "" \
+"qwerty/sr-cy.map" "" \
+"qwerty/sv-latin1.map" "" \
+"qwerty/tr_q-latin5.map" "" \
+"qwerty/tralt.map" "" \
+"qwerty/trf.map" "" \
+"qwerty/trq.map" "" \
+"qwerty/ttwin_alt-UTF-8.map.gz" "" \
+"qwerty/ttwin_cplk-UTF-8.map.gz" "" \
+"qwerty/ttwin_ct_sh-UTF-8.map.gz" "" \
+"qwerty/ttwin_ctrl-UTF-8.map.gz" "" \
+"qwerty/ua-cp1251.map.gz" "" \
+"qwerty/ua-utf-ws.map" "" \
+"qwerty/ua-utf.map" "" \
+"qwerty/ua-ws.map" "" \
+"qwerty/ua.map" "" \
+"qwerty/uk.map" "" \
+"qwerty/us-acentos.map" "" \
+"qwerty/us.map" "" \
+"qwertz/croat.map" "" \
+"qwertz/cz-us-qwertz.map" "" \
+"qwertz/cz.map" "" \
+"qwertz/de-latin1-nodeadkeys.map" "" \
+"qwertz/de-latin1.map" "" \
+"qwertz/de.map" "" \
+"qwertz/de_CH-latin1.map" "" \
+"qwertz/fr_CH-latin1.map" "" \
+"qwertz/fr_CH.map" "" \
+"qwertz/hu.map" "" \
+"qwertz/sg-latin1-lk450.map" "" \
+"qwertz/sg-latin1.map" "" \
+"qwertz/sg.map" "" \
+"qwertz/sk-prog-qwertz.map" "" \
+"qwertz/sk-qwertz.map" "" \
+"qwertz/slovene.map" "" )
+    [ -n "$KEYMAP" ] && KEYMAP=$(basename $KEYMAP .map)
+  fi
+
+  if echo $EXTRA | grep -q RESUMEDEV ; then
+    # Print information about swap partitions:
+    FREERAM=$(free -k | grep "^Mem:" | tr -s ' ' | cut -d' ' -f2)
+    SWPINFO=""
+    for SWPDEV in $(grep -w swap $FSTAB | cut -d' ' -f1) ; do
+      SWPINFO="$SWPINFO  $SWPDEV    Linux swap partition    $(fdisk -s $SWPDEV) KB \\n"
+      [ $(fdisk -s $SWPDEV) -gt $FREERAM ] && RESUMEDEV=$SWPDEV
+    done
+    FREERAM=$(free -m | grep "^Mem:" | tr -s ' ' | cut -d' ' -f2)
+    RESUMEDEV=$( dialog --stdout --no-collapse --title "HIBERNATE RESUME DEVICE" --inputbox "\
+When using suspend-to-disk feature (hibernate), your computer's RAM is copied \
+to a swap device when it shuts down.  The kernel will resume from that RAM \
+image at boot.  This means that the swap partition must not be smaller than \
+the amount of RAM you have ($FREERAM MB). \n\
+$SWPINFO \n\
+Please specify a swap partition to be used for hibernation:" \
+0 0 "$RESUMEDEV")
+    [ -z "$RESUMEDEV" ] && exit 1
+  fi
+
+  if echo $EXTRA | grep -q WAIT ; then
+    WAIT=$( dialog --stdout --title "WAIT FOR ROOT DEVICE" --inputbox "\
+Some block devices are too slow to be detected properly at boot. USB storage \
+devices and some disk arrays have this 'feature'. To make your machine \
+boot properly, you can add some delay here, to wait until all your disks are \
+probed and detected. The time is in seconds:" 0 0 "$WAIT")
+    [ -z "$WAIT" ] && exit 1
+  fi
+  
+  IMGFILE=$( dialog --stdout --title "INITRD IMAGE NAME" --inputbox "\
+Enter your initrd image filename." 0 0 "$IMGFILE" )
+  [ -z "$IMGFILE" ] && exit 1
+
+else    
+  MLIST=$(add_rootfs_module)
+fi
+
+# Add any modules passed along on the commandline:
+if [ -n "$MKINIT_MODS" ]; then
+  [ -n "$MLIST" ] && MLIST="$MLIST:$(echo $MKINIT_MODS | tr ' ' ':')" \
+                  || MLIST="$(echo $MKINIT_MODS | tr ' ' ':')"
+fi
+
+# Constructing the mkinitrd command:
+MKINIT="mkinitrd -c -k $KVER -f $ROOTFS -r $ROOTDEV"
+
+# If we have a module list, add them:
+if ! [ -z "$MLIST" -o "$MLIST" = ":" ]; then
+  MKINIT="$MKINIT -m $MLIST"
+fi
+
+# Deal with LUKS/LVM/RAID:
+if [ "$USING_LUKS" = "1" ]; then
+  MKINIT="$MKINIT -C $REALDEV"
+fi
+if [ "$USING_LVM" = "1" ]; then
+  MKINIT="$MKINIT -L"
+fi
+if [ "$USING_RAID" = "1" ]; then
+  MKINIT="$MKINIT -R"
+fi
+
+if [ -n "$RESUMEDEV" ]; then
+  # Add hibernation partition:
+  MKINIT="$MKINIT -h $RESUMEDEV"
+fi
+if [ -n "$KEYMAP" -a "$KEYMAP" != "us" ]; then
+  # Add non-us keyboard mapping:
+  MKINIT="$MKINIT -l $KEYMAP"
+fi
+if [ -n "$WAIT" -a $WAIT -ne 1 ]; then
+  # Add non-default wait time:
+  MKINIT="$MKINIT -w $WAIT"
+fi
+if ! echo "$MKINIT_PARAMS" | grep -q ' -o ' ; then
+  # Add non-default output filename:
+  MKINIT="$MKINIT -o $IMGFILE"
+fi
+if [ -n "$MKINIT_PARAMS" ]; then
+  # Add user-supplied additional parameters:
+  MKINIT="$MKINIT $MKINIT_PARAMS"
+fi
+
+# Notify the user:
+if [ "$EMIT" = "all" ]; then
+  cat <<-EOT
+	#
+	# $(basename $0) revision $REV
+	#
+	# This script will now make a recommendation about the command to use
+	# in case you require an initrd image to boot a kernel that does not
+	# have support for your storage or root filesystem built in
+	# (such as the Slackware 'generic' kernels').
+	# A suitable 'mkinitrd' command will be:
+	
+	$MKINIT
+	EOT
+elif [ "$EMIT" = "run" ]; then
+  echo "$MKINIT"
+elif [ "$EMIT" = "conf" ]; then
+  cat <<-EOT
+	SOURCE_TREE="$SOURCE_TREE"
+	CLEAR_TREE="$CLEAR_TREE"
+	OUTPUT_IMAGE="$IMGFILE"
+	KERNEL_VERSION="$KVER"
+	KEYMAP="$KEYMAP"
+	MODULE_LIST="$(echo $MLIST | cut -f2 -d\ )"
+	LUKSDEV="$REALDEV"
+	ROOTDEV="$ROOTDEV"
+	ROOTFS="$ROOTFS"
+	RESUMEDEV="$RESUMEDEV"
+	RAID="$USING_RAID"
+	LVM="$USING_LVM"
+	WAIT="$WAIT"
+	EOT
+fi
+
+if [ -n "$KFILE" ]; then
+  if [ "$EMIT" = "all" ]; then
+    cat <<-EOT
+	# An entry in 'etc/lilo.conf' for kernel '$KFILE' would look like this:
+	EOT
+  fi
+  if  [ "$EMIT" = "all" -o "$EMIT" = "lilo" ]; then
+  # Compensate for the syntax used for the LUKS-on-LVM case:
+  [ "$(basename $ROOTDEV)" = "$ROOTDEV" ] && BASE="/dev/mapper/" || BASE=""
+    cat <<-EOT
+	# Linux bootable partition config begins
+	# initrd created with '$MKINIT'
+	image = $KFILE
+	  initrd = $IMGFILE
+	  root = $BASE$ROOTDEV
+	  label = $KVER
+	  read-only
+	# Linux bootable partition config ends
+	EOT
+  fi
+fi
diff --git a/source/a/mkinitrd/mkinitrd_kernelcheck.diff b/source/a/mkinitrd/mkinitrd_kernelcheck.diff
new file mode 100644
index 000000000..e1302f54e
--- /dev/null
+++ b/source/a/mkinitrd/mkinitrd_kernelcheck.diff
@@ -0,0 +1,15 @@
+--- mkinitrd.orig	2008-11-30 15:35:58.000000000 +0100
++++ mkinitrd	2008-12-11 11:16:37.000000000 +0100
+@@ -277,6 +277,12 @@
+   esac
+ done
+ 
++# If kernel modules are needed but the kernel version is absent, exit now:
++if [ ! -d /lib/modules/$KERNEL_VERSION ]; then
++  echo "No modules tree found for kernel \"$KERNEL_VERSION\""
++  exit 1
++fi
++
+ # If clearing source tree was requested, do that first
+ if [ "$CLEAR_TREE" = "1" ]; then
+   clear_source_tree
diff --git a/source/a/mkinitrd/slack-desc b/source/a/mkinitrd/slack-desc
new file mode 100644
index 000000000..49d1a764f
--- /dev/null
+++ b/source/a/mkinitrd/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------------------------------------------------------|
+mkinitrd: mkinitrd (make an initial ramdisk)
+mkinitrd:
+mkinitrd: mkinitrd is a script to create an initial ramdisk that is loaded at
+mkinitrd: the same time as the kernel.  The initial ramdisk may be responsible
+mkinitrd: for loading kernel modules (such a filesystem or SCSI controller
+mkinitrd: module) that are needed to mount the root filesystem.
+mkinitrd:
+mkinitrd: The "initrd" is implemented as an initramfs.  See the kernel
+mkinitrd: documentation for more information on this, if you are interested.
+mkinitrd:
+mkinitrd:
diff --git a/source/a/module-init-tools/doinst.sh b/source/a/module-init-tools/doinst.sh
new file mode 100644
index 000000000..41ff1d753
--- /dev/null
+++ b/source/a/module-init-tools/doinst.sh
@@ -0,0 +1,22 @@
+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/modprobe.conf.new
+
+# Retain legacy behavior by tossing a symlink in /etc/modprobe.d/:
+# Note that the plan is to eliminate /etc/modprobe.conf and
+# /etc/modules.conf in the long run, so you may wish to remove the
+# link and move your actual file into /etc/modprobe.d/ if you want
+# to keep it instead of going with smaller chunks in there...
+if [ -r etc/modprobe.conf ]; then
+  ( cd etc/modprobe.d ; ln -s ../modprobe.conf . 2> /dev/null )
+fi
+
diff --git a/source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff b/source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff
new file mode 100644
index 000000000..1565d93a6
--- /dev/null
+++ b/source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff
@@ -0,0 +1,27 @@
+diff -Nur module-init-tools-3.6.old/doc/modprobe.conf.sgml module-init-tools-3.6.new/doc/modprobe.conf.sgml
+--- module-init-tools-3.6.old/doc/modprobe.conf.sgml	2009-02-04 01:45:24.000000000 -0600
++++ module-init-tools-3.6.new/doc/modprobe.conf.sgml	2009-02-08 01:42:05.097637263 -0600
+@@ -35,7 +35,9 @@
+     <para>Because the <command>modprobe</command> command can add or
+       remove extra more than one module, due to module dependencies,
+       we need a method of specifying what options are to be used with
+-      those modules.  <filename>/etc/modprobe.conf</filename> (or, if that does not exist, all files under the <filename>/etc/modprobe.d</filename> directory) specifies
++      those modules.  All of the files under the <filename>/etc/modprobe.d/</filename>
++      directory are used, or if that directory does not exist, the
++      <filename>/etc/modprobe.conf</filename> file specifies
+       those options, as required.  It can also be used to create
+       convenient aliases: alternate names for a module.  Finally, it
+       can override the normal <command>modprobe</command> behavior
+diff -Nur module-init-tools-3.6.old/modprobe.c module-init-tools-3.6.new/modprobe.c
+--- module-init-tools-3.6.old/modprobe.c	2009-02-04 01:45:24.000000000 -0600
++++ module-init-tools-3.6.new/modprobe.c	2009-02-08 01:42:05.099636402 -0600
+@@ -1366,8 +1366,8 @@
+ 
+ static const char *default_configs[] = 
+ {
+-	"/etc/modprobe.conf",
+ 	"/etc/modprobe.d",
++	"/etc/modprobe.conf",
+ };
+ 
+ static void read_toplevel_config(const char *filename,
diff --git a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
new file mode 100644
index 000000000..24967f0b2
--- /dev/null
+++ b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
@@ -0,0 +1,43 @@
+diff -Nur module-init-tools-3.6.old/modprobe.c module-init-tools-3.6.new/modprobe.c
+--- module-init-tools-3.6.old/modprobe.c	2009-02-04 01:45:24.000000000 -0600
++++ module-init-tools-3.6.new/modprobe.c	2009-02-08 01:40:24.143637295 -0600
+@@ -38,6 +38,7 @@
+ #include <asm/unistd.h>
+ #include <sys/wait.h>
+ #include <syslog.h>
++#include <regex.h>
+ 
+ #define streq(a,b) (strcmp((a),(b)) == 0)
+ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+@@ -1275,6 +1276,20 @@
+ 	return 1;
+ }
+ 
++/* Let's exclude a few file extensions */
++static int valid_file_name(const char *filename)
++{
++       static regex_t *re = NULL;
++
++       if (!re) {
++               re = NOFAIL(malloc(sizeof(regex_t)));
++               if (regcomp(re, "(^(\\.|\\.\\.)|\\.(new|orig|bak)$)",
++                   REG_EXTENDED|REG_NOSUB) != 0)
++                       fatal("regcomp failed: %s\n", strerror(errno));
++       }
++       return regexec(re, filename, 0, NULL, 0);
++}
++
+ /* Simple format, ignore lines starting with #, one command per line.
+    Returns true or false. */
+ static int read_config(const char *filename,
+@@ -1294,7 +1309,10 @@
+ 	if (dir) {
+ 		struct dirent *i;
+ 		while ((i = readdir(dir)) != NULL) {
++			/* Removed this line:
+			if (!streq(i->d_name,".") && !streq(i->d_name,"..")
++			and replaced with this one: */
++			if (valid_file_name(i->d_name)
+ 			    && config_filter(i->d_name)) {
+ 				char sub[strlen(filename) + 1
+ 					 + strlen(i->d_name) + 1];
diff --git a/source/a/module-init-tools/modprobe.no_sys_check.diff b/source/a/module-init-tools/modprobe.no_sys_check.diff
new file mode 100644
index 000000000..90e9a7d19
--- /dev/null
+++ b/source/a/module-init-tools/modprobe.no_sys_check.diff
@@ -0,0 +1,51 @@
+http://bugs.gentoo.org/258442
+
+From 1a55ee5297b883ea4b43cdf74ad890873ebe966c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 13 Feb 2009 02:21:10 -0500
+Subject: [PATCH] modprobe: remove pointless /sys requirement
+
+When modprobe was converted from parsing /proc to parsing /sys, it was not
+a straight conversion.  Instead, a "sanity" check was added early on where
+modprobe would simply abort doing anything useful if /sys isn't mounted.
+Unfortunately, this makes modprobe fairly unusable.  Considering the
+kernel itself can invoke modprobe before userspace gets a chance to start
+the init process (and actually mount /sys), we end up with a chicken and
+egg issue.  Which gets even worse when the kernel keeps running modprobe
+over and over and the boot output fills up with:
+modprobe: FATAL: /sys is not mounted.
+modprobe: FATAL: /sys is not mounted.
+modprobe: FATAL: /sys is not mounted.
+modprobe: FATAL: /sys is not mounted.
+modprobe: FATAL: /sys is not mounted.
+modprobe: FATAL: /sys is not mounted.
+
+Since modprobe itself is already written to handle the case where it
+cannot figure out whether a given module is loaded (and so was able to run
+perfectly fine without /proc being mounted), the check is wholly useless.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ modprobe.c |    5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/modprobe.c b/modprobe.c
+index 022004c..110204b 100644
+--- a/modprobe.c
++++ b/modprobe.c
+@@ -1522,11 +1522,6 @@ static void handle_module(const char *modname,
+ 			  const char *cmdline_opts,
+ 			  int flags)
+ {
+-	struct stat finfo;
+-
+-	if (stat("/sys/module", &finfo) < 0)
+-		fatal("/sys is not mounted.\n");
+-
+ 	if (list_empty(todo_list)) {
+ 		const char *command;
+ 
+-- 
+1.6.1.3
+
+
diff --git a/source/a/module-init-tools/module-init-tools.SlackBuild b/source/a/module-init-tools/module-init-tools.SlackBuild
new file mode 100755
index 000000000..d69b43bc2
--- /dev/null
+++ b/source/a/module-init-tools/module-init-tools.SlackBuild
@@ -0,0 +1,122 @@
+#!/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=3.6
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-module-init-tools
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf module-init-tools-$VERSION
+tar xvf $CWD/module-init-tools-$VERSION.tar.bz2 || exit 1
+cd module-init-tools-$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 {} \;
+
+# Look for /etc/modprobe.d/ first rather than bailing on the idea if
+# /etc/modprobe.conf exists.  IMHO, this is a better default behavior
+# because it allows /etc/modprobe.conf to remain behind if something
+# still looks there, and allows a smoother transition towards using
+# /etc/modprobe.d/ instead.
+zcat $CWD/modprobe.favor.etc.modprobe.d.diff.gz | patch -p1 --verbose || exit 1
+
+# Exclude *.{old,new,bak} files (and a few others that obviously aren't
+# valid for this...  Thanks to Marco d'Itri for the patch that it's based on
+zcat $CWD/modprobe.ignore_some_suffixes.diff.gz | patch -p1 --verbose || exit 1
+
+# We get (pointless) errors in early stages of the boot if modprobe checks for
+# a mounted /sys before it actually gets mounted:
+zcat $CWD/modprobe.no_sys_check.diff.gz | patch -p1 --verbose || exit 1
+
+# Using --bindir=/sbin to make lsmod go there too
+CFLAGS= \
+./configure \
+  --prefix=/ \
+  --bindir=/sbin \
+  --docdir=/usr/doc/module-init-tools-$VERSION \
+  --mandir=/usr/man \
+  --enable-zlib \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# We don't need this
+rm -f $PKG/sbin/generate-modprobe.conf
+
+# Links lsmod into /bin
+mkdir -p $PKG/bin
+( cd $PKG/bin ; ln -sf /sbin/lsmod . )
+
+# Add manpage symlink for modprobe.d
+( cd $PKG/usr/man/man5 
+  if [ -f modprobe.conf.5 -a ! -e modprobe.d.5 ]; then
+    ln -sf modprobe.conf.5 modprobe.d.5
+  fi
+)
+
+# Compress manpages
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/etc/modprobe.d/
+cat << EOF > $PKG/etc/modprobe.conf.new
+# /etc/modprobe.conf (old location for Linux 2.6+ config)
+#
+# The use of this config file is deprecated. 
+# Instead, create files in the /etc/modprobe.d/ directory 
+# containing modprobe options.
+#
+# For more information, see "man modprobe.conf".
+EOF
+
+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/module-init-tools-$VERSION
+# Most of these are out of date
+cp -a \
+  AUTHORS CODING COPYING FAQ HACKING INSTALL NEWS README TODO \
+  $PKG/usr/doc/module-init-tools-$VERSION
+
+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/module-init-tools-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/module-init-tools/slack-desc b/source/a/module-init-tools/slack-desc
new file mode 100644
index 000000000..2f0ca3316
--- /dev/null
+++ b/source/a/module-init-tools/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------------------------------------------------------|
+module-init-tools: module-init-tools (kernel module utilities)
+module-init-tools:
+module-init-tools: Utilities to load and unload kernel modules.  These are used on Linux
+module-init-tools: to load extra drivers or other features into the running kernel.
+module-init-tools:
+module-init-tools:
+module-init-tools:
+module-init-tools:
+module-init-tools:
+module-init-tools:
+module-init-tools:
diff --git a/source/a/mt-st/mt-st.SlackBuild b/source/a/mt-st/mt-st.SlackBuild
new file mode 100755
index 000000000..cbf44ec2f
--- /dev/null
+++ b/source/a/mt-st/mt-st.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=${VERSION:-0.9b}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mt-st
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf mt-st-$VERSION
+tar xzvf $CWD/mt-st-$VERSION.tar.gz
+cd mt-st-$VERSION
+
+zcat $CWD/mt-st.config.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/mt-st.man.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/mt-st.sdlt.diff.gz | patch -p1 --verbose || 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 {} \;
+
+sed -i -e 's#<linux/qic117.h>#"qic117.h"#' mtio.h || exit 1
+make || exit 1
+
+strip mt stinit
+mkdir -p $PKG/bin
+cat mt > $PKG/bin/mt-st
+chmod 755 $PKG/bin/mt-st
+( cd $PKG/bin ; ln -sf mt-st mt )
+mkdir -p $PKG/sbin
+cat stinit > $PKG/sbin/stinit
+chmod 755 $PKG/sbin/stinit
+mkdir -p $PKG/usr/man/man{1,8}
+cat mt.1 | gzip -9c > $PKG/usr/man/man1/mt-st.1.gz
+cat stinit.8 | gzip -9c > $PKG/usr/man/man8/stinit.8.gz
+
+( 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
+)
+
+mkdir -p $PKG/usr/doc/mt-st-$VERSION
+cp -a \
+  COPYING README* *.lsm stinit.def.examples \
+  $PKG/usr/doc/mt-st-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/mt-st-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/mt-st/mt-st.config.diff b/source/a/mt-st/mt-st.config.diff
new file mode 100644
index 000000000..756261b15
--- /dev/null
+++ b/source/a/mt-st/mt-st.config.diff
@@ -0,0 +1,172 @@
+--- mt-st-0.8/stinit.def.examples.configfiles	2002-09-23 19:02:21.000000000 +0200
++++ mt-st-0.8/stinit.def.examples	2005-04-07 08:21:01.732633520 +0200
+@@ -56,3 +56,169 @@
+ mode3 blocksize=0 density=1   #  800 bpi
+ }
+ 
++# DLT2000 / 2000XT
++manufacturer="QUANTUM" model = "DLT2000" {
++scsi2logical=1
++can-bsr
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++mode1 blocksize=0 density=0x81	# 10GB + compression on DLTtape III, 15+ with DLTtape IIIXT in 2000XT
++mode2 blocksize=0 density=0x80	# 10GB, no compression  on DLTtape III, 15 with DLTtape IIIXT in 2000XT
++mode3 blocksize=0 density=0x18  #  6GB, compression not available, on DLTtape III
++mode4 blocksize=0 density=0x17  #2.6GB, compression not available, on DLTtape III
++}
++
++# DLT4000
++manufacturer="QUANTUM" model = "DLT4000" {
++scsi2logical=1
++can-bsr
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards compatible, use older modes (e.g. from above) as required
++mode1 blocksize=0 density=0x83  # 20GB + compression
++mode2 blocksize=0 density=0x82  # 20GB, no compression
++mode3 blocksize=0 density=0x81	# 10GB + compression (DLT2000 mode) with DLTtape III, 15+ with DLTtape IIIXT in 2000XT
++mode4 blocksize=0 density=0x80	# 10GB, no compression  (DLT2000 mode) with DLTtape III, 15 with DLTtape IIIXT in 2000XT
++}
++
++# DLT7000
++manufacturer="QUANTUM" model = "DLT7000" {
++scsi2logical=1
++can-bsr
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards compatible, use older modes (e.g. from above) as required.
++mode1 blocksize=0 density=0x85  # 35GB + compression
++mode2 blocksize=0 density=0x84  # 35GB, no compression
++mode3 blocksize=0 density=0x83	# 20GB + compression (DLT4000 mode)
++mode4 blocksize=0 density=0x82	# 20GB, no compression (DLT4000 mode)
++}
++
++# DLT8000
++manufacturer="QUANTUM" model = "DLT8000" {
++scsi2logical=1
++can-bsr=1
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards compatible to DLT7000, use older modes (e.g. from above) as required. Modes <10GB (<0x19) not supported!
++mode1 blocksize=0 density=0x89	# 40GB + compression
++mode2 blocksize=0 density=0x88	# 40GB, no compression
++mode3 blocksize=0 density=0x85  # 35GB + compression (DLT7000 mode)
++mode4 blocksize=0 density=0x84  # 35GB, no compression (DLT7000 mode)
++}
++
++
++# SDLT220
++manufacturer="QUANTUM" model = "SuperDLT1" {
++scsi2logical=1
++can-bsr=1
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards read compatible to DLT4000/7000/8000. Mode settings are only required for writing, so no need to define any other modes here.
++mode1 blocksize=0 density=0x48 compression=1	# 110 GB + compression
++mode2 blocksize=0 density=0x48 compression=0	# 110 GB, no ompression
++}
++
++# SDLT320
++manufacturer="QUANTUM" model = "SDLT320" {
++scsi2logical=1
++can-bsr=1
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards write compatible to SDLT220 and read compatible to DLT4000/7000/8000. Mode settings are only required for writing, so we need only the SDL220/320 modes here
++mode1 blocksize=0 density=0x49 compression=1	# 160 GB + compression
++mode2 blocksize=0 density=0x49 compression=0	# 160 GB, no ompression
++mode3 blocksize=0 density=0x48 compression=1	# 110 GB + compression
++mode4 blocksize=0 density=0x48 compression=0	# 110 GB, no ompression
++}
++
++# SDLT600
++manufacturer="QUANTUM" model = "SDLT600" {
++scsi2logical=1
++can-bsr=1
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards read compatible to SDLT220/320 and VS160. Mode settings are only required for writing, so we need only the native SDLT600 mode here.
++mode1 blocksize=0 density=0x4a compression=1	# 300 GB + compression
++mode2 blocksize=0 density=0x4a compression=0	# 300 GB, no ompression
++mode3 blocksize=0 density=0x4a compression=1	# 300 GB + compression
++mode4 blocksize=0 density=0x4a compression=0	# 300 GB, no ompression
++}
++
diff --git a/source/a/mt-st/mt-st.man.diff b/source/a/mt-st/mt-st.man.diff
new file mode 100644
index 000000000..d22acefcc
--- /dev/null
+++ b/source/a/mt-st/mt-st.man.diff
@@ -0,0 +1,31 @@
+--- mt-st-0.9b/mt.1.manfix	2005-08-21 20:53:50.000000000 +0200
++++ mt-st-0.9b/mt.1	2005-10-25 12:13:43.000000000 +0200
+@@ -48,20 +48,22 @@
+ files.
+ The tape is positioned on the first block of the next file.
+ .IP fsfm
+-Forward space
++Forward space past
+ .I count
+-files.
+-The tape is positioned on the last block of the previous file.
++file marks, then backward space one file record.
++This leaves the tape positioned on the last block of the file that is count-1
++files past the current file.
+ .IP bsf
+ Backward space
+ .I count
+ files.
+ The tape is positioned on the last block of the previous file.
+ .IP bsfm
+-Backward space
++Backward space past
+ .I count
+-files.
+-The tape is positioned on the first block of the next file.
++file marks, then forward space one file record.
++This leaves the tape positioned on the first block of the file that is count-1
++files before the current file.
+ .IP asf
+ The tape is positioned at the beginning of the
+ .I count
diff --git a/source/a/mt-st/mt-st.sdlt.diff b/source/a/mt-st/mt-st.sdlt.diff
new file mode 100644
index 000000000..8dd9fa9ff
--- /dev/null
+++ b/source/a/mt-st/mt-st.sdlt.diff
@@ -0,0 +1,11 @@
+--- mt-st-0.7/mt.c.orig	Sat Feb 22 14:48:09 2003
++++ mt-st-0.7/mt.c	Sat Feb 22 14:50:21 2003
+@@ -220,6 +220,8 @@
+     {0x41, "DLT 40GB"},
+     {0x45, "QIC-3095-MC (TR-4)"},
+     {0x47, "TR-5"},
++    {0x48, "Quantum SDLT220"},
++    {0x49, "Quantum SDLT320"},
+     {0x80, "DLT 15GB uncomp. or Ecrix"},
+     {0x81, "DLT 15GB compressed"},
+     {0x82, "DLT 20GB uncompressed"},
diff --git a/source/a/mt-st/slack-desc b/source/a/mt-st/slack-desc
new file mode 100644
index 000000000..dda830939
--- /dev/null
+++ b/source/a/mt-st/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------------------------------------------------------|
+mt-st: mt-st (controls magnetic tape drive operation)
+mt-st:
+mt-st: This mt originates from BSD NET-2.  Some Linux SCSI tape-specific
+mt-st: ioctls have been added to the original source and the man page has
+mt-st: been updated.  Although this mt program is tailored for SCSI tape, it
+mt-st: can also be used with the QIC-02 driver and hopefully with other Linux
+mt-st: tape drivers using the same ioctls (some of the commands may not work
+mt-st: with all drivers).
+mt-st:
+mt-st:
+mt-st:
diff --git a/source/a/mtx/mtx.SlackBuild b/source/a/mtx/mtx.SlackBuild
new file mode 100755
index 000000000..c17d11769
--- /dev/null
+++ b/source/a/mtx/mtx.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# Copyright 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.
+
+
+# mtx.SlackBuild
+# Package mtx for Slackware
+# mozes@slackware.com
+# ftp://ftp.badtux.net/pub/storage/mtx
+ 
+PACKAGE=mtx
+VERSION=1.3.9
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PACKAGE
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Extract source:
+cd $TMP
+rm -rf $PACKAGE-*
+tar zxvvf $CWD/$PACKAGE-$VERSION.tar.gz 
+cd $PACKAGE-$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 {} \;
+
+# Configure:
+./configure \
+   --prefix=/usr \
+   --build=$ARCH-slackware-linux \
+   --host=$ARCH-slackware-linux \
+   --target=$ARCH-slackware-linux || exit 1
+
+# Avoid looking in the Kernel source:
+sed -i 's?-I/usr/src/linux/include? ?g' Makefile
+
+# Build:
+make || exit 1
+
+# Install into package:
+mkdir -pm755 $PKG/{install,usr/{sbin,doc/$PACKAGE-$VERSION,man/man1}}
+install -m755 scsitape tapeinfo mtx loaderinfo $PKG/usr/sbin
+install -m644 *.1 $PKG/usr/man/man1
+gzip -9 $PKG/usr/man/man1/*
+
+# Strip:
+( 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
+)
+
+# Copy docs:
+cp -fa mtx.doc CHANGES COMPATABILITY FAQ LICENSE README TODO \
+       $PKG/usr/doc/$PACKAGE-$VERSION
+
+# Install package description:
+install -m644 $CWD/slack-desc $PKG/install
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/$PACKAGE-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/a/mtx/slack-desc b/source/a/mtx/slack-desc
new file mode 100644
index 000000000..901abb3d4
--- /dev/null
+++ b/source/a/mtx/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------------------------------------------------------|
+mtx: mtx (Controls tape autochangers)
+mtx:
+mtx: The MTX program controls the robotic mechanism in autoloaders and
+mtx: tape libraries such as the HP SureStore DAT 40x6, Exabyte EZ-17, and
+mtx: Exabyte 220. 
+mtx:
+mtx: This program is also reported to work with a variety of other tape
+mtx: libraries and autochangers from Tandberg/Overland, Breece Hill, HP, 
+mtx: Seagate, Dell and Quantum.
+mtx:
+mtx:
diff --git a/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch b/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch
new file mode 100644
index 000000000..0ae7ec59f
--- /dev/null
+++ b/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch
@@ -0,0 +1,13 @@
+--- ncompress-4.2.4/compress42.c.bssUnderflow	2006-08-10 11:40:03.000000000 +0200
++++ ncompress-4.2.4/compress42.c	2006-08-10 11:40:31.000000000 +0200
+@@ -1689,6 +1689,10 @@
+ 
+ 				if (oldcode == -1)
+ 				{
++		                        if (code >= 256) {
++                	                        fprintf(stderr, "uncompress: corrupt input\n");
++                        	                abort_compress();
++                                	}
+ 					outbuf[outpos++] = (char_type)(finchar = (int)(oldcode = code));
+ 					continue;
+ 				}
diff --git a/source/a/ncompress/ncompress-4.2.4-endians.patch b/source/a/ncompress/ncompress-4.2.4-endians.patch
new file mode 100644
index 000000000..fdc966220
--- /dev/null
+++ b/source/a/ncompress/ncompress-4.2.4-endians.patch
@@ -0,0 +1,11 @@
+--- ncompress-4.2.4/compress42.c.endians	2006-09-19 13:53:58.000000000 +0200
++++ ncompress-4.2.4/compress42.c	2006-09-19 13:57:54.000000000 +0200
+@@ -432,7 +432,7 @@
+ 
+ union	bytes
+ {
+-	long	word;
++	int	word;
+ 	struct
+ 	{
+ #if BYTEORDER == 4321
diff --git a/source/a/ncompress/ncompress.2GB.diff b/source/a/ncompress/ncompress.2GB.diff
new file mode 100644
index 000000000..8c545caf4
--- /dev/null
+++ b/source/a/ncompress/ncompress.2GB.diff
@@ -0,0 +1,11 @@
+--- ncompress-4.2.4/compress42.c.2GB	2004-07-14 12:16:19.000000000 -0400
++++ ncompress-4.2.4/compress42.c	2004-07-14 12:16:59.000000000 -0400
+@@ -1329,7 +1329,7 @@
+ 		REG11	int			boff;
+ 		REG12	int			n_bits;
+ 		REG13	int			ratio;
+-		REG14	long		checkpoint;
++		REG14	unsigned long long	checkpoint;
+ 		REG15	code_int	extcode;
+ 		union
+ 		{
diff --git a/source/a/ncompress/ncompress.SlackBuild b/source/a/ncompress/ncompress.SlackBuild
new file mode 100755
index 000000000..e8b1c68fa
--- /dev/null
+++ b/source/a/ncompress/ncompress.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=4.2.4
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-ncompress
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ncompress-${VERSION}
+tar xzf $CWD/ncompress-${VERSION}.tar.gz
+cd ncompress-${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/ncompress.make.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/ncompress.lfs2.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/ncompress.filenamelen.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/ncompress.2GB.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/ncompress.zerobyteforce.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/ncompress-${VERSION}-bssUnderflow.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/ncompress-${VERSION}-endians.patch.gz | patch -p1 --verbose || exit 1
+
+make ENDIAN=4321 || exit 1
+mkdir -p $PKG/usr/bin
+cat compress > $PKG/usr/bin/compress
+chmod 755 $PKG/usr/bin/compress
+( cd $PKG/usr/bin ; ln -sf compress uncompress )
+mkdir $PKG/bin
+( cd $PKG/bin ; ln -sf /usr/bin/compress compress )
+( cd $PKG/bin ; ln -sf compress uncompress )
+mkdir -p $PKG/usr/man/man1
+cat compress.1 | gzip -9c > $PKG/usr/man/man1/compress.1.gz
+echo '.so man1/compress.1' | gzip -9c > $PKG/usr/man/man1/uncompress.1.gz
+mkdir -p $PKG/usr/doc/ncompress-${VERSION}
+cp -a \
+  Acknowleds LZW.INFO README \
+  $PKG/usr/doc/ncompress-${VERSION}
+
+# Strip everything for good measure:
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/ncompress-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/ncompress/ncompress.filenamelen.diff b/source/a/ncompress/ncompress.filenamelen.diff
new file mode 100644
index 000000000..67676c7a8
--- /dev/null
+++ b/source/a/ncompress/ncompress.filenamelen.diff
@@ -0,0 +1,98 @@
+--- ncompress-4.2.4/compress42.c.filenamelen	Wed Nov 21 12:19:38 2001
++++ ncompress-4.2.4/compress42.c	Wed Nov 21 12:20:03 2001
+@@ -140,6 +140,7 @@
+ #include	<sys/types.h>
+ #include	<sys/stat.h>
+ #include	<errno.h>
++#include        <string.h>
+ 
+ #ifdef DIRENT
+ #	include	<dirent.h>
+@@ -213,7 +214,7 @@
+ #	define	OBUFSIZ	BUFSIZ	/* Default output buffer size							*/
+ #endif
+ 
+-#define MAXPATHLEN 1024		/* MAXPATHLEN - maximum length of a pathname we allow 	*/
++#define MAXPATHLEN PATH_MAX 		/* MAXPATHLEN - maximum length of a pathname we allow 	*/
+ #define	SIZE_INNER_LOOP		256	/* Size of the inter (fast) compress loop			*/
+ 
+ 							/* Defines for third byte of header 					*/
+@@ -641,13 +642,11 @@
+ 	} ;
+ #endif
+ 
+-void  	main			ARGS((int,char **));
+ void  	Usage			ARGS((void));
+ void  	comprexx		ARGS((char **));
+ void  	compdir			ARGS((char *));
+ void  	compress		ARGS((int,int));
+ void  	decompress		ARGS((int,int));
+-char  	*rindex			ARGS((char *,int));
+ void  	read_error		ARGS((void));
+ void  	write_error		ARGS((void));
+ void 	abort_compress	ARGS((void));
+@@ -694,13 +693,15 @@
+  *   deterministic, and can be done on the fly.  Thus, the decompression
+  *   procedure needs no input table, but tracks the way the table was built.
+  */ 
+-void
++int
+ main(argc, argv)
+ 	REG1	int 	 argc;
+ 	REG2	char	*argv[];
+ 	{
+     	REG3	char		**filelist;
+ 		REG4	char		**fileptr;
++                int i;
++                
+ 
+     	if (fgnd_flag = (signal(SIGINT, SIG_IGN) != SIG_IGN))
+ 			signal(SIGINT, (SIG_TYPE)abort_compress);
+@@ -714,7 +715,14 @@
+     	nomagic = 1;	/* Original didn't have a magic number */
+ #endif
+ 
+-    	filelist = fileptr = (char **)malloc(argc*sizeof(char *));
++        for(i=0;i<argc;i++){
++            if(strlen(argv[i])>(MAXPATHLEN-1)){
++                fprintf(stderr,"Filename too long\n");
++                exit(1);
++            }
++        }
++
++        filelist = fileptr = (char **)malloc(argc*sizeof(char *));
+     	*filelist = NULL;
+ 
+     	if((progname = rindex(argv[0], '/')) != 0)
+@@ -853,8 +861,9 @@
+ 			else
+ 				decompress(0, 1);
+ 		}
+-
++        
+ 		exit((exit_code== -1) ? 1:exit_code);
++                return 0;
+ 	}
+ 
+ void
+@@ -1801,20 +1810,6 @@
+ 			write_error();
+ 	}
+ 
+-char *
+-rindex(s, c)		/* For those who don't have it in libc.a */
+-	REG1 char	*s;
+-	REG2 int	 c;
+-	{
+-		char *p;
+-
+-		for (p = NULL; *s; s++)
+-		    if (*s == (char)c)
+-				p = s;
+-
+-		return(p);
+-	}
+-
+ void
+ read_error()
+ 	{
diff --git a/source/a/ncompress/ncompress.lfs2.diff b/source/a/ncompress/ncompress.lfs2.diff
new file mode 100644
index 000000000..9da42eb56
--- /dev/null
+++ b/source/a/ncompress/ncompress.lfs2.diff
@@ -0,0 +1,52 @@
+--- ncompress-4.2.4/compress42.c.lfs	2002-06-19 19:19:33.000000000 -0400
++++ ncompress-4.2.4/compress42.c	2002-06-19 19:20:48.000000000 -0400
+@@ -130,6 +130,7 @@
+  *   Add variable bit length output.
+  *
+  */
++#include	<unistd.h>
+ #include	<stdio.h>
+ #include	<fcntl.h>
+ #include	<ctype.h>
+@@ -168,30 +169,6 @@
+ #	define	SIG_TYPE	void (*)()
+ #endif
+ 
+-#ifndef NOFUNCDEF
+-	extern	void	*malloc	LARGS((int));
+-	extern	void	free	LARGS((void *));
+-#ifndef _IBMR2
+-	extern	int		open	LARGS((char const *,int,...));
+-#endif
+-	extern	int		close	LARGS((int));
+-	extern	int		read	LARGS((int,void *,int));
+-	extern	int		write	LARGS((int,void const *,int));
+-	extern	int		chmod	LARGS((char const *,int));
+-	extern	int		unlink	LARGS((char const *));
+-	extern	int		chown	LARGS((char const *,int,int));
+-	extern	int		utime	LARGS((char const *,struct utimbuf const *));
+-	extern	char	*strcpy	LARGS((char *,char const *));
+-	extern	char	*strcat	LARGS((char *,char const *));
+-	extern	int		strcmp	LARGS((char const *,char const *));
+-	extern	unsigned strlen	LARGS((char const *));
+-	extern	void	*memset	LARGS((void *,char,unsigned int));
+-	extern	void	*memcpy	LARGS((void *,void const *,unsigned int));
+-	extern	int		atoi	LARGS((char const *));
+-	extern	void	exit	LARGS((int));
+-	extern	int		isatty	LARGS((int));
+-#endif
+-	
+ #define	MARK(a)	{ asm(" .globl M.a"); asm("M.a:"); }
+ 
+ #ifdef	DEF_ERRNO
+@@ -535,8 +512,8 @@
+ char 			ofname[MAXPATHLEN];	/* Output filename								*/
+ int				fgnd_flag = 0;		/* Running in background (SIGINT=SIGIGN)		*/
+ 
+-long 			bytes_in;			/* Total number of byte from input				*/
+-long 			bytes_out;			/* Total number of byte to output				*/
++long long bytes_in;			/* Total number of byte from input				*/
++long long bytes_out;			/* Total number of byte to output				*/
+ 
+ /*
+  * 8086 & 80286 Has a problem with array bigger than 64K so fake the array
diff --git a/source/a/ncompress/ncompress.make.diff b/source/a/ncompress/ncompress.make.diff
new file mode 100644
index 000000000..2a0acc1cc
--- /dev/null
+++ b/source/a/ncompress/ncompress.make.diff
@@ -0,0 +1,60 @@
+--- ncompress-4.2.4/Makefile.orig	Thu Oct 31 10:38:46 1996
++++ ncompress-4.2.4/Makefile	Thu Oct 31 10:39:12 1996
+@@ -0,0 +1,57 @@
++# Makefile generated by build.
++
++# C complier
++CC=cc $(RPM_OPT_FLAGS)
++
++# Install directory for binarys
++BINDIR=/usr/bin
++
++# Install directory for manual
++MANDIR=/usr/man/man1
++
++# compiler options:
++# options is a collection of:
++#
++#	-DAMIGA=1					Amiga support.
++#	-DNOFUNCDEF=1				Disable libary function definitions in
++#								compress42.c
++#	-DDIRENT=1					Use dirent.h
++#	-DSYSDIR=1					Use sys/dir.h
++#	-DLSTAT=1					Use lstat for finding symlinks.
++#	-DUTIME_H=1					Use utime.h
++#	-DUSERMEM=<size>			Availble memory for compress (default 800k).
++#	-DREGISTERS=<nbr>			Number of registers (default 2).
++#	-DIBUFSIZ=<size>			Input buffer size (default BUFSIZ).
++#	-DOBUFSIZ=<size>			Output buffer size (default BUFSIZ)
++#	-DBYTEORDER=<order>			Byte order (default: unknown).
++#	-DNOALLIGN=1				Data word allignment (default: yes).
++#	-DDEF_ERRNO=1				Define error (not defined in errno.h).
++#	-DMAXSEG_64K=1 -BITS=16		Support segment processsor like 80286.
++#
++options= -DDIRENT=1 -DSYSDIR=1 -DUTIME_H=1 -DUSERMEM=800000 -DREGISTERS=20 -DIBUFSIZ=1024 -DOBUFSIZ=1024 -DBYTEORDER=$(ENDIAN)
++
++# libary options
++LBOPT=
++
++
++compress:	Makefile compress42.c patchlevel.h
++	 $(CC) -o compress  $(options) "-DCOMPILE_DATE=\"`date`\"" compress42.c 
++
++install:	compress
++		[ -f $(BINDIR)/compress ] && \
++			{ rm -f $(BINDIR)/compress.old ; \
++	  		mv $(BINDIR)/compress $(BINDIR)/compress.old ; }
++		rm -f $(BINDIR)/uncompress $(BINDIR)/zcat
++		cp compress $(BINDIR)/compress
++		strip $(BINDIR)/compress
++		rm -f $(BINDIR)/uncompress
++		ln $(BINDIR)/compress $(BINDIR)/uncompress
++		rm -f $(BINDIR)/zcat
++		ln -f $(BINDIR)/compress $(BINDIR)/zcat
++		cp zcmp zdiff zmore $(BINDIR)/.
++		chmod 0755 $(BINDIR)/compress $(BINDIR)/zcmp $(BINDIR)/zdiff $(BINDIR)/zmore
++		cp compress.1 zcmp.1 zmore.1 $(MANDIR)/.
++		chmod 0644 $(MANDIR)/compress.1 $(MANDIR)/zcmp.1 $(MANDIR)/zmore.1
++
++cleanup:
++		rm -f compress compress.def comp.log
diff --git a/source/a/ncompress/ncompress.zerobyteforce.diff b/source/a/ncompress/ncompress.zerobyteforce.diff
new file mode 100644
index 000000000..465d67e3e
--- /dev/null
+++ b/source/a/ncompress/ncompress.zerobyteforce.diff
@@ -0,0 +1,24 @@
+--- ncompress-4.2.4/compress42.c.zerobyteforce	2006-04-14 14:18:28.000000000 +0200
++++ ncompress-4.2.4/compress42.c	2006-04-14 14:20:15.000000000 +0200
+@@ -1145,10 +1145,12 @@
+ 			if (fdout != 1 && close(fdout))
+ 				write_error();
+ 
+-			if (bytes_in == 0)
++			if ( (bytes_in == 0) && (force == 0 ) )
+ 			{
+ 				if (remove_ofname)
+ 				{
++					if(!quiet)
++						fprintf(stderr, "No compression -- %s unchanged\n", ifname);
+ 					if (unlink(ofname))	/* Remove input file */
+ 					{
+ 						fprintf(stderr, "\nunlink error (ignored) ");
+@@ -1157,6 +1159,7 @@
+ 					}
+ 		
+ 					remove_ofname = 0;
++					exit_code = 2;
+ 				}
+ 			}
+ 			else
diff --git a/source/a/ncompress/slack-desc b/source/a/ncompress/slack-desc
new file mode 100644
index 000000000..24bfa0222
--- /dev/null
+++ b/source/a/ncompress/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------------------------------------------------------|
+ncompress: ncompress (the classic *nix compression utility)
+ncompress:
+ncompress: Compress reduces the size of the named files using adaptive Lempel-Ziv
+ncompress: coding.  Whenever possible, each file is replaced by one with the
+ncompress: extension .Z, while keeping the same ownership modes, access and
+ncompress: modification times.  If no files are specified, the standard input is
+ncompress: compressed to the standard output.  Compressed files can be restored
+ncompress: to their original form using uncompress or zcat.
+ncompress:
+ncompress:
+ncompress:
diff --git a/source/a/ntfs-3g/10-ntfs-3g-policy.fdi b/source/a/ntfs-3g/10-ntfs-3g-policy.fdi
new file mode 100644
index 000000000..baaf81591
--- /dev/null
+++ b/source/a/ntfs-3g/10-ntfs-3g-policy.fdi
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+  <device>
+    <match key="volume.fstype" string="ntfs">
+      <match key="@block.storage_device:storage.hotpluggable" bool="true">
+        <merge key="volume.fstype" type="string">ntfs-3g</merge>
+        <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
+        <append key="volume.mount.valid_options" type="strlist">locale=</append>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
diff --git a/source/a/ntfs-3g/ntfs-3g.SlackBuild b/source/a/ntfs-3g/ntfs-3g.SlackBuild
new file mode 100755
index 000000000..2883d4fbf
--- /dev/null
+++ b/source/a/ntfs-3g/ntfs-3g.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for ntfs-3g
+
+# Copyright (c) 2008, Antonio Hernandez Blas <hba.nihilismus@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 1.- Redistributions of source code 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.
+
+# Modified by Robby Workman <rworkman@slackware.com>
+# Modified by Patrick Volkerding <volkerdi@slackware.com>
+# Modified by Eric Hameleers <alien@slackware.com>
+
+PRGNAM=ntfs-3g
+VERSION=${VERSION:-2009.4.4}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+rm -rf $PKG 
+mkdir -p $TMP $PKG
+cd $TMP || exit 1
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+cd $PRGNAM-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --bindir=/bin \
+  --sbindir=/sbin \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-fuse=internal \
+  --disable-ldconfig \
+  --enable-static=no \
+  --build=${ARCH}-slackware-linux \
+  || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Add the HAL fdi file so that automount uses "ntfs-3g" as filesystem type
+mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor
+cat $CWD/10-ntfs-3g-policy.fdi \
+  > $PKG/usr/share/hal/fdi/policy/10osvendor/10-ntfs-3g-policy.fdi
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
+rm -rf $PKG/usr/share/doc
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* CREDITS INSTALL NEWS README* \
+  $PKG/usr/doc/$PRGNAM-$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
+
diff --git a/source/a/ntfs-3g/slack-desc b/source/a/ntfs-3g/slack-desc
new file mode 100644
index 000000000..353695bbf
--- /dev/null
+++ b/source/a/ntfs-3g/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-----------------------------------------------------|
+ntfs-3g: ntfs-3g (NTFS read-write filesystem driver)
+ntfs-3g:
+ntfs-3g: The NTFS-3G driver is an open source, freely available NTFS driver
+ntfs-3g: for Linux with read and write support.  It provides safe and fast
+ntfs-3g: handling of the Windows XP, Windows Server 2003, Windows 2000 and
+ntfs-3g: Windows Vista file systems.  Most POSIX file system operations are
+ntfs-3g: supported, with the exception of full file ownership and access
+ntfs-3g: rights support.
+ntfs-3g:
+ntfs-3g: Homepage for the ntfs-3g project: http://www.ntfs-3g.org
+ntfs-3g:
diff --git a/source/a/patch/patch.SlackBuild b/source/a/patch/patch.SlackBuild
new file mode 100755
index 000000000..fb0c06d98
--- /dev/null
+++ b/source/a/patch/patch.SlackBuild
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=2.5.4
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-patch
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf patch-${VERSION}
+tar xzvf $CWD/patch-${VERSION}.tar.gz
+cd patch-${VERSION}
+chown -R root:root .
+mkdir -p $PKG/usr/doc/patch-${VERSION}
+cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/patch-${VERSION}
+chmod 644 $PKG/usr/doc/patch-${VERSION}/*
+./configure \
+  --prefix=/usr \
+  $ARCH-slackware-linux
+make CFLAGS=-O2  || exit 1
+mkdir -p $PKG/usr/bin
+cat patch > $PKG/usr/bin/patch
+chmod 755 $PKG/usr/bin/patch
+mkdir -p $PKG/usr/man/man1
+cat patch.man  | gzip -9c > $PKG/usr/man/man1/patch.1.gz
+
+# Strip everything for good measure:
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/patch-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/patch/slack-desc b/source/a/patch/slack-desc
new file mode 100644
index 000000000..5ddba89b5
--- /dev/null
+++ b/source/a/patch/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------------------------------------------------------|
+patch: patch (apply a diff file to an original file or files)
+patch:
+patch: Patch is a utility used to apply diffs (or patches) to files, which
+patch: are usually source code.
+patch:
+patch: Larry Wall wrote the original version of patch.  Paul Eggert removed
+patch: patch's arbitrary limits; added support for binary files, setting
+patch: file times, and deleting files; and made it conform better to POSIX.
+patch: Other  contributors include Wayne Davison, who added unidiff support,
+patch: and David MacKenzie, who added configuration and backup support.
+patch:
diff --git a/source/a/pciutils/pciutils.SlackBuild b/source/a/pciutils/pciutils.SlackBuild
new file mode 100755
index 000000000..183c7adde
--- /dev/null
+++ b/source/a/pciutils/pciutils.SlackBuild
@@ -0,0 +1,106 @@
+#!/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.1.3}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-pciutils
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -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 pciutils-$VERSION
+tar xvf $CWD/pciutils-$VERSION.tar.bz2 || exit 1
+cd pciutils-$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 {} \;
+
+# Fetch the latest pci.ids:
+rm -f pci.ids
+sh update-pciids.sh
+# Now fix the update-pciids script and preinstall it before 'make install' 
+# decides that it knows best
+zcat $CWD/pciutils.ids.dest.diff.gz | patch -p1 --verbose || exit 1
+mkdir -p $PKG/usr/sbin
+cat update-pciids.sh > $PKG/usr/sbin/update-pciids
+chmod 755 $PKG/usr/sbin/update-pciids
+
+make \
+  PREFIX=/usr \
+  SBINDIR=/sbin \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  MANDIR=/usr/man \
+  OPT="$SLKCFLAGS" \
+  $NUMJOBS || exit 1
+
+make install install-lib \
+  PREFIX=/usr \
+  SBINDIR=/sbin \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  MANDIR=/usr/man \
+  DESTDIR=$PKG
+
+# Do not compress pci.ids - hal-0.5.11 needs it uncompressed
+( cd $PKG/usr/share ; gzip -d pci.ids.gz )
+# Remove the update-pciids script that 'make install' placed
+rm -f $PKG/sbin/update-pciids
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
+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/pciutils-$VERSION
+cp -a \
+  ChangeLog README TODO \
+  $PKG/usr/doc/pciutils-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/pciutils-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/a/pciutils/pciutils.ids.dest.diff b/source/a/pciutils/pciutils.ids.dest.diff
new file mode 100644
index 000000000..98d152c2b
--- /dev/null
+++ b/source/a/pciutils/pciutils.ids.dest.diff
@@ -0,0 +1,14 @@
+diff -Nur pciutils-3.1.3.orig/update-pciids.sh pciutils-3.1.3/update-pciids.sh
+--- pciutils-3.1.3.orig/update-pciids.sh	2008-11-10 17:11:51.000000000 -0600
++++ pciutils-3.1.3/update-pciids.sh	2009-07-29 02:23:53.102308103 -0500
+@@ -3,8 +3,8 @@
+ [ "$1" = "-q" ] && quiet=true || quiet=false
+ 
+ set -e
+-SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
+-DEST=pci.ids
++SRC="http://pciids.sourceforge.net/pci.ids"
++DEST=/usr/share/pci.ids
+ PCI_COMPRESSED_IDS=
+ GREP=grep
+ 
diff --git a/source/a/pciutils/pciutils.url b/source/a/pciutils/pciutils.url
new file mode 100644
index 000000000..e77494b5e
--- /dev/null
+++ b/source/a/pciutils/pciutils.url
@@ -0,0 +1,2 @@
+#ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
+ftp.kernel.org:/pub/software/utils/pciutils/
diff --git a/source/a/pciutils/slack-desc b/source/a/pciutils/slack-desc
new file mode 100644
index 000000000..913f9646a
--- /dev/null
+++ b/source/a/pciutils/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------------------------------------------------------|
+pciutils: pciutils (PCI utilities)
+pciutils:
+pciutils: lspci displays detailed information about all PCI buses and devices
+pciutils: in the system, replacing the original /proc/pci interface.
+pciutils:
+pciutils: setpci allows reading from and writing to PCI device configuration
+pciutils: registers.  For example, you can adjust the latency timers with it.
+pciutils:
+pciutils: See the manual pages for more details.
+pciutils:
+pciutils:
diff --git a/source/a/pcmciautils/config/60-pcmcia.rules b/source/a/pcmciautils/config/60-pcmcia.rules
new file mode 100644
index 000000000..677da01bf
--- /dev/null
+++ b/source/a/pcmciautils/config/60-pcmcia.rules
@@ -0,0 +1,22 @@
+# PCMCIA devices:
+#
+# Very few CIS firmware entries (which we use for matching)
+# are so broken that we need to read out random bytes of it
+# instead of the manufactor, card or product ID. Then the
+# matching is done in userspace.
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
+		RUN+="/sbin/pcmcia-check-broken-cis"
+
+# However, the "weak" matching by func_id is only allowed _after_ modprobe
+# returns, so that "strong" matches have a higher priority.
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
+		RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
+
+# PCMCIA sockets:
+#
+# modprobe the pcmcia bus module so that 16-bit PCMCIA devices work
+ACTION=="add", SUBSYSTEM=="pcmcia_socket", RUN+="/sbin/modprobe pcmcia"
+
+# if this is a PCMCIA socket which needs a resource database,
+# pcmcia-socket-startup sets it up
+ACTION=="add", SUBSYSTEM=="pcmcia_socket", RUN+="/sbin/pcmcia-socket-startup"
diff --git a/source/a/pcmciautils/config/config.opts b/source/a/pcmciautils/config/config.opts
new file mode 100644
index 000000000..5b8d5faf3
--- /dev/null
+++ b/source/a/pcmciautils/config/config.opts
@@ -0,0 +1,71 @@
+#
+# Local PCMCIA Configuration File
+#
+#----------------------------------------------------------------------
+#
+# System resources available for PCMCIA cards
+#
+# NOTE: these settings have no effect on resources assigned to a
+# CardBus bridge device itself; this file only affects resources
+# assigned to cards.  Also, interrupt settings here will only affect
+# ISA bus interrupts assigned to 16-bit cards.  PCI interrupts
+# generally can't be reconfigured.
+#
+# With the kernel PCMCIA subsystem, these settings also have no effect
+# at all on resources used for 32-bit CardBus cards.  Those are set by
+# the PCI hotplug subsystem.
+#
+
+# These are the official ports to use from pcmcia-cs:
+#include port 0x100-0x4ff, port 0x800-0x8ff, port 0xc00-0xcff
+# However, ports 0x810-0x81f hurt on some DELL machines and
+# ports 0x3b0-0x3df hurt on some FSC machines, so we use this port
+# list instead:
+include port 0x100-0x3af, port 0x3e0-0x4ff, port 0xc00-0xcff
+
+include memory 0xc0000-0xfffff
+include memory 0xa0000000-0xa0ffffff, memory 0x60000000-0x60ffffff
+
+# High port numbers do not always work...
+# include port 0x1000-0x17ff
+
+# Extra port range for IBM Token Ring
+include port 0xa00-0xaff
+
+# Resources we should not use, even if they appear to be available
+
+# First built-in serial port
+exclude irq 4
+# Second built-in serial port
+#exclude irq 3
+# First built-in parallel port
+exclude irq 7
+
+#----------------------------------------------------------------------
+
+# Examples of options for loadable modules
+
+# To fix sluggish network with IBM ethernet adapter...
+#module "pcnet_cs" opts "mem_speed=600"
+
+# Options for IBM Token Ring adapters
+#module "ibmtr_cs" opts "mmiobase=0xd0000 srambase=0xd4000"
+
+# Options for Raylink/WebGear driver: uncomment only one line...
+# These are the default settings for use with the WebGear Windows driver:
+#module "ray_cs" opts "essid=NETWORK_NAME hop_dwell=128 beacon_period=256 translate=0"
+# Generic ad-hoc network
+#module "ray_cs" opts "essid=ADHOC_ESSID hop_dwell=128 beacon_period=256 translate=1"
+# Infrastructure network for older cards
+#module "ray_cs" opts "net_type=1 essid=ESSID1"
+# Infrastructure network for WebGear
+#module "ray_cs" opts "net_type=1 essid=ESSID1 translate=1 hop_dwell=128 beacon_period=256"
+
+# Options for WaveLAN/IEEE driver (AccessPoint mode)...
+#module "wvlan_cs" opts "station_name=MY_PC"
+# Options for WaveLAN/IEEE driver (ad-hoc mode)...
+#module "wvlan_cs" opts "port_type=3 channel=1 station_name=MY_PC"
+
+# Options for Xircom Netwave driver...
+#module "netwave_cs" opts "domain=0x100 scramble_key=0x0"
+
diff --git a/source/a/pcmciautils/config/rc.pcmcia b/source/a/pcmciautils/config/rc.pcmcia
new file mode 100755
index 000000000..1f21be84e
--- /dev/null
+++ b/source/a/pcmciautils/config/rc.pcmcia
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# rc.pcmcia: Script to initialize PCMCIA subsystem.
+#	     Based in an example found in cardmgr-to-pcmciautils.txt
+#	     and in Slackware rc.pcmcia found in pcmcia-cs package.
+#
+
+# Set this to the driver to use, one of:
+# probe, yenta_socket, i82365, i82092, pd6729, tcic, etc.
+#
+DRIVER=probe
+DRIVER_OPTS=
+
+case "$1" in
+	start)
+		echo "Starting PCMCIA services:"
+		fgrep -q pcmcia /proc/devices
+		if [ $? -ne 0 ] ; then
+			if [ "$DRIVER" = "probe" ]; then
+			   echo "  <Probing for PCIC: edit /etc/rc.d/rc.pcmcia>"
+			   for DRV in yenta_socket i82365 tcic ; do
+				/sbin/modprobe $DRV > /dev/null 2>&1
+				/sbin/pccardctl status | grep -q Socket && break 
+				/sbin/modprobe -r $DRV > /dev/null 2>&1
+			   done
+			else
+			echo "  <Loading PCIC: $DRIVER>"
+			   /sbin/modprobe $DRIVER $DRIVER_OPTS > /dev/null 2>&1
+			fi
+			/sbin/modprobe pcmcia > /dev/null 2>&1 # just in case it's not auto-loaded
+		else
+			echo "  <PCIC already loaded>"
+		fi
+		;;
+
+	stop)
+	        echo -n "Shutting down PCMCIA services: "
+		echo -n "cards "
+		/sbin/pccardctl eject
+		MODULES=`/sbin/lsmod | grep "pcmcia " | awk '{print $4}' | tr , ' '`
+		for i in $MODULES ; do
+			echo -n "$i "
+			/sbin/modprobe -r $i > /dev/null 2>&1
+		done
+		echo -n "pcmcia "
+		/sbin/modprobe -r pcmcia > /dev/null 2>&1
+		if [ "$DRIVER" = "probe" ]; then
+			for DRV in yenta_socket i82365 tcic ; do
+				grep -qw $DRV /proc/modules && modprobe -r $DRV && \
+					echo -n "$DRV " && break
+			done
+		else	
+			/sbin/modprobe -r $DRIVER > /dev/null 2>&1
+		fi
+		echo -n "rsrc_nonstatic "
+		/sbin/modprobe -r rsrc_nonstatic > /dev/null 2>&1
+		echo "pcmcia_core"
+		/sbin/modprobe -r pcmcia_core > /dev/null 2>&1
+		;;
+	
+	restart)
+		$0 stop
+		$0 start
+		;;
+esac
diff --git a/source/a/pcmciautils/doinst.sh b/source/a/pcmciautils/doinst.sh
new file mode 100644
index 000000000..d01ddb5c4
--- /dev/null
+++ b/source/a/pcmciautils/doinst.sh
@@ -0,0 +1,13 @@
+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/rc.d/rc.pcmcia.new
+config etc/pcmcia/config.opts.new
diff --git a/source/a/pcmciautils/pcmciautils.SlackBuild b/source/a/pcmciautils/pcmciautils.SlackBuild
new file mode 100755
index 000000000..dcf70895a
--- /dev/null
+++ b/source/a/pcmciautils/pcmciautils.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackware build script for pcmciautils
+
+# 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:-015}
+ARCH=${ARCH:-x86_64}
+# parallel build will cause an error building ccdv:
+NUMJOBS=${NUMJOBS:-" -j1 "}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-pcmciautils
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf pcmciautils-$VERSION
+tar xvf $CWD/pcmciautils-$VERSION.tar.bz2
+cd pcmciautils-$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 {} \;
+
+make $NUMJOBS || make || exit 1
+make 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
+)
+
+# Add some firmware:
+( cd $PKG
+  tar xvf $CWD/cis-cs-3.2.8.tar.gz
+  chown -R root:root lib
+)
+
+rm -rf $PKG/etc/*
+mkdir -p $PKG/etc/pcmcia $PKG/etc/rc.d $PKG/lib/udev/rules.d
+
+cp -a $CWD/config/rc.pcmcia $PKG/etc/rc.d/rc.pcmcia.new
+chown root:root $PKG/etc/rc.d/rc.pcmcia.new
+chmod 0755 $PKG/etc/rc.d/rc.pcmcia.new
+
+cp -a $CWD/config/config.opts $PKG/etc/pcmcia/config.opts.new
+chown root:root $PKG/etc/pcmcia/config.opts.new
+chmod 0644 $PKG/etc/pcmcia/config.opts.new
+
+cp -a udev/60-pcmcia.rules $PKG/lib/udev/rules.d/60-pcmcia.rules
+chown root:root $PKG/lib/udev/rules.d/60-pcmcia.rules
+chmod 0644 $PKG/lib/udev/rules.d/60-pcmcia.rules
+
+# Create some symlinks that the udev rules file wants
+( cd $PKG/lib/udev
+  ln -s ../../sbin/pcmcia-check-broken-cis .
+  ln -s ../../sbin/pcmcia-socket-startup .
+)
+
+mv $PKG/usr/share/man $PKG/usr
+rmdir $PKG/usr/share
+
+# 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/usr/doc/pcmciautils-$VERSION
+cp COPYING* $PKG/usr/doc/pcmciautils-$VERSION
+
+mkdir $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/pcmciautils-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/pcmciautils/slack-desc b/source/a/pcmciautils/slack-desc
new file mode 100644
index 000000000..c9958af84
--- /dev/null
+++ b/source/a/pcmciautils/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-------------------------------------------------------|
+pcmciautils: pcmciautils (Utilities for using PCMCIA cards with 2.6+ kernels)
+pcmciautils:
+pcmciautils: This package provides PCMCIA tools that replace the pcmcia-cs tools
+pcmciautils: used with the 2.4.x Linux kernel.  PCMCIA cards are commonly used
+pcmciautils: in laptops to provide expanded capabilities such as network
+pcmciautils: connections, modems, increased memory, and more.
+pcmciautils:
+pcmciautils:
+pcmciautils:
+pcmciautils:
+pcmciautils:
diff --git a/source/a/pkgtools/manpages/explodepkg.8 b/source/a/pkgtools/manpages/explodepkg.8
new file mode 100644
index 000000000..3e11fddc8
--- /dev/null
+++ b/source/a/pkgtools/manpages/explodepkg.8
@@ -0,0 +1,41 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH EXPLODEPKG 8 "21 May 1994" "Slackware Version 2.0.0"
+.SH NAME
+explodepkg \- Extract the contents of a tar+compression package (such as a Slackware
+software package) in the current directory.
+.SH SYNOPSIS
+.B explodepkg
+.BI package
+.BI [ 
+.BI package2, 
+.BI package3, 
+.BI ...
+.BI ]
+.SH DESCRIPTION
+.B explodepkg
+uncompresses and untars Slackware *.tgz (or .tbz, .tlz, .txz) packages (or any archive 
+that was created by
+compressing a tarfile with one of the supported compression utilities) in the current directory. It is not usually
+used to install packages, since it doesn't execute the installation scripts 
+in ./install or ./var/log/setup. The primary use for
+.B explodepkg
+is in package maintenance - exploding a package in a subdirectory, making fixes
+to it or upgrading the software, and then building the updated package with
+.B makepkg.
+.SH AUTHOR
+Patrick J. Volkerding <volkerdi@slackware.com>
+.SH "SEE ALSO"
+.BR tar(1),
+.BR gzip(1),
+.BR installpkg(8),
+.BR makepkg(8),
+.BR pkgtool(8), 
+.BR upgradepkg(8)
diff --git a/source/a/pkgtools/manpages/installpkg.8 b/source/a/pkgtools/manpages/installpkg.8
new file mode 100644
index 000000000..2d77f10e7
--- /dev/null
+++ b/source/a/pkgtools/manpages/installpkg.8
@@ -0,0 +1,91 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH INSTALLPKG 8 "22 Nov 2001" "Slackware Version 8.1.0"
+.SH NAME
+installpkg \- install Slackware packages.
+.SH SYNOPSIS
+.B installpkg
+[
+.B \--warn
+]
+[
+.B \--md5sum
+]
+[
+.B \--root /otherroot
+]
+[
+.B \--infobox
+]
+[
+.B \--menu
+]
+[
+.B \--ask
+]
+[
+.B \--priority ADD|REC|OPT|SKP
+]
+[
+.B \--tagfile /somedir/tagfile
+]
+.BI packagename
+[
+.B packagename2 ...
+]
+.SH DESCRIPTION
+.B installpkg
+installs single or multiple *.tgz (or .tbz, .tlz, .txz) binary packages designed
+for use with the Slackware Linux distribution onto your system.
+.SH OPTIONS
+.TP
+.B \--warn packagename
+Generate a report to the standard output about which files and directories
+would be removed or overwritten if you install the package, but do not
+actually install it.
+.TP
+.B \--md5sum packagename
+Record the package md5sum in the metadata written in /var/log/packages.
+.TP
+.B \--root /otherroot
+Install using a location other than / (the default) as the root of the
+filesystem to install on.  In the example given, use /otherroot instead.  Setting
+the ROOT environment variable does the same thing.
+.TP
+.B \--infobox
+Use /bin/dialog to display an informational dialog as the package is installed.
+Primarily used when installpkg is called from other scripts.
+.TP
+.B \--menu
+Use /bin/dialog to display a menu asking the user if they would like to install the
+package(s) or not.  Generally used when installpkg is called from other scripts.
+.TP
+.B \--ask
+Used with -menu mode.  When selected, always ask if a package should be
+installed regardless of what the package's priority is.
+.TP
+.B \--priority ADD|REC|OPT|SKP
+When installing with the \-menu option, package priority levels (found in the file
+"tagfile" in the package directory) are used to automatically install (ADD) or 
+skip (SKP) a package, or to suggest recommended (REC) or optional (OPT) to the user
+if a menu is displayed.  If a priority is set on the command line, it will override
+the values set in the tagfile for the entire package list.
+.TP
+.B \--tagfile /somedir/tagfile
+Specify a different file to use for package priorities (in this example, /somedir/tagfile
+will be used).  The default is "tagfile" in the package's directory.
+.SH AUTHOR
+Patrick J. Volkerding <volkerdi@slackware.com>
+.SH "SEE ALSO"
+.BR makepkg(8),
+.BR removepkg(8),
+.BR explodepkg(8),
+.BR pkgtool(8), 
+.BR upgradepkg(8)
diff --git a/source/a/pkgtools/manpages/makepkg.8 b/source/a/pkgtools/manpages/makepkg.8
new file mode 100644
index 000000000..b280ce51f
--- /dev/null
+++ b/source/a/pkgtools/manpages/makepkg.8
@@ -0,0 +1,135 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH MAKEPKG 8 "21 May 1994" "Slackware Version 2.0.0"
+.SH NAME
+makepkg \- make Slackware packages.
+.SH SYNOPSIS
+.B makepkg
+[
+.B -l, --linkadd y|n
+]
+[
+.B -c, --chown y|n
+]
+.BI packagename
+.SH DESCRIPTION
+.B makepkg
+creates a new Slackware compatible package.
+The package is constructed using the contents of the current directory and
+all subdirectories. If symbolic links exist, they will be converted to script
+code to recreate them when the package is installed. This code will be
+appended to the primary installation script 
+.B ( install/doinst.sh )
+, or, if that script does not exist it will be created with those contents.
+The package will be written out to the file
+.BI packagename
+which should be the full name, including the extension.  This is usually .tgz,
+but .tbz, .tlz, and .txz are also accepted.  The proper compression utility
+(gzip, bzip2, lzma, or xz) needs to be installed on the machine.
+.SH OPTIONS
+.TP
+.B \-l, --linkadd y|n
+If y, add any symbolic links found to the install script (doinst.sh) and
+delete them.  This is the recommended action.  If this option is not used,
+makepkg will prompt if symbolic links are found.
+.TP
+.B \-p, --prepend
+If this option is given, then any symbolic links added to doinst.sh will be
+prepended to the existing script.  This is useful for packages that contain
+shared libraries that need to be linked first because programs will use them
+later in the doinst.sh script.
+.TP
+.B \-c, --chown y|n
+If y, makepkg will reset all directory permissions to 755 and ownership to root:root.
+In general, you should have the permissions and ownerships worked out yourself, so
+relying on setting this option to y is somewhat sloppy.  It is not the default.  If an
+option is not provided, makepkg will prompt.
+.SH INSTALLATION SCRIPTS
+There are 3 types of installation scripts supported in the Slackware package
+system. 
+.TP
+The first is the 
+.B primary
+installation script. This is found in the subdirectory
+.B ./install
+and must have the name
+.B doinst.sh
+in order to be recognized. This ( and other install scripts ) should be written
+using the basic Bourne shell syntax recognized by the
+.B ash
+shell, since this is the shell that will be used to execute the script when
+installing from a Slackware install floppy. This is a common trap - beware of
+using
+.B bash
+syntax extensions, because the script will work fine when installed from the
+hard drive, but will bomb out when installed from floppy. If the package is
+for personal use, this isn't a problem. Be careful, though, if you plan to
+share your package with other users. The
+.B primary installation script
+is executed immediately after the package is installed with 
+.B installpkg, pkgtool, 
+or
+.B setup.
+.TP
+The second type of script is the
+.B configuration
+script. This is found in the subdirectory
+.B ./var/log/setup
+and must have a name that starts with
+.B setup.
+in order to be recongnized. An example is the timezone script: 
+.B /var/log/setup/setup.timeconfig. 
+These scripts are executed during the
+.B CONFIGURE
+phase of
+.B setup, 
+and are re-executed each time the user runs the
+.B CONFIGURE
+option from
+.B setup
+from then on.
+Typically, the user will go through this phase of setup following the 
+installation of all the packages. Anything that needs to be interactive
+should go in one of these scripts to avoid halting the package installation
+process during 
+.B setup. 
+.TP
+The third type of script is the
+.B onlyonce
+script. Like the name suggests, these are executed only once after the package
+is installed, in contrast to the standard
+.B configuration
+script. These scripts are also found in the
+.B ./var/log/setup
+directory and must have a name that starts with
+.B setup., 
+but in addition the name must contain the string
+.B onlyonce.
+An example might be a script with the name 
+.B /var/log/setup/setup.onlyonce.testscript
+.SH PACKAGE FORMAT
+.B makepkg
+uses GNU tar plus GNU gzip to create its packages. A simple way to 
+extract the contents of a package (without executing the installation
+scripts, of course) is to use a command like this:
+.TP
+explodepkg package.tgz
+.TP
+Or, something like this:
+.TP
+gzip -dc package.tgz | tar xvvf -
+.SH AUTHOR
+Patrick J. Volkerding <volkerdi@slackware.com>
+.SH "SEE ALSO"
+.BR installpkg(8),
+.BR explodepkg(8),
+.BR removepkg(8),
+.BR pkgtool(8), 
+.BR upgradepkg(8)
diff --git a/source/a/pkgtools/manpages/pkgtool.8 b/source/a/pkgtools/manpages/pkgtool.8
new file mode 100644
index 000000000..56e392176
--- /dev/null
+++ b/source/a/pkgtools/manpages/pkgtool.8
@@ -0,0 +1,95 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH PKGTOOL 8 "24 Nov 1995" "Slackware Version 3.1.0"
+.SH NAME
+pkgtool \- software package maintenance tool.
+.SH SYNOPSIS
+.B pkgtool
+.LP
+.B pkgtool
+[
+.B --sets #a#b#c#
+]
+[
+.B --source_mounted
+]
+[
+.B --ignore_tagfiles
+]
+[
+.B --tagfile tagfile
+]
+[
+.B --source_dir directory
+]
+[
+.B --target_dir directory
+]
+[
+.B --source_device device
+]
+.SH DESCRIPTION
+.B pkgtool
+is a menu-driven package maintenance tool provided with the Slackware Linux 
+distribution.  It allows the user to install, remove, or view
+software packages through an interactive
+system.  Pkgtool can also be used to re-run the menu-driven scripts normally
+executed at the end of a Slackware installation.  This is useful for doing
+basic reconfiguration (like changing the mouse type).
+.SH OPTIONS
+Most users will not want to use any options when running
+.B pkgtool.
+These are generally used only when
+.B pkgtool
+is run during the initial system installation.
+Feel free to try them, but be careful.
+.TP
+.B \--sets #A#B#C#
+Install the disk sets A, B, C. Seperate the disk set names by '#' symbols.
+.TP
+.B \--source_mounted
+When this flag is present, 
+.B pkgtool
+will not attempt to unmount and remount the source device with each disk.
+.TP
+.B \--ignore_tagfiles
+When this flag is present, 
+.B pkgtool
+will install every package encountered no matter what the tagfiles say.
+.TP
+.B \--tagfile tagfile
+This flag is used to specify from the command line which tagfile should be
+used for the installation.
+.TP
+.B \--source_dir directory
+Used when installing multiple packages from disk sets. This is the directory
+in which the subdirectories for each disk are found. This isn't used when
+installing from floppy.
+.TP
+.B \--target_dir directory
+The directory where the target root directory is located. This is '/' when 
+installing on the hard drive, or typically '/mnt' when installing from an
+install disk.
+.TP
+.B \--source_device device
+The source device to install from. This is not used if you've provided the
+.B \--source_mounted
+flag. It's usually used when installing from floppy, as in:
+ \--source_device /dev/fd0u1440
+or
+ \--source_device /dev/fd1h1200.
+.SH AUTHOR
+Patrick J. Volkerding <volkerdi@slackware.com>
+.SH "SEE ALSO"
+.BR makepkg(8),
+.BR explodepkg(8),
+.BR installpkg(8),
+.BR removepkg(8),
+.BR upgradepkg(8)
diff --git a/source/a/pkgtools/manpages/removepkg.8 b/source/a/pkgtools/manpages/removepkg.8
new file mode 100644
index 000000000..3bd8bf7a7
--- /dev/null
+++ b/source/a/pkgtools/manpages/removepkg.8
@@ -0,0 +1,108 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH REMOVEPKG 8 "23 Nov 2001" "Slackware Version 8.1.0"
+.SH NAME
+removepkg \- remove Slackware packages.
+.SH SYNOPSIS
+.B removepkg
+.BI packagename
+.LP
+[
+.B ROOT=/mnt
+]
+.B removepkg
+[
+.B \-copy
+]
+[
+.B \-keep
+]
+[
+.B \-preserve
+]
+[
+.B \-warn
+]
+.BI packagename
+.SH DESCRIPTION
+.B removepkg
+removes a previously installed Slackware package, while writing a progress
+report to the standard output.  A package may be specified either by the
+full package name (as you'd see listed in /var/log/packages/), or by the
+base package name.  For example, the package foo-1.0-i486-1.tgz may be removed
+with any of the following commands:
+
+removepkg foo-1.0-i486-1.tgz (also recognized: .tbz, .tlz, .txz)
+
+removepkg foo-1.0-i486-1
+
+removepkg foo.tgz
+
+removepkg foo
+
+When deleting files,
+.B removepkg
+will analyze the contents of the other packages installed on your system, and
+will only delete the files that are unique to the package being removed. 
+Similarly, the installation scripts for all the other packages will be 
+considered when deciding whether or not to delete symbolic links from the
+package.
+.LP
+Removing a package (as well as installing one) can be a dangerous undertaking.
+For this reason, there is the
+.B \-warn
+option available. When you use this,
+.B removepkg
+will not actually remove any files or links, but will output a detailed report
+of what it would do if you actually did remove the package. It's suggested that
+you do this (and maybe pipe the output to 
+.B less
+) before removing packages to make sure you've backed up anything that might
+be important.
+.LP
+When removing a package, it's original file index will be moved from 
+/var/log/packages to /var/log/removed_packages. Likewise, it's installation
+script will be moved from /var/log/scripts to /var/log/removed_scripts.
+.SH OPTIONS
+.TP
+.B \-warn packagename
+Generate a report to the standard output about which files and directories
+would be removed, but does not actually remove the package.
+.TP
+.B \-preserve packagename
+If specified, the complete package subtree is reconstructed in 
+/var/log/setup/tmp/preserved_packages/packagename.
+.TP
+.B \-copy packagename
+Construct a copy of the package under /var/log/setup/tmp/preserved_packages/packagename,
+but don't remove it.  (same effect as \-warn \-preserve)
+.TP
+.B \-keep
+Save the intermediate files created by removepkg (delete_list, 
+required_files, uniq_list, del_link_list, required_links, 
+required_list).  Mostly useful for debugging purposes.
+.SH " "
+It's possible to remove a package from a filesystem
+other than / by supplying
+.B removepkg
+with a
+.B ROOT
+environment variable:
+.TP
+.B ROOT=/mnt removepkg package
+
+.SH AUTHORS
+Patrick J. Volkerding <volkerdi@slackware.com>,
+with enhancements by Christian Franke <c.franke@acm.org>
+.SH "SEE ALSO"
+.BR installpkg(8),
+.BR makepkg(8),
+.BR pkgtool(8), 
+.BR upgradepkg(8)
diff --git a/source/a/pkgtools/manpages/setup.8-deprecated b/source/a/pkgtools/manpages/setup.8-deprecated
new file mode 100644
index 000000000..533974222
--- /dev/null
+++ b/source/a/pkgtools/manpages/setup.8-deprecated
@@ -0,0 +1,120 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH SETUP 8 "21 May 1994" "Slackware Version 2.0.0"
+.SH NAME
+setup \- Slackware system setup tool.
+.SH SYNOPSIS
+.B setup
+.LP
+.SH DESCRIPTION
+.B setup
+is the system installation and setup tool provided with the Slackware Linux
+distribution.
+.LP
+.B setup 
+is usually used to install software packages from your hard drive, a CD,
+NFS, or floppy disks. It is also a frontend for 
+.B pkgtool
+and many configuration scripts that come with various packages, such as the
+scripts which allow you to install LILO, configure your timezone, set your
+keyboard fonts, make bootdisks, and many other tasks.
+.SH OPTIONS
+.TP
+.B HELP
+Read the
+.B setup
+help file.
+.TP
+.B KEYMAP
+Change your keyboard map to one of many international and specialized keymaps
+available. 
+.B NOTE:
+This change will not become permanent unless you go through the 
+.B CONFIGURE option.
+.TP
+.B MAKE TAGS
+This allows you to write out custom tagfiles. A
+.B tagfile
+is a list of package names followed by one of these tags:
+.B ADD
+(required),
+.B SKP
+(skip),
+.B REC
+(recommended) or,
+.B OPT
+(optional). These allow you to completely automate your software installation.
+You can either put these files on the first disk of each disk series 
+(optionally using a custom 3 character extension), or in a custom location
+altogether, such as on a floppy disk in ./a1, ./ap1, ./d1, ..., directories.
+The format of a line in a 
+.B tagfile
+is like this:
+.LP
+package: 
+.B TAG
+.TP
+.B SOURCE
+Select your source media, such as hard disk, NFS, CD, or floppy. You should
+select installation from a directory if your CD or NFS directory has already
+been mounted, as it probably is if you're using 
+.B setup
+on your hard drive.
+.TP
+.B TARGET
+Select your target directory. For testing purposes, you may install the
+packages to a directory other than '/'. Don't expect them to run from there,
+though.
+.TP
+.B DISK SETS
+Select the disk sets you want to install. You can also install custom disk
+sets by tagging the
+.B CUS
+selection. The disk sets must be Slackware-like: they require the diskxxx?
+index on each disk, such as diskxyz1 for the first disk of the XYZ series.
+On the last disk there must be a file called
+.B install.end
+to signal the end of the disk series.
+.TP
+.B INSTALL
+Once you've gone through 
+.B SOURCE
+and
+.B DISK SETS
+( and possibly 
+.B TARGET
+), then you select this choice to go on with the software installation. You'll
+be asked what type of tagfiles you want to use and then 
+.B pkgtool
+will be called to install the software.
+.TP
+.B CONFIGURE
+This option runs through several scripts that configure various aspects of your
+Linux system. These might include LILO installation, timezone configuration,
+and other things.
+.TP
+.B PKGTOOL
+This option calls the 
+.B pkgtool(8)
+utility for you.
+.TP
+.B EXIT
+Exit the
+.B setup
+program.
+.SH AUTHOR
+Patrick J. Volkerding <volkerdi@slackware.com>
+.SH "SEE ALSO"
+.BR makepkg(8),
+.BR installpkg(8),
+.BR explodepkg(8),
+.BR removepkg(8),
+.BR pkgtool(8),
+.BR upgradepkg(8)
diff --git a/source/a/pkgtools/manpages/upgradepkg.8 b/source/a/pkgtools/manpages/upgradepkg.8
new file mode 100644
index 000000000..8ca7811ba
--- /dev/null
+++ b/source/a/pkgtools/manpages/upgradepkg.8
@@ -0,0 +1,98 @@
+.\" -*- nroff -*-
+.ds g \" empty
+.ds G \" empty
+.\" Like TP, but if specified indent is more than half
+.\" the current line-length - indent, use the default indent.
+.de Tp
+.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.el .TP "\\$1"
+..
+.TH UPGRADEPKG 8 "31 May 2002" "Slackware Version 8.1.0"
+.SH NAME
+upgradepkg \- upgrade Slackware packages.
+.SH SYNOPSIS
+.B upgradepkg
+[
+.B --dry-run
+]
+[
+.B --install-new
+]
+[
+.B --reinstall
+]
+[
+.B --verbose
+]
+.BI newpackagename
+.BI [ newpackagename2 ]
+.LP
+.B upgradepkg
+[
+.B --dry-run
+]
+[
+.B --install-new
+]
+[
+.B --reinstall
+]
+[
+.B --verbose
+]
+.BI oldpackagename%newpackagename
+.BI [ old2%new2 ]
+.SH DESCRIPTION
+.B upgradepkg
+upgrades a Slackware package from an older version to a
+newer one.  It does this by
+.B INSTALLING
+the new package onto the system, and then
+.B REMOVING 
+any files from the old package that aren't in the new package.
+If the old and new packages have the same name, a single argument is all that
+is required.  If the packages have different names, supply the name of the
+old package followed by a percent symbol (%), then the name of the new package.
+Do not add any extra whitespace between pairs of old/new package names.
+
+If upgradepkg finds more than one installed package matching the old package's
+name, it will remove them all.
+.TP
+To upgrade in a directory other than / (such as /mnt):
+.TP
+ROOT=/mnt upgradepkg package.tgz (or .tbz, .tlz, .txz)
+.SH OPTIONS
+.TP
+.B \--dry-run
+Output a report about which packages would be installed or upgraded
+but don't actually perform the upgrades.
+.TP
+.B \--install-new
+Normally upgradepkg only upgrades packages that are already installed on the system, and
+will skip any packages that do not already have a version installed.
+If
+.B --install-new
+is specified, the behavior is modified to install new packages in addition to upgrading
+existing ones.
+.TP
+.B \--reinstall
+Upgradepkg usually skips packages if the exact same package
+(matching name, version, arch, and build number) is already installed on the system.
+Use the --reinstall option if you want to upgrade all packages even if the same
+version is already installed.
+.TP
+.B \--verbose
+Show all the gory details of the upgrade.
+.SH BUGS
+Before upgrading a package, save any configuration files (such as in /etc)
+that you wish to keep.  Sometimes these will be preserved, but it depends on
+the package structure.  If you want to force new versions of the config files
+to be installed, remove the old ones manually prior to running upgradepkg.
+.SH AUTHOR
+Patrick J. Volkerding <volkerdi@slackware.com>
+.SH "SEE ALSO"
+.BR makepkg(8),
+.BR installpkg(8),
+.BR removepkg(8),
+.BR explodepkg(8),
+.BR pkgtool(8)
diff --git a/source/a/pkgtools/obsolete-scripts/README b/source/a/pkgtools/obsolete-scripts/README
new file mode 100644
index 000000000..3e0060de1
--- /dev/null
+++ b/source/a/pkgtools/obsolete-scripts/README
@@ -0,0 +1,5 @@
+This directory contains retired installation scripts.
+
+setup.90.modem-device is obsolete since udev will overwrite any
+existing devices or links in /dev.
+
diff --git a/source/a/pkgtools/obsolete-scripts/setup.90.modem-device b/source/a/pkgtools/obsolete-scripts/setup.90.modem-device
new file mode 100644
index 000000000..a1c5993af
--- /dev/null
+++ b/source/a/pkgtools/obsolete-scripts/setup.90.modem-device
@@ -0,0 +1,44 @@
+#!/bin/sh
+#BLURB="Select modem device"
+TMP=/var/log/setup/tmp
+T_PX="$1"
+if [ ! -d $TMP ]; then
+  mkdir -p $TMP
+fi
+
+dialog --title "MODEM CONFIGURATION" --menu "This part of the configuration \
+process will create a /dev/modem link pointing to the callout device (ttyS0, \
+ttyS1, ttyS2, ttyS3) representing your default modem.  You \
+can change this link \
+later if you move your modem to a different port.  If your modem is a PCI card, \
+it will probably use /dev/ttyS4 or higher. \
+Please select the callout \
+device which you would like to use for your modem:" 22 68 9 \
+"no modem" "do not set a /dev/modem link" \
+"/dev/ttyS0" "(COM1: under DOS)" \
+"/dev/ttyS1" "(COM2: under DOS)" \
+"/dev/ttyS2" "(COM3: under DOS)" \
+"/dev/ttyS3" "(COM4: under DOS)" \
+"/dev/ttyS4" "PCI modem" \
+"/dev/ttyS5" "PCI modem" \
+"/dev/ttyS6" "PCI modem" \
+"/dev/ttyS7" "PCI modem" \
+"/dev/ttyS8" "PCI modem" \
+"/dev/ttyS9" "PCI modem" \
+"/dev/ttyS10" "PCI modem" \
+"/dev/ttyS11" "PCI modem" \
+"/dev/ttyS12" "PCI modem" \
+"/dev/ttyS13" "PCI modem" \
+"/dev/ttyS14" "PCI modem" \
+"/dev/ttyS15" "PCI modem" \
+2> $TMP/callout
+
+if [ $? = 0 ]; then
+  MODEM_DEVICE="`cat $TMP/callout`"
+  if [ ! "$MODEM_DEVICE" = "no modem" ]; then
+    MODEM_DEVICE=`basename $MODEM_DEVICE`
+    ( cd $T_PX/dev ; ln -sf $MODEM_DEVICE modem )
+  fi
+fi
+rm -f $TMP/callout
+
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
new file mode 100755
index 000000000..da70e19f0
--- /dev/null
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+# Copyright 2005, 2006, 2007, 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.
+
+# Set initial variables:
+CWD=`pwd`
+if [ "$TMP" = "" ]; then
+  TMP=/tmp
+fi
+PKG=$TMP/package-pkgtools
+
+# *** UPDATE THESE WITH EACH BUILD:
+VERSION=13.0
+ARCH=${ARCH:-noarch}
+BUILD=3
+
+if [ ! -d $TMP ]; then
+  mkdir -p $TMP # location to build the source
+fi
+rm -rf $PKG
+mkdir -p $PKG
+
+# Install Slackware script manpages:
+( cd $CWD/manpages
+  mkdir -p $PKG/usr/man/man8
+  for page in explodepkg.8 installpkg.8 makepkg.8 upgradepkg.8 pkgtool.8 \
+    removepkg.8 ; do
+    cat $page | gzip -9c > $PKG/usr/man/man8/$page.gz
+  done
+)
+
+# Install Slackware scripts:
+( cd $CWD/scripts
+  # Install the core Slackware package tools:
+  mkdir -p $PKG/sbin
+  for file in explodepkg installpkg makebootdisk makepkg pkgtool removepkg upgradepkg ; do
+    cp -a $CWD/scripts/$file $PKG/sbin
+  done
+  chown root:root $PKG/sbin/*
+  chmod 755 $PKG/sbin/*
+  # These scripts are used during the installation:
+  mkdir -p $PKG/var/log/setup/tmp
+  chmod 700 $PKG/var/log/setup/tmp
+  for file in setup.* ; do
+    cp -a $file $PKG/var/log/setup
+  done
+  chown root:root $PKG/var/log/setup/setup.*
+  chmod 755 $PKG/var/log/setup/setup.*
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/pkgtools-$VERSION-$ARCH-$BUILD.tgz
+
+echo
+echo "HEY -- did you remember to update the version numbers in the setup scripts?"
+echo
+
diff --git a/source/a/pkgtools/scripts/explodepkg b/source/a/pkgtools/scripts/explodepkg
new file mode 100644
index 000000000..a113b085d
--- /dev/null
+++ b/source/a/pkgtools/scripts/explodepkg
@@ -0,0 +1,97 @@
+#!/bin/sh
+# Copyright 1994, 1998, 2000  Patrick Volkerding, Concord, CA, USA
+# Copyright 2001, 2003  Slackware Linux, Inc., Concord, CA, USA
+# Copyright 2007, 2009  Patrick 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.
+
+TAR=tar-1.13
+$TAR --help 1> /dev/null 2> /dev/null
+if [ ! $? = 0 ]; then
+  TAR=tar
+fi
+if [ ! "`LC_MESSAGES=C $TAR --version`" = "tar (GNU tar) 1.13
+
+Copyright (C) 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+Written by John Gilmore and Jay Fenlason." ]; then
+  echo "WARNING: pkgtools are unstable with tar > 1.13."
+  echo "         You should provide a \"tar-1.13\" in your \$PATH."
+  sleep 5
+fi
+
+if [ $# = 0 ]; then
+  cat << EOF
+Usage: explodepkg package_name [package_name2, ...]
+
+Explodes a Slackware compatible software package
+(or any tar+{gzip,bzip2,lzma,xz archive) in the current directory.
+Equivalent to (for each package listed):
+
+  ( umask 000 ; cat package_name | COMPRESSOR -dc | tar xzvf package_name )
+
+Note: This should only be used for debugging or examining packages, not for 
+installing them.  It doesn't execute installation scripts or update the package
+indexes in /var/log/packages and /var/log/scripts.
+
+EOF
+fi
+
+# Main loop:
+for PKG in $* ; do
+  echo "Exploding package $PKG in current directory:"
+  # Determine extension:
+  packageext="$( echo $PKG | rev | cut -f 1 -d . | rev)"
+  # Determine compression utility:
+  case $packageext in
+  'tgz' )
+    packagecompression=gzip
+    ;;
+  'gz' )
+    packagecompression=gzip
+    ;;
+  'tbz' )
+    packagecompression=bzip2
+    ;;
+  'bz2' )
+    packagecompression=bzip2
+    ;;
+  'tlz' )
+    packagecompression=lzma
+    ;;
+  'lzma' )
+    packagecompression=lzma
+    ;;
+  'txz' )
+    packagecompression=xz
+    ;;
+  'xz' )
+    packagecompression=xz
+    ;;
+  esac
+  ( umask 000 ; cat $PKG | $packagecompression -dc | $TAR xvf - 2> /dev/null )
+  if [ -r install/doinst.sh ]; then
+    echo
+    echo "An installation script was detected in ./install/doinst.sh, but"
+    echo "was not executed."
+  fi
+done
+
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
new file mode 100644
index 000000000..31bb0b717
--- /dev/null
+++ b/source/a/pkgtools/scripts/installpkg
@@ -0,0 +1,568 @@
+#!/bin/sh
+# Copyright 1994, 1998, 2000  Patrick Volkerding, Concord, CA, USA 
+# Copyright 2001, 2003  Slackware Linux, Inc., Concord, CA, USA
+# Copyright 2007, 2009  Patrick 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.
+#
+# Sat Apr 25 21:18:53 UTC 2009
+# Converted to use new pkgbase() function to remove pathname and
+# valid package extensions.
+#
+# Sat Apr  4 22:58:06 CDT 2009
+# Support additional compression formats if the supporting utilities exist:
+# .tbz - bzip2
+# .tlz - lzma
+# .txz - xz (also LZMA)
+# And of course, .tgz (gzip) is not going anywhere.  :-) <volkerdi>
+# Add command switches to determine the uncompressed package size even if
+# that will slow things down, and to add the package's md5sum to the
+# metadata stored in /var/log/packages/.
+#
+# Fri Dec 21 17:21:35 CST 2007
+# Added a patch from Johnny Morano to work around package removal issues
+# caused by packages that do not comply with FHS combined with a grep
+# regex error in installpkg.  Any package with a single-letter top-
+# level directory could not be removed.
+#
+# Shortened some of the top-line dialog output to avoid overflowing the
+# textbox (needed as some of the packages, especially in X, have very
+# long base package names now).  <pjv>
+#
+# Sun Nov 26 12:38:25 CST 1995
+# Added patch from Glenn Moloney <glenn@physics.unimelb.edu.au> to allow
+# packages to be installed to directories other than /.
+#
+# Wed Mar 18 15:15:51 CST 1998
+# Changed $TMP directory to /var/log/setup/tmp, and chmod'ed it 700 to close
+# some security holes.
+
+# Return a package name that has been stripped of the dirname portion
+# and any of the valid extensions (only):
+pkgbase() {
+  PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
+  case $PKGEXT in
+  'tgz' )
+    PKGRETURN=$(basename $1 .tgz)
+    ;;
+  'tbz' )
+    PKGRETURN=$(basename $1 .tbz)
+    ;;
+  'tlz' )
+    PKGRETURN=$(basename $1 .tlz)
+    ;;
+  'txz' )
+    PKGRETURN=$(basename $1 .txz)
+    ;;
+  *)
+    PKGRETURN=$(basename $1)
+    ;;
+  esac
+  echo $PKGRETURN
+}
+
+# If installpkg encounters a problem, it will return a non-zero error code.
+# If it finds more than one problem (i.e. with a list of packages) you'll only
+# hear about the most recent one. :)
+# 1 = tar returned error code
+# 2 = corrupt compression envelope
+# 3 = does not end in .tgz
+# 4 = no such file
+# 5 = external compression utility missing
+# 99 = user abort from menu mode
+EXITSTATUS=0
+
+# Do not store md5sums by default:
+MD5SUM=0
+
+# So that we know what to expect...
+umask 022
+TAR=tar-1.13
+$TAR --help 1> /dev/null 2> /dev/null
+if [ ! $? = 0 ]; then
+  TAR=tar
+fi
+if [ ! "$(LC_MESSAGES=C $TAR --version)" = "tar (GNU tar) 1.13
+
+Copyright (C) 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+Written by John Gilmore and Jay Fenlason." ]; then
+  echo "WARNING: pkgtools are unstable with tar > 1.13."
+  echo "         You should provide a \"tar-1.13\" in your \$PATH."
+  sleep 5
+fi
+
+usage() {
+ cat << EOF
+Usage: installpkg [options] <package_filename>
+
+Installpkg is used to install a .t{gz,bz,lz,xz} package like this:
+   installpkg slackware-package-1.0.0-i486-1.tgz (or .tbz, .tlz, .txz)
+
+options:      --warn (warn if files will be overwritten, but do not install)
+              --root /mnt (install someplace else, like /mnt)
+              --infobox (use dialog to draw an info box)
+              --menu (confirm package installation with a menu, unless
+                    the priority is [required] or ADD)
+              --ask (used with menu mode: always ask if a package should be
+                   installed regardless of what the package's priority is)
+              --priority ADD|REC|OPT|SKP  (provide a priority for the entire
+                    package list to use instead of the priority in the
+                    tagfile)
+              --tagfile /somedir/tagfile (specify a different file to use
+                    for package priorities.  The default is "tagfile" in
+                    the package's directory)
+              --md5sum (record the package's md5sum in the metadata file)
+
+EOF
+}
+
+# Eliminate whitespace function:
+crunch() {
+  while read FOO ; do
+    echo $FOO
+  done
+}
+
+package_name() {
+  STRING=$(pkgbase $1)
+  # Check for old style package name with one segment:
+  if [ "$(echo $STRING | cut -f 1 -d -)" = "$(echo $STRING | cut -f 2 -d -)" ]; then
+    echo $STRING
+  else # has more than one dash delimited segment
+    # Count number of segments:
+    INDEX=1
+    while [ ! "$(echo $STRING | cut -f $INDEX -d -)" = "" ]; do
+      INDEX=$(expr $INDEX + 1)
+    done
+    INDEX=$(expr $INDEX - 1) # don't include the null value
+    # If we don't have four segments, return the old-style (or out of spec) package name:
+    if [ "$INDEX" = "2" -o "$INDEX" = "3" ]; then
+      echo $STRING
+    else # we have four or more segments, so we'll consider this a new-style name:
+      NAME=$(expr $INDEX - 3)
+      NAME="$(echo $STRING | cut -f 1-$NAME -d -)"
+      echo $NAME
+      # cruft for later ;)
+      #VER=$(expr $INDEX - 2)
+      #VER="$(echo $STRING | cut -f $VER -d -)"
+      #ARCH=$(expr $INDEX - 1)
+      #ARCH="$(echo $STRING | cut -f $ARCH -d -)"
+      #BUILD="$(echo $STRING | cut -f $INDEX -d -)"
+    fi
+  fi
+}
+
+# Parse options:
+MODE=install # standard text-mode
+while [ 0 ]; do
+  if [ "$1" = "-warn" -o "$1" = "--warn" ]; then
+    MODE=warn
+    shift 1
+  elif [ "$1" = "-md5sum" -o "$1" = "--md5sum" ]; then
+    MD5SUM=1
+    shift 1
+  elif [ "$1" = "-infobox" -o "$1" = "--infobox" ]; then
+    MODE=infobox
+    shift 1
+  elif [ "$1" = "-menu" -o "$1" = "--menu" ]; then
+    MODE=menu
+    shift 1
+  elif [ "$1" = "-ask" -o "$1" = "--ask" ]; then
+    ALWAYSASK="yes"
+    shift 1
+  elif [ "$1" = "-tagfile" -o "$1" = "--tagfile" ]; then
+    if [ -r "$2" ]; then
+      USERTAGFILE="$2"
+    elif [ -r "$(pwd)/$2" ]; then
+      USERTAGFILE="$(pwd)/$2"
+    else
+      usage
+      exit
+    fi
+    shift 2
+  elif [ "$1" = "-priority" -o "$1" = "--priority" ]; then
+    if [ "$2" = "" ]; then
+      usage
+      exit
+    fi
+    USERPRIORITY="$2"
+    shift 2
+  elif [ "$1" = "-root" -o "$1" = "--root" ]; then
+    if [ "$2" = "" ]; then
+      usage
+      exit
+    fi
+    ROOT="$2"
+    shift 2
+  else
+    break
+  fi
+done
+
+# Set the prefix for the package database directories (packages, scripts).
+ADM_DIR="$ROOT/var/log"
+# If the directories don't exist, "initialize" the package database:
+for PKGDBDIR in packages removed_packages removed_scripts scripts setup ; do
+  if [ ! -d $ADM_DIR/$PKGDBDIR ]; then
+    rm -rf $ADM_DIR/$PKGDBDIR # make sure it's not a symlink or something stupid
+    mkdir -p $ADM_DIR/$PKGDBDIR
+    chmod 755 $ADM_DIR/$PKGDBDIR 
+  fi
+done
+
+# Make sure there's a proper temp directory:
+TMP=$ADM_DIR/setup/tmp
+# If the $TMP directory doesn't exist, create it:
+if [ ! -d $TMP ]; then
+  rm -rf $TMP # make sure it's not a symlink or something stupid
+  mkdir -p $TMP
+  chmod 700 $TMP # no need to leave it open
+fi
+
+# usage(), exit if called with no arguments:
+if [ $# = 0 ]; then
+  usage;
+  exit
+fi
+
+# If -warn mode was requested, produce the output and then exit:
+if [ "$MODE" = "warn" ]; then
+  while [ -f "$1" ]; do
+    echo "#### Scanning the contents of $1..."
+    mkdir -p $TMP/scan$$
+    # Determine extension:
+    packageext="$( echo $1 | rev | cut -f 1 -d . | rev)"
+    # Determine compressor utility:
+    case $packageext in
+    'tgz' )
+      packagecompression=gzip
+      ;;
+    'tbz' )
+      packagecompression=bzip2
+      ;;
+    'tlz' )
+      packagecompression=lzma
+      ;;
+    'txz' )
+      packagecompression=xz
+      ;;
+    esac
+    ( cd $TMP/scan$$ ; $packagecompression -dc | $TAR xf - install ) < $1 2> /dev/null 
+    if [ -r $TMP/scan$$/install/doinst.sh ]; then
+      if cat $TMP/scan$$/install/doinst.sh | grep ' rm -rf ' 1>/dev/null 2>/dev/null ; then
+        cat $TMP/scan$$/install/doinst.sh | grep ' rm -rf ' > $TMP/scan$$/install/delete
+        echo "The following locations will be completely WIPED OUT to allow symbolic"
+        echo "links to be made. (We're talking 'rm -rf') These locations may be files,"
+        echo "or entire directories.  Be sure you've backed up anything at these"
+        echo "locations that you want to save before you install this package:"
+        cat $TMP/scan$$/install/delete | cut -f 3,7 -d ' ' | tr ' ' '/'
+      fi
+      if [ -d $TMP/scan$$ ]; then
+        ( cd $TMP/scan$$ ; rm -rf install ) 2> /dev/null
+        ( cd $TMP ; rmdir scan$$ ) 2> /dev/null
+      fi
+    fi
+    echo "The following files will be overwritten when installing this package."
+    echo "Be sure they aren't important before you install this package:"
+    ( $packagecompression -dc | $TAR tvvf - ) < $1 | grep -v 'drwx'
+    echo
+    shift 1
+  done
+  exit
+fi
+
+# Main loop:
+for package in $* ; do
+
+  # Simple package integrity check:
+  if [ ! -f $package ]; then
+    EXITSTATUS=4
+    if [ "$MODE" = "install" ]; then
+      echo "Cannot install $package:  file not found"
+    fi
+    continue;
+  fi
+
+  # "shortname" isn't really THAT short...
+  # it's just the full name without ".t{gz,bz,lz,xz}"
+  shortname="$(pkgbase $package)"
+  packagedir="$(dirname $package)"
+  # This is the base package name, used for grepping tagfiles and descriptions:
+  packagebase="$(package_name $shortname)"
+
+  # Reject package if it does not end in '.t{gz,bz,lz,xz}':
+  if [ "$shortname" = "$(basename $package)" ]; then
+    EXITSTATUS=3
+    if [ "$MODE" = "install" ]; then
+      echo "Cannot install $package:  file does not end in .tgz, .tbz, .tlz, or .txz"
+    fi
+    continue;
+  fi
+
+  # Determine extension:
+  packageext="$(echo $package | rev | cut -f 1 -d . | rev)"
+
+  # Determine compressor utility:
+  case $packageext in
+  'tgz' )
+    packagecompression=gzip
+    ;;
+  'tbz' )
+    packagecompression=bzip2
+    ;;
+  'tlz' )
+    packagecompression=lzma
+    ;;
+  'txz' )
+    packagecompression=xz
+    ;;
+  esac
+
+  # Test presence of external compression utility:
+  if ! $packagecompression --help 1> /dev/null 2> /dev/null ; then
+    EXITSTATUS=5
+    if [ "$MODE" = "install" ]; then
+      echo "Cannot install $package:  external compression utility $packagecompression missing"
+    fi
+    continue;
+  fi
+
+  # Determine package's priority:
+  unset PRIORITY
+  if [ "$USERTAGFILE" = "" ]; then
+    TAGFILE="$packagedir/tagfile"   
+  else
+    TAGFILE="$USERTAGFILE"
+  fi
+  if [ ! -r "$TAGFILE" ]; then
+    TAGFILE=/dev/null
+  fi
+  if grep "^$packagebase:" "$TAGFILE" | grep ADD > /dev/null 2> /dev/null ; then
+    PRIORITY="ADD"
+  elif grep "^$packagebase:" "$TAGFILE" | grep REC > /dev/null 2> /dev/null ; then
+    PRIORITY="REC"
+  elif grep "^$packagebase:" "$TAGFILE" | grep OPT > /dev/null 2> /dev/null ; then
+    PRIORITY="OPT"
+  elif grep "^$packagebase:" "$TAGFILE" | grep SKP > /dev/null 2> /dev/null ; then
+    PRIORITY="SKP"
+  fi
+  if [ "$PRIORITY" = "ADD" ]; then
+    PMSG="[ADD]"
+  elif [ "$PRIORITY" = "REC" ]; then
+    PMSG="[REC]"
+  elif [ "$PRIORITY" = "OPT" ]; then
+    PMSG="[OPT]"
+  elif [ "$PRIORITY" = "SKP" ]; then
+    PMSG="[SKP]"
+  else
+    PMSG=""
+  fi
+
+  # If a tagfile wants this package to be skipped, do that now before
+  # wasting any more CPU on it:
+  if [ "$PRIORITY" = "SKP" -a ! "$ALWAYSASK" = "yes" ]; then
+    continue # next package
+  fi
+
+  # Figure out some package information, like the compressed and uncompressed
+  # sizes, and where to find the package description:
+  COMPRESSED="$(du -s $package | cut -f 1)K"
+  DESCRIPTION=""
+  # First check for .txt file next to the package, since this is faster:
+  if grep "^$packagebase:" "$packagedir/$shortname.txt" 1> /dev/null 2> /dev/null ; then
+    DESCRIPTION="$packagedir/$shortname.txt"
+  elif grep "^$shortname:" "$packagedir/$shortname.txt" 1> /dev/null 2> /dev/null ; then
+    DESCRIPTION="$packagedir/$shortname.txt"
+  fi
+
+  # Test tarball integrity and get uncompressed package size:
+  if [ "$MODE" = "install" ]; then
+    echo "Verifying package $(basename $package)."
+  fi
+  cat $package | $packagecompression -dc | dd 2> $TMP/tmpsize$$ | $TAR tf - 1> $TMP/tmplist$$ 2> /dev/null
+  TARERROR=$?
+  if [ ! "$TARERROR" = "0" ]; then
+    EXITSTATUS=1 # tar file corrupt
+    if [ "$MODE" = "install" ]; then
+      echo "Unable to install $package:  tar archive is corrupt (tar returned error code $TARERROR)"
+    fi
+    rm -f $TMP/tmplist$$ $TMP/tmpsize$$
+    continue
+  fi
+  UNCOMPRESSED="$(expr $(cat $TMP/tmpsize$$ | head -n 1 | cut -f 1 -d +) / 2)K"
+  rm -f $TMP/tmpsize$$
+
+  # If we still don't have a package description, look inside the package.
+  # This requires a costly untar.
+  if [ "$DESCRIPTION" = "" ]; then
+    mkdir -p $TMP/scan$$
+    ( cd $TMP/scan$$ ; $packagecompression -dc | $TAR xf - install ) < $package 2> /dev/null
+    if grep "^$packagebase:" "$TMP/scan$$/install/slack-desc" 1> /dev/null 2> /dev/null ; then
+      DESCRIPTION="$TMP/scan$$/install/slack-desc"
+    elif grep "^$shortname:" "$TMP/scan$$/install/slack-desc" 1> /dev/null 2> /dev/null ; then
+      DESCRIPTION="$TMP/scan$$/install/slack-desc"
+    fi
+  fi
+
+  if [ "$DESCRIPTION" = "" ]; then
+    #echo "WARNING NO SLACK-DESC"
+    DESCRIPTION="/dev/null"
+  fi
+
+  # Gather package infomation into a temporary file:
+  cat $DESCRIPTION | grep "^$packagebase:" | cut -f 2- -d : | cut -b2- 1> $TMP/tmpmsg$$ 2> /dev/null
+  if [ "$shortname" != "$packagebase" ]; then
+    cat $DESCRIPTION | grep "^$shortname:" | cut -f 2- -d : | cut -b2- 1>> $TMP/tmpmsg$$ 2> /dev/null
+  fi
+  # Adjust the length here.  This allows a slack-desc to be any size up to 13 lines instead of fixed at 11.
+  LENGTH=$(cat $TMP/tmpmsg$$ | wc -l)
+  while [ $LENGTH -lt 12 ]; do
+    echo >> $TMP/tmpmsg$$
+    LENGTH=$(expr $LENGTH + 1)
+  done
+  echo "Size: Compressed: ${COMPRESSED}, uncompressed: ${UNCOMPRESSED}." >> $TMP/tmpmsg$$
+  # For recent versions of dialog it is necessary to add \n to the end of each line
+  # or it will remove repeating spaces and mess up our careful formatting:
+  cat << EOF > $TMP/controlns$$
+\n
+\n
+\n
+\n
+\n
+\n
+\n
+\n
+\n
+\n
+\n
+\n
+\n
+EOF
+  paste -d "" $TMP/tmpmsg$$ $TMP/controlns$$ > $TMP/pasted$$
+  rm -f $TMP/controlns$$
+  mv $TMP/pasted$$ $TMP/tmpmsg$$
+  # Emit information to the console:
+  if [ "$MODE" = "install" ]; then
+    if [ "$PMSG" = "" ]; then
+      echo "Installing package $(basename $package):"
+    else
+      echo "Installing package $(basename $package) $PMSG:"
+    fi
+    echo "PACKAGE DESCRIPTION:"
+    cat $DESCRIPTION | grep "^$packagebase:" | uniq | sed "s/^$packagebase:/#/g"
+    if [ "$shortname" != "$packagebase" ]; then
+      cat $DESCRIPTION | grep "^$shortname:" | uniq | sed "s/^$shortname:/#/g"
+    fi
+  elif [ "$MODE" = "infobox" ]; then # install infobox package
+    dialog --title "Installing package $shortname $PMSG" --infobox "$(cat $TMP/tmpmsg$$)" 0 0
+  elif [ "$MODE" = "menu" -a "$PRIORITY" = "ADD" -a ! "$ALWAYSASK" = "yes" ]; then # ADD overrides menu mode unless -ask was used
+    dialog --title "Installing package $shortname $PMSG" --infobox "$(cat $TMP/tmpmsg$$)" 0 0
+  elif [ "$MODE" = "menu" -a "$USERPRIORITY" = "ADD" ]; then # install no matter what $PRIORITY
+    dialog --title "Installing package $shortname $PMSG" --infobox "$(cat $TMP/tmpmsg$$)" 0 0
+  else # we must need a full menu:
+    dialog --title "Package Name: $shortname $PMSG" --menu "$(cat $TMP/tmpmsg$$)" 0 0 3 \
+    "Yes" "Install package $shortname" \
+    "No" "Do not install package $shortname" \
+    "Quit" "Abort software installation completely" 2> $TMP/reply$$
+    if [ ! $? = 0 ]; then
+      echo "No" > $TMP/reply$$
+    fi
+    REPLY="$(cat $TMP/reply$$)"
+    rm -f $TMP/reply$$ $TMP/tmpmsg$$
+    if [ "$REPLY" = "Quit" ]; then
+      exit 99 # EXIT STATUS 99 = ABORT!
+    elif [ "$REPLY" = "No" ]; then
+      continue # skip the package
+    fi
+  fi
+
+  # Make sure there are no symbolic links sitting in the way of
+  # incoming package files:
+  cat $TMP/tmplist$$ | grep -v "/$" | while read file ; do
+    if [ -L "$ROOT/$file" ]; then
+      rm -f "$ROOT/$file"
+    fi
+  done
+  rm -f $TMP/tmplist$$
+
+  # Write the package file database entry and install the package:
+  echo "PACKAGE NAME:     $shortname" > $ADM_DIR/packages/$shortname
+  echo "COMPRESSED PACKAGE SIZE:     $COMPRESSED" >> $ADM_DIR/packages/$shortname
+  echo "UNCOMPRESSED PACKAGE SIZE:     $UNCOMPRESSED" >> $ADM_DIR/packages/$shortname
+  echo "PACKAGE LOCATION: $package" >> $ADM_DIR/packages/$shortname
+  # Record the md5sum if that's a selected option:
+  if [ $MD5SUM = 1 ]; then
+    echo "PACKAGE MD5SUM: $(md5sum $package | cut -f 1 -d ' ')" >> $ADM_DIR/packages/$shortname
+  fi
+  echo "PACKAGE DESCRIPTION:" >> $ADM_DIR/packages/$shortname
+  cat $DESCRIPTION | grep "^$packagebase:" >> $ADM_DIR/packages/$shortname 2> /dev/null
+  if [ "$shortname" != "$packagebase" ]; then
+    cat $DESCRIPTION | grep "^$shortname:" >> $ADM_DIR/packages/$shortname 2> /dev/null
+  fi
+  echo "FILE LIST:" >> $ADM_DIR/packages/$shortname
+  ( cd $ROOT/ ; $packagecompression -dc | $TAR -xlUpvf - ) < $package >> $TMP/$shortname 2> /dev/null
+  if [ "$(cat $TMP/$shortname | grep '^\./' | wc -l | tr -d ' ')" = "1" ]; then
+    # Good.  We have a package that meets the Slackware spec.
+    cat $TMP/$shortname >> $ADM_DIR/packages/$shortname
+  else
+    # Some dumb bunny built a package with something other than makepkg.  Bad!
+    # Oh well.  Bound to happen.  Par for the course.  Fix it and move on...
+    echo "WARNING:  Package has not been created with 'makepkg'"
+    echo './' >> $ADM_DIR/packages/$shortname
+    cat $TMP/$shortname >> $ADM_DIR/packages/$shortname
+  fi
+  rm -f $TMP/$shortname
+
+  # It's a good idea to make sure those newly installed libraries
+  # are properly activated for use:
+  if [ -x /sbin/ldconfig ]; then
+    /sbin/ldconfig
+  fi
+
+  if [ -f $ROOT/install/doinst.sh ]; then
+    if [ "$MODE" = "install" ]; then
+      echo "Executing install script for $(basename $package)."
+    fi
+    ( cd $ROOT/ ; sh install/doinst.sh -install; )
+  fi 
+  # Clean up the mess...
+  if [ -d $ROOT/install ]; then
+    if [ -r $ROOT/install/doinst.sh ]; then
+      cp $ROOT/install/doinst.sh $ADM_DIR/scripts/$shortname
+      chmod 755 $ADM_DIR/scripts/$shortname
+    fi
+    # /install/doinst.sh and /install/slack-* are reserved locations for the package system.
+    ( cd $ROOT/install ; rm -f doinst.sh slack-* 1> /dev/null 2>&1 )
+    rmdir $ROOT/install 1> /dev/null 2>&1
+  fi
+  # If we used a scan directory, get rid of it:
+  if [ -d "$TMP/scan$$" ]; then
+    rm -rf "$TMP/scan$$"
+  fi
+  rm -f $TMP/tmpmsg$$ $TMP/reply$$
+  if [ "$MODE" = "install" ]; then
+    echo "Package $(basename $package) installed."
+    echo
+  fi
+done
+
+exit $EXITSTATUS
diff --git a/source/a/pkgtools/scripts/makebootdisk b/source/a/pkgtools/scripts/makebootdisk
new file mode 100644
index 000000000..86b843a8b
--- /dev/null
+++ b/source/a/pkgtools/scripts/makebootdisk
@@ -0,0 +1,444 @@
+#!/bin/sh
+# Copyright 1995, 1998, 2002, 2005  Patrick Volkerding, Moorhead, 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.
+#
+
+if [ ! "$UID" = "0" ]; then
+    echo "You need to be root to run this script."
+    exit 1
+fi
+
+# Was a kernel specified on the command line?
+if [ -r "$1" ]; then
+  KERNEL=$1
+  KMSG="Using kernel $KERNEL"
+else
+  KMSG="No kernel selected yet"
+fi
+
+# Make sure there's a proper temp directory:
+TMP=/var/log/setup/tmp
+# If the $TMP directory doesn't exist, create it:
+if [ ! -d $TMP ]; then
+  rm -rf $TMP # make sure it's not a symlink or something stupid
+  mkdir -p $TMP
+  chmod 700 $TMP # no need to leave it open
+fi
+
+ROOT_DEVICE="`mount | grep ' on / ' | cut -f 1 -d ' '`"
+
+if mount | grep ' on / ' | grep umsdos 1> /dev/null 2> /dev/null ; then
+ MOUNT="read-write"
+else
+ MOUNT="read-only"
+fi
+
+make_root_device() {
+# Make a device:
+makedev() {
+  if [ ! -b $1 ]; then
+    mknod $1 b $2 $3
+    chown root.disk $1
+    chmod 640 $1
+  fi  
+}
+
+# Make ide device
+# make ide major minor hd1 hd2 (2 base devs for major)
+make_ide() {
+  # Handle base devices:
+  if [ "$2" = "0" ]; then
+    makedev $TMP/lilo/dev/$3 $1 $2
+    return 0
+  elif [ "$2" = "64" ]; then
+    makedev $TMP/lilo/dev/$4 $1 $2
+    return 0
+  fi
+  # Must be a partition:
+  if [ "`expr $2 / 64`" = "0" ]; then
+    DEV=$3
+    NUM=$2
+  else
+    DEV=$4
+    NUM=`expr $2 - 64`
+  fi
+  makedev $TMP/lilo/dev/$DEV$NUM $1 $2
+}
+
+# Make SCSI device
+make_scsi() {
+  # find drive # 0 - 15
+  DRV=`expr $1 / 16`
+  NUM=`expr $1 % 16`
+  if [ "$NUM" = "0" ]; then
+    NUM=""
+  fi
+  if [ "$DRV" = "0" ]; then
+    makedev $TMP/lilo/dev/sda$NUM 8 $1
+  elif [ "$DRV" = "1" ]; then
+    makedev $TMP/lilo/dev/sdb$NUM 8 $1
+  elif [ "$DRV" = "2" ]; then
+    makedev $TMP/lilo/dev/sdc$NUM 8 $1
+  elif [ "$DRV" = "3" ]; then
+    makedev $TMP/lilo/dev/sdd$NUM 8 $1
+  elif [ "$DRV" = "4" ]; then
+    makedev $TMP/lilo/dev/sde$NUM 8 $1
+  elif [ "$DRV" = "5" ]; then
+    makedev $TMP/lilo/dev/sdf$NUM 8 $1
+  elif [ "$DRV" = "6" ]; then
+    makedev $TMP/lilo/dev/sdg$NUM 8 $1
+  elif [ "$DRV" = "7" ]; then
+    makedev $TMP/lilo/dev/sdh$NUM 8 $1
+  elif [ "$DRV" = "8" ]; then
+    makedev $TMP/lilo/dev/sdi$NUM 8 $1
+  elif [ "$DRV" = "9" ]; then
+    makedev $TMP/lilo/dev/sdj$NUM 8 $1
+  elif [ "$DRV" = "10" ]; then
+    makedev $TMP/lilo/dev/sdk$NUM 8 $1
+  elif [ "$DRV" = "11" ]; then
+    makedev $TMP/lilo/dev/sdl$NUM 8 $1
+  elif [ "$DRV" = "12" ]; then
+    makedev $TMP/lilo/dev/sdm$NUM 8 $1
+  elif [ "$DRV" = "13" ]; then
+    makedev $TMP/lilo/dev/sdn$NUM 8 $1
+  elif [ "$DRV" = "14" ]; then
+    makedev $TMP/lilo/dev/sdo$NUM 8 $1
+  elif [ "$DRV" = "15" ]; then
+    makedev $TMP/lilo/dev/sdp$NUM 8 $1
+  fi
+}
+
+if cat /proc/partitions | grep / 1> /dev/null 2> /dev/null ; then # new
+  cat /proc/partitions | grep / | while read line ; do
+    SMASHED_LINE=$line
+    MAJOR=`echo $SMASHED_LINE | cut -f 1 -d ' '`
+    MINOR=`echo $SMASHED_LINE | cut -f 2 -d ' '`
+    if [ "$MAJOR" = "3" ]; then
+      make_ide $MAJOR $MINOR hda hdb
+    elif [ "$MAJOR" = "8" ]; then
+      make_scsi $MINOR
+    elif [ "$MAJOR" = "22" ]; then
+      make_ide $MAJOR $MINOR hdc hdd
+    elif [ "$MAJOR" = "33" ]; then
+      make_ide $MAJOR $MINOR hde hdf
+    elif [ "$MAJOR" = "34" ]; then
+      make_ide $MAJOR $MINOR hdg hdh
+    elif [ "$MAJOR" = "56" ]; then
+      make_ide $MAJOR $MINOR hdi hdj
+    fi
+  done
+else # old format
+  cat /proc/partitions | grep d | while read line ; do
+    SMASHED_LINE=$line
+    MAJOR=`echo $SMASHED_LINE | cut -f 1 -d ' '`
+    MINOR=`echo $SMASHED_LINE | cut -f 2 -d ' '`
+    DEVNAME=`echo $SMASHED_LINE | cut -f 4 -d ' '`
+    makedev $TMP/lilo/dev/$DEVNAME $MAJOR $MINOR
+  done
+fi
+}
+
+choose_kernel() {
+while [ 0 ]; do # input loop
+cat << EOF > $TMP/tmpmsg
+
+Some possible paths to kernels are these: 
+
+/boot/vmlinuz 
+/usr/src/linux/arch/i386/boot/bzImage
+/usr/src/linux/arch/i386/boot/zImage
+/vmlinuz
+
+Put the path to the kernel you want to use in the box below.
+
+EOF
+
+ dialog --title "CHOOSE KERNEL" --inputbox "`cat $TMP/tmpmsg`" \
+ 16 72 "/boot/vmlinuz" 2> $TMP/return
+ if [ ! $? = 0 ]; then
+  exit
+ fi
+
+ KERNEL="`cat $TMP/return`"
+    
+ if [ ! -r "$KERNEL" ]; then  
+    dialog --title "NOT FOUND!" --msgbox "$KERNEL" 5 60
+    continue
+ fi
+ KMSG="Using kernel $KERNEL"
+break
+done
+}
+
+format_disk() {
+  # If anyone still uses 1.2 MB, you'll have to uncomment this.
+  # It's no longer a default option.
+  #FDEV=/dev/fd0h1200
+  #FDEV=/dev/fd0u1400
+  FDEV=/dev/fd0u1680
+  if [ "$FDEV" = "/dev/fd0u1680" ]; then
+   dialog --title "Formatting /dev/fd0u1680" --infobox \
+   "Formatting /dev/fd0, 1.68 megabytes." 3 42
+  elif [ "$FDEV" = "/dev/fd0u1400" ]; then
+   dialog --title "Formatting /dev/fd0u1440" --infobox \
+   "Formatting /dev/fd0, 1.44 megabytes." 3 42
+  elif [ "$FDEV" = "/dev/fd0h1200" ]; then
+   dialog --title "Formatting /dev/fd0h1200" --infobox \
+   "Formatting /dev/fd0, 1.2 megabytes." 3 42
+  fi
+  fdformat $FDEV 1> /dev/null 2> /dev/null
+  if [ ! $? = 0 ]; then
+    dialog --title "ERROR: FLOPPY FORMAT FAILED" --msgbox "The attempt to format the floppy \
+disk in /dev/fd0 has failed, probably due to bad media.  Please try again with a \
+different disk.  If that doesn't work, perhaps the drive needs cleaning." 0 0
+    return 1
+  fi
+}
+
+DEFAULT_ITEM="syslinux"
+
+while [ 0 ]; do # menu loop
+ dialog --title "MAKE BOOT FLOPPY FROM KERNEL" \
+--default-item $DEFAULT_ITEM \
+--backtitle "$KMSG" --menu "This menu allows you to make a SYSLINUX bootdisk \
+from a compiled kernel.  The SYSLINUX bootloader has the advantage of \
+using a FAT filesystem making it easy to replace the kernel later.  \
+Which option would you like?" 12 67 2 \
+"syslinux" "Make a SYSLINUX bootdisk" \
+"exit" "Exit this program" 2> $TMP/return
+ if [ ! $? = 0 ]; then
+  break;
+ fi
+ REPLY=`cat $TMP/return`
+ rm -f $TMP/return
+ if [ "$REPLY" = "simple" ]; then # make simple bootdisk
+  if [ "$KERNEL" = "" ]; then
+   choose_kernel
+  fi
+  kernel_size=`du -Lk $KERNEL | cut -f1`
+  if [ "$kernel_size" -gt "1023" ]; then
+cat << EOF > $TMP/tmpmsg
+
+The kernel $KERNEL is $kernel_size K (which is
+more than 1023 Kb in size), so it probably won't 
+boot standalone on the floppy.  Use the 'syslinux' 
+method instead.
+ 
+EOF
+   dialog --title "KERNEL TOO BIG!" --msgbox "`cat $TMP/tmpmsg`" 10 60
+   continue
+  fi
+  dialog --title "BOOT DISK CREATION" --backtitle "$KMSG" --yesno \
+"\n\
+Now put a formatted floppy in your boot drive. \n\
+This will be made into your Linux boot disk. Use this to\n\
+boot Linux until LILO has been configured to boot from\n\
+the hard drive.\n\n\
+Any data on the target disk will be destroyed.\n\n\
+YES creates the disk, NO aborts.\n" 14 62
+  if [ $? = 0 ]; then
+   format_disk
+   dialog --title "CREATING DISK" --infobox "Creating boot disk from $KERNEL..." 5 72
+   dd if=$KERNEL of=/dev/fd0 2> /dev/null
+   rdev /dev/fd0 $ROOT_DEVICE
+   rdev -v /dev/fd0 -1
+   if [ "$MOUNT" = "read-only" ]; then
+    rdev -R /dev/fd0 1
+   else
+    rdev -R /dev/fd0 0
+   fi
+  fi
+ elif [ "$REPLY" = "syslinux" ]; then # make syslinux bootdisk
+  DEFAULT_ITEM="exit"
+  if [ "$KERNEL" = "" ]; then
+   choose_kernel
+  fi
+  dialog --title "CREATING SYSLINUX BOOTDISK IN /dev/fd0" --backtitle "$KMSG" --yesno "Now put a \
+floppy in your boot drive.  This will be made into a SYSLINUX \
+bootdisk that you can use to start your Linux system.  Any data on the \
+target disk will be destroyed.  YES creates the disk, NO aborts." 8 62
+  if [ $? = 0 ]; then # make the disk
+   format_disk
+   if [ ! $? = 0 ]; then
+    continue
+   fi
+   dialog --title "CREATING BOOT FLOPPY" --infobox "Creating SYSLINUX bootdisk for \
+$ROOT_DEVICE in /dev/fd0." 3 64
+   mkdosfs -F 12 /dev/fd0u1680 1680 1> /dev/null 2> /dev/null
+   if [ ! -d $TMP/bootdisk ]; then
+    mkdir $TMP/bootdisk
+   fi
+   mount -t vfat /dev/fd0 $TMP/bootdisk 1> /dev/null 2> /dev/null
+   cp $KERNEL $TMP/bootdisk/vmlinuz
+   ## This avoids a syslinux-1.72 bug, and doesn't seem to hurt anything:
+   #dd if=/dev/zero bs=1k count=1 >> $TMP/bootdisk/vmlinuz 2> /dev/null
+   if [ ! "$?" = "0" ]; then
+     dialog --title "ERROR COPYING KERNEL TO FLOPPY" \
+     --msgbox "Sorry, but there was an error copying the kernel to the \
+floppy disk.  Possibly the kernel is too large to fit the disk.  \
+This program will now exit." 0 0
+     umount /dev/fd0
+     rm -rf $TMP/bootdisk
+     exit 1
+   fi
+   cat << EOF > $TMP/bootdisk/message.txt
+
+Welcome to the 09Slackware07 Linux custom bootdisk!
+
+By default, this disk boots a root Linux partition on $ROOT_DEVICE when you
+hit ENTER.  If you'd like to boot some other partition, use a command like
+this on the prompt below:
+
+    mount root=/dev/sda1 ro
+
+Where "/dev/sda1" is the partition you want to boot, and "ro" specifies that
+the partition should be initially mounted as read-only.  If you wish to mount
+the partition read-write, use "rw" instead.  To set the video console mode,
+use the vga= parameter (press F1 to see a table).  You may also add any other
+kernel parameters you might need depending on your hardware, and which
+drivers are included in your kernel.
+
+EOF
+   cat << EOF > $TMP/bootdisk/syslinux.cfg
+default vmlinuz ramdisk_size=7000 root=$ROOT_DEVICE vga=normal ro
+prompt 1
+timeout 6000
+display message.txt
+F1 f1.txt
+F2 message.txt
+#F3 f3.txt
+#F4 f4.txt
+#F5 f5.txt
+#F6 f6.txt
+#F7 f7.txt
+label mount
+  kernel vmlinuz
+  append ramdisk_size=7000 root=$ROOT_DEVICE vga=normal ro
+label ramdisk
+  kernel vmlinuz
+  append vmlinuz ramdisk_size=7000 root=/dev/fd0u1440 vga=normal rw
+EOF
+   cat << EOF > $TMP/bootdisk/f1.txt
+ STANDARD MODES:
+ To make the kernel prompt for standard video modes use: vga=ask
+
+ FRAMEBUFFER MODES:
+ To get the kernel to start in VESA framebuffer mode, you need to pass it
+ a vga= init string on the "boot:" prompt.  Here's a table:
+
+   Colors   640x480 800x600 1024x768 1280x1024 1600x1200
+  --------+---------------------------------------------
+  256     |   769     771      773      775       796
+  32,768  |   784     787      790      793       797
+  65,536  |   785     788      791      794       798
+  16.8M   |   786     789      792      795       799
+
+  ...such as this for 1024x768x64k:
+   vga=791
+
+  F2 returns to the previous page.
+
+EOF
+   umount /dev/fd0
+   syslinux-nomtools -s /dev/fd0
+   rm -r $TMP/bootdisk
+  fi
+ elif [ "$REPLY" = "lilo" ]; then # make lilo bootdisk
+  DEFAULT_ITEM="exit"
+  if [ ! -x "`type -path lilo`" ]; then
+cat << EOF > $TMP/tmpmsg
+
+You don't have 'lilo' installed on the system.
+I guess you didn't install the lilo package.
+ 
+EOF
+   dialog --title "LILO NOT FOUND" --msgbox "`cat $TMP/tmpmsg`" 8 60
+   continue
+  fi
+  if [ "$KERNEL" = "" ]; then
+   choose_kernel
+  fi
+  dialog --title "CREATING LILO BOOTDISK IN /dev/fd0" --backtitle "$KMSG" --yesno "Now put a \
+floppy in your boot drive.  This will be made into a LILO \
+bootdisk that you can use to start your Linux system.  Any data on the \
+target disk will be destroyed.  YES creates the disk, NO aborts." 8 62
+  if [ $? = 0 ]; then # make the disk
+   format_disk
+   DEV=/dev/fd0u1680
+   mknod_fd="-m 0640 $TMP/lilo$DEV b 2 44"
+   dialog --infobox "Creating LILO bootdisk from $KERNEL for $ROOT_DEVICE..." 4 60
+   mke2fs -q -m 0 -i 4096 $DEV 1> /dev/null 2> /dev/null || exit 1
+   if [ ! -d $TMP/lilo ]; then
+    mkdir -p $TMP/lilo
+   fi
+   mount -t ext2 $DEV $TMP/lilo 1> /dev/null || exit 1
+   rmdir $TMP/lilo/lost+found
+   cp $KERNEL $TMP/lilo/vmlinuz || exit 1
+   mkdir $TMP/lilo/dev
+   make_root_device
+   mknod -m 0640 $TMP/lilo/dev/fd0 b 2 0
+   mknod -m 0640 $TMP/lilo/dev/fd1 b 2 1
+   mknod $mknod_fd
+   mknod -m 0666 $TMP/lilo/dev/null c 1 3
+   mkdir $TMP/lilo/etc
+   cat << EOF > $TMP/lilo/etc/lilo.conf
+boot = $DEV
+message=/boot/message
+backup=/dev/null
+prompt
+image = /vmlinuz
+        label = mount
+        ramdisk = 0
+        root = $ROOT_DEVICE
+        vga = normal
+        $MOUNT
+EOF
+   mkdir $TMP/lilo/boot
+   cp -a /boot/chain.b $TMP/lilo/boot
+   if [ -f /boot/boot-text.b ]; then
+   cp -a /boot/boot-text.b $TMP/lilo/boot/boot.b
+   else
+   cp -a /boot/boot.b $TMP/lilo/boot
+   fi   
+   cat << EOF > $TMP/lilo/boot/message
+
+Welcome to the Slackware Linux custom LILO bootdisk!  
+
+By default, this disk boots a root Linux partition on $ROOT_DEVICE when
+you hit ENTER.  If you'd like to boot some other partition, use a command
+like this on the LILO prompt below:
+
+    mount root=/dev/sda1 ro
+
+Where "/dev/sda1" is the partition you want to boot, and "ro" specifies that
+the partition should be initially mounted as read-only.  If you which to mount
+the partition read-write, use "rw" instead.  You may also add any other kernel
+parameters you might need depending on your hardware, and which drivers are
+included in your kernel.
+
+EOF
+   lilo -r $TMP/lilo > /dev/null
+   umount $TMP/lilo
+   rm -rf $TMP/lilo
+  fi
+ elif [ "$REPLY" = "exit" ]; then
+  break;
+ fi
+done
diff --git a/source/a/pkgtools/scripts/makepkg b/source/a/pkgtools/scripts/makepkg
new file mode 100644
index 000000000..e6805476a
--- /dev/null
+++ b/source/a/pkgtools/scripts/makepkg
@@ -0,0 +1,347 @@
+#!/bin/sh
+# Copyright 1994, 1998, 2008  Patrick Volkerding, Moorhead, Minnesota USA 
+# Copyright 2003  Slackware Linux, Inc.  Concord, CA USA
+# Copyright 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.
+#
+# Sun Apr  5 21:23:26 CDT 2009
+# Support .tgz, .tbz, .tlz, and .txz packages.  <volkerdi>
+#
+# Wed Mar 18 15:32:33 CST 1998
+# Patched to avoid possible symlink attacks in /tmp.
+
+CWD=$(pwd)
+
+TAR=tar-1.13
+umask 022
+$TAR --help 1> /dev/null 2> /dev/null
+if [ ! $? = 0 ]; then
+  TAR=tar
+fi
+if [ ! "$(LC_MESSAGES=C $TAR --version)" = "tar (GNU tar) 1.13
+
+Copyright (C) 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+Written by John Gilmore and Jay Fenlason." ]; then
+  echo "WARNING: pkgtools are unstable with tar > 1.13."
+  echo "         You should provide a \"tar-1.13\" in your \$PATH."
+  sleep 5
+fi
+
+make_install_script() {
+  COUNT=1
+  LINE="$(sed -n "$COUNT p" $1)"
+  while [ ! "$LINE" = "" ]; do
+   LINKGOESIN="$(echo "$LINE" | cut -f 1 -d " ")" 
+   LINKGOESIN="$(dirname $LINKGOESIN)" 
+   LINKNAMEIS="$(echo "$LINE" | cut -f 1 -d ' ')"
+   LINKNAMEIS="$(basename "$LINKNAMEIS")"
+   LINKPOINTSTO="$(echo "$LINE" | cut -f 3 -d ' ')"
+   echo "( cd $LINKGOESIN ; rm -rf $LINKNAMEIS )"
+   echo "( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS )"
+   COUNT=$(expr $COUNT + 1)
+   LINE="$(sed -n "$COUNT p" $1)"
+  done
+}
+
+usage() {
+  cat << EOF
+
+Usage: makepkg package_name.tgz
+       (or: package_name.tbz, package_name.tlz, package_name.txz)
+
+Makes a Slackware compatible package containing the contents of the current
+and all subdirectories.  If symbolic links exist, they will be removed and
+an installation script will be made to recreate them later. This script will
+be called "install/doinst.sh". You may add any of your own ash-compatible
+shell scripts to this file and rebuild the package if you wish.
+
+options:  -l, --linkadd y|n (moves symlinks into doinst.sh: recommended)
+          -p, --prepend (prepend rather than append symlinks to an existing
+                         doinst.sh.  Useful to link libraries needed by
+                         programs in the doinst.sh script)
+          -c, --chown y|n (resets all permissions to root:root 755
+                           - not generally recommended)
+
+If these options are not set, makepkg will prompt as appropriate.
+EOF
+}
+
+TMP=/tmp # This can be a hole, but I'm going to be careful about file
+         # creation in there, so don't panic. :^)
+
+# Parse options
+while [ 0 ]; do
+  if [ "$1" = "--linkadd" -o "$1" = "-l" ]; then
+    if [ "$2" = "y" ]; then
+      LINKADD=y
+    elif [ "$2" = "n" ]; then
+      LINKADD=n
+    else
+      usage
+      exit 2
+    fi
+    shift 2
+  elif [ "$1" = "--chown" -o "$1" = "-c" ]; then
+    if [ "$2" = "y" ]; then
+      CHOWN=y
+    elif [ "$2" = "n" ]; then
+      CHOWN=n
+    else
+      usage
+      exit 2
+    fi
+    shift 2
+  elif [ "$1" = "-p" -o "$1" = "--prepend" ]; then
+    PREPEND=y
+    shift 1
+  elif [ "$1" = "-h" -o "$1" = "-H" -o "$1" = "--help" -o $# = 0 ]; then
+    usage
+    exit 0
+  else
+    break
+  fi
+done
+
+PACKAGE_NAME="$1"
+TARGET_NAME="$(dirname $PACKAGE_NAME)"
+PACKAGE_NAME="$(basename $PACKAGE_NAME)"
+
+# Identify package extension:
+if [ ! "$(basename $PACKAGE_NAME .tgz)" = "$PACKAGE_NAME" ]; then
+  EXTENSION="tgz"
+elif [ ! "$(basename $PACKAGE_NAME .tar.gz)" = "$PACKAGE_NAME" ]; then
+  # .tar.compression is also supported, although the resulting "packages" will
+  # not be installable by installpkg without the correct 3 letter extension
+  # instead.
+  EXTENSION="tar.gz"
+elif [ ! "$(basename $PACKAGE_NAME .tbz)" = "$PACKAGE_NAME" ]; then
+  EXTENSION="tbz"
+elif [ ! "$(basename $PACKAGE_NAME .tar.bz2)" = "$PACKAGE_NAME" ]; then
+  EXTENSION="tar.bz2"
+elif [ ! "$(basename $PACKAGE_NAME .tlz)" = "$PACKAGE_NAME" ]; then
+  EXTENSION="tlz"
+elif [ ! "$(basename $PACKAGE_NAME .tar.lzma)" = "$PACKAGE_NAME" ]; then
+  EXTENSION="tar.lzma"
+elif [ ! "$(basename $PACKAGE_NAME .txz)" = "$PACKAGE_NAME" ]; then
+  EXTENSION="txz"
+elif [ ! "$(basename $PACKAGE_NAME .tar.xz)" = "$PACKAGE_NAME" ]; then
+  EXTENSION="tar.xz"
+else
+  EXTENSION="$(echo $PACKAGE_NAME | rev | cut -f 1 -d . | rev)"
+  echo "ERROR:  Package extension .$EXTENSION is not supported."
+  exit 1
+fi
+
+TAR_NAME="$(basename $PACKAGE_NAME .$EXTENSION)"
+
+# Sanity check -- we can't make the package in the current directory:
+if [ "$CWD" = "$TARGET_NAME" -o "." = "$TARGET_NAME" ]; then
+  echo "ERROR: Can't make output package in current directory."
+  exit 2
+fi
+
+# Make sure external compression utility is available:
+case $EXTENSION in
+'tgz' | 'tar.gz' )
+  if ! which gzip 1> /dev/null 2> /dev/null ; then
+    echo "ERROR:  gzip compression utility not found in \$PATH."
+    exit 3
+  fi
+  ;;
+'tbz' | 'tar.bz2' )
+  if ! which bzip2 1> /dev/null 2> /dev/null ; then
+    echo "ERROR:  bzip2 compression utility not found in \$PATH."
+    exit 3
+  fi
+  ;;
+'tlz' | 'tar.lzma' )
+  if ! which lzma 1> /dev/null 2> /dev/null ; then
+    echo "ERROR:  lzma compression utility not found in \$PATH."
+    exit 3
+  fi
+  ;;
+'txz' | 'tar.xz' )
+  if ! which xz 1> /dev/null 2> /dev/null ; then
+    echo "ERROR:  xz compression utility not found in \$PATH."
+    exit 3
+  fi
+  ;;
+esac
+
+echo
+echo "Slackware package maker, version 3.14159."
+echo
+echo "Searching for symbolic links:"
+# Get rid of possible pre-existing trouble:
+INST=$(mktemp $TMP/makepkg.XXXXXX)
+# This requires the ls from coreutils-5.0 (or newer):
+find . -type l -exec ls -l --time-style=long-iso {} \; | while read foo ; do echo $foo ; done | cut -f 8- -d ' ' | cut -b3- | tee $INST
+if [ ! "$(cat $INST)" = "" ]; then
+  echo
+  echo "Making symbolic link creation script:"
+  make_install_script $INST | tee doinst.sh
+fi
+echo
+if [ ! "$(cat $INST)" = "" ]; then
+  if [ -r install/doinst.sh ]; then
+    echo "Unless your existing installation script already contains the code"
+    echo "to create these links, you should append these lines to your existing"
+    echo "install script. Now's your chance. :^)"
+    echo
+    echo "Would you like to add this stuff to the existing install script and"
+    echo -n "remove the symbolic links ([y]es, [n]o)? "
+  else
+    echo "It is recommended that you make these lines your new installation script."
+    echo
+    echo "Would you like to make this stuff the install script for this package"
+    echo -n "and remove the symbolic links ([y]es, [n]o)? "
+  fi
+  if [ ! "$LINKADD" ]; then
+    read LINKADD;
+    echo
+  else
+    echo $LINKADD
+    echo
+  fi
+  if [ "$LINKADD" = "y" ]; then
+    if [ -r install/doinst.sh ]; then
+      UPDATE="t"
+      if [ "$PREPEND" = "y" ]; then
+        touch install/doinst.sh
+        mv install/doinst.sh install/doinst.sh.shipped
+        cat doinst.sh > install/doinst.sh
+        echo "" >> install/doinst.sh
+        cat install/doinst.sh.shipped >> install/doinst.sh
+        rm -f install/doinst.sh.shipped
+      else
+        cat doinst.sh >> install/doinst.sh
+      fi
+    else
+      mkdir -p install
+      cat doinst.sh > install/doinst.sh
+    fi
+    echo
+    echo "Removing symbolic links:"
+    find . -type l -exec rm -v {} \;
+    echo
+    if [ "$UPDATE" = "t" ]; then
+      if [ "$PREPEND" = "y" ]; then
+        echo "Updating your ./install/doinst.sh (prepending symlinks)..."
+      else
+        echo "Updating your ./install/doinst.sh..."
+      fi
+    else
+      echo "Creating your new ./install/doinst.sh..."
+    fi
+  fi
+else
+  echo "No symbolic links were found, so we won't make an installation script."
+  echo "You can make your own later in ./install/doinst.sh and rebuild the"
+  echo "package if you like."
+fi
+rm -f doinst.sh $INST
+echo
+echo "This next step is optional - you can set the directories in your package"
+echo "to some sane permissions. If any of the directories in your package have"
+echo "special permissions, then DO NOT reset them here!"
+echo 
+echo "Would you like to reset all directory permissions to 755 (drwxr-xr-x) and"
+echo -n "directory ownerships to root.root ([y]es, [n]o)? "
+if [ ! "$CHOWN" ]; then
+  read CHOWN;
+  echo
+else
+  echo $CHOWN
+  echo
+fi
+if [ "$CHOWN" = "y" ]; then
+  find . -type d -exec chmod -v 755 {} \; 
+  find . -type d -exec chown -v root.root {} \;
+fi
+
+echo "Creating Slackware package:  ${TARGET_NAME}/${TAR_NAME}.${EXTENSION}"
+echo
+rm -f ${TARGET_NAME}/${TAR_NAME}.${EXTENSION}
+case $EXTENSION in
+'tgz' | 'tar.gz' )
+  $TAR cvf - . | gzip -9c > ${TARGET_NAME}/${TAR_NAME}.${EXTENSION}
+  ERRCODE=$?
+  if [ ! $? = 0 ]; then
+    echo "ERROR:  gzip returned error code $? -- makepkg failed."
+  fi
+  ;;
+'tbz' | 'tar.bz2' )
+  $TAR cvf - . | bzip2 -9c > ${TARGET_NAME}/${TAR_NAME}.${EXTENSION}
+  ERRCODE=$?
+  if [ ! $ERRCODE = 0 ]; then
+    echo "ERROR:  bzip2 returned error code $ERRCODE -- makepkg failed."
+  fi
+  ;;
+'tlz' | 'tar.lzma' )
+  $TAR cvf - . | lzma -c > ${TARGET_NAME}/${TAR_NAME}.${EXTENSION}
+  ERRCODE=$?
+  if [ ! $ERRCODE = 0 ]; then
+    echo "ERROR:  lzma returned error code $ERRCODE -- makepkg failed."
+  fi
+  ;;
+'txz' | 'tar.xz' )
+  $TAR cvf - . | xz -c > ${TARGET_NAME}/${TAR_NAME}.${EXTENSION}
+  ERRCODE=$?
+  if [ ! $ERRCODE = 0 ]; then
+    echo "ERROR:  xz returned error code $ERRCODE -- makepkg failed."
+  fi
+  ;;
+esac
+
+# Warn of zero-length files:
+find . -type f -size 0c | while read file ; do
+  echo "WARNING:  zero length file $(echo $file | cut -b3-)"
+done
+
+# Warn of corrupt or empty gzip files:
+find . -type f -name '*.gz' | while read file ; do
+  if ! gzip -t $file 1> /dev/null 2> /dev/null ; then
+    echo "WARNING:  gzip test failed on $(echo $file | cut -b3-)"
+  else
+    if [ "$(gzip -l $file | tail -n 1 | tr -s ' ' | cut -f 3 -d ' ')" -eq 0 ]; then
+      echo "WARNING:  $(echo $file | cut -b3-) is an empty gzipped file"
+    fi
+  fi
+done
+
+# Some more handy warnings:
+if [ -d usr/share/man ]; then
+  echo "WARNING:  /usr/share/man (with possibly not gzipped man pages) detected"
+fi
+
+if [ -d usr/share/info ]; then
+  echo "WARNING:  /usr/share/info (with possibly not gzipped info pages) detected"
+fi
+
+if find . | grep site_perl 1> /dev/null ; then
+  echo "WARNING:  site_perl directory detected (this is fine for a local package build)"
+fi
+
+echo
+echo "Slackware package ${TARGET_NAME}/${TAR_NAME}.${EXTENSION} created."
+echo
diff --git a/source/a/pkgtools/scripts/pkgtool b/source/a/pkgtools/scripts/pkgtool
new file mode 100644
index 000000000..6191e36e7
--- /dev/null
+++ b/source/a/pkgtools/scripts/pkgtool
@@ -0,0 +1,754 @@
+#!/bin/sh
+#
+# Copyright 1993, 1994, 1995, 1996, 1997,
+#    1998, 1999  Patrick Volkerding,  Moorhead, MN  USA
+# Copyright 2001, 2004  Slackware Linux, Inc.,  Concord, CA  USA
+#    All rights reserved.
+# Copyright 2007, 2009  Patrick Volkerding, Sebeka, MN, USA
+#
+# 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.
+#
+
+# Sat Apr 25 21:18:53 UTC 2009
+# Converted to use new pkgbase() function to remove pathname and
+# valid package extensions.
+#
+# Wed Oct 31 16:28:46 CDT 2007
+#  * Thanks to Gabriele Inghirami for a patch allowing this script to work
+#    with much larger numbers of installed packages.
+# Wed, 27 Apr 1994 00:06:50 -0700 (PDT)
+#  * Optimization by David Hinds.
+# Sun Oct 24 23:11:40 BST 2004
+#  * Further optimisations by Jim Hawkins <jawkins@armedslack.org>
+#    - dramatically improved the speed of the "View" option
+# Thu Nov 04 12:19:56 BST 2004
+#  * More optimisations by Jim Hawkins
+#    - improved "Remove" speed in a similar manner to "View"
+# Wed Jan 12 16:53:48 GMT 2005
+#  * Fixed quoting bug thanks to Lasse Collin
+# Wed Jan 26 23:06:22 GMT 2005
+#  * Fix for non-standard package descriptions by Jim Hawkins
+
+# Return a package name that has been stripped of the dirname portion
+# and any of the valid extensions (only):
+pkgbase() {
+  PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
+  case $PKGEXT in
+  'tgz' )
+    PKGRETURN=$(basename $1 .tgz)
+    ;;
+  'tbz' )
+    PKGRETURN=$(basename $1 .tbz)
+    ;;
+  'tlz' )
+    PKGRETURN=$(basename $1 .tlz)
+    ;;
+  'txz' )
+    PKGRETURN=$(basename $1 .txz)
+    ;;
+  *)
+    PKGRETURN=$(basename $1)
+    ;;
+  esac
+  echo $PKGRETURN
+}
+
+SOURCE_DIR=/var/log/mount
+ASK="tagfiles"
+if [ -L /bin/chmod -a -L /bin/chown ]; then # probably on the bootdisk using busybox
+ TARGET_DIR=/mnt
+ TMP=/mnt/var/log/setup/tmp
+ if mount | grep "on /mnt" 1> /dev/null 2>&1 ; then # good
+  true
+ else # bad
+  echo
+  echo
+  echo "You can't run pkgtool from the rootdisk until you've mounted your Linux"
+  echo "partitions beneath /mnt. Here are some examples of this:"
+  echo
+  echo "If your root partition is /dev/hda1, and is using ext2fs, you would type:"
+  echo "mount /dev/hda1 /mnt -t ext2"
+  echo
+  echo "Then, supposing your /usr partition is /dev/hda2, you must do this:"
+  echo "mount /dev/hda2 /mnt/usr -t ext2"
+  echo
+  echo "Please mount your Linux partitions and then run pkgtool again."
+  echo
+  exit
+ fi
+else
+ TARGET_DIR=/
+ TMP=/var/log/setup/tmp
+fi
+if [ ! -d $TMP ]; then
+ mkdir -p $TMP
+ chmod 700 $TMP
+ fi
+ADM_DIR=$TARGET_DIR/var/log
+LOG=$TMP/PKGTOOL.REMOVED
+
+# remove whitespace
+crunch() {
+  while read FOO ; do
+    echo $FOO
+  done
+}
+
+package_name() {
+  STRING=$(pkgbase $1)
+  # Check for old style package name with one segment:
+  if [ "$(echo $STRING | cut -f 1 -d -)" = "$(echo $STRING | cut -f 2 -d -)" ]; then
+    echo $STRING
+  else # has more than one dash delimited segment
+    # Count number of segments:
+    INDEX=1
+    while [ ! "$(echo $STRING | cut -f $INDEX -d -)" = "" ]; do
+      INDEX=$(expr $INDEX + 1)
+    done
+    INDEX=$(expr $INDEX - 1) # don't include the null value
+    # If we don't have four segments, return the old-style (or out of spec) package name:
+    if [ "$INDEX" = "2" -o "$INDEX" = "3" ]; then
+      echo $STRING
+    else # we have four or more segments, so we'll consider this a new-style name:
+      NAME=$(expr $INDEX - 3)
+      NAME="$(echo $STRING | cut -f 1-$NAME -d -)"
+      echo $NAME
+      # cruft for later ;)
+      #VER=$(expr $INDEX - 2)
+      #VER="$(echo $STRING | cut -f $VER -d -)"
+      #ARCH=$(expr $INDEX - 1)
+      #ARCH="$(echo $STRING | cut -f $ARCH -d -)"
+      #BUILD="$(echo $STRING | cut -f $INDEX -d -)"
+    fi
+  fi
+}
+
+remove_packages() {
+ for pkg_name in $(cat $TMP/return | tr -d "\042")
+ do
+  if [ -r $ADM_DIR/packages/$pkg_name ]; then
+   dialog --title "PACKAGE REMOVAL IN PROGRESS" --cr-wrap --infobox \
+"\nRemoving package $pkg_name.\n\
+\n\
+Since each file must be checked \
+against the contents of every other installed package to avoid wiping out \
+areas of overlap, this process can take quite some time. If you'd like to \
+watch the progress, flip over to another virtual console and type:\n\
+\n\
+tail -f $TMP/PKGTOOL.REMOVED\n" 13 60
+   export ROOT=$TARGET_DIR
+   removepkg $pkg_name >> $LOG 2> /dev/null
+  else
+   echo "No such package: $pkg_name. Can't remove." >> $LOG
+  fi
+ done
+}
+
+create_list_of_installed_packages()
+{
+    	FILES=$(ls $ADM_DIR/packages)
+      if [ -n "$FILES" ]; then
+      cd $ADM_DIR/packages
+      { grep '^PACKAGE DESCRIPTION:$' -Z -H -m1 -A1 $FILES; echo; } \
+      | sed -n 'h;n;/\x00/{h;n;};x;s/  */ /g;s/ $//;s/[\"`$]/\\&/g
+       s/\(.*\)\x00\([^:]*:\)\? *\(.*\)/ "\1" "\3" "View information about package \1" \\/;p' > $TMP/list_of_installed_packages \
+
+      fi
+}
+
+  create_list_of_files_to_remove ()
+{
+FILES=$(ls $ADM_DIR/packages)
+     if [ -n "$FILES" ]; then
+       cd $ADM_DIR/packages
+       { grep '^PACKAGE DESCRIPTION:$' -Z -H -m1 -A1 $FILES; echo; } \
+       | sed -n 'h;n;/\x00/{h;n;};x;s/  */ /g;s/ $//;s/[\"`$]/\\&/g
+           s/\(.*\)\x00\([^:]*:\)\? *\(.*\)/ "\1" "\3" off "Select\/Unselect removing package \1" \\/;p' > $TMP/temporary_list \
+     
+   fi
+}
+
+# Here, we read the list of arguments passed to the pkgtool script.
+if [ $# -gt 0 ]; then # there are arguments to the command
+ while [ $# -gt 0 ]; do
+  case "$1" in
+  -sets | --sets)
+   DISK_SETS=$(echo $2 | tr "[A-Z]" "[a-z]") ; shift 2 ;;
+  -source_mounted | --source-mounted)
+   SOURCE_MOUNTED="always" ; shift 1 ;;
+  -ignore_tagfiles | --ignore-tagfiles)
+   ASK="never" ; shift 1 ;;
+  -tagfile | --tagfile)
+   USETAG=$2 ; shift 2 ;;
+  -source_dir | --source_dir)
+   SOURCE_DIR=$2 ; shift 2 ;;
+  -target_dir | --target_dir)
+   TARGET_DIR=$2
+   ADM_DIR=$TARGET_DIR/var/log
+   shift 2 ;;
+  -source_device | --source_device)
+   SOURCE_DEVICE=$2 ; shift 2 ;;
+  esac
+ done
+else  # there were no arguments, so we'll get the needed information from the
+      # user and then go on.
+ CMD_START="true"
+ rm -f $TMP/SeT*
+ while [ 0 ]; do
+  dialog --title "Slackware Package Tool (pkgtool version 13.0)" \
+--menu "\nWelcome to the Slackware package tool.\n\
+\nWhich option would you like?\n" 17 75 7 \
+"Current" "Install packages from the current directory" \
+"Other" "Install packages from some other directory" \
+"Floppy" "Install packages from floppy disks" \
+"Remove" "Remove packages that are currently installed" \
+"View" "View the list of files contained in a package" \
+"Setup" "Choose Slackware installation scripts to run again" \
+"Exit" "Exit Pkgtool" 2> $TMP/reply
+  if [ ! $? = 0 ]; then
+   rm -f $TMP/reply
+   dialog --clear
+   exit
+  fi
+  REPLY="$(cat $TMP/reply)"
+  rm -f $TMP/reply
+  if [ "$REPLY" = "Exit" ]; then
+   dialog --clear
+   exit
+  fi
+  if [ "$REPLY" = "Setup" ]; then
+    echo 'dialog --title "SELECT SYSTEM SETUP SCRIPTS" --item-help --checklist \
+    "Please use the spacebar to select the setup scripts to run.  Hit enter when you \
+are done selecting to run the scripts." 17 70 9 \' > $TMP/setupscr
+    for script in $ADM_DIR/setup/setup.* ; do
+      BLURB=$(grep '#BLURB' $script | cut -b8-)
+      if [ "$BLURB" = "" ]; then
+        BLURB="\"\""
+      fi
+      echo " \"$(basename $script | cut -f2- -d .)\" $BLURB \"no\" $BLURB \\" >> $TMP/setupscr 
+    done
+    echo "2> $TMP/return" >> $TMP/setupscr
+    . $TMP/setupscr
+    if [ ! "$(cat $TMP/return)" = "" ]; then
+      # Run each script:
+      for script in $(cat $TMP/return) ; do
+        scrpath=$ADM_DIR/setup/setup.$(echo $script | tr -d \")
+        rootdevice="$(mount | head -n 1 | cut -f 1 -d ' ')"
+        ( COLOR=on ; cd $TARGET_DIR ; . $scrpath / $rootdevice )
+      done
+    fi
+    rm -f $TMP/return $TMP/setupscr
+    continue
+  fi # end Setup
+
+  if [ "$REPLY" = "View" ]; then
+create_list_of_installed_packages
+   DEFITEM=""
+   export DEFITEM
+   #dialog --title "SCANNING" --infobox "Please wait while \
+#Pkgtool scans your system to determine which packages you have \
+#installed and prepares a list for you." 0 0
+   (
+     echo 'dialog $DEFITEM --item-help --menu "Please select the package you wish to view." 17 68 10 \
+     --file $TMP/list_of_installed_packages \'
+     echo "2> $TMP/return"
+   ) > $TMP/viewscr
+   while [ 0 ]; do
+    . $TMP/viewscr
+    if [ ! "$(cat $TMP/return)" = "" ]; then
+     DEFITEM="--default-item $(cat $TMP/return)"
+     dialog --title "CONTENTS OF PACKAGE: $(cat $TMP/return)" --no-shadow --textbox "$ADM_DIR/packages/$(cat $TMP/return)" \
+     0 0 2> /dev/null
+    else
+     break 
+    fi
+   done
+   rm -f $TMP/return $TMP/viewscr $TMP/tmpmsg $TMP/list_of_installed_packages
+   # This will clean up after most defective packages:
+   chmod 755 /
+   chmod 1777 /tmp
+   continue
+  fi  
+
+  if [ "$REPLY" = "Remove" ]; then
+   #dialog --title "SCANNING" --infobox "Please wait while Pkgtool scans \
+#your system to determine which packages you have installed and prepares \
+#a list for you." 0 0
+   # end section
+   (
+create_list_of_files_to_remove #call the function to create a list of installed packages
+     cat << EOF
+dialog --title "SELECT PACKAGES TO REMOVE" --item-help --checklist \
+"Please select the \
+packages you wish to Remove. Use the \
+spacebar to select packages to delete, and the UP/DOWN arrow keys to \
+scroll up and down through the entire list." 20 75 11 \
+--file $TMP/temporary_list \\
+EOF
+     echo "2> $TMP/return"
+   ) > $TMP/rmscript
+   if [ -L $LOG -o -r $LOG ]; then
+     rm -f $LOG
+   fi
+   cat /dev/null > $LOG
+   chmod 600 $LOG
+   chmod 700 $TMP/rmscript
+   export ADM_DIR;
+   $TMP/rmscript
+   remove_packages
+   if [ "$(cat $TMP/PKGTOOL.REMOVED)" = "" ]; then
+    rm -f $TMP/PKGTOOL.REMOVED
+    dialog --title "NO PACKAGES REMOVED" --msgbox "Hit OK to return \
+to the main menu." 5 40
+   else
+    dialog --title "PACKAGE REMOVAL COMPLETE" --msgbox "The packages have \
+been removed. A complete log of the files that were removed has been created \
+in $TMP: PKGTOOL.REMOVED." 0 0
+   fi
+   rm -f $TMP/rmscript $TMP/return $TMP/tmpmsg $TMP/SeT* $TMP/temporary_list
+   chmod 755 /
+   chmod 1777 /tmp
+# No, return to the main menu:
+#   exit
+  elif [ "$REPLY" = "Floppy" ]; then
+   dialog --title "SELECT FLOPPY DRIVE" --menu "Which floppy drive would \
+you like to install from?" \
+11 70 4 \
+"/dev/fd0u1440" "1.44 MB first floppy drive" \
+"/dev/fd1u1440" "1.44 MB second floppy drive" \
+"/dev/fd0h1200" "1.2 MB first floppy drive" \
+"/dev/fd1h1200" "1.2 MB second floppy drive" 2> $TMP/wdrive
+   if [ $? = 1 ]; then
+    dialog --clear
+    exit
+   fi
+   SOURCE_DEVICE="$(cat $TMP/wdrive)"
+   rm -f $TMP/wdrive 
+   cat << EOF > $TMP/tmpmsg
+
+Enter the names of any disk sets you would like to install.
+Separate the sets with a space, like this: a b oi x
+
+To install packages from one disk, hit [enter] without typing
+anything.
+
+EOF
+   dialog --title "SOFTWARE SELECTION" --inputbox "$(cat $TMP/tmpmsg)" 13 70 2> $TMP/sets 
+   DISK_SETS="$(cat $TMP/sets)"
+   rm -f $TMP/sets
+   if [ "$DISK_SETS" = "" ]; then
+    DISK_SETS="disk"
+   else
+    DISK_SETS=$(echo $DISK_SETS | sed 's/ /#/g')
+    DISK_SETS="#$DISK_SETS"
+   fi
+   break;
+  elif [ "$REPLY" = "Other" ]; then
+   dialog --title "SELECT SOURCE DIRECTORY" --inputbox "Please enter the name of the directory that you wish to \
+install packages from:" 10 50 2> $TMP/pkgdir
+   if [ $? = 1 ]; then
+    rm -f $TMP/pkgdir $TMP/SeT*
+    dialog --clear
+    exit
+   fi 
+   SOURCE_DIR="$(cat $TMP/pkgdir)"
+   SOURCE_MOUNTED="always"
+   DISK_SETS="disk" 
+   chmod 755 $TARGET_DIR
+   chmod 1777 $TARGET_DIR/tmp
+   rm -f $TMP/pkgdir
+   if [ ! -d $SOURCE_DIR ]; then
+    dialog --title "DIRECTORY NOT FOUND" --msgbox "The directory you want to \
+install from ($SOURCE_DIR) \
+does not seem to exist. Please check the directory and then try again." \
+10 50
+    dialog --clear
+    exit
+   fi
+   break;
+  else # installing from current directory
+   SOURCE_MOUNTED="always"
+   SOURCE_DIR="$PWD"
+   DISK_SETS="disk" 
+   chmod 755 $TARGET_DIR
+   chmod 1777 $TARGET_DIR/tmp
+   break;
+  fi 
+ done
+fi
+if [ "$DISK_SETS" = "disk" ]; then
+ ASK="always"
+fi
+
+mount_the_source() {
+ # is the source supposed to be mounted already?
+ if [ "$SOURCE_MOUNTED" = "always" ]; then
+  # The source should already be mounted, so we test it
+  if [ ! -d $SOURCE_DIR ]; then # the directory is missing
+   cat << EOF > $TMP/tmpmsg
+
+Your source device cannot be accessed properly.
+
+Please be sure that it is mounted on $SOURCE_DIR,
+and that the Slackware disks are found in subdirectories 
+of $SOURCE_DIR like specified.
+
+EOF
+   dialog --title "MOUNT ERROR" --msgbox "$(cat $TMP/tmpmsg)" 11 67
+   rm -f $TMP/tmpmsg
+   exit 1;
+  fi
+  return 0;
+ fi
+ dialog --title "INSERT DISK" --menu "Please insert disk $1 and \
+press ENTER to continue." \
+11 50 3 \
+"Continue" "Continue with the installation" \
+"Skip" "Skip the current disk series" \
+"Quit" "Abort the installation process" 2> $TMP/reply
+ if [ ! $? = 0 ]; then
+  REPLY="Quit"
+ else
+  REPLY="$(cat $TMP/reply)"
+ fi
+ rm -f $TMP/reply
+ if [ "$REPLY" = "Skip" ]; then
+  return 1;
+ fi
+ if [ "$REPLY" = "Quit" ]; then
+   dialog --title "ABORTING" --msgbox "Aborting software installation." 5 50
+   chmod 755 $TARGET_DIR
+   chmod 1777 $TARGET_DIR/tmp
+   exit 1;
+ fi;
+ # Old line:
+ # mount -r -t msdos $SOURCE_DEVICE $SOURCE_DIR
+ # New ones: (thanks to Andy Schwierskott!)
+ go_on=y
+ not_successfull_mounted=1
+ while [ "$go_on" = y -a "$not_successfull_mounted" = 1 ]; do
+  mount -r -t msdos $SOURCE_DEVICE $SOURCE_DIR
+  not_successfull_mounted=$?
+  if [ "$not_successfull_mounted" = 1 ]; then
+   mount_answer=x
+   while [ "$mount_answer" != "y" -a "$mount_answer" != "q" ] ; do
+    dialog --title "MOUNT PROBLEM" --menu "Media was not successfully \
+mounted! Do you want to \
+retry, or quit?" 10 60 2 \
+"Yes" "Try to mount the disk again" \
+"No" "No, abort." 2> $TMP/mntans
+    mount_answer="$(cat $TMP/mntans)"
+    rm -f $TMP/mntans
+    if [ "$mount_answer" = "Yes" ]; then
+     mount_answer="y"
+    else
+     mount_answer="q"
+    fi
+   done
+   go_on=$mount_answer
+  fi
+ done
+ test $not_successfull_mounted = 0
+}
+
+umount_the_source() {
+ if [ ! "$SOURCE_MOUNTED" = "always" ]; then
+  umount $SOURCE_DEVICE 1> /dev/null 2>&1
+ fi;
+}
+
+install_disk() {
+ mount_the_source $1
+ if [ $? = 1 ]; then
+  umount_the_source;
+  return 1;
+ fi
+ CURRENT_DISK_NAME="$1"
+ PACKAGE_DIR=$SOURCE_DIR
+ if [ "$SOURCE_MOUNTED" = "always" -a ! "$DISK_SETS" = "disk" ]; then
+   PACKAGE_DIR=$PACKAGE_DIR/$1
+ fi
+
+ # If this directory is missing or contains no *.t?z files, bail.
+ if [ ! -d $PACKAGE_DIR ]; then
+  return 1
+ fi
+ if ! ls $PACKAGE_DIR/*.t?z 1> /dev/null 2> /dev/null ; then
+  return 1
+ fi
+
+ #
+ # look for tagfile for this series and copy into $TMP/tagfile
+ #
+ touch $TMP/tagfile
+ if [ ! "$DISK_SETS" = "disk" ]; then
+  if [ -r $TMP/SeTtagext ]; then
+   if [ -r $PACKAGE_DIR/tagfile$(cat $TMP/SeTtagext) ]; then
+    cat $PACKAGE_DIR/tagfile$(cat $TMP/SeTtagext) >> $TMP/tagfile
+   else
+    if [ -r $PACKAGE_DIR/tagfile ]; then
+     cat $PACKAGE_DIR/tagfile >> $TMP/tagfile
+    fi
+   fi
+
+  #
+  # Do we need to follow a custom path to the tagfiles?
+  #
+  elif [ -r $TMP/SeTtagpath ]; then
+   custom_path=$(cat $TMP/SeTtagpath)
+   short_path=$(basename $PACKAGE_DIR)
+
+   # If tagfile exists at the specified custom path, copy it over.
+   if [ -r $custom_path/$short_path/tagfile ]; then
+    cat $custom_path/$short_path/tagfile >> $TMP/tagfile
+
+   else # well, I guess we'll use the default one then.
+    if [ -r $PACKAGE_DIR/tagfile ]; then
+     cat $PACKAGE_DIR/tagfile >> $TMP/tagfile
+    fi
+   fi
+  #
+  # We seem to be testing for this too often... maybe this code should
+  # be optimized a little...
+  # 
+  elif [ -r $PACKAGE_DIR/tagfile ]; then
+   cat $PACKAGE_DIR/tagfile >> $TMP/tagfile
+  fi
+
+  #
+  # Execute menus if in QUICK mode:
+  #
+  if [ -r $TMP/SeTQUICK -a -r $PACKAGE_DIR/maketag ]; then
+   if [ ! "$MAKETAG" = "" -a -r $PACKAGE_DIR/$MAKETAG ]; then # use alternate maketag
+    sh $PACKAGE_DIR/$MAKETAG
+   else    
+    sh $PACKAGE_DIR/maketag
+   fi
+   if [ -r $TMP/SeTnewtag ]; then
+    mv $TMP/SeTnewtag $TMP/tagfile
+   fi
+  fi
+
+  #
+  # Protect tagfile from hacker attack:
+  #
+  if [ -r $TMP/tagfile ]; then
+   chmod 600 $TMP/tagfile
+  fi
+
+ fi #  ! "$DISK_SETS" = "disk" 
+
+ # It's possible that the tagfile was specified on the command line.  If that's
+ # the case, then we'll just override whatever we figured out up above.
+ if [ ! "$USETAG" = "" ]; then
+   cat $USETAG > $TMP/tagfile
+ fi
+
+ # If there's a catalog file present, use it to check for missing files.
+ # If not, forget about that and install whatever's there.
+ if [ "$1" = "single_disk" -o -r $PACKAGE_DIR/disk$1 -o -r $PACKAGE_DIR/package-list.txt ]; then
+  if [ -r $PACKAGE_DIR/package-list.txt ]; then
+   CATALOG_FILE=$PACKAGE_DIR/package-list.txt
+  else
+   CATALOG_FILE=$(basename $PACKAGE_DIR/disk*);
+  fi
+  if [ -r $PACKAGE_DIR/$CATALOG_FILE -a ! -d $PACKAGE_DIR/$CATALOG_FILE ]; then
+   if grep CONTENTS: $PACKAGE_DIR/$CATALOG_FILE 1> /dev/null 2>&1 ; then
+    # First we check for missing packages...
+    for PKGTEST in $(grep "^CONTENTS:" $PACKAGE_DIR/$CATALOG_FILE | cut -f2- -d : 2> /dev/null) ; do
+     # This is not a perfect test.  (say emacs is missing but emacs-nox is not)
+     if ls $PACKAGE_DIR/$PKGTEST*.t?z 1> /dev/null 2> /dev/null ; then # found something like it
+      true
+     else
+      cat << EOF > $TMP/tmpmsg
+
+WARNING!!!
+
+While looking through your index file ($CATALOG_FILE),
+I noticed that you might be missing a package:
+
+$PKGTEST-\*-\*-\*.t?z
+
+that is supposed to be on this disk (disk $1). You may go
+on with the installation if you wish, but if this is a 
+crucial file I'm making no promises that your machine will
+boot.
+
+EOF
+      dialog --title "FILE MISSING FROM YOUR DISK" --msgbox \
+"$(cat $TMP/tmpmsg)" 17 67
+     fi
+    done # checking for missing packages
+    # Now we test for extra packages:
+    ALLOWED="$(grep CONTENTS: $PACKAGE_DIR/$CATALOG_FILE | cut -b10- 2> /dev/null)" 
+    for PACKAGE_FILENAME in $PACKAGE_DIR/*.t?z; do
+     BASE=$(pkgbase $PACKAGE_FILENAME)
+     BASE="$(package_name $BASE)"
+     if echo $ALLOWED | grep $BASE 1> /dev/null 2>&1 ; then
+      true
+     else
+      cat << EOF > $TMP/tmpmsg
+
+WARNING!!!
+
+While looking through your index file ($CATALOG_FILE),
+I noticed that you have this extra package:
+
+($BASE.t?z) 
+
+that I don't recognize. Please be sure this package is
+really supposed to be here, and is not left over from an
+old version of Slackware. Sometimes this can happen at the 
+archive sites.
+
+EOF
+      dialog --title "EXTRA FILE FOUND ON YOUR DISK" \
+--msgbox "$(cat $TMP/tmpmsg)" 17 67 
+      rm -f $TMP/tmpmsg
+     fi
+    done 
+   fi
+  fi
+ fi # check for missing/extra packages
+
+ # Install the packages:
+ for PACKAGE_FILENAME in $PACKAGE_DIR/*.t?z; do
+  if [ "$PACKAGE_FILENAME" = "$PACKAGE_DIR/*.t?z" ]; then
+   continue;
+  fi
+  if [ "$ASK" = "never" ]; then # install the package
+   installpkg -root $TARGET_DIR -infobox -tagfile $TMP/tagfile $PACKAGE_FILENAME
+   ERROR=$?
+  elif [ "$ASK" = "tagfiles" ]; then
+   installpkg -root $TARGET_DIR -menu -tagfile $TMP/tagfile $PACKAGE_FILENAME
+   ERROR=$?
+  else # ASK should be = always here, and that's how we'll treat it
+   installpkg -root $TARGET_DIR -menu -ask -tagfile $TMP/tagfile $PACKAGE_FILENAME
+   ERROR=$?
+  fi
+  # Check for abort:
+  if [ "$ERROR" = "99" ]; then
+   umount_the_source;
+   chmod 755 $TARGET_DIR
+   chmod 1777 $TARGET_DIR/tmp
+   exit 1;
+   fi
+ done
+ OUTTAHERE="false"
+ if [ -r $PACKAGE_DIR/install.end ]; then
+  OUTTAHERE="true"
+ fi
+ umount_the_source;
+ if [ "$OUTTAHERE" = "true" ]; then
+  return 1;
+ fi
+}
+
+install_disk_set() { # accepts one argument: the series name in lowercase.
+ SERIES_NAME=$1
+ CURRENT_DISK_NUMBER="1";
+ while [ 0 ]; do
+  # Don't start numbering the directories until 2:
+  if [ $CURRENT_DISK_NUMBER = 1 ]; then
+    DISKTOINSTALL=$SERIES_NAME
+  else
+    DISKTOINSTALL=$SERIES_NAME$CURRENT_DISK_NUMBER
+  fi
+  install_disk $DISKTOINSTALL
+  if [ ! $? = 0 ]; then # install.end was found, or the user chose
+        # to quit installing packages.
+   return 0;
+  fi
+  CURRENT_DISK_NUMBER=$(expr $CURRENT_DISK_NUMBER + 1)
+ done;
+}
+
+# /* main() */ ;)
+if [ "$DISK_SETS" = "disk" ]; then
+ install_disk single_disk;
+ ASK="always"
+else
+ touch $TMP/tagfile
+ chmod 600 $TMP/tagfile
+ if echo $DISK_SETS | grep "#a#" 1> /dev/null 2>&1; then
+  A_IS_NEEDED="true"
+ else
+  A_IS_NEEDED="false"
+ fi
+ while [ 0 ];
+ do
+  while [ 0 ]; # strip leading '#'s
+  do
+   if [ "$(echo $DISK_SETS | cut -b1)" = "#" ]; then
+    DISK_SETS="$(echo $DISK_SETS | cut -b2-)"
+   else
+    break;
+   fi
+  done
+  if [ "$A_IS_NEEDED" = "true" ]; then
+   cat << EOF > $TMP/tmpmsg
+
+--- Installing package series ==>a<==
+
+EOF
+   dialog --infobox "$(cat $TMP/tmpmsg)" 5 45
+   sleep 1
+   rm -f $TMP/tmpmsg
+   install_disk_set a;
+   A_IS_NEEDED="false"
+  fi
+  count="1"
+  if [ "$(echo $DISK_SETS | cut -b$count)" = "" ]; then
+   break; # we be done here :^)
+  else
+   count="2"
+   while [ 0 ]; do
+    if [ "$(echo $DISK_SETS | cut -b$count)" = "" -o "$(echo $DISK_SETS | cut -b$count)" = "#" ]; then
+     count="$(expr $count - 1)"
+     break;
+    else
+     count="$(expr $count + 1)"
+    fi 
+   done
+  fi 
+  diskset="$(echo $DISK_SETS | cut -b1-$count)"
+  count="$(expr $count + 1)"
+  DISK_SETS="$(echo $DISK_SETS | cut -b$count-)"
+  if [ "$diskset" = "a" ]; then
+   continue; # we expect this to be done elsewhere
+  fi
+  cat << EOF > $TMP/tmpmsg
+
+Installing package series ==>$diskset<==
+
+EOF
+  dialog --infobox "$(cat $TMP/tmpmsg)" 5 45
+  sleep 1
+  rm -f $TMP/tmpmsg
+  install_disk_set $diskset; 
+ done
+fi
+
+if [ "$DISK_SETS" = "disk" -o "$CMD_START" = "true" ]; then
+ if [ -r $TMP/tagfile ]; then
+  rm $TMP/tagfile
+ fi
+ dialog --clear
+fi
+chmod 755 $TARGET_DIR $TARGET_DIR/var $TARGET_DIR/usr
+chmod 1777 $TARGET_DIR/tmp
diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg
new file mode 100644
index 000000000..8b5a911dd
--- /dev/null
+++ b/source/a/pkgtools/scripts/removepkg
@@ -0,0 +1,430 @@
+#!/bin/sh
+# Slackware remove package script
+#
+# Sat Apr 25 21:18:53 UTC 2009 (12.34567890b)
+# Converted to use new pkgbase() function to remove pathname and
+# valid package extensions.
+#
+# Revision 12.34567890 Sun Apr  5 20:59:32 CDT 2009 <volkerdi>
+# - Support packages with the extensions: .tgz, .tbz, .tlz, .txz
+#
+# Revision 1.9 Wed Oct 31 14:04:28 CDT 2007 volkerding
+# - Fix problem removing packages with a large number of fields.
+#   Thanks to Niki Kovacs for noticing this, and to Piter Punk
+#   for the patch.
+# - Use LC_ALL=C locale, which is much faster with "sort".
+#   Thanks to Tsomi.
+# - Don't try to remove any package that starts with '-'.  This
+#   is not a proper package name (usually a typo), and results
+#   in the package database being broken.  Thanks to Jef Oliver.
+# - Patched cat_except() to allow the last Slackware package on
+#   a partition to be removed (using ROOT=, of course)
+#   Thanks to Selkfoster for the patch, and to everyone else who
+#   proposed solutions before.  This issue really wasn't given
+#   the highest priority before, but I figured while I'm in here...
+#
+# Revision 1.8 Thu Nov 22 14:00:13 PST 2001 volkerding Rel $
+# - Move $TMP underneath $ROOT
+# - Understand the idea of a base package name, so that packages
+#   can be removed with any of these notations:
+#   removepkg foo-1.0-i386-1.tgz
+#   removepkg foo-1.0-i386-1
+#   removepkg foo.tgz
+#   removepkg foo
+#
+# Revision 1.7  2001/03/30 12:36:28 volkerding
+# - Strip extra ".tgz" from input names.
+#
+# Revision 1.6  1999/03/25 18:26:41 volkerding
+# - Use external $ROOT variable, like installpkg.
+#
+# Revision 1.5.1  1998/03/18 15:37:28 volkerding
+# - Since removepkg is always run by root, the temp directory has been
+#   moved from /tmp to a private directory to avoid symlink attacks from
+#   malicious users.
+#
+# Revision 1.5  1997/06/26 12:09:53  franke
+# - Fixed old bug in TRIGGER regex setting
+# - -preserve/-copy options now preserve non-unique files
+#   and empty directories also
+#
+# Revision 1.4  1997/06/09 13:21:36  franke
+# - Package file preserve (-preserve, -copy) added.
+# - Don't execute "rm -rf" lines from doinst.sh, removing links explicit.
+# - Warning on no longer existing files added.
+# - Warning on files changed after package installation added.
+# - Intermediate file preserve (-keep) added.
+# - Check for required files/links now done on a combined list.
+# - Write access to /var/log/{packages,scripts} no longer necessary for -warn.
+#
+# Revision 1.3  1997/06/08 13:03:05  franke
+# Merged with revision 1.1.1.1
+#
+# Revision 1.2  1996/06/01 20:04:26  franke
+# Delete empty directories & formated manual pages added
+#
+# Revision 1.1.1.1  1995/12/18 21:20:42  volkerding
+# Original Version from Slackware 3.1
+#
+# Revision 1.1  1995/06/05 22:49:11  volkerding
+# Original Version from Slackware 3.0
+#
+
+# Copyright 1994, 1995, 1998  Patrick Volkerding, Moorhead, Minnesota USA
+# Copyright 2001, Slackware Linux, Inc., Concord, CA USA
+# Copyright 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.
+#
+
+# Return a package name that has been stripped of the dirname portion
+# and any of the valid extensions (only):
+pkgbase() {
+  PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
+  case $PKGEXT in
+  'tgz' )
+    PKGRETURN=$(basename $1 .tgz)
+    ;;
+  'tbz' )
+    PKGRETURN=$(basename $1 .tbz)
+    ;;
+  'tlz' )
+    PKGRETURN=$(basename $1 .tlz)
+    ;;
+  'txz' )
+    PKGRETURN=$(basename $1 .txz)
+    ;;
+  *)
+    PKGRETURN=$(basename $1)
+    ;;
+  esac
+  echo $PKGRETURN
+}
+
+# This makes "sort" run much faster:
+export LC_ALL=C
+
+# Make sure there's a proper temp directory:
+TMP=$ROOT/var/log/setup/tmp
+# If the $TMP directory doesn't exist, create it:
+if [ ! -d $TMP ]; then
+  rm -rf $TMP # make sure it's not a symlink or something stupid
+  mkdir -p $TMP
+  chmod 700 $TMP # no need to leave it open
+fi
+ADM_DIR=$ROOT/var/log
+PRES_DIR=$TMP/preserved_packages
+
+# This simple cat_except() should be used on the installer,
+# since the busybox "find" can't handle the complex find
+# syntax:
+#cat_except() {
+# ( cd "$1" && cat $(ls * | sed "/^$2\$/d"))
+#}
+
+# This version of cat_except() allows the last package to be
+# removed when ROOT= is used:
+cat_except() {
+  ( cd "$1" && \
+    if [ $(find . -type f -maxdepth 1 | wc -l) -ne 1 ]; then
+      cat $(find . -type f -maxdepth 1 | grep -v "$2")
+    fi
+  )
+}
+
+extract_links() {
+ sed -n 's,^( *cd \([^ ;][^ ;]*\) *; *rm -rf \([^ )][^ )]*\) *) *$,\1/\2,p'
+}
+
+preserve_file() {
+ if [ "$PRESERVE" = "true" ]; then
+  F="$(basename "$1")"
+  D="$(dirname "$1")"
+  if [ ! -d "$PRES_DIR/$PKGNAME/$D" ]; then
+    mkdir -p "$PRES_DIR/$PKGNAME/$D" || return 1
+  fi
+  cp -p "$ROOT/$D/$F" "$PRES_DIR/$PKGNAME/$D" || return 1
+ fi
+ return 0
+}
+
+preserve_dir() {
+ if [ "$PRESERVE" = "true" ]; then
+  if [ ! -d "$PRES_DIR/$PKGNAME/$1" ]; then
+    mkdir -p "$PRES_DIR/$PKGNAME/$1" || return 1
+  fi
+ fi
+ return 0
+}
+
+keep_files() {
+ while read FILE ; do
+  if [ ! -d "$ROOT/$FILE" ]; then
+   if [ -r "$ROOT/$FILE" ]; then
+    echo "  --> $ROOT/$FILE was found in another package. Skipping."
+    preserve_file "$FILE"
+   else
+    if [ "$(echo $FILE | cut -b1-8)" != "install/" ]; then
+     echo "WARNING: Nonexistent $ROOT/$FILE was found in another package. Skipping."
+    fi
+   fi
+  else
+   preserve_dir "$FILE"
+  fi
+ done
+}
+
+keep_links() {
+ while read LINK ; do
+  if [ -L "$ROOT/$LINK" ]; then
+   echo "  --> $ROOT/$LINK (symlink) was found in another package. Skipping."
+  else
+   echo "WARNING: Nonexistent $ROOT/$LINK (symlink) was found in another package. Skipping."
+  fi
+ done
+}
+
+delete_files() {
+ while read FILE ; do
+  if [ ! -d "$ROOT/$FILE" ]; then
+   if [ -r "$ROOT/$FILE" ]; then
+    if [ "$ROOT/$FILE" -nt "$ADM_DIR/packages/$PKGNAME" ]; then
+     echo "WARNING: $ROOT/$FILE changed after package installation."
+    fi
+    if [ ! "$WARN" = "true" ]; then
+     echo "  --> Deleting $ROOT/$FILE"
+     preserve_file "$FILE" && rm -f "$ROOT/$FILE"
+    else
+     echo "  --> $ROOT/$FILE would be deleted"
+     preserve_file "$FILE"
+    fi
+   else
+    echo "  --> $ROOT/$FILE no longer exists. Skipping."
+   fi
+  else
+   preserve_dir "$FILE"
+  fi
+ done
+}
+
+delete_links() {
+ while read LINK ; do
+  if [ -L "$ROOT/$LINK" ]; then
+   if [ ! "$WARN" = "true" ]; then
+    echo "  --> Deleting symlink $ROOT/$LINK"
+    rm -f $ROOT/$LINK
+   else
+    echo "  --> $ROOT/$LINK (symlink) would be deleted"
+   fi
+  else
+   echo "  --> $ROOT/$LINK (symlink) no longer exists. Skipping."
+  fi
+ done
+}
+
+delete_dirs() {
+ sort -r | \
+ while read DIR ; do
+  if [ -d "$ROOT/$DIR" ]; then
+    if [ ! "$WARN" = "true" ]; then
+      if [ $(ls -a "$ROOT/$DIR" | wc -l) -eq 2 ]; then
+        echo "  --> Deleting empty directory $ROOT/$DIR"
+        rmdir "$ROOT/$DIR"
+      else
+        echo "WARNING: Unique directory $ROOT/$DIR contains new files"
+      fi
+    else
+     echo "  --> $ROOT/$DIR (dir) would be deleted if empty"
+    fi
+  fi
+ done
+}
+
+delete_cats() {
+ sed -n 's,/man\(./[^/]*$\),/cat\1,p'  | \
+ while read FILE ; do
+   if [ -f "$ROOT/$FILE" ]; then
+     if [ ! "$WARN" = "true" ]; then
+       echo "  --> Deleting $ROOT/$FILE (fmt man page)"
+       rm -f $ROOT/$FILE
+     else
+       echo "  --> $ROOT/$FILE (fmt man page) would be deleted"
+     fi
+   fi
+ done
+}
+
+package_name() {
+  STRING=$(pkgbase $1)
+  # If we don't do this, commands run later will take the '-' to be an option
+  # and will destroy the package database.  Packages should not contain spaces
+  # in them.  Normally this type of problem results from a command line typo.
+  if [ "$(echo $STRING | cut -b 1)" = "-" ]; then
+    STRING="malformed-package-name-detected"
+  fi
+  # Check for old style package name with one segment:
+  if [ "$(echo $STRING | cut -f 1 -d -)" = "$(echo $STRING | cut -f 2 -d -)" ]; then
+    echo $STRING
+  else # has more than one dash delimited segment
+    # Count number of segments:
+    INDEX=1
+    while [ ! "$(echo $STRING | cut -f $INDEX -d -)" = "" ]; do
+      INDEX=$(expr $INDEX + 1)
+    done
+    INDEX=$(expr $INDEX - 1) # don't include the null value
+    # If we don't have four segments, return the old-style (or out of spec) package name:
+    if [ "$INDEX" = "2" -o "$INDEX" = "3" ]; then
+      echo $STRING
+    else # we have four or more segments, so we'll consider this a new-style name:
+      NAME=$(expr $INDEX - 3)
+      NAME="$(echo $STRING | cut -f 1-$NAME -d -)"
+      echo $NAME
+      # cruft for later ;)
+      #VER=$(expr $INDEX - 2)
+      #VER="$(echo $STRING | cut -f $VER -d -)"
+      #ARCH=$(expr $INDEX - 1)
+      #ARCH="$(echo $STRING | cut -f $ARCH -d -)"
+      #BUILD="$(echo $STRING | cut -f $INDEX -d -)"
+    fi
+  fi
+}
+
+# Conversion to 'comm' utility by Mark Wisdom.
+# is pretty nifty! :^)
+remove_packages() {
+ for PKGLIST in $* 
+ do
+  PKGNAME=$(pkgbase $PKGLIST)
+  echo
+  # If we don't have a package match here, then we will attempt to find
+  # a package using the long name format (name-version-arch-build) for
+  # which the base package name was given.  On a properly-managed machine,
+  # there should only be one package installed with a given basename, but
+  # we don't enforce this policy.  If there's more than one, only one will
+  # be removed.  If you want to remove them all, you'll need to run
+  # removepkg again until it removes all the same-named packages.
+  if [ ! -e $ADM_DIR/packages/$PKGNAME ]; then
+   SHORT="$(package_name $PKGNAME)"
+   for long_package in $ADM_DIR/packages/${PKGNAME}* ; do
+    if [ "$SHORT" = "$(package_name $long_package)" ]; then
+     PKGNAME="$(basename $long_package)"
+    fi
+   done
+  fi
+
+  if [ ! -e $ADM_DIR/packages/$PKGNAME ]; then
+    long_package=$(ls -1 $ADM_DIR/packages/${PKGNAME}* | grep -m 1 "${PKGNAME}-[^-]*-[^-]*-[^-]*$")
+    if [ -e "$long_package" ]; then
+      PKGNAME=$(basename $long_package)
+    fi
+  fi
+
+  if [ -r $ADM_DIR/packages/$PKGNAME ]; then
+   if [ ! "$WARN" = true ]; then
+    echo "Removing package $ADM_DIR/packages/$PKGNAME..."
+   fi
+   if fgrep "./" $ADM_DIR/packages/$PKGNAME 1> /dev/null 2>&1; then
+    TRIGGER="^\.\/"
+   else
+    TRIGGER="FILE LIST:"
+   fi
+   if [ ! "$WARN" = true ]; then
+    echo "Removing files:"
+   fi
+   sed -n "/$TRIGGER/,/^$/p" < $ADM_DIR/packages/$PKGNAME | \
+    fgrep -v "FILE LIST:" | sort -u > $TMP/delete_list$$
+   # Pat's new-new && improved pre-removal routine.
+   cat_except $ADM_DIR/packages $PKGNAME | sort -u > $TMP/required_list$$
+   if [ -r $ADM_DIR/scripts/$PKGNAME ]; then
+    extract_links < $ADM_DIR/scripts/$PKGNAME | sort -u > $TMP/del_link_list$$
+    cat_except $ADM_DIR/scripts $PKGNAME | extract_links | \
+     sort -u > $TMP/required_links$$
+    mv $TMP/required_list$$ $TMP/required_files$$
+    sort -u $TMP/required_links$$ $TMP/required_files$$ > $TMP/required_list$$
+    comm -12 $TMP/del_link_list$$ $TMP/required_list$$ | keep_links
+    comm -23 $TMP/del_link_list$$ $TMP/required_list$$ | delete_links
+   else
+    cat $ADM_DIR/scripts/* | extract_links | \
+     sort -u > $TMP/required_links$$
+    mv $TMP/required_list$$ $TMP/required_files$$
+    sort -u $TMP/required_links$$ $TMP/required_files$$ >$TMP/required_list$$
+   fi
+   comm -12 $TMP/delete_list$$ $TMP/required_list$$ | keep_files
+   comm -23 $TMP/delete_list$$ $TMP/required_list$$ > $TMP/uniq_list$$
+   delete_files < $TMP/uniq_list$$
+   delete_dirs < $TMP/uniq_list$$
+   delete_cats < $TMP/uniq_list$$
+   if [ ! "$KEEP" = "true" ]; then
+    rm -f $TMP/delete_list$$ $TMP/required_files$$ $TMP/uniq_list$$
+    rm -f $TMP/del_link_list$$ $TMP/required_links$$ $TMP/required_list$$
+   fi
+   if [ "$PRESERVE" = "true" ]; then
+    if [ -r $ADM_DIR/scripts/$PKGNAME ]; then
+     if [ ! -d "$PRES_DIR/$PKGNAME/install" ]; then
+      mkdir -p "$PRES_DIR/$PKGNAME/install"
+     fi
+     cp -p $ADM_DIR/scripts/$PKGNAME $PRES_DIR/$PKGNAME/install/doinst.sh
+    fi
+   fi
+   if [ ! "$WARN" = "true" ]; then
+    for DIR in $ADM_DIR/removed_packages $ADM_DIR/removed_scripts ; do
+     if [ ! -d $DIR ] ; then mkdir -p $DIR ; chmod 755 $DIR ; fi
+    done
+    mv $ADM_DIR/packages/$PKGNAME $ADM_DIR/removed_packages
+    if [ -r $ADM_DIR/scripts/$PKGNAME ]; then
+     mv $ADM_DIR/scripts/$PKGNAME $ADM_DIR/removed_scripts
+    fi
+   fi
+  else
+   echo "No such package: $ADM_DIR/packages/$PKGNAME. Can't remove."
+  fi
+ done
+}
+
+if [ "$#" = "0" ]; then
+  echo "Usage: $(basename $0) [-copy] [-keep] [-preserve] [-warn] packagename ..."; exit 1
+fi
+
+while : ; do
+ case "$1" in
+  -copy | --copy) WARN=true; PRESERVE=true; shift;;
+  -keep | --keep) KEEP=true; shift;;
+  -preserve | --preserve) PRESERVE=true; shift;;
+  -warn | --warn) WARN=true; shift;;
+  -* | --*) echo "Usage: $(basename $0) [-copy] [-keep] [-preserve] [-warn] packagename ..."; exit 1;;
+  *) break
+ esac
+done
+
+if [ "$WARN" = "true" ]; then
+ echo "Only warning... not actually removing any files."
+ if [ "$PRESERVE" = "true" ]; then
+  echo "Package contents is copied to $PRES_DIR."
+ fi
+ echo "Here's what would be removed (and left behind) if you"
+ echo "removed the package(s):"
+ echo
+else
+ if [ "$PRESERVE" = "true" ]; then
+  echo "Package contents is copied to $PRES_DIR."
+ fi
+fi
+
+remove_packages $*
+
diff --git a/source/a/pkgtools/scripts/setup.70.install-kernel b/source/a/pkgtools/scripts/setup.70.install-kernel
new file mode 100644
index 000000000..8edf64779
--- /dev/null
+++ b/source/a/pkgtools/scripts/setup.70.install-kernel
@@ -0,0 +1,5 @@
+# Install the bootdisk or CD-ROM's Linux kernel:
+#BLURB="Install a Linux kernel from a bootdisk"
+if [ -x /usr/lib/setup/SeTkernel ]; then
+  . /usr/lib/setup/SeTkernel
+fi
diff --git a/source/a/pkgtools/scripts/setup.80.make-bootdisk b/source/a/pkgtools/scripts/setup.80.make-bootdisk
new file mode 100644
index 000000000..d9b4012f2
--- /dev/null
+++ b/source/a/pkgtools/scripts/setup.80.make-bootdisk
@@ -0,0 +1,175 @@
+#!/bin/sh
+#BLURB="Create a USB Linux boot stick"
+RDIR=/dev/tty4
+NDIR=/dev/null
+TMP=/var/log/setup/tmp
+
+if [ ! -d $TMP ]; then
+  mkdir -p $TMP
+fi
+T_PX="$1"
+ROOT_DEVICE="$2"
+
+while [ 0 ]; do # the bootdisk menu loop
+ # Run "rescan-scsi-bus -l" to get an up to date overview of devices:
+ /sbin/rescan-scsi-bus -l 1>$RDIR 2>$RDIR
+ # Get a list of removable block devices before the USB stick is inserted:
+ echo "" > $TMP/remov_prior
+ for BDEV in $(ls --indicator-style none /sys/block | egrep -v "loop|ram"); do
+   [ -r /sys/block/$BDEV/removable -a "$(cat /sys/block/$BDEV/removable)" == "1" ] \
+     && echo $BDEV >> $TMP/remov_prior
+ done
+ dialog --title "MAKE USB FLASH BOOT" --default-item "Skip" --menu \
+"If your computer supports booting from a USB device, it is recommended that you make \
+a USB boot stick for your system at this time. It will boot your computer straight \
+into the root filesystem on $ROOT_DEVICE. \n\
+\n\
+Please insert a USB flash memory stick and then press ENTER to create a boot stick.  \n\
+\n\
+WARNING!  The existing contents of the USB stick will be erased. \n\
+   " 18 70 2 \
+ "Create" "Make a USB Linux boot stick" \
+ "Skip" "Skip making a USB boot stick" \
+ 2> $TMP/return
+ REPLY=`cat $TMP/return`
+ rm -f $TMP/return
+ if [ "$REPLY" = "Create" ]; then
+  # Run "rescan-scsi-bus -l" to discover our USB stick if needed:
+  /sbin/rescan-scsi-bus -l 1>$RDIR 2>$RDIR
+  # Get a list of removable block devices after the USB stick is inserted:
+  echo "" > $TMP/remov_after
+  for BDEV in $(ls --indicator-style none /sys/block | egrep -v "loop|ram"); do
+    [ -r /sys/block/$BDEV/removable -a "$(cat /sys/block/$BDEV/removable)" == "1" ] \
+      && echo $BDEV >> $TMP/remov_after
+  done
+  ADDED=$(diff -u $TMP/remov_prior $TMP/remov_after | sed -n 's/^\+//p' | grep -v '^+')
+  REMVD=$(diff -u $TMP/remov_prior $TMP/remov_after | sed -n 's/^\+//p' | grep -v '^+')
+  if [ -n "$ADDED" ] ; then STICK=$ADDED ; else STICK="" ; fi
+  rm $TMP/remov_prior $TMP/remov_after
+  if [ ! -n "$STICK" ]; then
+   dialog --title "NO NEW DEVICE DETECTED" --ok-label Restart --msgbox  \
+"No new USB device was detected. 
+If you had already inserted your USB stick, please remove it now. \
+Then select 'Restart'." 7 70
+   continue
+  else
+   VENDOR="Vendor : $(cat /sys/block/$STICK/device/vendor)"
+   MODEL="Model  : $(cat /sys/block/$STICK/device/model)"
+   SIZE="Size   : $(( $(cat /sys/block/$STICK/size) / 2048)) MB"
+   dialog --title "NEW DEVICE DETECTED" --yesno \
+"A new USB device '/dev/$STICK' was detected with specifications:
+
+--  $VENDOR
+--  $MODEL
+--  $SIZE
+
+If this is the USB stick to use, select 'Yes',
+otherwise select 'No'." 12 70
+   if [ $? -eq 1 ]; then
+    continue
+   fi
+  fi
+
+  dialog --title "CREATING USB BOOT STICK" --infobox "Creating SYSLINUX bootdisk for \
+$ROOT_DEVICE on /dev/$STICK." 3 64 
+  # Determine max size of the filesystem (in KB) we want to create:
+  USBSIZE=$(( $(cat /sys/block/$STICK/size) / 2048))
+  if [ $USBSIZE -lt 512 ]; then DOSSIZE=$(($USBSIZE*1024))
+  else DOSSIZE=$((512*1024))
+  fi
+  # Hack from Pat.  If we're wasting a whole stick, who cares if the partition is
+  # extra-small, as long as the kernel fits?  Also, FAT12 is the least problematic.
+  DOSSIZE=15861
+  if [ -x /sbin/mkdosfs ]; then
+    /sbin/mkdosfs -I -n USBSLACK -F 12 /dev/$STICK $DOSSIZE 1> /dev/null 2> /dev/null
+  else
+    chroot $T_PX /sbin/mkdosfs -I -n USBSLACK -F 12 /dev/$STICK $DOSSIZE 1> /dev/null 2> /dev/null
+  fi
+  if [ ! -d $TMP/bootdisk ]; then
+    mkdir $TMP/bootdisk
+  fi
+  mount -t vfat /dev/$STICK $TMP/bootdisk 1> /dev/null 2> /dev/null
+  if [ -r $T_PX/vmlinuz ]; then
+    cp $T_PX/vmlinuz $TMP/bootdisk/vmlinuz
+  elif [ -r $T_PX/boot/vmlinuz ]; then
+    cp $T_PX/boot/vmlinuz $TMP/bootdisk/vmlinuz
+  fi
+  # We don't need the isolinux bootloader with syslinux do we?
+  #cp $T_PX/usr/share/syslinux/isolinux.bin $TMP/bootdisk/
+  cat << EOF > $TMP/bootdisk/message.txt
+
+Welcome to the 09Slackware07 Linux custom USB boot stick!
+
+By default, this stick boots a root Linux partition on $ROOT_DEVICE when you
+hit ENTER.  If you'd like to boot some other partition, use a command like
+this on the prompt below:
+
+    mount root=/dev/sda1 ro
+
+Where "/dev/sda1" is the partition you want to boot, and "ro" specifies that
+the partition should be initially mounted as read-only.  If you wish to mount
+the partition read-write, use "rw" instead.  To set the video console mode,
+use the vga= parameter (press F1 to see a table).  You may also add any other
+kernel parameters you might need depending on your hardware, and which
+drivers are included in your kernel.
+
+EOF
+   cat << EOF > $TMP/bootdisk/syslinux.cfg
+default vmlinuz root=$ROOT_DEVICE vga=normal ro
+prompt 1
+timeout 6000
+display message.txt
+F1 f1.txt
+F2 message.txt
+#F3 f3.txt
+#F4 f4.txt
+#F5 f5.txt
+#F6 f6.txt
+#F7 f7.txt
+label mount
+  kernel vmlinuz
+  append root=$ROOT_DEVICE vga=normal ro
+EOF
+  cat << EOF > $TMP/bootdisk/f1.txt
+ STANDARD MODES:
+ To make the kernel prompt for standard video modes use: vga=ask
+
+ FRAMEBUFFER MODES:
+ To get the kernel to start in VESA framebuffer mode, you need to pass it
+ a vga= init string on the "boot:" prompt.  Here's a table:
+
+   Colors   640x480 800x600 1024x768 1280x1024 1600x1200
+  --------+---------------------------------------------
+  256     |   769     771      773      775       796
+  32,768  |   784     787      790      793       797
+  65,536  |   785     788      791      794       798
+  16.8M   |   786     789      792      795       799
+
+  ...such as this for 1024x768x64k:
+   vga=791
+
+  F2 returns to the previous page.
+
+EOF
+  umount /dev/$STICK
+  rm -r $TMP/bootdisk
+  # Make the device bootable:
+  syslinux -s /dev/$STICK 1> /dev/null 2> /dev/null
+  dialog --title "USB BOOT STICK CREATED" --ok-label Continue --cancel-label Create --menu \
+"The USB boot stick has been successfully created in /dev/$STICK.  If you would like to \
+create an additional boot stick, please select 'Create' and we'll go back and make another \
+one, otherwise select 'Continue' to continue configuring your system." 12 70 2 \
+ "Continue" "Continue the configuration (done making boot sticks)" \
+ "Create" "Make a spare Linux boot stick in /dev/$STICK" \
+ 2> $TMP/return
+  REPLY=`cat $TMP/return`
+  rm -f $TMP/return
+  if [ "$REPLY" = "Create" ]; then
+   continue
+  else
+   break
+  fi
+ else # ! Create
+  break
+ fi
+done
diff --git a/source/a/pkgtools/scripts/setup.htmlview b/source/a/pkgtools/scripts/setup.htmlview
new file mode 100644
index 000000000..2fd9930a7
--- /dev/null
+++ b/source/a/pkgtools/scripts/setup.htmlview
@@ -0,0 +1,33 @@
+#!/bin/sh
+#BLURB="Set a default browser link."
+# Sorry, this is not a full menu, and may not ever be.
+# It is trivial to find the htmllink symbolic link and
+# point it at the browser that you like.  Besides,
+# this is not a Linux standard that could be locating
+# in any official document.  It seems to have been
+# started without any consultation with other
+# distributions by <take a wild guess>, and now things
+# expect it to be there.
+#
+#
+# Note 1.  Listing a browser doesn't mean we ship it.
+# Note 2.  Complaints about our preferences or missing
+#          browsers in the list will be considered.
+#          Yell at Pat about it.  ;-)
+
+# There must be no link, or we assume the admin set it and
+# do nothing.  Can you tell this Q+D script was written for
+# the initial installation?
+
+for browser in firefox seamonkey konqueror galeon epiphany links lynx ; do
+  if [ ! -e usr/bin/htmlview -a -x usr/bin/$browser ]; then
+    cat << EOF > usr/bin/htmlview
+#!/bin/sh
+exec $browser "\$@"
+EOF
+  fi
+done
+if [ -e usr/bin/htmlview ]; then
+  chmod 755 usr/bin/htmlview
+fi
+
diff --git a/source/a/pkgtools/scripts/setup.services b/source/a/pkgtools/scripts/setup.services
new file mode 100644
index 000000000..aee2599fd
--- /dev/null
+++ b/source/a/pkgtools/scripts/setup.services
@@ -0,0 +1,287 @@
+#!/bin/sh
+#BLURB="Select/deselect system daemons (services)"
+TMP=/var/log/setup/tmp
+if [ ! -d $TMP ]; then
+  mkdir -p $TMP
+fi
+T_PX="$1"
+cd $T_PX
+rm -f $TMP/tmpscript
+
+cat << EOF > $TMP/tmpscript
+dialog --title "CONFIRM STARTUP SERVICES TO RUN" --item-help --checklist \\
+"The selected services will be started at boot time.  If you \\
+don't need them, you may unselect them to turn them off (which may improve \\
+overall system security).  You may also choose to start services that are \\
+not run by default, but be aware that more services means less security.  \\
+Use the spacebar to select or unselect the services you wish to run.  \\
+Recommended choices have been preselected.  \\
+Press the ENTER key when you are finished." \\
+20 75 7 \\
+EOF
+
+if [ -r etc/rc.d/rc.atalk ]; then
+  if [ -x etc/rc.d/rc.atalk ]; then
+    RC_ATALK=on
+  else
+    RC_ATALK=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.atalk" "Netatalk Appletalk file/print server" $RC_ATALK "The Netatalk server is a file and print server for Macintosh networks." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.bind ]; then
+  if [ -x etc/rc.d/rc.bind ]; then
+    RC_BIND=on
+  else
+    RC_BIND=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.bind" "BIND (Domain Name System) server" $RC_BIND "BIND (Berkeley Internet Name Domain) is a Domain Name System (DNS) server." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.cups ]; then
+  if [ -x etc/rc.d/rc.cups ]; then
+    RC_CUPS=on
+  else
+    RC_CUPS=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.cups" "CUPS print server" $RC_CUPS "The Common UNIX Printing system (print spooler choice #1)." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.dnsmasq ]; then
+  if [ -x etc/rc.d/rc.dnsmasq ]; then
+    RC_DNSMASQ=on
+  else
+    RC_DNSMASQ=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.dnsmasq" "dnsmasq DHCP/DNS server" $RC_DNSMASQ "dnsmasq provides DNS and DHCP service to a LAN." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.fuse ]; then
+  if [ -x etc/rc.d/rc.fuse ]; then
+    RC_FUSE=on
+  else
+    RC_FUSE=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.fuse" "Filesystem in Userspace library" $RC_FUSE "FUSE is an interface to allow userspace programs to use filesystems." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.hald ]; then
+  if [ -x etc/rc.d/rc.hald ]; then
+    RC_HALD=on
+  else
+    RC_HALD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.hald" "Hardware Abstraction Layer" $RC_HALD "HAL makes access to CD/DVD drives and USB devices easier." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.hplip ]; then
+  if [ -x etc/rc.d/rc.hplip ]; then
+    RC_HPLIP=on
+  else
+    RC_HPLIP=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.hplip" "HP printer/scanner daemons" $RC_HPLIP "Programs used to run printers and scanners from Hewlett Packard." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.httpd ]; then
+  if [ -x etc/rc.d/rc.httpd ]; then
+    RC_HTTPD=on
+  else
+    RC_HTTPD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.httpd" "The Apache web server" $RC_HTTPD "Apache, the most widely used web server on the net." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.inetd ]; then
+  if [ -x etc/rc.d/rc.inetd ]; then
+    RC_INETD=on
+  else
+    RC_INETD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.inetd" "The BSD Inetd daemon" $RC_INETD "Inetd daemon (this allows:  time, ftp, comsat, talk, finger, and auth)." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.ip_forward ]; then
+  if [ -x etc/rc.d/rc.ip_forward ]; then
+    RC_IP_FORWARD=on
+  else
+    RC_IP_FORWARD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.ip_forward" "Activate IP packet forwarding" $RC_IP_FORWARD "Packet forwarding allows your Linux machine to act as a router." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.lprng ]; then
+  if [ -x etc/rc.d/rc.lprng ]; then
+    RC_LPRNG=on
+  else
+    RC_LPRNG=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.lprng" "LPRng print server" $RC_LPRNG "The LPRng printing system (print spooler choice #2)." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.messagebus ]; then
+  if [ -x etc/rc.d/rc.messagebus ]; then
+    RC_MESSAGEBUS=on
+  else
+    RC_MESSAGEBUS=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.messagebus" "D-Bus system message bus" $RC_MESSAGEBUS "Used for communication by HAL and other programs." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.mysqld ]; then
+  if [ -x etc/rc.d/rc.mysqld ]; then
+    RC_MYSQLD=on
+  else
+    RC_MYSQLD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.mysqld" "The MySQL database server" $RC_MYSQLD "MySQL, an SQL-based relational database daemon." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.ntpd ]; then
+  if [ -x etc/rc.d/rc.ntpd ]; then
+    RC_NTPD=on
+  else
+    RC_NTPD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.ntpd" "The network time server" $RC_NTPD "NTP synchronizes your time to/from other NTP servers." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.pcmcia ]; then
+  if [ -x etc/rc.d/rc.pcmcia ]; then
+    RC_PCMCIA=on
+  else
+    RC_PCMCIA=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.pcmcia" "PCMCIA/Cardbus card services" $RC_PCMCIA "This supports PCMCIA or Cardbus cards used with laptops." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.rpc ]; then
+  if [ -x etc/rc.d/rc.rpc ]; then
+    RC_RPC=on
+  else
+    RC_RPC=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.rpc" "RPC (NFS) daemons" $RC_RPC "Needed to serve or mount NFS (Network File System) partitions." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.samba ]; then
+  if [ -x etc/rc.d/rc.samba ]; then
+    RC_SAMBA=on
+  else
+    RC_SAMBA=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.samba" "The Samba file/print server" $RC_SAMBA "Samba is a file and print server for Windows networks." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.saslauthd ]; then
+  if [ -x etc/rc.d/rc.saslauthd ]; then
+    RC_SASLAUTHD=on
+  else
+    RC_SASLAUTHD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.saslauthd" "The SASL authentication server" $RC_SASLAUTHD "SASL is an authentication method often used by mail servers." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.sendmail ]; then
+  if [ -x etc/rc.d/rc.sendmail ]; then
+    RC_SENDMAIL=on
+  else
+    RC_SENDMAIL=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.sendmail" "The Sendmail mail server" $RC_SENDMAIL "The Sendmail server allows your machine to send and receive mail." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.snmpd ]; then
+  if [ -x etc/rc.d/rc.snmpd ]; then
+    RC_SNMPD=on
+  else
+    RC_SNMPD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.snmpd" "Net-SNMP daemon" $RC_SNMPD "SNMP daemon that receives and logs SNMP TRAP and INFORM messages." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.syslog ]; then
+  if [ -x etc/rc.d/rc.syslog ]; then
+    RC_SYSLOGD=on
+  else
+    RC_SYSLOGD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.syslog" "The Linux system logging utilities" $RC_SYSLOGD "The syslogd and klogd daemons log important messages under /var/log." \\
+EOF
+fi
+
+if [ -r etc/rc.d/rc.sshd ]; then
+  if [ -x etc/rc.d/rc.sshd ]; then
+    RC_SSHD=on
+  else
+    RC_SSHD=off
+  fi
+  cat << EOF >> $TMP/tmpscript
+    "rc.sshd" "The SSHD (secure shell) daemon" $RC_SSHD "SSHD allows secure encrypted logins to your machine." \\
+EOF
+fi
+
+cat << EOF >> $TMP/tmpscript
+  2> $TMP/reply
+EOF
+
+. $TMP/tmpscript
+
+if [ ! $? = 0 ]; then
+  rm -f $TMP/reply $TMP/tmpscript
+  exit
+fi
+
+for service in rc.atalk rc.bind rc.cups rc.dnsmasq rc.fuse rc.hald rc.hplip rc.httpd rc.inetd rc.ip_forward rc.lprng rc.messagebus rc.mysqld rc.ntpd rc.pcmcia rc.rpc rc.samba rc.saslauthd rc.snmpd rc.sendmail rc.syslog rc.sshd ; do
+  if [ -f etc/rc.d/$service ]; then
+    if grep -w $service $TMP/reply 1> /dev/null ; then
+      chmod 755 etc/rc.d/$service
+    else
+      chmod 644 etc/rc.d/$service
+    fi
+  fi
+done
+
+rm -f $TMP/reply $TMP/tmpscript
+
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
new file mode 100644
index 000000000..cc3250dae
--- /dev/null
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -0,0 +1,387 @@
+#!/bin/sh
+# Copyright 1999  Patrick Volkerding, Moorhead, Minnesota, USA 
+# Copyright 2001, 2002, 2003  Slackware Linux, Inc., Concord, California, USA
+# Copyright 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.
+#
+# Modified to handle either old 8.3 or new package-version-arch-build.tgz
+# packages, Sat Nov 17 14:25:58 PST 2001 volkerdi
+#
+# Rewritten to clean out _all_ old packages of a given basename, not just
+# the first one found, Thu Apr  4 01:01:05 PST 2002 volkerdi
+#
+# Added --install-new and --reinstall, Fri May 31 14:11:14 PDT 2002 volkerdi
+# Added --dry-run, Sat Apr 26 18:13:29 PDT 2003
+#
+# Sat Apr 25 21:18:53 UTC 2009
+# Support new compression types and package extensions.
+# Converted to use new pkgbase() function to remove pathname and
+# valid package extensions.
+
+# Return a package name that has been stripped of the dirname portion
+# and any of the valid extensions (only):
+pkgbase() {
+  PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
+  case $PKGEXT in
+  'tgz' )
+    PKGRETURN=$(basename $1 .tgz)
+    ;;
+  'tbz' )
+    PKGRETURN=$(basename $1 .tbz)
+    ;;
+  'tlz' )
+    PKGRETURN=$(basename $1 .tlz)
+    ;;
+  'txz' )
+    PKGRETURN=$(basename $1 .txz)
+    ;;
+  *)
+    PKGRETURN=$(basename $1)
+    ;;
+  esac
+  echo $PKGRETURN
+}
+
+usage() {
+ cat << EOF
+
+Usage: upgradepkg newpackage [newpackage2 ... ]
+       upgradepkg oldpackage%newpackage [oldpackage2%newpackage2 ... ]
+
+Upgradepkg upgrades a Slackware package (.tgz, .tbz, .tlz, .txz) from an
+older version to a newer one.  It does this by INSTALLING the new package
+onto the system, and then REMOVING any files from the old package that
+aren't in the new package.  If the old and new packages have the same
+name, a single argument is all that is required.  If the packages have
+different names, supply the name of the old package followed by a percent
+symbol (%), then the name of the new package.  Do not add any extra
+whitespace between pairs of old/new package names.
+
+Before upgrading a package, save any configuration files (such as in /etc)
+that you wish to keep.  Sometimes these will be preserved, but it depends
+on the package.  If you want to force new versions of the config files
+to be installed, remove the old ones manually prior to running upgradepkg.
+
+To upgrade in a directory other than / (such as /mnt):  
+
+   ROOT=/mnt upgradepkg package.tgz (or .tbz, .tlz, .txz)
+
+EOF
+}
+
+# Make sure there's a proper temp directory:
+TMP=$ROOT/var/log/setup/tmp
+# If the $TMP directory doesn't exist, create it:
+if [ ! -d $TMP ]; then
+  rm -rf $TMP # make sure it's not a symlink or something stupid
+  mkdir $TMP
+  chmod 700 $TMP # no need to leave it open
+fi
+
+# This script expects an 022 umask:
+umask 022
+
+# $ROOT defined?
+if [ -d "$ROOT" ]; then
+  export ROOT
+fi
+
+# --help or no args?
+if [ "$1" = "" -o "$1" = "--help" -o "$1" = "-?" ]; then
+  usage;
+  exit 1;
+fi
+
+# Arg processing loop.  These must come before any packages are listed.
+while [ 0 ]; do
+  if [ "$1" = "--no-paranoia" ]; then
+    # Enable --no-paranoia mode.  This is so not-recommended that we're
+    # not even going to document it. ;)   If a file used to be directly
+    # managed and now is moved into place, using --no-paranoia will cause
+    # it to improperly disappear.  It does slightly speed things up, though.
+    # Don't use it.
+    NOT_PARANOID="true"
+    shift 1
+  elif [ "$1" = "--install-new" ]; then
+    # Install packages that do not already have an installed version.
+    # The usual default is to skip them.
+    INSTALL_NEW="yes"
+    shift 1
+  elif [ "$1" = "--reinstall" ]; then
+    # Reinstall packages even if the installed one is the same version.
+    REINSTALL="true"
+    shift 1
+  elif [ "$1" = "--verbose" -o "$1" = "-v" ]; then
+    # We're adding a --verbose mode that doesn't filter removepkg as much
+    VERBOSE="verbose"
+    shift 1
+  elif [ "$1" = "--dry-run" ]; then
+    # Output a report about which packages would be installed or upgraded
+    # but don't actually perform the upgrades.
+    DRY_RUN="true"
+    shift 1
+  else # no more args
+    break;
+  fi
+done # processing args
+
+# Here's a function to figure out the package name from one of those
+# new long filenames.  We'll need this to double check the name of the
+# old package.
+
+package_name() {
+  STRING=$(pkgbase $1)
+  # Check for old style package name with one segment:
+  if [ "$(echo $STRING | cut -f 1 -d -)" = "$(echo $STRING | cut -f 2 -d -)" ]; then
+    echo $STRING
+  else # has more than one dash delimited segment
+    # Count number of segments:
+    INDEX=1
+    while [ ! "$(echo $STRING | cut -f $INDEX -d -)" = "" ]; do
+      INDEX=$(expr $INDEX + 1)
+    done
+    INDEX=$(expr $INDEX - 1) # don't include the null value
+    # If we don't have four segments, return the old-style (or out of spec) package name:
+    if [ "$INDEX" = "2" -o "$INDEX" = "3" ]; then
+      echo $STRING
+    else # we have four or more segments, so we'll consider this a new-style name:
+      NAME=$(expr $INDEX - 3)
+      NAME="$(echo $STRING | cut -f 1-$NAME -d -)"
+      echo $NAME
+      # cruft for later ;)
+      #VER=$(expr $INDEX - 2)
+      #VER="$(echo $STRING | cut -f $VER -d -)"
+      #ARCH=$(expr $INDEX - 1)
+      #ARCH="$(echo $STRING | cut -f $ARCH -d -)"
+      #BUILD="$(echo $STRING | cut -f $INDEX -d -)"
+    fi
+  fi
+}
+
+ERRCODE=0
+
+# Main processing loop:
+while [ ! "$1" = "" ]; do
+
+# Simple package integrity check:
+if [ ! -f $(echo $1 | cut -f 2 -d '%') ]; then
+  ERRCODE=4
+  echo "Cannot install $1:  file not found"
+  shift 1
+  continue;
+fi
+
+# Figure out the names of the old and new packages:
+OLD=$(echo $1 | cut -f 1 -d '%')
+NEW=$(echo $1 | cut -f 2 -d '%')
+INCOMINGDIR=$(dirname $NEW)
+# These are the package names with the extension:
+NNAME=$(basename $NEW)
+ONAME=$(basename $OLD)
+# These are the package names without the extension:
+OLD=$(pkgbase $OLD)
+NEW=$(pkgbase $NEW)
+
+# Make sure the extension is valid:
+if [ "$NNAME" = "$NEW" ]; then
+  # We won't throw an ERRCODE for this, but the package is skipped:
+  echo "Cannot install $1:  invalid package extension"
+  shift 1
+  continue;
+fi
+
+# Check and fix the old package name:
+SHORT="$(package_name $OLD)"
+if [ ! -r $ROOT/var/log/packages/$OLD ]; then
+  if ls $ROOT/var/log/packages/$SHORT* 1> /dev/null 2> /dev/null ; then
+    for installed_package in $ROOT/var/log/packages/$SHORT* ; do
+      if [ "$(package_name $installed_package)" = "$SHORT" ]; then # found one
+        OLD="$(basename $installed_package)"
+        break
+      fi
+    done
+  fi
+fi
+
+# Test to see if both the old and new packages are where we expect them
+# to be -- skip to the next package (or package pair) if anything's wrong:
+
+if [ ! -r $ROOT/var/log/packages/$OLD ]; then
+  if [ ! "$INSTALL_NEW" = "yes" ]; then
+    if [ "$DRY_RUN" = "true" ]; then
+      echo "$OLD would not be upgraded (no installed package named $SHORT)."
+    else  
+      echo
+      echo "Error:  there is no installed package named $OLD."
+      echo "        (looking for $ROOT/var/log/packages/$OLD)"
+      echo
+    fi
+    ERRCODE=1
+  else # --install-new was given, so install the new package:
+    if [ "$DRY_RUN" = "true" ]; then
+      echo "$NEW would be installed (new package)."
+    else
+      cat << EOF
+
++==============================================================================
+| Installing new package $INCOMINGDIR/$NNAME
++==============================================================================
+
+EOF
+      installpkg $INCOMINGDIR/$NNAME
+    fi
+  fi
+  shift 1
+  continue;
+elif [ ! -r "$INCOMINGDIR/$NNAME" ]; then
+  if [ "$DRY_RUN" = "true" ]; then
+    echo "$NEW incoming package not found (command line)."
+  else
+    echo
+    echo "Error:  incoming package $INCOMINGDIR/$NNAME not found."
+    echo
+  fi
+  shift 1
+  ERRCODE=1
+  continue;
+fi
+
+# Unless --reinstall was given, compare the package names
+# and skip any exact matches:
+if [ ! "$REINSTALL" = "true" ]; then
+  if [ "$OLD" = "$NEW" ]; then
+    if [ "$DRY_RUN" = "true" ]; then
+      echo "$NEW would be skipped (already installed)."
+    else
+      cat << EOF
+
++==============================================================================
+| Skipping package $NEW (already installed)
++==============================================================================
+
+EOF
+    fi
+    shift 1
+    continue; 
+  fi
+fi
+
+# Showtime.  Let's do the upgrade.  First, we will rename all the
+# installed packages with this basename to make them easy to remove later:
+
+TIMESTAMP=$(date +%Y-%m-%d,%T)
+SHORT="$(package_name $OLD)"
+if [ "$DRY_RUN" = "true" ]; then
+  echo -n "$NEW would upgrade: "
+  for installed_package in $ROOT/var/log/packages/$SHORT* ; do
+  if [ "$(package_name $installed_package)" = "$SHORT" ]; then
+    echo -n "$(pkgbase $installed_package)"
+  fi
+  done
+  echo
+  shift 1
+  continue
+fi
+for installed_package in $ROOT/var/log/packages/$SHORT* ; do
+  if [ "$(package_name $installed_package)" = "$SHORT" ]; then
+    mv $installed_package ${installed_package}-upgraded-$TIMESTAMP
+  fi
+done
+for installed_script in $ROOT/var/log/scripts/$SHORT* ; do
+  if [ "$(package_name $installed_script)" = "$SHORT" ]; then
+    if [ -r $installed_script ]; then
+      mv $installed_script ${installed_script}-upgraded-$TIMESTAMP
+    fi
+  fi
+done
+
+# Print a banner for the current upgrade:
+cat << EOF
+
++==============================================================================
+| Upgrading $OLD package using $INCOMINGDIR/$NNAME
++==============================================================================
+
+EOF
+
+# Next, the new package is pre-installed:
+if [ "$VERBOSE" = "verbose" ]; then
+  installpkg $INCOMINGDIR/$NNAME
+  RETCODE=$?
+else
+  echo "Pre-installing package $NEW..."
+  installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+  RETCODE=$?
+fi
+# Make sure that worked:
+if [ ! $RETCODE = 0 ]; then
+  echo "ERROR:  Package $INCOMINGDIR/$NNAME did not install"
+  echo "correctly.  You may need to reinstall your old package"
+  echo "to avoid problems.  Make sure the new package is not"
+  echo "corrupted."
+  sleep 30
+  # Skip this package, but still try to proceed.  Good luck...
+  shift 1
+  continue;
+fi
+
+# Now, the leftovers from the old package(s) can go.  Pretty simple, huh? :)
+if [ -d "$ROOT" ]; then
+  ( cd $ROOT/var/log/packages
+    for rempkg in *-$TIMESTAMP ; do
+      if [ "$VERBOSE" = "verbose" ]; then
+        ROOT=$ROOT removepkg $rempkg
+      else
+        ROOT=$ROOT removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:"
+      fi
+    done
+  )
+else
+  ( cd /var/log/packages
+    for rempkg in *-$TIMESTAMP ; do
+      if [ "$VERBOSE" = "verbose" ]; then
+        removepkg $rempkg
+      else
+        removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:"
+      fi
+    done
+  )
+fi
+echo
+
+# Again!  Again!
+# Seriously, the reinstalling of a package can be crucial if any files
+# shift location, so we should always reinstall as the final step:
+if [ ! "$NOT_PARANOID" = "true" ]; then
+  installpkg $INCOMINGDIR/$NNAME
+fi
+
+echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME."
+ERRCODE=0
+
+# Process next parameter:
+shift 1
+
+done
+
+if [ ! "$DRY_RUN" = "true" ]; then
+  echo
+fi
+exit $ERRCODE
diff --git a/source/a/pkgtools/slack-desc b/source/a/pkgtools/slack-desc
new file mode 100644
index 000000000..ab3fc1198
--- /dev/null
+++ b/source/a/pkgtools/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------------------------------------------------------|
+pkgtools: pkgtools (The Slackware package maintenance system)
+pkgtools:
+pkgtools: This package contains utilities for handling Slackware packages.
+pkgtools: Included are the command line utilities 'installpkg', 'removepkg',
+pkgtools: 'makepkg', 'explodepkg', and 'upgradepkg' that install, remove,
+pkgtools: build, examine, and upgrade software packages.  Also included are 
+pkgtools: 'pkgtool', a menu based program for installing packages, removing
+pkgtools: packages, or viewing the packages that are installed on the system,
+pkgtools: documentation (man pages), and a few other system admin scripts.
+pkgtools:
+pkgtools:
diff --git a/source/a/procps/procinfo.gcc3.diff b/source/a/procps/procinfo.gcc3.diff
new file mode 100644
index 000000000..96a3dbb19
--- /dev/null
+++ b/source/a/procps/procinfo.gcc3.diff
@@ -0,0 +1,11 @@
+--- ./routines.c.orig	2001-02-24 15:30:45.000000000 -0800
++++ ./routines.c	2003-02-07 13:38:09.000000000 -0800
+@@ -390,7 +390,7 @@
+     unsigned int d, h, m, s;
+     static char buf[22];
+ 
+-    t = t * 100 / HZ;
++    t = t * 100. / HZ;
+     d = (int) (t / 8640000);
+     t = t - (long) (d * 8640000);
+     h = (int) (t / 360000);
diff --git a/source/a/procps/procinfo.lsm b/source/a/procps/procinfo.lsm
new file mode 100644
index 000000000..70ff559f6
--- /dev/null
+++ b/source/a/procps/procinfo.lsm
@@ -0,0 +1,15 @@
+Begin3
+Title:		procinfo
+Version:	18
+Entered-date:	02MAR01
+Description:	A utility to prettyprint /proc/*
+Keywords:	procinfo, system info
+Author:		svm@kozmix.cistron.nl (Sander van Malssen)
+Maintained-by:	svm@kozmix.cistron.nl (Sander van Malssen)
+Primary-site:	ftp.cistron.nl /pub/people/svm
+		23k procinfo-18.tar.gz
+Alternate-site:	metalab.unc.edu /pub/Linux/system/status/ps
+Alternate-site:	tsx-11.mit.edu /pub/linux/sources/usr.bin
+Platforms:	Linux 1.0.x - 2.4.x
+Copying-policy:	GNU Public License
+End
diff --git a/source/a/procps/procps-3.2.7-ps-eip64.diff b/source/a/procps/procps-3.2.7-ps-eip64.diff
new file mode 100644
index 000000000..9eb851f44
--- /dev/null
+++ b/source/a/procps/procps-3.2.7-ps-eip64.diff
@@ -0,0 +1,48 @@
+--- procps-3.2.7/ps/ps.1.eip64	2007-06-14 11:08:35.000000000 +0200
++++ procps-3.2.7/ps/ps.1	2007-06-14 11:03:28.000000000 +0200
+@@ -1156,6 +1156,14 @@
+ or\ a\ decimal representation otherwise.
+ T}
+ 
++rip	RIP	T{
++64-bit instruction pointer.
++T}
++
++rsp	RSP	T{
++64-bit stack pointer.
++T}
++
+ rss	RSS	T{
+ resident set size, the non\-swapped physical memory that
+ a task has used (in\ kiloBytes).
+--- procps-3.2.7/ps/output.c.eip64	2007-06-14 11:08:24.000000000 +0200
++++ procps-3.2.7/ps/output.c	2007-06-14 10:58:21.000000000 +0200
+@@ -764,10 +764,18 @@
+     return snprintf(outbuf, COLWID, "%08x", (unsigned)(pp->kstk_esp));
+ }
+ 
++static int pr_rsp(char *restrict const outbuf, const proc_t *restrict const pp){
++    return snprintf(outbuf, COLWID, "%016lx", (unsigned long)(pp->kstk_esp));
++}
++
+ static int pr_eip(char *restrict const outbuf, const proc_t *restrict const pp){
+     return snprintf(outbuf, COLWID, "%08x", (unsigned)(pp->kstk_eip));
+ }
+ 
++static int pr_rip(char *restrict const outbuf, const proc_t *restrict const pp){
++    return snprintf(outbuf, COLWID, "%016lx", (unsigned long)(pp->kstk_eip));
++}
++
+ /* This function helps print old-style time formats */
+ static int old_time_helper(char *dst, unsigned long long t, unsigned long long rel) {
+   if(!t)            return snprintf(dst, COLWID, "    -");
+@@ -1403,7 +1411,9 @@
+ {"resident",  "RES",     pr_nop,      sr_resident, 5,MEM,    LNX, PO|RIGHT},
+ {"rgid",      "RGID",    pr_rgid,     sr_rgid,    5,   0,    XXX, ET|RIGHT},
+ {"rgroup",    "RGROUP",  pr_rgroup,   sr_rgroup,  8, GRP,    U98, ET|USER}, /* was 8 wide */
++{"rip",       "RIP",     pr_rip,      sr_kstk_eip, 16, 0,    LNX, TO|RIGHT},
+ {"rlink",     "RLINK",   pr_nop,      sr_nop,     8,   0,    BSD, AN|RIGHT},
++{"rsp",       "RSP",     pr_rsp,      sr_kstk_eip, 16, 0,    LNX, TO|RIGHT},
+ {"rss",       "RSS",     pr_rss,      sr_rss,     5,   0,    XXX, PO|RIGHT}, /* was 5 wide */
+ {"rssize",    "RSS",     pr_rss,      sr_vm_rss,  5,   0,    DEC, PO|RIGHT}, /*rsz*/
+ {"rsz",       "RSZ",     pr_rss,      sr_vm_rss,  5,   0,    BSD, PO|RIGHT}, /*rssize*/
diff --git a/source/a/procps/procps.SlackBuild b/source/a/procps/procps.SlackBuild
new file mode 100755
index 000000000..a5163bbc2
--- /dev/null
+++ b/source/a/procps/procps.SlackBuild
@@ -0,0 +1,191 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+
+VERSION=3.2.7
+# Sometimes this number lags behind...
+SOVER=3.2.7
+PSMISCVER=22.3
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-procps
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  LIBDIRSUFFIX=""
+elif [ "$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
+
+# Prepare build locations:
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf procps-$VERSION
+tar xzvf $CWD/procps-$VERSION.tar.gz
+cd procps-$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 {} \;
+
+mkdir -p $PKG/usr/doc/procps-$VERSION
+cp -a BUGS COPYING COPYING.LIB NEWS TODO $PKG/usr/doc/procps-$VERSION
+chown root:root $PKG/usr/doc/procps-$VERSION/*
+chmod 644 $PKG/usr/doc/procps-$VERSION/*
+# While I don't agree this is a harmful patch, I will defer to the
+# maintainer's judgement on this one.  Besides, I quit using the '-'
+# with ps years ago.  It wasn't that hard to change.
+#echo zcat $CWD/procps.nowarning.diff.gz
+#zcat $CWD/procps.nowarning.diff.gz | patch -p1 --verbose || exit 1
+
+# Display the location from which the user is logged in by default.
+# This is how previous versions of 'w' in Slackware have always
+# defaulted.
+echo zcat $CWD/procps.w.showfrom.diff.gz
+zcat $CWD/procps.w.showfrom.diff.gz | patch -p1 --verbose || exit 1
+
+if [ "$ARCH" = "x86_64" ]; then
+# Taken from RedHat: ps truncates eip and esp to 32bit values on 64bit systems.
+# The patch adds 64bit rip and rsp to the 'ps' output options on x86_64
+  zcat $CWD/procps-3.2.7-ps-eip64.diff.gz | patch -p1 --verbose || exit 1
+fi
+
+make OPT="$SLKCFLAGS"
+mkdir -p $PKG/lib${LIBDIRSUFFIX} $PKG/bin $PKG/sbin $PKG/usr/bin
+cat free > $PKG/bin/free
+cat ps/ps> $PKG/bin/ps
+cat proc/libproc-${SOVER}.so > $PKG/lib${LIBDIRSUFFIX}/libproc-${SOVER}.so
+cat pkill > $PKG/usr/bin/pkill
+cat skill > $PKG/usr/bin/skill
+cat pmap > $PKG/usr/bin/pmap
+cat slabtop > $PKG/usr/bin/slabtop
+cat sysctl > $PKG/sbin/sysctl
+cat tload > $PKG/usr/bin/tload
+cat top > $PKG/usr/bin/top
+cat uptime > $PKG/usr/bin/uptime
+cat vmstat > $PKG/usr/bin/vmstat
+cat w > $PKG/usr/bin/w
+cat watch > $PKG/usr/bin/watch
+( cd $PKG/usr/bin
+  ln -sf pkill pgrep
+  ln -sf skill snice
+  # Just in case
+  ln -sf /bin/free .
+  ln -sf /bin/ps .
+)
+cp -a ps/ps.1 .
+mkdir -p $PKG/usr/man/man1
+for page in free.1 pgrep.1 pkill.1 ps.1 slabtop.1 skill.1 snice.1 tload.1 top.1 uptime.1 w.1 watch.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
+done
+mkdir -p $PKG/usr/man/man5
+cat sysctl.conf.5 | gzip -9c > $PKG/usr/man/man5/sysctl.conf.5.gz
+mkdir -p $PKG/usr/man/man8
+for page in vmstat.8 sysctl.8 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man8/$page.gz
+done
+
+echo "+=============+"
+echo "| psmisc-$PSMISCVER |"
+echo "+=============+"
+cd $TMP
+rm -rf psmisc-$PSMISCVER
+tar xzvf $CWD/psmisc-$PSMISCVER.tar.gz
+cd psmisc-$PSMISCVER
+# Maybe we'll turn on NLS when it supports more than
+# just US English. :)
+CFLAGS="$SLKCFLAGS" \
+./configure --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-nls
+mkdir -p $PKG/usr/doc/psmisc-$PSMISCVER
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/psmisc-$PSMISCVER
+chmod 644 $PKG/usr/doc/psmisc-$PSMISCVER/*
+chown root:root $PKG/usr/doc/psmisc-$PSMISCVER/*
+make
+cd src
+strip fuser pstree killall
+cat fuser > $PKG/usr/bin/fuser
+cat pstree > $PKG/usr/bin/pstree
+cat killall > $PKG/bin/killall
+cd ../doc
+for page in fuser.1 killall.1 pstree.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
+done
+cd ..
+
+echo "+=============+"
+echo "| procinfo-18 |"
+echo "+=============+"
+cd $TMP
+rm -rf procinfo-18
+tar xzvf $CWD/procinfo-18.tar.gz
+cd procinfo-18
+zcat $CWD/procinfo.gcc3.diff.gz | patch -p1 --backup --suffix=.orig --verbose || exit 1
+mkdir -p $PKG/usr/doc/procinfo-18
+cp -a CHANGES README $PKG/usr/doc/procinfo-18
+chmod 644 $PKG/usr/doc/procinfo-18/*
+chown root:root $PKG/usr/doc/procinfo-18/*
+make CFLAGS="$SLKCFLAGS"
+strip procinfo
+cat procinfo > $PKG/usr/bin/procinfo
+cat lsdev.pl > $PKG/usr/bin/lsdev
+cat socklist.pl > $PKG/usr/bin/socklist
+for page in procinfo.8 lsdev.8 socklist.8 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man8/$page.gz
+done
+
+# Fix permissions:
+chmod 755 $PKG/lib${LIBDIRSUFFIX}/* $PKG/bin/* $PKG/sbin/* $PKG/usr/bin/*
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/procps-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/procps-$VERSION
+  rm -rf $TMP/procinfo-18
+  rm -rf $TMP/psmisc-$PSMISCVER
+  rm -rf $PKG
+fi
diff --git a/source/a/procps/procps.nowarning.diff b/source/a/procps/procps.nowarning.diff
new file mode 100644
index 000000000..bd4b1466a
--- /dev/null
+++ b/source/a/procps/procps.nowarning.diff
@@ -0,0 +1,25 @@
+--- ./ps/parser.c.orig	2004-08-09 17:41:10.000000000 -0700
++++ ./ps/parser.c	2004-08-16 18:30:09.000000000 -0700
+@@ -1213,12 +1213,20 @@
+   // about "ps -aux" suddenly changing behavior if a user "x" were
+   // added to the system.
+   //
++  //   Yes, this is still getting patched out here.  IMO, people can change
++  //   old habits if and when user 'x' comes along.  I still find this warning
++  //   to be a POLA violation.  No offense...  that's the beauty of open source.
++  //   You've got your ideas about this, and I have mine, and we're allowed
++  //   to disagree.  Nothing in the UNIX or POSIX standards requires this (annoying)
++  //   warning to be displayed, and we're not changing the actual behavior
++  //   of ps in any way.  I know of no other 'ps' that produces this message.
++  //
+   // Also, a "-x" option is coming. It's already there in fact,
+   // for some non-default personalities. So "ps -ax" will parse
+   // as SysV options... and you're screwed if you've been patching
+   // out the friendly warning. Cut-over is likely to be in 2005.
+-  if(!(personality & PER_FORCE_BSD))
+-    fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
++  // if(!(personality & PER_FORCE_BSD))
++  //  fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
+   // Remember: contact albert@users.sf.net or procps-feedback@lists.sf.net
+   // if you should feel tempted. Be damn sure you understand all
+   // the issues. The same goes for other stuff too, BTW. Please ask.
diff --git a/source/a/procps/procps.w.showfrom.diff b/source/a/procps/procps.w.showfrom.diff
new file mode 100644
index 000000000..0b1c71a3e
--- /dev/null
+++ b/source/a/procps/procps.w.showfrom.diff
@@ -0,0 +1,11 @@
+--- ./w.c.orig	2002-12-21 05:30:33.000000000 -0800
++++ ./w.c	2003-02-02 11:46:58.000000000 -0800
+@@ -33,6 +33,8 @@
+ 
+ typedef struct utmp utmp_t;
+ 
++#define W_SHOWFROM 1
++
+ #ifdef W_SHOWFROM
+ #   define FROM_STRING "on"
+ #else
diff --git a/source/a/procps/slack-desc b/source/a/procps/slack-desc
new file mode 100644
index 000000000..22cf9e0d2
--- /dev/null
+++ b/source/a/procps/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------------------------------------------------------|
+procps: procps (utilities for displaying process information)
+procps:
+procps: The procps package provides the classic set of utilities used to
+procps: display information about the processes currently running on the 
+procps: machine.
+procps:
+procps:
+procps:
+procps:
+procps:
+procps:
diff --git a/source/a/quota/quota.SlackBuild b/source/a/quota/quota.SlackBuild
new file mode 100755
index 000000000..0ae450b90
--- /dev/null
+++ b/source/a/quota/quota.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=3.17
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-quota
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf quota-tools
+tar xvf $CWD/quota-$VERSION.tar.?z*
+cd quota-tools
+chown -R root:root .
+find . -perm 2755 -exec chmod 755 {} \;
+./configure \
+   --prefix=/usr \
+   $ARCH-slackware-linux
+make
+make mo
+mkdir -p $PKG/sbin
+cat convertquota > $PKG/sbin/convertquota
+cat quotacheck > $PKG/sbin/quotacheck
+cat quotaon > $PKG/sbin/quotaon
+( cd $PKG/sbin ; ln -sf quotaon quotaoff )
+chmod 755 $PKG/sbin/*
+mkdir -p $PKG/usr/sbin
+for file in edquota repquota warnquota quotastats setquota quot xqmstats rpc.rquotad ; do
+  cat $file > $PKG/usr/sbin/$file
+done
+chmod 755 $PKG/usr/sbin/*
+mkdir -p $PKG/usr/bin
+cat quota > $PKG/usr/bin/quota
+chmod 755 $PKG/usr/bin/quota
+mkdir -p $PKG/usr/include/rpcsvc
+cat rquota.h > $PKG/usr/include/rpcsvc/rquota.h
+cat rquota.x > $PKG/usr/include/rpcsvc/rquota.x
+mkdir -p $PKG/etc
+cat warnquota.conf > $PKG/etc/warnquota.conf-sample
+cat quotatab > $PKG/etc/quotatab-sample
+cat quotagrpadmins > $PKG/etc/quotagrpadmins-sample
+mkdir -p $PKG/usr/man/man{1,2,3,8}
+for page in *.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
+done
+for page in *.2 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man2/$page.gz
+done
+for page in *.3 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man3/$page.gz
+done
+for page in *.8 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man8/$page.gz
+done
+mkdir -p $PKG/usr/share/locale/pl/LC_MESSAGES
+cat po/pl.mo > $PKG/usr/share/locale/pl/LC_MESSAGES/quota.mo
+mkdir -p $PKG/usr/doc/quota-$VERSION
+cp -a Changelog README* $PKG/usr/doc/quota-$VERSION
+( cd doc
+  sgml2txt quotadoc.sgml
+  sgml2html -s 0 quotadoc.sgml
+  if [ ! -r quotadoc.html ]; then
+    echo "WARNING: no quotadoc.html generated"
+    sleep 100
+  fi
+  cp quotadoc*txt quotadoc*html $PKG/usr/doc/quota-$VERSION/ )
+find $PKG/usr/doc/quota-$VERSION -name CVS -type d | xargs rm -rf
+( 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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/quota-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/quota
+  rm -rf $PKG
+fi
diff --git a/source/a/quota/slack-desc b/source/a/quota/slack-desc
new file mode 100644
index 000000000..dd07ea43b
--- /dev/null
+++ b/source/a/quota/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------------------------------------------------------|
+quota: quota (Linux disk quota utilities)
+quota:
+quota: An implementation of the diskquota system for the Linux operating
+quota: system to keep those greedy users from gobbling up 100% of the hard
+quota: drive space.  Works with ext2, ext3, reiserfs, and xfs filesystems.
+quota: This system is based on the Melbourne quota system by Robert Elz.
+quota: Edvard Tuinder and Marco van Wieringen ported this code to Linux.
+quota: Jan Kara added support for the new Linux quota format and the XFS
+quota: filesystem.
+quota:
+quota:
diff --git a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
new file mode 100755
index 000000000..c56d8f13f
--- /dev/null
+++ b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
@@ -0,0 +1,110 @@
+#!/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=3.6.21
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-reiserfs
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf reiserfsprogs-$VERSION
+tar xvf $CWD/reiserfsprogs-$VERSION.tar.?z* || exit 1
+cd reiserfsprogs-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sbindir=/sbin \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+if [ "$ARCH" = "x86_64" ]; then
+  # To prevent compilation errors due to broken header:
+  sed -i -e 's?#define HAVE_ASM_UNALIGNED_H 1?/* & */?' config.h
+fi
+
+make $NUMJOBS || make || exit1
+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
+
+# Add a couple of useful symlinks
+( cd $PKG/sbin
+  ln -sf mkreiserfs mkfs.reiserfs
+  ln -sf reiserfsck fsck.reiserfs
+)
+
+# These were renamed, it seems
+#  --> Deleting /usr/man/man8/debugreiserfs.8.gz
+#  --> Deleting /usr/man/man8/mkreiserfs.8.gz
+#  --> Deleting /usr/man/man8/reiserfsck.8.gz
+#  --> Deleting /usr/man/man8/reiserfstune.8.gz
+#  --> Deleting /usr/man/man8/resize_reiserfs.8.gz
+# Do we want symlinks for backwards compatibility?  If so...
+( cd $PKG/usr/man/man8
+  ln -s mkfs.reiserfs.8 mkreiserfs.8
+  ln -s debugfs.reiserfs.8 debugreiserfs.8
+  ln -s fsck.reiserfs.8 reiserfsck.8
+  ln -s tunefs.reiserfs.8 reiserfstune.8
+  ln -s resizefs.reiserfs.8 resize_reiserfs.8
+)
+
+# Compress the man pages
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/usr/doc/reiserfsprogs-$VERSION
+cp -a \
+  AUTHORS COPYING* CREDITS INSTALL NEWS README* \
+  $PKG/usr/doc/reiserfsprogs-$VERSION
+chmod 644 $PKG/usr/doc/reiserfsprogs-$VERSION/*
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/reiserfsprogs-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/reiserfsprogs/slack-desc b/source/a/reiserfsprogs/slack-desc
new file mode 100644
index 000000000..3358fdf77
--- /dev/null
+++ b/source/a/reiserfsprogs/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------------------------------------------------------|
+reiserfsprogs: reiserfsprogs (Reiserfs filesystem utilities)
+reiserfsprogs:
+reiserfsprogs: These utilities are used for Reiserfs.  Reiserfs is a file system
+reiserfsprogs: based on balanced tree algorithms.  Learn more at the home site:
+reiserfsprogs: http://www.namesys.com
+reiserfsprogs:
+reiserfsprogs: Reiserfs is the work of Hans Reiser and many others.  See the file
+reiserfsprogs: /usr/doc/reiserfs*/README for full credits.
+reiserfsprogs:
+reiserfsprogs:
+reiserfsprogs:
diff --git a/source/a/rpm2tgz/rpm2targz b/source/a/rpm2tgz/rpm2targz
new file mode 100644
index 000000000..484e5ad05
--- /dev/null
+++ b/source/a/rpm2tgz/rpm2targz
@@ -0,0 +1,129 @@
+#!/bin/sh
+# Copyright 1997, 1998  Patrick Volkerding, Moorhead, MN USA
+# Copyright 2002, 2004  Slackware Linux, Inc., Concord, CA USA
+# Copyright 2006, 2009  Patrick 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.
+#
+
+if [ "$1" = "" ]; then
+  echo "$0:  Converts RPM format to standard GNU tar + GNU zip format."
+  echo "            (view converted packages with \"less\", install and remove"
+  echo "            with \"installpkg\", \"removepkg\", \"pkgtool\", or manually"
+  echo "            with \"tar\")"
+  echo
+  echo "Usage:      $0 <file.rpm>"
+  if [ "$(basename $0)" = "rpm2tgz" ]; then
+    echo "            (Outputs \"file.tgz\")"
+  else
+    echo "            (Outputs \"file.tar.gz\")"
+  fi
+  exit 1;
+fi
+
+CWD=$(pwd)
+
+# Create a new temporary directory with a secure filename:
+make_temp_dir() {
+  if [ -x "$(which mcookie)" ]; then
+    tempd=/tmp/tmp.$(mcookie)
+    mkdir -p -m 0755 $tempd
+  elif [ -x "$(which openssl)" ]; then
+    tempd=/tmp/tmp.$(dd if=/dev/urandom bs=1k count=1 2> /dev/null | openssl dgst -md5)
+    mkdir -p -m 0755 $tempd
+  elif [ -x "$(which md5)" ]; then
+    tempd=/tmp/tmp.$(dd if=/dev/urandom bs=1k count=1 2> /dev/null | md5)
+    mkdir -p -m 0755 $tempd
+  elif [ -x "$(which mktemp)" ]; then
+    tempd=$(mktemp -d)
+    chmod 755 $tempd
+  ## Uncomment for insecure use, but don't blame me:
+  #else
+  #  tempd=/tmp/tmp.$$
+  #  mkdir -p -m 0755 $tempd
+  fi
+  if [ -d $tempd ]; then # success, return the name of the directory:
+    echo $tempd
+  else
+    echo "ERROR:  Could not find mcookie, openssl, or md5."
+    echo "        Exiting since a secure temporary directory could not be made."
+    exit 1
+  fi
+}
+
+for i in $* ; do
+  
+  # Determine if this is a source or binary RPM.
+  # If we have getrpmtype, use that.  Otherwise, try "file".
+  if which getrpmtype 1> /dev/null 2> /dev/null; then
+    if getrpmtype -n $i | grep source 1> /dev/null 2> /dev/null ; then
+      isSource=1
+    else
+      isSource=0
+    fi
+  else # use file.  This works fine on Slackware, and is the default.
+    if file $i | grep RPM | grep " src " 1> /dev/null 2> /dev/null ; then
+      isSource=1
+    else
+      isSource=0
+    fi
+  fi
+
+  # Create a temporary directory:
+  TMPDIR=$(make_temp_dir)
+
+  # Extract the RPM:
+  ofn=$TMPDIR/$(basename $i .rpm).cpio
+  if which rpm2cpio 1> /dev/null 2> /dev/null ; then
+    rpm2cpio $i > $ofn 2> /dev/null
+    if [ ! $? = 0 ]; then
+      echo "ERROR:  rpm2cpio failed.  (maybe $i is not an RPM?)"
+      rm -rf $TMPDIR
+      continue
+    fi
+  else # less reliable than rpm2cpio...
+    ( dd ibs=$(rpmoffset < $i) skip=1 if=$i 2> /dev/null | gzip -dc > $ofn 2>/dev/null ) || \
+    ( dd ibs=$(rpmoffset < $i) skip=1 if=$i 2> /dev/null | bzip2 -dc > $ofn 2>/dev/null )
+  fi
+  DEST=$TMPDIR
+  if [ "$isSource" = "1" ]; then
+     DEST=$DEST/$(basename $(basename $i .rpm) .src)
+  fi
+  mkdir -p $DEST
+  ( cd $DEST
+    cpio -i -m -d < $ofn 1> /dev/null 2> /dev/null
+    rm -f $ofn
+    find . -type d -perm 700 -exec chmod 755 {} \;
+  )
+
+  # If this program was called as "rpm2targz", then repack as a plain
+  # tar+gz archive.  If it was called as "rpm2tgz", use Slackware's
+  # makepkg to produce the .tgz:
+  if [ "$(basename $0)" = "rpm2tgz" ]; then
+    ( cd $TMPDIR ; makepkg -l y -c n $CWD/$(basename $i .rpm).tgz )
+  else
+    ( cd $TMPDIR ; tar cf - . ) > $(basename $i .rpm).tar
+    gzip -9 $(basename $i .rpm).tar
+  fi
+
+  # Remove temporary directory:
+  rm -rf $TMPDIR
+
+done
+
diff --git a/source/a/rpm2tgz/rpm2targz.README b/source/a/rpm2tgz/rpm2targz.README
new file mode 100644
index 000000000..2ce141c06
--- /dev/null
+++ b/source/a/rpm2tgz/rpm2targz.README
@@ -0,0 +1,18 @@
+
+This package contains 'rpm2targz', a simple utility to convert Red Hat-style
+RPM packages into standard tar.gz archives.  Converted binary packages can then
+be installed/removed using the 'installpkg/removepkg' commands, or 'pkgtool'. 
+
+It's advisable to at least examine the converted package with 'less' to make
+sure it won't do anything too crazy to your system.  If it does, Patrick
+Volkerding and David Cantrell are not responsible, so use this at your own
+risk.  :-)
+
+By default, rpm2targz will attempt to use "file" to detect source RPMS, and will
+put the contents into a subdirectory in the resulting package.  This may not be
+portable to other operating systems -- if you're trying to run rpm2targz on an
+OS that doesn't have a file that knows RPM types, and you care about this source
+RPM feature, you can compile and install David Cantrell's standalone getrpmtype
+utility.  The getrpmtype.tar.gz source archive can be found in Slackware's
+source tree in source/a/rpm2tgz/.
+
diff --git a/source/a/rpm2tgz/rpm2tgz.SlackBuild b/source/a/rpm2tgz/rpm2tgz.SlackBuild
new file mode 100755
index 000000000..abfe3298a
--- /dev/null
+++ b/source/a/rpm2tgz/rpm2tgz.SlackBuild
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=1.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-bin
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+echo "+===========+"
+echo "| rpm2targz |"
+echo "+===========+"
+cd $TMP
+mkdir -p $PKG/usr/bin
+cc -o $PKG/usr/bin/rpmoffset $CWD/rpmoffset.c
+cat $CWD/rpm2targz > $PKG/usr/bin/rpm2targz
+chmod 755 $PKG/usr/bin/{rpmoffset,rpm2targz}
+( cd $PKG/usr/bin ; ln -sf rpm2targz rpm2tgz )
+mkdir -p $PKG/usr/doc/rpm2targz
+cp -a $CWD/rpm2targz.README $PKG/usr/doc/rpm2targz/rpm2targz.README
+chown root:root $PKG/usr/doc/rpm2targz/rpm2targz.README
+chmod 644 $PKG/usr/doc/rpm2targz/rpm2targz.README
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/rpm2tgz-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/rpm2tgz/rpmoffset.c b/source/a/rpm2tgz/rpmoffset.c
new file mode 100644
index 000000000..57af397c6
--- /dev/null
+++ b/source/a/rpm2tgz/rpmoffset.c
@@ -0,0 +1,24 @@
+
+/* Find how deeply inside an .RPM the real data is */
+/* kept, and report the offset in bytes */
+
+/* Wouldn't it be a lot more sane if we could just untar these things? */
+
+#include <stdlib.h>
+
+/* These offsets keep getting bigger, so we're going to just bite a 2MB */
+/* chunk of RAM right away so that we have enough.  Yeah, horrible */
+/* quick and dirty implementation, but hey -- it gets the job done. */
+
+#define RPMBUFSIZ 2097152
+
+main()
+{
+        char *buff = malloc(RPMBUFSIZ),*eb,*p;
+        for (p = buff, eb = buff + read(0,buff,RPMBUFSIZ); p < eb; p++)
+                if ((*p == '\037' && p[1] == '\213' && p[2] == '\010') ||
+                   (*p == 'B' && p[1] == 'Z' && p[2] == 'h' && '1' <= p[3] && p[3] <= '9' ))
+                        printf("%d\n",p - buff),
+                        exit(0);
+        exit(1);
+}
diff --git a/source/a/rpm2tgz/slack-desc b/source/a/rpm2tgz/slack-desc
new file mode 100644
index 000000000..8f8861b5f
--- /dev/null
+++ b/source/a/rpm2tgz/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------------------------------------------------------|
+rpm2tgz: rpm2tgz (a tool for converting an RPM archive into a tar+gz one)
+rpm2tgz:
+rpm2tgz: Converts RPM format to Slackware's GNU tar + GNU zip format.  (view
+rpm2tgz: converted packages with "less", install and remove with "installpkg",
+rpm2tgz: "removepkg", "pkgtool", or manually with "tar").
+rpm2tgz:
+rpm2tgz: Converted packages come with no warranty.  ;-)
+rpm2tgz:
+rpm2tgz:
+rpm2tgz:
+rpm2tgz:
diff --git a/source/a/sdparm/sdparm.SlackBuild b/source/a/sdparm/sdparm.SlackBuild
new file mode 100755
index 000000000..e00a93568
--- /dev/null
+++ b/source/a/sdparm/sdparm.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=sdparm
+VERSION=${VERSION:-1.01}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+
+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"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2"
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION
+
+# 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 {} \;
+
+# Use --bindir=/usr/sbin, as that's where hdparm has always been...
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --bindir=/usr/sbin \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make -j4 || 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-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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING CREDITS INSTALL NEWS README notes.txt \
+  doc/sdparm.html \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/sdparm/slack-desc b/source/a/sdparm/slack-desc
new file mode 100644
index 000000000..497c4d9ec
--- /dev/null
+++ b/source/a/sdparm/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------------------------------------------------------|
+sdparm: sdparm (fetch and change SCSI attributes)
+sdparm:
+sdparm: sdparm is a utility for listing and potentially changing SCSI disk
+sdparm: parameters.  More generally it can be used on any device that uses
+sdparm: a SCSI command set.  Apart from SCSI disks, examples of devices that
+sdparm: use SCSI command sets are ATAPI CD/DVD drives, SCSI and ATAPI tape
+sdparm: drives and SCSI enclosures.
+sdparm:
+sdparm: sdparm was written by Douglas Gilbert.
+sdparm:
+sdparm:
diff --git a/source/a/sed/sed.SlackBuild b/source/a/sed/sed.SlackBuild
new file mode 100755
index 000000000..8dedfc4b4
--- /dev/null
+++ b/source/a/sed/sed.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+
+VERSION=4.1.5
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sed
+
+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"
+fi
+
+rm -rf $PKG
+mkdir -p $PKG $PKG
+
+cd $TMP
+rm -rf sed-$VERSION
+tar xzvf $CWD/sed-$VERSION.tar.gz
+cd sed-$VERSION
+chown -R root:root .
+find . -perm 777 -exec chmod 755 {} \;
+find . -perm 664 -exec chmod 644 {} \;
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  $ARCH-slackware-linux
+make -j5
+make install DESTDIR=$PKG
+mkdir -p $PKG/bin
+mv $PKG/usr/bin/sed $PKG/bin
+( cd $PKG/usr/bin ; ln -sf /bin/sed . )
+( 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
+)
+mkdir -p $PKG/usr/doc/sed-$VERSION
+cp -a \
+  ANNOUNCE AUTHORS BUGS COPYING* INSTALL NEWS README README.boot THANKS TODO \
+  $PKG/usr/doc/sed-$VERSION
+gzip -9 $PKG/usr/man/man?/*.?
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/sed-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/sed/slack-desc b/source/a/sed/slack-desc
new file mode 100644
index 000000000..46e3ef350
--- /dev/null
+++ b/source/a/sed/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------------------------------------------------------|
+sed: sed (stream editor)
+sed:
+sed: This is the GNU version of sed, a stream editor.  A stream editor is
+sed: used to perform basic text transformations on an input stream (a file
+sed: or input from a pipeline).  It is sed's ability to filter text in a
+sed: pipeline which distinguishes it from other types of editors.
+sed:
+sed: sed is a required package (it is needed by many system scripts).
+sed:
+sed:
+sed:
diff --git a/source/a/shadow/adduser b/source/a/shadow/adduser
new file mode 100644
index 000000000..02385e33c
--- /dev/null
+++ b/source/a/shadow/adduser
@@ -0,0 +1,437 @@
+#!/bin/bash
+#
+# Copyright 1995  Hrvoje Dogan, Croatia.
+# Copyright 2002, 2003, 2004, 2008, 2009  Stuart Winter, Surrey, England, UK.
+# Copyright 2004, 2008, 2009  Slackware Linux, Inc., Concord, CA, 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.
+#
+#
+##########################################################################
+# Program: /usr/sbin/adduser
+# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
+# Author : Stuart Winter <mozes@slackware.com>
+#          Based on the original Slackware adduser by Hrvoje Dogan
+#          with modifications by Patrick Volkerding
+# Version: 1.12
+##########################################################################
+# Usage..: adduser [<new_user_name>]
+##########################################################################
+# History #
+###########
+# v1.12 - 21/07/09
+#       * Adjusted the search of /etc/passwd to exclude the NIS inclusion
+#        string.  Thanks to Dominik L. Borkowski.
+# v1.11 - 04/06/09
+#       * Add power and netdev to the suggested group list
+# v1.10 - 24/03/08
+#       * To facilitate use of the automatic mounting features of HAL,
+#         allow the admin to easily add users to the default groups:
+#         audio,cdrom,video,plugdev,floppy.
+#         The default is not to add new users to these groups.
+#         And by the way, this script is "useradd from Slackware" not
+#         "superadduser from Gentoo" ;-)
+# v1.09 - 07/06/04 
+#       * Added standard Slackware script licence to the head of this file.
+# v1.08 - 25/04/04
+#       * Disallow user names that begin with a numeric because useradd 
+#         (from shadow v4.03) does not allow them. <sw>
+# v1.07 - 07/03/03
+#       * When supplying a null string for the uid (meaning 'Choose next available'), 
+#         if there were file names in the range 'a-z' in the pwd then the 
+#         egrep command considered these files rather than the null string. 
+#         The egrep expression is now in quotes.  
+#         Reported & fixed by Vadim O. Ustiansky <sw>
+# v1.06 - 31/03/03
+#       * Ask to chown user.group the home directory if it already exists.
+#         This helps reduce later confusion when adding users whose home dir
+#         already exists (mounted partition for example) and is owned
+#         by a user other than the user to which the directory is being
+#         assigned as home.  Default is not to chown.
+#         Brought to my attention by mRgOBLIN. <sw>
+# v1.05 - 04/01/03
+#       * Advise & prevent users from creating logins with '.' characters
+#         in the user name. <sw>
+#       * Made pending account creation info look neater <sw>
+# v1.04 - 09/06/02
+#       * Catered for shadow-4.0.3's 'useradd' binary that no longer
+#         will let you create a user that has any uppercase chars in it
+#         This was reported on the userlocal.org forums
+#         by 'xcp' - thanks. <sw,pjv>
+# v1.03 - 20/05/02
+#       * Support 'broken' (null lines in) /etc/passwd and 
+#         /etc/group files <sw>       
+#       * For recycling UIDs (default still 'off'), we now look in 
+#         /etc/login.defs for the UID_MIN value and use it
+#         If not found then default to 1000 <sw>
+# v1.02 - 10/04/02
+#       * Fix user-specified UID bug. <pjv>
+# v1.01 - 23/03/02
+#       * Match Slackware indenting style, simplify. <pjv>
+# v1.00 - 22/03/02
+#       * Created
+#######################################################################
+
+# Path to files
+pfile=/etc/passwd
+gfile=/etc/group
+sfile=/etc/shells
+
+# Paths to binaries
+useradd=/usr/sbin/useradd
+chfn=/usr/bin/chfn
+passwd=/usr/bin/passwd
+chmod=/bin/chmod
+
+# Defaults
+defhome=/home
+defshell=/bin/bash
+defchmod=711 # home dir permissions - may be preferable to use 701, however.
+defgroup=users 
+AGID="audio cdrom floppy plugdev video power netdev" # additional groups for desktop users
+
+# Determine what the minimum UID is (for UID recycling)
+# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
+export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
+# If we couldn't find it, set it to the default of 1000
+if [ -z "$recycleUIDMIN" ]; then
+   export recycleUIDMIN=1000  # this is the default from Slackware's /etc/login.defs
+fi
+
+
+# This setting enables the 'recycling' of older unused UIDs.
+# When you userdel a user, it removes it from passwd and shadow but it will
+# never get used again unless you specify it expliticly -- useradd (appears to) just
+# look at the last line in passwd and increment the uid.  I like the idea of 
+# recycling uids but you may have very good reasons not to (old forgotten
+# confidential files still on the system could then be owned by this new user).
+# We'll set this to no because this is what the original adduser shell script
+# did and it's what users expect.
+recycleuids=no
+
+# Function to read keyboard input.
+# bash1 is broken (even ash will take read -ep!), so we work around
+# it (even though bash1 is no longer supported on Slackware).
+function get_input() { 
+  local output
+  if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then
+    echo -n "${1} " >&2 # fudge for use with bash v1
+    read output
+  else # this should work with any other /bin/sh
+    read -ep "${1} " output
+  fi
+  echo $output
+}
+
+# Function to display the account info
+function display () {
+  local goose
+  goose="$(echo $2 | cut -d ' ' -f 2-)"  # lop off the prefixed argument useradd needs
+  echo -n "$1 "
+  # If it's null then display the 'other' information
+  if [ -z "$goose" -a ! -z "$3" ]; then 
+    echo "$3" 
+  else 
+    echo "$goose" 
+  fi
+}
+
+# Function to check whether groups exist in the /etc/group file
+function check_group () {
+  local got_error group
+  if [ ! -z "$@" ]; then  
+  for group in $@ ; do
+    local uid_not_named="" uid_not_num=""
+    grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes  
+    grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
+    if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
+      echo "- Group '$group' does not exist"
+      got_error=yes
+    fi
+  done
+  fi
+  # Return exit code of 1 if at least one of the groups didn't exist
+  if [ ! -z "$got_error" ]; then
+    return 1
+  fi
+}   
+
+#: Read the login name for the new user :#
+#
+# Remember that most Mail Transfer Agents are case independant, so having
+# 'uSer' and 'user' may cause confusion/things to break.  Because of this,
+# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
+# and we must reject them, too.
+
+# Set the login variable to the command line param
+echo
+LOGIN="$1"
+needinput=yes
+while [ ! -z $needinput ]; do
+  if [ -z "$LOGIN" ]; then 
+    while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done
+  fi
+  grep "^${LOGIN}:" $pfile >/dev/null 2>&1  # ensure it's not already used
+  if [ $? -eq 0 ]; then
+    echo "- User '$LOGIN' already exists; please choose another"
+    unset LOGIN
+  elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then
+    echo "- User names cannot begin with a number; please choose another"
+    unset LOGIN
+  elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase
+    echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
+    unset LOGIN
+  elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then
+    echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
+    unset LOGIN
+  else
+    unset needinput
+  fi
+done
+
+# Display the user name passed from the shell if it hasn't changed
+if [ "$1" = "$LOGIN" ]; then
+  echo "Login name for new user: $LOGIN"
+fi
+
+#: Get the UID for the user & ensure it's not already in use :#
+#
+# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
+# when you change password for the uid, it finds the first match in /etc/passwd 
+# which isn't necessarily the correct user
+#
+echo
+needinput=yes
+while [ ! -z "$needinput" ]; do
+  _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
+  egrep -v "^$|^\+" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    echo "- That UID is already in use; please choose another"
+  elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
+    echo "- UIDs are numerics only"         
+  else
+    unset needinput
+  fi
+done
+# If we were given a UID, then syntax up the variable to pass to useradd
+if [ ! -z "$_UID" ]; then 
+  U_ID="-u ${_UID}"
+else
+  # Will we be recycling UIDs?
+  if [ "$recycleuids" = "yes" ]; then
+    U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
+  fi   
+fi
+
+#: Get the initial group for the user & ensure it exists :#
+#
+# We check /etc/group for both the text version and the group ID number 
+echo
+needinput=yes
+while [ ! -z "$needinput" ]; do
+  GID="$(get_input "Initial group [ ${defgroup} ]:")"
+  check_group "$GID"
+  if [ $? -gt 0 ]; then
+    echo "- Please choose another"
+  else
+    unset needinput 
+  fi
+done
+# Syntax the variable ready for useradd
+if [ -z "$GID" ]; then
+  GID="-g ${defgroup}"
+else
+  GID="-g ${GID}"
+fi
+
+#: Get additional groups for the user :#
+#
+echo "Additional UNIX groups:"
+echo
+echo "Users can belong to additional UNIX groups on the system."
+echo "For local users using graphical desktop login managers such"
+echo "as XDM/KDM, users may need to be members of additional groups"
+echo "to access the full functionality of removable media devices."
+echo
+echo "* Security implications *"
+echo "Please be aware that by adding users to additional groups may"
+echo "potentially give access to the removable media of other users."
+echo
+echo "If you are creating a new user for remote shell access only,"
+echo "users do not need to belong to any additional groups as standard,"
+echo "so you may press ENTER at the next prompt."
+echo
+needinput=yes
+while [ ! -z "$needinput" ]; do
+  history -c
+  history -s "$AGID"
+  echo "Press ENTER to continue without adding any additional groups"
+  echo "Or press the UP arrow to add/select/edit additional groups"
+  AGID="$(get_input ": " | tr -d '[:punct:]' | tr -s ' ' | sed 's?^ $??g' )"
+  if [ ! -z "$AGID" ]; then
+    check_group "$AGID" # check all groups at once (treated as N # of params)
+    if [ $? -gt 0 ]; then
+      echo "- Please re-enter the group(s)"
+      echo
+    else
+      unset needinput # we found all groups specified
+      AGID="-G $(echo $AGID | tr ' ' ,)" # useradd takes comma delimited groups
+    fi
+  else
+    unset needinput # we don't *have* to have additional groups
+  fi
+done
+
+#: Get the new user's home dir :#
+#       
+echo
+needinput=yes
+while [ ! -z "$needinput" ]; do
+  HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
+  if [ -z "$HME" ]; then
+    HME="${defhome}/${LOGIN}"
+  fi 
+  # Warn the user if the home dir already exists
+  if [ -d "$HME" ]; then
+    echo "- Warning: '$HME' already exists !"
+    getyn="$(get_input "  Do you wish to change the home directory path ? (Y/n) ")"
+    if [ "$(echo $getyn | grep -i "n")" ]; then
+      unset needinput
+      # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
+      getyn="$(get_input "  Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
+      if [ "$(echo $getyn | grep -i "y")" ]; then
+         CHOWNHOMEDIR=$HME # set this to the home directory
+      fi
+    fi
+  else
+    unset needinput
+  fi
+done           
+HME="-d ${HME}"  
+    
+#: Get the new user's shell :#
+echo
+needinput=yes
+while [ ! -z "$needinput" ]; do
+  unset got_error
+  SHL="$(get_input "Shell [ ${defshell} ]")"
+  if [ -z "$SHL" ]; then
+    SHL="${defshell}"
+  fi 
+  # Warn the user if the shell doesn't exist in /etc/shells or as a file
+  if [ -z "$(grep "^${SHL}$" $sfile)" ]; then
+    echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
+    got_error=yes
+  fi
+  if [ ! -f "$SHL" ]; then
+    echo "- Warning: ${SHL} does not exist as a file"
+    got_error=yes
+  fi
+  if [ ! -z "$got_error" ]; then
+    getyn="$(get_input "  Do you wish to change the shell ? (Y/n) ")"
+    if [ "$(echo $getyn | grep -i "n")" ]; then
+      unset needinput
+    fi
+  else
+    unset needinput
+  fi
+done           
+SHL="-s ${SHL}"
+
+#: Get the expiry date :#
+echo
+needinput=yes
+while [ ! -z "$needinput" ]; do
+  EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
+  if [ ! -z "$EXP" ]; then
+    # Check to see whether the expiry date is in the valid format
+    if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
+      echo "- That is not a valid expiration date"
+    else
+      unset needinput 
+      EXP="-e ${EXP}" 
+    fi
+  else
+    unset needinput
+  fi
+done
+
+# Display the info about the new impending account
+echo
+echo "New account will be created as follows:"
+echo
+echo "---------------------------------------"
+display "Login name.......: " "$LOGIN"
+display "UID..............: " "$_UID" "[ Next available ]"
+display "Initial group....: " "$GID"
+display "Additional groups: " "$AGID" "[ None ]"
+display "Home directory...: " "$HME"
+display "Shell............: " "$SHL"
+display "Expiry date......: " "$EXP" "[ Never ]"
+echo
+
+echo "This is it... if you want to bail out, hit Control-C.  Otherwise, press"
+echo "ENTER to go ahead and make the account."
+read junk
+
+echo
+echo "Creating new account..."
+echo
+echo
+
+# Add the account to the system
+CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
+$CMD
+
+if [ $? -gt 0 ]; then
+  echo "- Error running useradd command -- account not created!"
+  echo "(cmd: $CMD)"
+  exit 1
+fi
+
+# chown the home dir ?  We can only do this once the useradd has
+# completed otherwise the user name doesn't exist.
+if [ ! -z "${CHOWNHOMEDIR}" ]; then
+  chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
+fi
+
+# Set the finger information
+$chfn "$LOGIN"
+if [ $? -gt 0 ]; then
+  echo "- Warning: an error occurred while setting finger information"
+fi
+
+# Set a password
+$passwd "$LOGIN"
+if [ $? -gt 0 ]; then
+  echo "* WARNING: An error occured while setting the password for"
+  echo "           this account.  Please manually investigate this *"
+  exit 1
+fi
+
+# If it was created (it should have been!), set the permissions for that user's dir 
+HME="$(echo "$HME" | awk '{print $2}')"  # We have to remove the -g prefix
+if [ -d "$HME" ]; then
+  $chmod $defchmod "$HME"
+fi
+
+echo
+echo
+echo "Account setup complete."
+exit 0
diff --git a/source/a/shadow/shadow-4.0.3.x86_64.diff b/source/a/shadow/shadow-4.0.3.x86_64.diff
new file mode 100644
index 000000000..15d16c7c8
--- /dev/null
+++ b/source/a/shadow/shadow-4.0.3.x86_64.diff
@@ -0,0 +1,166 @@
+--- shadow-4.0.3/libmisc/failure.h.orig	2004-01-02 18:47:01.000000000 -0800
++++ shadow-4.0.3/libmisc/failure.h	2004-01-02 18:52:38.000000000 -0800
+@@ -4,7 +4,12 @@
+ 
+ #include "defines.h"
+ #include "faillog.h"
++
++#if HAVE_UTMPX_H
++#include <utmpx.h>
++#else
+ #include <utmp.h>
++#endif
+ 
+ /*
+  * failure - make failure entry
+@@ -38,7 +43,11 @@
+  *	failtmp updates the (struct utmp) formatted failure log which
+  *	maintains a record of all login failures.
+  */
++#if HAVE_UTMPX_H
++extern void failtmp(const struct utmpx *);
++#else
+ extern void failtmp(const struct utmp *);
++#endif
+ 
+ #endif
+ 
+--- shadow-4.0.3/libmisc/failure.c.orig	2004-01-02 18:47:06.000000000 -0800
++++ shadow-4.0.3/libmisc/failure.c	2004-01-02 18:53:37.000000000 -0800
+@@ -39,7 +39,11 @@
+ #include "getdef.h"
+ #include "failure.h"
+ 
++#if HAVE_UTMPX_H
++#include <utmpx.h>
++#else
+ #include <utmp.h>
++#endif
+ 
+ #define	YEAR	(365L*DAY)
+ 
+@@ -248,7 +252,11 @@
+  */
+ 
+ void
++#if HAVE_UTMPX_H
++failtmp(const struct utmpx *failent)
++#else
+ failtmp(const struct utmp *failent)
++#endif
+ {
+ 	char *ftmp;
+ 	int fd;
+--- shadow-4.0.3/libmisc/log.c.orig	2004-01-02 18:58:04.000000000 -0800
++++ shadow-4.0.3/libmisc/log.c	2004-01-02 18:58:51.000000000 -0800
+@@ -57,6 +57,7 @@
+ 	int	fd;
+ 	off_t	offset;
+ 	struct	lastlog	newlog;
++	time_t  ll_time;
+ 
+ 	/*
+ 	 * If the file does not exist, don't create it.
+@@ -88,7 +89,8 @@
+ 	if (ll)
+ 		*ll = newlog;
+ 
+-	time(&newlog.ll_time);
++        ll_time = newlog.ll_time;
++	time(&ll_time);
+ 	strncpy(newlog.ll_line, line, sizeof newlog.ll_line);
+ #if HAVE_LL_HOST
+ 	strncpy(newlog.ll_host, host, sizeof newlog.ll_host);
+--- shadow-4.0.3/libmisc/utmp.c.orig	2004-01-02 18:59:04.000000000 -0800
++++ shadow-4.0.3/libmisc/utmp.c	2004-01-02 19:05:34.000000000 -0800
+@@ -79,6 +79,8 @@
+ {
+ 	char *line;
+ 	struct utmp *ut;
++	time_t uttime;
++
+ 	pid_t pid = getpid();
+ 
+ 	setutent();
+@@ -111,7 +113,8 @@
+ 		/* XXX - assumes /dev/tty?? */
+ 		strncpy(utent.ut_id, utent.ut_line + 3, sizeof utent.ut_id);
+ 		strcpy(utent.ut_user, "LOGIN");
+-		time(&utent.ut_time);
++		time(&uttime);
++		utent.ut_time = uttime;
+ 	}
+ }
+ 
+@@ -284,9 +287,14 @@
+ void
+ setutmp(const char *name, const char *line, const char *host)
+ {
++        time_t uttime;
++
+ 	utent.ut_type = USER_PROCESS;
+ 	strncpy(utent.ut_user, name, sizeof utent.ut_user);
+-	time(&utent.ut_time);
++	
++	time(&uttime);
++	utent.ut_time = uttime;
++
+ 	/* other fields already filled in by checkutmp above */
+ 	setutent();
+ 	pututline(&utent);
+--- shadow-4.0.3/src/lastlog.c.orig	2004-01-02 18:06:09.000000000 -0800
++++ shadow-4.0.3/src/lastlog.c	2004-01-02 18:29:57.000000000 -0800
+@@ -167,6 +167,7 @@
+ 	static int once;
+ 	char *cp;
+ 	struct tm *tm;
++	time_t ll_time;
+ 
+ #ifdef HAVE_STRFTIME
+ 	char ptime[80];
+@@ -184,7 +185,9 @@
+ #endif
+ 		once++;
+ 	}
+-	tm = localtime (&lastlog.ll_time);
++	ll_time = lastlog.ll_time; 
++	tm = localtime (&ll_time);
++
+ #ifdef HAVE_STRFTIME
+ 	strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm);
+ 	cp = ptime;
+--- shadow-4.0.3/src/login.c.orig	2004-01-02 18:33:13.000000000 -0800
++++ shadow-4.0.3/src/login.c	2004-01-02 18:40:17.000000000 -0800
+@@ -1019,8 +1019,12 @@
+ 			const char *failent_user;
+ 
+ #if HAVE_UTMPX_H
++			struct timeval ut_tv;
++			ut_tv.tv_sec = failent.ut_tv.tv_sec;
++			ut_tv.tv_usec = failent.ut_tv.tv_usec;
++
+ 			failent = utxent;
+-			gettimeofday (&(failent.ut_tv), NULL);
++			gettimeofday (&ut_tv, NULL);
+ #else
+ 			failent = utent;
+ 			time (&failent.ut_time);
+@@ -1271,15 +1275,16 @@
+ 		}
+ 		if (getdef_bool ("LASTLOG_ENAB")
+ 		    && lastlog.ll_time != 0) {
++			time_t ll_time= lastlog.ll_time;
+ #ifdef HAVE_STRFTIME
+ 			strftime (ptime, sizeof (ptime),
+ 				  "%a %b %e %H:%M:%S %z %Y",
+-				  localtime (&lastlog.ll_time));
++				  localtime (&ll_time));
+ 			printf (_("Last login: %s on %s"),
+ 				ptime, lastlog.ll_line);
+ #else
+ 			printf (_("Last login: %.19s on %s"),
+-				ctime (&lastlog.ll_time),
++				ctime (&ll_time),
+ 				lastlog.ll_line);
+ #endif
+ #ifdef HAVE_LL_HOST		/* SVR4 || __linux__ || SUN4 */
diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild
new file mode 100755
index 000000000..2f0e11786
--- /dev/null
+++ b/source/a/shadow/shadow.SlackBuild
@@ -0,0 +1,156 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+VERSION=4.0.3
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-18}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-shadow
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_shadow.tar.gz
+
+cd $TMP
+rm -rf shadow-$VERSION
+tar xjvf $CWD/shadow-$VERSION.tar.bz2
+cd shadow-$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/shadow.shadowconfig.diff.gz | patch -p1 --verbose --backup || exit 1
+zcat $CWD/shadow.newgrp.nopam.gz | patch -p0 --verbose --backup || exit 1
+zcat $CWD/shadow.login.defs.diff.gz | patch -p0 --verbose --backup || exit 1
+zcat $CWD/shadow.newgrp.getlogin.gz | patch -p1 --verbose --backup || exit 1
+zcat $CWD/shadow.gcc34.diff.gz | patch -p1 --verbose --backup || exit 1
+zcat $CWD/shadow.remove.obsolete.options.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+if [ "$ARCH" = "x86_64" ]; then
+  zcat $CWD/shadow-4.0.3.x86_64.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+fi
+
+./configure \
+  --prefix=/usr \
+  --disable-shared \
+  --disable-desrpc \
+  --build=$ARCH-slackware-linux
+
+make -j6 || exit 1
+cat etc/login.defs.linux > $PKG/etc/login.defs.new
+cat etc/login.access > $PKG/etc/login.access.new
+cat $CWD/adduser > $PKG/usr/sbin/adduser
+
+# These things aren't needed when using glibc, as it
+# supplies its own shadow functions:
+#cat lib/libshadow.a > $PKG/usr/lib/libshadow.a
+#cp -a lib/pwauth.h $PKG/usr/include/shadow/pwauth.h
+#cp -a lib/shadow_.h $PKG/usr/include/shadow/shadow.h
+#chmod 644 $PKG/usr/include/shadow/*
+#chown root.root $PKG/usr/include/shadow/*
+
+cd po
+for file in *.gmo ; do
+  mkdir -p $PKG/usr/share/locale/$(basename $file .gmo)/LC_MESSAGES
+  cat $file > $PKG/usr/share/locale/$(basename $file .gmo)/LC_MESSAGES/shadow.mo
+done
+cd ../src
+cat login > $PKG/bin/login
+cat su > $PKG/bin/su
+cat sulogin > $PKG/sbin/sulogin
+cat ../debian/shadowconfig.sh > $PKG/usr/sbin/shadowconfig
+for file in chpasswd dpasswd faillog groupadd groupdel groupmod grpck \
+lastlog logoutd mkpasswd newusers pwck useradd userdel usermod \
+pwconv pwunconv grpconv grpunconv vipw ; do
+  cat $file > $PKG/usr/sbin/$file
+done
+for file in chage chfn chsh expiry gpasswd newgrp passwd ; do
+  cat $file > $PKG/usr/bin/$file
+done
+cd ..
+cp contrib/adduser.sh /sbin/adduser
+mkdir -p $PKG/usr/doc/shadow-$VERSION
+cp -a \
+  ABOUT-NLS ChangeLog NEWS README TODO doc/* \
+  $PKG/usr/doc/shadow-$VERSION
+chmod 644 $PKG/usr/doc/shadow-$VERSION/*
+
+install_man_pages() {
+for file in chage.1 chfn.1 chsh.1 gpasswd.1 groups.1 login.1 newgrp.1 \
+passwd.1 su.1 ; do
+  if [ -r $file ]; then
+    mkdir -p $1/man1
+    gzip -9c $file > $1/man1/$file.gz
+  fi
+done
+for file in pw_auth.3 shadow.3 ; do
+  if [ -r $file ]; then
+    mkdir -p $1/man3
+    gzip -9c $file > $1/man3/$file.gz
+  fi
+done
+for file in faillog.5 limits.5 login.access.5 login.defs.5 passwd.5 \
+porttime.5 shadow.5 suauth.5 ; do
+  if [ -r $file ]; then
+    mkdir -p $1/man5
+    gzip -9c $file > $1/man5/$file.gz
+  fi
+done
+for file in chpasswd.8 dpasswd.8 faillog.8 groupadd.8 groupdel.8 groupmod.8 \
+grpck.8 lastlog.8 logoutd.8 mkpasswd.8 newusers.8 pwauth.8 pwck.8 pwconv.8 \
+shadowconfig.8 sulogin.8 useradd.8 userdel.8 usermod.8 vipw.8 ; do
+  if [ -r $file ]; then
+    mkdir -p $1/man8
+    gzip -9c $file > $1/man8/$file.gz
+  fi
+done
+}
+
+cd man
+  install_man_pages $PKG/usr/man
+  for dir in * ; do
+    if [ -d $dir ] ; then
+      ( cd $dir ; install_man_pages $PKG/usr/man/$dir )
+    fi
+  done
+cd ..
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/shadow-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/shadow-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/a/shadow/shadow.gcc34.diff b/source/a/shadow/shadow.gcc34.diff
new file mode 100644
index 000000000..71dff4c85
--- /dev/null
+++ b/source/a/shadow/shadow.gcc34.diff
@@ -0,0 +1,11 @@
+--- ./libmisc/xmalloc.c.orig	1998-12-28 14:34:56.000000000 -0600
++++ ./libmisc/xmalloc.c	2006-08-12 19:02:51.000000000 -0500
+@@ -16,8 +16,6 @@
+ 
+ #include "defines.h"
+ 
+-extern char *malloc();
+-
+ char *
+ xmalloc(size_t size)
+ {
diff --git a/source/a/shadow/shadow.login.defs.diff b/source/a/shadow/shadow.login.defs.diff
new file mode 100644
index 000000000..bfed463ae
--- /dev/null
+++ b/source/a/shadow/shadow.login.defs.diff
@@ -0,0 +1,67 @@
+--- ./etc/login.defs.linux.orig	2000-08-26 13:27:10.000000000 -0500
++++ ./etc/login.defs.linux	2008-03-24 15:10:09.000000000 -0500
+@@ -170,8 +170,8 @@
+ # *REQUIRED*  The default PATH settings, for superuser and normal users.
+ #
+ # (they are minimal, add the rest in the shell startup files)
+-ENV_SUPATH	PATH=/sbin:/bin:/usr/sbin:/usr/bin
+-ENV_PATH	PATH=/bin:/usr/bin
++ENV_SUPATH	PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin
++ENV_PATH	PATH=/usr/local/bin:/bin:/usr/bin
+ 
+ #
+ # Terminal permissions
+@@ -185,7 +185,7 @@
+ # TTYPERM to either 622 or 600.
+ #
+ TTYGROUP	tty
+-TTYPERM		0600
++TTYPERM		0620
+ 
+ #
+ # Login configuration initializations:
+@@ -230,7 +230,7 @@
+ #
+ # If compiled with cracklib support, where are the dictionaries
+ #
+-CRACKLIB_DICTPATH	/var/cache/cracklib/cracklib_dict
++#CRACKLIB_DICTPATH	/var/cache/cracklib/cracklib_dict
+ 
+ #
+ # Min/max values for automatic uid selection in useradd
+@@ -282,7 +282,7 @@
+ # phone, home phone).  If not defined, no changes are allowed.
+ # For backward compatibility, "yes" = "rwh" and "no" = "frwh".
+ # 
+-CHFN_RESTRICT		rwh
++CHFN_RESTRICT		frwh
+ 
+ #
+ # Password prompt (%s will be replaced by user name).
+@@ -299,7 +299,7 @@
+ # Set to "no" if you need to copy encrypted passwords to other systems
+ # which don't understand the new algorithm.  Default is "no".
+ #
+-#MD5_CRYPT_ENAB	no
++MD5_CRYPT_ENAB	yes
+ 
+ #
+ # List of groups to add to the user's supplementary group set
+@@ -310,7 +310,16 @@
+ # access to these groups, even when not logged in on the console.
+ # How to do it is left as an exercise for the reader...
+ #
+-#CONSOLE_GROUPS		floppy:audio:cdrom
++# Most of these groups are self-explanatory.
++#
++# Note that users are added to these default groups only when
++# logging into a shell with /bin/login, not when using a login
++# manager such as kdm.  In that case, users who should have
++# hardware access must be added to the appropriate groups
++# when the user is added with adduser or useradd, or by editing
++# /etc/group directly.
++#
++CONSOLE_GROUPS		floppy:audio:cdrom:video
+ 
+ #
+ # Should login be allowed if we can't cd to the home directory?
diff --git a/source/a/shadow/shadow.newgrp.getlogin b/source/a/shadow/shadow.newgrp.getlogin
new file mode 100644
index 000000000..5d032f15c
--- /dev/null
+++ b/source/a/shadow/shadow.newgrp.getlogin
@@ -0,0 +1,21 @@
+--- ./src/newgrp.c.orig	2003-05-31 21:19:39.000000000 -0700
++++ ./src/newgrp.c	2003-05-31 21:21:32.000000000 -0700
+@@ -76,6 +76,7 @@
+ 	gid_t gid;
+ 	char *cp;
+ 	const char *cpasswd, *name, *prog;
++	char *loginname = NULL;
+ 	char *group = NULL;
+ 	char *command = NULL;
+ 	char **envp = environ;
+@@ -386,7 +387,9 @@
+ 		SYSLOG ((LOG_INFO, "user `%s' switched to group `%s'",
+ 			 name, group));
+ 	if (getdef_bool ("SYSLOG_SG_ENAB")) {
+-		char *loginname = xstrdup (getlogin ());
++                char *user = getlogin ();
++                if (user != NULL)
++                        loginname = xstrdup (user);
+ 		char *tty = xstrdup (ttyname (0));
+ 
+ 		if (loginname == NULL)
diff --git a/source/a/shadow/shadow.newgrp.nopam b/source/a/shadow/shadow.newgrp.nopam
new file mode 100644
index 000000000..7920dde00
--- /dev/null
+++ b/source/a/shadow/shadow.newgrp.nopam
@@ -0,0 +1,18 @@
+--- src/newgrp.c.orig	2002-10-12 14:15:34.000000000 +0100
++++ src/newgrp.c	2002-10-12 14:15:42.000000000 +0100
+@@ -398,6 +398,7 @@
+ 		SYSLOG ((LOG_INFO,
+ 			 "user `%s' (login `%s' on %s) switched to group `%s'",
+ 			 name, loginname, tty, group));
++#ifdef USE_PAM
+ 		if (getdef_bool ("CLOSE_SESSIONS")) {
+ 			/*
+ 			 * We want to fork and exec the new shell in the child, leaving the
+@@ -450,6 +451,7 @@
+ 			signal (SIGTTIN, SIG_DFL);
+ 			signal (SIGTTOU, SIG_DFL);
+ 		}
++#endif // USE_PAM
+ 	}
+ #endif				/* USE_SYSLOG */
+ 
diff --git a/source/a/shadow/shadow.remove.obsolete.options.diff b/source/a/shadow/shadow.remove.obsolete.options.diff
new file mode 100644
index 000000000..100fe2a88
--- /dev/null
+++ b/source/a/shadow/shadow.remove.obsolete.options.diff
@@ -0,0 +1,78 @@
+--- ./man/passwd.1.orig	2002-03-13 11:52:15.000000000 -0600
++++ ./man/passwd.1	2006-08-20 18:29:58.000000000 -0500
+@@ -29,26 +29,17 @@
+ .SH NAME
+ passwd \- change user password
+ .SH SYNOPSIS
+-\fBpasswd\fR [\fB-f\fR|\fB-s\fR] [\fIname\fR]
+-.br
+-\fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIgroup\fR
++\fBpasswd\fR [\fIname\fR]
+ .br
+ \fBpasswd\fR [\fB-x \fImax\fR] [\fB-n \fImin\fR]
+ [\fB-w \fIwarn\fR] [\fB-i \fIinact\fR] \fIlogin\fR
+ .br
+ \fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR|\fB-e\fR} \fIlogin\fR
+ .SH DESCRIPTION
+-\fBpasswd\fR changes passwords for user and group accounts.
++\fBpasswd\fR changes passwords for user accounts.
+ A normal user may only change the password for his/her own account,
+ the super user may change the password for any account.
+-The administrator of a group may change the password for the group.
+-\fBpasswd\fR also changes account information, such as the full name
+-of the user, user's login shell, or password expiry date and interval.
+-.PP
+-The \fB-s\fR option makes passwd call chsh to change the user's shell. The
+-\fB-f\fR option makes passwd call chfn to change the user's gecos
+-information. These two options are only meant for compatiblity, since the
+-other programs can be called directly.
++.PP
+ .SS Password Changes
+ The user is first prompted for his/her old password, if one is present.
+ This password is then encrypted and compared against the
+@@ -86,17 +77,6 @@
+ against the first.
+ Both entries are required to match in order for the password
+ to be changed.
+-.SS Group passwords
+-When the \fB-g\fR option is used, the password for the named
+-group is changed.
+-The user must either be the super user, or a group administrator
+-for the named group.
+-The current group password is not prompted for.
+-The \fB-r\fR option is used with the \fB-g\fR option to remove
+-the current password from the named group.
+-This allows group access to all members.
+-The \fB-R\fR option is used with the \fB-g\fR option to restrict
+-the named group for all users.
+ .SS Password expiry information
+ The password aging information may be changed by the super
+ user with the \fB-x\fR, \fB-n\fR, \fB-w\fR, and \fB-i\fR options.
+@@ -191,6 +171,9 @@
+ .br
+ /etc/shadow \- encrypted user passwords
+ .SH "SEE ALSO"
++.BR chfn (1),
++.BR chsh (1),
++.BR gpasswd (1),
+ .BR group (5),
+ .BR passwd (5)
+ .SH AUTHOR
+--- ./src/passwd.c.orig	2002-01-05 09:41:43.000000000 -0600
++++ ./src/passwd.c	2006-08-20 18:31:50.000000000 -0500
+@@ -955,6 +955,7 @@
+ 	 * Please run these programs directly.  --marekm
+ 	 */
+ 
++#ifdef I_LIKE_OBSOLETE_OPTIONS
+ 	if (argc > 1 && argv[1][0] == '-' && strchr ("gfs", argv[1][1])) {
+ 		char buf[200];
+ 
+@@ -980,6 +981,7 @@
+ 		closelog ();
+ 		exit (E_FAILURE);
+ 	}
++#endif
+ 
+ 	/* 
+ 	 * The remaining arguments will be processed one by one and executed
diff --git a/source/a/shadow/shadow.shadowconfig.diff b/source/a/shadow/shadow.shadowconfig.diff
new file mode 100644
index 000000000..7dc9286e7
--- /dev/null
+++ b/source/a/shadow/shadow.shadowconfig.diff
@@ -0,0 +1,49 @@
+--- ./debian/shadowconfig.sh.orig	2001-05-29 23:20:22.000000000 -0700
++++ ./debian/shadowconfig.sh	2003-06-23 16:35:38.000000000 -0700
+@@ -1,23 +1,28 @@
+ #!/bin/bash
+-# turn shadow passwords on or off on a Debian system
++#
++#       'shadowconfig on' will turn shadow passwords on;
++#       'shadowconfig off' will turn shadow passwords off.
++#
++#       shadowconfig will print an error message and exit with
++#       a nonzero code if it finds anything awry.  If that happens,
++#       you should correct the error and run it again.
++#
++#       Turning shadow passwords on when they are already on, or
++#       off when they are already off, is harmless.
++#
++#       Be aware that account expiration dates are only supported
++#       by shadow passwords -- these dates will be lost when converting
++#       from shadow to non-shadow passwords.  If you need to save this
++#       information, back up your /etc/shadow before turning off
++#       shadow passwords.
++#       
+ 
+-set -e
+ 
+-permfix () {
+-    [ -f $1 ] || return 0
+-    chown root:shadow $1
+-    chmod 2755 $1
+-}
+-export -f permfix
++set -e
+ 
+ shadowon () {
+ bash<<- EOF
+     set -e
+-
+-    permfix /usr/X11R6/bin/xlock
+-    permfix /usr/X11R6/bin/xtrlock
+-    permfix /bin/vlock
+-
+     pwck -q
+     grpck
+     pwconv
+@@ -65,3 +70,4 @@
+ 	echo Usage: $0 on \| off
+ 	;;
+ esac
++
diff --git a/source/a/shadow/slack-desc b/source/a/shadow/slack-desc
new file mode 100644
index 000000000..57749146e
--- /dev/null
+++ b/source/a/shadow/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------------------------------------------------------|
+shadow: shadow (shadow password suite)
+shadow:
+shadow: This set of login related programs utilizes an alternate, non-readable
+shadow: file to contain the actual encrypted passwords.  This is presumed to 
+shadow: increase system security by increasing the difficulty with which 
+shadow: system crackers obtain encrypted passwords.  It was written by 
+shadow: Julianne Frances Haugh and the Linux port is maintained by Tomasz
+shadow: Kloczko.
+shadow:
+shadow: This package provides 'login', which is needed to log into the system.
+shadow:
diff --git a/source/a/sharutils/sharutils.SlackBuild b/source/a/sharutils/sharutils.SlackBuild
new file mode 100755
index 000000000..0d8bd6f07
--- /dev/null
+++ b/source/a/sharutils/sharutils.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=4.7
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sharutils
+
+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"
+  LIBDIRSUFFIX="64"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf sharutils-$VERSION
+tar xjvf $CWD/sharutils-$VERSION.tar.bz2
+cd sharutils-$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 \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  $ARCH-slackware-linux
+make -j3
+make install DESTDIR=$PKG
+make install-man DESTDIR=$PKG
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/* $PKG/usr/man/man?/*.?
+
+( 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
+)
+
+mkdir -p $PKG/usr/doc/sharutils-$VERSION
+cp -a \
+  AUTHORS COPYING INSTALL NEWS README README-alpha THANKS TODO \
+  $PKG/usr/doc/sharutils-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/sharutils-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/sharutils/slack-desc b/source/a/sharutils/slack-desc
new file mode 100644
index 000000000..fbc490fad
--- /dev/null
+++ b/source/a/sharutils/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------------------------------------------------------|
+sharutils: sharutils (GNU shell archive packing utilities)
+sharutils:
+sharutils: `shar' makes so-called shell archives out of many files, preparing
+sharutils: them for transmission by electronic mail services.  `unshar' helps
+sharutils: unpacking shell archives after reception.  `uuencode' prepares a file
+sharutils: for transmission over an electronic channel which ignores or otherwise
+sharutils: mangles the eight bit (high order bit) of bytes.  `uudecode' does the
+sharutils: converse transformation.  `remsync' allows for remote synchronization
+sharutils: of directory trees using electronic mail. 
+sharutils:
+sharutils:
diff --git a/source/a/slocate/slack-desc b/source/a/slocate/slack-desc
new file mode 100644
index 000000000..22ec56cc8
--- /dev/null
+++ b/source/a/slocate/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------------------------------------------------------|
+slocate: slocate (Secure Locate)
+slocate:
+slocate: Slocate is an enhanced version of locate, a command to help you locate
+slocate: files on the system.  Like the original version of locate, Slocate
+slocate: maintains a database of files on the system, updating it nightly.
+slocate: Unlike the original, Slocate indexes every file on the machine rather
+slocate: than only the ones that can be seen by everyone.  The "secure" part of
+slocate: slocate is that it will only return matches if the user is allowed to
+slocate: see the files.
+slocate:
+slocate:
diff --git a/source/a/slocate/slocate-3.1.tar.gz.sign b/source/a/slocate/slocate-3.1.tar.gz.sign
new file mode 100644
index 000000000..91b982425
--- /dev/null
+++ b/source/a/slocate/slocate-3.1.tar.gz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQBEDmWkUZpV8HRsUfQRAnLeAJ0cBuIYvy+3GSTdm+sfQ7XYbNWuwgCgj+pZ
+RKdGZfMmcuFGoBO39sCX/64=
+=K/rW
+-----END PGP SIGNATURE-----
diff --git a/source/a/slocate/slocate.SlackBuild b/source/a/slocate/slocate.SlackBuild
new file mode 100755
index 000000000..3fec40f26
--- /dev/null
+++ b/source/a/slocate/slocate.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=3.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-slocate
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_slocate.tar.gz
+
+cd $TMP
+rm -rf slocate-$VERSION
+tar xzvf $CWD/slocate-$VERSION.tar.gz
+cd slocate-$VERSION
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 2750 -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 {} \;
+
+cd src
+make CFLAGS="$SLKCFLAGS"
+cd ..
+strip --strip-unneeded src/slocate
+mkdir -p $PKG/usr/bin
+cat src/slocate > $PKG/usr/bin/slocate
+mkdir -p $PKG/usr/man/man1
+cat doc/slocate.1 | gzip -9c > $PKG/usr/man/man1/slocate.1.gz
+cat doc/updatedb.1 | gzip -9c > $PKG/usr/man/man1/updatedb.1.gz
+mkdir -p $PKG/usr/doc/slocate-$VERSION
+cp -a \
+  Changelog LICENSE README WISHLIST \
+  $PKG/usr/doc/slocate-$VERSION
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/slocate-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/smartmontools/doinst.sh b/source/a/smartmontools/doinst.sh
new file mode 100644
index 000000000..82f0ac136
--- /dev/null
+++ b/source/a/smartmontools/doinst.sh
@@ -0,0 +1,13 @@
+#!/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 etc/smartd.conf.new
diff --git a/source/a/smartmontools/slack-desc b/source/a/smartmontools/slack-desc
new file mode 100644
index 000000000..ce462947f
--- /dev/null
+++ b/source/a/smartmontools/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------------------------------------------------------|
+smartmontools: smartmontools (hard drive monitoring utilities)
+smartmontools:
+smartmontools: SMARTMONTOOLS contains utilities that control and monitor storage
+smartmontools: devices using the Self-Monitoring, Analysis and Reporting Technology
+smartmontools: (S.M.A.R.T.) system build into ATA and SCSI Hard Drives. This is used
+smartmontools: to check the reliability of the hard drive and to predict drive
+smartmontools: failures.  SMARTMONTOOLS Version 5.x is designed to comply to the
+smartmontools: ATA/ATAPI-5 specification (Revision 1).  Future releases of
+smartmontools: SMARTMONTOOLS (Versions 6.x and 7.x) will comply with the ATA/ATAPI-6
+smartmontools: and ATA/ATAPI-7 specifications.
+smartmontools:
diff --git a/source/a/smartmontools/smartmontools.SlackBuild b/source/a/smartmontools/smartmontools.SlackBuild
new file mode 100755
index 000000000..fd4fcf35b
--- /dev/null
+++ b/source/a/smartmontools/smartmontools.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=5.38
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=/tmp/package-smartmontools
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf smartmontools-$VERSION
+tar xvf $CWD/smartmontools-$VERSION.tar.*
+cd smartmontools-$VERSION
+chown -R root:root .
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  $ARCH-slackware-linux
+make
+make install DESTDIR=$PKG
+# Not used on Slackware:
+rm -rf $PKG/etc/rc.d
+mv $PKG/etc/smartd.conf $PKG/etc/smartd.conf.new
+gzip -9 $PKG/usr/man/man?/*.?
+mv $PKG/usr/share/doc $PKG/usr
+rmdir $PKG/usr/share
+rm -f $PKG/usr/doc/smartmontools-$VERSION/CHANGELOG \
+      $PKG/usr/doc/smartmontools-$VERSION/smartd.conf
+( 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
+)
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/smartmontools-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/smartmontools-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/a/splitvt/slack-desc b/source/a/splitvt/slack-desc
new file mode 100644
index 000000000..0aa6ab24d
--- /dev/null
+++ b/source/a/splitvt/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------------------------------------------------------|
+splitvt: splitvt (run multiple shells in a single window)
+splitvt:
+splitvt: This program splits the screen into two windows, one above the other,
+splitvt: and runs a shell in each one.
+splitvt:
+splitvt: Splitvt was written by Sam Lantinga.
+splitvt:
+splitvt:
+splitvt:
+splitvt:
+splitvt:
diff --git a/source/a/splitvt/splitvt.SlackBuild b/source/a/splitvt/splitvt.SlackBuild
new file mode 100755
index 000000000..f643a825c
--- /dev/null
+++ b/source/a/splitvt/splitvt.SlackBuild
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=1.6.5
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-splitvt
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf splitvt-1.6.5
+tar xzvf $CWD/splitvt-1.6.5.tar.gz
+cd splitvt-1.6.5
+zcat $CWD/splitvt_1.6.5-9.diff.gz | patch -p1 --verbose || exit 1
+chown -R root:root .
+./configure
+make || exit 1
+mkdir -p $PKG/usr/bin
+cat splitvt > $PKG/usr/bin/splitvt
+chmod 755 $PKG/usr/bin/splitvt
+mkdir -p $PKG/usr/man/man1
+cat splitvt.1 | gzip -9c > $PKG/usr/man/man1/splitvt.1.gz
+mkdir -p $PKG/usr/doc/splitvt-1.6.5
+cp -a examples ANNOUNCE CHANGES NOTES README TODO \
+  $PKG/usr/doc/splitvt-1.6.5
+( cd $PKG/usr/doc/splitvt-1.6.5
+  find . -type d | xargs chmod 755
+  find . -type f | xargs chmod 644 )
+
+# Strip everything for good measure:
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/splitvt-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/splitvt/splitvt_1.6.5-9.diff b/source/a/splitvt/splitvt_1.6.5-9.diff
new file mode 100644
index 000000000..47d560377
--- /dev/null
+++ b/source/a/splitvt/splitvt_1.6.5-9.diff
@@ -0,0 +1,1073 @@
+--- splitvt-1.6.5.orig/debian/changelog
++++ splitvt-1.6.5/debian/changelog
+@@ -0,0 +1,147 @@
++splitvt (1.6.5-9) unstable; urgency=low
++
++  * Ensure that -upper and -lower have arguemnts. Closes: #319091
++
++ -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2005 17:50:32 -0400
++
++splitvt (1.6.5-8) unstable; urgency=low
++
++  * Patch from Andreas Jochens to fix building with gcc 4.0. Closes: #294620
++
++ -- Joey Hess <joeyh@debian.org>  Fri, 15 Jul 2005 17:38:09 +0300
++
++splitvt (1.6.5-7) unstable; urgency=low
++
++  * Many changes to make it build cleanly with -Wall. This included some
++    missing headers that probably caused it to crash on amd64.
++  * Disabled vttest, since its read from the console to try to detect a vt100
++    terminal was responsible for startup hang on sparc. Closes: #273330
++
++ -- Joey Hess <joeyh@debian.org>  Wed, 26 Jan 2005 20:32:34 -0500
++
++splitvt (1.6.5-6) unstable; urgency=low
++
++  * Rebuilt to update to current policy on /usr/doc links &etc.
++
++ -- Joey Hess <joeyh@debian.org>  Sat,  8 Feb 2003 12:32:25 -0500
++
++splitvt (1.6.5-5) unstable; urgency=low
++
++  * Updated to debhelper v4.
++
++ -- Joey Hess <joeyh@debian.org>  Thu, 13 Jun 2002 16:30:04 -0400
++
++splitvt (1.6.5-4) unstable; urgency=low
++
++  * Updated patch to not break resizing.
++
++ -- Joey Hess <joeyh@debian.org>  Fri,  5 Oct 2001 20:09:25 -0400
++
++splitvt (1.6.5-3) unstable; urgency=low
++
++  * Patch from Robert de Bath <robert$@mayday.cix.co.uk> that has a doc fix
++    and also fixes a splitvt segfault when one uses the CSI ? 3 h to got o
++    132 column mode. Closes: #113868 (also sent upstream)
++
++ -- Joey Hess <joeyh@debian.org>  Sat, 29 Sep 2001 16:44:25 -0400
++
++splitvt (1.6.5-2) unstable; urgency=HIGH
++
++  * New upstream version, with a format string hole fixed, and several
++    possible buffer overfllows fixed.
++    - Of those, only (I think) the format string attack and two of the
++      buffer overflows can affect the debian package.
++    - Luckily, my last release of the package back in June 2000 made
++      it only need to be sgid tty.
++    - Total possible impact: attacker could possibly crack the tty group.
++  * Goofed up version number because this source is already in the
++    archives.
++
++ -- Joey Hess <joeyh@debian.org>  Wed, 17 Jan 2001 23:39:09 -0800
++
++splitvt (1.6.4-4) unstable; urgency=low
++
++  * Drop setgid first. Very doubtful this effects anything, but it's the
++    right way to do things.
++
++ -- Joey Hess <joeyh@debian.org>  Thu, 15 Jun 2000 11:37:48 -0700
++
++splitvt (1.6.4-3) unstable; urgency=low
++
++  * Modified to use glibc's sys4-ish pty routines; devpts, grantpt, etc.
++  * Modified to drop sgid bit properly.
++  * Now I can make it just sgid utmp, rather than suid root, and it
++    continues to work just as before. Beaujolais! Closes: #65227
++  * Removed no-longer-needed glibc stdion/stdout fix patch.
++
++ -- Joey Hess <joeyh@debian.org>  Wed, 14 Jun 2000 14:13:30 -0700
++
++splitvt (1.6.4-2) unstable; urgency=low
++
++  * Corrected build-depends, Closes: #65584
++
++ -- Joey Hess <joeyh@debian.org>  Tue, 13 Jun 2000 11:42:02 -0700
++
++splitvt (1.6.4-1) unstable; urgency=high
++
++  * New upstream release with security fix (already applied in the previous
++    version, I'm just syncing up with upstream).
++  * Added homepage to copyright file.
++  * Added some more files to docs.
++  * Now under the GPL explicitly, some updates to the copyright file.
++
++ -- Joey Hess <joeyh@debian.org>  Sun, 11 Jun 2000 21:42:41 -0700
++
++splitvt (1.6.3-7.0slink1) stable; urgency=high
++
++  *  Security fix.
++
++ -- Daniel Jacobowitz <dan@debian.org>  Sat,  3 Jun 2000 17:56:33 -0400
++
++splitvt (1.6.3-7) unstable; urgency=low
++
++  * Build dep.
++
++ -- Joey Hess <joeyh@debian.org>  Sat,  4 Dec 1999 16:21:35 -0800
++
++splitvt (1.6.3-6) unstable; urgency=low
++
++  * FHS
++
++ -- Joey Hess <joeyh@debian.org>  Sat, 11 Sep 1999 01:27:49 -0700
++
++splitvt (1.6.3-5) unstable; urgency=low
++
++  * vtmouse.c: Don't use stdin/stdout as initializers. Instead, in
++    event_getc(), set xt_input and xt_output to stdin and stdout if
++    they are not yet set. This is for the ports to other architectures.
++    (#29597)
++
++ -- Joey Hess <joeyh@debian.org>  Tue, 17 Nov 1998 15:50:53 -0800
++
++splitvt (1.6.3-4) unstable; urgency=low
++
++  * Built with newest debhelper to change how the suid binary is registered.
++
++ -- Joey Hess <joeyh@debian.org>  Tue, 27 Oct 1998 21:59:05 -0800
++
++splitvt (1.6.3-3) unstable; urgency=low
++
++  * Hacked in a -f flag, that allows you to resize one of the splitvt
++    windows down to 1 line tall. This is particularly useful for ticker.
++
++ -- Joey Hess <joeyh@debian.org>  Mon,  7 Sep 1998 19:56:53 -0700
++
++splitvt (1.6.3-2) unstable; urgency=low
++
++  * Fixed package description spelling (#18990).
++
++ -- Joey Hess <joeyh@debian.org>  Thu,  5 Mar 1998 17:00:19 -0800
++
++splitvt (1.6.3-1) unstable; urgency=low
++
++  * First release.
++  * Write to author and clarified copyright.
++  * Change /etc/utmp to /var/run/utmp
++
++ -- Joey Hess <joeyh@debian.org>  Wed,  1 Oct 1997 16:19:01 -0400
+--- splitvt-1.6.5.orig/debian/control
++++ splitvt-1.6.5/debian/control
+@@ -0,0 +1,14 @@
++Source: splitvt
++Section: utils
++Priority: optional
++Build-Depends: debhelper (>= 4), libncurses5-dev, dpkg-dev (>= 1.9.0)
++Maintainer: Joey Hess <joeyh@debian.org>
++Standards-Version: 3.5.8.0
++
++Package: splitvt
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Description: run two programs in a split screen
++ A utility to split a vt100 compatible screen into two halves,
++ upper and lower, and run a different program simultaneously
++ in each half.
+--- splitvt-1.6.5.orig/debian/compat
++++ splitvt-1.6.5/debian/compat
+@@ -0,0 +1 @@
++4
+--- splitvt-1.6.5.orig/debian/watch
++++ splitvt-1.6.5/debian/watch
+@@ -0,0 +1,2 @@
++version=2
++http://www.devolution.com/~slouken/projects/splitvt/ splitvt-(.*).tar.gz
+--- splitvt-1.6.5.orig/debian/copyright
++++ splitvt-1.6.5/debian/copyright
+@@ -0,0 +1,45 @@
++This is a Debian prepackaged version of the splitvt utility.
++
++This package was put together by Joey Hess <joeyh@debian.org>, using
++sources from:
++	http://www.devolution.com/~slouken/projects/splitvt/
++
++The following copyright notices can still be found in the source code:
++
++        /*  utmp.c    Shareware Copyright by Sam Lantinga        10/6/93 */
++
++That is a historical relic, though. The current copyright of splitvt is the
++GPL; the text to which can be found in /usr/share/common-licenses/GPL on a
++Debian system.
++
++Before the copyright was expressly changed to the GPL, I wrote and asked the
++author about copyright. He replied:
++
++ Date: Wed, 1 Oct 1997 13:39:18 -0700                                            
++ From: Sam Lantinga <slouken@domo.ccnet.com>                                     
++ To: Joey Hess <joey@kite.ml.org>                                                
++ Cc: slouken@mongoloid.devolution.com                                            
++ Subject: Re: splitvt copyright                                                  
++ X-Mailer: My Mailer 1.5  <slouken@devolution.com>                               
++  
++ > I've never heard of no fee shareware before. What restrictions does that
++ > place on the software? Can it be put on a cd with other software (such as a
++ > linux distribution) and sold for profit? Can it be used by anyone, for any
++ > purpose? If so, why don't you just place it under the GPL?
++ 
++ Consider it GPL'd.  I wrote it before I was aware of the GPL, and haven't
++ done much work on it in quite a while.
++ 
++ > At this point, I'm not sure if splitvt's copyright will let it go in our
++ > main distribution, that is sold on cd, or not. Awaiting your clarification..
++                                                                                 
++ You are more than welcome to put splitvt in the Debian distribution.
++ It is already in Slackware and S.u.S.E.
++ 
++ See ya!
++        -Sam Lantinga                           (slouken@devolution.com)
++ 
++ -- 
++ Author of Linux Maelstrom -
++         http://www.devolution.com/~slouken/Maelstrom/
++ --
+--- splitvt-1.6.5.orig/debian/rules
++++ splitvt-1.6.5/debian/rules
+@@ -0,0 +1,43 @@
++#!/usr/bin/make -f
++
++build: build-stamp
++build-stamp:
++	dh_testdir
++	rm -f Makefile
++	./configure
++	$(MAKE)
++	touch build-stamp
++
++clean:
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp
++	dh_clean
++	if [ ! -f Makefile ]; then ./configure ; fi
++	-$(MAKE) distclean
++
++binary-indep: build
++
++binary-arch: build
++	dh_testdir
++	dh_testroot
++	dh_clean
++	dh_install splitvt usr/bin
++	dh_installdocs README TODO ANNOUNCE BLURB
++	dh_installexamples examples/*
++	dh_installmenu
++	dh_installcron
++	dh_installman splitvt.1
++	dh_installchangelogs CHANGES
++	dh_strip
++	dh_compress
++	dh_installdeb
++	dh_shlibdeps
++	dh_gencontrol
++	dh_fixperms
++	chgrp utmp debian/splitvt/usr/bin/splitvt
++	chmod g+s debian/splitvt/usr/bin/splitvt
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary
+--- splitvt-1.6.5.orig/splitvt.man
++++ splitvt-1.6.5/splitvt.man
+@@ -176,7 +176,7 @@
+        replace it with entries for the two windows.  This  allows
+        you to use programs such as 'talk' within the splitvt win-
+        dows.   If  you	do  not	have  write  permission  to  the
+-       /etc/utmp  file,	you  will not be able to modify the utmp
++       /etc/utmp  file, you  will not be able to modify the utmp
+        entries.
+ 
+        splitvt can be made set-uid root.  splitvt will reset  its
+--- splitvt-1.6.5.orig/parserc.c
++++ splitvt-1.6.5/parserc.c
+@@ -1,6 +1,8 @@
+ 
+ /* Routines to parse the ~/.splitvtrc file and set default options */
+ 
++#include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <string.h>
+@@ -213,7 +215,7 @@
+ 	char line[BUFSIZ], newline[BUFSIZ*2], *parsed[256];
+ 	char *head, *tail, *ptr, *subptr;
+ 	char *envptr, envbuf[128];
+-	int  i, n, quoted=0;
++	int  i, n;
+ 	int  ignoring=0, ifs=0;
+ 
+ 	/* Get our home directory */
+--- splitvt-1.6.5.orig/splitvt.c
++++ splitvt-1.6.5/splitvt.c
+@@ -13,6 +13,9 @@
+ static char *version=
+ "@(#)Splitvt 1.6.5  1/12/2001  -Sam Lantinga   (slouken@devolution.com)\n";
+ 
++#include	<string.h>
++#include	<unistd.h>
++#include	<stdlib.h>
+ #include	<sys/types.h>
+ #include	<sys/time.h>
+ #include	<sys/wait.h>
+@@ -79,6 +82,8 @@
+ char *upper_args[MAX_ARGS+1]={NULL}, *lower_args[MAX_ARGS+1]={NULL};
+ int upper_empty=1, lower_empty=1;
+ 
++int force_height=0;
++
+ void print_usage(argv)
+ char *argv;
+ {
+@@ -95,13 +100,14 @@
+ 	fprintf(stderr, "\t-nologin\t\tOverrides \"set login on\" in startup file\n");
+ 	fprintf(stderr, "\t-rcfile file\t\tLoads 'file' at startup instead of ~/.splitvtrc\n");
+ 	fprintf(stderr, "\t-norc\t\t\tSuppresses loading your startup file\n");
++  	fprintf(stderr, "\t-f\t\t\tAllow setting screen size of less than 3 lines\n");
+ 	fprintf(stderr, "\t-v\t\t\tPrint out the version number\n");
+ 	fprintf(stderr, "\n");
+ 	exit(1);
+ }
+ 
+  
+-main(argc, argv)
++int main(argc, argv)
+ int argc;
+ char *argv[];
+ {
+@@ -111,7 +117,10 @@
+ 	int i, len, maxfds, numready;
+ 	char buffer[BUFSIZ], *ptr;
+ 	char *xterm_title=NULL;
+-	struct timeval tv, *tvptr;
++#ifdef NEED_INET_H
++	struct timeval tv;
++#endif
++	struct timeval *tvptr;
+ 	fd_set read_mask;
+ 	static struct passwd pwdata;	/* Our passwd entry */
+ 
+@@ -151,7 +160,7 @@
+ 		splitvtrc();
+ 
+ 	/* Parse command line options */
+-	while ( (i=getopt(argc, argv, "n:u:l:r:s:t:vh")) != EOF )
++	while ( (i=getopt(argc, argv, "fn:u:l:r:s:t:vh")) != EOF )
+ 	{
+ 		switch (i)
+ 		{
+@@ -163,11 +172,19 @@
+ 				  break;
+ 			case 'u': if ( strcmp(optarg, "pper") != 0 )
+ 					print_usage(argv[0]);
++				  if (optind >= argc) {
++					fprintf(stderr, "-upper requires an argument\n");
++					print_usage(argv[0]);
++				  }
+ 				  tokenize(upper_args, MAX_ARGS+1,
+ 						  argv[optind++], " ");
+ 				  upper_empty=0;
+ 				  break;
+ 			case 'l': if ( strcmp(optarg, "ower") == 0 ) {
++					if (optind >= argc) {
++						fprintf(stderr, "-lower requires an argument\n");
++						print_usage(argv[0]);
++					}
+ 				  	tokenize(lower_args, MAX_ARGS+1,
+ 							argv[optind++], " ");
+ 				  	lower_empty=0;
+@@ -188,7 +205,9 @@
+ 			case 'v': printf("%s", version+4);
+ 				  exit(0);
+ 				  break;
+-			case 'h':
++		  	case 'f': force_height=1;
++		  		  break;
++		        case 'h':
+ 			default:  print_usage(argv[0]);
+ 				  break;
+ 		}
+@@ -212,7 +231,7 @@
+ 	}
+ 	(void) tty_raw(0);   /* Set the tty raw here to prevent lost input */
+ 
+-	if ( (ptr=init_vt100()) != NULL )
++	if ( (ptr=init_vt100(1)) != NULL )
+ 	{
+ 		if ( tty_reset(0) < 0 )	
+ 			(void) tty_sane(0);
+@@ -473,6 +492,7 @@
+ 		}
+ 	}
+ 	finish(0);
++	exit(0);
+ }
+ 
+ void reset_bar(sleeptime)
+@@ -496,6 +516,7 @@
+ "	'x'	Lock the screen",
+ "	'h'	Show this help screen",
+ "	'q'	Quickly quit splitvt",
++"	'0-9'	Line count for + or -",
+ NULL
+ };
+ 	vt_showscreen("Splitvt HELP screen:", help);
+@@ -700,7 +721,7 @@
+ 	tmp_uulines=UU_lines;
+ 	UU_lines=WU_lines;
+ 	UU_lines += howfar;	/* Positive to go down, negative to go up */
+-	init_vt100();		/* Reset the windows to the new size */
++	init_vt100(0);		/* Reset the windows to the new size */
+ 
+ 	/* Tell the running processes about the size change */
+ 	if ( topok )
+@@ -722,7 +743,7 @@
+ 
+ 	signal(sig, winch);
+ 
+-	if ( (ptr=init_vt100()) != NULL ) {
++	if ( (ptr=init_vt100(1)) != NULL ) {
+ 		fprintf(stderr, "Can't resize window: %s. (exiting)\n", ptr);
+ 		finish(0);
+ 	} else
+--- splitvt-1.6.5.orig/config.c
++++ splitvt-1.6.5/config.c
+@@ -169,7 +169,7 @@
+ 		strcat(ldflags, " -lsun");
+ 
+ 	/* Tell the user what kind of configuration to do */
+-	if ( (access("/etc/utmp", (R_OK|W_OK)) == 0) && getuid() )
++	if ( (access("/var/run/utmp", (R_OK|W_OK)) == 0) && getuid() )
+ 		write_utmp=1;
+ 	else
+ 		write_utmp=0;
+@@ -180,14 +180,14 @@
+ 			VERBOSE_PRINT(
+ 	"This program doesn't need to be installed set-uid root.\n");
+ 			VERBOSE_PRINT(
+-	"\nThis program will put entries for its windows in /etc/utmp.\n");
++	"\nThis program will put entries for its windows in /var/run/utmp.\n");
+ 		} else {
+ 			VERBOSE_PRINT(
+-	"If installed set-uid root, this program will put entries for its windows\nin /etc/utmp.\n");
++	"If installed set-uid root, this program will put entries for its windows\nin /var/run/utmp.\n");
+ 		}
+ 	} else if ( write_utmp ) {
+ 		VERBOSE_PRINT(
+-	"This program will put entries for its windows in /etc/utmp.\n");
++	"This program will put entries for its windows in /var/run/utmp.\n");
+ 		VERBOSE_PRINT(
+ 	"\nIf installed set-uid root, this program will change ownership of the\n");
+ 		VERBOSE_PRINT(
+@@ -196,7 +196,7 @@
+ 		VERBOSE_PRINT(
+ 	"If installed set-uid root, this program will put entries for its windows\n");
+ 		VERBOSE_PRINT(
+-	"in /etc/utmp, and will also change ownership of the ttys it acquires to the\n");
++	"in /var/run/utmp, and will also change ownership of the ttys it acquires to the\n");
+ 		VERBOSE_PRINT(
+ 	"user running this program.\n");
+ 	}
+@@ -225,7 +225,7 @@
+ 	}
+ 	fprintf(makefile, 
+ 		"PTYOPTS = -DPTYCHAR=$(PTYCHAR) -DHEXDIGIT=$(HEXDIGIT)\n");
+-	sprintf(line, "\nCFLAGS = %s $(PTYOPTS)\nLIBS = %s\n", cflags, ldflags);
++	sprintf(line, "\nCFLAGS = -Wall %s $(PTYOPTS)\nLIBS = %s\n", cflags, ldflags);
+ 	fprintf(makefile, "%s", line);
+ 	fprintf(makefile, "OBJS = splitvt.o misc.o utmp.o vt100.o videomem.o terminal.o vttest.o vtmouse.o \\\n");
+ 	fprintf(makefile, "       parserc.o lock.o cut-paste.o\n\n");
+--- splitvt-1.6.5.orig/cut-paste.c
++++ splitvt-1.6.5/cut-paste.c
+@@ -2,8 +2,12 @@
+ /* The cut-paste module for splitvt */
+ 
+ #include	<stdio.h>
++#include	<string.h>
++#include	<unistd.h>
+ #include	"vt100.h"
+ #include	"video.h"
++#include	"splitvt.h"
++#include	"terminal.h"
+ 
+ #define RIGHT 0x01
+ #define LEFT  0x02
+@@ -41,7 +45,7 @@
+ 	} else
+ 		c ^= (SELECTED<<8);
+ 
+-	(*oldattr)=check_attr(c, *oldattr, on);
++	(*oldattr)=check_attr(c, *oldattr, (int)on);
+ 	put_video(c, win, x, y);
+ 
+ 	if ( c&0xFF )
+@@ -86,7 +90,6 @@
+ int len;
+ position *mark1, *mark2;
+ {
+-	int selection=0;
+ 	position startsel, endsel;
+ 
+ 	if ( mark1->x == mark2->x )
+@@ -200,9 +203,9 @@
+ void vt_initsel()
+ {
+ 	extern char *pathsearch();	/* From misc.c */
+-	char *display;
+ 
+ #ifdef USE_XCB
++	char *display;
+ 	/* Use xcb if we have both an X display and the command. */
+ 	/* xcb needs to support my hacked '-R' option. */
+ 	if ( (display=(char *)getenv("DISPLAY")) && pathsearch("xcb", 1) )
+@@ -254,7 +257,7 @@
+ char *buf;
+ int len;
+ {
+-	int c, state=NORMAL;
++	int c;
+ 	position here, cursor, mark1, mark2;
+ 	window *thiswin;
+ 	
+@@ -311,7 +314,7 @@
+ 			default:	break;
+ 		}
+ 	}
+-	return;	/* Hopefully, we never reach here */
++	return NULL; /* Hopefully, we never reach here */
+ }
+ 
+ 
+--- splitvt-1.6.5.orig/vt100.c
++++ splitvt-1.6.5/vt100.c
+@@ -8,6 +8,9 @@
+    Many thanks to Matt Ostanik who wrote the ANSI Handbook.
+ */
+ 
++#include	<unistd.h>
++#include	<string.h>
++#include	<stdlib.h>
+ #include	<sys/types.h>
+ #ifdef HAVE_TERMIO_H
+ #include	<termio.h>		/* Used only for TIOCGWINSZ */
+@@ -20,6 +23,7 @@
+ #include	"vt100.h"
+ #include	"video.h"
+ #include	"terminal.h"
++#include	"splitvt.h"
+ 
+ #define SEP_CHAR	' '		/* Separator bar character */
+ 
+@@ -135,7 +139,7 @@
+ 	unsigned char on=NORMAL;
+ 
+ 	vt_resetattr();
+-	(void) check_attr(0, win->textattr, &on);
++	(void) check_attr(0, win->textattr, (int)&on);
+ }
+ 
+ /* Process the ^[[X;Xm escape.  Made into a separate routine to support
+@@ -683,10 +687,9 @@
+ 					break;
+ 				case 3: /* 132 char/row */
+ 					if ( physical.cols != 132 ) {
+-						upper.cols=132;
+-						lower.cols=132;
+ 						physical.cols=132;
+ 						vt_widemode(1);
++						init_vt100(0);
+ 					}
+ 					break;
+ 				case 4: /* Set jump scroll */	
+@@ -726,11 +729,9 @@
+ 					break;
+ 				case 3: /* 80 char/row */
+ 					if ( physical.cols == 132 ) {
+-						vt_rows_cols(terminal_type, 
+-							NULL, &physical.cols);
+-						upper.cols=physical.cols;
+-						lower.cols=physical.cols;
++					        physical.cols = 80;
+ 						vt_widemode(0);
++						init_vt100(0);
+ 					}
+ 					break;
+ 				case 4: /* Set smooth scroll */	
+@@ -843,7 +844,8 @@
+ 
+ static int setup_vt100 = 0;	/* Have we initialized the vt100 system? */
+ 
+-char *init_vt100()
++char *init_vt100(reread_tsize)
++int reread_tsize;
+ {
+ #ifdef TIOCGWINSZ
+ 	struct /* winsize */ {
+@@ -853,7 +855,7 @@
+ 		unsigned short	ws_ypixel;	/* vertical size - not used */
+ 	} mywinz;
+ #endif
+-	int i, **videomem, oldrows, newrows, newcols;
++	int i, **videomem, oldrows = 0, newrows, newcols;
+ 	position newpos;
+ 	char *ptr, *errmesg;
+ 
+@@ -869,18 +871,22 @@
+ 		vt_initsel();
+ 	}
+ 
++	if (reread_tsize)
++	{
+ #ifdef TIOCGWINSZ
+-	if ( ioctl(0, TIOCGWINSZ, &mywinz) == 0 ) {
+-		if ( mywinz.ws_row )
+-			physical.rows=mywinz.ws_row;
+-		if ( mywinz.ws_col )
+-			physical.cols=mywinz.ws_col;
+-	}
++		if ( ioctl(0, TIOCGWINSZ, &mywinz) == 0 ) {
++			if ( mywinz.ws_row )
++				physical.rows=mywinz.ws_row;
++			if ( mywinz.ws_col )
++				physical.cols=mywinz.ws_col;
++		}
+ #endif
+-	if ( (ptr=(char *)getenv("LINES")) != NULL )
+-		physical.rows=atoi(ptr);
+-	if ( (ptr=(char *)getenv("COLUMNS")) != NULL )
+-		physical.cols=atoi(ptr);
++
++		if ( (ptr=(char *)getenv("LINES")) != NULL )
++			physical.rows=atoi(ptr);
++		if ( (ptr=(char *)getenv("COLUMNS")) != NULL )
++			physical.cols=atoi(ptr);
++	}
+ 
+ 	/* Now set defaults if we can't find the window size */
+ 	if ( ! physical.rows )	physical.rows=24;
+@@ -892,19 +898,21 @@
+ 	if ( physical.rows < 7 )
+ 		return("Screen is not tall enough to split.");
+ 
+-	/* If physical.cols has been set to 132, assume we are on a
+-	   vt100 wide terminal, and set 132 column mode.  Note that
+-	   setting COLUMNS in the environment will override termcap */
+-	if ( physical.cols == 132 )
+-		vt_widemode(1);
++	if ( ! setup_vt100 ) {
++		/* If physical.cols has been set to 132, assume we are on a
++		   vt100 wide terminal, and set 132 column mode.  Note that
++		   setting COLUMNS in the environment will override termcap */
++		if ( physical.cols == 132 )
++			vt_widemode(1);
++	}
+ 
+ 	/* Set the exportable variables */
+ 	if ( UU_lines ) {
+ 		/* Check the user set # of lines */
+-		if ( UU_lines > (physical.rows-1-3) )
+-			LU_lines=(physical.rows-1-3);
+-		else if ( UU_lines < 3 )
+-			LU_lines=3;
++		if ( UU_lines > (physical.rows-1-3+(2*force_height)) )
++			LU_lines=(physical.rows-1-3+(2*force_height));
++	  	else if ( UU_lines < 3 - (2*force_height))
++	    		LU_lines=3 - (2*force_height);
+ 		else
+ 			LU_lines=UU_lines;
+ 
+--- splitvt-1.6.5.orig/splitvt.h
++++ splitvt-1.6.5/splitvt.h
+@@ -34,3 +34,25 @@
+ 
+ /* Functions exported from splitvt.c */
+ extern void reset_bar();
++
++/* If set, allow resizing to less than 3 lines */
++extern int force_height;
++
++void tokenize(char *array[], int size, char *line, char *tokens);
++void d_copy(register char *src, register char *dst, register int len);
++int tty_getmode(int fd);
++int tty_raw(int fd);
++int tty_reset(int fd);
++int tty_sane(int fd);
++int remove_me(void);
++int pty_open(char *argv[], int *childpid, int win);
++int addutmp(char *user, int uid, char *tty);
++char *vt_setsel(char *buf, int len, int startx, int endx, int starty, int endy);
++int delutmp(char *user, char *tty);
++int replace_me(void);
++void pty_setwin(int fd, int win);
++int check_attr(int pixel, int lastattr, int currattr);
++void d_zero(register char *dst, register int len);
++void vt_initsel(void);
++int vttest(void);
++int safe_pclose(FILE *pipefp);
+--- splitvt-1.6.5.orig/splitvt.1
++++ splitvt-1.6.5/splitvt.1
+@@ -47,6 +47,11 @@
+ Suppresses loading your ~/.splitvtrc
+ .TP
+ .TB
++.I -f
++Allow setting the height of either the top or the bottom window to less than
++3 lines.
++.TP
++.TB
+ .I -v
+ Print out the version number of splitvt
+ .LP
+@@ -173,7 +178,7 @@
+ splitvt will attempt to erase the current utmp entry, and replace it
+ with entries for the two windows.  This allows you to use programs
+ such as 'talk' within the splitvt windows.  If you do not have write
+-permission to the /etc/utmp file, you will not be able to modify the
++permission to the /var/run/utmp file, you will not be able to modify the
+ utmp entries.
+ 
+ splitvt can be made set-uid root.  splitvt will reset its user id to
+--- splitvt-1.6.5.orig/splitvt-1.6.4.lsm
++++ splitvt-1.6.5/splitvt-1.6.4.lsm
+@@ -0,0 +1,15 @@
++Begin3
++Title:          Splitvt - a split windows utility
++Version:        1.6.4
++Entered-date:   03JUN2000
++Description:    A utility to split a vt100 compatible screen into two halfs,
++                upper and lower, and run a different program simultaneously
++                in each half.
++Keywords:       screen vt100 emulator
++Author:         slouken@devolution.com  (Sam Lantinga)
++Maintained-by:  slouken@devolution.com  (Sam Lantinga)
++Primary-site:   http://www.devolution.com/~slouken/projects/splitvt/
++Alternate-site: sunsite.unc.edu /pub/Linux/utils/terminal
++Platform:       UNIX
++Copying-policy: GPL
++End
+--- splitvt-1.6.5.orig/utmp.c
++++ splitvt-1.6.5/utmp.c
+@@ -1,21 +1,27 @@
+ 
+ /*  utmp.c    Shareware Copyright by Sam Lantinga	10/6/93	*/
+ 
++#include	<unistd.h>
+ #include	<sys/types.h>
+ #include	<sys/stat.h>
+ #include	<fcntl.h>
+ #include	<utmp.h>
+ #include	<stdio.h>
++#include	<string.h>
++#include	<time.h>
++#include	"splitvt.h"
+ 
+ #ifdef DEBUG_UTMP
+ #undef  UTMP_FILE
+ #define UTMP_FILE  "/tmp/utmp"
+ #else
+ #ifndef UTMP_FILE
+-#define UTMP_FILE  "/etc/utmp"
++#define UTMP_FILE  "/var/run/utmp"
+ #endif /* UTMP_FILE */
+ #endif /* DEBUG_UTMP */
+ 
++int get_utmp(char *tty, struct utmp *save);
++int set_utmp(char *tty, struct utmp *save);
+ 
+ /* Remove us from the utmp file, saving our entry to replace later */
+ 
+@@ -94,7 +100,7 @@
+   		if (strncmp(ttyptr, ut.ut_line, sizeof(ut.ut_line)) == 0) {
+ 			/* Break out; we've found our entry! */
+ 			if ( save )
+-				d_copy((char *)&ut, save, sizeof(ut));
++				d_copy((char *)&ut, (char *)&save, sizeof(ut));
+ 			close(fd);
+ 			return(0);
+     		}
+@@ -158,7 +164,9 @@
+ int uid;		/* The uid corresponding to user */
+ char *tty;		/* /dev/ttyxx */
+ {
++#if !defined(SOLARIS) && !defined(IRIX) && !defined(__GLIBC__)
+ 	struct stat sb;
++#endif
+ 	struct utmp ut;
+ 	char *ttyptr;
+ 
+@@ -195,12 +203,13 @@
+ #endif
+ 	(void) time(&ut.ut_time);
+ 
+-#if !defined(SOLARIS) && !defined(IRIX)
+-	/* Solaris and Irix machines do this automatically */
++#if !defined(SOLARIS) && !defined(IRIX) && !defined(__GLIBC__)
++	/* Solaris and Irix and GLIBC machines do this automatically */
+ 	/* Change the ownership and mode of the tty */
+ 	if ( stat(tty, &sb) == 0 ) {
+ 		(void) chmod(tty, 0620);  /* crw--w---- */
+ 		(void) chown(tty, uid, sb.st_gid);
++		
+ 	}
+ #endif
+ 	return(set_utmp(tty, &ut));
+--- splitvt-1.6.5.orig/lock.c
++++ splitvt-1.6.5/lock.c
+@@ -1,9 +1,13 @@
+ 
+ /* The screen locking module for splitvt */
+ 
++#include	<unistd.h>
++#include	<sys/types.h>
++#include	<string.h>
+ #include	<stdio.h>
+ #include	<pwd.h>
+ #include	"vt100.h"
++#include	"splitvt.h"
+ 
+ #define UNLOCKED	0
+ #define ENTERED1	1
+--- splitvt-1.6.5.orig/vttest.c
++++ splitvt-1.6.5/vttest.c
+@@ -12,6 +12,7 @@
+ 	-Sam Lantinga		(slouken@toadflax.cs.ucdavis.edu)
+ */
+ 
++#include	<unistd.h>
+ #include	<sys/types.h>
+ #include	<stdio.h>
+ #include	<fcntl.h>
+@@ -48,9 +49,12 @@
+ int vttest() 
+ {
+ 	char   buff[512];
+-	int x=0, w, rc=0, fd;
++	int x=0, rc=0, fd;
+ 	struct termio ttold, ttraw;
+ 
++	/* Disabled since at least on sparc it causes a hang. */
++	return 1;
++	
+ 	/* Set the terminal in a raw mode */
+ 	if ( (fd=open("/dev/tty", O_RDWR, 0666)) < 0 )
+ 		return(0);
+--- splitvt-1.6.5.orig/vtmouse.c
++++ splitvt-1.6.5/vtmouse.c
+@@ -7,8 +7,11 @@
+ 
+ #define SPLITVT_SOURCE
+ 
++#include <string.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include "vtmouse.h"
++#include "splitvt.h"
+ 
+ extern FILE *safe_popen();		/* From misc.c */
+ 
+--- splitvt-1.6.5.orig/videomem.c
++++ splitvt-1.6.5/videomem.c
+@@ -1,6 +1,7 @@
+ 
+ /* This file holds the functions for manipulating video memory */
+ 
++#include	<stdlib.h>
+ #include	<stdio.h>
+ #include	"video.h"
+ #include	"terminal.h"
+@@ -113,7 +114,7 @@
+ int x1, x2;
+ int y1, y2;
+ {
+-	int l=0, i, j, eol, eos;
++	int l=0, i, j, eol, eos=0;
+ 
+ 	--maxlen;	/* Account for trailing null */
+ 	for ( i=(x1-1); (i<x2 && l<maxlen); ++i ) {
+@@ -319,7 +320,7 @@
+ void paint_video(win)
+ window *win;
+ {
+-	unsigned char change, on=NORMAL;
++	unsigned char on=NORMAL;
+ 	int i, j, oldattr=0;
+ 
+ 	vt_setscroll(0,0);
+--- splitvt-1.6.5.orig/vtmouse.h
++++ splitvt-1.6.5/vtmouse.h
+@@ -39,5 +39,7 @@
+ extern int  event_getc();
+ extern void event_quit();
+ 
++#if 0
++/* this is broken for gcc 4.0, so comment it out */
+ extern FILE *xt_input, *xt_output;	/* Usually untouched */
+-
++#endif
+--- splitvt-1.6.5.orig/terminal.c
++++ splitvt-1.6.5/terminal.c
+@@ -4,8 +4,11 @@
+    actually write to the terminal.
+ */
+ 
+-
++#include	<curses.h>
++#include	<term.h>
+ #include	<stdio.h>
++#include	<string.h>
++#include	"splitvt.h"
+ #include	"video.h"
+ #include	"terminal.h"
+ 
+@@ -125,7 +128,7 @@
+ 	}
+ 	return(NULL);
+ }
+-void outc(c) int c; { putchar(c); }
++int outc(c) int c; { return putchar(c); }
+ 
+ void vt_rows_cols(termtype, rows, cols)
+ char *termtype;
+--- splitvt-1.6.5.orig/misc.c
++++ splitvt-1.6.5/misc.c
+@@ -1,10 +1,17 @@
+ /* Miscellaneous system dependent routines for splitsh */
+ 
++#define _GNU_SOURCE /* for getpt and other gnu extensions to libc */
++
+ #include	<sys/types.h>
++#include	<sys/wait.h>
++#include	<unistd.h>
++#include	<stdlib.h>
+ #include	<sys/stat.h>
+ #include	<fcntl.h>
+ #include	<stdio.h>
+ #include	<signal.h>
++#include	<utime.h>
++#include	<string.h>
+ 
+ 
+ #ifdef HAVE_TERMIO_H
+@@ -24,6 +31,8 @@
+ /*#define STTY_HACK*/
+ #endif
+ 
++int tty_reset(int fd);
++
+ /*
+  * Initialize a pty, fork a command running under it, and then 
+  * return the master file descriptor
+@@ -44,7 +53,10 @@
+ 	int get_master_pty(), get_slave_pty();
+ 	char *get_ttyname(), *myputenv();
+ 
+-	char LINES[12], COLUMNS[12], SPLITVT[24];
++#ifndef TIOCGWINSZ
++	char LINES[12], COLUMNS[12];
++#endif
++	char SPLITVT[24];
+ 	int returnfd, slave_fd;
+ 
+ 	/* Get the master pty file descriptor */
+@@ -106,6 +118,8 @@
+ 		/* "touch" the tty so 'w' reports proper idle times */
+ 		(void) utime(get_ttyname(), NULL);
+ 
++		/* Set our gid to our real gid if necessary */
++		(void) setgid(getgid());
+ 		/* Set our uid to our real uid if necessary */
+ 		(void) setuid(getuid());
+ 			
+@@ -182,12 +196,18 @@
+ #else /* ! IRIX */
+ 
+ 
+-#ifdef SOLARIS		/* System V.4 pty routines from W. Richard Stevens */
++#if defined(SOLARIS) || defined(__GLIBC__)
++/* System V.4 pty routines from W. Richard Stevens */
++/* GLIBC is very similar, so this will handle it too. */
++
++#ifdef SOLARIS
+ 
+ #include <stropts.h>
+ 
+ #define DEV_CLONE	"/dev/ptmx"
+ 
++#endif
++
+ extern char *ptsname();
+ 
+ int get_master_pty()
+@@ -195,9 +215,14 @@
+ 
+ 	char 	*ttyptr;
+ 
++#ifdef SOLARIS
+ 	if ( (master_fd=open(DEV_CLONE, O_RDWR)) < 0 )
+ 		return(-1);
+-
++#else /* GLIBC */
++	if ( (master_fd=getpt()) == -1 )
++		return (-1);
++#endif
++	
+ 	if ( grantpt(master_fd) < 0 )	/* grant access to slave */
+ 	{
+ 		close(master_fd);
+@@ -242,6 +267,7 @@
+ 		return(-1);
+ 	}
+ 
++#ifdef SOLARIS
+ 	if ( ioctl(slave_fd, I_PUSH, "ptem") < 0 )
+ 	{
+ 		close(master_fd);
+@@ -262,7 +288,8 @@
+ 		close(slave_fd);
+ 		return(-1);
+ 	}
+-
++#endif
++	
+ 	return(slave_fd);
+ }
+ 
+@@ -393,8 +420,10 @@
+ 
+ void dropctty()
+ {
++#ifndef CIBAUD
+ 	int fd;
+-
++#endif
++	
+ #if defined(_POSIX_SOURCE) || defined(SOLARIS) || \
+ 				defined(__386BSD__) || defined(__FreeBSD__)
+ 	setsid();		/* The POSIX solution is simple. :) */
+@@ -708,7 +737,6 @@
+ 	extern char **environ;	/* The process environment strings */
+ 
+ 	char *newptr, **envptr;
+-	char *tmptr, temp[BUFSIZ];
+ 	int   distance, n=0;
+ 
+ 	for ( distance=0; ((*(string+distance)) && 
+@@ -759,7 +787,7 @@
+ char *line;
+ char *tokens;
+ {
+-	char *head, *ptr;
++	char *head;
+ 	int i=0;
+ 
+ 	for ( head=line; *line && i < size-2; ) {
+@@ -847,7 +875,7 @@
+ {
+ 	char *argv[4];
+ 	int pipe_fds[2];
+-	int rw, child;
++	int rw;
+ 
+ 	if ( strcmp(type, "r") == 0 )
+ 		rw=0;	/* READ access for parent */
diff --git a/source/a/sysfsutils/slack-desc b/source/a/sysfsutils/slack-desc
new file mode 100644
index 000000000..b7b470925
--- /dev/null
+++ b/source/a/sysfsutils/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------------------------------------------------------|
+sysfsutils: sysfsutils (Utilities for the sysfs filesystem)
+sysfsutils:
+sysfsutils: The purpose of this package is to provide a set of utilities for
+sysfsutils: interfacing with sysfs, a virtual filesystem in Linux kernel versions
+sysfsutils: 2.6+ that provides a tree of system devices.  While a filesystem is a
+sysfsutils: very useful interface, a library (libsysfs) is also included that
+sysfsutils: will hopefully make it easier for applications to query system
+sysfsutils: devices and their attributes.
+sysfsutils:
+sysfsutils:
+sysfsutils:
diff --git a/source/a/sysfsutils/sysfsutils.SlackBuild b/source/a/sysfsutils/sysfsutils.SlackBuild
new file mode 100755
index 000000000..0534b3e29
--- /dev/null
+++ b/source/a/sysfsutils/sysfsutils.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=2.1.0
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sysfsutils
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf sysfsutils-$VERSION
+tar xjvf $CWD/sysfsutils-$VERSION.tar.bz2
+cd sysfsutils-$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 \
+  --prefix=/usr \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --enable-static=no \
+  $ARCH-slackware-linux
+make
+make install DESTDIR=$PKG
+
+# Unless things start whining later that this libtool junk is
+# required for some reason, out it goes.  Especially in /lib,
+# where probably nothing would find it anyway.
+rm -f $PKG/lib${LIBDIRSUFFIX}/*.la
+
+# .so links should really go in /usr/lib:
+rm $PKG/lib${LIBDIRSUFFIX}/*.so
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+# sanity check
+if [ ! -L $PKG/lib${LIBDIRSUFFIX}/libsysfs.so.2 ]; then
+  exit 1
+fi
+( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf /lib${LIBDIRSUFFIX}/libsysfs.so.2 libsysfs.so )
+
+( 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
+)
+
+mkdir -p $PKG/usr/doc/sysfsutils-$VERSION
+cp -a \
+  AUTHORS COPYING CREDITS NEWS README TODO \
+  docs/* \
+  $PKG/usr/doc/sysfsutils-$VERSION
+
+# Compress and/or relink manpages:
+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 $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/sysfsutils-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/sysklogd/slack-desc b/source/a/sysklogd/slack-desc
new file mode 100644
index 000000000..883782ccf
--- /dev/null
+++ b/source/a/sysklogd/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------------------------------------------------------|
+sysklogd: sysklogd (Linux system logging utilities)
+sysklogd:
+sysklogd: Dr. Greg Wettstein and Stephen Tweedie's syslogd/klogd.
+sysklogd:
+sysklogd: This package contains a modified version of syslogd for the Linux
+sysklogd: environment.  An additional utility, klogd, is included which allows
+sysklogd: kernel logging to be directed through the syslogd facility.
+sysklogd: Syslogd and klogd are started when your system boots.
+sysklogd:
+sysklogd:
+sysklogd:
diff --git a/source/a/sysklogd/sysklogd-1.4.1-owl-syslogd-crunch_list.diff b/source/a/sysklogd/sysklogd-1.4.1-owl-syslogd-crunch_list.diff
new file mode 100644
index 000000000..268309297
--- /dev/null
+++ b/source/a/sysklogd/sysklogd-1.4.1-owl-syslogd-crunch_list.diff
@@ -0,0 +1,90 @@
+--- ./syslogd.c.orig	2007-04-09 18:17:05.000000000 -0500
++++ ./syslogd.c	2007-04-09 18:25:22.000000000 -0500
+@@ -1273,61 +1273,55 @@
+ crunch_list(list)
+ 	char *list;
+ {
+-	int count, i;
++	int i, m, n;
+ 	char *p, *q;
+ 	char **result = NULL;
+ 
+ 	p = list;
+ 	
+ 	/* strip off trailing delimiters */
+-	while (p[strlen(p)-1] == LIST_DELIMITER) {
+-		count--;
++	while (*p && p[strlen(p)-1] == LIST_DELIMITER)
+ 		p[strlen(p)-1] = '\0';
+-	}
+ 	/* cut off leading delimiters */
+-	while (p[0] == LIST_DELIMITER) {
+-		count--;
+-		p++; 
+-	}
+-	
+-	/* count delimiters to calculate elements */
+-	for (count=i=0; p[i]; i++)
+-		if (p[i] == LIST_DELIMITER) count++;
+-	
+-	if ((result = (char **)malloc(sizeof(char *) * (count+2))) == NULL) {
++	while (p[0] == LIST_DELIMITER)
++		p++;
++
++	/* count delimiters to calculate the number of elements */
++	for (n = i = 0; p[i]; i++)
++		if (p[i] == LIST_DELIMITER) n++;
++
++	if ((result = (char **)malloc(sizeof(char *) * (n + 2))) == NULL) {
+ 		printf ("Sorry, can't get enough memory, exiting.\n");
+-		exit(0);
++		exit(1);
+ 	}
+-	
++
+ 	/*
+ 	 * We now can assume that the first and last
+ 	 * characters are different from any delimiters,
+ 	 * so we don't have to care about this.
+ 	 */
+-	count = 0;
+-	while ((q=strchr(p, LIST_DELIMITER))) {
+-		result[count] = (char *) malloc((q - p + 1) * sizeof(char));
+-		if (result[count] == NULL) {
++	m = 0;
++	while ((q = strchr(p, LIST_DELIMITER)) && m < n) {
++		result[m] = (char *) malloc((q - p + 1) * sizeof(char));
++		if (result[m] == NULL) {
+ 			printf ("Sorry, can't get enough memory, exiting.\n");
+-			exit(0);
++			exit(1);
+ 		}
+-		strncpy(result[count], p, q - p);
+-		result[count][q - p] = '\0';
++		memcpy(result[m], p, q - p);
++		result[m][q - p] = '\0';
+ 		p = q; p++;
+-		count++;
++		m++;
+ 	}
+-	if ((result[count] = \
+-	     (char *)malloc(sizeof(char) * strlen(p) + 1)) == NULL) {
++	if ((result[m] = strdup(p)) == NULL) {
+ 		printf ("Sorry, can't get enough memory, exiting.\n");
+-		exit(0);
++		exit(1);
+ 	}
+-	strcpy(result[count],p);
+-	result[++count] = NULL;
++	result[++m] = NULL;
+ 
+ #if 0
+-	count=0;
+-	while (result[count])
+-		dprintf ("#%d: %s\n", count, StripDomains[count++]);
++	m = 0;
++	while (result[m])
++		dprintf ("#%d: %s\n", m, result[m++]);
+ #endif
+ 	return result;
+ }
diff --git a/source/a/sysklogd/sysklogd-1.4.1.lsm b/source/a/sysklogd/sysklogd-1.4.1.lsm
new file mode 100644
index 000000000..0c3b75f8f
--- /dev/null
+++ b/source/a/sysklogd/sysklogd-1.4.1.lsm
@@ -0,0 +1,23 @@
+Begin3
+Title:          sysklogd
+Version:        1.4.1
+Entered-date:   2001-03-11
+Description:    The sysklogd package implements two system log daemons.  The
+                syslogd daemon is the general system logging daemon which
+                is responsible for handling requests for syslog services.
+		This version of syslogd is similar to the standard Berkeley
+		product but with a number of compatible extensions.  The
+		klogd daemon runs either standalone or as a client of syslogd.
+		Klogd 'listens' to kernel log messages, prioritizes them and
+		routes them to either output files or to syslogd.  This
+		version of klogd will optionally translate kernel addresses
+		to their symbolic equivalents if provided with a system map.
+Keywords:       logging, remote, kernel, syslogd, proc, daemon, klogd
+Author:         greg@wind.enjellic.com (Dr. G.W. Wettstein)
+Maintained-by:  joey@infodrom.ffis.de (Martin Schulze)
+Primary-site:   www.infodrom.ffis.de /projects/sysklogd
+                82kB sysklogd-1.4.1.tar.gz
+                1kB  sysklogd-1.4.1.lsm
+Alternate-site: metalab.unc.edu /pub/Linux/system/daemons
+Copying-policy: syslogd is under Berkeley copyright, klogd is under GPL.
+End
diff --git a/source/a/sysklogd/sysklogd.SlackBuild b/source/a/sysklogd/sysklogd.SlackBuild
new file mode 100755
index 000000000..110659e4c
--- /dev/null
+++ b/source/a/sysklogd/sysklogd.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+
+VERSION=1.4.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-10}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sysklogd
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_sysklogd.tar.gz
+
+cd $TMP
+rm -rf sysklogd-$VERSION
+tar xzvf $CWD/sysklogd-$VERSION.tar.gz || exit 1
+cd sysklogd-$VERSION
+zcat $CWD/sysklogd_1.4.1-20.diff.gz | patch -p1 --verbose || exit 1
+#zcat $CWD/sysklogd-1.4.1-owl-syslogd-crunch_list.diff.gz | patch -p1 --verbose || 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 -j4 || exit 1
+make syslog_tst || exit 1
+cat klogd > $PKG/usr/sbin/klogd
+cat syslog_tst > $PKG/usr/sbin/syslog_tst
+cat syslogd > $PKG/usr/sbin/syslogd
+for page in klogd.8 sysklogd.8 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man8/$page.gz
+done
+cat syslog.conf.5 | gzip -9c > $PKG/usr/man/man5/syslog.conf.5.gz
+mkdir -p $PKG/usr/doc/sysklogd-$VERSION
+cp -a ANNOUNCE CHANGES COPYING INSTALL MANIFEST NEWS README.1st \
+  README.linux $PKG/usr/doc/sysklogd-$VERSION
+chmod 644 $PKG/usr/doc/sysklogd-$VERSION/*
+( 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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/sysklogd-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/sysklogd-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/a/sysklogd/sysklogd_1.4.1-20.diff b/source/a/sysklogd/sysklogd_1.4.1-20.diff
new file mode 100644
index 000000000..9bb27bbb6
--- /dev/null
+++ b/source/a/sysklogd/sysklogd_1.4.1-20.diff
@@ -0,0 +1,2555 @@
+--- sysklogd-1.4.1.orig/CHANGES
++++ sysklogd-1.4.1/CHANGES
+@@ -30,3 +30,4 @@
+  . Olaf Kirch <okir@caldera.de>
+    - Remove Unix Domain Sockets and switch to Datagram Unix Sockets
+  . Several bugfixes and improvements, please refer to the .c files
++
+--- sysklogd-1.4.1.orig/README.linux
++++ sysklogd-1.4.1/README.linux
+@@ -44,8 +44,8 @@
+ mail to Majordomo@Infodrom.North.DE with a line "subscribe sysklogd"
+ in the message body.
+ 
+-New versions of this package will be available at Joey's ftp server.
+-ftp://ftp.infodrom.north.de/pub/people/joey/sysklogd/
++New versions of this package will be available at Joey's server.
++  http://www.infodrom.org/projects/sysklogd/
+ 
+ Best regards,
+ 
+@@ -67,6 +67,6 @@
+ 
+ Martin Schulze
+ Infodrom Oldenburg
+-joey@linux.de
++joey@infodrom.org
+ 
+ And a host of bug reporters whose contributions cannot be underestimated.
+--- sysklogd-1.4.1.orig/klogd.8
++++ sysklogd-1.4.1/klogd.8
+@@ -321,7 +321,7 @@
+ .B klogd
+ to reload the module symbol information whenever a protection fault
+ is detected.  Caution should be used before invoking the program in
+-\'paranoid\' mode.  The stability of the kernel and the operating
++\&'paranoid\&' mode.  The stability of the kernel and the operating
+ environment is always under question when a protection fault occurs.
+ Since the klogd daemon must execute system calls in order to read the
+ module symbol information there is the possibility that the system may
+--- sysklogd-1.4.1.orig/ksym_mod.c
++++ sysklogd-1.4.1/ksym_mod.c
+@@ -78,6 +78,11 @@
+  *
+  * Tue Sep 12 23:11:13 CEST 2000: Martin Schulze <joey@infodrom.ffis.de>
+  *	Changed llseek() to lseek64() in order to skip a libc warning.
++ *
++ * Wed Mar 31 17:35:01 CEST 2004: Martin Schulze <joey@infodrom.org>
++ *	Removed references to <linux/module.h> since it doesn't work
++ *	anymore with its recent content from Linux 2.4/2.6, created
++ *	module.h locally instead.
+  */
+ 
+ 
+@@ -89,11 +94,12 @@
+ #include <errno.h>
+ #include <sys/fcntl.h>
+ #include <sys/stat.h>
++#include "module.h"
+ #if !defined(__GLIBC__)
+ #include <linux/time.h>
+-#include <linux/module.h>
++#include <linux/linkage.h>
+ #else /* __GLIBC__ */
+-#include <linux/module.h>
++#include <linux/linkage.h>
+ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ extern int get_kernel_syms __P ((struct kernel_sym *__table));
+ #endif /* __GLIBC__ */
+--- sysklogd-1.4.1.orig/module.h
++++ sysklogd-1.4.1/module.h
+@@ -0,0 +1,90 @@
++/*
++    module.h - Miscellaneous module definitions
++    Copyright (c) 1996 Richard Henderson <rth@tamu.edu>
++    Copyright (c) 2004 Martin Schulze <joey@infodrom.org>
++
++    This file is part of the sysklogd package.
++
++    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., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++
++/* ChangeLog:
++ *
++ * Wed Mar 31 17:35:01 CEST 2004: Martin Schulze <joey@infodrom.org>
++ *	Created local copy of module.h based on the content of Linux
++ *	2.2 since <linux/module.h> doesn't work anymore with its
++ *	recent content from Linux 2.4/2.6.
++ * Thu May 25 09:14:33 CEST 2006: Martin Schulze <joey@infodrom.org>
++ *	Removed asm/atomic.h since it is not needed anymore.
++ */
++
++#define MODULE_NAME_LEN 60
++
++struct kernel_sym
++{
++	unsigned long value;
++	char name[MODULE_NAME_LEN];
++};
++
++
++struct list_head {
++	struct list_head *next, *prev;
++};
++
++
++struct module_info
++{
++	unsigned long addr;
++	unsigned long size;
++	unsigned long flags;
++	long usecount;
++};
++
++
++struct module
++{
++	unsigned long size_of_struct;	/* == sizeof(module) */
++	struct module *next;
++	const char *name;
++	unsigned long size;
++
++	union
++	{
++		int usecount;
++		long pad;
++	} uc;				/* Needs to keep its size - so says rth */
++
++	unsigned long flags;		/* AUTOCLEAN et al */
++
++	unsigned nsyms;
++	unsigned ndeps;
++
++	struct module_symbol *syms;
++	struct module_ref *deps;
++	struct module_ref *refs;
++	int (*init)(void);
++	void (*cleanup)(void);
++	const struct exception_table_entry *ex_table_start;
++	const struct exception_table_entry *ex_table_end;
++#ifdef __alpha__
++	unsigned long gp;
++#endif
++	/* Members past this point are extensions to the basic
++	   module support and are optional.  Use mod_opt_member()
++	   to examine them.  */
++	const struct module_persist *persist_start;
++	const struct module_persist *persist_end;
++	int (*can_unload)(void);
++};
+--- sysklogd-1.4.1.orig/pidfile.c
++++ sysklogd-1.4.1/pidfile.c
+@@ -87,7 +87,7 @@
+   int fd;
+   int pid;
+ 
+-  if ( ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1)
++  if ( ((fd = open(pidfile, O_RDWR|O_CREAT|O_TRUNC, 0644)) == -1)
+        || ((f = fdopen(fd, "r+")) == NULL) ) {
+       fprintf(stderr, "Can't open or create %s.\n", pidfile);
+       return 0;
+--- sysklogd-1.4.1.orig/syslog.conf.5
++++ sysklogd-1.4.1/syslog.conf.5
+@@ -64,7 +64,7 @@
+ The
+ .I facility
+ is one of the following keywords:
+-.BR auth ", " authpriv ", " cron ", " daemon ", " kern ", " lpr ", "
++.BR auth ", " authpriv ", " cron ", " daemon ", " ftp ", " kern ", " lpr ", "
+ .BR mail ", " mark ", " news ", " security " (same as " auth "), "
+ .BR syslog ", " user ", " uucp " and " local0 " through " local7 .
+ The keyword 
+@@ -122,7 +122,7 @@
+ This 
+ .BR syslogd (8)
+ has a syntax extension to the original BSD source, that makes its use
+-more intuitively.  You may precede every priority with an equation sign
++more intuitive.  You may precede every priority with an equation sign
+ (``='') to specify only this single priority and not any of the
+ above.  You may also (both is valid, too) precede the priority with an
+ exclamation mark (``!'') to ignore all that priorities, either exact
+@@ -300,7 +300,7 @@
+ .B syslogd
+ log all messages that come with either the
+ .BR info " or the " notice
+-facility into the file
++priority into the file
+ .IR /var/log/messages ,
+ except for all messages that use the
+ .B mail
+--- sysklogd-1.4.1.orig/syslogd.c
++++ sysklogd-1.4.1/syslogd.c
+@@ -890,11 +890,11 @@
+ 		dprintf("Checking pidfile.\n");
+ 		if (!check_pid(PidFile))
+ 		{
++			signal (SIGTERM, doexit);
+ 			if (fork()) {
+ 				/*
+ 				 * Parent process
+ 				 */
+-				signal (SIGTERM, doexit);
+ 				sleep(300);
+ 				/*
+ 				 * Not reached unless something major went wrong.  5
+@@ -1074,9 +1074,9 @@
+ 				  (fd_set *) NULL, (struct timeval *) NULL);
+ 		if ( restart )
+ 		{
++			restart = 0;
+ 			dprintf("\nReceived SIGHUP, reloading syslogd.\n");
+ 			init();
+-			restart = 0;
+ 			continue;
+ 		}
+ 		if (nfds == 0) {
+@@ -1141,13 +1141,13 @@
+ 				 */
+ 				printchopped(from, line, \
+  					     i + 2,  finet);
+-			} else if (i < 0 && errno != EINTR) {
++			} else if (i < 0 && errno != EINTR && errno != EAGAIN) {
+ 				dprintf("INET socket error: %d = %s.\n", \
+ 					errno, strerror(errno));
+ 				logerror("recvfrom inet");
+ 				/* should be harmless now that we set
+ 				 * BSDCOMPAT on the socket */
+-				sleep(10);
++				sleep(1);
+ 			}
+ 		}
+ #endif
+@@ -1216,6 +1216,7 @@
+ {
+ 	int fd, on = 1;
+ 	struct sockaddr_in sin;
++	int sockflags;
+ 
+ 	fd = socket(AF_INET, SOCK_DGRAM, 0);
+ 	if (fd < 0) {
+@@ -1241,6 +1242,24 @@
+ 		close(fd);
+ 		return -1;
+ 	}
++	/* We must not block on the network socket, in case a packet
++	 * gets lost between select and recv, otherise the process
++	 * will stall until the timeout, and other processes trying to
++	 * log will also stall.
++	 */
++	if ((sockflags = fcntl(fd, F_GETFL)) != -1) {
++		sockflags |= O_NONBLOCK;
++		/*
++		 * SETFL could fail too, so get it caught by the subsequent
++		 * error check.
++		 */
++		sockflags = fcntl(fd, F_SETFL, sockflags);
++	}
++	if (sockflags == -1) {
++		logerror("fcntl(O_NONBLOCK), suspending inet");
++		close(fd);
++		return -1;
++	}
+ 	if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
+ 		logerror("bind, suspending inet");
+ 		close(fd);
+@@ -1275,7 +1294,7 @@
+ 	for (count=i=0; p[i]; i++)
+ 		if (p[i] == LIST_DELIMITER) count++;
+ 	
+-	if ((result = (char **)malloc(sizeof(char *) * count+2)) == NULL) {
++	if ((result = (char **)malloc(sizeof(char *) * (count+2))) == NULL) {
+ 		printf ("Sorry, can't get enough memory, exiting.\n");
+ 		exit(0);
+ 	}
+@@ -1539,20 +1558,37 @@
+ 	int fac, prilev, lognum;
+ 	int msglen;
+ 	char *timestamp;
++#ifdef __gnu_linux__
++	sigset_t mask;
++#else
++#ifndef SYSV
++	sigset_t omask;
++#endif
++#endif
+ 
+ 	dprintf("logmsg: %s, flags %x, from %s, msg %s\n", textpri(pri), flags, from, msg);
+ 
++#ifdef __gnu_linux__
++	sigemptyset(&mask);
++	sigaddset(&mask, SIGHUP);
++	sigaddset(&mask, SIGALRM);
++	sigprocmask(SIG_BLOCK, &mask, NULL);
++#else
+ #ifndef SYSV
+ 	omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM));
+ #endif
++#endif
+ 
+ 	/*
+ 	 * Check to see if msg looks non-standard.
+ 	 */
+ 	msglen = strlen(msg);
+-	if (msglen < 16 || msg[3] != ' ' || msg[6] != ' ' ||
+-	    msg[9] != ':' || msg[12] != ':' || msg[15] != ' ')
+-		flags |= ADDDATE;
++	flags |= ADDDATE;
++	if ( !(msglen < 16 || msg[3] != ' ' || msg[6] != ' ' ||
++	    msg[9] != ':' || msg[12] != ':' || msg[15] != ' ')) {
++		msg += 16;
++		msglen -= 16;
++	}
+ 
+ 	(void) time(&now);
+ 	if (flags & ADDDATE)
+@@ -1581,9 +1617,13 @@
+ 			(void) close(f->f_file);
+ 			f->f_file = -1;
+ 		}
++#ifdef __gnu_linux__
++		sigprocmask(SIG_UNBLOCK, &mask, NULL);
++#else
+ #ifndef SYSV
+ 		(void) sigsetmask(omask);
+ #endif
++#endif
+ 		return;
+ 	}
+ #ifdef SYSV
+@@ -1646,9 +1686,13 @@
+ 			}
+ 		}
+ 	}
++#ifdef __gnu_linux__
++	sigprocmask(SIG_UNBLOCK, &mask, NULL);
++#else
+ #ifndef SYSV
+ 	(void) sigsetmask(omask);
+ #endif
++#endif
+ }
+ #if FALSE
+ } /* balance parentheses for emacs */
+@@ -1839,7 +1883,7 @@
+ #else
+ 				&& e == EBADF) {
+ #endif
+-				f->f_file = open(f->f_un.f_fname, O_WRONLY|O_APPEND|O_NOCTTY);
++				f->f_file = open(f->f_un.f_fname, O_WRONLY|O_APPEND|O_NOCTTY|O_NONBLOCK);
+ 				if (f->f_file < 0) {
+ 					f->f_type = F_UNUSED;
+ 					logerror(f->f_un.f_fname);
+@@ -2640,7 +2684,7 @@
+ 			f->f_file = open(++p, O_RDWR|O_NONBLOCK);
+ 			f->f_type = F_PIPE;
+ 	        } else {
+-			f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
++			f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY|O_NONBLOCK,
+ 					 0644);
+ 			f->f_type = F_FILE;
+ 		}
+--- sysklogd-1.4.1.orig/debian/NMU-Disclaimer
++++ sysklogd-1.4.1/debian/NMU-Disclaimer
+@@ -0,0 +1,45 @@
++Non Maintainer Upload of this Package
++-------------------------------------
++
++If you plan to work on an NMU for this package, read the following
++closely.  It can save you and me some grief.
++
++ 1. At first, contact the maintainer (i.e. send a mail to
++    joey@debian.org, do not cc or bounce a mail, send a plain mail,
++    not copied to any mailing list or the BTS) and ask about the
++    status of the bug you are considering to work on.
++
++ 2. In this mail include all information relevant for this problem,
++    i.e. include a description of the bug and not only its bug
++    number.
++
++ 3. If the maintainer is not able or willing to fix the problem or
++    does not respond within four days, continue with step 4.
++
++ 4. Work on the bug and prepare a patch.  Do not upload into the
++    Debian archive.
++
++ 5. Send the entire patch, together with enough explanations, to the
++    maintainer for reviewing and ask him for permission of an NMU
++    using this patch.
++
++ 6. IF AND ONLY IF the maintainer approves the patch (or doesn't
++    respond within four days), upload the NMU to the incoming
++    directory and send the patch to the BTS.  If the NMU is not
++    approved, go back to 4. or add the NMU to your homepage, but do
++    not upload it to the Debian archive.
++
++ 7. Properly sized and well-written patches sent to the BTS are always
++    appreciated, even if they are rejected later.  They demonstrate a
++    potential solution which could probably improved into a real
++    solution.
++
++ 8. NEVER change the way a package is maintained in an NMU, i.e. don't
++    remove dh_* stuff or switch to dh_* respectively.  This rule
++    applies to all NMU's, not only to an NMU for this package.
++
++These rules always apply.  They even apply if somebody declares NMUs
++as ok and reduces regular NMU rules to a delay of zero days.  Unless
++I'm on vacation or on a show I am reachable via mail, so there is
++hardly a reason not to contact me.
++
+--- sysklogd-1.4.1.orig/debian/changelog
++++ sysklogd-1.4.1/debian/changelog
+@@ -0,0 +1,694 @@
++sysklogd (1.4.1-20) unstable; urgency=low
++
++  * Added a missing whitespace to the rc file (Closes: Bug#388787,
++    Bug#388378, Bug#388260)
++  * Corrected typo in syslog.conf(5) (Closes: Bug#327200)
++
++ -- Martin Schulze <joey@infodrom.org>  Thu, 28 Sep 2006 20:46:41 +0200
++
++sysklogd (1.4.1-19) unstable; urgency=high
++
++  * Converted init.d scripts to LSB style
++    - accidently closes: Bug#211858
++  * Removed code that's not required anymore in cron.daily/sysklogd
++  * Fix initial permission (closes: Bug#285500)
++  * Added a special exception for when /var/log/news is a file (closes:
++    Bug#266555)
++  * Tidy up the postinst script
++  * Added devfs awarenes for /dev/xconsole creation (closes: Bug#206066)
++  * Move daemon stop logic into klogd's postinst
++  * Removed both preinst scripts from the distribution
++
++ -- Martin Schulze <joey@infodrom.org>  Mon, 18 Sep 2006 13:15:59 +0200
++
++sysklogd (1.4.1-18) unstable; urgency=medium
++
++  * Removed asm/atomic.h since it is not needed anymore. (closes:
++    Bug#350764)
++  * Fixed typo in NMU-Disclaimer (closes: Bug#225895)
++  * Corrected getconf call in debian/rules to fix lagefile support
++    (closes: Bug#320119)
++  * Applied patch by Joey Hess to prevent klogd to be stopped/started too
++    fast (closes: Bug#284914)
++  * Finish /usr/share/doc transition with patch by Julien Cristau (closes:
++    Bug#337712, Bug#322769, Bug#255590)
++  * Reset the 'restart' flag immediately after entering the restart code.
++    Thanks to Dean Gaudet (closes: Bug#154805)
++  * Added support for /etc/default/{syslogd,klogd} files to contain
++    commandline arguments for syslogd and klogd (closes: Bug#98631,
++    Bug#127579, Bug#241350, Bug#266985)
++  * Added a description of system log level and link to sysctl(8) (closes:
++    Bug#164153)
++  * Acknowledging Joey's NMUs (closes: Bug#347333)
++
++ -- Martin Schulze <joey@infodrom.org>  Thu, 25 May 2006 11:07:52 +0200
++
++sysklogd (1.4.1-17) unstable; urgency=high
++
++  * Use $(getconf LFS_CFLAGS) for large file support
++  * Applied adjusted patch by Miquel van Smoorenburg to fix spurious
++    hanging syslogd in connection with futex and NPTL introduced in recent
++    glibc versions and Linux 2.6 (closes: Bug#301511)
++
++ -- Martin Schulze <joey@infodrom.org>  Wed, 25 May 2005 20:10:31 +0200
++
++sysklogd (1.4.1-16) unstable; urgency=medium
++
++  * applied patch by cph
++  * Applied patch by Colin Phipps so that syslogd doesn't block on the
++    network socket, in case a packet gets lost between select and
++    recv. (closes: Bug#275578)
++  * Applied patch by Anders Henke so that syslog calculates the time for
++    each message (closes: Bug#207619)
++  * Don't create /var/log/news if it's not needed (closes: Bug#266555)
++
++ -- Martin Schulze <joey@infodrom.org>  Sun,  7 Nov 2004 13:10:03 +0100
++
++sysklogd (1.4.1-15) unstable; urgency=low
++
++  * Applied patch by Steve Grubb <linux_4ever@yahoo.com> to adjust memory
++    calculation in crunch_list().
++  * Removed atomic_t in the usecount field of the module struct for
++    compatibility reasons (closes: Bug#245513)
++
++ -- Martin Schulze <joey@infodrom.org>  Tue, 27 Jul 2004 17:28:49 +0200
++
++sysklogd (1.4.1-14) unstable; urgency=medium
++
++  * Added more trailing newlines to init.d programs (closes: Bug#216110)
++  * Adjusted the use of head to the new behaviour for GNU coreutils
++    (closes: Bug#205535, Bug#172655)
++  * Install /usr/share/sysklogd/dummy to replace /usr/share/doc/sysklogd,
++    since /usr/share/doc should be removable by an admin (Policy 12.3).
++    (closes: Bug#237724)
++  * Added a private module.h with extracted data from Linux 2.2 to replace
++    <linux/module.h> which creates a number parse errors.  (closes: Bug#223210)
++  * Added support for invoke-rc.d as written in policy 9.3.3 (closes:
++    Bug#213211, Bug#213585, Bug#216858, Bug#214912)
++
++ -- Martin Schulze <joey@debian.org>  Wed, 31 Mar 2004 18:18:54 +0200
++
++sysklogd (1.4.1-13) unstable; urgency=medium
++
++  * Updated some text in the cronjobs
++  * Direct output of reloading to /dev/null so that no cron log mails will
++    be created defaultly (closes: Bug#213717, Bug#213646)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu,  2 Oct 2003 19:51:34 +0200
++
++sysklogd (1.4.1-12) unstable; urgency=low
++
++  * On heavily loaded system syslog will not spit out error messages
++    anymore when recvfrom() results in EAGAIN (closes: Bug#188194)
++  * Applied patch by Ryan Murray to make this package build on mipsel
++    again (closes: Bug#191969)
++  * Added O_NONBLOCK to two more locations, since Andreas Barth
++    <aba@not.so.argh.org> believes that it fixes this bug.  However,
++    according to the note in open(2) this does not have to have any effect
++    on files other than pipes... (closes: Bug#45245)
++  * Permissions on empty files should also be corrected (closes: Bug#135485)
++  * Corrected the number of bytes denoting 1GB for large logfiles (closes: Bug#138234)
++  * Corrected the handling of the skip pattern (closes: Bug#152247)
++  * Don't cut non-newline trailing characters from the last line anymore
++    (closes: Bug#152248)
++  * Improved init.d scripts so non-existing pid directories are not
++    touched anymore (see Bug#165472)
++  * Whoops, looks like O_TRUNC was missing when opening the pidfile for writing,
++    increasing the chance of left-overs from older pid contents in the
++    file.  (closes: Bug#165472) 
++  * Don't send SIGHUP to klogd anymore.  Only restart it in case the old
++    process got lost somehow.  (closes: Bug#168851)
++  * Improved init.d script output (closes: Bug#190328)
++  * Adjusted the use of chown to the new behaviour for GNU coreutils
++    (closes: Bug#205364)
++  * Adjusted the use of head to the new behaviour for GNU coreutils
++    (closes: Bug#205535)
++  * Moved the installation of the signal handler up a little bit so it
++    guaranteed to be available when the child is forked, hence, fixing a
++    race condition.  This used to create problems with UML and fast
++    machines.  Thanks to Jon Burgess <Jon_Burgess@eur.3com.com> (closes:
++    Bug#211993)
++
++ -- Martin Schulze <joey@kyllikki.infodrom.north.de>  Sun, 28 Sep 2003 12:34:31 +0200
++
++sysklogd (1.4.1-11) unstable; urgency=low
++
++  * Added a disclaimer for those people who plan to NMU this package
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu, 17 Oct 2002 08:26:04 +0200
++
++sysklogd (1.4.1-10) unstable; urgency=low
++
++  * Removed bashism from rc files (closes: Bug#127406, Bug#127407,
++    Bug#127578, Bug#127372)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu,  3 Jan 2002 18:22:13 +0100
++
++sysklogd (1.4.1-9) unstable; urgency=low
++
++  * Use a newer Standards-Version
++  * Corrected dependency of sysklogd (closes: Bug#123908)
++  * Transfer section/priority into .deb (closes: Bug#123908)
++  * Fix typo in syslog.conf(5) (closes: Bug#126899)
++  * Added ``-e'' to weekly and daily cron scripts.  Beware, from now on
++    they will fail if an error occurs and leave /var/log in an undefined
++    state, not signalling syslogd to reopen files as well. (closes: Bug#123281)
++  * Added some intelligence into /etc/init.d/sysklogd and klogd so the
++    daemons will be restarted when they should only be reloaded but are
++    not running.  This could be helpful if after an OOM situation syslogd
++    or klogd were killed by init but cron wasn't.  (closes: Bug#126749, Bug#126750)
++  * Create /dev/xconsole in init.d script if it doesn't exist.  Hence
++    removing this out of the postinst script.  This should help situations
++    when devfs is installed and /dev/ get's removed on system boot, thus
++    /dev/xconsole gets removed as well. (closes: Bug#106535)
++  * Added ftp facility (closes: Bug#100437)
++  * Added missing documentation to syslogd-listfiles(8) (fixes: Bug#48326)
++  * Added a PATH= statement to all init.d files (closes: Bug#47901)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Tue,  1 Jan 2002 13:44:42 +0100
++
++sysklogd (1.4.1-8) unstable; urgency=low
++
++  * Added special code to find out if a logfile was rotated within the
++    last 5 hours already, hence should not be rotated again.  Hope this
++    satisfies Craig Sanders' request properly. (closes: Bug#39198)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu,  6 Dec 2001 11:06:53 +0100
++
++sysklogd (1.4.1-7) unstable; urgency=low
++
++  * Fixed override disparity
++  * Added more defines so files larger than 2GB can be created, approved
++    by the glibc maintainer (closes: Bug#120574)
++  * Closing old bug reports (closes: Bug#95230, Bug#34391, Bug#72892)
++  * Added `--large nnn' as argument to syslogd-listfiles so people can
++    decide on their own what a large file is (closes: Bug#39198)
++  * Increased the default definition for large files
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Wed,  5 Dec 2001 22:01:23 +0100
++
++sysklogd (1.4.1-6) unstable; urgency=low
++
++  * Corrected path for syslogd in cron scripts (closes: Bug#122261,
++    Bug#121680, Bug#120809)
++  * Already fixed bugs (closes: Bug#121784)
++  * Improved package description (closes: Bug#120755)
++  * Added an improved pattern for news.*, thanks Takuo (closes: Bug#103999)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Tue,  4 Dec 2001 09:46:46 +0100
++
++sysklogd (1.4.1-5) unstable; urgency=low
++
++  * Fix the override disparity
++  * Removed superflous Priority
++  * Removed =VER= string from syslogd-listfiles (closes: Bug#102998)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Wed, 21 Nov 2001 23:00:29 +0100
++
++sysklogd (1.4.1-4) unstable; urgency=low
++
++  * Added convenience code to support $DEB_BUILD_OPTIONS
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Wed, 21 Nov 2001 18:41:23 +0100
++
++sysklogd (1.4.1-3) unstable; urgency=medium
++
++  * Be more anal about whether sysklogd is installed or not in our cron
++    scripts (closes: Bug#100319)
++  * Added missing newline in init.d script upon restart (closes: Bug#95554)
++  * Moved stop code to prerm (closes: Bug#120249, Bug#96355, Bug#105441,
++    Bug#105442, Bug#109470)
++  * Corrected broken character in klogd.8 (closes: Bug#75932) [repeat, due
++    to typo]
++  * Added dependency to klogd so people who upgrade their sysklogd package
++    won't lose it anymore (closes: Bug#93729) [repeat, another bug#]
++  * auth.* files are only rotated daily (closes: Bug#102138)
++  * Changed -p to -s in documentation (closes: Bug#108473)
++  * Updated documentation to reflect the current location of the mailing
++    list
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Tue, 20 Nov 2001 20:48:32 +0100
++
++sysklogd (1.4.1-2) unstable; urgency=low
++
++  * Corrected location of GPL (closes: Bug#90582)
++  * Added section and priority for binary packages
++  * Added dependency to klogd so people who upgrade their sysklogd package
++    won't lose it anymore (closes: Bug#93922)
++  * Added code snipped to stop klogd/syslogd upon removal (closes:
++    Bug#90534, Bug#90970)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Sat, 21 Apr 2001 15:06:02 +0200
++
++sysklogd (1.4.1-1) unstable; urgency=low
++
++  * New upstream source (closes: Bug#87819, Bug#70790, Bug#32580,
++    Bug#62358, Bug#71631)
++  * Upstream: Doesn't re-set log-level if not requested (closes:
++    Bug#76170, Bug#76170, Bug#85289)
++  * Upstream: Ignore zero bytes (closes: Bug#85478, Bug#85478, Bug#41068)
++  * Upstream: Corrected documentation for `-s' (closes: Bug#87020)
++  * Upstream: test for existence of syslogd-listfiles before calling
++    them.  This got lost due to 1.4.0 brokennes which was packaged and
++    removed some hours later (closes: Bug#84872, Bug#66712)
++  * Applied patch by Tommi Virtanen <tv@debian.org> splitting the package
++    into `sysklogd' and `klogd' (closes:Bug#35586, Bug#72043, Bug#74864,
++    Bug#72122)
++  * Provide / depend on virtual packages system-log-daemon
++    and linux-kernel-log-daemon (closes: Bug#67604)
++  * Applied patch from Tim Janik <timj@gtk.org> to support `-s pattern' in
++    syslogd-listfiles
++  * Transition to FHS, i.e. /usr/share/doc instead of /usr/doc and
++    /usr/share/man instead of /usr/man (closes:  Bug#79250, Bug#80771)
++  * Use --exec for stopping services (closes: Bug#76757)
++  * Corrected broken character in klogd.8 (cloes: Bug#75932)
++  * Only rotate logfiles with size greater than zero.  This got lost due
++    to 1.4.0 brokennes which was packaged and removed some hours later
++    (closes: Bug#74993, Bug#49824)
++  * Added another note about modificability of cronjobs (closes:
++    Bug#88741)
++  * Since klogd replaces parts of sysklogd a proper Replaces line is there
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Sun, 11 Mar 2001 22:30:53 +0100
++
++sysklogd (1.4-1) stable unstable; urgency=medium, closes=70790 32580 49824 62358 66712 71631
++
++  * Added paragraph to binary target
++  * New upstream version (closes: Bug#70790, Bug#32580, Bug#62358,
++    Bug#71631)
++  * Only rotate logfiles that have a size greater than zero (closes:
++    Bug#49824)
++  * Test for existence of syslogd-listfiles before calling it (closes:
++    Bug#66712)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Mon, 18 Sep 2000 16:02:05 +0200
++
++sysklogd (1.3-33) unstable; urgency=medium, closes=38977
++
++  * chmod 0640 /dev/xconsole regardless of its existence (closes: Bug#38977)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Sun, 12 Sep 1999 20:47:53 +0200
++
++sysklogd (1.3-32) unstable; urgency=low, closes=35408 34733 36198
++
++  * Fixed typo in syslogd-listfiles (closes: Bug#35408)
++  * Removed superflous call to utmpname() (closes: Bug#34733)
++  * Added --ignore-size and limit for rotating log files at 2MB to
++    syslogd-listfiles (closes: Bug#36198)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Sun, 23 May 1999 10:40:33 +0200
++
++sysklogd (1.3-31) frozen unstable; urgency=low, closes=28629 30093 31494 30462
++
++  * ``-m 0'' turns off -- MARK -- now. (closes: Bug#28629, Bug#31494)
++  * Changed Greg's e-mail address to represent his current one.
++  * Shortened line length for kernel logging slightly.
++  * Corrected return value of AddModule (closes: Bug#30093)
++  * Finally fixed an error with `-a' processing, thanks to Topi Miettinen
++    <tom@medialab.sonera.net> (closes: Bug#30462)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Tue, 19 Jan 1999 23:56:07 +0100
++
++sysklogd (1.3-30) unstable; urgency=low, closes=28128 28122 24893
++
++  * Contains more patches from Topi Miettinen.
++  * Fixed two mistakes from the most recent version
++  * Fixed fd leak problem.  Thanks to Topi for detecting it
++  * Ouch!  Looks like the released package again is broken.  It worked
++    locally.
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Sun, 18 Oct 1998 20:38:22 +0200
++
++sysklogd (1.3-29) unstable; urgency=low, closes=24893
++
++  * Re-Applied patch provided vom Topi Miettinen with regard to the people
++    from OpenBSD.  This provides the additional '-a' argument used for
++    specifying additional UNIX domain sockets to listen to.  This is been
++    used with chroot()'ed named's for example.  An example is described at
++    http://www.psionic.com/papers/dns.html.  This time the patch doesn't
++    stall syslogd.  Thanks to Topi Miettinen <tom@medialab.sonera.net>
++    (closes: Bug#24893)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Sat, 17 Oct 1998 20:23:00 +0200
++
++sysklogd (1.3-28) unstable; urgency=low
++
++  * Added manpage for syslog-facility, also written by Raphaël Hertzog 
++  * Reverted support for multiple Unix domain sockets since it caused
++    syslogd to not accept more sockets after a certain (undefinitve)
++    time.  (opens: Bug#24893)
++  * The complete code is still present, search for `Bug#24893'
++  * Commented out `-a' in the syslogd.8 manpage
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu, 15 Oct 1998 19:35:26 +0200
++
++sysklogd (1.3-27) frozen unstable; urgency=low, closes=21212 11917 21606 24609 25835 26015 24648 20135 23502 24893 24894
++
++  * Postinst will create files with correct file modes (closes: Bug#21212)
++  * Made /dev/xconsole mode 0640 and root.adm (closes: Bug#11917)
++  * Changed priority of exit message from LOG_ERR to LOG_INFO (closes
++    Bug#21606)
++  * The code now is compilable without SYSLOG_INET again.  Thanks to
++    Enrik Berkhan <enrik@rzstud1.akk.org>.
++  * Added support for TESTING define which will turn syslogd into
++    stdio-mode used for debugging.
++  * Reworked the initialization/fork code.  Now the parent
++    process activates a signal handler which the daughter process will
++    raise if it is initialized.  Only after that one the parent process
++    may exit.  Otherwise klogd might try to flush its log cache while
++    syslogd can't receive the messages yet. (closes: Bug#24609)
++  * Fixed typo in /etc/syslog.conf (closes: Bug#25835)
++  * Modified pre- and postinst scripts to set +e before executing external
++    scripts.  This is a workaround against a bug in bash (Bug#23857).
++    Bash exports the errexit (-e) flag if allexport (-a) has been set. The
++    bug occurs even if allexport is being _re_set.  (closes: Bug#26015)
++  * Modified ksym::CheckVersion()
++    . Use shift to decode the kernel version
++    . Compare integers of kernel version
++    . extract major.minor.patch from utsname.release via sscanf()
++    The reason lays in possible use of kernel flavours which modify
++    utsname.release but no the Version_ symbol.  (closes: Bug#20135)
++  * Corrected klogd.c in order to support the new address space for late
++    2.1 kernels.  Some support for unsigned long in contrary to int was
++    missing.  (closes: Bug#23502)
++  * Applied patch provided vom Topi Miettinen with regard to the people
++    from OpenBSD.  This provides the additional '-a' argument used for
++    specifying additional UNIX domain sockets to listen to.  This is been
++    used with chroot()'ed named's for example.  An example is described at
++    http://www.psionic.com/papers/dns.html.  Thanks to Topi Miettinen
++    <tom@medialab.sonera.net> (closes: Bug#24893)
++  * Added support for `ftp' log facility which was introduced by glibc
++    version 2.  Thanks to netgod and Flood from #Debian.
++  * Code cleanups with regard to bsd -> posix transition and stronger
++    security (buffer length checking).  Thanks to Topi Miettinen
++    <tom@medialab.sonera.net> (closes: Bug#24894)
++    . index() --> strchr()
++    . sprintf() --> snprintf()
++    . bcopy() --> memcpy()
++    . bzero() --> memset()
++    . UNAMESZ --> UT_NAMESIZE
++    . sys_errlist --> strerror()
++  * Added support for setutent()/getutent()/endutend() instead of binary
++    reading the UTMP file.  This is the the most portable way.  Thanks to
++    Topi Miettinen <tom@medialab.sonera.net>.
++  * Avoid logging of SIGCHLD when syslogd is in the process of exiting and
++    closing its files.  Again thanks to Topi.
++  * Added /usr/sbin/syslog-facility, written by Raphaël Hertzog
++    <hertzog@debian.org>.  It opens a way for other packages to add and
++    remove logfiles/facilities.
++  * Modified printline() to support 8bit characters - such as russion
++    letters.  Thanks to Vladas Lapinskas <lapinskas@mail.iae.lt>.
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Mon, 12 Oct 1998 22:24:04 +0200
++
++sysklogd (1.3-26) frozen unstable; urgency=low, closes=20903 20765 20556 20507 20647 20220
++
++  * Fixed typos in syslogd-listfiles(1), thanks to Francesco Potorti`
++    <F.Potorti@cnuce.cnr.it> (closes: Bug#20903)
++  * Corrected email address for Shane Alderton (closes: Bug#20765)
++  * Fixed manpage to not reflect reverse implementated SIGALRM signal
++    handler (closes: Bug#20647)
++  * Modified behaviour with including <sys/module.h> (closes: Bug#20556)
++  * Added correct prototype for llseek() (closes: Bug#20507, Bug#20220)
++  * Added more log information if problems occurr while reading a system
++    map file.
++  * Modified System.map read function to try all possible map files until
++    a file with matching version is found.
++  * Added Debian release to klogd
++  * Switched to fgets() as gets() is not buffer overrun secure.
++  * Modified loop for detecting the correct system map.
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu, 16 Apr 1998 19:28:05 +0200
++
++sysklogd (1.3-25) unstable; urgency=low, closes=19454 19145 1914
++
++  * Corrected permissions on packaging control files (closes: Bug#19414)
++  * Removed kill statements from rc file (closes: Bug#19454, Bug#19145)
++  * Applied patch from Pedro Manuel Rodrigues <pmanuel@cindy.fe.up.pt> to
++    let klogd work togther with >2GB address space.
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu, 19 Mar 1998 23:56:09 +0100
++
++sysklogd (1.3-24) unstable; urgency=low, closes=18124
++
++  * Fixed tiny mistake which refused the MARK facility to work properly
++    (closes: Bug#18124)
++  * Corrected Topi's patch as it prevented forwarding during startup due
++    to an unknown LogPort.
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Wed, 25 Feb 1998 13:19:27 +0100
++
++sysklogd (1.3-23) unstable; urgency=low
++
++  * Corrected FSF's address (lintian)
++  * Implemented force-reload (lintian)
++  * Standards-Version: 2.4.0.0
++  * Applied patch from Topi Miettinen <Topi.Miettinen@ml.tele.fi> to open
++    the UDP socket only if it is really needed.
++  * Updated sysklogd(8) manpage
++  * Added notes to mailing list
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Tue, 24 Feb 1998 00:39:10 +0100
++
++sysklogd (1.3-22) unstable; urgency=low, closes=17192 17385 17601
++
++  * Included a real fix to the %'s problem (fixes: Bug#17192)
++  * Another patch for Linux/alpha by Christopher C Chimelis
++    <chris@classnet.med.miami.edu> (fixes: Bug#17385)
++  * Removed killall-statement from postinst.  Thanks to James Troup for
++    reporting it.
++  * Added chdir("/") to both daemons (fixes: Bug#17601)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu, 29 Jan 1998 21:56:40 +0100
++
++sysklogd (1.3-21) unstable; urgency=low, closes=17159
++
++  * Fixed small typo in syslogd-listfiles (Bug#17159)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu, 15 Jan 1998 23:22:57 +0100
++
++sysklogd (1.3-20) unstable; urgency=low, closes=17000
++
++  * Corrected some code that caused klogd to dump core when receiving some
++    special messages from 2.1.78.  Thanks to Chu-yeon Park
++    <kokids@doit.ajou.ac.kr> for informing me.
++  * Fixed bug that caused klogd to die if there is no System.map
++    available.
++  * Added -x switch to omit EIP translation and System.map evaluation.
++    Thanks to Florian La Roche <florian@knorke.saar.de>
++  * Fixed small bugs in F_FORW_UNKN meachanism.  Thanks to Torsten Neumann
++    <torsten@londo.rhein-main.de> for pointing me to it.
++  * Fixed problem with klogd not being able to be built on a kernel newer
++    than 2.1.18.  Worked in a patch from Alessandro Suardi <asuardi@uninetcom.it>
++  * Fixed small typo in syslogd-listfiles
++  * Corrected debug output concerning remote receiption
++  * Removed race condition in syslogd-listfiles
++  * Modified logfile detection routine to take care of double listed
++    logfiles.  Thanks to Roman Hodek <roman@debian.org> for providing an
++    appropriate patch.  (Bug#17000)
++  
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Tue, 13 Jan 1998 01:59:56 +0100
++
++sysklogd (1.3-19) unstable; urgency=low, closes=16643 16769 16796 16828 16148 14776
++
++  * Used better regexp for detecting sensitive data.  Thanks a lot to
++    Susanne Schmidt <banshee@linux.de> for providing it.
++  * Fixed ownership of /usr/doc/sysklogd/copyright and readme (Bug#16643)
++  * Corrected Standards-Version to 2.3.0.1 (Bug#16769)
++  * Reworked one line of an older patch because it prevented syslogd from
++    binding the socket with the result that no messages were forwarded to
++    other hosts.
++  * Changed the behaviour of klogd when receiving a terminate signal. Now
++    the program terminates immediately instead of completing the receipt of
++    a kernel message.  (Bug#16796, Bug#16828, Bug#16148)
++  * Noticed a bug which was closed by 1.3-18 (Bug#14776)
++  * Changed Maintainer address to joey@debian.org
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Fri, 9 Jan 1998 00:58:36 +0100
++
++sysklogd (1.3-18) unstable; urgency=low, closes=11731 12009 13506 14329 14521 14610 15840 15336
++
++  * Added test in postinst if user and group exist.  Christoph Lameter run
++    into trouble upgrading a RedHat system.
++  * Fixed little mistake which prevented klogd from accepting a console
++    log level of 8 to get <7> alias KERN_DEBUG displayed.
++  * Linked against libc6 (Bug#11731)
++  * Added SHELL=/bin/bash to rules as Herbert Xu suggested
++  * Corrected syslog.conf(5) manpage
++  * syslogd resets the ignore priority flag now.  Thanks to Herbert
++    Thielen. (Bug#12009)
++  * Fixed bug that caused syslogd to write into wrong files under some
++    race conditions.  Thanks to Herbet Xu. (Bug#13506)
++  * /var/log/auth.log will only be touch if needed (Bug#14329)
++  * debian/conffiles is treated like a document (Bug#14521)
++  * Added script for generic logfile detection and rotation and included
++    that in cron scripts, included also its manpage (Bug#14610)
++  * Modified restart messages in /etc/init.d/sysklogd (Bug#15840)
++  * klogd will first try to load /boot/System.map-$ver, then
++    /boot/System.map, then /System.map-$ver and after that /System.map
++  * Modified ExpandKadds() because there were some problems accessing
++    memory r/w.  (Bug#15336)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Fri, 2 Jan 1998 03:31:09 +0100
++
++sysklogd (1.3-17) unstable; urgency=low
++
++  * Fixed stupid bug which caused klogd to eat up 90% cpu time.
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Wed, 25 Jun 1997 15:22:29 +0200
++
++sysklogd (1.3-16) unstable; urgency=low
++
++  * Included Miquel's patches which allows continuation line support
++    for syslogd.  Corrected syslog.conf(5) manpage.  Improved
++    syslog.conf file.  Thanks to Miquel van Smoorenburg
++    <miquels@cistron.nl> for dropping in these patches.
++  * Added /var/log/syslog as a daily rotated logfile which contains
++    everything except auth.*
++  * ksym.c: Added #1 and #2 to some error messages in order to being able
++    to divide them (ulmo@Q.Net)
++  * Improved postinst script (Thanks to Miquel van Smorrenborg for ideas)
++  * klogd now also reads /System.map-<version> and
++    /boot/System.map-<version> (Bug#7210)
++  * syslogd,klogd: made DEBRELEASE optional to support a non-Debian
++    release as well.
++  * Corrected freeing of logfiles.
++  * Removed delay of 10 seconds. (Bug#8104, Bug#8400)
++  * Modified permissions of logfiles from 644 to 640 and 640 to 600 for
++    security aspects.
++  * Corrected syslog.conf(5) manpage (Bug#9779)
++  * Found upstream patches for 1.3.1 to 1.3.3 which are now included.
++    These also include some patches for glibc and Alpha.
++  * Included patch to modules package to support better debugging
++  * Added patch from Leland Olds which fixes a buffer overrun and improved
++    symbol lookup. (Bug#4875)
++  * Some more glibc patches made by Michael Alan Dorman
++    <mdorman@debian.org>. (Bug#8362, Bug#8763)
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Sun, 15 Jun 1997 19:37:13 +0200
++
++sysklogd (1.3-15) unstable; urgency=low
++
++  * Added /var/log/mail.log as a logfile
++  * Corrected Description field (Bug#7624)
++  * Added read statement in postinst script (Bug#8243)
++
++ -- Martin Schulze <joey@infodrom.north.de>  Wed, 26 Mar 1997 13:32:24 +0100
++
++sysklogd (1.3-14) unstable; urgency=low
++
++  * Debugging syslogd now shows facility.priority
++  * Minor fixes
++  * Modified syslogd.c to not kill itself which confuses bash 2.0
++
++ -- Martin Schulze <joey@infodrom.north.de>  Sun, 23 Feb 1997 12:23:55 +0100
++
++sysklogd (1.3-13) stable; urgency=low
++
++  * Made /etc/init.d/sysklogd more verbose
++  * Minor fixes
++  * Uncompressed copyright, but compressed /usr/doc/sysklogd-1.3.16/readme
++
++ -- Martin Schulze <joey@debian.org>  Sat, 8 Feb 1997 14:12:29 +0100
++
++sysklogd (1.3-12) stable; urgency=HIGH
++  
++  * Converted to Standards-Version 2.1.1.2
++  * init.d/sysklogd: added "sleep 1"
++  * syslogd won't hassle anymore if it can't access logfils. Patched by
++    me. This adresses Bug#5865.
++  * /etc/init.d/sysklogd: Modified so that one can use commandline
++    arguments for both syslogd and klogd.
++  * debian.rules: Installed ChangeLog
++
++ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu, 30 Jan 1997 22:48:59 +0100
++
++Mon Now 25 10:36:01 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* modified preinst to work if /etc/init.d/sysklogd doesn't exist
++	because of a failure
++
++Mon Sep 10 10:36:01 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* ksyms.c: klogd will first look at /System.map (Bug#4403, #4459)
++
++Fri Aug 16 21:36:01 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* debian.rules: Changed permissions for syslogd and klogd to 755
++	(Bug#4049)
++
++Mon Aug 12 10:40:05 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* Corrected permissions of documentation.  Thanks to Dan
++        Quinlan. (Bug#4090)
++
++Mon Aug  5 22:47:40 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* syslogd.c: If you haven't set your domainname, syslogd will dump
++	core upon startup.  Fixed.  Thanks to Leeland Lucius
++	<llucius@millcomm.com> for reporting and patching it. (Bug#3526)
++
++	* /etc/init.d/sysklogd, /etc/cron.weekly/sysklogd: slight
++	improvements.  Thanks to Bernd Eckenfels <ecki@tapac.inka.de>.
++
++Fri Aug  2 11:03:30 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* modified weekly cron script, thanks to Todd Tyrone Fries <todd@miango.com>
++
++Fri Jun 14 10:42:26 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* ksyms.c: increased the size of vstring, because since Linux
++	major versions are decoded with n * 65536 and we now have 2.0, the
++	field was too short.
++
++Tue May 28 01:02:01 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* syslogd.c: Corrected behaviour of blocking pipes - i.e. the
++	whole system hung.  Michael Nonweiler <mrn20@hermes.cam.ac.uk> has
++	sent us a patch to correct this.  A new logfile type F_PIPE has
++	been introduced.
++
++Thu May 23 08:39:54 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* postinst: Corrected killall-statement, Thanks to Miquel van
++	Smoorenborg for the hint
++
++Mon May 20 00:14:35 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* postinst: added a killall to remove an existing syslogd.  It
++	could exist because of Bug#2836.
++
++Sun May 12 13:36:55 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* removed auth.* from /dev/xconsole
++
++	* klogd won't log old messages anymore (Bug#2337)
++	I have applied the patch from Chris Hanson.
++
++	* I have put another start-stop-daemon call in the startup script
++	so the configs are reloaded on startup. This should
++	help. (Bug#2552)
++
++	* Sysklogd takes care of this and createst /dev/xconsole if it
++	doesn't exist during installation. (Bug#2683)
++
++	* I have corrected permissions of /dev/xconsole. (Bug#2837)
++
++	* defined /etc/cron.weekly/sysklogd as a conffile (Bug#2950, Bug#2960)
++
++	* introduced two binary packages: syslogd and sysklogd which
++	exclude each other
++
++Sun Apr 21 17:56:03 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* Corrected preinst (Bug#2722, Bug#2725, Bug#2726)
++
++	* Linked against libc 5.2.18 (Bug#2723, Bug#2725)
++
++	* Corrected control file to fit with newer dpkgs
++
++Wed Apr 17 21:40:56 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
++
++	* Added Debian packaging information
++
++
+--- sysklogd-1.4.1.orig/debian/conffiles
++++ sysklogd-1.4.1/debian/conffiles
+@@ -0,0 +1,5 @@
++/etc/default/syslogd
++/etc/syslog.conf
++/etc/init.d/sysklogd
++/etc/cron.daily/sysklogd
++/etc/cron.weekly/sysklogd
+--- sysklogd-1.4.1.orig/debian/conffiles.klogd
++++ sysklogd-1.4.1/debian/conffiles.klogd
+@@ -0,0 +1,2 @@
++/etc/default/klogd
++/etc/init.d/klogd
+--- sysklogd-1.4.1.orig/debian/control
++++ sysklogd-1.4.1/debian/control
+@@ -0,0 +1,32 @@
++Source: sysklogd
++Section: admin
++Priority: important
++Maintainer: Martin Schulze <joey@debian.org>
++Standards-Version: 3.5.6.0
++
++Package: sysklogd
++Architecture: any
++Section: admin
++Depends: ${shlibs:Depends}, klogd | linux-kernel-log-daemon
++Conflicts: syslogd
++Provides: syslogd, system-log-daemon
++Replaces: syslogd
++Description: System Logging Daemon
++ This package implements the system log daemon, which is an enhanced
++ version of the standard Berkeley utility program. It is responsible
++ for providing logging of messages received from programs and facilities
++ on the local host as well as from remote hosts.
++
++Package: klogd
++Architecture: any
++Section: admin
++Depends: ${shlibs:Depends}, sysklogd | system-log-daemon
++Conflicts: sysklogd (<= 1.3-33)
++Provides: linux-kernel-log-daemon
++Replaces: sysklogd
++Description: Kernel Logging Daemon
++ The klogd daemon listens to kernel message sources and is responsible
++ for prioritizing and processing operating system messages.  The klogd
++ daemon can run as a client of syslogd or optionally as a standalone
++ program.  Klogd can now be used to decode EIP addresses if it can
++ determine a System.map file.
+--- sysklogd-1.4.1.orig/debian/copyright
++++ sysklogd-1.4.1/debian/copyright
+@@ -0,0 +1,50 @@
++This is the Debian GNU/Linux prepackaged version of Linux' system and
++kernel logging daemons.
++
++This package was put together by Martin Schulze <joey@debian.org>,
++from sources obtained from:
++
++  http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.4.1.tar.gz
++
++Recent versions are Debian versions that may be also be found at
++
++  http://www.infodrom.org/projects/sysklogd/
++
++syslogd is under Berkeley copyright, klogd is under GPL.
++
++   Copyright (C) 1994-96 Greg Wettstein <greg@wind.enjellic.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; version 2 dated June, 1991.
++
++   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, USA.
++
++On Debian GNU/Linux systems, the complete text of the GNU General
++Public License can be found in `/usr/share/common-licenses/GPL'.
++
++There is a mailing list covering this package and syslog in general.
++The lists address is infodrom-sysklogd@lists.infodrom.org .  
++
++To subscribe to this list,
++
++ . send a mail to infodrom-sysklogd-request@lists.infodrom.org with
++   the word "subscribe" as subject, or
++
++ . send a mail to majordomo@lists.infodrom.org with the body of
++   "subscribe infodrom-sysklogd".
++
++The list will be archived publically at
++<http://www.infodrom.org/Mail-Archive/infodrom-sysklogd>.
++
++The source of the Debian package is managed through CVS.  It is publically
++available at <http://cvs.infodrom.org/sysklogd/?cvsroot=debian> or as
++<:pserver:anonymous@cvs.infodrom.org/var/cvs/debian/sysklogd/>.
++
+--- sysklogd-1.4.1.orig/debian/cron.daily
++++ sysklogd-1.4.1/debian/cron.daily
+@@ -0,0 +1,39 @@
++#! /bin/sh
++
++# sysklogd	Cron script to rotate system log files daily.
++#
++#		If you want to rotate other logfiles daily, edit
++#		this script.  An easy way is to add files manually,
++#		to add -a (for all log files) to syslogd-listfiles and
++#		add some grep stuff, or use the -s pattern argument to
++#		specify files that must not be listed.
++#
++#		This is a configration file.  You are invited to edit
++#		it and maintain it on your own.  You'll have to do
++#		that if you don't like the default policy
++#		wrt. rotating logfiles (i.e. with large logfiles
++#		weekly and daily rotation may interfere).  If you edit
++#		this file and don't let dpkg upgrade it, you have full
++#		control over it.  Please read the manpage to
++#		syslogd-listfiles.
++#
++#		Written by Martin Schulze <joey@debian.org>.
++#		$Id: cron.daily,v 1.13 2006-09-18 09:42:30 joey Exp $
++
++test -x /usr/sbin/syslogd-listfiles || exit 0
++test -x /sbin/syslogd || exit 0
++test -f /usr/share/sysklogd/dummy || exit 0
++
++set -e
++
++cd /var/log
++for LOG in `syslogd-listfiles`
++do
++   if [ -s $LOG ]; then
++      savelog -g adm -m 640 -u root -c 7 $LOG >/dev/null
++   fi
++done
++
++# Restart syslogd
++#
++/etc/init.d/sysklogd reload-or-restart > /dev/null
+--- sysklogd-1.4.1.orig/debian/cron.daily.klogd
++++ sysklogd-1.4.1/debian/cron.daily.klogd
+@@ -0,0 +1,47 @@
++#! /bin/sh
++
++binpath=/sbin/klogd
++pidfile=/var/run/klogd.pid
++
++test -x $binpath || exit 0
++
++
++running()
++{
++    # No pidfile, probably no daemon present
++    #
++    if [ ! -f $pidfile ]
++    then
++	return 1
++    fi
++
++    pid=`cat $pidfile`
++
++    # No pid, probably no daemon present
++    #
++    if [ -z "$pid" ]
++    then
++	return 1
++    fi
++
++    if [ ! -d /proc/$pid ]
++    then
++	return 1
++    fi
++
++    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1`
++
++    # No syslogd?
++    #
++    if [ "$cmd" != "$binpath" ]
++    then
++	return 1
++    fi
++
++    return 0
++}
++
++if ! running
++then
++    sh /etc/init.d/klogd start > /dev/null
++fi
+--- sysklogd-1.4.1.orig/debian/cron.weekly
++++ sysklogd-1.4.1/debian/cron.weekly
+@@ -0,0 +1,38 @@
++#! /bin/sh
++
++# sysklogd	Cron script to rotate system log files weekly.
++#
++#		If you want to rotate logfiles daily, edit
++#		this script and /etc/cron.daily/sysklogd to get
++#		the logfiles in sync (they must not occur in both
++#		files).
++#
++#		This is a configration file.  You are invited to edit
++#		it and maintain it on your own.  You'll have to do
++#		that if you don't like the default policy
++#		wrt. rotating logfiles (i.e. with large logfiles
++#		weekly and daily rotation may interfere).  If you edit
++#		this file and don't let dpkg upgrade it, you have full
++#		control over it.  Please read the manpage to
++#		syslogd-listfiles.
++#
++#		Written by Ian A. Murdock <imurdock@debian.org>.
++#		$Id: cron.weekly,v 1.10 2004-03-31 16:18:15 joey Exp $
++
++test -x /usr/sbin/syslogd-listfiles || exit 0
++test -x /sbin/syslogd || exit 0
++test -f /usr/share/sysklogd/dummy || exit 0
++
++set -e
++
++cd /var/log
++for LOG in `syslogd-listfiles --weekly`
++do
++   if [ -s $LOG ]; then
++      savelog -g adm -m 640 -u root -c 4 $LOG >/dev/null
++   fi
++done
++
++# Restart syslogd
++#
++/etc/init.d/sysklogd reload-or-restart > /dev/null
+--- sysklogd-1.4.1.orig/debian/default
++++ sysklogd-1.4.1/debian/default
+@@ -0,0 +1,13 @@
++#
++# Top configuration file for syslogd
++#
++
++#
++# Full documentation of possible arguments are found in the manpage
++# syslogd(8).
++#
++
++#
++# For remote UDP logging use SYSLOGD="-r"
++#
++SYSLOGD=""
+--- sysklogd-1.4.1.orig/debian/default.klogd
++++ sysklogd-1.4.1/debian/default.klogd
+@@ -0,0 +1,15 @@
++#
++# top configuration file for klogd
++#
++
++#
++# Full documentation of possible arguments are found in the manpage
++# klogd(8).
++#
++
++#
++# Use KLOGD="-k /boot/System.map-$(uname -r)" to specify System.map
++# -c 4 to alter the kernel console log level (deprecated)
++#   use sysctl instead
++#
++KLOGD="-x"
+--- sysklogd-1.4.1.orig/debian/dummy
++++ sysklogd-1.4.1/debian/dummy
+@@ -0,0 +1,4 @@
++Do not remove this file or your log files won't be rotated anymore.
++This is a control file to ensure that the sysklogd package is
++installed so that the cronjobs don't have to parse the dpkg database
++for each run.
+--- sysklogd-1.4.1.orig/debian/postinst
++++ sysklogd-1.4.1/debian/postinst
+@@ -0,0 +1,83 @@
++#! /bin/sh
++
++set -e
++
++if [ "$1" = "configure" ]
++then
++    case $2 in
++	1.2-*)
++cat<<EOT
++The default behaviour of syslogd has altered from 1.2 to 1.3.  By default
++*no* messages from the UDP port are accepted.
++
++Read the documentation in /usr/doc/sysklogd carefully.  Some important
++things have been changed!
++
++Press [Enter] to continue
++EOT
++	read xyz
++	;;
++  esac
++fi
++
++if [ "$1" = "configure" ]
++then
++
++    # Prepare for takeover of the host
++    if [ -z "$2" ]
++    then
++	if [ ! -e /var/log/news ] \
++	    && grep -q '^[^#].*/var/log/news/' /etc/syslog.conf \
++	    && grep -q ^news: /etc/passwd \
++	    && grep -q ^news: /etc/group 
++	then
++	    mkdir /var/log/news
++	    chmod 2755 /var/log/news
++	    chown news:news /var/log/news
++	fi
++
++	# Create logfiles with correct file modes
++	if [ -z "$2" ]
++	then
++	    for LOG in `syslogd-listfiles --all`
++	    do
++	      if [ ! -f $LOG ]
++	      then
++		  touch $LOG
++	      fi
++	      chown root:adm $LOG
++	      chmod 640 $LOG
++	    done
++	fi
++    fi
++
++    if [ -f /etc/init.d/sysklogd -a -n "$2" ]
++    then
++	set +e
++	if [ -x /usr/sbin/invoke-rc.d ]
++	then
++	    invoke-rc.d sysklogd stop
++	else
++	    sh /etc/init.d/sysklogd stop
++	fi
++	set -e
++    fi
++
++    update-rc.d sysklogd defaults 10 90 >/dev/null
++
++    # restarting daemon
++    #
++    if [ -f /etc/init.d/sysklogd ]
++    then
++	set +e
++	if [ -x /usr/sbin/invoke-rc.d ]
++	then
++	    invoke-rc.d sysklogd start
++	else
++	    sh /etc/init.d/sysklogd start
++	fi
++	set -e
++    fi
++fi
++
++exit 0
+--- sysklogd-1.4.1.orig/debian/postinst.klogd
++++ sysklogd-1.4.1/debian/postinst.klogd
+@@ -0,0 +1,36 @@
++#! /bin/sh
++
++set -e
++
++if [ "$1" = "configure" ]
++then
++    if [ -f /etc/init.d/klogd -a -n "$2" ]
++    then
++	set +e
++	if [ -x /usr/sbin/invoke-rc.d ]
++	then
++	    invoke-rc.d klogd stop
++	else
++	    sh /etc/init.d/klogd stop
++	fi
++	set -e
++    fi
++
++    update-rc.d klogd defaults 11 89 >/dev/null
++
++    # restarting daemon
++    #
++    if [ -f /etc/init.d/klogd ]
++    then
++	set +e
++	if [ -x /usr/sbin/invoke-rc.d ]
++	then
++	    invoke-rc.d klogd start
++	else
++	    sh /etc/init.d/klogd start
++	fi
++	set -e
++    fi
++fi
++
++exit 0
+--- sysklogd-1.4.1.orig/debian/postrm
++++ sysklogd-1.4.1/debian/postrm
+@@ -0,0 +1,8 @@
++#! /bin/sh
++
++set -e
++
++if [ "$1" = "purge" ]
++then
++    update-rc.d sysklogd remove >/dev/null
++fi
+--- sysklogd-1.4.1.orig/debian/postrm.klogd
++++ sysklogd-1.4.1/debian/postrm.klogd
+@@ -0,0 +1,8 @@
++#! /bin/sh
++
++set -e
++
++if [ "$1" = "purge" ]
++then
++  update-rc.d klogd remove >/dev/null
++fi
+--- sysklogd-1.4.1.orig/debian/preinst
++++ sysklogd-1.4.1/debian/preinst
+@@ -0,0 +1,21 @@
++#! /bin/sh
++
++set -e
++
++dpkg --assert-support-predepends
++
++if [ "$1" = "upgrade" -a -f /etc/init.d/sysklogd ]; then
++    if [ -f /etc/init.d/sysklogd ]
++    then
++	set +e
++	if [ -x /usr/sbin/invoke-rc.d ]
++	then
++	    invoke-rc.d sysklogd stop
++	else
++	    sh /etc/init.d/sysklogd stop
++	fi
++	set -e
++    fi
++fi
++
++exit 0
+--- sysklogd-1.4.1.orig/debian/preinst.klogd
++++ sysklogd-1.4.1/debian/preinst.klogd
+@@ -0,0 +1,21 @@
++#! /bin/sh
++
++set -e
++
++dpkg --assert-support-predepends
++
++if [ "$1" = "upgrade" -a -f /etc/init.d/klogd ]; then
++    if [ -f /etc/init.d/klogd ]
++    then
++	set +e
++	if [ -x /usr/sbin/invoke-rc.d ]
++	then
++	    invoke-rc.d klogd stop
++	else
++	    sh /etc/init.d/klogd stop
++	fi
++	set -e
++    fi
++fi
++
++exit 0
+--- sysklogd-1.4.1.orig/debian/prerm
++++ sysklogd-1.4.1/debian/prerm
+@@ -0,0 +1,19 @@
++#! /bin/sh
++
++set -e
++
++if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/sysklogd ]
++then
++    rm -f /usr/doc/sysklogd
++fi
++
++if [ "$1" = "purge"  -o "$1" = "remove" ]
++then
++    if [ -x /usr/sbin/invoke-rc.d ]
++    then
++	invoke-rc.d sysklogd stop
++    else
++	sh /etc/init.d/sysklogd stop
++    fi
++fi
++
+--- sysklogd-1.4.1.orig/debian/prerm.klogd
++++ sysklogd-1.4.1/debian/prerm.klogd
+@@ -0,0 +1,19 @@
++#! /bin/sh
++
++set -e
++
++if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/klogd ]
++then
++    rm -f /usr/doc/klogd
++fi
++
++if [ "$1" = "purge"  -o "$1" = "remove" ]
++then
++    if [ -x /usr/sbin/invoke-rc.d ]
++    then
++	invoke-rc.d klogd stop
++    else
++	sh /etc/init.d/klogd stop
++    fi
++fi
++
+--- sysklogd-1.4.1.orig/debian/rc
++++ sysklogd-1.4.1/debian/rc
+@@ -0,0 +1,112 @@
++#! /bin/sh
++# /etc/init.d/sysklogd: start the system log daemon.
++
++### BEGIN INIT INFO
++# Provides:             syslog
++# Required-Start:       $local_fs $network $time
++# Required-Stop:        $local_fs $network $time
++# Default-Start:        2 3 4 5
++# Default-Stop:         S 0 1 6
++# Short-Description:    System logger
++### END INIT INFO
++
++PATH=/bin:/usr/bin:/sbin:/usr/sbin
++
++pidfile=/var/run/syslogd.pid
++binpath=/sbin/syslogd
++
++test -x $binpath || exit 0
++
++test ! -r /etc/default/syslogd || . /etc/default/syslogd
++
++. /lib/lsb/init-functions
++
++create_xconsole()
++{
++    # Only proceed if not using devfsd
++    if [ -e /dev/.devfsd ] \
++	|| ! grep -q '^[^#].*/dev/xconsole' /etc/syslog.conf
++    then
++	return
++    fi
++
++    if [ ! -e /dev/xconsole ]; then
++	mknod -m 640 /dev/xconsole p
++    else
++	chmod 0640 /dev/xconsole
++    fi
++    chown root:adm /dev/xconsole
++}
++
++running()
++{
++    # No pidfile, probably no daemon present
++    #
++    if [ ! -f $pidfile ]
++    then
++	return 1
++    fi
++
++    pid=`cat $pidfile`
++
++    # No pid, probably no daemon present
++    #
++    if [ -z "$pid" ]
++    then
++	return 1
++    fi
++
++    if [ ! -d /proc/$pid ]
++    then
++	return 1
++    fi
++
++    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1`
++
++    # No syslogd?
++    #
++    if [ "$cmd" != "$binpath" ]
++    then
++	return 1
++    fi
++
++    return 0
++}
++
++case "$1" in
++  start)
++    log_begin_msg "Starting system log daemon..."
++    create_xconsole
++    start-stop-daemon --start --quiet --pidfile $pidfile --name syslogd --startas $binpath -- $SYSLOGD
++    log_end_msg $?
++    ;;
++  stop)
++    log_begin_msg "Stopping system log daemon..."
++    start-stop-daemon --stop --quiet --pidfile $pidfile --name syslogd
++    log_end_msg $?
++    ;;
++  reload|force-reload)
++    log_begin_msg "Reloading system log daemon..."
++    start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile --name syslogd
++    log_end_msg $?
++    ;;
++  restart)
++    log_begin_msg "Restarting system log daemon..."
++    start-stop-daemon --stop --retry 5 --quiet --pidfile $pidfile --name syslogd
++    start-stop-daemon --start --quiet --pidfile $pidfile --name syslogd --startas $binpath -- $SYSLOGD
++    log_end_msg $?
++    ;;
++  reload-or-restart)
++    if running
++    then
++	$0 reload
++    else
++	$0 start
++    fi
++    ;;
++  *)
++    echo "Usage: /etc/init.d/sysklogd {start|stop|reload|restart|force-reload|reload-or-restart}"
++    exit 1
++esac
++
++exit 0
+--- sysklogd-1.4.1.orig/debian/rc.klogd
++++ sysklogd-1.4.1/debian/rc.klogd
+@@ -0,0 +1,46 @@
++#! /bin/sh
++# /etc/init.d/klogd: start the kernel log daemon.
++
++### BEGIN INIT INFO
++# Provides:             klogd
++# Required-Start:       $time syslog
++# Required-Stop:        $time syslog
++# Default-Start:        2 3 4 5
++# Default-Stop:         S 0 1 6
++# Short-Description:    kernel logger
++### END INIT INFO
++
++PATH=/bin:/usr/bin:/sbin:/usr/sbin
++
++pidfile=/var/run/klogd.pid
++binpath=/sbin/klogd
++
++test -f $binpath || exit 0
++
++test ! -r /etc/default/klogd || . /etc/default/klogd
++
++. /lib/lsb/init-functions
++
++case "$1" in
++  start)
++    log_begin_msg "Starting kernel log daemon..."
++    start-stop-daemon --start --quiet --pidfile $pidfile --name klogd --startas $binpath -- $KLOGD
++    log_end_msg $?
++    ;;
++  stop)
++    log_begin_msg "Stopping kernel log daemon..."
++    start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL --quiet --pidfile $pidfile --name klogd
++    log_end_msg $?
++    ;;
++  restart|force-reload)
++    log_begin_msg "Reloading kernel log daemon..."
++    start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL --quiet --pidfile $pidfile --name klogd
++    start-stop-daemon --start --quiet --pidfile $pidfile --name klogd --startas $binpath -- $KLOGD
++    log_end_msg $?
++    ;;
++  *)
++    echo "Usage: /etc/init.d/klogd {start|stop|restart|force-reload}"
++    exit 1
++esac
++
++exit 0
+--- sysklogd-1.4.1.orig/debian/readme
++++ sysklogd-1.4.1/debian/readme
+@@ -0,0 +1,44 @@
++
++Additional information about system logging
++-------------------------------------------
++
++ . When logging into a fifo syslogd will stop loggin into this
++   logfile if no process is reading it and thus the buffer is filled
++   up.  Buffer size can be adjusted through the kernel.
++
++ . When using the Perl5 Sys::Syslog module (use Sys::Syslog;) to
++   provide logging to your Perl programs, please notice that since it
++   will open a UDP connection to the local syslogd you'll need to have
++   remote receiption enabled.
++
++   Joey Hess teaches us how to change this behaviour and switch to
++   using the Unix domain socket.  After the opening with "use" you
++   have to add "Sys::Syslog::setlogsock('unix');".
++
++   The default behaviour might change in future releases of Perl.
++
++Modifying the kernel console log level
++--------------------------------------
++
++  There are two ways to alter the kernel console log level.  This
++  setting controls whether log messages from the kernel should appear
++  on the system console or not.
++
++  In the past, klogd had to do this with the -c parameter.  Using '-c
++  4' will set the log level of console messages to 4 and only display
++  warnings and errors but not regular debug or information messages.
++
++  This behaviour is deprecated and hencely not enforced anymore via
++  the RC script of klogd.  Instead sysctl(8) should be used as
++  interface to various kernel variables.  These can be stored
++  non-volatile in /etc/sysctl.conf.
++
++  The prevent the kernel to flood the system console and to achieve
++  the same behaviour of '-c 4' simply add the following to the
++  configuration file and let sysctl set this kernel parameter upon
++  system boot.
++
++  kernel/printk = 4 4 1 7
++
++  More information can be found in Documentation/sysctl/kernel.txt in
++  the kernel source and proc(5).
+--- sysklogd-1.4.1.orig/debian/rules
++++ sysklogd-1.4.1/debian/rules
+@@ -0,0 +1,172 @@
++#! /usr/bin/make -f
++
++#   Copyright 1994-98,2001   joey@infodrom.org (Martin Schulze)
++#
++#   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; version 2 dated June, 1991.
++#
++#   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
++#
++SHELL=/bin/bash
++
++# The name and version of the source
++#
++source = $(shell grep "^Source: " debian/control|head -n 1|sed 's/Source: \(.*\)/\1/g')
++package = $(shell grep "^Package: " debian/control|head -n 1|sed 's/Package: \(.*\)/\1/g')
++version = $(shell grep "^$(source) " debian/changelog|head -n 1 |sed 's/.*(\(.*\)\-[^\-]*).*/\1/g')
++revision = $(shell grep "^$(source) " debian/changelog|head -n 1 |sed 's/.*([^\-]*\-\(.*\)).*/\1/g')
++
++installbin = install -g root -o root -m 755
++installdoc = install -g root -o root -m 644
++
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++CFLAGS = -g -O2 -Wall $(shell getconf LFS_CFLAGS)
++else
++CFLAGS = -O2 -Wall $(shell getconf LFS_CFLAGS)
++endif
++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++STRIP = -s
++endif
++
++build:
++	$(MAKE) DEB="-DDEBRELEASE=\\\"$(revision)\\\"" \
++		CFLAGS="$(CFLAGS) -DSYSV -fomit-frame-pointer -fno-strength-reduce" \
++		LDFLAGS=""
++	pod2man --section=8 --lax --center="Debian GNU/Linux" \
++	  --release="Debian Project" debian/syslog-facility.pod \
++	  > syslog-facility.8
++	(cat README.linux; printf "\n\n"; cat README.1st; \
++	  printf "\n\nThe following important changes have been reported by the developers:\n\n"; \
++	  cat NEWS debian/readme) \
++	  > readme.txt
++	(cat debian/copyright; \
++	  printf "Syslogd stays under the following copyright:\n\n"; \
++	    sed -e '/^$$/,$$d' < syslogd.c; \
++	  printf "\nKlogd has the following copyright notice:\n\n"; \
++	    sed -e '/^$$/,$$d' < klogd.c ) \
++	  > copyright
++	touch stamp-build
++
++clean: debclean
++	rm -f stamp-build
++	$(MAKE) clobber
++	rm -rf *~ debian/*~ syslog-facility.8 readme.txt copyright
++
++debclean:
++# Cleans debian binary directories to allow binary creation
++	rm -rf debian/tmp.sysklogd debian/tmp.klogd
++	rm -f debian/{files,substvars}
++
++binary-indep:
++# Nothing to be done here
++
++binary-arch-sysklogd: debclean
++	test -f stamp-build || $(MAKE) -f debian/rules build
++	$(installbin) -d debian/tmp.sysklogd/DEBIAN
++	chown -R root:root debian/tmp.sysklogd
++	chmod -R g-ws debian/tmp.sysklogd
++	$(installbin) -d debian/tmp.sysklogd/usr/share/doc/$(package)
++	$(installbin) debian/{postinst,postrm,prerm} debian/tmp.sysklogd/DEBIAN/
++	$(installdoc) debian/conffiles debian/tmp.sysklogd/DEBIAN/
++	$(installdoc) debian/changelog debian/tmp.sysklogd/usr/share/doc/$(package)/changelog.Debian
++	#
++	$(installbin) -d debian/tmp.sysklogd/usr/share/$(package)
++	$(installdoc) debian/dummy debian/tmp.sysklogd/usr/share/$(package)
++	#
++	$(installdoc) copyright debian/tmp.sysklogd/usr/share/doc/$(package)/
++	$(installdoc) readme.txt debian/tmp.sysklogd/usr/share/doc/$(package)/
++	$(installdoc) CHANGES debian/tmp.sysklogd/usr/share/doc/$(package)/changelog
++	gzip -9f debian/tmp.sysklogd/usr/share/doc/$(package)/{changelog.Debian,changelog,readme.txt}
++	#
++	$(installbin) -d debian/tmp.sysklogd/{usr/,}sbin
++	$(installbin) $(STRIP) syslogd debian/tmp.sysklogd/sbin
++	$(installbin) debian/syslogd-listfiles debian/tmp.sysklogd/usr/sbin
++	$(installbin) debian/syslog-facility debian/tmp.sysklogd/usr/sbin
++	#
++	$(installbin) -d debian/tmp.sysklogd/etc/{init.d,cron.{daily,weekly},default}
++	$(installbin) debian/default debian/tmp.sysklogd/etc/default/syslogd
++	$(installbin) debian/rc debian/tmp.sysklogd/etc/init.d/sysklogd
++	$(installbin) debian/cron.weekly debian/tmp.sysklogd/etc/cron.weekly/sysklogd
++	$(installbin) debian/cron.daily debian/tmp.sysklogd/etc/cron.daily/sysklogd
++	$(installdoc) debian/syslog.conf debian/tmp.sysklogd/etc/syslog.conf
++	$(installbin) -d debian/tmp.sysklogd/var/log
++	#
++	$(installbin) -d debian/tmp.sysklogd/usr/share/man/man{5,8}
++	$(installdoc) syslog.conf.5 debian/tmp.sysklogd/usr/share/man/man5
++	$(installdoc) {sysklogd,syslogd,debian/syslogd-listfiles}.8 debian/tmp.sysklogd/usr/share/man/man8
++	$(installdoc) syslog-facility.8 debian/tmp.sysklogd/usr/share/man/man8
++	gzip -9 debian/tmp.sysklogd/usr/share/man/man?/*
++	#
++	dpkg-shlibdeps debian/tmp.sysklogd/sbin/syslogd
++	dpkg-gencontrol -psysklogd -Pdebian/tmp.sysklogd -isp
++	dpkg --build debian/tmp.sysklogd ..
++
++binary-arch-klogd: debclean
++	test -f stamp-build || $(MAKE) -f debian/rules build
++	$(installbin) -d debian/tmp.klogd/DEBIAN
++	chown -R root:root debian/tmp.klogd
++	chmod -R g-ws debian/tmp.klogd
++	$(installbin) -d debian/tmp.klogd/usr/share/doc/klogd
++	$(installbin) debian/postinst.klogd debian/tmp.klogd/DEBIAN/postinst
++	$(installbin) debian/postrm.klogd debian/tmp.klogd/DEBIAN/postrm
++	$(installbin) debian/prerm.klogd debian/tmp.klogd/DEBIAN/prerm
++	$(installdoc) debian/conffiles.klogd debian/tmp.klogd/DEBIAN/conffiles
++	$(installdoc) debian/changelog debian/tmp.klogd/usr/share/doc/klogd/changelog.Debian
++	#
++	$(installdoc) copyright debian/tmp.klogd/usr/share/doc/klogd/
++	$(installdoc) readme.txt debian/tmp.klogd/usr/share/doc/klogd/
++	$(installdoc) CHANGES debian/tmp.klogd/usr/share/doc/klogd/changelog
++	gzip -9f debian/tmp.klogd/usr/share/doc/klogd/{changelog.Debian,changelog,readme.txt}
++	$(installdoc) modutils.patch debian/tmp.klogd/usr/share/doc/klogd
++	#
++	$(installbin) -d debian/tmp.klogd/sbin
++	$(installbin) $(STRIP) klogd debian/tmp.klogd/sbin
++	#
++	$(installbin) -d debian/tmp.klogd/etc/{init.d,default}
++	$(installbin) debian/default.klogd debian/tmp.klogd/etc/default/klogd
++	$(installbin) debian/rc.klogd debian/tmp.klogd/etc/init.d/klogd
++	#
++	$(installbin) -d debian/tmp.klogd/usr/share/man/man8
++	$(installdoc) klogd.8 debian/tmp.klogd/usr/share/man/man8
++	gzip -9 debian/tmp.klogd/usr/share/man/man?/*
++	#
++	dpkg-shlibdeps debian/tmp.klogd/sbin/klogd
++	dpkg-gencontrol -pklogd -Pdebian/tmp.klogd -isp
++	dpkg --build debian/tmp.klogd ..
++
++binary-arch: binary-arch-sysklogd binary-arch-klogd
++
++binary: binary-indep binary-arch
++
++source diff:
++	@echo >&2 'source and diff are obsolete - use dpkg-source -b' or dsc; false
++
++dsc:
++	-test -d debian/tmp.sysklogd -o -d debian/tmp.klogd \
++		&& $(MAKE) -f debian/rules clean
++	if [ ! -f ../$(source)_$(version).orig.tar.gz -a -f ../orig/$(source)_$(version).orig.tar.gz ]; \
++	then \
++	  ln -s orig/$(source)_$(version).orig.tar.gz ../$(source)_$(version).orig.tar.gz; \
++	  touch /tmp/stamp-$(source)-link; \
++	fi; \
++	cd .. && dpkg-source -b $(source)-$(version)
++	if [ -f /tmp/stamp-$(source)-link ]; then \
++	  rm ../$(source)_$(version).orig.tar.gz /tmp/stamp-$(source)-link; \
++	fi
++
++checkroot:
++	$(checkdir)
++	test root = "`whoami`"
++
++dist: binary dsc
++
++.PHONY: binary binary-arch binary-indep clean checkroot
++
+--- sysklogd-1.4.1.orig/debian/syslog-facility
++++ sysklogd-1.4.1/debian/syslog-facility
+@@ -0,0 +1,140 @@
++#! /usr/bin/perl -w
++
++# Copyright 1998 Hertzog Raphaël
++# You can use this script under the term of the GPL v2 or later.
++
++# 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, USA.
++
++my $conf_file = '/etc/syslog.conf';
++
++## BUGS :
++#  . This script doesn't know about multi-lines configuration (ie with '\')
++#  . With a line like that "mail,local0.* /anything" 
++#    "syslog-facility remove local0" would remove the entire line
++#    => should not be a problem since lines installed by this script
++#    cannot use such syntax
++##
++
++## Nothing to modify after this line ##
++
++my $command = lc(shift);
++
++usage() if ($command !~ /^(?:set|remove)$/); 
++usage() if (not scalar(@ARGV));
++
++if ($command eq "set")
++{
++    usage() if (int(scalar(@ARGV) / 2) != scalar(@ARGV) / 2);
++    # find a free localx facility
++    my $facility = get_first_free_facility();
++    # if none stop immediately
++    if ($facility eq "none") {
++	print "none\n";
++	exit 1;
++    }
++    # ok append the lines asked
++    open (CONF, ">>$conf_file") || 
++        die "Can't open $conf_file in write mode: $!\n";
++    my ($pri,$file,$line);
++    while (defined($pri = shift)) {
++	$file = shift;
++	$line = "";
++	foreach (split(/;/,$pri)) {
++	    $_ =~ s/all/*/g;
++	    $line .= ";" if ($line);
++	    $line .= "$facility.$_";
++	}
++	$line .= "\t\t$file\n";
++	print CONF $line;
++    }
++    close CONF;
++    print "$facility\n";
++    exit 0;
++
++} elsif ($command eq "remove") {
++
++    my $facility = lc(shift);
++    my ($left,$file,$line);
++    open (CONF, $conf_file) || die "Can't open $conf_file: $!\n";
++    open (CONFNEW, ">$conf_file.new")  || 
++	die "Can't open $conf_file.new in write mode: $!\n";
++    while (defined($_=<CONF>)) {
++	# Write all "simple" lines like empty lines and comments
++	if (/^\s*$/ or /^\s*#/ or /\\$/) {
++	    print CONFNEW $_;
++	    next;
++	}
++	# Otherwise look if the facility to remove appears in the line
++	if (/^\s*(\S+)\s+(\S+)\s*/) {
++	    $left = $1; $file = $2; chomp $file;
++	    # It doesn't appers => write
++	    if ($left !~ /$facility/i) {
++		print CONFNEW $_;
++		next;
++	    }
++	    # It appears => write a new line without the localx facility
++	    $line = "";
++	    foreach (split(/;/,$left)) {
++		if (not /$facility/i) {
++		    $line .= ";" if ($line);
++		    $line .= $_;
++		}
++	    }
++	    next if ($line eq "");
++	    $line .= "\t\t$file\n";
++	    print CONFNEW $line;
++	}
++    }
++    close CONFNEW;
++    close CONF;
++    rename ("$conf_file.new", "$conf_file");
++}
++
++sub get_first_free_facility {
++
++    my @facility = (0) x 8;
++    my ($left,$fac);
++    open(CONF, $conf_file) || die "Can't open $conf_file: $!\n";
++    while(defined($_=<CONF>))
++    {
++	next if (/^\s*$/);
++	next if (/^\s*#/);
++        next if (/\\$/);
++	next if (not /^\s*(\S+)\s+(\S+)\s*$/);
++	$left = $1;
++	foreach $fac (split(/;/,$left)) {
++	    $facility[$1]++ if ($fac =~ /local(\d)/i);
++	}
++    }
++    foreach $fac (0..7)	{
++	return "local$fac" if ($facility[$fac] == 0);
++    }
++    return "none";
++}
++
++sub usage {
++
++    die  "syslog-facility - Copyright (c) 1998 Hertzog Raphaël\n"
++	."Usage : $0 set <set_of_priority> <logfile> ... \n"
++	."        it returns the 'LOCALx' string you have the right to use.\n"
++	."        $0 remove <facility>\n"
++	."Example: $0 set all /var/log/all\n"
++	."         $0 set all\\;\\!=info /var/log/all-without-info\n"
++	."         $0 set =err /var/log/errors =warning /var/log/warn\n"
++	."         $0 remove LOCAL1\n";   
++}
++
++
++
+--- sysklogd-1.4.1.orig/debian/syslog-facility.pod
++++ sysklogd-1.4.1/debian/syslog-facility.pod
+@@ -0,0 +1,58 @@
++=head1 NAME
++
++syslog-facility - Setup and remove LOCALx facility for sysklogd
++
++=head1 SYNOPSIS
++
++B<syslog-facility> B<set> I<set_of_priority> I<log_file>  ...
++
++B<syslog-facility> B<remove> I<facility>
++
++=head1 DESCRIPTION
++
++B<syslog-facility> can be used to setup a syslog facility and to remove
++it. The primary use of this perl script is to allow packages to
++automatically setup (and remove) a LOCALx facility. With the
++first argument beeing I<set>, it will output a string containing
++the first free LOCALx facility that has been assigned to your request :
++
++  # syslog-facility set all /var/log/sympa
++  local0
++
++This does mean that a line "local0.*	/var/log/sympa" has been
++added to the syslog.conf file. If no free LOCALx facility has been
++found, then it outputs "none" (with a end of line).
++
++You can use different set of priorities (most of what syslogd supports) :
++
++  # syslog-facility set 'all;!=debug;' /var/log/sympa '=debug' /var/log/sympa-d
++  local1
++
++Pay particular attention to shell escapes since ';','!' have special
++meanings for them. The syntax is similar to syslog.conf except that
++'*' must be replaced by 'all'.
++
++In that case you will have two lines added two the syslog.conf file :
++
++  local1.*;local1.!=debug	/var/log/sympa
++  local1.=debug			/var/log/sympa-d
++
++If the first argument is I<remove>, then it will remove all references
++to a precise LOCALx facility. Example :
++
++  # syslog-facility remove local1
++
++It will remove all references to the local1 facility. 
++
++=head1 BUGS
++
++The script doesn't know about multi-lines configuration (ie with '\').
++
++With a line like that "mail,local0.* /anything", "syslog-facility remove
++local0" would remove the entire line. It should not be a problem since
++lines installed by this script cannot use this syntax.
++
++=head1 SEE ALSO
++
++B<syslog.conf>(5), B<sysklogd>(8).
++ 
+--- sysklogd-1.4.1.orig/debian/syslog.conf
++++ sysklogd-1.4.1/debian/syslog.conf
+@@ -0,0 +1,71 @@
++#  /etc/syslog.conf	Configuration file for syslogd.
++#
++#			For more information see syslog.conf(5)
++#			manpage.
++
++#
++# First some standard logfiles.  Log by facility.
++#
++
++auth,authpriv.*			/var/log/auth.log
++*.*;auth,authpriv.none		-/var/log/syslog
++#cron.*				/var/log/cron.log
++daemon.*			-/var/log/daemon.log
++kern.*				-/var/log/kern.log
++lpr.*				-/var/log/lpr.log
++mail.*				-/var/log/mail.log
++user.*				-/var/log/user.log
++uucp.*				/var/log/uucp.log
++
++#
++# Logging for the mail system.  Split it up so that
++# it is easy to write scripts to parse these files.
++#
++mail.info			-/var/log/mail.info
++mail.warn			-/var/log/mail.warn
++mail.err			/var/log/mail.err
++
++# Logging for INN news system
++#
++news.crit			/var/log/news/news.crit
++news.err			/var/log/news/news.err
++news.notice			-/var/log/news/news.notice
++
++#
++# Some `catch-all' logfiles.
++#
++*.=debug;\
++	auth,authpriv.none;\
++	news.none;mail.none	-/var/log/debug
++*.=info;*.=notice;*.=warn;\
++	auth,authpriv.none;\
++	cron,daemon.none;\
++	mail,news.none		-/var/log/messages
++
++#
++# Emergencies are sent to everybody logged in.
++#
++*.emerg				*
++
++#
++# I like to have messages displayed on the console, but only on a virtual
++# console I usually leave idle.
++#
++#daemon,mail.*;\
++#	news.=crit;news.=err;news.=notice;\
++#	*.=debug;*.=info;\
++#	*.=notice;*.=warn	/dev/tty8
++
++# The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
++# you must invoke `xconsole' with the `-file' option:
++# 
++#    $ xconsole -file /dev/xconsole [...]
++#
++# NOTE: adjust the list below, or you'll go crazy if you have a reasonably
++#      busy site..
++#
++daemon.*;mail.*;\
++	news.crit;news.err;news.notice;\
++	*.=debug;*.=info;\
++	*.=notice;*.=warn	|/dev/xconsole
++
+--- sysklogd-1.4.1.orig/debian/syslogd-listfiles
++++ sysklogd-1.4.1/debian/syslogd-listfiles
+@@ -0,0 +1,146 @@
++#! /usr/bin/perl
++
++# Copyright (c) 1998,9,2001,3 by Martin Schulze <joey@infodrom.org>
++
++# 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, USA.
++
++$conf = "/etc/syslog.conf";
++$opt_daily = 1;
++$opt_all = 0;
++$opt_auth = 0;
++$opt_ign_size = 0;
++$opt_news = 0;
++$opt_skip = '';
++$opt_large = 1024*1024;
++
++sub usage
++{
++    print STDERR
++"
++Debian GNU/Linux syslogd-listfiles.  Copyright (c) 1997,2001
++Martin Schulze.  This is free software; see the GNU General Public Licence
++version 2 or later for copying conditions.  There is NO warranty.
++
++Usage: syslogd-listfiles <options>
++Options: -f file	specifies another syslog.conf file
++         -a | --all	list all files (including news)
++         --auth		list all files containing auth.<some prio>
++	 --ignore-size  don't rotate files which got too large
++         --large nnn	define what is large in bytes (default: 10MB)
++         --news		include news logfiles, too
++         -w | --weekly	use weekly pattern instead of daily
++         -s pattern	skip files matching pattern
++";
++}
++
++# Test if the file was already rotated within the last n hours
++# with n=5
++#
++sub rotated
++{
++    my $file = shift;
++    my $nfile;
++    my $delta = 5 * 60 * 60;
++    my $now = time();
++    
++    # /var/log/file -> /var/log/file.0
++    $nfile = $file . ".0";
++    if (-r $nfile) {
++	if (($now - (stat $nfile)[9]) > $delta) {
++	    return 0;
++	} else {
++	    return 1;
++	}
++    }
++
++    # /var/log/file -> /var/log/OLD/file.0
++    $nfile =~ s,(.*)/([^/]+),$1/OLD/$2,;
++    if (-r $nfile) {
++	if (($now - (stat $nfile)[9]) > $delta) {
++	    return 0;
++	} else {
++	    return 1;
++	}
++    }
++
++    return 0;
++}
++
++while (@ARGV) {
++    $_=shift(@ARGV);
++    if (m/^-f$/) {
++	$conf = shift(@ARGV);
++    } elsif (m/^-s$/) {
++	$opt_skip = shift(@ARGV);
++    } elsif (m/^--large$/) {
++	$opt_large = shift(@ARGV);
++    } elsif (m/^(--weekly|-w)$/) {
++	$opt_daily = 0;
++    } elsif (m/^(-a|--all)$/) {
++	$opt_all = 1;
++    } elsif (m/^--auth$/) {
++	$opt_auth = 1;
++    } elsif (m/^--ignore-size/) {
++	$opt_ign_size = 1;
++    } elsif (m/^--news$/) {
++	$opt_news = 1;
++    } else {
++	&usage();exit (0);
++    }
++}
++
++open (C, $conf) || die "Can't open $conf, $!";
++while (<C>) {
++    next if (/^(\#|$)/);
++    chomp;
++
++    s/\s*(\S.*)$/$1/ if ($line);
++
++    $line .= $_;
++    chop ($line) if (/\\$/);
++    if (!/\\$/) {
++	$line =~ s/\s+/\t/;
++	$line =~ s/\t-/\t/;
++	push (@lines, $line) if ($line =~ /\t\/(?!dev\/)/);
++	$line = "";
++    }
++}
++close (C);
++
++foreach $line (@lines) {
++    ($pat,$file) = split (/\t/,$line);
++
++    # These files are handled by news.daily from INN, so we ignore them
++    next if (!$opt_news && ($pat =~ /news\.(\*|crit|err|info|notice)/));
++
++    if ($opt_all) {
++	$output{$file} = 1;
++    } elsif ($opt_auth) {
++	$output{$file} = 1 if ($pat =~ /auth[^\.]*\.(?!none).*/);
++    } else {
++	$everything = ($pat =~ /\*\.\*/);
++	$output{$file} = 1 if (($everything && $opt_daily)
++			       || (!$everything && !$opt_daily && !rotated ($file))
++			       || (!$opt_ign_size && ((stat $file)[7] >= $opt_large) && $opt_daily)
++			       );
++    }
++}
++
++foreach $file (keys (%output)) {
++    $skip = $file;
++    if (!length($opt_skip) ||  $skip !~ /$opt_skip/) {
++	printf "%s\n", $file;
++    }
++}
+--- sysklogd-1.4.1.orig/debian/syslogd-listfiles.8
++++ sysklogd-1.4.1/debian/syslogd-listfiles.8
+@@ -0,0 +1,95 @@
++.\" syslogd-listfiles.8 - generic routine for /etc/syslog.conf
++.\" Copyright (c) 1997,8,2001  Martin Schulze <joey@debian.org>
++.\" 
++.\" 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., 675 Mass Ave, Cambridge, MA 02139, USA.
++.\"
++.TH SYSLOGD-LISTFILES 8 "December 5th, 2001" "Debian Project" "Debian GNU/Linux"
++.SH NAME
++syslogd-listfiles \- list system logfiles
++.SH SYNOPSIS
++.B syslogd-listfiles
++.RB [ " \-a " | " \-\-all " ]
++.RB [ " \-\-auth " ] 
++.RB [ " \-f "
++.I config file
++]
++.RB [ " \-s "
++.I pattern
++]
++.RB [ " \-\-large "
++.I nnn
++]
++.RB [ " \-\-news " ]
++.RB [ " \-w " | " \-\-weekly " ]
++.SH DESCRIPTION
++.B Sysklogd
++provides a modern mechanism to log system messages.  This mechanism is
++controlled by the file
++.IR /etc/syslog.conf .
++Messages are divided into logfiles which can grow quite big.
++Therefore the logfiles need to be rotated once per day, per week or
++per month.  On a Debian GNU/Linux system most of the files are rotated
++once per week.
++
++This program helps the rotation script to determine which logfiles
++need to be rotated and when.  It takes care of news logfiles that are
++handled by the
++.B news.daily
++script from INN.  In conjunction with the scripts in
++.IR /etc/cron.daily " and " /etc/cron.weekly
++it takes care of files with sensitive information.
++
++By default a list of files for daily rotation is generated.  At the
++moment this option only reflects entries that contain "*.*" as
++facility.priority.
++
++.SH OPTIONS
++.TP
++.BR "\-a" ", " "\-\-all"
++List all logfiles and ignore all other rules.
++.TP
++.BI "\-f " "config file"
++Specify an alternative configuration file instead of
++.IR /etc/syslog.conf ","
++which is the default.
++.TP
++.BI "\-s " "pattern"
++Specify a regular expression for files that must not be listed.
++.TP
++.B "\-\-auth"
++Only list files containing sensitive information such as the one
++containing auth.*.
++.TP
++.BI "\-\-large " "nnn"
++Define the filesize for a large file.  The size is provided in bytes.
++This value defaults to 1 megabyte.
++.TP
++.B \-\-ignore\-size
++Don't rotate files whose file size is larger than the regular limit
++(see above).  This option is useful if you are postprocessing logfiles
++which would break if log files are rotated at a different date/time.
++.TP
++.B "\-\-news"
++Don't exclude news logfiles which are normally handled by the
++.B news.daily
++script from INN.
++.TP
++.BR "\-w" ", " "\-\-weekly"
++Generate the list for weekly rotation.
++.LP
++.SH SEE ALSO
++.BR syslog.conf (5),
++.BR syslogd (8),
++.BR savelog (8).
+--- sysklogd-1.4.1.orig/debian/technical
++++ sysklogd-1.4.1/debian/technical
+@@ -0,0 +1,10 @@
++  Some technical information - unsorted
++  -------------------------------------
++
++  1. Logfiles in syslogd
++
++     As of version 1.3 syslogd doesn't come with a static array of
++     logfiles.  Although the logfiles are still organized in an array.
++     This array is initialized when the configuration file (default is
++     /etc/syslog.conf) is read.  Whenever a new line is read the
++     length of the array it prolongued.
diff --git a/source/a/syslinux/slack-desc b/source/a/syslinux/slack-desc
new file mode 100644
index 000000000..b71399209
--- /dev/null
+++ b/source/a/syslinux/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------------------------------------------------------|
+syslinux: syslinux (SYSLINUX/PXELINUX/ISOLINUX boot loaders)
+syslinux:
+syslinux: SYSLINUX is a boot loader for the Linux operating system which
+syslinux: operates off an MS-DOS/Windows FAT filesystem.  This is used by the
+syslinux: Slackware makebootdisk script to create system boot floppies.
+syslinux:
+syslinux: Also included are PXELINUX and ISOLINUX, boot loaders for booting from
+syslinux: a network server or CD-ROM.
+syslinux:
+syslinux: SYSLINUX, PXELINUX, and ISOLINUX were written by H. Peter Anvin.
+syslinux:
diff --git a/source/a/syslinux/syslinux-3.52.tar.bz2.sign b/source/a/syslinux/syslinux-3.52.tar.bz2.sign
new file mode 100644
index 000000000..1d319cd30
--- /dev/null
+++ b/source/a/syslinux/syslinux-3.52.tar.bz2.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBG+aOayGugalF9Dw4RAtvoAJ93vpkYgJsPYBI95vXW1/qLIQC2lwCcCOPf
+NhphOdhGCaUwMdqZH9tahC0=
+=OS5y
+-----END PGP SIGNATURE-----
diff --git a/source/a/syslinux/syslinux.SlackBuild b/source/a/syslinux/syslinux.SlackBuild
new file mode 100755
index 000000000..e084f96f5
--- /dev/null
+++ b/source/a/syslinux/syslinux.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=syslinux
+VERSION=${VERSION:-3.52}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION
+
+# Make sure ownerships and permissions are sane:
+chown -R root:root .
+find . \
+  \( -perm 2777 -o -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 {} \;
+
+# Build:
+make -j4 || exit 1
+
+make install-all INSTALLROOT=/tmp/package-syslinux
+make mkdiskimage
+make libsyslinux.a
+cp -a unix/syslinux-nomtools mkdiskimage $PKG/usr/bin
+chmod 755 $PKG/usr/bin/*
+
+mkdir -p $PKG/usr/lib
+cp -a libsyslinux.a $PKG/usr/lib
+mkdir -p $PKG/usr/include
+cp -a syslinux.h $PKG/usr/include
+
+rm -rf $PKG/usr/lib/syslinux/com32
+
+# 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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  BUGS COPYING NEWS README* TODO \
+  distrib.doc isolinux.doc pxelinux.doc syslinux.doc \
+  com32/LICENSE \
+  memdisk/memdisk.doc \
+  menu \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $TMP/package-${PKGNAM}
+makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/sysvinit-functions/README.functions b/source/a/sysvinit-functions/README.functions
new file mode 100644
index 000000000..005012f3c
--- /dev/null
+++ b/source/a/sysvinit-functions/README.functions
@@ -0,0 +1,17 @@
+
+If you're reading this in /etc/init.d/, Slackware's real init directory is
+/etc/rc.d/.  Maybe you already knew this, but it never hurts to say.  :-)
+
+This script was taken from Fedora (and is presumably licensed under the GPL).
+While I don't see Slackware init scripts making much use of it (but use it
+if you wish), some third party init scripts (such as for commercial software
+designed to run on Red Hat based systems) expect this script and use it in
+their own init scripts, so it's a good idea to make it available here.
+
+These functions are provided solely for commercial (or other) software that
+expects to find "Red Hat-isms".  I wouldn't use them to write new init
+scripts (personally), but if you've had experience with them in the past
+and like them, by all means feel free.
+
+It's planned to continue support for them.
+
diff --git a/source/a/sysvinit-functions/doinst.sh b/source/a/sysvinit-functions/doinst.sh
new file mode 100644
index 000000000..bbeb4a57d
--- /dev/null
+++ b/source/a/sysvinit-functions/doinst.sh
@@ -0,0 +1,23 @@
+( cd etc
+  for dir in init.d rc0.d rc1.d rc2.d rc3.d rc4.d rc5.d rc6.d ; do
+    if [ ! -L $dir -a -d $dir ]; then
+      mv ${dir} ${dir}.bak
+    fi
+  done
+)
+( cd etc ; rm -rf init.d )
+( cd etc ; ln -sf rc.d/init.d init.d )
+( cd etc ; rm -rf rc0.d )
+( cd etc ; ln -sf rc.d/rc0.d rc0.d )
+( cd etc ; rm -rf rc1.d )
+( cd etc ; ln -sf rc.d/rc1.d rc1.d )
+( cd etc ; rm -rf rc2.d )
+( cd etc ; ln -sf rc.d/rc2.d rc2.d )
+( cd etc ; rm -rf rc3.d )
+( cd etc ; ln -sf rc.d/rc3.d rc3.d )
+( cd etc ; rm -rf rc4.d )
+( cd etc ; ln -sf rc.d/rc4.d rc4.d )
+( cd etc ; rm -rf rc5.d )
+( cd etc ; ln -sf rc.d/rc5.d rc5.d )
+( cd etc ; rm -rf rc6.d )
+( cd etc ; ln -sf rc.d/rc6.d rc6.d )
diff --git a/source/a/sysvinit-functions/functions b/source/a/sysvinit-functions/functions
new file mode 100644
index 000000000..580216d1b
--- /dev/null
+++ b/source/a/sysvinit-functions/functions
@@ -0,0 +1,577 @@
+# -*-Shell-script-*-
+#
+# functions	This file contains functions to be used by most or all
+#		shell scripts in the /etc/init.d directory.
+#
+
+TEXTDOMAIN=initscripts
+
+# Make sure umask is sane
+umask 022
+
+# Set up a default search path.
+PATH="/sbin:/usr/sbin:/bin:/usr/bin"
+export PATH
+
+# Get a sane screen width
+[ -z "${COLUMNS:-}" ] && COLUMNS=80
+
+[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="`/sbin/consoletype`"
+
+if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" ] ; then
+  . /etc/profile.d/lang.sh
+fi
+
+# Read in our configuration
+if [ -z "${BOOTUP:-}" ]; then
+  if [ -f /etc/sysconfig/init ]; then
+      . /etc/sysconfig/init
+  else
+    # This all seem confusing? Look in /etc/sysconfig/init,
+    # or in /usr/doc/initscripts-*/sysconfig.txt
+    BOOTUP=color
+    RES_COL=60
+    MOVE_TO_COL="echo -en \\033[${RES_COL}G"
+    SETCOLOR_SUCCESS="echo -en \\033[1;32m"
+    SETCOLOR_FAILURE="echo -en \\033[1;31m"
+    SETCOLOR_WARNING="echo -en \\033[1;33m"
+    SETCOLOR_NORMAL="echo -en \\033[0;39m"
+    LOGLEVEL=1
+  fi
+  if [ "$CONSOLETYPE" = "serial" ]; then
+      BOOTUP=serial
+      MOVE_TO_COL=
+      SETCOLOR_SUCCESS=
+      SETCOLOR_FAILURE=
+      SETCOLOR_WARNING=
+      SETCOLOR_NORMAL=
+  fi
+fi
+
+if [ "${BOOTUP:-}" != "verbose" ]; then
+   INITLOG_ARGS="-q"
+else
+   INITLOG_ARGS=
+fi
+
+# Interpret escape sequences in an fstab entry
+fstab_decode_str() {
+	fstab-decode echo "$1"
+}
+
+# Check if $pid (could be plural) are running
+checkpid() {
+	local i
+
+	for i in $* ; do
+		[ -d "/proc/$i" ] && return 0
+	done
+	return 1
+}
+
+# __umount_loop awk_program fstab_file first_msg retry_msg umount_args
+# awk_program should process fstab_file and return a list of fstab-encoded
+# paths; it doesn't have to handle comments in fstab_file.
+__umount_loop() {
+	local remaining sig=
+	local retry=3
+
+	remaining=$(LC_ALL=C awk "/^#/ {next} $1" "$2" | sort -r)
+	while [ -n "$remaining" -a "$retry" -gt 0 ]; do
+		if [ "$retry" -eq 3 ]; then
+			action "$3" fstab-decode umount $5 $remaining
+		else
+			action "$4" fstab-decode umount $5 $remaining
+		fi
+		sleep 2
+		remaining=$(LC_ALL=C awk "/^#/ {next} $1" "$2" | sort -r)
+		[ -z "$remaining" ] && break
+		fstab-decode /sbin/fuser -k -m $sig $remaining >/dev/null
+		sleep 5
+		retry=$(($retry -1))
+		sig=-9
+	done
+}
+
+# Similar to __umount loop above, specialized for loopback devices
+__umount_loopback_loop() {
+	local remaining devremaining sig=
+	local retry=3
+
+	remaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts)
+	devremaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts)
+	while [ -n "$remaining" -a "$retry" -gt 0 ]; do
+		if [ "$retry" -eq 3 ]; then
+			action $"Unmounting loopback filesystems: " \
+				fstab-decode umount $remaining
+		else
+			action $"Unmounting loopback filesystems (retry):" \
+				fstab-decode umount $remaining
+		fi
+		for dev in $devremaining ; do
+			losetup $dev > /dev/null 2>&1 && \
+				action $"Detaching loopback device $dev: " \
+				losetup -d $dev
+		done
+		remaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts)
+		devremaining=$(awk '$1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts)
+		[ -z "$remaining" ] && break
+		fstab-decode /sbin/fuser -k -m $sig $remaining >/dev/null
+		sleep 5
+		retry=$(($retry -1))
+		sig=-9
+	done
+}
+
+# __proc_pids {program} [pidfile]
+# Set $pid to pids from /var/run* for {program}.  $pid should be declared
+# local in the caller.
+# Returns LSB exit code for the 'status' action.
+__pids_var_run() {
+	local base=${1##*/}
+	local pid_file=${2:-/var/run/$base.pid}
+
+	pid=
+	if [ -f "$pid_file" ] ; then
+	        local line p
+		read line < "$pid_file"
+		for p in $line ; do
+			[ -z "${p//[0-9]/}" -a -d "/proc/$p" ] && pid="$pid $p"
+		done
+	        if [ -n "$pid" ]; then
+	                return 0
+	        fi
+		return 1 # "Program is dead and /var/run pid file exists"
+	fi
+	return 3 # "Program is not running"
+}
+
+# Output PIDs of matching processes, found using pidof
+__pids_pidof() {
+	pidof -c -o $$ -o $PPID -o %PPID -x "$1" || \
+		pidof -c -o $$ -o $PPID -o %PPID -x "${1##*/}"
+}
+
+
+# A function to start a program.
+daemon() {
+	# Test syntax.
+	local gotbase= force= nicelevel corelimit
+	local pid base= user= nice= bg= pid_file=
+	nicelevel=0
+	while [ "$1" != "${1##[-+]}" ]; do
+	  case $1 in
+	    '')    echo $"$0: Usage: daemon [+/-nicelevel] {program}"
+	           return 1;;
+	    --check)
+		   base=$2
+		   gotbase="yes"
+		   shift 2
+		   ;;
+	    --check=?*)
+	    	   base=${1#--check=}
+		   gotbase="yes"
+		   shift
+		   ;;
+	    --user)
+		   user=$2
+		   shift 2
+		   ;;
+	    --user=?*)
+	           user=${1#--user=}
+		   shift
+		   ;;
+	    --pidfile)
+		   pid_file=$2
+		   shift 2
+		   ;;
+	    --pidfile=?*)
+		   pid_file=${1#--pidfile=}
+		   shift
+		   ;;
+	    --force)
+	    	   force="force"
+		   shift
+		   ;;
+	    [-+][0-9]*)
+	    	   nice="nice -n $1"
+	           shift
+		   ;;
+	    *)     echo $"$0: Usage: daemon [+/-nicelevel] {program}"
+	           return 1;;
+	  esac
+	done
+
+        # Save basename.
+        [ -z "$gotbase" ] && base=${1##*/}
+
+        # See if it's already running. Look *only* at the pid file.
+	__pids_var_run "$base" "$pid_file"
+
+	[ -n "$pid" -a -z "$force" ] && return
+
+	# make sure it doesn't core dump anywhere unless requested
+	corelimit="ulimit -S -c ${DAEMON_COREFILE_LIMIT:-0}"
+	
+	# if they set NICELEVEL in /etc/sysconfig/foo, honor it
+	[ -n "${NICELEVEL:-}" ] && nice="nice -n $NICELEVEL"
+	
+	# Echo daemon
+        [ "${BOOTUP:-}" = "verbose" -a -z "${LSB:-}" ] && echo -n " $base"
+
+	# And start it up.
+	if [ -z "$user" ]; then
+	   $nice /bin/bash -c "$corelimit >/dev/null 2>&1 ; $*"
+	else
+	   $nice runuser -s /bin/bash - $user -c "$corelimit >/dev/null 2>&1 ; $*"
+	fi
+	[ "$?" -eq 0 ] && success $"$base startup" || failure $"$base startup"
+}
+
+# A function to stop a program.
+killproc() {
+	local RC killlevel= base pid pid_file= delay
+
+	RC=0; delay=3
+	# Test syntax.
+	if [ "$#" -eq 0 ]; then
+		echo $"Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]"
+		return 1
+	fi
+	if [ "$1" = "-p" ]; then
+		pid_file=$2
+		shift 2
+	fi
+	if [ "$1" = "-d" ]; then
+		delay=$2
+		shift 2
+	fi
+        
+
+	# check for second arg to be kill level
+	[ -n "${2:-}" ] && killlevel=$2
+
+        # Save basename.
+        base=${1##*/}
+
+        # Find pid.
+	__pids_var_run "$1" "$pid_file"
+	if [ -z "$pid_file" -a -z "$pid" ]; then
+		pid="$(__pids_pidof "$1")"
+	fi
+
+        # Kill it.
+        if [ -n "$pid" ] ; then
+                [ "$BOOTUP" = "verbose" -a -z "${LSB:-}" ] && echo -n "$base "
+		if [ -z "$killlevel" ] ; then
+		       if checkpid $pid 2>&1; then
+			   # TERM first, then KILL if not dead
+			   kill -TERM $pid >/dev/null 2>&1
+			   usleep 100000
+			   if checkpid $pid && sleep 1 &&
+			      checkpid $pid && sleep $delay &&
+			      checkpid $pid ; then
+                                kill -KILL $pid >/dev/null 2>&1
+				usleep 100000
+			   fi
+		        fi
+			checkpid $pid
+			RC=$?
+			[ "$RC" -eq 0 ] && failure $"$base shutdown" || success $"$base shutdown"
+			RC=$((! $RC))
+		# use specified level only
+		else
+		        if checkpid $pid; then
+	                	kill $killlevel $pid >/dev/null 2>&1
+				RC=$?
+				[ "$RC" -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel"
+			elif [ -n "${LSB:-}" ]; then
+				RC=7 # Program is not running
+			fi
+		fi
+	else
+		if [ -n "${LSB:-}" -a -n "$killlevel" ]; then
+			RC=7 # Program is not running
+		else
+			failure $"$base shutdown"
+			RC=0
+		fi
+	fi
+
+        # Remove pid file if any.
+	if [ -z "$killlevel" ]; then
+            rm -f "${pid_file:-/var/run/$base.pid}"
+	fi
+	return $RC
+}
+
+# A function to find the pid of a program. Looks *only* at the pidfile
+pidfileofproc() {
+	local pid
+
+	# Test syntax.
+	if [ "$#" = 0 ] ; then
+		echo $"Usage: pidfileofproc {program}"
+		return 1
+	fi
+
+	__pids_var_run "$1"
+	[ -n "$pid" ] && echo $pid
+	return 0
+}
+
+# A function to find the pid of a program.
+pidofproc() {
+	local RC pid pid_file=
+
+	# Test syntax.
+	if [ "$#" = 0 ]; then
+		echo $"Usage: pidofproc [-p pidfile] {program}"
+		return 1
+	fi
+	if [ "$1" = "-p" ]; then
+		pid_file=$2
+		shift 2
+	fi
+	fail_code=3 # "Program is not running"
+
+	# First try "/var/run/*.pid" files
+	__pids_var_run "$1" "$pid_file"
+	RC=$?
+	if [ -n "$pid" ]; then
+		echo $pid
+		return 0
+	fi
+
+	[ -n "$pid_file" ] && return $RC
+	__pids_pidof "$1" || return $RC
+}
+
+status() {
+	local base pid pid_file=
+
+	# Test syntax.
+	if [ "$#" = 0 ] ; then
+		echo $"Usage: status [-p pidfile] {program}"
+		return 1
+	fi
+	if [ "$1" = "-p" ]; then
+		pid_file=$2
+		shift 2
+	fi
+	base=${1##*/}
+
+	# First try "pidof"
+	pid="$(__pids_pidof "$1")"
+	if [ -n "$pid" ]; then
+	        echo $"${base} (pid $pid) is running..."
+	        return 0
+	fi
+
+	# Next try "/var/run/*.pid" files
+	__pids_var_run "$1" "$pid_file"
+	case "$?" in
+		0)
+			echo $"${base} (pid $pid) is running..."
+			return 0
+			;;
+		1)
+	                echo $"${base} dead but pid file exists"
+	                return 1
+			;;
+	esac
+	# See if /var/lock/subsys/${base} exists
+	if [ -f /var/lock/subsys/${base} ]; then
+		echo $"${base} dead but subsys locked"
+		return 2
+	fi
+	echo $"${base} is stopped"
+	return 3
+}
+
+echo_success() {
+  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
+  echo -n "["
+  [ "$BOOTUP" = "color" ] && $SETCOLOR_SUCCESS
+  echo -n $"  OK  "
+  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
+  echo -n "]"
+  echo -ne "\r"
+  return 0
+}
+
+echo_failure() {
+  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
+  echo -n "["
+  [ "$BOOTUP" = "color" ] && $SETCOLOR_FAILURE
+  echo -n $"FAILED"
+  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
+  echo -n "]"
+  echo -ne "\r"
+  return 1
+}
+
+echo_passed() {
+  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
+  echo -n "["
+  [ "$BOOTUP" = "color" ] && $SETCOLOR_WARNING
+  echo -n $"PASSED"
+  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
+  echo -n "]"
+  echo -ne "\r"
+  return 1
+}
+
+echo_warning() {
+  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
+  echo -n "["
+  [ "$BOOTUP" = "color" ] && $SETCOLOR_WARNING
+  echo -n $"WARNING"
+  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
+  echo -n "]"
+  echo -ne "\r"
+  return 1
+}
+
+# Inform the graphical boot of our current state
+update_boot_stage() {
+  if [ "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb-client ]; then
+    /usr/bin/rhgb-client --update="$1"
+  fi
+  return 0
+}
+
+# Log that something succeeded
+success() {
+  #if [ -z "${IN_INITLOG:-}" ]; then
+  #   initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
+  #fi
+  [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_success
+  return 0
+}
+
+# Log that something failed
+failure() {
+  local rc=$?
+  #if [ -z "${IN_INITLOG:-}" ]; then
+  #   initlog $INITLOG_ARGS -n $0 -s "$1" -e 2
+  #fi
+  [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_failure
+  [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes
+  return $rc
+}
+
+# Log that something passed, but may have had errors. Useful for fsck
+passed() {
+  local rc=$?
+  #if [ -z "${IN_INITLOG:-}" ]; then
+  #   initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
+  #fi
+  [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_passed
+  return $rc
+}  
+
+# Log a warning
+warning() {
+  local rc=$?
+  #if [ -z "${IN_INITLOG:-}" ]; then
+  #   initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
+  #fi
+  [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_warning
+  return $rc
+}  
+
+# Run some action. Log its output.
+action() {
+  local STRING rc
+
+  STRING=$1
+  echo -n "$STRING "
+  if [ "${RHGB_STARTED:-}" != "" -a -w /etc/rhgb/temp/rhgb-console ]; then
+      echo -n "$STRING " > /etc/rhgb/temp/rhgb-console
+  fi
+  shift
+  "$@" && success $"$STRING" || failure $"$STRING"
+  rc=$?
+  echo
+  if [ "${RHGB_STARTED:-}" != "" -a -w /etc/rhgb/temp/rhgb-console ]; then
+      if [ "$rc" = "0" ]; then
+      	echo_success > /etc/rhgb/temp/rhgb-console
+      else
+        echo_failure > /etc/rhgb/temp/rhgb-console
+	[ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes
+      fi
+      echo > /etc/rhgb/temp/rhgb-console
+  fi
+  return $rc
+}
+
+# returns OK if $1 contains $2
+strstr() {
+  [ "${1#*$2*}" = "$1" ] && return 1
+  return 0
+}
+
+# Confirm whether we really want to run this service
+confirm() {
+  [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes
+  while : ; do 
+      echo -n $"Start service $1 (Y)es/(N)o/(C)ontinue? [Y] "
+      read answer
+      if strstr $"yY" "$answer" || [ "$answer" = "" ] ; then
+         return 0
+      elif strstr $"cC" "$answer" ; then
+	 rm -f /var/run/confirm
+	 [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=no
+         return 2
+      elif strstr $"nN" "$answer" ; then
+         return 1
+      fi
+  done
+}
+
+# resolve a device node to its major:minor numbers in decimal or hex
+get_numeric_dev() {
+(
+    fmt="%d:%d"
+    if [ "$1" == "hex" ]; then
+        fmt="%x:%x"
+    fi
+    ls -lH "$2" | awk '{ sub(/,/, "", $5); printf("'"$fmt"'", $5, $6); }'
+) 2>/dev/null
+}
+
+# find the working name for a running dm device with the same table as one
+# that dmraid would create
+resolve_dm_name() {
+(
+    name="$1"
+
+    line=$(/sbin/dmraid -ay -t --ignorelocking | \
+        egrep -iv "no block devices found|No RAID disks" | \
+        awk -F ':' "{ if (\$1 ~ /^$name$/) { print \$2; }}")
+    for x in $line ; do
+        if [[ "$x" =~ "^/dev/" ]] ; then
+            majmin=$(get_numeric_dev dec $x)
+            line=$(echo "$line" | sed -e "s,$x\( \|$\),$majmin\1,g")
+        fi
+    done
+    line=$(echo "$line" | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//' \
+               -e 's/ core [12] [[:digit:]]\+ / core [12] [[:digit:]]\\+ /')
+    /sbin/dmsetup table | \
+        sed -n -e "s/.*\(no block devices found\|No devices found\).*//" \
+               -e "s/\(^[^:]\+\): $line\( \+$\|$\)/\1/p"
+) 2>/dev/null
+}
+
+# Check whether file $1 is a backup or rpm-generated file and should be ignored
+is_ignored_file() {
+    case "$1" in
+	*~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave)
+	    return 0
+	    ;;
+    esac
+    return 1
+}
+# A sed expression to filter out the files that is_ignored_file recognizes
+__sed_discard_ignored_files='/\(~\|\.bak\|\.orig\|\.rpmnew\|\.rpmorig\|\.rpmsave\)$/d'
diff --git a/source/a/sysvinit-functions/slack-desc b/source/a/sysvinit-functions/slack-desc
new file mode 100644
index 000000000..7d8e6182f
--- /dev/null
+++ b/source/a/sysvinit-functions/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------------------------------------------------------|
+sysvinit-functions: sysvinit-functions (/etc/init.d/functions)
+sysvinit-functions:
+sysvinit-functions: This is the /etc/init.d/functions file, the typical sysvinit-style
+sysvinit-functions: directories, and a few supporting binaries.  Using this system,
+sysvinit-functions: subdirectories of /etc/rc.d/ are searched for scripts (which are
+sysvinit-functions: usually symlinks to the script in /etc/init.d/ or /etc/rc.d/init.d/).
+sysvinit-functions: The links must start with S to start a script or K to stop (kill) it.
+sysvinit-functions:
+sysvinit-functions: For the most part, these are useful for running software developed
+sysvinit-functions: for other versions of Linux.
+sysvinit-functions:
diff --git a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild
new file mode 100755
index 000000000..9af7f9ec3
--- /dev/null
+++ b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+
+VERSION=${VERSION:-8.53}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sysvinit-functions
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# The functions that ship in /etc/rc.d/init.d are used mainly
+# by Red Hat (and derived) systems.  Most users will not need
+# them, but since some commerical software makes the assuption
+# that /etc/rc.d/init.d/functions will exist (and uses it),
+# shipping at least it and the sysvinit runlevel directories
+# will probably make life easier for everybody.  We'll maybe
+# ever consider splitting a few of the functions of the old
+# venerable BSD-style init scripts into runlevel scripts (if
+# it looks like it will make system maintainance easier).
+
+# Build supporting binaries:
+cd $TMP
+rm -rf function-src-$VERSION
+# A small patch was applied to initlog to shut it the %^@& up.
+tar xjf $CWD/function-src-$VERSION.tar.bz2 || exit 1
+cd function-src-$VERSION
+make
+find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+mkdir -p $PKG/bin $PKG/sbin $PKG/usr/man/man{1,8}
+make install DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man?/*.?
+
+# The FHS/LSB is a little bit unclear as to what to do here --
+# /etc/rc.d/init.d has been declared "deprecated" for no good
+# reason at all (commercial vendors couldn't find /etc/rc.d?),
+# so we'll make both /etc/init.d and /etc/rc.d/init.d with the
+# same contents.  Hopefully this will make all the programs
+# happy.
+mkdir -p $PKG/etc/rc.d/init.d
+for file in $CWD/README.functions $CWD/functions ; do
+  cat $file > $PKG/etc/rc.d/init.d/$(basename $file)
+done
+chmod 755 $PKG/etc/rc.d/init.d/functions
+
+# Make empty runlevel directories:
+mkdir -p $PKG/etc/rc.d/rc{0,1,2,3,4,5,6}.d
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/sysvinit-functions-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/sysvinit-scripts/doinst.sh b/source/a/sysvinit-scripts/doinst.sh
new file mode 100644
index 000000000..ff0ffc285
--- /dev/null
+++ b/source/a/sysvinit-scripts/doinst.sh
@@ -0,0 +1,25 @@
+
+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...
+}
+# Slackware scripts
+config etc/inittab.new
+config etc/rc.d/rc.4.new
+config etc/rc.d/rc.6.new
+config etc/rc.d/rc.K.new
+config etc/rc.d/rc.M.new
+config etc/rc.d/rc.S.new
+config etc/rc.d/rc.local.new
+config etc/rc.d/rc.sysvinit.new
+
+( cd etc/rc.d ; rm -rf rc.0 )
+( cd etc/rc.d ; ln -sf rc.6 rc.0 )
+
diff --git a/source/a/sysvinit-scripts/scripts/fetch-rescan-scsi-bus.sh b/source/a/sysvinit-scripts/scripts/fetch-rescan-scsi-bus.sh
new file mode 100644
index 000000000..29dccf78a
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/fetch-rescan-scsi-bus.sh
@@ -0,0 +1 @@
+lftpget http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh
diff --git a/source/a/sysvinit-scripts/scripts/inittab b/source/a/sysvinit-scripts/scripts/inittab
new file mode 100644
index 000000000..862f704c1
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/inittab
@@ -0,0 +1,74 @@
+#
+# inittab	This file describes how the INIT process should set up
+#		the system in a certain run-level.
+#
+# Version:	@(#)inittab		2.04	17/05/93	MvS
+#                                       2.10    02/10/95        PV
+#                                       3.00    02/06/1999      PV
+#                                       4.00    04/10/2002      PV
+#
+# Author:	Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
+# Modified by:	Patrick J. Volkerding, <volkerdi@slackware.com>
+#
+
+# These are the default runlevels in Slackware:
+#   0 = halt
+#   1 = single user mode
+#   2 = unused (but configured the same as runlevel 3)
+#   3 = multiuser mode (default Slackware runlevel)
+#   4 = X11 with KDM/GDM/XDM (session managers)
+#   5 = unused (but configured the same as runlevel 3)
+#   6 = reboot
+
+# Default runlevel. (Do not set to 0 or 6)
+id:3:initdefault:
+
+# System initialization (runs when system boots).
+si:S:sysinit:/etc/rc.d/rc.S
+
+# Script to run when going single user (runlevel 1).
+su:1S:wait:/etc/rc.d/rc.K
+
+# Script to run when going multi user.
+rc:2345:wait:/etc/rc.d/rc.M
+
+# What to do at the "Three Finger Salute".
+ca::ctrlaltdel:/sbin/shutdown -t5 -r now
+
+# Runlevel 0 halts the system.
+l0:0:wait:/etc/rc.d/rc.0
+
+# Runlevel 6 reboots the system.
+l6:6:wait:/etc/rc.d/rc.6
+
+# What to do when power fails.
+pf::powerfail:/sbin/genpowerfail start
+
+# If power is back, cancel the running shutdown.
+pg::powerokwait:/sbin/genpowerfail stop
+
+# These are the standard console login getties in multiuser mode:
+c1:1235:respawn:/sbin/agetty 38400 tty1 linux
+c2:1235:respawn:/sbin/agetty 38400 tty2 linux
+c3:1235:respawn:/sbin/agetty 38400 tty3 linux
+c4:1235:respawn:/sbin/agetty 38400 tty4 linux
+c5:1235:respawn:/sbin/agetty 38400 tty5 linux
+c6:12345:respawn:/sbin/agetty 38400 tty6 linux
+
+# Local serial lines:
+#s1:12345:respawn:/sbin/agetty -L ttyS0 9600 vt100
+#s2:12345:respawn:/sbin/agetty -L ttyS1 9600 vt100
+
+# Dialup lines:
+#d1:12345:respawn:/sbin/agetty -mt60 38400,19200,9600,2400,1200 ttyS0 vt100
+#d2:12345:respawn:/sbin/agetty -mt60 38400,19200,9600,2400,1200 ttyS1 vt100
+
+# Runlevel 4 used to be for an X window only system, until we discovered
+# that it throws init into a loop that keeps your load avg at least 1 all 
+# the time. Thus, there is now one getty opened on tty6. Hopefully no one
+# will notice. ;^)
+# It might not be bad to have one text console anyway, in case something 
+# happens to X.
+x1:4:respawn:/etc/rc.d/rc.4
+
+# End of /etc/inittab
diff --git a/source/a/sysvinit-scripts/scripts/rc.4 b/source/a/sysvinit-scripts/scripts/rc.4
new file mode 100644
index 000000000..be8a9c746
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/rc.4
@@ -0,0 +1,48 @@
+#! /bin/sh
+#
+# rc.4		This file is executed by init(8) when the system is being
+#		initialized for run level 4 (XDM)
+#
+# Version:	@(#)/etc/rc.d/rc.4	2.00	02/17/93
+#
+# Author:	Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
+# At least 47% rewritten by:  Patrick J. Volkerding <volkerdi@slackware.com>
+#
+
+# Tell the viewers what's going to happen...
+echo "Starting up X11 session manager..."
+
+# Try to use GNOME's gdm session manager.  This comes first because if
+# gdm is on the machine then the user probably installed it and wants
+# to use it by default:
+if [ -x /usr/bin/gdm ]; then
+  exec /usr/bin/gdm -nodaemon
+fi
+
+# Someone thought that gdm looked prettier in /usr/sbin,
+# so look there, too:
+if [ -x /usr/sbin/gdm ]; then
+  exec /usr/sbin/gdm -nodaemon
+fi
+
+# Not there?  OK, try to use KDE's kdm session manager:
+if [ -x /opt/kde/bin/kdm ]; then
+  exec /opt/kde/bin/kdm -nodaemon
+elif [ -x /usr/bin/kdm ]; then
+  exec /usr/bin/kdm -nodaemon
+fi
+
+# If all you have is XDM, I guess it will have to do:
+if [ -x /usr/bin/xdm ]; then
+  exec /usr/bin/xdm -nodaemon
+elif [ -x /usr/X11R6/bin/xdm ]; then
+  exec /usr/X11R6/bin/xdm -nodaemon
+fi
+
+# error
+echo
+echo "Hey, you don't have KDM, GDM, or XDM.  Can't use runlevel 4 without"
+echo "one of those installed."
+sleep 30
+
+# All done.
diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6
new file mode 100644
index 000000000..2d5028e35
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/rc.6
@@ -0,0 +1,266 @@
+#! /bin/sh
+#
+# rc.6		This file is executed by init when it goes into runlevel
+#		0 (halt) or runlevel 6 (reboot). It kills all processes,
+#		unmounts file systems and then either halts or reboots.
+#
+# Version:	@(#)/etc/rc.d/rc.6	2.47 Sat Jan 13 13:37:26 PST 2001
+#
+# Author:	Miquel van Smoorenburg <miquels@drinkel.nl.mugnet.org>
+# Modified by:  Patrick J. Volkerding, <volkerdi@slackware.com>
+#
+
+# Set the path.
+PATH=/sbin:/etc:/bin:/usr/bin
+
+# If there are SystemV init scripts for this runlevel, run them.
+if [ -x /etc/rc.d/rc.sysvinit ]; then
+  . /etc/rc.d/rc.sysvinit
+fi
+
+# Set linefeed mode to avoid staircase effect.
+/bin/stty onlcr
+
+echo "Running shutdown script $0:"
+
+# Find out how we were called.
+case "$0" in
+	*0)
+		command="halt"
+		;;
+	*6)
+		command=reboot
+		;;
+	*)
+		echo "$0: call me as \"rc.0\" or \"rc.6\" please!"
+		exit 1
+		;;
+esac
+
+# Save the system time to the hardware clock using hwclock --systohc.
+if [ -x /sbin/hwclock ]; then
+  # Check for a broken motherboard RTC clock (where ioports for rtc are
+  # unknown) to prevent hwclock causing a hang:
+  if ! grep -q -w rtc /proc/ioports ; then
+    CLOCK_OPT="--directisa"
+  fi
+  if grep -q "^UTC" /etc/hardwareclock 2> /dev/null ; then
+    echo "Saving system time to the hardware clock (UTC)."
+    /sbin/hwclock $CLOCK_OPT --utc --systohc
+  else
+    echo "Saving system time to the hardware clock (localtime)."
+    /sbin/hwclock  $CLOCK_OPT --localtime --systohc
+  fi
+fi
+
+# Run any local shutdown scripts:
+if [ -x /etc/rc.d/rc.local_shutdown ]; then
+  /etc/rc.d/rc.local_shutdown stop
+fi
+
+# Stop the Apache web server:
+if [ -x /etc/rc.d/rc.httpd ]; then
+  /etc/rc.d/rc.httpd stop
+fi
+
+# Stop the MySQL database:
+if [ -r /var/run/mysql/mysql.pid ]; then
+  . /etc/rc.d/rc.mysqld stop
+fi
+
+# Stop the Samba server:
+if [ -x /etc/rc.d/rc.samba ]; then
+  . /etc/rc.d/rc.samba stop
+fi
+
+# Shut down the NFS server:
+if [ -x /etc/rc.d/rc.nfsd ]; then
+  /etc/rc.d/rc.nfsd stop
+fi
+
+# Shut down the SSH server:
+if [ -x /etc/rc.d/rc.sshd ]; then
+  /etc/rc.d/rc.sshd stop
+fi
+
+# Shut down the SASL authentication daemon:
+if [ -x /etc/rc.d/rc.saslauthd ]; then
+  /etc/rc.d/rc.saslauthd stop
+fi
+
+# Shut down OpenLDAP:
+if [ -x /etc/rc.d/rc.openldap ]; then
+  /etc/rc.d/rc.openldap stop
+fi
+
+# Stop D-Bus:
+if [ -x /etc/rc.d/rc.messagebus ]; then
+  sh /etc/rc.d/rc.messagebus stop
+fi
+
+# Unmount any NFS, SMB, or CIFS filesystems:
+echo "Unmounting remote filesystems."
+/bin/umount -v -a -r -t nfs,smbfs,cifs
+
+# Try to shut down pppd:
+PS="$(ps ax)"
+if echo "$PS" | /bin/grep -q -w pppd ; then
+  if [ -x /usr/sbin/ppp-off ]; then
+    /usr/sbin/ppp-off
+  fi
+fi
+
+# Bring down the networking system, but first make sure that this
+# isn't a diskless client with the / partition mounted via NFS:
+if ! /bin/mount | /bin/grep -q 'on / type nfs' ; then
+  if [ -x /etc/rc.d/rc.inet1 ]; then
+    . /etc/rc.d/rc.inet1 stop
+  fi
+fi
+
+# In case dhcpcd might have been manually started on the command line,
+# look for the .pid file, and shut dhcpcd down if it's found:
+if /bin/ls /etc/dhcpc/*.pid 1> /dev/null 2> /dev/null ; then
+  /sbin/dhcpcd -k 1> /dev/null 2> /dev/null
+  # A little time for /etc/resolv.conf and/or other files to
+  # restore themselves.
+  sleep 2
+fi
+
+# Shut down PCMCIA devices:
+if [ -x /etc/rc.d/rc.pcmcia ]; then
+  . /etc/rc.d/rc.pcmcia stop
+  # The cards might need a little extra time here to deactivate:
+  /bin/sleep 5
+fi
+
+# Turn off process accounting:
+if [ -x /sbin/accton -a -r /var/log/pacct ]; then
+  /sbin/accton off
+fi
+
+# Terminate acpid before syslog:
+if [ -x /etc/rc.d/rc.acpid -a -r /var/run/acpid.pid ]; then # quit
+  . /etc/rc.d/rc.acpid stop
+fi
+
+# Kill all processes.
+# INIT is supposed to handle this entirely now, but this didn't always
+# work correctly without this second pass at killing off the processes.
+# Since INIT already notified the user that processes were being killed,
+# we'll avoid echoing this info this time around.
+if [ ! "$1" = "fast" ]; then # shutdown did not already kill all processes
+  /sbin/killall5 -15 
+  /bin/sleep 5
+  /sbin/killall5 -9
+fi
+
+# Try to turn off quota.
+if /bin/grep -q quota /etc/fstab ; then
+  if [ -x /sbin/quotaoff ]; then
+    echo "Turning off filesystem quotas."
+    /sbin/quotaoff -a
+  fi
+fi
+
+# Carry a random seed between reboots.
+echo "Saving random seed from /dev/urandom in /etc/random-seed."
+# Use the pool size from /proc, or 512 bytes:
+if [ -r /proc/sys/kernel/random/poolsize ]; then
+  /bin/dd if=/dev/urandom of=/etc/random-seed count=1 bs=$(cat /proc/sys/kernel/random/poolsize) 2> /dev/null
+else
+  /bin/dd if=/dev/urandom of=/etc/random-seed count=1 bs=512 2> /dev/null
+fi
+/bin/chmod 600 /etc/random-seed
+
+# Before unmounting file systems write a reboot or halt record to wtmp.
+$command -w
+
+# Clear /var/lock/subsys.
+if [ -d /var/lock/subsys ]; then
+  rm -f /var/lock/subsys/*
+fi
+
+# Turn off swap:
+echo "Turning off swap."
+/sbin/swapoff -a
+/bin/sync
+
+# Umount any LVM volumes:
+if /bin/mount | /bin/grep -q '^/dev/mapper/' ; then
+  echo "Unmounting LVM volumes."
+  /bin/umount -v $(/bin/mount | /bin/grep '^/dev/mapper/' | /bin/cut -d ' ' -f 3 | /bin/tac)
+fi
+
+echo "Unmounting local file systems."
+/bin/umount -v -a -t no,proc,sysfs
+
+echo "Remounting root filesystem read-only."
+/bin/mount -v -n -o remount,ro /
+
+# This never hurts:
+/bin/sync
+
+# Close any volumes opened by cryptsetup:
+if [ -f /etc/crypttab -a -x /sbin/cryptsetup.static ]; then
+  cat /etc/crypttab | grep -v "^#" | grep -v "^$" | while read line; do
+    # NOTE: we only support LUKS formatted volumes (except for swap)!
+    LUKS=$(echo $line | tr '\t' ' ' | tr -s ' ' | cut -f1 -d' ')
+    DEV=$(echo $line | tr '\t' ' ' | tr -s ' ' | cut -f2 -d' ')
+    OPTS=$(echo $line | tr '\t' ' ' | tr -s ' ' | cut -f4 -d' ')
+    if /sbin/cryptsetup.static isLuks $DEV 2>/dev/null ; then
+      echo "Locking LUKS crypt volume '${LUKS}':"
+      /sbin/cryptsetup.static luksClose ${LUKS}
+    elif echo $OPTS | grep -wq swap ; then
+      # If any of the volumes was used as encrypted swap,
+      # then run mkswap on the underlying device -
+      # in case other Linux installations on this computer should use it:
+      echo "Erasing encrypted swap '${LUKS}' and restoring normal swap on ${DEV}:"
+      /sbin/cryptsetup.static remove ${LUKS}
+      mkswap $DEV
+    fi
+  done
+fi
+
+# Deactivate LVM volume groups:
+if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then
+  echo "Deactivating LVM volume groups:"
+  /sbin/vgchange -an --ignorelockingfailure
+fi
+
+# This never hurts again (especially since root-on-LVM always fails
+# to deactivate the / logical volume...  but at least it was
+# remounted as read-only first)
+/bin/sync
+
+# sleep 3 fixes problems with some hard drives that don't
+# otherwise finish syncing before reboot or poweroff
+/bin/sleep 3
+
+# This is to ensure all processes have completed on SMP machines:
+wait
+
+if [ -x /sbin/genpowerd ]; then
+  # See if this is a powerfail situation:
+  if /bin/egrep -q "FAIL|SCRAM" /etc/upsstatus 2> /dev/null ; then
+    # Signal UPS to shut off the inverter:
+    /sbin/genpowerd -k
+    if [ ! $? = 0 ]; then
+      echo
+      echo "There was an error signaling the UPS."
+      echo "Perhaps you need to edit /etc/genpowerd.conf to configure"
+      echo "the serial line and UPS type."
+      # Wasting 15 seconds of precious power:
+      /bin/sleep 15
+    fi
+  fi
+fi
+
+# Now halt (poweroff with APM or ACPI enabled kernels) or reboot.
+if [ "$command" = "reboot" ]; then
+  echo "Rebooting."
+  /sbin/reboot
+else
+  /sbin/poweroff
+fi
+
diff --git a/source/a/sysvinit-scripts/scripts/rc.K b/source/a/sysvinit-scripts/scripts/rc.K
new file mode 100644
index 000000000..68609753a
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/rc.K
@@ -0,0 +1,106 @@
+#! /bin/sh
+#
+# rc.K 		This file is executed by init when it goes into runlevel
+#		1, which is the administrative state. It kills all
+#		daemons and then puts the system into single user mode.
+#		Note that the file systems are kept mounted.
+#
+# Version:	@(#)/etc/rc.d/rc.K	3.1415 Sat Jan 13 13:37:26 PST 2001
+#
+# Author:	Miquel van Smoorenburg <miquels@drinkel.nl.mugnet.org>
+# Modified by:  Patrick J. Volkerding <volkerdi@slackware.com>
+#
+
+# Set the path.
+PATH=/sbin:/bin:/usr/bin:/usr/sbin
+
+# Load any needed keyboard mappings:
+if [ -x /etc/rc.d/rc.keymap ]; then
+  . /etc/rc.d/rc.keymap
+fi
+
+# If there are SystemV init scripts for this runlevel, run them.
+if [ -x /etc/rc.d/rc.sysvinit ]; then
+  . /etc/rc.d/rc.sysvinit
+fi
+
+# Try to turn off quota:
+if grep -q quota /etc/fstab ; then
+  if [ -x /sbin/quotaoff ]; then
+    echo "Turning off filesystem quotas."
+    /sbin/quotaoff -a
+  fi
+fi
+
+# Try to turn off accounting:
+if [ -x /sbin/accton -a -r /var/log/pacct ]; then
+  /sbin/accton off
+fi
+
+# Run any local shutdown scripts:
+if [ -x /etc/rc.d/rc.local_shutdown ]; then
+  /etc/rc.d/rc.local_shutdown stop
+fi
+
+# Stop the Apache web server:
+if [ -x /etc/rc.d/rc.httpd ]; then
+  /etc/rc.d/rc.httpd stop
+fi
+
+# Stop the Samba server:
+if [ -x /etc/rc.d/rc.samba ]; then
+  . /etc/rc.d/rc.samba stop
+fi
+
+# Shut down the NFS server:
+if [ -x /etc/rc.d/rc.nfsd ]; then
+  /etc/rc.d/rc.nfsd stop
+fi
+
+# Unmount any NFS, SMB, or CIFS filesystems:
+echo "Unmounting remote filesystems."
+umount -a -r -t nfs,smbfs,cifs
+
+# Shut down PCMCIA devices:
+if [ -x /etc/rc.d/rc.pcmcia ] ; then
+  . /etc/rc.d/rc.pcmcia stop
+  # The cards might need a little extra time here to deactivate:
+  sleep 5
+fi
+
+# Terminate acpid before syslog:
+if [ -x /etc/rc.d/rc.acpid -a -r /var/run/acpid.pid ]; then # quit
+  . /etc/rc.d/rc.acpid stop
+fi
+
+# Kill all processes.
+echo
+echo "Sending all processes the SIGHUP signal."
+killall5 -1
+echo -n "Waiting for processes to hang up"
+for loop in 0 1 2 3 4 5 ; do
+  sleep 1
+  echo -n "."
+done
+echo
+echo "Sending all processes the SIGTERM signal."
+killall5 -15
+echo -n "Waiting for processes to terminate"
+for loop in 0 1 2 3 4 5 ; do
+  sleep 1
+  echo -n "."
+done
+echo
+echo "Sending all processes the SIGKILL signal."
+killall5 -9
+echo -n "Waiting for processes to exit"
+for loop in 0 1 2 3 4 5 ; do
+  sleep 1
+  echo -n "."
+done
+echo
+
+# Now go to the single user level
+echo "Going to single user mode..."
+telinit -t 1 1
+
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M
new file mode 100644
index 000000000..fe2c9b6f0
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/rc.M
@@ -0,0 +1,355 @@
+#!/bin/sh
+#
+# rc.M		This file is executed by init(8) when the system is being
+#		initialized for one of the "multi user" run levels (i.e.
+#		levels 1 through 6).  It usually does mounting of file
+#		systems et al.
+#
+# Version:	@(#)/etc/rc.d/rc.M	2.23	Wed Feb 26 19:20:58 PST 2003
+#
+# Author:	Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
+#		Heavily modified by Patrick Volkerding <volkerdi@slackware.com>
+#
+
+# Tell the viewers what's going to happen.
+echo "Going multiuser..."
+
+# Update all the shared library links:
+if [ -x /sbin/ldconfig ]; then
+  echo "Updating shared library links:  /sbin/ldconfig &"
+  /sbin/ldconfig &
+fi
+
+# Screen blanks after 15 minutes idle time, and powers down in one hour
+# if the kernel supports APM or ACPI power management:
+/bin/setterm -blank 15 -powersave powerdown -powerdown 60
+
+# Set the hostname.
+if [ -r /etc/HOSTNAME ]; then
+  /bin/hostname $(cat /etc/HOSTNAME | cut -f1 -d .)
+else
+  # fall back on this old default:
+  echo "darkstar.example.net" > /etc/HOSTNAME
+  /bin/hostname darkstar
+fi
+
+# Save the contents of 'dmesg':
+/bin/dmesg -s 65536 > /var/log/dmesg
+
+# Initialize PCMCIA devices:
+#
+# NOTE: This used to be started near the top of rc.S so that PCMCIA devices
+# could be fsck'ed along with the other drives.  This had some unfortunate
+# side effects, however, since root isn't yet read-write, and /var might not
+# even be mounted the .pid files can't be correctly written in /var/run and
+# the pcmcia system can't be correctly shut down.  If you want some PCMCIA
+# partition to be mounted at boot (or when the card is inserted) then add
+# the appropriate lines to /etc/pcmcia/scsi.opts.
+#
+# Note that the stuff in /etc/pcmcia/ is only for 2.4.x kernels using
+# 16-bit PCMCIA cards (not 32-bit Cardbus cards!).  For example, with a
+# wireless card you might need to set options in /etc/pcmcia OR in
+# /etc/rc.d/rc.wireless.conf, or even in /etc/rc.d/rc.inet1.conf (with
+# extra options if needed for the encryption key, ESSID, etc.)
+#
+# Hopefully this situation will be unified in the future, but for now
+# that's how it is...
+#
+if [ -x /etc/rc.d/rc.pcmcia ]; then
+  . /etc/rc.d/rc.pcmcia start
+  # The cards might need a little extra time here to initialize.
+  sleep 5
+fi
+
+# Start the system logger.
+if [ -x /etc/rc.d/rc.syslog -a -x /usr/sbin/syslogd -a -d /var/log ]; then
+  . /etc/rc.d/rc.syslog start
+fi
+
+# Update the X font indexes:
+if [ -x /usr/bin/fc-cache ]; then
+  echo "Updating X font indexes:  /usr/bin/fc-cache -f &"
+  /usr/bin/fc-cache -f &
+fi
+
+# If we are returning from single-user mode we will need to restart
+# udevd on systems that use udev:
+if grep -wq sysfs /proc/mounts && grep -wq tmpfs /proc/filesystems ; then
+  if ! grep -wq nohotplug /proc/cmdline ; then
+    if [ -x /etc/rc.d/rc.udev ]; then
+      /bin/sh /etc/rc.d/rc.udev start
+    fi
+  fi
+fi
+
+# Initialize the networking hardware.
+if [ -x /etc/rc.d/rc.inet1 ]; then
+  . /etc/rc.d/rc.inet1
+fi
+
+# Look for additional USB/SCSI/IEEE1394/etc devices on multiple LUNs:
+if [ -x /etc/rc.d/rc.scanluns ]; then
+  . /etc/rc.d/rc.scanluns
+fi
+
+# Start networking daemons:
+if [ -x /etc/rc.d/rc.inet2 ]; then
+  . /etc/rc.d/rc.inet2
+fi
+
+# Mount any additional filesystem types that haven't already been mounted:
+mount -a -v 2> /dev/null | grep -v "already mounted"
+
+# Start the Network Time Protocol daemon:
+if [ -x /etc/rc.d/rc.ntpd ]; then
+  sh /etc/rc.d/rc.ntpd start
+fi
+
+# Remove stale locks and junk files (must be done after mount -a!)
+/bin/rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/core /core 2> /dev/null
+
+# Remove stale hunt sockets so the game can start.
+if [ -r /tmp/hunt -o -r /tmp/hunt.stats ]; then
+  echo "Removing your stale hunt sockets from /tmp."
+  /bin/rm -f /tmp/hunt*
+fi
+
+# Ensure basic filesystem permissions sanity.
+chmod 755 / 2> /dev/null
+chmod 1777 /tmp /var/tmp
+
+# Start APM or ACPI daemon.
+# If APM is enabled in the kernel, start apmd:
+if [ -e /proc/apm ]; then
+  if [ -x /usr/sbin/apmd ]; then
+    echo "Starting APM daemon:  /usr/sbin/apmd"
+    /usr/sbin/apmd
+  fi
+elif [ -x /etc/rc.d/rc.acpid ]; then # otherwise, start acpid:
+  . /etc/rc.d/rc.acpid start
+fi
+
+# Update any existing icon cache files:
+if find /usr/share/icons 2> /dev/null | grep -q icon-theme.cache ; then
+  for theme_dir in /usr/share/icons/* ; do
+    if [ -r ${theme_dir}/icon-theme.cache ]; then
+      echo "Updating icon-theme.cache in ${theme_dir}..."
+      /usr/bin/gtk-update-icon-cache -t -f ${theme_dir} 1> /dev/null 2> /dev/null &
+    fi
+  done
+  # This would be a large file and probably shouldn't be there.
+  if [ -r /usr/share/icons/icon-theme.cache ]; then
+    echo "Deleting icon-theme.cache in /usr/share/icons..."
+    #/usr/bin/gtk-update-icon-cache -t -f /usr/share/icons 1> /dev/null 2> /dev/null &
+    rm -f /usr/share/icons/icon-theme.cache
+  fi
+fi
+
+# Update mime database:
+if [ -x /usr/bin/update-mime-database -a -d /usr/share/mime ]; then
+  echo "Updating MIME database:  /usr/bin/update-mime-database /usr/share/mime &"
+  /usr/bin/update-mime-database /usr/share/mime 1> /dev/null 2> /dev/null &
+fi
+
+# Start D-Bus:
+if [ -x /etc/rc.d/rc.messagebus ]; then
+  sh /etc/rc.d/rc.messagebus start
+fi
+
+# Start HAL:
+if [ -x /etc/rc.d/rc.hald ]; then
+  sh /etc/rc.d/rc.hald start
+fi
+
+# Start Bluetooth:
+if [ -x /etc/rc.d/rc.bluetooth ]; then
+  sh /etc/rc.d/rc.bluetooth start
+fi
+
+# Start wicd:
+if [ -x /etc/rc.d/rc.wicd ]; then
+  sh /etc/rc.d/rc.wicd start
+fi
+
+# These GTK+/pango files need to be kept up to date for
+# proper input method, pixbuf loaders, and font support.
+if [ -x /usr/bin/update-gtk-immodules ]; then
+  /usr/bin/update-gtk-immodules --verbose
+fi
+if [ -x /usr/bin/update-gdk-pixbuf-loaders ]; then
+  /usr/bin/update-gdk-pixbuf-loaders --verbose
+fi
+if [ -x /usr/bin/update-pango-querymodules ]; then
+  /usr/bin/update-pango-querymodules --verbose
+fi
+
+# Start dnsmasq, a simple DHCP/DNS server:
+if [ -x /etc/rc.d/rc.dnsmasq ]; then
+  /etc/rc.d/rc.dnsmasq start
+fi
+
+# Start snmpd:
+if [ -x /etc/rc.d/rc.snmpd ]; then
+  /etc/rc.d/rc.snmpd start
+fi
+
+# Start the print spooling system.  This will usually be LPRng (lpd) or CUPS.
+if [ -x /etc/rc.d/rc.cups ]; then
+  # Start CUPS:
+  /etc/rc.d/rc.cups start
+elif [ -x /etc/rc.d/rc.lprng ]; then
+  # Start LPRng (lpd):
+  . /etc/rc.d/rc.lprng start
+fi
+
+# Start netatalk. (a file/print server for Macs using Appletalk)
+if [ -x /etc/rc.d/rc.atalk ]; then
+  /etc/rc.d/rc.atalk
+fi
+
+# Start smartd, which monitors the status of S.M.A.R.T. compatible
+# hard drives and reports any problems.  Note some devices (which aren't
+# smart, I guess ;) will hang if probed by smartd, so it's commented out
+# by default.
+#if [ -x /usr/sbin/smartd ]; then
+#  /usr/sbin/smartd
+#fi
+
+# If we're using udev, make /dev/cdrom and any other optical drive symlinks
+# if some udev rule hasn't made them already:
+if grep -wq sysfs /proc/mounts && grep -wq tmpfs /proc/filesystems; then
+  if ! grep -wq nohotplug /proc/cmdline ; then
+    if [ -x /lib/udev/rc.optical-symlinks -a -x /etc/rc.d/rc.udev ]; then
+      /bin/sh /lib/udev/rc.optical-symlinks
+    fi
+  fi
+fi
+
+# Monitor the UPS with genpowerd.
+# To use this, uncomment this section and edit your settings in
+# /etc/genpowerd.conf (serial device, UPS type, etc).  For more information,
+# see "man genpowerd" or the extensive documentation in the
+# /usr/doc/genpower-*/ directory.
+# You'll also need to configure a similar block in /etc/rc.d/rc.6 if you want
+# support for stopping the UPS's inverter after the machine halts.
+#if [ -x /sbin/genpowerd ]; then
+#  echo "Starting genpowerd daemon..."
+#  /sbin/genpowerd
+#fi
+
+# Turn on process accounting.  To enable process accounting, make sure the
+# option for BSD process accounting is enabled in your kernel, and then
+# create the file /var/log/pacct (touch /var/log/pacct).  By default, process
+# accounting is not enabled (since /var/log/pacct does not exist).  This is
+# because the log file can get VERY large.
+if [ -x /sbin/accton -a -r /var/log/pacct ]; then
+  chmod 640 /var/log/pacct
+  /sbin/accton /var/log/pacct
+fi
+
+# Start crond (Dillon's crond):
+# If you want cron to actually log activity to /var/log/cron, then change
+# -l10 to -l8 to increase the logging level.
+if [ -x /usr/sbin/crond ]; then
+  /usr/sbin/crond -l10 >>/var/log/cron 2>&1
+fi
+
+# Start atd (manages jobs scheduled with 'at'):
+if [ -x /usr/sbin/atd ]; then
+  /usr/sbin/atd -b 15 -l 1
+fi
+
+# Slackware-Mini-Quota-HOWTO:
+# To really activate quotas, you'll need to add 'usrquota' and/or 'grpquota' to
+# the appropriate partitions as listed in /etc/fstab.  Here's an example:
+#
+# /dev/hda2      /home      ext3     defaults,usrquota      1   1
+#
+# You'll then need to setup initial quota files at the top of the partitions
+# to support quota, like this:
+# touch /home/aquota.user /home/aquota.group
+# chmod 600 /home/aquota.user /home/aquota.group
+#
+# Then, reboot to activate the system.
+# To edit user quotas, use 'edquota'.  See 'man edquota'.  Also, the
+# official Quota Mini-HOWTO has lots of useful information.  That can be found
+# here:  /usr/doc/Linux-HOWTOs/Quota
+
+# Check quotas and then turn quota system on:
+if grep -q quota /etc/fstab ; then
+  for quotafs in $(awk '/quota/ {print $2}' /etc/fstab) ; do
+    /bin/rm -f $quotafs/{a,}quota.{group,user}.new
+  done
+  if [ -x /sbin/quotacheck ]; then
+    echo "Checking filesystem quotas:  /sbin/quotacheck -avugm"
+    /sbin/quotacheck -avugm
+  fi
+  if [ -x /sbin/quotaon ]; then
+    echo "Activating filesystem quotas:  /sbin/quotaon -avug"
+    /sbin/quotaon -avug
+  fi
+fi
+
+# Start the SASL authentication server.  This provides SASL
+# authentication services for sendmail:
+if [ -x /etc/rc.d/rc.saslauthd ]; then
+  . /etc/rc.d/rc.saslauthd start
+fi
+
+# Start the sendmail daemon:
+if [ -x /etc/rc.d/rc.sendmail ]; then
+  . /etc/rc.d/rc.sendmail start
+fi
+
+# Load ALSA (sound) defaults:
+if [ -x /etc/rc.d/rc.alsa ]; then
+  . /etc/rc.d/rc.alsa
+fi
+
+# Load a custom screen font if the user has an rc.font script.
+if [ -x /etc/rc.d/rc.font ]; then
+  . /etc/rc.d/rc.font
+fi
+
+# Load a custom keymap if the user has an rc.keymap script.
+if [ -x /etc/rc.d/rc.keymap ]; then
+  . /etc/rc.d/rc.keymap
+fi
+
+# Start the MySQL database:
+if [ -x /etc/rc.d/rc.mysqld ]; then
+  . /etc/rc.d/rc.mysqld start
+fi
+
+# Start Apache web server:
+if [ -x /etc/rc.d/rc.httpd ]; then
+  . /etc/rc.d/rc.httpd start
+fi
+
+# Start OpenLDAP:
+if [ -x /etc/rc.d/rc.openldap ]; then
+  . /etc/rc.d/rc.openldap start
+fi
+
+# Start Samba (a file/print server for Win95/NT machines).
+# Samba can be started in /etc/inetd.conf instead.
+if [ -x /etc/rc.d/rc.samba ]; then
+  . /etc/rc.d/rc.samba start
+fi
+
+# Start the GPM mouse server:
+if [ -x /etc/rc.d/rc.gpm ]; then
+  . /etc/rc.d/rc.gpm start
+fi
+
+# If there are SystemV init scripts for this runlevel, run them.
+if [ -x /etc/rc.d/rc.sysvinit ]; then
+  . /etc/rc.d/rc.sysvinit
+fi
+
+# Start the local setup procedure.
+if [ -x /etc/rc.d/rc.local ]; then
+  . /etc/rc.d/rc.local
+fi
+
+# All done.
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
new file mode 100644
index 000000000..a0072d286
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -0,0 +1,382 @@
+#!/bin/sh
+#
+# /etc/rc.d/rc.S:  System initialization script.
+#
+# Mostly written by:  Patrick J. Volkerding, <volkerdi@slackware.com>
+#
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+# Mount /proc right away:
+/sbin/mount -v proc /proc -n -t proc
+
+# Mount sysfs next, if the kernel supports it:
+if [ -d /sys ]; then
+  if grep -wq sysfs /proc/filesystems ; then
+    if ! grep -wq sysfs /proc/mounts ; then
+      /sbin/mount -v sysfs /sys -n -t sysfs
+    fi
+  fi
+fi
+
+# Initialize udev to manage /dev entries and hotplugging for 2.6.x kernels.
+# You may turn off udev by making the /etc/rc.d/rc.udev file non-executable
+# or giving the "nohotplug" option at boot, but in the 2.6.x+ kernels udev
+# has taken over the job of hotplug (finding hardware and loading the kernel
+# modules for it, as well as creating device nodes in /dev).  Realize that
+# if you turn off udev that you will have to load all the kernel modules
+# that you need yourself (possibly in /etc/rc.d/rc.modules, which does not
+# promise to list all of them), and make any additional device nodes that you
+# need in the /dev directory.  Even USB and IEEE1394 devices will need to have
+# the modules loaded by hand if udev is not used with a 2.6 kernel.  So use it.  :-)
+if grep -wq sysfs /proc/mounts && grep -wq tmpfs /proc/filesystems ; then
+  if ! grep -wq nohotplug /proc/cmdline ; then
+    if [ -x /etc/rc.d/rc.udev ]; then
+      /bin/sh /etc/rc.d/rc.udev start
+    fi
+  fi
+fi
+
+# Initialize the Logical Volume Manager.
+# This won't start unless we find /etc/lvmtab (LVM1) or
+# /etc/lvm/backup/ (LVM2).  This is created by /sbin/vgscan, so to
+# use LVM you must run /sbin/vgscan yourself the first time (and
+# create some VGs and LVs).
+if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then
+  echo "Initializing LVM (Logical Volume Manager):"
+  # Check for device-mapper support.
+  if ! grep -wq device-mapper /proc/devices ; then
+    # Try to load a device-mapper kernel module:
+    /sbin/modprobe -q dm-mod
+  fi
+  # Scan for new volume groups:
+  /sbin/vgscan --mknodes --ignorelockingfailure 2> /dev/null
+  if [ $? = 0 ]; then
+    # Make volume groups available to the kernel.
+    # This should also make logical volumes available.
+    /sbin/vgchange -ay --ignorelockingfailure
+  fi
+fi
+
+# Open any volumes created by cryptsetup:
+if [ -f /etc/crypttab -a -x /sbin/cryptsetup.static ]; then
+  # First, check for device-mapper support.
+  if ! grep -wq device-mapper /proc/devices ; then
+    # If device-mapper exists as a module, try to load it.
+    # Try to load a device-mapper kernel module:
+    /sbin/modprobe -q dm-mod
+  fi
+  # NOTE: we only support LUKS formatted volumes (except for swap)!
+  cat /etc/crypttab | grep -v "^#" | grep -v "^$" | while read line; do
+    eval LUKSARRAY=( $line )
+    LUKS="${LUKSARRAY[0]}"
+    DEV="${LUKSARRAY[1]}"
+    PASS="${LUKSARRAY[2]}"
+    OPTS="${LUKSARRAY[3]}"
+    LUKSOPTS=""
+    if echo $OPTS | grep -wq ro ; then LUKSOPTS="${LUKSOPTS} --readonly" ; fi
+
+    # Skip LUKS volumes that were already unlocked (in the initrd):
+    /sbin/cryptsetup.static status $LUKS 1>/dev/null 2>/dev/null && continue
+    if /sbin/cryptsetup.static isLuks $DEV 2>/dev/null ; then
+      echo "Unlocking LUKS crypt volume '${LUKS}' on device '$DEV':"
+      if [ -n "${PASS}" ]; then
+        if [ -f ${PASS} ]; then
+          /sbin/cryptsetup.static ${LUKSOPTS} --key-file=${PASS} luksOpen $DEV $LUKS
+        elif [ "${PASS}" != "none" ]; then
+          # A password field of 'none' indicates a line for swap:
+          echo "${PASS}" | /sbin/cryptsetup.static ${LUKSOPTS} luksOpen $DEV $LUKS
+        fi
+      else
+        for i in seq 1 3 ; do
+          /sbin/cryptsetup.static ${LUKSOPTS} luksOpen $DEV $LUKS </dev/tty0 >/dev/tty0 2>&1
+          [ $? -eq 0 ] && break
+        done
+      fi
+    elif echo $OPTS | grep -wq swap ; then
+      # If any of the volumes is to be used as encrypted swap,
+      # then encrypt it using a random key and run mkswap:
+      echo "Creating encrypted swap on device '$DEV' mapped to '${LUKS}':"
+      /sbin/cryptsetup.static --cipher=aes --key-file=/dev/urandom --key-size=256 create $LUKS $DEV
+      mkswap /dev/mapper/$LUKS
+    fi
+  done
+fi
+
+# Enable swapping:
+/sbin/swapon -a
+
+# Start FUSE, if requested:
+if [ -x /etc/rc.d/rc.fuse ]; then
+  sh /etc/rc.d/rc.fuse start
+fi
+
+# Set the system time from the hardware clock using hwclock --hctosys.
+if [ -x /sbin/hwclock ]; then
+  # Check for a broken motherboard RTC clock (where ioports for rtc are
+  # unknown) to prevent hwclock causing a hang:
+  if ! grep -q -w rtc /proc/ioports ; then
+    CLOCK_OPT="--directisa"
+  fi
+  if grep -wq "^UTC" /etc/hardwareclock ; then
+    echo "Setting system time from the hardware clock (UTC)."
+    /sbin/hwclock $CLOCK_OPT --utc --hctosys
+  else
+    echo "Setting system time from the hardware clock (localtime)."
+    /sbin/hwclock $CLOCK_OPT --localtime --hctosys
+  fi
+fi
+
+# Test to see if the root partition is read-only, like it ought to be.
+READWRITE=no
+if touch /fsrwtestfile 2>/dev/null; then
+  rm -f /fsrwtestfile
+  READWRITE=yes
+else
+  echo "Testing root filesystem status:  read-only filesystem"
+fi
+
+# See if a forced filesystem check was requested at shutdown:
+if [ -r /etc/forcefsck ]; then
+  FORCEFSCK="-f"
+fi
+
+# Check the root filesystem:
+if [ ! $READWRITE = yes ]; then
+  RETVAL=0
+  if [ ! -r /etc/fastboot ]; then
+    echo "Checking root filesystem:"
+    /sbin/fsck $FORCEFSCK -C -a /
+    RETVAL=$?
+  fi
+  # An error code of 2 or higher will require a reboot.
+  if [ $RETVAL -ge 2 ]; then
+    # An error code equal to or greater than 4 means that some errors
+    # could not be corrected.  This requires manual attention, so we
+    # offer a chance to try to fix the problem in single-user mode:
+    if [ $RETVAL -ge 4 ]; then
+      echo
+      echo "***********************************************************"
+      echo "*** An error occurred during the root filesystem check. ***"
+      echo "*** You will now be given a chance to log into the      ***"
+      echo "*** system in single-user mode to fix the problem.      ***"
+      echo "***                                                     ***"
+      echo "*** If you are using the ext2 filesystem, running       ***"
+      echo "*** 'e2fsck -v -y <partition>' might help.              ***"
+      echo "***********************************************************"
+      echo
+      echo "Once you exit the single-user shell, the system will reboot."
+      echo
+      PS1="(Repair filesystem) \#"; export PS1
+      sulogin
+    else # With an error code of 2 or 3, reboot the machine automatically:
+      echo
+      echo "***********************************"
+      echo "*** The filesystem was changed. ***"
+      echo "*** The system will now reboot. ***"
+      echo "***********************************"
+      echo
+    fi
+    echo "Unmounting file systems."
+    /sbin/umount -a -r
+    /sbin/mount -n -o remount,ro /
+    echo "Rebooting system."
+    sleep 2
+    reboot -f
+  fi
+  # Remount the root filesystem in read-write mode
+  echo "Remounting root device with read-write enabled."
+  /sbin/mount -w -v -n -o remount /
+  if [ $? -gt 0 ] ; then
+    echo
+    echo "Attempt to remount root device as read-write failed!  This is going to"
+    echo "cause serious problems."
+    echo 
+    echo "If you're using the UMSDOS filesystem, you **MUST** mount the root partition"
+    echo "read-write!  You can make sure the root filesystem is getting mounted "
+    echo "read-write with the 'rw' flag to Loadlin:"
+    echo
+    echo "loadlin vmlinuz root=/dev/hda1 rw   (replace /dev/hda1 with your root device)"
+    echo
+    echo "Normal bootdisks can be made to mount a system read-write with the rdev command:"
+    echo
+    echo "rdev -R /dev/fd0 0"
+    echo
+    echo "You can also get into your system by using a boot disk with a command like this"
+    echo "on the LILO prompt line:  (change the root partition name as needed)"
+    echo 
+    echo "LILO: mount root=/dev/hda1 rw"
+    echo
+    echo "Please press ENTER to continue, then reboot and use one of the above methods to"
+    echo -n "get into your machine and start looking for the problem. " 
+    read junk; 
+  fi
+else
+  echo "Testing root filesystem status:  read-write filesystem"
+  echo
+  echo "*** ERROR: Root partition has already been mounted read-write. Cannot check!"
+  echo
+  echo "For filesystem checking to work properly, your system must initially mount"
+  echo "the root partition as read only. Please modify your kernel with 'rdev' so that"
+  echo "it does this. If you're booting with LILO, add a line:"
+  echo
+  echo "   read-only"
+  echo
+  echo "to the Linux section in your /etc/lilo.conf and type 'lilo' to reinstall it."
+  echo
+  echo "If you boot from a kernel on a floppy disk, put it in the drive and type:"
+  echo "   rdev -R /dev/fd0 1"
+  echo
+  echo "If you boot from a bootdisk, or with Loadlin, you can add the 'ro' flag."
+  echo
+  echo "This will fix the problem *AND* eliminate this annoying message. :^)"
+  echo
+  echo -n "Press ENTER to continue. "
+  read junk;
+fi # Done checking root filesystem
+
+# Any /etc/mtab that exists here is old, so we delete it to start over:
+/bin/rm -f /etc/mtab*
+# Remounting the / partition will initialize the new /etc/mtab:
+/sbin/mount -w -o remount /
+
+# Read in the correct / filesystem complete with arguments so mount will
+# show them correctly. This does not stop those arguments from functioning
+# but does prevent a small bug with /etc/mtab.
+/bin/grep ' / ' /proc/mounts | grep -v "^rootfs" > /etc/mtab
+
+# Fix /etc/mtab to list sys and proc if they were not yet entered in
+# /etc/mtab because / was still mounted read-only:
+if [ -d /proc/sys ]; then
+  /sbin/mount -f proc /proc -t proc
+fi
+if [ -d /sys/bus ]; then
+  /sbin/mount -f sysfs /sys -t sysfs
+fi
+
+# Configure ISA Plug-and-Play devices:
+if [ -r /etc/isapnp.conf ]; then
+  if [ -x /sbin/isapnp ]; then
+    /sbin/isapnp /etc/isapnp.conf
+  fi
+fi
+
+# This loads any kernel modules that are needed.  These might be required to
+# use your ethernet card, sound card, or other optional hardware.
+# Priority is given first to a script named "rc.modules.local", then
+# to "rc.modules-$FULL_KERNEL_VERSION", and finally to the plain "rc.modules".
+# Note that if /etc/rc.d/rc.modules.local is found, then that will be the ONLY
+# rc.modules script the machine will run, so make sure it has everything in
+# it that you need.
+if [ -x /etc/rc.d/rc.modules.local -a -r /proc/modules ]; then
+  echo "Running /etc/rc.d/rc.modules.local:"
+  /bin/sh /etc/rc.d/rc.modules.local
+elif [ -x /etc/rc.d/rc.modules-$(uname -r) -a -r /proc/modules ]; then
+  echo "Running /etc/rc.d/rc.modules-$(uname -r):"
+  . /etc/rc.d/rc.modules-$(uname -r)
+elif [ -x /etc/rc.d/rc.modules -a -r /proc/modules -a -L /etc/rc.d/rc.modules ]; then
+  echo "Running /etc/rc.d/rc.modules -> $(readlink /etc/rc.d/rc.modules):"
+  . /etc/rc.d/rc.modules
+elif [ -x /etc/rc.d/rc.modules -a -r /proc/modules ]; then
+  echo "Running /etc/rc.d/rc.modules:"
+  . /etc/rc.d/rc.modules
+fi
+
+# Configure runtime kernel parameters:
+if [ -x /sbin/sysctl -a -r /etc/sysctl.conf ]; then
+  /sbin/sysctl -e -p /etc/sysctl.conf
+fi
+
+# Check all the non-root filesystems:
+if [ ! -r /etc/fastboot ]; then
+  echo "Checking non-root filesystems:"
+  /sbin/fsck $FORCEFSCK -C -R -A -a
+fi
+
+# Mount usbfs:
+if grep -wq usbfs /proc/filesystems; then
+  if ! grep -wq usbfs /proc/mounts ; then
+    if ! grep -wq usbfs /etc/fstab; then
+      /sbin/mount -v usbfs /proc/bus/usb -t usbfs
+    else
+      /sbin/mount -v /proc/bus/usb
+    fi
+  fi
+fi
+
+# Mount non-root file systems in fstab, but not NFS or SMB 
+# because TCP/IP is not yet configured, and not proc or sysfs
+# because those have already been mounted.  Also check that
+# devpts is not already mounted before attempting to mount
+# it.  With a 2.6.x or newer kernel udev mounts devpts.
+# We also need to wait a little bit to let USB and other
+# hotplugged devices settle (sorry to slow down the boot):
+echo "Mounting non-root local filesystems:"
+sleep 3
+if /bin/grep -wq devpts /proc/mounts ; then
+  /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts
+else
+  /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs
+fi
+
+# Enable swapping again.  This is needed in case a swapfile is used,
+# as it can't be enabled until the filesystem it resides on has been
+# mounted read-write.
+/sbin/swapon -a
+
+# Clean up some temporary files:
+rm -f /var/run/* /var/run/*/* /var/run/*/*/* /etc/nologin \
+  /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \
+  /var/state/saslauthd/saslauthd.pid \
+  /tmp/.Xauth* 1> /dev/null 2> /dev/null
+  ( cd /var/log/setup/tmp && rm -rf * )
+  ( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* )
+
+# Create /tmp/{.ICE-unix,.X11-unix} if they are not present:
+if [ ! -e /tmp/.ICE-unix ]; then
+  mkdir -p /tmp/.ICE-unix
+  chmod 1777 /tmp/.ICE-unix
+fi
+if [ ! -e /tmp/.X11-unix ]; then
+  mkdir -p /tmp/.X11-unix
+  chmod 1777 /tmp/.X11-unix
+fi
+
+# Create a fresh utmp file:
+touch /var/run/utmp
+chown root:utmp /var/run/utmp
+chmod 664 /var/run/utmp
+
+# Update the current kernel level in the /etc/motd (Message Of The Day) file,
+# if the first line of that file begins with the word 'Linux'.
+# You are free to modify the rest of the file as you see fit.
+if [ -x /bin/sed ]; then
+  /bin/sed -i "{1s/^Linux.*/$(/bin/uname -sr)\./}" /etc/motd
+fi
+
+# If there are SystemV init scripts for this runlevel, run them.
+if [ -x /etc/rc.d/rc.sysvinit ]; then
+  . /etc/rc.d/rc.sysvinit
+fi
+
+# Run serial port setup script:
+# CAREFUL!  This can make some systems hang if the rc.serial script isn't
+# set up correctly.  If this happens, you may have to edit the file from a
+# boot disk, and/or set it as non-executable:
+if [ -x /etc/rc.d/rc.serial ]; then
+  sh /etc/rc.d/rc.serial start
+fi
+
+# Carry an entropy pool between reboots to improve randomness.
+if [ -f /etc/random-seed ]; then
+  echo "Using /etc/random-seed to initialize /dev/urandom."
+  cat /etc/random-seed > /dev/urandom
+fi
+# Use the pool size from /proc, or 512 bytes:
+if [ -r /proc/sys/kernel/random/poolsize ]; then
+  dd if=/dev/urandom of=/etc/random-seed count=1 bs=$(cat /proc/sys/kernel/random/poolsize) 2> /dev/null
+else
+  dd if=/dev/urandom of=/etc/random-seed count=1 bs=512 2> /dev/null
+fi
+chmod 600 /etc/random-seed
+
diff --git a/source/a/sysvinit-scripts/scripts/rc.local b/source/a/sysvinit-scripts/scripts/rc.local
new file mode 100644
index 000000000..65b358bbf
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/rc.local
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# /etc/rc.d/rc.local:  Local system initialization script.
+#
+# Put any local startup commands in here.  Also, if you have
+# anything that needs to be run at shutdown time you can
+# make an /etc/rc.d/rc.local_shutdown script and put those
+# commands in there.
+
diff --git a/source/a/sysvinit-scripts/scripts/rc.sysvinit b/source/a/sysvinit-scripts/scripts/rc.sysvinit
new file mode 100644
index 000000000..916e59ee4
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/rc.sysvinit
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# rc.sysvinit   This file provides basic compatibility with SystemV style
+#               startup scripts.  The SystemV style init system places 
+#               start/stop scripts for each runlevel into directories such as
+#               /etc/rc.d/rc3.d/ (for runlevel 3) instead of starting them
+#               from /etc/rc.d/rc.M.  This makes for a lot more init scripts,
+#               and a more complicated execution path to follow through if
+#               something goes wrong.  For this reason, Slackware has always
+#               used the traditional BSD style init script layout.
+#
+#               However, many binary packages exist that install SystemV
+#               init scripts.  With rc.sysvinit in place, most well-written
+#               startup scripts will work.  This is primarily intended to
+#               support commercial software, though, and probably shouldn't
+#               be considered bug free.
+#
+#               Written by Patrick Volkerding <volkerdi@slackware.com>, 1999
+#               from an example by Miquel van Smoorenburg <miquels@cistron.nl>.
+
+# Run an init script:
+startup() {
+  case "$1" in
+  *.sh)
+    sh "$@"
+    ;;
+  *)
+    "$@"
+    ;;
+  esac
+}
+
+# Set onlcr to avoid staircase effect.
+stty onlcr 0>&1
+
+if [ "$runlevel" = "" ]; then
+  runlevel=$RUNLEVEL
+  export runlevel
+  prevlevel=$PREVLEVEL
+  export prevlevel
+fi
+
+# Run kill scripts in the previous runlevel if not "none"
+if [ ! "$prevlevel" = "N" ]; then
+  for script in /etc/rc.d/rc$prevlevel.d/K* ; do
+    if [ -x $script ]; then
+      startup $script stop
+    fi
+  done
+fi
+
+# Now do the startup scripts:
+for script in /etc/rc.d/rc$runlevel.d/S* ; do
+  if [ -x $script ]; then
+    startup $script start
+  fi
+done
+
diff --git a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh
new file mode 100644
index 000000000..4378e208a
--- /dev/null
+++ b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh
@@ -0,0 +1,558 @@
+#!/bin/bash
+# Skript to rescan SCSI bus, using the 
+# scsi add-single-device mechanism
+# (c) 1998--2008 Kurt Garloff <kurt@garloff.de>, GNU GPL v2 or later
+# (c) 2006--2008 Hannes Reinecke, GNU GPL v2 or later
+# $Id: rescan-scsi-bus.sh,v 1.29 2008/10/29 10:03:04 garloff Exp $
+
+setcolor ()
+{
+  red="\e[0;31m"
+  green="\e[0;32m"
+  yellow="\e[0;33m"
+  bold="\e[0;1m"
+  norm="\e[0;0m"
+}
+
+unsetcolor () 
+{
+  red=""; green=""
+  yellow=""; norm=""
+}
+
+# Return hosts. sysfs must be mounted
+findhosts_26 ()
+{
+  hosts=
+  if ! ls /sys/class/scsi_host/host* >/dev/null 2>&1; then
+    echo "No SCSI host adapters found in sysfs"
+    exit 1;
+  fi 
+  for hostdir in /sys/class/scsi_host/host*; do
+    hostno=${hostdir#/sys/class/scsi_host/host}
+    if [ -f $hostdir/isp_name ] ; then
+	hostname="qla2xxx"
+    elif [ -f $hostdir/lpfc_drvr_version ] ; then
+	hostname="lpfc"
+    else
+        hostname=`cat $hostdir/proc_name`
+    fi
+    hosts="$hosts $hostno"
+    echo "Host adapter $hostno ($hostname) found."
+  done
+  hosts=`echo $hosts | sed 's/ /\n/g' | sort -n`
+}
+
+# Return hosts. /proc/scsi/HOSTADAPTER/? must exist
+findhosts ()
+{
+  hosts=
+  for driverdir in /proc/scsi/*; do
+    driver=${driverdir#/proc/scsi/}
+    if test $driver = scsi -o $driver = sg -o $driver = dummy -o $driver = device_info; then continue; fi
+    for hostdir in $driverdir/*; do
+      name=${hostdir#/proc/scsi/*/}
+      if test $name = add_map -o $name = map -o $name = mod_parm; then continue; fi
+      num=$name
+      driverinfo=$driver
+      if test -r $hostdir/status; then
+	num=$(printf '%d\n' `sed -n 's/SCSI host number://p' $hostdir/status`)
+	driverinfo="$driver:$name"
+      fi
+      hosts="$hosts $num"
+      echo "Host adapter $num ($driverinfo) found."
+    done
+  done
+}
+
+# Get /proc/scsi/scsi info for device $host:$channel:$id:$lun
+# Optional parameter: Number of lines after first (default = 2), 
+# result in SCSISTR, return code 1 means empty.
+procscsiscsi ()
+{  
+  if test -z "$1"; then LN=2; else LN=$1; fi
+  CHANNEL=`printf "%02i" $channel`
+  ID=`printf "%02i" $id`
+  LUN=`printf "%02i" $lun`
+  if [ -d /sys/class/scsi_device ]; then
+      SCSIPATH="/sys/class/scsi_device/${host}:${channel}:${id}:${lun}"
+      if [ -d  "$SCSIPATH" ] ; then
+	  SCSISTR="Host: scsi${host} Channel: $CHANNEL Id: $ID Lun: $LUN"
+	  if [ "$LN" -gt 0 ] ; then
+	      IVEND=$(cat ${SCSIPATH}/device/vendor)
+	      IPROD=$(cat ${SCSIPATH}/device/model)
+	      IPREV=$(cat ${SCSIPATH}/device/rev)
+	      SCSIDEV=$(printf '  Vendor: %-08s Model: %-16s Rev: %-4s' "$IVEND" "$IPROD" "$IPREV")
+	      SCSISTR="$SCSISTR
+$SCSIDEV"
+	  fi
+	  if [ "$LN" -gt 1 ] ; then
+	      ILVL=$(cat ${SCSIPATH}/device/scsi_level)
+	      type=$(cat ${SCSIPATH}/device/type)
+	      case "$type" in
+		  0) ITYPE="Direct-Access    " ;;
+		  1) ITYPE="Sequential-Access" ;;
+		  2) ITYPE="Printer          " ;;
+		  3) ITYPE="Processor        " ;;
+		  4) ITYPE="WORM             " ;;
+		  5) ITYPE="CD-ROM           " ;;
+		  6) ITYPE="Scanner          " ;;
+		  7) ITYPE="Optical Device   " ;;
+		  8) ITYPE="Medium Changer   " ;;
+		  9) ITYPE="Communications   " ;;
+		  10) ITYPE="Unknown          " ;;
+		  11) ITYPE="Unknown          " ;;
+		  12) ITYPE="RAID             " ;;
+		  13) ITYPE="Enclosure        " ;;
+		  14) ITYPE="Direct-Access-RBC" ;;
+		  *) ITYPE="Unknown          " ;;
+	      esac
+	      SCSITMP=$(printf '  Type:   %-16s                ANSI SCSI revision: %02d' "$ITYPE" "$((ILVL - 1))")
+	      SCSISTR="$SCSISTR
+$SCSITMP"
+	  fi
+	      
+      else
+	  return 1
+      fi
+  else
+      grepstr="scsi$host Channel: $CHANNEL Id: $ID Lun: $LUN"
+      SCSISTR=`cat /proc/scsi/scsi | grep -A$LN -e"$grepstr"`
+  fi
+  if test -z "$SCSISTR"; then return 1; else return 0; fi
+}
+
+# Find sg device with 2.6 sysfs support
+sgdevice26 ()
+{
+  if test -e /sys/class/scsi_device/$host\:$channel\:$id\:$lun/device/generic; then	
+    SGDEV=`readlink /sys/class/scsi_device/$host\:$channel\:$id\:$lun/device/generic`
+    SGDEV=`basename $SGDEV`
+  else
+    for SGDEV in /sys/class/scsi_generic/sg*; do
+      DEV=`readlink $SGDEV/device`
+      if test "${DEV##*/}" = "$host:$channel:$id:$lun"; then
+	SGDEV=`basename $SGDEV`; return
+      fi
+    done
+    SGDEV=""
+  fi  
+}
+
+# Find sg device with 2.4 report-devs extensions
+sgdevice24 ()
+{
+  if procscsiscsi 3; then
+    SGDEV=`echo "$SCSISTR" | grep 'Attached drivers:' | sed 's/^ *Attached drivers: \(sg[0-9]*\).*/\1/'`
+  fi
+}
+
+# Find sg device that belongs to SCSI device $host $channel $id $lun
+sgdevice ()
+{
+  SGDEV=
+  if test -d /sys/class/scsi_device; then
+    sgdevice26
+  else  
+    DRV=`grep 'Attached drivers:' /proc/scsi/scsi 2>/dev/null`
+    repdevstat=$((1-$?))
+    if [ $repdevstat = 0 ]; then
+      echo "scsi report-devs 1" >/proc/scsi/scsi
+      DRV=`grep 'Attached drivers:' /proc/scsi/scsi 2>/dev/null`
+      if [ $? = 1 ]; then return; fi
+    fi
+    if ! `echo $DRV | grep 'drivers: sg' >/dev/null`; then
+      modprobe sg
+    fi
+    sgdevice24
+    if [ $repdevstat = 0 ]; then
+      echo "scsi report-devs 0" >/proc/scsi/scsi
+    fi
+  fi
+}       
+
+# Test if SCSI device is still responding to commands
+testonline ()
+{
+  : testonline
+  if test ! -x /usr/bin/sg_turs; then return 0; fi
+  sgdevice
+  if test -z "$SGDEV"; then return 0; fi
+  sg_turs /dev/$SGDEV >/dev/null 2>&1
+  RC=$?
+  # echo -e "\e[A\e[A\e[A${yellow}Test existence of $SGDEV = $RC ${norm} \n\n\n"
+  if test $RC = 1; then return $RC; fi
+  # OK, device online, compare INQUIRY string
+  INQ=`sg_inq $sg_len_arg /dev/$SGDEV`
+  IVEND=`echo "$INQ" | grep 'Vendor identification:' | sed 's/^[^:]*: \(.*\)$/\1/'`
+  IPROD=`echo "$INQ" | grep 'Product identification:' | sed 's/^[^:]*: \(.*\)$/\1/'`
+  IPREV=`echo "$INQ" | grep 'Product revision level:' | sed 's/^[^:]*: \(.*\)$/\1/'`
+  STR=`printf "  Vendor: %-08s Model: %-16s Rev: %-4s" "$IVEND" "$IPROD" "$IPREV"`
+  IPTYPE=`echo "$INQ" | sed -n 's/.* Device_type=\([0-9]*\) .*/\1/p'`
+  IPQUAL=`echo "$INQ" | sed -n 's/ *PQual=\([0-9]*\)  Device.*/\1/p'`
+  if [ "$IPQUAL" != 0 ] ; then
+    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nLU not available (PQual $IPQUAL)${norm}\n\n\n"
+    return 1
+  fi
+
+  procscsiscsi
+  TMPSTR=`echo "$SCSISTR" | grep 'Vendor:'`
+  if [ "$TMPSTR" != "$STR" ]; then
+    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR#* } \nto: $STR ${norm}\n\n\n"
+    return 1
+  fi
+  TMPSTR=`echo "$SCSISTR" | sed -n 's/.*Type: *\(.*\) *ANSI.*/\1/p'`
+  if [ $TMPSTR != $TYPE ] ; then
+     echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR} \nto: $TYPE ${norm}\n\n\n"
+     return 1
+  fi  
+  return $RC
+}
+
+# Test if SCSI device $host $channen $id $lun exists
+# Outputs description from /proc/scsi/scsi, returns SCSISTR 
+testexist ()
+{
+  : testexist
+  SCSISTR=
+  if procscsiscsi; then
+    echo "$SCSISTR" | head -n1
+    echo "$SCSISTR" | tail -n2 | pr -o4 -l1
+  fi
+}
+
+# Returns the list of existing channels per host
+chanlist ()
+{
+  local hcil
+  local cil
+  local chan
+  local tmpchan
+
+  for dev in /sys/class/scsi_device/${host}:* ; do
+    hcil=${dev##*/}
+    cil=${hcil#*:}
+    chan=${cil%%:*}
+    for tmpchan in $channelsearch ; do
+      if test "$chan" -eq $tmpchan ; then
+	chan=
+      fi
+    done
+    if test -n "$chan" ; then
+      channelsearch="$channelsearch $chan"
+    fi
+  done
+}
+
+# Returns the list of existing targets per host
+idlist ()
+{
+  local hcil
+  local cil
+  local il
+  local target
+  local tmpid
+
+  for dev in /sys/class/scsi_device/${host}:${channel}:* ; do
+    hcil=${dev##*/}
+    cil=${hcil#*:}
+    il=${cil#*:}
+    target=${il%%:*}
+    for tmpid in $idsearch ; do
+      if test "$target" -eq $tmpid ; then
+	target=
+      fi
+    done
+    if test -n "$target" ; then
+      idsearch="$idsearch $target"
+    fi
+  done
+}
+
+# Returns the list of existing LUNs
+getluns ()
+{
+  if test ! -x /usr/bin/sg_luns; then return; fi
+  sgdevice
+  if test -z "$SGDEV"; then return; fi
+  sg_luns -d /dev/$SGDEV | sed -n 's/.*lun=\(.*\)/\1/p'
+}
+
+# Perform scan on a single lun
+dolunscan()
+{
+  SCSISTR=
+  devnr="$host $channel $id $lun"
+  echo "Scanning for device $devnr ..."
+  printf "${yellow}OLD: $norm"
+  testexist
+  : f $remove s $SCSISTR
+  if test "$remove" -a "$SCSISTR"; then
+    # Device exists: Test whether it's still online
+    # (testonline returns 1 if it's gone or has changed)
+    testonline
+    if test $? = 1 -o ! -z "$forceremove"; then
+      echo -en "\r\e[A\e[A\e[A${red}REM: "
+      echo "$SCSISTR" | head -n1
+      echo -e "${norm}\e[B\e[B"
+      if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then
+        echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/delete
+        # Try reading, should fail if device is gone
+        echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan
+      else
+        echo "scsi remove-single-device $devnr" > /proc/scsi/scsi
+        # Try reading, should fail if device is gone
+        echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+      fi
+    fi
+    if test $RC = 0 ; then
+      if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then
+        echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/rescan
+      fi
+    fi
+
+    printf "\r\x1b[A\x1b[A\x1b[A${yellow}OLD: $norm"
+    testexist
+    if test -z "$SCSISTR"; then
+      printf "\r${red}DEL: $norm\r\n\n"
+      let rmvd+=1;
+    fi
+  fi
+  if test -z "$SCSISTR"; then
+    # Device does not exist, try to add
+    printf "\r${green}NEW: $norm"
+    if test -e /sys/class/scsi_host/host${host}/scan; then
+      echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null
+    else
+      echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+    fi
+    testexist
+    if test -z "$SCSISTR"; then
+      # Device not present
+      printf "\r\x1b[A";
+      # Optimization: if lun==0, stop here (only if in non-remove mode)
+      if test $lun = 0 -a -z "$remove" -a $optscan = 1; then 
+        break;
+      fi
+    else 
+      let found+=1; 
+    fi
+  fi
+}
+
+# Perform report lun scan
+doreportlun()
+{
+  lun=0
+  SCSISTR=
+  devnr="$host $channel $id $lun"
+  echo "Scanning for device $devnr ..."
+  printf "${yellow}OLD: $norm"
+  testexist
+  if test -z "$SCSISTR"; then
+    # Device does not exist, try to add
+    printf "\r${green}NEW: $norm"
+    if test -e /sys/class/scsi_host/host${host}/scan; then
+      echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null
+    else
+      echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+    fi
+    testexist
+    if test -z "$SCSISTR"; then
+      # Device not present
+      printf "\r\x1b[A";
+      lunsearch=
+      return
+    fi
+  fi
+  lunsearch=`getluns`
+  lunremove=
+  # Check existing luns
+  for dev in /sys/class/scsi_device/$host\:$channel\:$id\:*; do
+    lun=${dev##*:}
+    newsearch=
+    oldsearch="$lunsearch"
+    for tmplun in $lunsearch; do
+      if test $tmplun -eq $lun ; then
+	# Optimization: don't scan lun 0 again
+	if [ $lun -ne 0 ]; then
+	  dolunscan
+	fi
+      else
+	newsearch="$newsearch $tmplun"
+      fi
+    done
+    if [ "${#oldsearch}" = "${#newsearch}" ] ; then
+	# Stale lun
+	lunremove="$lunremove $lun"
+    fi
+    lunsearch="$newsearch"
+  done
+  # Add new ones and check stale ones
+  for lun in $lunsearch $lunremove; do
+    dolunscan
+  done
+}
+  
+# Perform search (scan $host)
+dosearch ()
+{
+  if test -z "$channelsearch" ; then
+    chanlist
+  fi
+  for channel in $channelsearch; do
+    if test -z "$idsearch" ; then
+      idlist
+    fi
+    for id in $idsearch; do
+      if test -z "$lunsearch"; then
+	doreportlun
+      else
+	for lun in $lunsearch; do
+          dolunscan
+        done
+      fi
+    done
+  done
+}
+ 
+# main
+if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then
+    echo "Usage: rescan-scsi-bus.sh [options] [host [host ...]]"
+    echo "Options:"
+    echo " -l      activates scanning for LUNs 0-7    [default: 0]"
+    echo " -L NUM  activates scanning for LUNs 0--NUM [default: 0]"
+    echo " -w      scan for target device IDs 0 .. 15 [default: 0-7]"
+    echo " -c      enables scanning of channels 0 1   [default: 0]"
+    echo " -r      enables removing of devices        [default: disabled]"
+    echo " -i      issue a FibreChannel LIP reset     [default: disabled]"
+    echo "--remove:        same as -r"
+    echo "--issue-lip:     same as -i"
+    echo "--forceremove:   Remove and readd every device (DANGEROUS)"
+    echo "--nooptscan:     don't stop looking for LUNs is 0 is not found"
+    echo "--color:         use coloured prefixes OLD/NEW/DEL"
+    echo "--hosts=LIST:    Scan only host(s) in LIST"
+    echo "--channels=LIST: Scan only channel(s) in LIST"
+    echo "--ids=LIST:      Scan only target ID(s) in LIST"
+    echo "--luns=LIST:     Scan only lun(s) in LIST"  
+    echo " Host numbers may thus be specified either directly on cmd line (deprecated) or"
+    echo " or with the --hosts=LIST parameter (recommended)."
+    echo "LIST: A[-B][,C[-D]]... is a comma separated list of single values and ranges"
+    echo " (No spaces allowed.)"
+    exit 0
+fi
+
+expandlist ()
+{
+    list=$1
+    result=""
+    first=${list%%,*}
+    rest=${list#*,}
+    while test ! -z "$first"; do 
+	beg=${first%%-*};
+	if test "$beg" = "$first"; then
+	    result="$result $beg";
+    	else
+    	    end=${first#*-}
+	    result="$result `seq $beg $end`"
+	fi
+	test "$rest" = "$first" && rest=""
+	first=${rest%%,*}
+	rest=${rest#*,}
+    done
+    echo $result
+}
+
+if test ! -d /sys/class/scsi_host/ -a ! -d /proc/scsi/; then
+  echo "Error: SCSI subsystem not active"
+  exit 1
+fi	
+
+# Make sure sg is there
+modprobe sg >/dev/null 2>&1
+
+sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3)
+sg_version=${sg_version##0.}
+if [ "$sg_version" -lt 70 ] ; then
+    sg_len_arg="-36"
+else
+    sg_len_arg="--len=36"
+fi
+
+# defaults
+unsetcolor
+lunsearch=""
+idsearch=`seq 0 7`
+channelsearch="0"
+remove=
+forceremove=
+optscan=1
+if test -d /sys/class/scsi_host; then 
+  findhosts_26
+else  
+  findhosts
+fi  
+
+# Scan options
+opt="$1"
+while test ! -z "$opt" -a -z "${opt##-*}"; do
+  opt=${opt#-}
+  case "$opt" in
+    l) lunsearch=`seq 0 7` ;;
+    L) lunsearch=`seq 0 $2`; shift ;;
+    w) idsearch=`seq 0 15` ;;
+    c) channelsearch="0 1" ;;
+    r) remove=1 ;;
+    i) lipreset=1 ;;
+    -remove)      remove=1 ;;
+    -forceremove) remove=1; forceremove=1 ;;
+    -hosts=*)     arg=${opt#-hosts=};   hosts=`expandlist $arg` ;;
+    -channels=*)  arg=${opt#-channels=};channelsearch=`expandlist $arg` ;; 
+    -ids=*)   arg=${opt#-ids=};         idsearch=`expandlist $arg` ;; 
+    -luns=*)  arg=${opt#-luns=};        lunsearch=`expandlist $arg` ;; 
+    -color) setcolor ;;
+    -nooptscan) optscan=0 ;;
+    -issue-lip) lipreset=1 ;;
+    *) echo "Unknown option -$opt !" ;;
+  esac
+  shift
+  opt="$1"
+done    
+
+# Hosts given ?
+if test "@$1" != "@"; then 
+  hosts=$*; 
+fi
+
+echo "Scanning SCSI subsystem for new devices"
+test -z "$remove" || echo " and remove devices that have disappeared"
+declare -i found=0
+declare -i rmvd=0
+for host in $hosts; do
+  echo -n "Scanning host $host "
+  if test -e /sys/class/fc_host/host$host ; then
+    # It's pointless to do a target scan on FC
+    if test -n "$lipreset" ; then
+      echo 1 > /sys/class/fc_host/host$host/issue_lip 2> /dev/null;
+      echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null;
+    fi
+    channelsearch=""
+    idsearch=""
+  fi
+  [ -n "$channelsearch" ] && echo -n "channels $channelsearch "
+  echo -n "for "
+  if [ -n "$idsearch" ] ; then
+      echo -n " SCSI target IDs " $idsearch
+  else
+      echo -n " all SCSI target IDs"
+  fi
+  if [ -n "$lunsearch" ] ; then
+      echo ", LUNs " $lunsearch
+  else
+      echo ", all LUNs"
+  fi
+  dosearch; 
+done
+echo "$found new device(s) found.               "
+echo "$rmvd device(s) removed.                 "
+
diff --git a/source/a/sysvinit-scripts/slack-desc b/source/a/sysvinit-scripts/slack-desc
new file mode 100644
index 000000000..95fff611e
--- /dev/null
+++ b/source/a/sysvinit-scripts/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------------------------------------------------------|
+sysvinit-scripts: sysvinit-scripts (the basic scripts used to boot your machine)
+sysvinit-scripts:
+sysvinit-scripts: These are the Slackware boot scripts, which are needed to start the
+sysvinit-scripts: machine.  Sysvinit looks for these in /etc/rc.d/.
+sysvinit-scripts:
+sysvinit-scripts:
+sysvinit-scripts:
+sysvinit-scripts:
+sysvinit-scripts:
+sysvinit-scripts:
+sysvinit-scripts:
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
new file mode 100755
index 000000000..4b9eba043
--- /dev/null
+++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+# Copyright 2005-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:-1.2}
+ARCH=noarch
+BUILD=${BUILD:-30}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sysvinit-scripts
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Install Slackware scripts and config files from $CWD/scripts/:
+mkdir -p $PKG/etc/rc.d
+for file in rc.{4,6,K,M,S} rc.local rc.sysvinit ; do
+  cp -a $CWD/scripts/$file $PKG/etc/rc.d/${file}.new
+  chmod 755 $PKG/etc/rc.d/${file}.new
+  chown root:root $PKG/etc/rc.d/${file}.new
+done
+cat $CWD/scripts/inittab > $PKG/etc/inittab.new
+chmod 644 $PKG/etc/inittab.new
+chown root:root $PKG/etc/inittab.new
+
+# Add a very handy tool for scanning new SCSI devices.  Most useful for
+# finding new USB and Firewire storage devices which show up as SCSI.
+mkdir -p $PKG/sbin
+cat $CWD/scripts/rescan-scsi-bus.sh > $PKG/sbin/rescan-scsi-bus
+chmod 755 $PKG/sbin/rescan-scsi-bus
+chown root:root $PKG/sbin/rescan-scsi-bus
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/sysvinit-scripts-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/sysvinit/doinst.sh b/source/a/sysvinit/doinst.sh
new file mode 100644
index 000000000..0e476e119
--- /dev/null
+++ b/source/a/sysvinit/doinst.sh
@@ -0,0 +1,48 @@
+
+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...
+}
+# RH functions:
+#config etc/rc.d/init.d/halt.new
+#config etc/rc.d/init.d/killall.new
+#config etc/rc.d/init.d/netfs.new
+#config etc/rc.d/init.d/network.new
+#config etc/rc.d/init.d/single.new
+
+if [ -r sbin/init ]; then
+  mv sbin/init sbin/init.old
+fi
+
+mv sbin/init.new sbin/init
+
+# Add a btmp file to store login failure if one doesn't exist:
+if [ ! -r var/log/btmp ]; then
+  ( cd var/log ; umask 077 ; touch btmp )
+fi
+
+# Notice we use an absolute path below, rather than usr/bin/last.  This is because
+# we're testing to see if we are on the bootdisk, which will not have /usr/bin/last.
+# If we aren't, we will signal init to restart using the new binary.
+# The presence of "/etc/slack-installer" is under consideration as a better test.
+if [ -x /usr/bin/last -a ! -r /etc/slack-installer ]; then
+  /sbin/init u
+fi
+
+( cd sbin ; rm -rf telinit )
+( cd sbin ; ln -sf  init telinit )
+( cd sbin ; rm -rf reboot )
+( cd sbin ; ln -sf  halt reboot )
+( cd sbin ; rm -rf pidof )
+( cd sbin ; ln -sf killall5 pidof )
+( cd sbin ; rm -rf poweroff )
+( cd sbin ; ln -sf halt poweroff )
+
+rm -f sbin/init.old
diff --git a/source/a/sysvinit/slack-desc b/source/a/sysvinit/slack-desc
new file mode 100644
index 000000000..5fc2652c1
--- /dev/null
+++ b/source/a/sysvinit/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------------------------------------------------------|
+sysvinit: sysvinit (init, the parent of all processes)
+sysvinit:
+sysvinit: System V style init programs by Miquel van Smoorenburg that control
+sysvinit: the booting and shutdown of your system.  These support a number of
+sysvinit: system runlevels, each with a specific set of utilities spawned.
+sysvinit: For example, the normal system runlevel is 3, which starts agetty
+sysvinit: on virtual consoles tty1 - tty6.  Runlevel 4 starts xdm.
+sysvinit: Runlevel 0 shuts the system down.
+sysvinit:
+sysvinit:
+sysvinit:
diff --git a/source/a/sysvinit/sysvinit-2.86-timeval.patch b/source/a/sysvinit/sysvinit-2.86-timeval.patch
new file mode 100644
index 000000000..acb0d5b68
--- /dev/null
+++ b/source/a/sysvinit/sysvinit-2.86-timeval.patch
@@ -0,0 +1,42 @@
+--- sysvinit-2.86/src/utmp.c.timeval	1999-06-09 07:11:33.000000000 -0400
++++ sysvinit-2.86/src/utmp.c	2006-08-09 19:46:26.000000000 -0400
+@@ -47,7 +47,8 @@
+ 	int fd;
+ 	struct utmp utmp;
+ 	struct utsname uname_buf;
+-
++	struct timeval tv;
++	
+ 	/*
+ 	 *	Try to open the wtmp file. Note that we even try
+ 	 *	this if we have updwtmp() so we can see if the
+@@ -76,7 +77,9 @@
+ 	 */
+ 	memset(&utmp, 0, sizeof(utmp));
+ #if defined(__GLIBC__)
+-	gettimeofday(&utmp.ut_tv, NULL);
++	gettimeofday(&tv, NULL);
++	utmp.ut_tv.tv_sec = tv.tv_sec;
++	utmp.ut_tv.tv_usec = tv.tv_usec;
+ #else
+ 	time(&utmp.ut_time);
+ #endif
+@@ -113,6 +116,7 @@
+ 	struct utmp utmp;
+ 	struct utmp tmp;
+ 	struct utmp *utmptr;
++	struct timeval tv;
+ 
+ 	/*
+ 	 *	Can't do much if UTMP_FILE is not present.
+@@ -144,7 +148,9 @@
+ 	utmp.ut_pid = pid;
+ 	strncpy(utmp.ut_id, id, sizeof(utmp.ut_id));
+ #if defined(__GLIBC__)
+-	gettimeofday(&utmp.ut_tv, NULL);
++	gettimeofday(&tv, NULL);
++	utmp.ut_tv.tv_sec = tv.tv_sec;
++	utmp.ut_tv.tv_usec = tv.tv_usec;
+ #else
+ 	time(&utmp.ut_time);
+ #endif
diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild
new file mode 100755
index 000000000..4916e695e
--- /dev/null
+++ b/source/a/sysvinit/sysvinit.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+# Copyright 2005-2009  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.
+
+
+VERSION=${VERSION:-2.86}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sysvinit
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf sysvinit-$VERSION
+tar xzvf $CWD/sysvinit-$VERSION.tar.gz || exit 1
+cd sysvinit-$VERSION
+chown -R root:root .
+zcat $CWD/sysvinit.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1
+zcat $CWD/sysvinit.pidof.rhforkseverything.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1
+if [ "$ARCH" = "x86_64" ]; then
+  # Don't overwrite ut_addr_v6 in utmp records on 64-bit platforms
+  zcat $CWD/sysvinit-2.86-timeval.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1
+fi
+
+cd doc
+mkdir -p $PKG/usr/doc/sysvinit-$VERSION
+cp -a Install Propaganda sysvinit-$VERSION.lsm \
+  $PKG/usr/doc/sysvinit-$VERSION
+chmod -R 644 $PKG/usr/doc/sysvinit-$VERSION/*
+chmod 755 $PKG/usr/doc/sysvinit-$VERSION
+
+cd ../src
+if [ "$ARCH" = "x86_64" ]; then
+  # static 'init' segfaults, so your computer never reaches command prompt:
+  sed -i -e "s/-static//" Makefile
+fi
+make clobber
+make || exit 1
+
+mkdir -p $PKG/sbin
+for program in bootlogd halt init killall5 shutdown runlevel ; do
+  strip --strip-unneeded $program
+  cat $program > $PKG/sbin/$program
+  chmod 755 $PKG/sbin/$program
+  chown root:root $PKG/sbin/$program
+done
+mkdir -p $PKG/usr/bin
+for program in last mountpoint ; do
+  strip --strip-unneeded $program
+  cat $program > $PKG/usr/bin/$program
+  chmod 755 $PKG/usr/bin/$program
+  chown root:root $PKG/usr/bin/$program
+done
+( cd $PKG/usr/bin ; ln -sf last lastb )
+mv $PKG/sbin/init $PKG/sbin/init.new
+chmod 755 $PKG/sbin/init.new
+chown root:root $PKG/sbin/init.new
+
+# This version is old.  We use genpower now.
+#cat wall > $PKG/usr/bin/wall
+#strip --strip-unneeded powerd
+#cat powerd > $PKG/sbin/powerd
+#chmod 755 $PKG/usr/bin/wall $PKG/sbin/powerd
+#chown root:root $PKG/usr/bin/wall $PKG/sbin/powerd
+cp initscript.sample $PKG/sbin/initscript.sample
+
+cd ../man
+mkdir -p $PKG/usr/man/man{1,5,8}
+for page in last.1 mountpoint.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
+done
+for page in inittab.5 initscript.5 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man5/$page.gz
+done
+for page in halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8 \
+  shutdown.8 telinit.8 bootlogd.8 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man8/$page.gz
+done
+( cd $PKG/usr/man/man1 ; ln -sf last.1.gz lastb.1.gz )
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/sysvinit-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/sysvinit-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/a/sysvinit/sysvinit.diff b/source/a/sysvinit/sysvinit.diff
new file mode 100644
index 000000000..11477be72
--- /dev/null
+++ b/source/a/sysvinit/sysvinit.diff
@@ -0,0 +1,125 @@
+diff -Naur sysvinit-2.86.orig/man/init.8 sysvinit-2.86/man/init.8
+--- sysvinit-2.86.orig/man/init.8	2004-07-29 13:21:31.000000000 +0200
++++ sysvinit-2.86/man/init.8	2007-12-23 12:22:51.000000000 +0100
+@@ -76,7 +76,7 @@
+ are processed.
+ .PP
+ When starting a new process, \fBinit\fP first checks whether the file
+-\fI/etc/initscript\fP exists. If it does, it uses this script to
++\fI/sbin/initscript\fP exists. If it does, it uses this script to
+ start the process.
+ .PP
+ Each time a child terminates, \fBinit\fP records the fact and the reason
+@@ -240,7 +240,7 @@
+ .SH FILES
+ .nf
+ /etc/inittab
+-/etc/initscript
++/sbin/initscript
+ /dev/console
+ /var/run/utmp
+ /var/log/wtmp
+diff -Naur sysvinit-2.86.orig/man/initscript.5 sysvinit-2.86/man/initscript.5
+--- sysvinit-2.86.orig/man/initscript.5	2004-06-09 14:47:45.000000000 +0200
++++ sysvinit-2.86/man/initscript.5	2007-12-23 12:22:51.000000000 +0100
+@@ -2,15 +2,15 @@
+ .SH NAME
+ initscript \- script that executes inittab commands.
+ .SH SYNOPSIS
+-/bin/sh /etc/initscript id runlevels action process
++/bin/sh /sbin/initscript id runlevels action process
+ .SH DESCRIPTION
+-When the shell script \fI/etc/initscript\fP is present, \fBinit\fP
++When the shell script \fI/sbin/initscript\fP is present, \fBinit\fP
+ will use it to execute the commands from \fIinittab\fP.
+ This script can be used to set things like \fBulimit\fP and
+ \fBumask\fP default values for every process.
+ .SH EXAMPLES
+ This is a sample initscript, which might be installed on your
+-system as \fI/etc/initscript.sample\fP.
++system as \fI/sbin/initscript.sample\fP.
+ .RS
+ .sp
+ .nf
+@@ -20,7 +20,7 @@
+ # initscript   Executed by init(8) for every program it
+ #              wants to spawn like this:
+ #
+-#              /bin/sh /etc/initscript <id> <level> <action> <process>
++#              /bin/sh /sbin/initscript <id> <level> <action> <process>
+ #
+ 
+   # Set umask to safe level, and enable core dumps.
+@@ -48,7 +48,7 @@
+ .RE
+ .SH FILES
+ /etc/inittab,
+-/etc/initscript.
++/sbin/initscript.
+ .SH AUTHOR
+ Miquel van Smoorenburg ,<miquels@cistron.nl>
+ .SH "SEE ALSO"
+diff -Naur sysvinit-2.86.orig/src/Makefile sysvinit-2.86/src/Makefile
+--- sysvinit-2.86.orig/src/Makefile	2004-06-09 14:47:45.000000000 +0200
++++ sysvinit-2.86/src/Makefile	2007-12-23 12:22:51.000000000 +0100
+@@ -11,7 +11,7 @@
+ CC	= gcc
+ CFLAGS	= -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
+ LDFLAGS	= -s
+-STATIC	=
++STATIC	= -static
+ 
+ # For some known distributions we do not build all programs, otherwise we do.
+ BIN	=
+diff -Naur sysvinit-2.86.orig/src/initscript.sample sysvinit-2.86/src/initscript.sample
+--- sysvinit-2.86.orig/src/initscript.sample	1997-11-26 14:06:33.000000000 +0100
++++ sysvinit-2.86/src/initscript.sample	2007-12-23 12:22:51.000000000 +0100
+@@ -1,14 +1,14 @@
+ #
+-# initscript	If this script is intalled as /etc/initscript,
++# initscript	If this script is intalled as /sbin/initscript,
+ #		it is executed by init(8) for every program it
+ #		wants to spawn like this:
+ #
+-#		/bin/sh /etc/initscript <id> <level> <action> <process>
++#		/bin/sh /sbin/initscript <id> <level> <action> <process>
+ #
+ #		It can be used to set the default umask and ulimit
+ #		of all processes. By default this script is installed
+-#		as /etc/initscript.sample, so to enable it you must
+-#		rename this script first to /etc/initscript.
++#		as /sbin/initscript.sample, so to enable it you must
++#		rename this script first to /sbin/initscript.
+ #
+ # Version:	@(#)initscript 1.10 10-Dec-1995 MvS.
+ #
+diff -Naur sysvinit-2.86.orig/src/paths.h sysvinit-2.86/src/paths.h
+--- sysvinit-2.86.orig/src/paths.h	2004-06-09 14:47:45.000000000 +0200
++++ sysvinit-2.86/src/paths.h	2007-12-23 12:23:50.000000000 +0100
+@@ -20,21 +20,21 @@
+ #define INITTAB		"/etc/inittab"		/* Location of inittab */
+ #define INIT		"/sbin/init"		/* Location of init itself. */
+ #define NOLOGIN		"/etc/nologin"		/* Stop user logging in. */
+-#define FASTBOOT	"/fastboot"		/* Enable fast boot. */
+-#define FORCEFSCK	"/forcefsck"		/* Force fsck on boot */
++#define FASTBOOT	"/etc/fastboot"		/* Enable fast boot. */
++#define FORCEFSCK	"/etc/forcefsck"	/* Force fsck on boot */
+ #define SDPID		"/var/run/shutdown.pid"	/* PID of shutdown program */
+ #define SHELL		"/bin/sh"		/* Default shell */
+ #define SULOGIN		"/sbin/sulogin"		/* Sulogin */
+-#define INITSCRIPT	"/etc/initscript"	/* Initscript. */
++#define INITSCRIPT	"/sbin/initscript"	/* Initscript. */
+ #define PWRSTAT		"/etc/powerstatus"	/* COMPAT: SIGPWR reason (OK/BAD) */
+ 
+ #if 0
+ #define INITLVL		"/etc/initrunlvl"	/* COMPAT: New runlevel */
+ #define INITLVL2	"/var/log/initrunlvl"	/* COMPAT: New runlevel */
+ 				/* Note: INITLVL2 definition needs INITLVL */
+-#define HALTSCRIPT1	"/etc/init.d/halt"	/* Called by "fast" shutdown */
++#define HALTSCRIPT1	"/etc/init.d/rc.halt"	/* Called by "fast" shutdown */
+ #define HALTSCRIPT2	"/etc/rc.d/rc.0"	/* Called by "fast" shutdown */
+-#define REBOOTSCRIPT1	"/etc/init.d/reboot"	/* Ditto. */
++#define REBOOTSCRIPT1	"/etc/init.d/rc.reboot"	/* Ditto. */
+ #define REBOOTSCRIPT2	"/etc/rc.d/rc.6"	/* Ditto. */
+ #endif
+ 
diff --git a/source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff b/source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff
new file mode 100644
index 000000000..db94dcf19
--- /dev/null
+++ b/source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff
@@ -0,0 +1,81 @@
+--- sysvinit-2.86/man/pidof.8.chroot	1998-09-02 08:49:33.000000000 -0400
++++ sysvinit-2.86/man/pidof.8	2005-12-19 15:37:40.000000000 -0500
+@@ -4,6 +4,7 @@
+ .SH SYNOPSIS
+ .B pidof
+ .RB [ \-s ]
++.RB [ \-c ]
+ .RB [ \-x ]
+ .RB [ \-o
+ .IR omitpid ]
+@@ -24,6 +25,10 @@
+ .SH OPTIONS
+ .IP -s
+ Single shot - this instructs the program to only return one \fIpid\fP.
++.IP -c
++Only return process ids that are running with the same root directory.
++This option does not make sense for non-root users, as they will be
++unable to check the current root directory of processes they do not own.
+ .IP -x
+ Scripts too - this causes the program to also return process id's of
+ shells running the named scripts.
+--- sysvinit-2.86/src/killall5.c.chroot	2004-07-30 08:16:23.000000000 -0400
++++ sysvinit-2.86/src/killall5.c	2005-12-19 15:38:47.000000000 -0500
+@@ -476,16 +476,22 @@
+ 	int		f;
+ 	int		first = 1;
+ 	int		i, oind, opt, flags = 0;
++	int		chroot_check = 0;
++	struct stat	st;
++	char		tmp[512];
+ 
+ 	for (oind = PIDOF_OMITSZ-1; oind > 0; oind--)
+ 		opid[oind] = 0;
+ 	opterr = 0;
+ 
+-	while ((opt = getopt(argc,argv,"ho:sx")) != EOF) switch (opt) {
++	while ((opt = getopt(argc,argv,"hco:sx")) != EOF) switch (opt) {
+ 		case '?':
+ 			nsyslog(LOG_ERR,"invalid options on command line!\n");
+ 			closelog();
+ 			exit(1);
++		case 'c':
++			chroot_check = 1;
++			break;
+ 		case 'o':
+ 			if (oind >= PIDOF_OMITSZ -1) {
+ 				nsyslog(LOG_ERR,"omit pid buffer size %d "
+@@ -518,6 +524,16 @@
+ 	argc -= optind;
+ 	argv += optind;
+ 
++	/* Check if we are in a chroot */
++	if (chroot_check) {
++		snprintf(tmp, 512, "/proc/%d/root", getpid());
++		if (stat(tmp, &st) < 0) {
++			nsyslog(LOG_ERR, "stat failed for %s!\n", tmp);
++			closelog();
++			exit(1);
++		}
++	}
++
+ 	/* Print out process-ID's one by one. */
+ 	readproc();
+ 	for(f = 0; f < argc; f++) {
+@@ -541,6 +557,16 @@
+ 					else
+ 						spid = 1;
+ 				}
++				if (chroot_check) {
++					struct stat st2;
++					snprintf(tmp, 512, "/proc/%d/root",
++						 p->pid);
++					if (stat(tmp, &st2) < 0 ||
++					    st.st_dev != st2.st_dev ||
++					    st.st_ino != st2.st_ino) {
++						continue;
++					}
++				}
+ 				if (!first)
+ 					printf(" ");
+ 				printf("%d", p->pid);
diff --git a/source/a/tar/rmt.8 b/source/a/tar/rmt.8
new file mode 100644
index 000000000..86d2cf92f
--- /dev/null
+++ b/source/a/tar/rmt.8
@@ -0,0 +1,217 @@
+.\" Copyright (c) 1983, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
+.\"
+.\"     @(#)rmt.8	6.5 (Berkeley) 3/16/91
+.\"
+.Dd March 16, 1991
+.Dt RMT 8
+.Os BSD 4.2
+.Sh NAME
+.Nm rmt
+.Nd remote magtape protocol module
+.Sh SYNOPSIS
+.Nm rmt
+.Sh DESCRIPTION
+.Nm Rmt
+is a program used by the remote dump and restore programs
+in manipulating a magnetic tape drive through an interprocess
+communication connection.
+.Nm Rmt
+is normally started up with an
+.Xr rexec 3
+or
+.Xr rcmd 3
+call.
+.Pp
+The 
+.Nm rmt
+program accepts requests specific to the manipulation of
+magnetic tapes, performs the commands, then responds with
+a status indication.  All responses are in
+.Tn ASCII
+and in
+one of two forms. 
+Successful commands have responses of:
+.Bd -filled -offset indent
+.Sm off
+.Sy A Ar number No \en
+.Sm on
+.Ed
+.Pp
+.Ar Number
+is an
+.Tn ASCII
+representation of a decimal number.
+Unsuccessful commands are responded to with:
+.Bd -filled -offset indent
+.Sm off
+.Xo Sy E Ar error-number
+.No \en Ar error-message
+.No \en
+.Xc
+.Sm on
+.Ed
+.Pp
+.Ar Error-number
+is one of the possible error
+numbers described in
+.Xr intro 2
+and
+.Ar error-message
+is the corresponding error string as printed
+from a call to
+.Xr perror 3 .
+The protocol is comprised of the
+following commands, which are sent as indicated - no spaces are supplied
+between the command and its arguments, or between its arguments, and
+.Ql \en
+indicates that a newline should be supplied:
+.Bl -tag -width Ds
+.Sm off
+.It Xo Sy \&O Ar device
+.No \en Ar mode No \en
+.Xc
+Open the specified 
+.Ar device
+using the indicated
+.Ar mode .
+.Ar Device
+is a full pathname and
+.Ar mode
+is an
+.Tn ASCII
+representation of a decimal
+number suitable for passing to
+.Xr open 2 .
+If a device had already been opened, it is
+closed before a new open is performed.
+.It Xo Sy C Ar device No \en
+.Xc
+Close the currently open device.  The
+.Ar device
+specified is ignored.
+.It Xo Sy L
+.Ar whence No \en
+.Ar offset No \en
+.Xc
+.Sm on
+Perform an
+.Xr lseek 2
+operation using the specified parameters.
+The response value is that returned from the
+.Xr lseek
+call.
+.Sm off
+.It Sy W Ar count No \en
+.Sm on
+Write data onto the open device.
+.Nm Rmt
+reads
+.Ar count
+bytes from the connection, aborting if
+a premature end-of-file is encountered.
+The response value is that returned from
+the
+.Xr write 2
+call.
+.Sm off
+.It Sy R Ar count No \en
+.Sm on
+Read
+.Ar count
+bytes of data from the open device.
+If
+.Ar count
+exceeds the size of the data buffer (10 kilobytes), it is
+truncated to the data buffer size.
+.Nm rmt
+then performs the requested 
+.Xr read 2
+and responds with 
+.Sm off
+.Sy A Ar count-read No \en
+.Sm on
+if the read was
+successful; otherwise an error in the
+standard format is returned.  If the read
+was successful, the data read is then sent.
+.Sm off
+.It Xo Sy I Ar operation
+.No \en Ar count No \en
+.Xc
+.Sm on
+Perform a
+.Dv MTIOCOP
+.Xr ioctl 2
+command using the specified parameters.
+The parameters are interpreted as the
+.Tn ASCII
+representations of the decimal values
+to place in the 
+.Ar mt_op
+and
+.Ar mt_count
+fields of the structure used in the
+.Xr ioctl
+call.  The return value is the
+.Ar count
+parameter when the operation is successful.
+.It Sy S
+Return the status of the open device, as
+obtained with a
+.Dv MTIOCGET
+.Xr ioctl
+call.  If the operation was successful,
+an ``ack'' is sent with the size of the
+status buffer, then the status buffer is
+sent (in binary).
+.El
+.Sm on
+.Pp
+Any other command causes 
+.Nm rmt
+to exit.
+.Sh DIAGNOSTICS
+All responses are of the form described above.
+.Sh SEE ALSO
+.Xr rcmd 3 ,
+.Xr rexec 3 ,
+.Xr mtio 4 ,
+.Xr rdump 8 ,
+.Xr rrestore 8
+.Sh BUGS
+People tempted to use this for a remote file access protocol
+are discouraged.
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.2 .
diff --git a/source/a/tar/slack-desc b/source/a/tar/slack-desc
new file mode 100644
index 000000000..573b89013
--- /dev/null
+++ b/source/a/tar/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------------------------------------------------------|
+tar: tar (archiving utility)
+tar:
+tar: This is the GNU version of tar, an archiving program designed to store
+tar: and extract files from an archive file known as a tarfile.  A tarfile
+tar: may be made on a tape drive, however, it is also common to write a
+tar: tarfile to a normal file.
+tar:
+tar: Slackware's package system uses tarfiles compressed with GNU gzip.
+tar:
+tar:
+tar:
diff --git a/source/a/tar/tar-1.13.bzip2.diff b/source/a/tar/tar-1.13.bzip2.diff
new file mode 100644
index 000000000..85c03368c
--- /dev/null
+++ b/source/a/tar/tar-1.13.bzip2.diff
@@ -0,0 +1,48 @@
+--- ./src/tar.c.orig	Wed Jul  7 00:49:50 1999
++++ ./src/tar.c	Fri Jul 30 23:00:13 1999
+@@ -16,6 +16,8 @@
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ 
++/* Patched to integrate bzip2 as compression filter (option -j)  */
++
+ #include "system.h"
+ 
+ #include <getopt.h>
+@@ -164,6 +166,8 @@
+   {"block-number", no_argument, NULL, 'R'},
+   {"block-size", required_argument, NULL, OBSOLETE_BLOCKING_FACTOR},
+   {"blocking-factor", required_argument, NULL, 'b'},
++  {"bzip2", required_argument, NULL, 'j'},
++  {"bunzip2", required_argument, NULL, 'j'},
+   {"catenate", no_argument, NULL, 'A'},
+   {"checkpoint", no_argument, &checkpoint_option, 1},
+   {"compare", no_argument, NULL, 'd'},
+@@ -340,6 +344,7 @@
+               PATTERN                at list/extract time, a globbing PATTERN\n\
+   -o, --old-archive, --portability   write a V7 format archive\n\
+       --posix                        write a POSIX conformant archive\n\
++  -j, --bzip2, --bunzip2             filter the archive through bzip2\n\
+   -z, --gzip, --ungzip               filter the archive through gzip\n\
+   -Z, --compress, --uncompress       filter the archive through compress\n\
+       --use-compress-program=PROG    filter through PROG (must accept -d)\n"),
+@@ -416,7 +421,7 @@
+    Y  per-block gzip compression */
+ 
+ #define OPTION_STRING \
+-  "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz"
++  "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxz"
+ 
+ static void
+ set_subcommand_option (enum subcommand subcommand)
+@@ -787,6 +792,10 @@
+ 	if (add_exclude_file (excluded, optarg, '\n') != 0)
+ 	  FATAL_ERROR ((0, errno, "%s", optarg));
+ 	break;
++
++      case 'j':
++        set_use_compress_program_option ("bzip2");
++        break;
+ 
+       case 'z':
+ 	set_use_compress_program_option ("gzip");
diff --git a/source/a/tar/tar-1.22-support_txz.diff b/source/a/tar/tar-1.22-support_txz.diff
new file mode 100644
index 000000000..5104f5639
--- /dev/null
+++ b/source/a/tar/tar-1.22-support_txz.diff
@@ -0,0 +1,11 @@
+diff -Nur tar-1.22.orig/src/suffix.c tar-1.22/src/suffix.c
+--- tar-1.22.orig/src/suffix.c	2009-03-05 01:04:13.000000000 -0600
++++ tar-1.22/src/suffix.c	2009-05-06 15:59:10.695985191 -0500
+@@ -41,6 +41,7 @@
+   { S(tlz, lzma) },
+   { S(lzo, lzop) },
+   { S(xz, xz) },
++  { S(txz, xz) },
+ #undef S
+ };
+ 
diff --git a/source/a/tar/tar.1 b/source/a/tar/tar.1
new file mode 100644
index 000000000..1d7e02faf
--- /dev/null
+++ b/source/a/tar/tar.1
@@ -0,0 +1,368 @@
+.\" @(#)tar.1 1.11.1 93/19/22 PJV;
+.TH TAR 1 "22 September 1993"
+.SH NAME
+tar \- The GNU version of the tar archiving utility
+.SH SYNOPSIS
+.B tar
+[
+.B \-
+]
+.B A --catenate --concatenate \||\| c --create \||\| d --diff --compare \||\| r --append \||\| t --list \||\| u --update \||\| x -extract --get
+[
+.B --atime-preserve
+]
+[
+.B -b, --block-size N
+]
+[
+.B -B, --read-full-blocks
+]
+[
+.B -C, --directory DIR
+]
+[
+.B --checkpoint	
+]
+[
+.B -f, --file [HOSTNAME:]F
+]
+[
+.B --force-local	
+]
+[
+.B -F, --info-script F --new-volume-script F
+]
+[
+.B -G, --incremental
+]
+[
+.B -g, --listed-incremental F
+]
+[
+.B -h, --dereference
+]
+[
+.B -i, --ignore-zeros
+]
+[
+.B -j, --bzip2
+]
+[
+.B --ignore-failed-read
+]
+[
+.B -k, --keep-old-files
+]
+[
+.B -K, --starting-file F
+]
+[
+.B -l, --one-file-system
+]
+[
+.B -L, --tape-length N
+]
+[
+.B -m, --modification-time
+]
+[
+.B -M, --multi-volume
+]
+[
+.B -N, --after-date DATE, --newer DATE
+]
+[
+.B -o, --old-archive, --portability
+]
+[
+.B -O, --to-stdout
+]
+[
+.B -p, --same-permissions, --preserve-permissions
+]
+[
+.B -P, --absolute-names
+]
+[
+.B --preserve	
+]
+[
+.B -R, --record-number
+]
+[
+.B --remove-files
+]
+[
+.B -s, --same-order, --preserve-order
+]
+[
+.B --same-owner
+]
+[
+.B --numeric-owner
+]
+[
+.B -S, --sparse
+]
+[
+.B -T, --files-from F
+]
+[
+.B --null	
+]
+[
+.B --totals	
+]
+[
+.B -v, --verbose
+]
+[
+.B -V, --label NAME
+]
+[
+.B --version	
+]
+[
+.B -w, --interactive, --confirmation
+]
+[
+.B -W, --verify	
+]
+[
+.B --exclude FILE
+]
+[
+.B -X, --exclude-from FILE
+]
+[
+.B -Z, --compress, --uncompress
+]
+[
+.B -z, --gzip, --ungzip	
+]
+[
+.B --use-compress-program PROG
+]
+[
+.B --block-compress
+]
+[
+.B -[0-7][lmh]	
+]
+.TP
+.I filename1 [ filename2, ... filenameN ] 
+.TP
+.I directory1 [ directory2, ...directoryN ]
+.SH DESCRIPTION
+.LP
+This manual page documents the GNU version of
+.B tar
+, an archiving program designed to store and extract files from 
+an archive file known as a 
+.IR tarfile.
+A 
+.IR tarfile 
+may be made on a tape drive, however, it is also common
+to write a
+.IR tarfile
+to a normal file. 
+The first argument to 
+.B tar
+must be one of the options:
+.BR Acdrtux ,
+followed by any optional functions.
+The final arguments to 
+.B tar
+are the names of the files or directories which should be archived. The use
+of a directory name always implies that the subdirectories below should be
+included in the archive.
+.SH EXAMPLES
+.TP
+.B tar -xvvf foo.tar
+extract foo.tar
+.TP
+.B tar -xvvzf foo.tar.gz
+extract gzipped foo.tar.gz
+.TP
+.B tar -cvvf foo.tar foo/
+tar contents of folder foo in foo.tar
+.SH "FUNCTION LETTERS"
+.TP
+.B One of the following options must be used:
+.TP
+.B -A, --catenate, --concatenate
+append tar files to an archive
+.TP
+.B -c, --create	
+create a new archive
+.TP
+.B -d, --diff, --compare
+find differences between archive and file system
+.TP
+.B --delete		
+delete from the archive (not for use on mag tapes!)
+.TP
+.B -r, --append		
+append files to the end of an archive
+.TP
+.B -t, --list		
+list the contents of an archive
+.TP
+.B -u, --update		
+only append files that are newer than copy in archive
+.TP
+.B -x, --extract, --get		
+extract files from an archive
+.SH "OTHER OPTIONS"
+.TP
+.B --atime-preserve	
+don't change access times on dumped files
+.TP
+.B -b, --block-size N	
+block size of Nx512 bytes (default N=20)
+.TP
+.B -B, --read-full-blocks	
+reblock as we read (for reading 4.2BSD pipes)
+.TP 
+.B -C, --directory DIR	
+change to directory DIR
+.TP 
+.B --checkpoint		
+print directory names while reading the archive
+.TP
+.B -f, --file [HOSTNAME:]F	
+use archive file or device F (default "-", meaning stdin/stdout)
+.TP
+.B --force-local		
+archive file is local even if has a colon
+.TP 
+.B -F, --info-script F --new-volume-script F 
+run script at end of each tape (implies -M)
+.TP
+.B -G, --incremental	
+create/list/extract old GNU-format incremental backup
+.TP
+.B -g, --listed-incremental F 
+create/list/extract new GNU-format incremental backup
+.TP 
+.B -h, --dereference	
+don't dump symlinks; dump the files they point to
+.TP
+.B -i, --ignore-zeros	
+ignore blocks of zeros in archive (normally mean EOF)
+.TP
+.B -j, --bzip2
+filter archive through bzip2, use to decompress .bz2 files
+.TP
+.B --ignore-failed-read	
+don't exit with non-zero status on unreadable files
+.TP
+.B -k, --keep-old-files	
+keep existing files; don't overwrite them from archive
+.TP
+.B -K, --starting-file F	
+begin at file F in the archive
+.TP
+.B -l, --one-file-system	
+stay in local file system when creating an archive
+.TP
+.B -L, --tape-length N	
+change tapes after writing N*1024 bytes
+.TP
+.B -m, --modification-time	
+don't extract file modified time
+.TP
+.B -M, --multi-volume	
+create/list/extract multi-volume archive
+.TP
+.B -N, --after-date DATE, --newer DATE	
+only store files newer than DATE
+.TP
+.B -o, --old-archive, --portability	
+write a V7 format archive, rather than ANSI format
+.TP
+.B -O, --to-stdout		
+extract files to standard output
+.TP
+.B -p, --same-permissions, --preserve-permissions 
+extract all protection information
+.TP
+.B -P, --absolute-paths	
+don't strip leading `/'s from file names
+.TP
+.B --preserve		
+like -p -s
+.TP
+.B -R, --record-number	
+show record number within archive with each message
+.TP 
+.B --remove-files		
+remove files after adding them to the archive
+.TP
+.B -s, --same-order, --preserve-order	
+list of names to extract is sorted to match archive
+.TP
+.B --same-owner		
+create extracted files with the same ownership 
+.TP
+.B --numeric-owner
+always use numbers for user/group names
+.TP
+.B -S, --sparse		
+handle sparse files efficiently
+.TP 
+.B -T, --files-from F	
+get names to extract or create from file F
+.TP
+.B --null			
+-T reads null-terminated names, disable -C
+.TP
+.B --totals		
+print total bytes written with --create
+.TP
+.B -v, --verbose		
+verbosely list files processed
+.TP
+.B -V, --label NAME	
+create archive with volume name NAME
+.TP 
+.B --version		
+print tar program version number
+.TP
+.B -w, --interactive, --confirmation	
+ask for confirmation for every action
+.TP
+.B -W, --verify		
+attempt to verify the archive after writing it
+.TP
+.B --exclude FILE		
+exclude file FILE
+.TP
+.B -X, --exclude-from FILE	
+exclude files listed in FILE
+.TP
+.B -Z, --compress, --uncompress      	
+filter the archive through compress
+.TP 
+.B -z, --gzip, --ungzip		
+filter the archive through gzip
+.TP
+.B --use-compress-program PROG
+filter the archive through PROG (which must accept -d)
+.TP
+.B --block-compress	
+block the output of compression program for tapes
+.TP
+.B -[0-7][lmh]		
+specify drive and density
+.SH BUGS
+.LP
+The GNU folks, in general, abhor man pages, and create info documents instead.
+The maintainer of tar falls into this category.  This man page is neither
+complete, nor current, and was included in the Debian Linux packaging of tar
+entirely to reduce the frequency with which the lack of a man page gets
+reported as a bug in our defect tracking system.
+
+If you really want to understand tar, then you should run info and read the
+tar info pages, or use the info mode in emacs.
+
diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild
new file mode 100755
index 000000000..43181ccbe
--- /dev/null
+++ b/source/a/tar/tar.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright 2005-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.
+
+# Slackware build script for tar
+
+VERSION=1.22
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-tar
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+# This old version is the only one that won't clobber symlinks, e.g.:
+# someone moves /opt to /usr/opt and makes a symlink.  With newer
+# versions of tar, installing any new package will remove the /opt
+# symlink and plop down a new directory there.
+# Well, there's a lot of other bugs (the remote stuff particularly I'm
+# told is flaky) in tar-1.13, so it'll only be here now for use by the
+# Slackware package utils.  And, we'll even let people remove it and
+# the pkgutils will still try to work (but eventually they'll pay the
+# price :)
+cd $TMP
+rm -rf tar-1.13
+tar xvf $CWD/tar-1.13.tar.gz || exit 1
+cd tar-1.13 || exit 1
+zcat $CWD/tar-1.13.bzip2.diff.gz | patch -p1 --verbose || exit 1
+# The original config.{guess,sub} do not work on x86_64
+cp -p /usr/share/libtool/config.{guess,sub} .
+chown -R root:root .
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --disable-nls \
+  --build=$ARCH-slackware-linux
+make $NUMJOBS || make || exit 1
+mkdir -p $PKG/bin
+cat src/tar > $PKG/bin/tar-1.13
+chmod 0755 $PKG/bin/tar-1.13
+# End building of tar-1.13
+
+cd $TMP
+rm -rf tar-$VERSION
+tar xvf $CWD/tar-$VERSION.tar.bz2 || exit 1
+cd tar-$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 {} \;
+
+# Don't spew "Record size = foo blocks" messages:
+zcat $CWD/tar.norecordsizespam.diff.gz | patch -p1 --verbose || exit 1
+
+# The "A lone zero block at %s" messages also cause problems:
+zcat $CWD/tar.nolonezero.diff.gz | patch -p1 --verbose || exit 1
+
+# Add support for *.txz files (our packages)
+zcat $CWD/tar-1.22-support_txz.diff.gz | patch -p1 --verbose || exit1
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/tar-$VERSION \
+  --enable-backup-scripts \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make 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
+)
+
+mv $PKG/usr/bin/tar $PKG/bin
+( cd $PKG/usr/bin ; ln -sf /bin/tar . )
+( cd $PKG/bin ; ln -sf tar tar-$VERSION )
+
+# Support "historic" rmt locations:
+mkdir -p $PKG/{etc,sbin}
+( cd $PKG/etc
+  ln -sf /usr/libexec/rmt .
+  cd $PKG/sbin
+  ln -sf /usr/libexec/rmt .
+)
+
+mkdir -p $PKG/usr/man/man{1,8}
+cat $CWD/tar.1.gz > $PKG/usr/man/man1/tar.1.gz
+cat $CWD/rmt.8.gz > $PKG/usr/man/man8/rmt.8.gz
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/tar-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING NEWS PORTS README THANKS TODO \
+  $PKG/usr/doc/tar-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/tar-$VERSION-$ARCH-$BUILD.tgz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/tar-$VERSION
+  rm -rf $PKG
+fi
+
diff --git a/source/a/tar/tar.nolonezero.diff b/source/a/tar/tar.nolonezero.diff
new file mode 100644
index 000000000..3c6f6f97b
--- /dev/null
+++ b/source/a/tar/tar.nolonezero.diff
@@ -0,0 +1,25 @@
+--- ./src/list.c.orig	2004-05-10 04:49:09.000000000 -0700
++++ ./src/list.c	2004-06-06 13:13:23.000000000 -0700
+@@ -138,6 +138,14 @@
+ 
+ 	  if (!ignore_zeros_option)
+ 	    {
++
++	      /* 
++	       * According to POSIX tar specs, this is wrong, but on the web
++	       * there are some tar specs that can trigger this, and some tar
++	       * implementations create tars according to that spec.  For now,
++	       * let's not be pedantic about issuing the warning.
++	       */
++#if 0	       
+ 	      char buf[UINTMAX_STRSIZE_BOUND];
+ 
+ 	      status = read_header (false);
+@@ -145,6 +153,7 @@
+ 		break;
+ 	      WARN ((0, 0, _("A lone zero block at %s"),
+ 		     STRINGIFY_BIGINT (current_block_ordinal (), buf)));
++#endif
+ 	      break;
+ 	    }
+ 	  status = prev_status;
diff --git a/source/a/tar/tar.norecordsizespam.diff b/source/a/tar/tar.norecordsizespam.diff
new file mode 100644
index 000000000..b7d1b7a9f
--- /dev/null
+++ b/source/a/tar/tar.norecordsizespam.diff
@@ -0,0 +1,20 @@
+--- ./src/buffer.c.orig	2009-03-05 01:04:13.000000000 -0600
++++ ./src/buffer.c	2009-03-09 20:17:50.000000000 -0500
+@@ -688,7 +688,7 @@
+   more = record_start->buffer + status;
+   left = record_size - status;
+ 
+-  if (left && left % BLOCKSIZE == 0
++  /* if (left && left % BLOCKSIZE == 0
+       && verbose_option
+       && record_start_block == 0 && status != 0)
+     {
+@@ -698,7 +698,7 @@
+                        "Record size = %lu blocks",
+                        rsize),
+              rsize));
+-    }
++    } */
+ 
+   while (left % BLOCKSIZE != 0
+          || (left && status && read_full_records))
diff --git a/source/a/tcsh/doinst.sh b/source/a/tcsh/doinst.sh
new file mode 100644
index 000000000..d351e5057
--- /dev/null
+++ b/source/a/tcsh/doinst.sh
@@ -0,0 +1,8 @@
+if fgrep tcsh etc/shells 1> /dev/null 2> /dev/null ; then
+ GOOD=y
+else
+ echo "/bin/tcsh" >> etc/shells
+ echo "/bin/csh" >> etc/shells
+fi
+( cd bin ; rm -rf csh )
+( cd bin ; ln -sf  tcsh csh )
diff --git a/source/a/tcsh/slack-desc b/source/a/tcsh/slack-desc
new file mode 100644
index 000000000..623ad4580
--- /dev/null
+++ b/source/a/tcsh/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------------------------------------------------------|
+tcsh: tcsh (C shell)
+tcsh:
+tcsh: tcsh is an enhanced but completely compatible version of the Berkeley
+tcsh: UNIX C shell, csh(1). It is a command language interpreter usable both
+tcsh: as an interactive login shell and a shell script command processor. It
+tcsh: includes a command-line editor, programmable word completion, spelling
+tcsh: correction, a history mechanism, job control, and a C-like syntax.
+tcsh:
+tcsh:
+tcsh:
+tcsh:
diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild
new file mode 100755
index 000000000..653964787
--- /dev/null
+++ b/source/a/tcsh/tcsh.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=6.15.00
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-tcsh
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf tcsh-$VERSION
+tar xjvf $CWD/tcsh-$VERSION.tar.bz2 || exit 1
+cd tcsh-$VERSION
+
+# The LS_COLORS variable shared by tcsh has new options in recent
+# versions of coreutils that cause tcsh to exit, so disable the
+# built-in color ls:
+zcat $CWD/tcsh.nobuiltincolorls.diff.gz | patch -p1 --verbose || 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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=  \
+  $ARCH-slackware-linux
+make -j4 || exit 1
+mkdir -p $PKG/etc
+mkdir -p $PKG/bin
+cat tcsh > $PKG/bin/tcsh
+chmod 755 $PKG/bin/tcsh
+mkdir -p $PKG/usr/man/man1
+cat tcsh.man | gzip -9c > $PKG/usr/man/man1/tcsh.1.gz
+echo '.so man1/tcsh.1' | gzip -9c > $PKG/usr/man/man1/csh.1.gz
+( 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
+)
+mkdir -p $PKG/usr/doc/tcsh-$VERSION
+cp -a \
+  BUGS FAQ Fixes NewThings Ported README README.imake WishList Y2K \
+  $PKG/usr/doc/tcsh-$VERSION
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/tcsh-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/tcsh-${VERSION}
+  rm -rf $PKG
+fi
diff --git a/source/a/tcsh/tcsh.nobuiltincolorls.diff b/source/a/tcsh/tcsh.nobuiltincolorls.diff
new file mode 100644
index 000000000..2fd1c2896
--- /dev/null
+++ b/source/a/tcsh/tcsh.nobuiltincolorls.diff
@@ -0,0 +1,11 @@
+--- ./config_f.h.orig	2005-03-04 07:46:04.000000000 -0600
++++ ./config_f.h	2006-02-09 14:30:59.000000000 -0600
+@@ -174,7 +174,7 @@
+  * COLOR_LS_F Do you want to use builtin color ls-F ?
+  *
+  */
+-#define COLOR_LS_F
++#undef COLOR_LS_F
+ 
+ /*
+  * COLORCAT Do you want to colorful message ?
diff --git a/source/a/time/slack-desc b/source/a/time/slack-desc
new file mode 100644
index 000000000..633c58161
--- /dev/null
+++ b/source/a/time/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------------------------------------------------------|
+time: time (the GNU time command for measuring program resource use)
+time:
+time: The `time' command runs another program, then displays information
+time: about the resources used by that program, collected by the system
+time: while the program was running. 
+time:
+time: GNU time was originally written by David Keppel, with later versions
+time: worked on by David MacKenzie, Arne Henrik Juul, and Francois Pinard.
+time:
+time:
+time:
diff --git a/source/a/time/time.SlackBuild b/source/a/time/time.SlackBuild
new file mode 100755
index 000000000..108e7a8b6
--- /dev/null
+++ b/source/a/time/time.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=1.7
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-time
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+cd $TMP
+rm -rf time-${VERSION}
+tar xvzf $CWD/time-${VERSION}.tar.gz
+cd time-${VERSION}
+chown -R root:root .
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  $ARCH-slackware-linux
+make || exit 1
+mkdir -p $PKG/usr/bin
+cat time > $PKG/usr/bin/time
+chmod 755 $PKG/usr/bin/time
+mkdir -p $PKG/usr/info
+cat time.info | gzip -9c > $PKG/usr/info/time.info.gz
+mkdir -p $PKG/usr/doc/time-${VERSION}
+cp -a \
+  AUTHORS COPYING NEWS README \
+  $PKG/usr/doc/time-${VERSION}
+( 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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/time-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/tree/slack-desc b/source/a/tree/slack-desc
new file mode 100644
index 000000000..4140d110e
--- /dev/null
+++ b/source/a/tree/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------------------------------------------------------|
+tree: tree (a program to display a directory tree)
+tree:
+tree: Tree is a recursive directory listing program that produces a depth
+tree: indented listing of files, which is colorized ala dircolors if the
+tree: LS_COLORS environment variable is set and output is to tty.  With no
+tree: arguments, tree lists the files in the current directory.
+tree:
+tree: The tree utility was written by Steve Baker.
+tree:
+tree:
+tree:
diff --git a/source/a/tree/tree.SlackBuild b/source/a/tree/tree.SlackBuild
new file mode 100755
index 000000000..d20c3c1eb
--- /dev/null
+++ b/source/a/tree/tree.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Copyright 2007-2009  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.
+
+VERSION=1.5.2.2
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-tree
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf tree-$VERSION
+tar xvf $CWD/tree-$VERSION.tar.?z* || exit 1
+cd tree-$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 {} \;
+
+make -j2 || exit 1
+mkdir -p $PKG/usr/bin
+cat tree > $PKG/usr/bin/tree
+chmod 755 $PKG/usr/bin/tree
+mkdir -p $PKG/usr/man/man1
+cat man/tree.1 | gzip -9c > $PKG/usr/man/man1/tree.1.gz
+mkdir -p $PKG/usr/doc/tree-$VERSION
+cp -a \
+  CHANGES LICENSE README \
+  $PKG/usr/doc/tree-$VERSION
+( 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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/tree-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/udev/config/modprobe.d/blacklist.conf.new b/source/a/udev/config/modprobe.d/blacklist.conf.new
new file mode 100644
index 000000000..25811703d
--- /dev/null
+++ b/source/a/udev/config/modprobe.d/blacklist.conf.new
@@ -0,0 +1,270 @@
+#
+# Listing a module here prevents the hotplug scripts from loading it.
+# Usually that'd be so that some other driver will bind it instead,
+# no matter which driver happens to get probed first.  Sometimes user
+# mode tools can also control driver binding.
+
+# PC Speaker support:
+# This one is loaded by /etc/rc.d/rc.modules. If you don't like
+# the beeps and buzz from speaker, edit /etc/rc.d/rc.modules.
+blacklist pcspkr
+
+# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices
+blacklist de4x5
+
+# At least 2.4.3 and later xircom_tulip doesn't have that conflict
+# xircom_tulip_cb
+blacklist dmfe
+
+#evbug is a debug tool and should be loaded explicitly
+blacklist evbug
+
+# Alternate Intel EtherExpress Pro/100 support driver.  List it
+# here so it won't conflict with an already-loaded e100 module.
+blacklist eepro100
+
+# Alternate 8139 driver.  Some 8139 cards need this specific driver,
+# though...
+blacklist 8139cp
+
+# Deprecated BCM4318 driver.
+blacklist bcm43xx
+
+# Modules used to run a wireless adaptor as an access point.  These
+# conflict with the normal driver for the device, and so should be
+# loaded manually.
+blacklist hostap_cs
+blacklist hostap_pci
+blacklist hostap_plx
+blacklist hostap
+
+# Ethernet over IEEE1394 module.  In too many cases this will load
+# when there's no eth1394 device present (just an IEEE1394 port)
+blacklist eth1394
+
+# This module has also been known to cause crashes with some hardware.
+blacklist hw_random
+
+# The kernel lists this as "experimental", but for now it's "broken"
+blacklist via-ircc
+
+# ALSA modules to support sound modems.  These should be loaded manually
+# if needed.  For most people they just break sound support...
+blacklist snd-atiixp-modem
+blacklist snd-intel8x0m
+blacklist snd-via82xx-modem
+
+# OSS (Open Sound System) modules.  This is the old and deprecated Linux
+# sound system.  If you want to use OSS, remove the alsa-driver package
+# and cut out (or comment out) this list.  With these modules
+# blacklisted ALSA will load by default.
+blacklist ac97
+blacklist ac97_codec
+blacklist aci
+blacklist ad1816
+blacklist ad1848
+blacklist ad1889
+blacklist adlib_card
+blacklist aedsp16
+blacklist ali5455
+blacklist awe_wave
+blacklist btaudio
+blacklist cmpci
+blacklist cs4232
+blacklist cs4281
+blacklist cs46xx
+blacklist emu10k1
+blacklist es1370
+blacklist es1371
+blacklist esssolo1
+blacklist forte
+blacklist gus
+blacklist i810_audio
+blacklist kahlua
+blacklist mad16
+blacklist maestro
+blacklist maestro3
+blacklist maui
+blacklist mpu401
+blacklist msnd
+blacklist msnd_classic
+blacklist msnd_pinnacle
+blacklist nm256_audio
+blacklist opl3
+blacklist opl3sa
+blacklist opl3sa2
+blacklist pas2
+blacklist pss
+blacklist rme96xx
+blacklist sb
+blacklist sb_lib
+blacklist sgalaxy
+blacklist sonicvibes
+blacklist sound
+blacklist sscape
+blacklist trident
+blacklist trix
+blacklist uart401
+blacklist uart6850
+blacklist v_midi
+blacklist via82cxxx_audio
+blacklist wavefront
+blacklist ymfpci
+
+# Hardware specific video framebuffer modules.  If the user wants
+# these, they can load them manually or de-blacklist them.  Having
+# them load automatically may lead to funny side effects with
+# certain revisions of video hardware.
+blacklist arcfb
+blacklist aty128fb
+blacklist atyfb
+blacklist cirrusfb
+blacklist clgenfb
+blacklist cyber2000fb
+blacklist fbcon-cfb2
+blacklist fbcon-cfb4
+blacklist fbcon-hga
+blacklist fbcon-mfb
+blacklist fbcon-vga-planes
+blacklist fbgen
+blacklist hgafb
+blacklist i2c-matroxfb
+blacklist i810fb
+blacklist intelfb
+blacklist kyrofb
+blacklist matroxfb_DAC1064
+blacklist matroxfb_Ti3026
+blacklist matroxfb_accel
+blacklist matroxfb_base
+blacklist matroxfb_crtc2
+blacklist matroxfb_g450
+blacklist matroxfb_maven
+blacklist matroxfb_misc
+blacklist neofb
+blacklist nvidiafb
+blacklist pm2fb
+blacklist pm3fb
+blacklist radeonfb
+blacklist rivafb
+blacklist savagefb
+blacklist sisfb
+blacklist sstfb
+blacklist tdfxfb
+blacklist tridentfb
+blacklist vga16fb
+
+# SCSI and SATA controller modules.  Typically these are either
+# built into the kernel or loaded with an initrd already.
+blacklist 3w-xxxx
+blacklist 53c7,8xx
+blacklist AM53C974
+blacklist BusLogic
+blacklist NCR53c406a
+blacklist a100u2w
+blacklist advansys
+blacklist aha152x
+blacklist aha1542
+blacklist aha1740
+blacklist aic79xx
+blacklist aic7xxx
+blacklist aic7xxx_old
+blacklist aic94xx
+blacklist ata_piix
+blacklist atp870u
+blacklist cpqfc
+blacklist dc395x
+blacklist dmx3191d
+blacklist dpt_i2o
+blacklist dtc
+blacklist eata
+blacklist eata_dma
+blacklist eata_pio
+blacklist fdomain
+blacklist g_NCR5380
+blacklist g_NCR5380_mmio
+blacklist gdth
+blacklist ide-scsi
+blacklist imm
+blacklist in2000
+blacklist initio
+blacklist ipr
+blacklist ips
+blacklist libata
+blacklist megaraid
+blacklist ncr53c8xx
+blacklist nsp32
+blacklist osst
+blacklist pas16
+blacklist pci2000
+blacklist pci2220i
+blacklist ppa
+blacklist psi240i
+blacklist qla1280
+blacklist qla2100
+blacklist qla2200
+blacklist qla2300
+blacklist qla2322
+blacklist qla2xxx
+blacklist qla6312
+blacklist qla6322
+blacklist qlogicfas
+blacklist qlogicfas408
+blacklist qlogicfc
+blacklist qlogicisp
+blacklist seagate
+blacklist sim710
+blacklist sata_promise
+blacklist sata_sil
+blacklist sata_sis
+blacklist sata_svw
+blacklist sata_sx4
+blacklist sata_via
+blacklist sata_vsc
+blacklist scsi_debug
+blacklist scsi_transport_fc
+blacklist scsi_transport_spi
+blacklist sym53c416
+blacklist sym53c8xx
+blacklist sym53c8xx
+blacklist t128
+blacklist tmscsim
+blacklist u14-34f
+
+# Blacklist all watchdog modules. Many motherboards hangs with them and,
+# if you really need an watchdog you probably know how to load the module 
+blacklist acquirewdt
+blacklist advantechwdt
+blacklist alim1535_wdt
+blacklist alim7101_wdt
+blacklist cpu5wdt
+blacklist eurotechwdt
+blacklist hpwdt
+blacklist i6300esb
+blacklist iTCO_vendor_support
+blacklist iTCO_wdt
+blacklist ib700wdt
+blacklist ibmasr
+blacklist it8712f_wdt
+blacklist machzwd
+blacklist mixcomwd
+blacklist pc87413_wdt
+blacklist pcwd
+blacklist pcwd_pci
+blacklist pcwd_usb
+blacklist sbc60xxwdt
+blacklist sbc7240_wdt
+blacklist sbc8360
+blacklist sbc_epx_c3
+blacklist sc1200wdt
+blacklist sc520_wdt
+blacklist scx200_wdt
+blacklist smsc37b787_wdt
+blacklist softdog
+blacklist w83627hf_wdt
+blacklist w83697hf_wdt
+blacklist w83877f_wdt
+blacklist w83977f_wdt
+blacklist wafer5823wdt
+blacklist wdt
+blacklist wdt_pci
+
diff --git a/source/a/udev/config/modprobe.d/isapnp.conf.new b/source/a/udev/config/modprobe.d/isapnp.conf.new
new file mode 100644
index 000000000..2ed9305ee
--- /dev/null
+++ b/source/a/udev/config/modprobe.d/isapnp.conf.new
@@ -0,0 +1,15 @@
+# These aliases are here because many PnP modules do not
+# provide aliases for them.
+alias pnp:dPNP0400 parport_pc
+alias pnp:dPNP0401 parport_pc
+alias pnp:dPNP0510 irtty-sir
+alias pnp:dPNP0511 irtty-sir
+alias pnp:dPNP0700 floppy
+alias pnp:dPNP0B00 rtc
+alias acpi:PNP0B00: rtc-cmos
+alias acpi:PNP0B01: rtc-cmos
+alias acpi:PNP0B02: rtc-cmos
+alias pnp:dPNPB02F analog
+alias pnp:dPNP0F13 psmouse
+alias pnp:dPNP0800 pcspkr
+alias pnp:dPNP0303 atkbd
diff --git a/source/a/udev/config/modprobe.d/psmouse.conf.new b/source/a/udev/config/modprobe.d/psmouse.conf.new
new file mode 100644
index 000000000..70c0d8195
--- /dev/null
+++ b/source/a/udev/config/modprobe.d/psmouse.conf.new
@@ -0,0 +1,6 @@
+# PS/2 mouse support:
+# The default options when the psmouse module can cause problems with KVM
+# switches.  If you experience this, you may want to uncomment the line
+# below to use a more basic mouse protocol with the psmouse module:
+#options psmouse proto=imps
+
diff --git a/source/a/udev/config/modprobe.d/usb-controller.conf.new b/source/a/udev/config/modprobe.d/usb-controller.conf.new
new file mode 100644
index 000000000..4b77fd825
--- /dev/null
+++ b/source/a/udev/config/modprobe.d/usb-controller.conf.new
@@ -0,0 +1,4 @@
+# Make sure that ehci-hcd is always loaded before uhci-hci
+# # or ohci-hcd to prevent a kernel warning:
+install uhci-hcd /sbin/modprobe ehci-hcd ; /sbin/modprobe -i uhci-hcd
+install ohci-hcd /sbin/modprobe ehci-hcd ; /sbin/modprobe -i ohci-hcd
diff --git a/source/a/udev/config/rc.d/rc.udev.new b/source/a/udev/config/rc.d/rc.udev.new
new file mode 100644
index 000000000..8c238b0dd
--- /dev/null
+++ b/source/a/udev/config/rc.d/rc.udev.new
@@ -0,0 +1,133 @@
+#!/bin/sh
+# This is a script to initialize udev, which populates the /dev
+# directory with device nodes, scans for devices, loads the
+# appropriate kernel modules, and configures the devices.
+
+PATH="/sbin:/bin"
+OPT=""
+
+. /etc/udev/udev.conf
+
+# remove trailing slash from udev_root
+UDEV_ROOT=$(echo "${udev_root}" |sed 's/\/*$//')
+
+case "$1" in
+    start)
+	# Sanity check #1, udev requires that the kernel support tmpfs:
+        if ! grep -wq tmpfs /proc/filesystems ; then
+          echo "Sorry, but you need tmpfs support in the kernel to use udev."
+          echo
+          echo "FATAL:  Refusing to run /etc/rc.d/rc.udev."
+          exit 1
+        fi
+
+        # Sanity check #2, make sure that a 2.6.x kernel is new enough:
+        if [ "$(uname -r | cut -f 1,2 -d .)" = "2.6" ]; then
+          if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "15" ]; then
+            echo "Sorry, but you need a 2.6.15+ kernel to use udev."
+            echo "Your kernel version is only $(uname -r)."
+            echo
+            echo "FATAL:  Refusing to run /etc/rc.d/rc.udev."
+            exit 1
+          fi
+        fi
+
+        # Sanity check #3, make sure the udev package was not removed.  If udevd
+        # is not there, this will also shut off this script to prevent further
+        # problems:
+        if [ ! -x /sbin/udevd ]; then
+          chmod 644 /etc/rc.d/rc.udev
+          echo "No udevd daemon found."
+          echo "Turning off udev:  chmod 644 /etc/rc.d/rc.udev"
+          echo "FATAL:  Refusing to run /etc/rc.d/rc.udev."
+          exit 1
+        fi
+
+        # Disable hotplug helper since udevd listens to netlink:
+        if [ -e /proc/sys/kernel/hotplug ]; then
+          echo "" > /proc/sys/kernel/hotplug
+        fi
+
+	# if udevd is already running, rc.udev start will try to re-run
+	# failed events. Else, it will start udevd.
+	if ps axc | grep -q udevd ; then
+	  OPT="--type=failed $OPT"
+	  ( cd ${UDEV_ROOT}/.udev
+	    for TMPFILE in tmp-rules-*.rules ; do
+		mv $TMPFILE /etc/udev/rules.d/${TMPFILE/tmp-rules--/} 2>/dev/null
+	    done
+	  ) 
+	else
+	  # Mount tmpfs on $UDEV_ROOT:
+	  if ! grep -E -q "^[^[:space:]]+ $UDEV_ROOT tmpfs" /proc/mounts; then
+		# umount shm if needed
+		if grep -E -q "^[^[:space:]]+ $UDEV_ROOT/shm tmpfs" /proc/mounts; then
+			umount -l $UDEV_ROOT/shm
+		fi
+
+		# Umount pts if needed, we will remount it later:
+		if grep -E -q "^[^[:space:]]+ $UDEV_ROOT/pts devpts" /proc/mounts; then
+			umount -l $UDEV_ROOT/pts
+		fi
+
+		# Mount tmpfs on $UDEV_ROOT:
+		# the -n is because we don't want $UDEV_ROOT umounted when
+		# someone (rc.[06]) calls umount -a
+		mount -n -o mode=0755 -t tmpfs tmpfs $UDEV_ROOT 
+
+		# Remount pts:
+		mkdir $UDEV_ROOT/pts 2> /dev/null
+		mount -n -o mode=0620,gid=5 -t devpts devpts $UDEV_ROOT/pts
+	  fi
+
+	  # Add the static nodes to $UDEV_ROOT:
+	  cp --preserve=all --recursive --remove-destination /lib/udev/devices/* $UDEV_ROOT 
+
+	  # Start udevd:
+	  echo "Starting udevd:  /sbin/udevd --daemon"
+	  /sbin/udevd --daemon
+
+	  # Create rootdev rules
+	  DEVICENUMBER=$( /bin/stat -c %d / )
+	  MAJORNUMBER=$(($DEVICENUMBER / 256))
+	  MINORNUMBER=$(($DEVICENUMBER % 256))
+
+	  echo 'ACTION=="add|change", SUBSYSTEM=="block", ENV{MAJOR}=="'$MAJORNUMBER'", ENV{MINOR}=="'$MINORNUMBER'", SYMLINK+="root"' > /dev/.udev/rules.d/61-dev-root-link.rules
+
+	fi
+
+	echo "Triggering udev events:  /sbin/udevadm trigger $OPT"	
+	# Call udevtrigger and udevsettle to do the device configuration:
+	/sbin/udevadm trigger $OPT && /sbin/udevadm settle --timeout=120
+
+	;;
+    stop)
+	echo "Stopping udevd"
+        if [ -e /proc/sys/kernel/hotplug ]; then
+          echo /sbin/hotplug > /proc/sys/kernel/hotplug
+        fi
+	killall udevd 
+	;;
+    restart)
+	echo "Restarting udevd"
+	killall udevd
+	sleep 5
+	udevd --daemon
+	;;
+    reload)
+	echo "Reloading udev rules"
+	udevadm control --reload-rules
+	cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT
+	;;
+    force-reload)
+	echo "Updating all available device nodes in $UDEV_ROOT"
+	udevadm control --reload-rules
+	rm -rf $UDEV_ROOT/.udev $UDEV_ROOT/disk
+	cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT
+	;;
+	
+    *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}"
+	exit 1
+	;;
+esac
diff --git a/source/a/udev/config/rules.d/40-slackware.rules b/source/a/udev/config/rules.d/40-slackware.rules
new file mode 100644
index 000000000..29b6071e0
--- /dev/null
+++ b/source/a/udev/config/rules.d/40-slackware.rules
@@ -0,0 +1,16 @@
+# /lib/udev/rules.d/40-slackware.rules
+#
+# Slackware custom udev rules
+# Also see the following Slackware-provided custom rules files:
+# 65-permissions.rules and 90-network.rules
+#
+# Any change in this file will be overwritten in upgrades. Put your
+# custom rules somewhere else (90-local.rules is a good idea).
+#
+# See the udev man page to know the parameters you can use in udev
+# rules.
+#
+
+# input devices
+KERNEL=="mice",		SYMLINK+="mouse"
+
diff --git a/source/a/udev/config/rules.d/65-permissions.rules b/source/a/udev/config/rules.d/65-permissions.rules
new file mode 100644
index 000000000..b0cfb2590
--- /dev/null
+++ b/source/a/udev/config/rules.d/65-permissions.rules
@@ -0,0 +1,52 @@
+# Slackware permission rules
+#
+# These rules are here instead of 40-slackware.rules because
+# many of them need to run after the block section in
+# 50-udev.default.rules
+#
+# Remember, in any upgrade, this file will be overwritten.
+# Put your custom rules somewhere else (90-local.rules is 
+# a good idea).
+#
+
+# all disks with group disk
+KERNEL!="fd*", SUBSYSTEM=="block",             GROUP="disk"
+
+# permissions for IDE floppy devices
+KERNEL=="hd*[!0-9]", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", \
+			SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove"
+KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", \
+			SYMLINK+="floppy-%k", OPTIONS+="ignore_remove"
+
+# put all removable devices in group "plugdev"
+KERNEL=="hd*[!0-9]", ATTR{removable}=="1", GROUP="plugdev"
+KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GROUP="plugdev"
+KERNEL=="sd*[!0-9]", ATTR{removable}=="1", GROUP="plugdev"
+KERNEL=="sd*[0-9]", ATTRS{removable}=="1", GROUP="plugdev"
+
+# Many hot-pluggable devices (ZIP, Jazz, LS-120, etc...)
+# need to be in plugdev, too.
+KERNEL=="diskonkey*",	GROUP="plugdev"
+KERNEL=="jaz*",		GROUP="plugdev"
+KERNEL=="pocketzip*",	GROUP="plugdev"
+KERNEL=="zip*",		GROUP="plugdev"
+KERNEL=="ls120",	GROUP="plugdev"
+KERNEL=="microdrive*",	GROUP="plugdev"
+
+# CD group and permissions 
+ENV{ID_CDROM}=="?*", 		GROUP="cdrom", MODE="0660"
+KERNEL=="pktcdvd",		GROUP="cdrom", MODE="0660"
+KERNEL=="pktcdvd[0-9]*",	GROUP="cdrom", MODE="0660"
+# permissions for SCSI sg devices
+SUBSYSTEMS=="scsi", KERNEL=="s[gt][0-9]*", ATTRS{type}=="5", \
+				GROUP="cdrom", MODE="0660"
+
+# Make DRI video devices usable by anyone in group "video":
+KERNEL=="card[0-9]*",GROUP:="video"
+
+# alsa devices
+SUBSYSTEM=="sound", GROUP="audio"
+
+# Make the real time clock readable by all, and writable by root:
+KERNEL=="rtc|rtc0",             MODE="0644"
+
diff --git a/source/a/udev/config/rules.d/90-network.rules b/source/a/udev/config/rules.d/90-network.rules
new file mode 100644
index 000000000..03f2ddc76
--- /dev/null
+++ b/source/a/udev/config/rules.d/90-network.rules
@@ -0,0 +1,5 @@
+# This file will be overwritten in next upgrade.  Please put your
+# custom rules somewhere else (90-local.rules is a good idea)
+
+SUBSYSTEM=="net", NAME=="?*", ACTION=="add", RUN+="nethelper.sh $env{INTERFACE} start"
+SUBSYSTEM=="net", NAME=="?*", ACTION=="remove", RUN+="nethelper.sh $env{INTERFACE} stop"
diff --git a/source/a/udev/config/scripts/nethelper.sh b/source/a/udev/config/scripts/nethelper.sh
new file mode 100755
index 000000000..9e1720271
--- /dev/null
+++ b/source/a/udev/config/scripts/nethelper.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+DEVNAME="$1"
+COMMAND="$2"
+
+testwrite() { 
+	if touch /var/run/checkrw 2>/dev/null ; then
+		rm -rf /var/run/checkrw 
+		RW=1
+	fi
+}
+
+case $DEVNAME in
+	eth*|ath*|wlan*|ra*|sta*|ctc*|lcs*|hsi*)
+		case $COMMAND in
+			'start')
+				testwrite
+
+				if [ $RW ]; then
+					if [ -x /etc/rc.d/rc.inet1 ]; then
+						if ! /sbin/ifconfig | /bin/grep -q "^${DEVNAME} "; then
+							/etc/rc.d/rc.inet1 ${DEVNAME}_start
+						fi
+					fi
+					exit 0
+				else
+					exit 1
+				fi
+				;;
+			'stop')
+	                        if [ -x /etc/rc.d/rc.inet1 ]; then
+                                     if /sbin/ifconfig | /bin/grep -q "^${DEVNAME} "; then
+                                        /etc/rc.d/rc.inet1 ${DEVNAME}_stop
+                                     fi
+                                fi
+                                # Does dhcpcd appear to still be running on the
+				# interface?  If so, try to stop it.
+                                if [ -r /etc/dhcpc/dhcpcd-$DEVNAME.pid -o -r /var/run/dhcpcd-$DEVNAME.pid ]; then
+                                  /sbin/dhcpcd -k -d $DEVNAME
+                                  # Force garbage removal, if needed:
+                                  if [ -r /etc/dhcpc/dhcpcd-$DEVNAME.pid ]; then
+                                     /bin/rm -f /etc/dhcpc/dhcpcd-$DEVNAME.pid
+                                  elif [ -r /var/run/dhcpcd-$DEVNAME.pid ]; then
+                                     /bin/rm -f /var/run/dhcpcd-$DEVNAME.pid
+                                  fi
+                                fi
+                                # If the interface is now down, exit with a status of 0:
+                                if /sbin/ifconfig | /bin/grep -q "^${DEVNAME} " ; then
+                                  exit 0
+                                fi
+                                ;;
+			*)
+				echo "usage $0 interface start|stop"
+				exit 1
+				;;
+		esac
+	;;
+	*)
+		echo "Interface $DEVNAME not supported."
+		exit 1
+	;;
+esac
+exit 0
diff --git a/source/a/udev/config/udev.conf b/source/a/udev/config/udev.conf
new file mode 100644
index 000000000..b0421a08b
--- /dev/null
+++ b/source/a/udev/config/udev.conf
@@ -0,0 +1,14 @@
+# udev.conf
+# The main config file for udev
+#
+# This file can be used to override some of udev's default values for where it
+# looks for files, and where it places device nodes.
+
+# udev_root - where in the filesystem to place the device nodes
+udev_root="/dev/"
+
+# udev_log - The initial syslog(3) priority: "err", "info", "debug" or
+# its numerical equivalent.  For runtime debugging, the daemons
+# internal state can be changed with:  udevcontrol log_priority=<value>
+udev_log="err"
+
diff --git a/source/a/udev/doinst.sh b/source/a/udev/doinst.sh
new file mode 100644
index 000000000..5e737ca0c
--- /dev/null
+++ b/source/a/udev/doinst.sh
@@ -0,0 +1,39 @@
+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...
+}
+
+# Keep same perms on rc.udev.new:
+if [ -e etc/rc.d/rc.udev ]; then
+  cp -a etc/rc.d/rc.udev etc/rc.d/rc.udev.new.incoming
+  cat etc/rc.d/rc.udev.new > etc/rc.d/rc.udev.new.incoming
+  mv etc/rc.d/rc.udev.new.incoming etc/rc.d/rc.udev.new
+fi
+
+# There's no reason for a user to edit rc.udev, so overwrite it:
+if [ -r etc/rc.d/rc.udev.new ]; then
+  mv etc/rc.d/rc.udev.new etc/rc.d/rc.udev
+fi
+
+# This should catch *all* files in /etc/modprobe.d/ and move them over to
+# have .conf extensions
+for modfile in $(ls etc/modprobe.d/ | grep -v "\.\(conf\|bak\|orig\|new\)"); do
+  if [ -e etc/modprobe.d/$modfile -a ! -e etc/modprobe.d/$modfile.conf ]; then
+    mv etc/modprobe.d/$modfile etc/modprobe.d/$modfile.conf
+  elif [ -e etc/modprobe.d/$modfile -a -e etc/modprobe.d/$modfile.conf ]; then
+    mv etc/modprobe.d/$modfile etc/modprobe.d/$modfile.bak
+  fi
+done
+
+config etc/modprobe.d/blacklist.conf.new
+config etc/modprobe.d/isapnp.conf.new
+config etc/modprobe.d/psmouse.conf.new
+config etc/modprobe.d/usb-controller.conf.new
+
diff --git a/source/a/udev/rule_generator.diff b/source/a/udev/rule_generator.diff
new file mode 100644
index 000000000..0ff218a6c
--- /dev/null
+++ b/source/a/udev/rule_generator.diff
@@ -0,0 +1,80 @@
+diff -Naur udev-114/extras/rule_generator/write_cd_rules udev-114slk/extras/rule_generator/write_cd_rules
+--- udev-114/extras/rule_generator/write_cd_rules	2007-08-05 09:08:47.000000000 -0300
++++ udev-114slk/extras/rule_generator/write_cd_rules	2007-08-22 20:17:24.000000000 -0300
+@@ -3,7 +3,8 @@
+ # This script is run if an optical drive lacks a rule for persistent naming.
+ #
+ # It adds symlinks for optical drives based on the device class determined
+-# by cdrom_id and used ID_PATH to identify the device.
++# by cdrom_id and used ID_PATH or ID_SERIAL or ID_MODEL and ID_REVISION
++# to identify the device.
+ #
+ # (C) 2006 Marco d'Itri <md@Linux.IT>
+ #
+@@ -97,18 +98,59 @@
+ choose_rules_file
+ 
+ link_num=$(find_next_available 'cdrom[0-9]*')
++[ "$link_num" = "" ] && link_num=0
+ 
+ match="ENV{ID_CDROM}==\"?*\", $RULE"
+ 
+ comment="$ID_MODEL ($ID_PATH)"
+-
+ 	write_rule "$match" "cdrom$link_num" "$comment"
+-[ "$ID_CDROM_CD_R" -o "$ID_CDROM_CD_RW" ] && \
+-	write_rule "$match" "cdrw$link_num"
+-[ "$ID_CDROM_DVD" ] && \
+-	write_rule "$match" "dvd$link_num"
+-[ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ] && \
+-	write_rule "$match" "dvdrw$link_num"
++	if [ "$(find_all_rules 'SYMLINK+=' cdrom)" = "" ]; then
++		write_rule "$match" "cdrom"
++	fi
++
++	if [ "$ID_CDROM_CD_R" ]; then
++	       	write_rule "$match" "cdr$link_num"
++		if [ "$(find_all_rules 'SYMLINK+=' cdr)" = "" ]; then
++			write_rule "$match" "cdr"
++		fi
++
++		write_rule "$match" "cdwriter$link_num"
++		if [ "$(find_all_rules 'SYMLINK+=' cdwriter)" = "" ]; then
++			write_rule "$match" "cdwriter"
++		fi
++
++		if [ "$ID_CDROM_CD_RW" ]; then
++			write_rule "$match" "cdrw$link_num"
++			if [ "$(find_all_rules 'SYMLINK+=' cdrw)" = "" ]; then
++				write_rule "$match" "cdrw"
++			fi
++		fi
++
++		if [ "$(find_all_rules 'SYMLINK+=' writer)" = "" ]; then
++			write_rule "$match" "writer"
++		fi
++	fi
++
++	if [  "$ID_CDROM_DVD" ]; then
++		write_rule "$match" "dvd$link_num"
++		if [ "$(find_all_rules 'SYMLINK+=' dvd)" = "" ]; then
++			write_rule "$match" "dvd"
++		fi
++
++		if [ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ]; then
++			write_rule "$match" "dvdrw$link_num"
++			if [ "$(find_all_rules 'SYMLINK+=' dvdrw)" = "" ]; then
++				write_rule "$match" "dvdrw"
++			fi
++
++			write_rule "$match" "dvdwriter$link_num"
++			if [ "$(find_all_rules 'SYMLINK+=' dvdwriter)" = "" ]; then
++				write_rule "$match" "dvdwriter"
++			fi
++		fi
++	fi
++
++
+ 
+ unlock_rules_file
+ 
diff --git a/source/a/udev/slack-desc b/source/a/udev/slack-desc
new file mode 100644
index 000000000..c411756c8
--- /dev/null
+++ b/source/a/udev/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-------------------------------------------------------|
+udev: udev (dynamic device directory system)
+udev:
+udev: udev provides a dynamic device directory containing only the files
+udev: for the devices which are actually present.  It creates or removes
+udev: device node files usually located in the /dev directory.
+udev:
+udev: udev requires a 2.6 or newer kernel.
+udev:
+udev: Kay Sievers is the udev maintainer.
+udev:
+udev:
diff --git a/source/a/udev/udev-141.tar.bz2.sign b/source/a/udev/udev-141.tar.bz2.sign
new file mode 100644
index 000000000..a30826919
--- /dev/null
+++ b/source/a/udev/udev-141.tar.bz2.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
+
+iD8DBQBJ3TgkyGugalF9Dw4RAtJCAJ4+ns9bz4ZIu+3ecfra/BWrn3euqwCeOFQZ
+6A7UqbHlTlD48sOk249ZATA=
+=AY1A
+-----END PGP SIGNATURE-----
diff --git a/source/a/udev/udev.SlackBuild b/source/a/udev/udev.SlackBuild
new file mode 100755
index 000000000..0c6327486
--- /dev/null
+++ b/source/a/udev/udev.SlackBuild
@@ -0,0 +1,140 @@
+#!/bin/sh
+
+# Copyright 2006, 2008, 2009  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.
+
+
+VERSION=${VERSION:-141}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-udev
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/lib/udev
+cd $TMP
+rm -rf udev-$VERSION
+tar xvf $CWD/udev-$VERSION.tar.bz2 || exit 1
+cd udev-$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 {} \;
+
+zcat $CWD/rule_generator.diff.gz | patch -p1 --verbose || exit 1
+
+./configure \
+  --prefix=/usr \
+  --exec-prefix=/ \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --with-libdir-name=lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make 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 || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+# scsi_id and vol_id are needed by multipath
+( cd $PKG/sbin 
+  ln -s ../lib/udev/scsi_id scsi_id
+  ln -s ../lib/udev/vol_id vol_id
+)
+
+mkdir -p \
+  $PKG/etc/modprobe.d \
+  $PKG/etc/rc.d \
+  $PKG/etc/udev/rules.d \
+  $PKG/lib/firmware
+
+# Yes, these will clobber existing config files.
+cp -a $CWD/config/udev.conf $PKG/etc/udev/udev.conf
+# Copy Slackware custom rules
+cp -a $CWD/config/rules.d/* $PKG/lib/udev/rules.d/
+# Copy some files from upstream
+cp -a rules/packages/40-alsa.rules $PKG/lib/udev/rules.d/
+cp -a rules/packages/40-isdn.rules $PKG/lib/udev/rules.d/
+cp -a rules/packages/40-zaptel.rules $PKG/lib/udev/rules.d/
+cp -a rules/packages/40-infiniband.rules $PKG/lib/udev/rules.d/
+#cp -a rules/packages/40-pilot-links.rules $PKG/etc/udev/rules.d/
+#cp -a rules/packages/64-md-raid.rules $PKG/etc/udev/rules.d/
+# Now the init script and module-init-tools stuff
+cp -a $CWD/config/rc.d/rc.udev.new $PKG/etc/rc.d/rc.udev.new
+cp -a $CWD/config/modprobe.d/* $PKG/etc/modprobe.d
+
+chown -R root:root $PKG/etc
+find $PKG/etc -type f -exec chmod 644 {} \;
+find $PKG/etc -type d -exec chmod 755 {} \;
+chmod 755 $PKG/etc/rc.d/rc.udev.new
+
+# Add extra device nodes to the package that udev doesn't make:
+tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG
+
+# Add various helper scripts:
+for file in $CWD/config/scripts/* ; do
+  cp -a $file $PKG/lib/udev/
+done
+chown -R root:root $PKG/lib/udev
+chmod 755 $PKG/lib/udev/*
+
+mkdir -p $PKG/usr/doc/udev-$VERSION
+cp -a \
+  COPYING* FAQ README* TODO RELEASE-NOTES docs \
+  $PKG/usr/doc/udev-$VERSION
+
+# Compress and fix manpage symlinks:
+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
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c y $TMP/udev-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/a/unarj/Makefile b/source/a/unarj/Makefile
new file mode 100644
index 000000000..95483e751
--- /dev/null
+++ b/source/a/unarj/Makefile
@@ -0,0 +1,21 @@
+#
+# Makefile for unarj under Linux
+# by Arrigo Triulzi ({a.triulzi,agbt}@{imperial,ic}.ac.uk)
+#
+
+CC = gcc
+CFLAGS = -O2 -DUNIX
+INSTALLDIR=/usr/bin
+
+unarj: unarj.o decode.o environ.o
+	gcc $(CFLAGS) -o unarj unarj.o decode.o environ.o
+
+clean:
+	rm -f core unarj *.o *.out
+
+install:
+	cp unarj $(INSTALLDIR)
+
+unarj.o: unarj.c unarj.h Makefile
+environ.o:  environ.c unarj.h Makefile
+decode.o:   decode.c unarj.h Makefile
diff --git a/source/a/unarj/slack-desc b/source/a/unarj/slack-desc
new file mode 100644
index 000000000..14b080098
--- /dev/null
+++ b/source/a/unarj/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------------------------------------------------------|
+unarj: unarj (a command-line utility for decompressing .arj archives)
+unarj:
+unarj: This is a simple command-line tool for decompressing .arj files.
+unarj: Thanks to Haruhiko Okumura and ARJ Software, Inc. for providing this
+unarj: source code free of charge.
+unarj:
+unarj: UNARJ software and manual copyright (c) 1990-2002 ARJ Software, Inc.
+unarj: All rights reserved.
+unarj:
+unarj:
+unarj:
diff --git a/source/a/unarj/unarj.SlackBuild b/source/a/unarj/unarj.SlackBuild
new file mode 100755
index 000000000..56097eb2c
--- /dev/null
+++ b/source/a/unarj/unarj.SlackBuild
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=265
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-unarj
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf unarj${VERSION}
+tar xzvf $CWD/unarj${VERSION}.tar.gz
+cd unarj${VERSION}
+chown -R root:root .
+cp -a $CWD/Makefile.gz .
+gzip --force -d Makefile.gz
+make || exit 1
+mkdir -p $PKG/usr/bin
+cat unarj > $PKG/usr/bin/unarj
+chmod 755 $PKG/usr/bin/unarj
+mkdir -p $PKG/usr/doc/unarj${VERSION}
+cp -a \
+  *.txt \
+  $PKG/usr/doc/unarj${VERSION}
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/unarj-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/usbutils/slack-desc b/source/a/usbutils/slack-desc
new file mode 100644
index 000000000..ffca25c28
--- /dev/null
+++ b/source/a/usbutils/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------------------------------------------------------|
+usbutils: usbutils (USB utilities)
+usbutils:
+usbutils: lsusb displays detailed information about all USB buses and devices
+usbutils: in the system.
+usbutils:
+usbutils: usbmodules lists the kernel modules for a plugged in USB device.
+usbutils:
+usbutils: See the manual pages for more details.
+usbutils:
+usbutils:
+usbutils:
diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild
new file mode 100755
index 000000000..dcb14b466
--- /dev/null
+++ b/source/a/usbutils/usbutils.SlackBuild
@@ -0,0 +1,120 @@
+#!/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:-0.82}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-usbutils
+
+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"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf usbutils-$VERSION
+tar xvf $CWD/usbutils-$VERSION.tar.?z* || exit 1
+cd usbutils-$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 {} \;
+
+# Fetch the latest usb.ids:
+rm -f usb.ids*
+wget $(grep 'SRC=' update-usbids.sh.in | cut -d= -f2- | tr -d \")
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sbindir=/sbin \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Get rid of this redundant file:
+rm -f $PKG/usr/share/usb.ids.gz
+
+# The usbids are kept under /usr, so it makes no sense at all to have
+# this util in /sbin rather than /usr/sbin:
+mkdir -p $PKG/usr/sbin
+mv $PKG/sbin/update-usbids.sh $PKG/usr/sbin/update-usbids.sh
+
+# Now that they install the util as "update-usbids.sh" instead of
+# "update-usbids", we have to make a compatibility symlink in case
+# anyone is updating this with a cron job or some such:
+( cd $PKG/usr/sbin ; ln -sf update-usbids.sh update-usbids )
+
+# And, since they put the util in /sbin, we'd better at least make the
+# upstream name available there too...
+( cd $PKG/sbin ; ln -sf /usr/sbin/update-usbids.sh . )
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# 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/usr/doc/usbutils-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog NEWS README \
+  $PKG/usr/doc/usbutils-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/usbutils-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/usbutils/usbutils.ids.dest b/source/a/usbutils/usbutils.ids.dest
new file mode 100644
index 000000000..67111881e
--- /dev/null
+++ b/source/a/usbutils/usbutils.ids.dest
@@ -0,0 +1,11 @@
+--- ./update-usbids.sh.orig	2005-01-22 17:03:47.000000000 -0600
++++ ./update-usbids.sh	2007-01-04 17:14:28.000000000 -0600
+@@ -4,7 +4,7 @@
+ 
+ set -e
+ SRC="http://www.linux-usb.org/usb.ids"
+-DEST=usb.ids
++DEST=/usr/share/usb.ids
+ 
+ if which wget >/dev/null ; then
+ 	DL="wget -O $DEST.new $SRC"
diff --git a/source/a/utempter/doinst.sh b/source/a/utempter/doinst.sh
new file mode 100644
index 000000000..94c6231df
--- /dev/null
+++ b/source/a/utempter/doinst.sh
@@ -0,0 +1,10 @@
+if ! grep "^utmp:" etc/group 1> /dev/null 2> /dev/null ; then
+  if ! grep ":22:" etc/group 1> /dev/null 2> /dev/null ; then
+    # we'll be adding this in the etc package anyway.
+    echo "utmp::22:" >> etc/group
+    # This should be able to handle itself...
+    #chown root:utmp usr/sbin/utempter
+  fi
+fi
+chown root:utmp var/run/utmp var/log/wtmp
+chmod 664 var/run/utmp var/log/wtmp
diff --git a/source/a/utempter/slack-desc b/source/a/utempter/slack-desc
new file mode 100644
index 000000000..ff00f66e6
--- /dev/null
+++ b/source/a/utempter/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------------------------------------------------------|
+utempter: utempter (utmp updating library and utility)
+utempter:
+utempter: The utempter package provides a utility and shared library that
+utempter: allows terminal applications such as xterm and screen to update
+utempter: /var/run/utmp and /var/log/wtmp without requiring root privileges.
+utempter:
+utempter:
+utempter:
+utempter:
+utempter:
+utempter:
diff --git a/source/a/utempter/utempter.SlackBuild b/source/a/utempter/utempter.SlackBuild
new file mode 100755
index 000000000..7d0d24b75
--- /dev/null
+++ b/source/a/utempter/utempter.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=1.1.4
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-utempter
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr
+
+cd $TMP
+# The original package name was "utempter", but this new version
+# calls itself "libutempter".  We'll keep the same old package name
+# to avoid confusing upgrades.
+rm -rf libutempter-$VERSION
+tar xjvf $CWD/libutempter-$VERSION.tar.bz2
+cd libutempter-$VERSION
+chown -R root:root .
+## I see no reason to use different paths than in utempter-0.5.2:
+#zcat $CWD/libutempter.slack.diff.gz | patch -p1 --verbose || exit 1
+find . -perm 664 -exec chmod 644 {} \;
+find . -perm 775 -exec chmod 755 {} \;
+sed -i -e "s#/usr/lib#/usr/lib${LIBDIRSUFFIX}#g" Makefile
+make
+make install DESTDIR=$PKG
+# A static libutempter seems like a bad idea, since it wouldn't work
+# without the making utempter binary.  That and the shared lib are a
+# closely matched set.
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libutempter.a
+# Set proper permissions:
+chown root:utmp $PKG/usr/lib${LIBDIRSUFFIX}/utempter/utempter
+chmod 2755 $PKG/usr/lib${LIBDIRSUFFIX}/utempter/utempter
+chmod 644 $PKG/usr/include/utempter.h
+mkdir -p $PKG/usr/doc/utempter-$VERSION
+cp -a \
+  COPYING README \
+  $PKG/usr/doc/utempter-$VERSION
+( 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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+makepkg -l y -c n $TMP/utempter-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/util-linux-ng/adjtimex_1.23-1.diff b/source/a/util-linux-ng/adjtimex_1.23-1.diff
new file mode 100644
index 000000000..8c250157e
--- /dev/null
+++ b/source/a/util-linux-ng/adjtimex_1.23-1.diff
@@ -0,0 +1,5456 @@
+--- adjtimex-1.23.orig/config.sub
++++ adjtimex-1.23/config.sub
+@@ -0,0 +1,1622 @@
++#! /bin/sh
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++#   Inc.
++
++timestamp='2007-01-18'
++
++# This file is (in principle) common to ALL GNU software.
++# The presence of a machine in this file suggests that SOME GNU software
++# can handle that machine.  It does not imply ALL GNU software can.
++#
++# This file is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++
++# Please send patches to <config-patches@gnu.org>.  Submit a context
++# diff and a properly formatted ChangeLog entry.
++#
++# Configuration subroutine to validate and canonicalize a configuration type.
++# Supply the specified configuration type as an argument.
++# If it is invalid, we print an error message on stderr and exit with code 1.
++# Otherwise, we print the canonical config type on stdout and succeed.
++
++# This file is supposed to be the same for all GNU packages
++# and recognize all the CPU types, system types and aliases
++# that are meaningful with *any* GNU software.
++# Each package is responsible for reporting which valid configurations
++# it does not support.  The user should be able to distinguish
++# a failure to support a valid configuration from a meaningless
++# configuration.
++
++# The goal of this file is to map all the various variations of a given
++# machine specification into a single specification in the form:
++#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
++# or in some cases, the newer four-part form:
++#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
++# It is wrong to echo any other type of specification.
++
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
++
++Canonicalize a configuration name.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit ;;
++    --version | -v )
++       echo "$version" ; exit ;;
++    --help | --h* | -h )
++       echo "$usage"; exit ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help"
++       exit 1 ;;
++
++    *local*)
++       # First pass through any local machine types.
++       echo $1
++       exit ;;
++
++    * )
++       break ;;
++  esac
++done
++
++case $# in
++ 0) echo "$me: missing argument$help" >&2
++    exit 1;;
++ 1) ;;
++ *) echo "$me: too many arguments$help" >&2
++    exit 1;;
++esac
++
++# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
++# Here we must recognize all the valid KERNEL-OS combinations.
++maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
++case $maybe_os in
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  storm-chaos* | os2-emx* | rtmk-nova*)
++    os=-$maybe_os
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++    ;;
++  *)
++    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
++    if [ $basic_machine != $1 ]
++    then os=`echo $1 | sed 's/.*-/-/'`
++    else os=; fi
++    ;;
++esac
++
++### Let's recognize common machines as not being operating systems so
++### that things like config.sub decstation-3100 work.  We also
++### recognize some manufacturers as not being operating systems, so we
++### can provide default operating systems below.
++case $os in
++	-sun*os*)
++		# Prevent following clause from handling this invalid input.
++		;;
++	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
++	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
++	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
++	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
++	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
++	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
++	-apple | -axis | -knuth | -cray)
++		os=
++		basic_machine=$1
++		;;
++	-sim | -cisco | -oki | -wec | -winbond)
++		os=
++		basic_machine=$1
++		;;
++	-scout)
++		;;
++	-wrs)
++		os=-vxworks
++		basic_machine=$1
++		;;
++	-chorusos*)
++		os=-chorusos
++		basic_machine=$1
++		;;
++ 	-chorusrdb)
++ 		os=-chorusrdb
++		basic_machine=$1
++ 		;;
++	-hiux*)
++		os=-hiuxwe2
++		;;
++	-sco6)
++		os=-sco5v6
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco5)
++		os=-sco3.2v5
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco4)
++		os=-sco3.2v4
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco3.2.[4-9]*)
++		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco3.2v[4-9]*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-sco*)
++		os=-sco3.2v2
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-udk*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-isc)
++		os=-isc2.2
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-clix*)
++		basic_machine=clipper-intergraph
++		;;
++	-isc*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
++	-lynx*)
++		os=-lynxos
++		;;
++	-ptx*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
++		;;
++	-windowsnt*)
++		os=`echo $os | sed -e 's/windowsnt/winnt/'`
++		;;
++	-psos*)
++		os=-psos
++		;;
++	-mint | -mint[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
++esac
++
++# Decode aliases for certain CPU-COMPANY combinations.
++case $basic_machine in
++	# Recognize the basic CPU types without company name.
++	# Some are omitted here because they have special meanings below.
++	1750a | 580 \
++	| a29k \
++	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
++	| am33_2.0 \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++	| bfin \
++	| c4x | clipper \
++	| d10v | d30v | dlx | dsp16xx \
++	| fido | fr30 | frv \
++	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| i370 | i860 | i960 | ia64 \
++	| ip2k | iq2000 \
++	| m32c | m32r | m32rle | m68000 | m68k | m88k \
++	| maxq | mb | microblaze | mcore | mep \
++	| mips | mipsbe | mipseb | mipsel | mipsle \
++	| mips16 \
++	| mips64 | mips64el \
++	| mips64vr | mips64vrel \
++	| mips64orion | mips64orionel \
++	| mips64vr4100 | mips64vr4100el \
++	| mips64vr4300 | mips64vr4300el \
++	| mips64vr5000 | mips64vr5000el \
++	| mips64vr5900 | mips64vr5900el \
++	| mipsisa32 | mipsisa32el \
++	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa64 | mipsisa64el \
++	| mipsisa64r2 | mipsisa64r2el \
++	| mipsisa64sb1 | mipsisa64sb1el \
++	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipstx39 | mipstx39el \
++	| mn10200 | mn10300 \
++	| mt \
++	| msp430 \
++	| nios | nios2 \
++	| ns16k | ns32k \
++	| or32 \
++	| pdp10 | pdp11 | pj | pjl \
++	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| pyramid \
++	| score \
++	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| sh64 | sh64le \
++	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++	| spu | strongarm \
++	| tahoe | thumb | tic4x | tic80 | tron \
++	| v850 | v850e \
++	| we32k \
++	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| z8k)
++		basic_machine=$basic_machine-unknown
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12)
++		# Motorola 68HC11/12.
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
++		;;
++	ms1)
++		basic_machine=mt-unknown
++		;;
++
++	# We use `pc' rather than `unknown'
++	# because (1) that's what they normally are, and
++	# (2) the word "unknown" tends to confuse beginning users.
++	i*86 | x86_64)
++	  basic_machine=$basic_machine-pc
++	  ;;
++	# Object if more than one company name word.
++	*-*-*)
++		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		exit 1
++		;;
++	# Recognize the basic CPU types with company name.
++	580-* \
++	| a29k-* \
++	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++	| avr-* | avr32-* \
++	| bfin-* | bs2000-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++	| clipper-* | craynv-* | cydra-* \
++	| d10v-* | d30v-* | dlx-* \
++	| elxsi-* \
++	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
++	| h8300-* | h8500-* \
++	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| i*86-* | i860-* | i960-* | ia64-* \
++	| ip2k-* | iq2000-* \
++	| m32c-* | m32r-* | m32rle-* \
++	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* \
++	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
++	| mips16-* \
++	| mips64-* | mips64el-* \
++	| mips64vr-* | mips64vrel-* \
++	| mips64orion-* | mips64orionel-* \
++	| mips64vr4100-* | mips64vr4100el-* \
++	| mips64vr4300-* | mips64vr4300el-* \
++	| mips64vr5000-* | mips64vr5000el-* \
++	| mips64vr5900-* | mips64vr5900el-* \
++	| mipsisa32-* | mipsisa32el-* \
++	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa64-* | mipsisa64el-* \
++	| mipsisa64r2-* | mipsisa64r2el-* \
++	| mipsisa64sb1-* | mipsisa64sb1el-* \
++	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipstx39-* | mipstx39el-* \
++	| mmix-* \
++	| mt-* \
++	| msp430-* \
++	| nios-* | nios2-* \
++	| none-* | np1-* | ns16k-* | ns32k-* \
++	| orion-* \
++	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| pyramid-* \
++	| romp-* | rs6000-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
++	| sparclite-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
++	| tahoe-* | thumb-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tron-* \
++	| v850-* | v850e-* | vax-* \
++	| we32k-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa-* \
++	| ymp-* \
++	| z8k-*)
++		;;
++	# Recognize the various machine names and aliases which stand
++	# for a CPU type and a company and sometimes even an OS.
++	386bsd)
++		basic_machine=i386-unknown
++		os=-bsd
++		;;
++	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
++		basic_machine=m68000-att
++		;;
++	3b*)
++		basic_machine=we32k-att
++		;;
++	a29khif)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++    	abacus)
++		basic_machine=abacus-unknown
++		;;
++	adobe68k)
++		basic_machine=m68010-adobe
++		os=-scout
++		;;
++	alliant | fx80)
++		basic_machine=fx80-alliant
++		;;
++	altos | altos3068)
++		basic_machine=m68k-altos
++		;;
++	am29k)
++		basic_machine=a29k-none
++		os=-bsd
++		;;
++	amd64)
++		basic_machine=x86_64-pc
++		;;
++	amd64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	amdahl)
++		basic_machine=580-amdahl
++		os=-sysv
++		;;
++	amiga | amiga-*)
++		basic_machine=m68k-unknown
++		;;
++	amigaos | amigados)
++		basic_machine=m68k-unknown
++		os=-amigaos
++		;;
++	amigaunix | amix)
++		basic_machine=m68k-unknown
++		os=-sysv4
++		;;
++	apollo68)
++		basic_machine=m68k-apollo
++		os=-sysv
++		;;
++	apollo68bsd)
++		basic_machine=m68k-apollo
++		os=-bsd
++		;;
++	aux)
++		basic_machine=m68k-apple
++		os=-aux
++		;;
++	balance)
++		basic_machine=ns32k-sequent
++		os=-dynix
++		;;
++	c90)
++		basic_machine=c90-cray
++		os=-unicos
++		;;
++	convex-c1)
++		basic_machine=c1-convex
++		os=-bsd
++		;;
++	convex-c2)
++		basic_machine=c2-convex
++		os=-bsd
++		;;
++	convex-c32)
++		basic_machine=c32-convex
++		os=-bsd
++		;;
++	convex-c34)
++		basic_machine=c34-convex
++		os=-bsd
++		;;
++	convex-c38)
++		basic_machine=c38-convex
++		os=-bsd
++		;;
++	cray | j90)
++		basic_machine=j90-cray
++		os=-unicos
++		;;
++	craynv)
++		basic_machine=craynv-cray
++		os=-unicosmp
++		;;
++	cr16c)
++		basic_machine=cr16c-unknown
++		os=-elf
++		;;
++	crds | unos)
++		basic_machine=m68k-crds
++		;;
++	crisv32 | crisv32-* | etraxfs*)
++		basic_machine=crisv32-axis
++		;;
++	cris | cris-* | etrax*)
++		basic_machine=cris-axis
++		;;
++	crx)
++		basic_machine=crx-unknown
++		os=-elf
++		;;
++	da30 | da30-*)
++		basic_machine=m68k-da30
++		;;
++	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
++		basic_machine=mips-dec
++		;;
++	decsystem10* | dec10*)
++		basic_machine=pdp10-dec
++		os=-tops10
++		;;
++	decsystem20* | dec20*)
++		basic_machine=pdp10-dec
++		os=-tops20
++		;;
++	delta | 3300 | motorola-3300 | motorola-delta \
++	      | 3300-motorola | delta-motorola)
++		basic_machine=m68k-motorola
++		;;
++	delta88)
++		basic_machine=m88k-motorola
++		os=-sysv3
++		;;
++	djgpp)
++		basic_machine=i586-pc
++		os=-msdosdjgpp
++		;;
++	dpx20 | dpx20-*)
++		basic_machine=rs6000-bull
++		os=-bosx
++		;;
++	dpx2* | dpx2*-bull)
++		basic_machine=m68k-bull
++		os=-sysv3
++		;;
++	ebmon29k)
++		basic_machine=a29k-amd
++		os=-ebmon
++		;;
++	elxsi)
++		basic_machine=elxsi-elxsi
++		os=-bsd
++		;;
++	encore | umax | mmax)
++		basic_machine=ns32k-encore
++		;;
++	es1800 | OSE68k | ose68k | ose | OSE)
++		basic_machine=m68k-ericsson
++		os=-ose
++		;;
++	fx2800)
++		basic_machine=i860-alliant
++		;;
++	genix)
++		basic_machine=ns32k-ns
++		;;
++	gmicro)
++		basic_machine=tron-gmicro
++		os=-sysv
++		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
++	h3050r* | hiux*)
++		basic_machine=hppa1.1-hitachi
++		os=-hiuxwe2
++		;;
++	h8300hms)
++		basic_machine=h8300-hitachi
++		os=-hms
++		;;
++	h8300xray)
++		basic_machine=h8300-hitachi
++		os=-xray
++		;;
++	h8500hms)
++		basic_machine=h8500-hitachi
++		os=-hms
++		;;
++	harris)
++		basic_machine=m88k-harris
++		os=-sysv3
++		;;
++	hp300-*)
++		basic_machine=m68k-hp
++		;;
++	hp300bsd)
++		basic_machine=m68k-hp
++		os=-bsd
++		;;
++	hp300hpux)
++		basic_machine=m68k-hp
++		os=-hpux
++		;;
++	hp3k9[0-9][0-9] | hp9[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hp9k2[0-9][0-9] | hp9k31[0-9])
++		basic_machine=m68000-hp
++		;;
++	hp9k3[2-9][0-9])
++		basic_machine=m68k-hp
++		;;
++	hp9k6[0-9][0-9] | hp6[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hp9k7[0-79][0-9] | hp7[0-79][0-9])
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k78[0-9] | hp78[0-9])
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[0-9][13679] | hp8[0-9][13679])
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[0-9][0-9] | hp8[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hppa-next)
++		os=-nextstep3
++		;;
++	hppaosf)
++		basic_machine=hppa1.1-hp
++		os=-osf
++		;;
++	hppro)
++		basic_machine=hppa1.1-hp
++		os=-proelf
++		;;
++	i370-ibm* | ibm*)
++		basic_machine=i370-ibm
++		;;
++# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
++	i*86v32)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-sysv32
++		;;
++	i*86v4*)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-sysv4
++		;;
++	i*86v)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-sysv
++		;;
++	i*86sol2)
++		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		os=-solaris2
++		;;
++	i386mach)
++		basic_machine=i386-mach
++		os=-mach
++		;;
++	i386-vsta | vsta)
++		basic_machine=i386-unknown
++		os=-vsta
++		;;
++	iris | iris4d)
++		basic_machine=mips-sgi
++		case $os in
++		    -irix*)
++			;;
++		    *)
++			os=-irix4
++			;;
++		esac
++		;;
++	isi68 | isi)
++		basic_machine=m68k-isi
++		os=-sysv
++		;;
++	m88k-omron*)
++		basic_machine=m88k-omron
++		;;
++	magnum | m3230)
++		basic_machine=mips-mips
++		os=-sysv
++		;;
++	merlin)
++		basic_machine=ns32k-utek
++		os=-sysv
++		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
++	miniframe)
++		basic_machine=m68000-convergent
++		;;
++	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
++	mips3*-*)
++		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
++		;;
++	mips3*)
++		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
++		;;
++	monitor)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
++	morphos)
++		basic_machine=powerpc-unknown
++		os=-morphos
++		;;
++	msdos)
++		basic_machine=i386-pc
++		os=-msdos
++		;;
++	ms1-*)
++		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		;;
++	mvs)
++		basic_machine=i370-ibm
++		os=-mvs
++		;;
++	ncr3000)
++		basic_machine=i486-ncr
++		os=-sysv4
++		;;
++	netbsd386)
++		basic_machine=i386-unknown
++		os=-netbsd
++		;;
++	netwinder)
++		basic_machine=armv4l-rebel
++		os=-linux
++		;;
++	news | news700 | news800 | news900)
++		basic_machine=m68k-sony
++		os=-newsos
++		;;
++	news1000)
++		basic_machine=m68030-sony
++		os=-newsos
++		;;
++	news-3600 | risc-news)
++		basic_machine=mips-sony
++		os=-newsos
++		;;
++	necv70)
++		basic_machine=v70-nec
++		os=-sysv
++		;;
++	next | m*-next )
++		basic_machine=m68k-next
++		case $os in
++		    -nextstep* )
++			;;
++		    -ns2*)
++		      os=-nextstep2
++			;;
++		    *)
++		      os=-nextstep3
++			;;
++		esac
++		;;
++	nh3000)
++		basic_machine=m68k-harris
++		os=-cxux
++		;;
++	nh[45]000)
++		basic_machine=m88k-harris
++		os=-cxux
++		;;
++	nindy960)
++		basic_machine=i960-intel
++		os=-nindy
++		;;
++	mon960)
++		basic_machine=i960-intel
++		os=-mon960
++		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
++	np1)
++		basic_machine=np1-gould
++		;;
++	nsr-tandem)
++		basic_machine=nsr-tandem
++		;;
++	op50n-* | op60c-*)
++		basic_machine=hppa1.1-oki
++		os=-proelf
++		;;
++	openrisc | openrisc-*)
++		basic_machine=or32-unknown
++		;;
++	os400)
++		basic_machine=powerpc-ibm
++		os=-os400
++		;;
++	OSE68000 | ose68000)
++		basic_machine=m68000-ericsson
++		os=-ose
++		;;
++	os68k)
++		basic_machine=m68k-none
++		os=-os68k
++		;;
++	pa-hitachi)
++		basic_machine=hppa1.1-hitachi
++		os=-hiuxwe2
++		;;
++	paragon)
++		basic_machine=i860-intel
++		os=-osf
++		;;
++	pbd)
++		basic_machine=sparc-tti
++		;;
++	pbb)
++		basic_machine=m68k-tti
++		;;
++	pc532 | pc532-*)
++		basic_machine=ns32k-pc532
++		;;
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentium | p5 | k5 | k6 | nexgen | viac3)
++		basic_machine=i586-pc
++		;;
++	pentiumpro | p6 | 6x86 | athlon | athlon_*)
++		basic_machine=i686-pc
++		;;
++	pentiumii | pentium2 | pentiumiii | pentium3)
++		basic_machine=i686-pc
++		;;
++	pentium4)
++		basic_machine=i786-pc
++		;;
++	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
++		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentium4-*)
++		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pn)
++		basic_machine=pn-gould
++		;;
++	power)	basic_machine=power-ibm
++		;;
++	ppc)	basic_machine=powerpc-unknown
++		;;
++	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppcle | powerpclittle | ppc-le | powerpc-little)
++		basic_machine=powerpcle-unknown
++		;;
++	ppcle-* | powerpclittle-*)
++		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64)	basic_machine=powerpc64-unknown
++		;;
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++		basic_machine=powerpc64le-unknown
++		;;
++	ppc64le-* | powerpc64little-*)
++		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ps2)
++		basic_machine=i386-ibm
++		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
++	rom68k)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
++	rm[46]00)
++		basic_machine=mips-siemens
++		;;
++	rtpc | rtpc-*)
++		basic_machine=romp-ibm
++		;;
++	s390 | s390-*)
++		basic_machine=s390-ibm
++		;;
++	s390x | s390x-*)
++		basic_machine=s390x-ibm
++		;;
++	sa29200)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++	sb1)
++		basic_machine=mipsisa64sb1-unknown
++		;;
++	sb1el)
++		basic_machine=mipsisa64sb1el-unknown
++		;;
++	sde)
++		basic_machine=mipsisa32-sde
++		os=-elf
++		;;
++	sei)
++		basic_machine=mips-sei
++		os=-seiux
++		;;
++	sequent)
++		basic_machine=i386-sequent
++		;;
++	sh)
++		basic_machine=sh-hitachi
++		os=-hms
++		;;
++	sh5el)
++		basic_machine=sh5le-unknown
++		;;
++	sh64)
++		basic_machine=sh64-unknown
++		;;
++	sparclite-wrs | simso-wrs)
++		basic_machine=sparclite-wrs
++		os=-vxworks
++		;;
++	sps7)
++		basic_machine=m68k-bull
++		os=-sysv2
++		;;
++	spur)
++		basic_machine=spur-unknown
++		;;
++	st2000)
++		basic_machine=m68k-tandem
++		;;
++	stratus)
++		basic_machine=i860-stratus
++		os=-sysv4
++		;;
++	sun2)
++		basic_machine=m68000-sun
++		;;
++	sun2os3)
++		basic_machine=m68000-sun
++		os=-sunos3
++		;;
++	sun2os4)
++		basic_machine=m68000-sun
++		os=-sunos4
++		;;
++	sun3os3)
++		basic_machine=m68k-sun
++		os=-sunos3
++		;;
++	sun3os4)
++		basic_machine=m68k-sun
++		os=-sunos4
++		;;
++	sun4os3)
++		basic_machine=sparc-sun
++		os=-sunos3
++		;;
++	sun4os4)
++		basic_machine=sparc-sun
++		os=-sunos4
++		;;
++	sun4sol2)
++		basic_machine=sparc-sun
++		os=-solaris2
++		;;
++	sun3 | sun3-*)
++		basic_machine=m68k-sun
++		;;
++	sun4)
++		basic_machine=sparc-sun
++		;;
++	sun386 | sun386i | roadrunner)
++		basic_machine=i386-sun
++		;;
++	sv1)
++		basic_machine=sv1-cray
++		os=-unicos
++		;;
++	symmetry)
++		basic_machine=i386-sequent
++		os=-dynix
++		;;
++	t3e)
++		basic_machine=alphaev5-cray
++		os=-unicos
++		;;
++	t90)
++		basic_machine=t90-cray
++		os=-unicos
++		;;
++	tic54x | c54x*)
++		basic_machine=tic54x-unknown
++		os=-coff
++		;;
++	tic55x | c55x*)
++		basic_machine=tic55x-unknown
++		os=-coff
++		;;
++	tic6x | c6x*)
++		basic_machine=tic6x-unknown
++		os=-coff
++		;;
++	tx39)
++		basic_machine=mipstx39-unknown
++		;;
++	tx39el)
++		basic_machine=mipstx39el-unknown
++		;;
++	toad1)
++		basic_machine=pdp10-xkl
++		os=-tops20
++		;;
++	tower | tower-32)
++		basic_machine=m68k-ncr
++		;;
++	tpf)
++		basic_machine=s390x-ibm
++		os=-tpf
++		;;
++	udi29k)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++	ultra3)
++		basic_machine=a29k-nyu
++		os=-sym1
++		;;
++	v810 | necv810)
++		basic_machine=v810-nec
++		os=-none
++		;;
++	vaxv)
++		basic_machine=vax-dec
++		os=-sysv
++		;;
++	vms)
++		basic_machine=vax-dec
++		os=-vms
++		;;
++	vpp*|vx|vx-*)
++		basic_machine=f301-fujitsu
++		;;
++	vxworks960)
++		basic_machine=i960-wrs
++		os=-vxworks
++		;;
++	vxworks68)
++		basic_machine=m68k-wrs
++		os=-vxworks
++		;;
++	vxworks29k)
++		basic_machine=a29k-wrs
++		os=-vxworks
++		;;
++	w65*)
++		basic_machine=w65-wdc
++		os=-none
++		;;
++	w89k-*)
++		basic_machine=hppa1.1-winbond
++		os=-proelf
++		;;
++	xbox)
++		basic_machine=i686-pc
++		os=-mingw32
++		;;
++	xps | xps100)
++		basic_machine=xps100-honeywell
++		;;
++	ymp)
++		basic_machine=ymp-cray
++		os=-unicos
++		;;
++	z8k-*-coff)
++		basic_machine=z8k-unknown
++		os=-sim
++		;;
++	none)
++		basic_machine=none-none
++		os=-none
++		;;
++
++# Here we handle the default manufacturer of certain CPU types.  It is in
++# some cases the only manufacturer, in others, it is the most popular.
++	w89k)
++		basic_machine=hppa1.1-winbond
++		;;
++	op50n)
++		basic_machine=hppa1.1-oki
++		;;
++	op60c)
++		basic_machine=hppa1.1-oki
++		;;
++	romp)
++		basic_machine=romp-ibm
++		;;
++	mmix)
++		basic_machine=mmix-knuth
++		;;
++	rs6000)
++		basic_machine=rs6000-ibm
++		;;
++	vax)
++		basic_machine=vax-dec
++		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
++	pdp11)
++		basic_machine=pdp11-dec
++		;;
++	we32k)
++		basic_machine=we32k-att
++		;;
++	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++		basic_machine=sh-unknown
++		;;
++	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
++		basic_machine=sparc-sun
++		;;
++	cydra)
++		basic_machine=cydra-cydrome
++		;;
++	orion)
++		basic_machine=orion-highlevel
++		;;
++	orion105)
++		basic_machine=clipper-highlevel
++		;;
++	mac | mpw | mac-mpw)
++		basic_machine=m68k-apple
++		;;
++	pmac | pmac-mpw)
++		basic_machine=powerpc-apple
++		;;
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
++		;;
++	*)
++		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		exit 1
++		;;
++esac
++
++# Here we canonicalize certain aliases for manufacturers.
++case $basic_machine in
++	*-digital*)
++		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
++		;;
++	*-commodore*)
++		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
++		;;
++	*)
++		;;
++esac
++
++# Decode manufacturer-specific aliases for certain operating systems.
++
++if [ x"$os" != x"" ]
++then
++case $os in
++        # First match some system type aliases
++        # that might get confused with valid system types.
++	# -solaris* is a basic system type, with this one exception.
++	-solaris1 | -solaris1.*)
++		os=`echo $os | sed -e 's|solaris1|sunos4|'`
++		;;
++	-solaris)
++		os=-solaris2
++		;;
++	-svr4*)
++		os=-sysv4
++		;;
++	-unixware*)
++		os=-sysv4.2uw
++		;;
++	-gnu/linux*)
++		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
++		;;
++	# First accept the basic system types.
++	# The portable systems comes first.
++	# Each alternative MUST END IN A *, to match a version number.
++	# -sysv* is not here because it comes later, after sysvr4.
++	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
++	      | -aos* \
++	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
++	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -openbsd* | -solidbsd* \
++	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
++	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
++	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -chorusos* | -chorusrdb* \
++	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++	# Remember, each alternative MUST END IN *, to match a version number.
++		;;
++	-qnx*)
++		case $basic_machine in
++		    x86-* | i*86-*)
++			;;
++		    *)
++			os=-nto$os
++			;;
++		esac
++		;;
++	-nto-qnx*)
++		;;
++	-nto*)
++		os=`echo $os | sed -e 's|nto|nto-qnx|'`
++		;;
++	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
++	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
++		;;
++	-mac*)
++		os=`echo $os | sed -e 's|mac|macos|'`
++		;;
++	-linux-dietlibc)
++		os=-linux-dietlibc
++		;;
++	-linux*)
++		os=`echo $os | sed -e 's|linux|linux-gnu|'`
++		;;
++	-sunos5*)
++		os=`echo $os | sed -e 's|sunos5|solaris2|'`
++		;;
++	-sunos6*)
++		os=`echo $os | sed -e 's|sunos6|solaris3|'`
++		;;
++	-opened*)
++		os=-openedition
++		;;
++        -os400*)
++		os=-os400
++		;;
++	-wince*)
++		os=-wince
++		;;
++	-osfrose*)
++		os=-osfrose
++		;;
++	-osf*)
++		os=-osf
++		;;
++	-utek*)
++		os=-bsd
++		;;
++	-dynix*)
++		os=-bsd
++		;;
++	-acis*)
++		os=-aos
++		;;
++	-atheos*)
++		os=-atheos
++		;;
++	-syllable*)
++		os=-syllable
++		;;
++	-386bsd)
++		os=-bsd
++		;;
++	-ctix* | -uts*)
++		os=-sysv
++		;;
++	-nova*)
++		os=-rtmk-nova
++		;;
++	-ns2 )
++		os=-nextstep2
++		;;
++	-nsk*)
++		os=-nsk
++		;;
++	# Preserve the version number of sinix5.
++	-sinix5.*)
++		os=`echo $os | sed -e 's|sinix|sysv|'`
++		;;
++	-sinix*)
++		os=-sysv4
++		;;
++        -tpf*)
++		os=-tpf
++		;;
++	-triton*)
++		os=-sysv3
++		;;
++	-oss*)
++		os=-sysv3
++		;;
++	-svr4)
++		os=-sysv4
++		;;
++	-svr3)
++		os=-sysv3
++		;;
++	-sysvr4)
++		os=-sysv4
++		;;
++	# This must come after -sysvr4.
++	-sysv*)
++		;;
++	-ose*)
++		os=-ose
++		;;
++	-es1800*)
++		os=-ose
++		;;
++	-xenix)
++		os=-xenix
++		;;
++	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++		os=-mint
++		;;
++	-aros*)
++		os=-aros
++		;;
++	-kaos*)
++		os=-kaos
++		;;
++	-zvmoe)
++		os=-zvmoe
++		;;
++	-none)
++		;;
++	*)
++		# Get rid of the `-' at the beginning of $os.
++		os=`echo $os | sed 's/[^-]*-//'`
++		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
++		exit 1
++		;;
++esac
++else
++
++# Here we handle the default operating systems that come with various machines.
++# The value should be what the vendor currently ships out the door with their
++# machine or put another way, the most popular os provided with the machine.
++
++# Note that if you're going to try to match "-MANUFACTURER" here (say,
++# "-sun"), then you have to tell the case statement up towards the top
++# that MANUFACTURER isn't an operating system.  Otherwise, code above
++# will signal an error saying that MANUFACTURER isn't an operating
++# system, and we'll never get to this point.
++
++case $basic_machine in
++        score-*)
++		os=-elf
++		;;
++        spu-*)
++		os=-elf
++		;;
++	*-acorn)
++		os=-riscix1.2
++		;;
++	arm*-rebel)
++		os=-linux
++		;;
++	arm*-semi)
++		os=-aout
++		;;
++        c4x-* | tic4x-*)
++        	os=-coff
++		;;
++	# This must come before the *-dec entry.
++	pdp10-*)
++		os=-tops20
++		;;
++	pdp11-*)
++		os=-none
++		;;
++	*-dec | vax-*)
++		os=-ultrix4.2
++		;;
++	m68*-apollo)
++		os=-domain
++		;;
++	i386-sun)
++		os=-sunos4.0.2
++		;;
++	m68000-sun)
++		os=-sunos3
++		# This also exists in the configure program, but was not the
++		# default.
++		# os=-sunos4
++		;;
++	m68*-cisco)
++		os=-aout
++		;;
++        mep-*)
++		os=-elf
++		;;
++	mips*-cisco)
++		os=-elf
++		;;
++	mips*-*)
++		os=-elf
++		;;
++	or32-*)
++		os=-coff
++		;;
++	*-tti)	# must be before sparc entry or we get the wrong os.
++		os=-sysv3
++		;;
++	sparc-* | *-sun)
++		os=-sunos4.1.1
++		;;
++	*-be)
++		os=-beos
++		;;
++	*-haiku)
++		os=-haiku
++		;;
++	*-ibm)
++		os=-aix
++		;;
++    	*-knuth)
++		os=-mmixware
++		;;
++	*-wec)
++		os=-proelf
++		;;
++	*-winbond)
++		os=-proelf
++		;;
++	*-oki)
++		os=-proelf
++		;;
++	*-hp)
++		os=-hpux
++		;;
++	*-hitachi)
++		os=-hiux
++		;;
++	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
++		os=-sysv
++		;;
++	*-cbm)
++		os=-amigaos
++		;;
++	*-dg)
++		os=-dgux
++		;;
++	*-dolphin)
++		os=-sysv3
++		;;
++	m68k-ccur)
++		os=-rtu
++		;;
++	m88k-omron*)
++		os=-luna
++		;;
++	*-next )
++		os=-nextstep
++		;;
++	*-sequent)
++		os=-ptx
++		;;
++	*-crds)
++		os=-unos
++		;;
++	*-ns)
++		os=-genix
++		;;
++	i370-*)
++		os=-mvs
++		;;
++	*-next)
++		os=-nextstep3
++		;;
++	*-gould)
++		os=-sysv
++		;;
++	*-highlevel)
++		os=-bsd
++		;;
++	*-encore)
++		os=-bsd
++		;;
++	*-sgi)
++		os=-irix
++		;;
++	*-siemens)
++		os=-sysv4
++		;;
++	*-masscomp)
++		os=-rtu
++		;;
++	f30[01]-fujitsu | f700-fujitsu)
++		os=-uxpv
++		;;
++	*-rom68k)
++		os=-coff
++		;;
++	*-*bug)
++		os=-coff
++		;;
++	*-apple)
++		os=-macos
++		;;
++	*-atari*)
++		os=-mint
++		;;
++	*)
++		os=-none
++		;;
++esac
++fi
++
++# Here we handle the case where we know the os, and the CPU type, but not the
++# manufacturer.  We pick the logical manufacturer.
++vendor=unknown
++case $basic_machine in
++	*-unknown)
++		case $os in
++			-riscix*)
++				vendor=acorn
++				;;
++			-sunos*)
++				vendor=sun
++				;;
++			-aix*)
++				vendor=ibm
++				;;
++			-beos*)
++				vendor=be
++				;;
++			-hpux*)
++				vendor=hp
++				;;
++			-mpeix*)
++				vendor=hp
++				;;
++			-hiux*)
++				vendor=hitachi
++				;;
++			-unos*)
++				vendor=crds
++				;;
++			-dgux*)
++				vendor=dg
++				;;
++			-luna*)
++				vendor=omron
++				;;
++			-genix*)
++				vendor=ns
++				;;
++			-mvs* | -opened*)
++				vendor=ibm
++				;;
++			-os400*)
++				vendor=ibm
++				;;
++			-ptx*)
++				vendor=sequent
++				;;
++			-tpf*)
++				vendor=ibm
++				;;
++			-vxsim* | -vxworks* | -windiss*)
++				vendor=wrs
++				;;
++			-aux*)
++				vendor=apple
++				;;
++			-hms*)
++				vendor=hitachi
++				;;
++			-mpw* | -macos*)
++				vendor=apple
++				;;
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++				vendor=atari
++				;;
++			-vos*)
++				vendor=stratus
++				;;
++		esac
++		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
++		;;
++esac
++
++echo $basic_machine$os
++exit
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+--- adjtimex-1.23.orig/config.guess
++++ adjtimex-1.23/config.guess
+@@ -0,0 +1,1516 @@
++#! /bin/sh
++# Attempt to guess a canonical system name.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++#   Inc.
++
++timestamp='2007-03-06'
++
++# 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., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++
++# Originally written by Per Bothner <per@bothner.com>.
++# Please send patches to <config-patches@gnu.org>.  Submit a context
++# diff and a properly formatted ChangeLog entry.
++#
++# This script attempts to guess a canonical system name similar to
++# config.sub.  If it succeeds, it prints the system name on stdout, and
++# exits with 0.  Otherwise, it exits with 1.
++#
++# The plan is that this can be called by configure scripts if you
++# don't specify an explicit build system type.
++
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION]
++
++Output the configuration name of the system \`$me' is run on.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.guess ($timestamp)
++
++Originally written by Per Bothner.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit ;;
++    --version | -v )
++       echo "$version" ; exit ;;
++    --help | --h* | -h )
++       echo "$usage"; exit ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help" >&2
++       exit 1 ;;
++    * )
++       break ;;
++  esac
++done
++
++if test $# != 0; then
++  echo "$me: too many arguments$help" >&2
++  exit 1
++fi
++
++trap 'exit 1' 1 2 15
++
++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
++# compiler to aid in system detection is discouraged as it requires
++# temporary files to be created and, as you can see below, it is a
++# headache to deal with in a portable fashion.
++
++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
++# use `HOST_CC' if defined, but it is deprecated.
++
++# Portable tmp directory creation inspired by the Autoconf team.
++
++set_cc_for_build='
++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
++: ${TMPDIR=/tmp} ;
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
++dummy=$tmp/dummy ;
++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
++case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int x;" > $dummy.c ;
++	for c in cc gcc c89 c99 ; do
++	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++	     CC_FOR_BUILD="$c"; break ;
++	  fi ;
++	done ;
++	if test x"$CC_FOR_BUILD" = x ; then
++	  CC_FOR_BUILD=no_compiler_found ;
++	fi
++	;;
++ ,,*)   CC_FOR_BUILD=$CC ;;
++ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
++esac ; set_cc_for_build= ;'
++
++# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
++# (ghazi@noc.rutgers.edu 1994-08-24)
++if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
++	PATH=$PATH:/.attbin ; export PATH
++fi
++
++UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
++UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
++
++# Note: order is significant - the case branches are not exclusive.
++
++case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++    *:NetBSD:*:*)
++	# NetBSD (nbsd) targets should (where applicable) match one or
++	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
++	# switched to ELF, *-*-netbsd* would select the old
++	# object file format.  This provides both forward
++	# compatibility and a consistent mechanism for selecting the
++	# object file format.
++	#
++	# Note: NetBSD doesn't particularly care about the vendor
++	# portion of the name.  We always set it to "unknown".
++	sysctl="sysctl -n hw.machine_arch"
++	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
++	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
++	case "${UNAME_MACHINE_ARCH}" in
++	    armeb) machine=armeb-unknown ;;
++	    arm*) machine=arm-unknown ;;
++	    sh3el) machine=shl-unknown ;;
++	    sh3eb) machine=sh-unknown ;;
++	    sh5el) machine=sh5le-unknown ;;
++	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	esac
++	# The Operating System including object format, if it has switched
++	# to ELF recently, or will in the future.
++	case "${UNAME_MACHINE_ARCH}" in
++	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
++		eval $set_cc_for_build
++		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++			| grep __ELF__ >/dev/null
++		then
++		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++		    # Return netbsd for either.  FIX?
++		    os=netbsd
++		else
++		    os=netbsdelf
++		fi
++		;;
++	    *)
++	        os=netbsd
++		;;
++	esac
++	# The OS release
++	# Debian GNU/NetBSD machines have a different userland, and
++	# thus, need a distinct triplet. However, they do not need
++	# kernel version information, so it can be replaced with a
++	# suitable tag, in the style of linux-gnu.
++	case "${UNAME_VERSION}" in
++	    Debian*)
++		release='-gnu'
++		;;
++	    *)
++		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		;;
++	esac
++	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
++	# contains redundant information, the shorter form:
++	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
++	echo "${machine}-${os}${release}"
++	exit ;;
++    *:OpenBSD:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++	exit ;;
++    *:ekkoBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
++    macppc:MirBSD:*:*)
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++	exit ;;
++    *:MirBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	exit ;;
++    alpha:OSF1:*:*)
++	case $UNAME_RELEASE in
++	*4.0)
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
++		;;
++	*5.*)
++	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		;;
++	esac
++	# According to Compaq, /usr/sbin/psrinfo has been available on
++	# OSF/1 and Tru64 systems produced since 1995.  I hope that
++	# covers most systems running today.  This code pipes the CPU
++	# types through head -n 1, so we only detect the type of CPU 0.
++	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
++	case "$ALPHA_CPU_TYPE" in
++	    "EV4 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV4.5 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "LCA4 (21066/21068)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV5 (21164)")
++		UNAME_MACHINE="alphaev5" ;;
++	    "EV5.6 (21164A)")
++		UNAME_MACHINE="alphaev56" ;;
++	    "EV5.6 (21164PC)")
++		UNAME_MACHINE="alphapca56" ;;
++	    "EV5.7 (21164PC)")
++		UNAME_MACHINE="alphapca57" ;;
++	    "EV6 (21264)")
++		UNAME_MACHINE="alphaev6" ;;
++	    "EV6.7 (21264A)")
++		UNAME_MACHINE="alphaev67" ;;
++	    "EV6.8CB (21264C)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8AL (21264B)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8CX (21264D)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.9A (21264/EV69A)")
++		UNAME_MACHINE="alphaev69" ;;
++	    "EV7 (21364)")
++		UNAME_MACHINE="alphaev7" ;;
++	    "EV7.9 (21364A)")
++		UNAME_MACHINE="alphaev79" ;;
++	esac
++	# A Pn.n version is a patched version.
++	# A Vn.n version is a released version.
++	# A Tn.n version is a released field test version.
++	# A Xn.n version is an unreleased experimental baselevel.
++	# 1.2 uses "1.2" for uname -r.
++	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	exit ;;
++    Alpha\ *:Windows_NT*:*)
++	# How do we know it's Interix rather than the generic POSIX subsystem?
++	# Should we change UNAME_MACHINE based on the output of uname instead
++	# of the specific Alpha model?
++	echo alpha-pc-interix
++	exit ;;
++    21064:Windows_NT:50:3)
++	echo alpha-dec-winnt3.5
++	exit ;;
++    Amiga*:UNIX_System_V:4.0:*)
++	echo m68k-unknown-sysv4
++	exit ;;
++    *:[Aa]miga[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-amigaos
++	exit ;;
++    *:[Mm]orph[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-morphos
++	exit ;;
++    *:OS/390:*:*)
++	echo i370-ibm-openedition
++	exit ;;
++    *:z/VM:*:*)
++	echo s390-ibm-zvmoe
++	exit ;;
++    *:OS400:*:*)
++        echo powerpc-ibm-os400
++	exit ;;
++    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
++	echo arm-acorn-riscix${UNAME_RELEASE}
++	exit ;;
++    arm:riscos:*:*|arm:RISCOS:*:*)
++	echo arm-unknown-riscos
++	exit ;;
++    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
++	echo hppa1.1-hitachi-hiuxmpp
++	exit ;;
++    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
++	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
++	if test "`(/bin/universe) 2>/dev/null`" = att ; then
++		echo pyramid-pyramid-sysv3
++	else
++		echo pyramid-pyramid-bsd
++	fi
++	exit ;;
++    NILE*:*:*:dcosx)
++	echo pyramid-pyramid-svr4
++	exit ;;
++    DRS?6000:unix:4.0:6*)
++	echo sparc-icl-nx6
++	exit ;;
++    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
++	case `/usr/bin/uname -p` in
++	    sparc) echo sparc-icl-nx7; exit ;;
++	esac ;;
++    sun4H:SunOS:5.*:*)
++	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
++	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    i86pc:SunOS:5.*:*)
++	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    sun4*:SunOS:6*:*)
++	# According to config.sub, this is the proper way to canonicalize
++	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
++	# it's likely to be more like Solaris than SunOS4.
++	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    sun4*:SunOS:*:*)
++	case "`/usr/bin/arch -k`" in
++	    Series*|S4*)
++		UNAME_RELEASE=`uname -v`
++		;;
++	esac
++	# Japanese Language versions have a version number like `4.1.3-JL'.
++	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
++	exit ;;
++    sun3*:SunOS:*:*)
++	echo m68k-sun-sunos${UNAME_RELEASE}
++	exit ;;
++    sun*:*:4.2BSD:*)
++	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
++	case "`/bin/arch`" in
++	    sun3)
++		echo m68k-sun-sunos${UNAME_RELEASE}
++		;;
++	    sun4)
++		echo sparc-sun-sunos${UNAME_RELEASE}
++		;;
++	esac
++	exit ;;
++    aushp:SunOS:*:*)
++	echo sparc-auspex-sunos${UNAME_RELEASE}
++	exit ;;
++    # The situation for MiNT is a little confusing.  The machine name
++    # can be virtually everything (everything which is not
++    # "atarist" or "atariste" at least should have a processor
++    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
++    # to the lowercase version "mint" (or "freemint").  Finally
++    # the system name "TOS" denotes a system which is actually not
++    # MiNT.  But MiNT is downward compatible to TOS, so this should
++    # be no problem.
++    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
++	exit ;;
++    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
++	echo m68k-atari-mint${UNAME_RELEASE}
++        exit ;;
++    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
++	exit ;;
++    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
++        echo m68k-milan-mint${UNAME_RELEASE}
++        exit ;;
++    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
++        echo m68k-hades-mint${UNAME_RELEASE}
++        exit ;;
++    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
++        echo m68k-unknown-mint${UNAME_RELEASE}
++        exit ;;
++    m68k:machten:*:*)
++	echo m68k-apple-machten${UNAME_RELEASE}
++	exit ;;
++    powerpc:machten:*:*)
++	echo powerpc-apple-machten${UNAME_RELEASE}
++	exit ;;
++    RISC*:Mach:*:*)
++	echo mips-dec-mach_bsd4.3
++	exit ;;
++    RISC*:ULTRIX:*:*)
++	echo mips-dec-ultrix${UNAME_RELEASE}
++	exit ;;
++    VAX*:ULTRIX*:*:*)
++	echo vax-dec-ultrix${UNAME_RELEASE}
++	exit ;;
++    2020:CLIX:*:* | 2430:CLIX:*:*)
++	echo clipper-intergraph-clix${UNAME_RELEASE}
++	exit ;;
++    mips:*:*:UMIPS | mips:*:*:RISCos)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++#ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
++	int main (int argc, char *argv[]) {
++#else
++	int main (argc, argv) int argc; char *argv[]; {
++#endif
++	#if defined (host_mips) && defined (MIPSEB)
++	#if defined (SYSTYPE_SYSV)
++	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
++	#endif
++	#if defined (SYSTYPE_SVR4)
++	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
++	#endif
++	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
++	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
++	#endif
++	#endif
++	  exit (-1);
++	}
++EOF
++	$CC_FOR_BUILD -o $dummy $dummy.c &&
++	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	    { echo "$SYSTEM_NAME"; exit; }
++	echo mips-mips-riscos${UNAME_RELEASE}
++	exit ;;
++    Motorola:PowerMAX_OS:*:*)
++	echo powerpc-motorola-powermax
++	exit ;;
++    Motorola:*:4.3:PL8-*)
++	echo powerpc-harris-powermax
++	exit ;;
++    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
++	echo powerpc-harris-powermax
++	exit ;;
++    Night_Hawk:Power_UNIX:*:*)
++	echo powerpc-harris-powerunix
++	exit ;;
++    m88k:CX/UX:7*:*)
++	echo m88k-harris-cxux7
++	exit ;;
++    m88k:*:4*:R4*)
++	echo m88k-motorola-sysv4
++	exit ;;
++    m88k:*:3*:R3*)
++	echo m88k-motorola-sysv3
++	exit ;;
++    AViiON:dgux:*:*)
++        # DG/UX returns AViiON for all architectures
++        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	then
++	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
++	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    then
++		echo m88k-dg-dgux${UNAME_RELEASE}
++	    else
++		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++	    fi
++	else
++	    echo i586-dg-dgux${UNAME_RELEASE}
++	fi
++ 	exit ;;
++    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
++	echo m88k-dolphin-sysv3
++	exit ;;
++    M88*:*:R3*:*)
++	# Delta 88k system running SVR3
++	echo m88k-motorola-sysv3
++	exit ;;
++    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
++	echo m88k-tektronix-sysv3
++	exit ;;
++    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
++	echo m68k-tektronix-bsd
++	exit ;;
++    *:IRIX*:*:*)
++	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
++	exit ;;
++    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
++	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
++	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
++    i*86:AIX:*:*)
++	echo i386-ibm-aix
++	exit ;;
++    ia64:AIX:*:*)
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	exit ;;
++    *:AIX:2:3)
++	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
++		eval $set_cc_for_build
++		sed 's/^		//' << EOF >$dummy.c
++		#include <sys/systemcfg.h>
++
++		main()
++			{
++			if (!__power_pc())
++				exit(1);
++			puts("powerpc-ibm-aix3.2.5");
++			exit(0);
++			}
++EOF
++		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		then
++			echo "$SYSTEM_NAME"
++		else
++			echo rs6000-ibm-aix3.2.5
++		fi
++	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
++		echo rs6000-ibm-aix3.2.4
++	else
++		echo rs6000-ibm-aix3.2
++	fi
++	exit ;;
++    *:AIX:*:[45])
++	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
++	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
++		IBM_ARCH=rs6000
++	else
++		IBM_ARCH=powerpc
++	fi
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
++	exit ;;
++    *:AIX:*:*)
++	echo rs6000-ibm-aix
++	exit ;;
++    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
++	echo romp-ibm-bsd4.4
++	exit ;;
++    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
++	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
++	exit ;;                             # report: romp-ibm BSD 4.3
++    *:BOSX:*:*)
++	echo rs6000-bull-bosx
++	exit ;;
++    DPX/2?00:B.O.S.:*:*)
++	echo m68k-bull-sysv3
++	exit ;;
++    9000/[34]??:4.3bsd:1.*:*)
++	echo m68k-hp-bsd
++	exit ;;
++    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
++	echo m68k-hp-bsd4.4
++	exit ;;
++    9000/[34678]??:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	case "${UNAME_MACHINE}" in
++	    9000/31? )            HP_ARCH=m68000 ;;
++	    9000/[34]?? )         HP_ARCH=m68k ;;
++	    9000/[678][0-9][0-9])
++		if [ -x /usr/bin/getconf ]; then
++		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++                    case "${sc_cpu_version}" in
++                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                      532)                      # CPU_PA_RISC2_0
++                        case "${sc_kernel_bits}" in
++                          32) HP_ARCH="hppa2.0n" ;;
++                          64) HP_ARCH="hppa2.0w" ;;
++			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
++                        esac ;;
++                    esac
++		fi
++		if [ "${HP_ARCH}" = "" ]; then
++		    eval $set_cc_for_build
++		    sed 's/^              //' << EOF >$dummy.c
++
++              #define _HPUX_SOURCE
++              #include <stdlib.h>
++              #include <unistd.h>
++
++              int main ()
++              {
++              #if defined(_SC_KERNEL_BITS)
++                  long bits = sysconf(_SC_KERNEL_BITS);
++              #endif
++                  long cpu  = sysconf (_SC_CPU_VERSION);
++
++                  switch (cpu)
++              	{
++              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++              	case CPU_PA_RISC2_0:
++              #if defined(_SC_KERNEL_BITS)
++              	    switch (bits)
++              		{
++              		case 64: puts ("hppa2.0w"); break;
++              		case 32: puts ("hppa2.0n"); break;
++              		default: puts ("hppa2.0"); break;
++              		} break;
++              #else  /* !defined(_SC_KERNEL_BITS) */
++              	    puts ("hppa2.0"); break;
++              #endif
++              	default: puts ("hppa1.0"); break;
++              	}
++                  exit (0);
++              }
++EOF
++		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    test -z "$HP_ARCH" && HP_ARCH=hppa
++		fi ;;
++	esac
++	if [ ${HP_ARCH} = "hppa2.0w" ]
++	then
++	    eval $set_cc_for_build
++
++	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
++	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
++	    # generating 64-bit code.  GNU and HP use different nomenclature:
++	    #
++	    # $ CC_FOR_BUILD=cc ./config.guess
++	    # => hppa2.0w-hp-hpux11.23
++	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
++	    # => hppa64-hp-hpux11.23
++
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++		grep __LP64__ >/dev/null
++	    then
++		HP_ARCH="hppa2.0w"
++	    else
++		HP_ARCH="hppa64"
++	    fi
++	fi
++	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++	exit ;;
++    ia64:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux${HPUX_REV}
++	exit ;;
++    3050*:HI-UX:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <unistd.h>
++	int
++	main ()
++	{
++	  long cpu = sysconf (_SC_CPU_VERSION);
++	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
++	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
++	     results, however.  */
++	  if (CPU_IS_PA_RISC (cpu))
++	    {
++	      switch (cpu)
++		{
++		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
++		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
++		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
++		  default: puts ("hppa-hitachi-hiuxwe2"); break;
++		}
++	    }
++	  else if (CPU_IS_HP_MC68K (cpu))
++	    puts ("m68k-hitachi-hiuxwe2");
++	  else puts ("unknown-hitachi-hiuxwe2");
++	  exit (0);
++	}
++EOF
++	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++		{ echo "$SYSTEM_NAME"; exit; }
++	echo unknown-hitachi-hiuxwe2
++	exit ;;
++    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
++	echo hppa1.1-hp-bsd
++	exit ;;
++    9000/8??:4.3bsd:*:*)
++	echo hppa1.0-hp-bsd
++	exit ;;
++    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
++	echo hppa1.0-hp-mpeix
++	exit ;;
++    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
++	echo hppa1.1-hp-osf
++	exit ;;
++    hp8??:OSF1:*:*)
++	echo hppa1.0-hp-osf
++	exit ;;
++    i*86:OSF1:*:*)
++	if [ -x /usr/sbin/sysversion ] ; then
++	    echo ${UNAME_MACHINE}-unknown-osf1mk
++	else
++	    echo ${UNAME_MACHINE}-unknown-osf1
++	fi
++	exit ;;
++    parisc*:Lites*:*:*)
++	echo hppa1.1-hp-lites
++	exit ;;
++    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
++	echo c1-convex-bsd
++        exit ;;
++    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
++	if getsysinfo -f scalar_acc
++	then echo c32-convex-bsd
++	else echo c2-convex-bsd
++	fi
++        exit ;;
++    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
++	echo c34-convex-bsd
++        exit ;;
++    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
++	echo c38-convex-bsd
++        exit ;;
++    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
++	echo c4-convex-bsd
++        exit ;;
++    CRAY*Y-MP:*:*:*)
++	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    CRAY*[A-Z]90:*:*:*)
++	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
++	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
++	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
++	      -e 's/\.[^.]*$/.X/'
++	exit ;;
++    CRAY*TS:*:*:*)
++	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    CRAY*T3E:*:*:*)
++	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    CRAY*SV1:*:*:*)
++	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    *:UNICOS/mp:*:*)
++	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
++    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
++	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++        exit ;;
++    5000:UNIX_System_V:4.*:*)
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
++    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
++	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
++	exit ;;
++    sparc*:BSD/OS:*:*)
++	echo sparc-unknown-bsdi${UNAME_RELEASE}
++	exit ;;
++    *:BSD/OS:*:*)
++	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++	exit ;;
++    *:FreeBSD:*:*)
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
++	exit ;;
++    i*:CYGWIN*:*)
++	echo ${UNAME_MACHINE}-pc-cygwin
++	exit ;;
++    *:MINGW*:*)
++	echo ${UNAME_MACHINE}-pc-mingw32
++	exit ;;
++    i*:windows32*:*)
++    	# uname -m includes "-pc" on this system.
++    	echo ${UNAME_MACHINE}-mingw32
++	exit ;;
++    i*:PW*:*)
++	echo ${UNAME_MACHINE}-pc-pw32
++	exit ;;
++    *:Interix*:[3456]*)
++    	case ${UNAME_MACHINE} in
++	    x86) 
++		echo i586-pc-interix${UNAME_RELEASE}
++		exit ;;
++	    EM64T | authenticamd)
++		echo x86_64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	esac ;;
++    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
++	echo i${UNAME_MACHINE}-pc-mks
++	exit ;;
++    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
++	# How do we know it's Interix rather than the generic POSIX subsystem?
++	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
++	# UNAME_MACHINE based on the output of uname instead of i386?
++	echo i586-pc-interix
++	exit ;;
++    i*:UWIN*:*)
++	echo ${UNAME_MACHINE}-pc-uwin
++	exit ;;
++    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
++	echo x86_64-unknown-cygwin
++	exit ;;
++    p*:CYGWIN*:*)
++	echo powerpcle-unknown-cygwin
++	exit ;;
++    prep*:SunOS:5.*:*)
++	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
++    *:GNU:*:*)
++	# the GNU system
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	exit ;;
++    *:GNU/*:*:*)
++	# other systems with GNU libc and userland
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	exit ;;
++    i*86:Minix:*:*)
++	echo ${UNAME_MACHINE}-pc-minix
++	exit ;;
++    arm*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    avr32*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    cris:Linux:*:*)
++	echo cris-axis-linux-gnu
++	exit ;;
++    crisv32:Linux:*:*)
++	echo crisv32-axis-linux-gnu
++	exit ;;
++    frv:Linux:*:*)
++    	echo frv-unknown-linux-gnu
++	exit ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    mips:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips
++	#undef mipsel
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mipsel
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	;;
++    mips64:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips64
++	#undef mips64el
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mips64el
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips64
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	;;
++    or32:Linux:*:*)
++	echo or32-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
++	exit ;;
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
++    parisc:Linux:*:* | hppa:Linux:*:*)
++	# Look for CPU level
++	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
++	esac
++	exit ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit ;;
++    s390:Linux:*:* | s390x:Linux:*:*)
++	echo ${UNAME_MACHINE}-ibm-linux
++	exit ;;
++    sh64*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    sh*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    sparc:Linux:*:* | sparc64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
++	exit ;;
++    x86_64:Linux:*:*)
++	echo x86_64-unknown-linux-gnu
++	exit ;;
++    xtensa:Linux:*:*)
++    	echo xtensa-unknown-linux-gnu
++	exit ;;
++    i*86:Linux:*:*)
++	# The BFD linker knows what the default object file format is, so
++	# first see if it will tell us. cd to the root directory to prevent
++	# problems with other programs or directories called `ld' in the path.
++	# Set LC_ALL=C to ensure ld outputs messages in English.
++	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
++			 | sed -ne '/supported targets:/!d
++				    s/[ 	][ 	]*/ /g
++				    s/.*supported targets: *//
++				    s/ .*//
++				    p'`
++        case "$ld_supported_targets" in
++	  elf32-i386)
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++		;;
++	  a.out-i386-linux)
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
++		exit ;;
++	  coff-i386)
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++		exit ;;
++	  "")
++		# Either a pre-BFD a.out linker (linux-gnuoldld) or
++		# one that does not give us useful --help.
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
++		exit ;;
++	esac
++	# Determine whether the default compiler is a.out or elf
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <features.h>
++	#ifdef __ELF__
++	# ifdef __GLIBC__
++	#  if __GLIBC__ >= 2
++	LIBC=gnu
++	#  else
++	LIBC=gnulibc1
++	#  endif
++	# else
++	LIBC=gnulibc1
++	# endif
++	#else
++	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
++	LIBC=gnu
++	#else
++	LIBC=gnuaout
++	#endif
++	#endif
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^LIBC/{
++		s: ::g
++		p
++	    }'`"
++	test x"${LIBC}" != x && {
++		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++		exit
++	}
++	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
++	;;
++    i*86:DYNIX/ptx:4*:*)
++	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
++	# earlier versions are messed up and put the nodename in both
++	# sysname and nodename.
++	echo i386-sequent-sysv4
++	exit ;;
++    i*86:UNIX_SV:4.2MP:2.*)
++        # Unixware is an offshoot of SVR4, but it has its own version
++        # number series starting with 2...
++        # I am not positive that other SVR4 systems won't match this,
++	# I just have to hope.  -- rms.
++        # Use sysv4.2uw... so that sysv4* matches it.
++	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++	exit ;;
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit ;;
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
++	exit ;;
++    i*86:syllable:*:*)
++	echo ${UNAME_MACHINE}-pc-syllable
++	exit ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	echo i386-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit ;;
++    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
++	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
++	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
++		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++	else
++		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++	fi
++	exit ;;
++    i*86:*:5:[678]*)
++    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	case `/bin/uname -X | grep "^Machine"` in
++	    *486*)	     UNAME_MACHINE=i486 ;;
++	    *Pentium)	     UNAME_MACHINE=i586 ;;
++	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
++	esac
++	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++	exit ;;
++    i*86:*:3.2:*)
++	if test -f /usr/options/cb.name; then
++		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
++		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
++	elif /bin/uname -X 2>/dev/null >/dev/null ; then
++		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
++		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
++		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
++			&& UNAME_MACHINE=i586
++		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
++			&& UNAME_MACHINE=i686
++		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
++			&& UNAME_MACHINE=i686
++		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
++	else
++		echo ${UNAME_MACHINE}-pc-sysv32
++	fi
++	exit ;;
++    pc:*:*:*)
++	# Left here for compatibility:
++        # uname -m prints for DJGPP always 'pc', but it prints nothing about
++        # the processor, so we play safe by assuming i386.
++	echo i386-pc-msdosdjgpp
++        exit ;;
++    Intel:Mach:3*:*)
++	echo i386-pc-mach3
++	exit ;;
++    paragon:*:*:*)
++	echo i860-intel-osf1
++	exit ;;
++    i860:*:4.*:*) # i860-SVR4
++	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
++	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
++	else # Add other i860-SVR4 vendors below as they are discovered.
++	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
++	fi
++	exit ;;
++    mini*:CTIX:SYS*5:*)
++	# "miniframe"
++	echo m68010-convergent-sysv
++	exit ;;
++    mc68k:UNIX:SYSTEM5:3.51m)
++	echo m68k-convergent-sysv
++	exit ;;
++    M680?0:D-NIX:5.3:*)
++	echo m68k-diab-dnix
++	exit ;;
++    M68*:*:R3V[5678]*:*)
++	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
++    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
++	OS_REL=''
++	test -r /etc/.relid \
++	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
++        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++          && { echo i486-ncr-sysv4; exit; } ;;
++    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
++	echo m68k-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    mc68030:UNIX_System_V:4.*:*)
++	echo m68k-atari-sysv4
++	exit ;;
++    TSUNAMI:LynxOS:2.*:*)
++	echo sparc-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    rs6000:LynxOS:2.*:*)
++	echo rs6000-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	exit ;;
++    SM[BE]S:UNIX_SV:*:*)
++	echo mips-dde-sysv${UNAME_RELEASE}
++	exit ;;
++    RM*:ReliantUNIX-*:*:*)
++	echo mips-sni-sysv4
++	exit ;;
++    RM*:SINIX-*:*:*)
++	echo mips-sni-sysv4
++	exit ;;
++    *:SINIX-*:*:*)
++	if uname -p 2>/dev/null >/dev/null ; then
++		UNAME_MACHINE=`(uname -p) 2>/dev/null`
++		echo ${UNAME_MACHINE}-sni-sysv4
++	else
++		echo ns32k-sni-sysv
++	fi
++	exit ;;
++    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                      # says <Richard.M.Bartel@ccMail.Census.GOV>
++        echo i586-unisys-sysv4
++        exit ;;
++    *:UNIX_System_V:4*:FTX*)
++	# From Gerald Hewes <hewes@openmarket.com>.
++	# How about differentiating between stratus architectures? -djm
++	echo hppa1.1-stratus-sysv4
++	exit ;;
++    *:*:*:FTX*)
++	# From seanf@swdc.stratus.com.
++	echo i860-stratus-sysv4
++	exit ;;
++    i*86:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo ${UNAME_MACHINE}-stratus-vos
++	exit ;;
++    *:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo hppa1.1-stratus-vos
++	exit ;;
++    mc68*:A/UX:*:*)
++	echo m68k-apple-aux${UNAME_RELEASE}
++	exit ;;
++    news*:NEWS-OS:6*:*)
++	echo mips-sony-newsos6
++	exit ;;
++    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
++	if [ -d /usr/nec ]; then
++	        echo mips-nec-sysv${UNAME_RELEASE}
++	else
++	        echo mips-unknown-sysv${UNAME_RELEASE}
++	fi
++        exit ;;
++    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
++	echo powerpc-be-beos
++	exit ;;
++    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
++	echo powerpc-apple-beos
++	exit ;;
++    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
++	echo i586-pc-beos
++	exit ;;
++    SX-4:SUPER-UX:*:*)
++	echo sx4-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-5:SUPER-UX:*:*)
++	echo sx5-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-6:SUPER-UX:*:*)
++	echo sx6-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-7:SUPER-UX:*:*)
++	echo sx7-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8:SUPER-UX:*:*)
++	echo sx8-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8R:SUPER-UX:*:*)
++	echo sx8r-nec-superux${UNAME_RELEASE}
++	exit ;;
++    Power*:Rhapsody:*:*)
++	echo powerpc-apple-rhapsody${UNAME_RELEASE}
++	exit ;;
++    *:Rhapsody:*:*)
++	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++	exit ;;
++    *:Darwin:*:*)
++	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++	case $UNAME_PROCESSOR in
++	    unknown) UNAME_PROCESSOR=powerpc ;;
++	esac
++	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	exit ;;
++    *:procnto*:*:* | *:QNX:[0123456789]*:*)
++	UNAME_PROCESSOR=`uname -p`
++	if test "$UNAME_PROCESSOR" = "x86"; then
++		UNAME_PROCESSOR=i386
++		UNAME_MACHINE=pc
++	fi
++	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	exit ;;
++    *:QNX:*:4*)
++	echo i386-pc-qnx
++	exit ;;
++    NSE-?:NONSTOP_KERNEL:*:*)
++	echo nse-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    NSR-?:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    *:NonStop-UX:*:*)
++	echo mips-compaq-nonstopux
++	exit ;;
++    BS2000:POSIX*:*:*)
++	echo bs2000-siemens-sysv
++	exit ;;
++    DS/*:UNIX_System_V:*:*)
++	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	exit ;;
++    *:Plan9:*:*)
++	# "uname -m" is not consistent, so use $cputype instead. 386
++	# is converted to i386 for consistency with other x86
++	# operating systems.
++	if test "$cputype" = "386"; then
++	    UNAME_MACHINE=i386
++	else
++	    UNAME_MACHINE="$cputype"
++	fi
++	echo ${UNAME_MACHINE}-unknown-plan9
++	exit ;;
++    *:TOPS-10:*:*)
++	echo pdp10-unknown-tops10
++	exit ;;
++    *:TENEX:*:*)
++	echo pdp10-unknown-tenex
++	exit ;;
++    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
++	echo pdp10-dec-tops20
++	exit ;;
++    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
++	echo pdp10-xkl-tops20
++	exit ;;
++    *:TOPS-20:*:*)
++	echo pdp10-unknown-tops20
++	exit ;;
++    *:ITS:*:*)
++	echo pdp10-unknown-its
++	exit ;;
++    SEI:*:*:SEIUX)
++        echo mips-sei-seiux${UNAME_RELEASE}
++	exit ;;
++    *:DragonFly:*:*)
++	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	exit ;;
++    *:*VMS:*:*)
++    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	case "${UNAME_MACHINE}" in
++	    A*) echo alpha-dec-vms ; exit ;;
++	    I*) echo ia64-dec-vms ; exit ;;
++	    V*) echo vax-dec-vms ; exit ;;
++	esac ;;
++    *:XENIX:*:SysV)
++	echo i386-pc-xenix
++	exit ;;
++    i*86:skyos:*:*)
++	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
++esac
++
++#echo '(No uname command or uname output not recognized.)' 1>&2
++#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
++
++eval $set_cc_for_build
++cat >$dummy.c <<EOF
++#ifdef _SEQUENT_
++# include <sys/types.h>
++# include <sys/utsname.h>
++#endif
++main ()
++{
++#if defined (sony)
++#if defined (MIPSEB)
++  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
++     I don't know....  */
++  printf ("mips-sony-bsd\n"); exit (0);
++#else
++#include <sys/param.h>
++  printf ("m68k-sony-newsos%s\n",
++#ifdef NEWSOS4
++          "4"
++#else
++	  ""
++#endif
++         ); exit (0);
++#endif
++#endif
++
++#if defined (__arm) && defined (__acorn) && defined (__unix)
++  printf ("arm-acorn-riscix\n"); exit (0);
++#endif
++
++#if defined (hp300) && !defined (hpux)
++  printf ("m68k-hp-bsd\n"); exit (0);
++#endif
++
++#if defined (NeXT)
++#if !defined (__ARCHITECTURE__)
++#define __ARCHITECTURE__ "m68k"
++#endif
++  int version;
++  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
++  if (version < 4)
++    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
++  else
++    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
++  exit (0);
++#endif
++
++#if defined (MULTIMAX) || defined (n16)
++#if defined (UMAXV)
++  printf ("ns32k-encore-sysv\n"); exit (0);
++#else
++#if defined (CMU)
++  printf ("ns32k-encore-mach\n"); exit (0);
++#else
++  printf ("ns32k-encore-bsd\n"); exit (0);
++#endif
++#endif
++#endif
++
++#if defined (__386BSD__)
++  printf ("i386-pc-bsd\n"); exit (0);
++#endif
++
++#if defined (sequent)
++#if defined (i386)
++  printf ("i386-sequent-dynix\n"); exit (0);
++#endif
++#if defined (ns32000)
++  printf ("ns32k-sequent-dynix\n"); exit (0);
++#endif
++#endif
++
++#if defined (_SEQUENT_)
++    struct utsname un;
++
++    uname(&un);
++
++    if (strncmp(un.version, "V2", 2) == 0) {
++	printf ("i386-sequent-ptx2\n"); exit (0);
++    }
++    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
++	printf ("i386-sequent-ptx1\n"); exit (0);
++    }
++    printf ("i386-sequent-ptx\n"); exit (0);
++
++#endif
++
++#if defined (vax)
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
++#endif
++
++#if defined (alliant) && defined (i860)
++  printf ("i860-alliant-bsd\n"); exit (0);
++#endif
++
++  exit (1);
++}
++EOF
++
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++	{ echo "$SYSTEM_NAME"; exit; }
++
++# Apollos put the system type in the environment.
++
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
++
++# Convex versions that predate uname can use getsysinfo(1)
++
++if [ -x /usr/convex/getsysinfo ]
++then
++    case `getsysinfo -f cpu_type` in
++    c1*)
++	echo c1-convex-bsd
++	exit ;;
++    c2*)
++	if getsysinfo -f scalar_acc
++	then echo c32-convex-bsd
++	else echo c2-convex-bsd
++	fi
++	exit ;;
++    c34*)
++	echo c34-convex-bsd
++	exit ;;
++    c38*)
++	echo c38-convex-bsd
++	exit ;;
++    c4*)
++	echo c4-convex-bsd
++	exit ;;
++    esac
++fi
++
++cat >&2 <<EOF
++$0: unable to guess system type
++
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
++
++  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++and
++  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++
++If the version you run ($0) is already up to date, please
++send the following data and any information you think might be
++pertinent to <config-patches@gnu.org> in order to provide the needed
++information to handle your system.
++
++config.guess timestamp = $timestamp
++
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
++
++hostinfo               = `(hostinfo) 2>/dev/null`
++/bin/universe          = `(/bin/universe) 2>/dev/null`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
++/bin/arch              = `(/bin/arch) 2>/dev/null`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++
++UNAME_MACHINE = ${UNAME_MACHINE}
++UNAME_RELEASE = ${UNAME_RELEASE}
++UNAME_SYSTEM  = ${UNAME_SYSTEM}
++UNAME_VERSION = ${UNAME_VERSION}
++EOF
++
++exit 1
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+--- adjtimex-1.23.orig/debian/control
++++ adjtimex-1.23/debian/control
+@@ -0,0 +1,20 @@
++Source: adjtimex
++Section: admin
++Priority: optional
++Maintainer: James R. Van Zandt <jrv@debian.org>
++Build-Depends: debhelper (>= 5), po-debconf
++Standards-Version: 3.7.2
++
++Package: adjtimex
++Architecture: any
++Depends: ${shlibs:Depends}, debconf | debconf-2.0
++Suggests: ntpdate
++Description: Utility to display or set the kernel time variables
++ This program gives you raw access to the kernel time variables.  For
++ a machine connected to the Internet, or equipped with a precision
++ oscillator or radio clock, the best way to keep the system clock
++ correct is with ntpd.  However, for a standalone or intermittently
++ connected machine, you may use adjtimex instead to at least correct
++ for systematic drift.  adjtimex can optionally adjust the system
++ clock using the CMOS clock as a reference, and can log times for
++ long-term estimation of drift rates.
+--- adjtimex-1.23.orig/debian/po/POTFILES.in
++++ adjtimex-1.23/debian/po/POTFILES.in
+@@ -0,0 +1 @@
++[type: gettext/rfc822deb] templates
+--- adjtimex-1.23.orig/debian/po/templates.pot
++++ adjtimex-1.23/debian/po/templates.pot
+@@ -0,0 +1,59 @@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=CHARSET\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
+--- adjtimex-1.23.orig/debian/po/fr.po
++++ adjtimex-1.23/debian/po/fr.po
+@@ -0,0 +1,87 @@
++# translation of fr.po to French
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++#    Developers do not need to manually edit POT or PO files.
++#
++# Christian Perrier <bubulle@debian.org>, 2006.
++msgid ""
++msgstr ""
++"Project-Id-Version: fr\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2006-12-17 14:01+0100\n"
++"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
++"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr ""
++"Faut-il lancer adjtimex lors de l'installation et à chaque démarrage du "
++"système ?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"Adjtimex peut être lancé au démarrage du système afin de régler les "
++"paramètres d'horloge du noyau en fonction des valeurs contenues dans /etc/"
++"default/adjtimex. Ne choisissez pas cette option si vous souhaitez "
++"simplement vous servir d'adjtimex pour consulter les paramètres actuels."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Faut-il lancer adjtimexconfig lors de l'installation ?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"Le script adjtimexconfig utilise adjtimex afin de trouver les valeurs "
++"appropriées pour les variables du noyau concernant le battement (« tick ») "
++"et la fréquence d'horloge. Cela permettra à l'horloge du système d'être à "
++"peu près en accord avec l'horloge matérielle (parfois appelée « horloge "
++"CMOS »). Ces valeurs seront alors conservées dans le fichier de "
++"configuration /etc/default/adjtimex ce qui permettra de les restaurer à "
++"chaque démarrage quand /etc/init.d/adjtimex s'exécutera. "
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"La durée d'exécution du script est de 70 secondes. Vous pouvez également "
++"utiliser adjtimexconfig vous-même plus tard ou déterminer les valeurs des "
++"variables du noyau d'une autre manière (il en existe plusieurs : voir la "
++"page de manuel d'adjtimex). Ces valeurs devront ensuite être placées dans /"
++"etc/default/adjtimex."
+--- adjtimex-1.23.orig/debian/po/es.po
++++ adjtimex-1.23/debian/po/es.po
+@@ -0,0 +1,81 @@
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++#    Developers do not need to manually edit POT or PO files.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: Vicente H. <vherrerv@supercable.es>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr "¿Debe ejecutarse adjtimex ahora y en cada arranque?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++#, fuzzy
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"Adjtimex puede ser ejecutado en el arranque del sistema para poner los "
++"parámetros de tiempo del núcleo en /etc/default/adjtimex. Si usted solamente "
++"quiere usar adjtimex para inspeccionar los parámetros actuales, conteste \"No"
++"\"."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "¿Debe ejecutarse adjtimexconfig ahora?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"El guión adjtimexconfig usará adjtimex para encontrar los valores para el "
++"núcleo de la señal y frecuencia que será tomada por el reloj del sistema "
++"para estar de acuerdo con el reloj del hardware (también conocido como el "
++"reloj CMOS). Este guión guardará los valores en el archivo de configuración /"
++"etc/default/adjtimex para que los ajustes sean restaurados en cada arranque "
++"del sistema, cuando /etc/init.d/adjtimex sea ejecutado."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"El guión toma 70 seg. para ser ejecutado. O bien, usted mismo puede ejecutar "
++"adjtimexconfig más tarde, o determinar las variables del núcleo de varias "
++"formas (mire la página man de adjtimex) y anótelos en /etc/default/adjtimex."
+--- adjtimex-1.23.orig/debian/po/pl.po
++++ adjtimex-1.23/debian/po/pl.po
+@@ -0,0 +1,83 @@
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++#    Developers do not need to manually edit POT or PO files.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: Bartosz Zapa³owski <zapal@debian.linux.org.pl>\n"
++"Language-Team: Polish Debian Documentation Project <pddp@debian.linux.org."
++"pl>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=iso-8859-2\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr ""
++"Czy adjtimex ma byæ uruchomiany podczas instalacji i ka¿dego startu systemu?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"adjtimex mo¿e byæ uruchamiany podczas ka¿dego uruchomienia systemu,by "
++"ustawiæ parametry czasu w j±drze na warto¶ci znajduj±ce siê w pliku/etc/"
++"default/adjtimex. Nie wyra¿aj zgody, je¶li chcesz u¿ywaæ adjtimextylko do "
++"sprawdzania aktualnych warto¶ci."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Czy adjtimexconfig ma byæ uruchomiony podczas instalacji?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"Skrypt adjtimexconfig skorzysta z programu adjtimex do znalezienia "
++"takichwarto¶ci parametrów j±dra tick i frequency, ¿eby zegar systemowy by³ "
++"zbli¿onydo zegara sprzêtowego (zegara CMOS). Nastêpnie zapisze ustawienia w "
++"plikukonfiguracyjnym /etc/default/adjtimex, dziêki czemu warto¶ci te "
++"bêd±przywrócane przy ka¿dym starcie systemu w momencie wykonywania skryptu/"
++"etc/init.d/adjtimex."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"Skrypt bêdzie dzia³a³ przez 70 sekund. Mo¿esz te¿ uruchomiæ "
++"w³asnorêcznieadjtimexconfig w dowolnym czasie lub dobraæ paramterty j±dra w "
++"innysposób (zapoznaj siê ze stron± manuala adjtimex) i zapisaæ je w pliku/"
++"etc/default/adjtimex."
+--- adjtimex-1.23.orig/debian/po/nl.po
++++ adjtimex-1.23/debian/po/nl.po
+@@ -0,0 +1,82 @@
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++#    Developers do not need to manually edit POT or PO files.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: adjtimex\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2003-10-04 16:05+0100\n"
++"Last-Translator: Michiel Sikkes <michiel@sikkes.xs4all.nl>\n"
++"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr ""
++"Wilt u dat adjtimex bij elke installatie en bij elke opstartprocedure "
++"gedraaid wordt?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"adjtimex kan gedraaid worden bij het opstarten van het systeem om de "
++"kerneltijd parameters in te stellen zoals gedefinieerd in /etc/default/"
++"adjtimex. Accepteer deze optie niet als u adjtimex wilt gebruiken om de "
++"huidige parameters te bekijken."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Wilt u dat adjtimexconfig bij het installeren wordt gedraaid?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"Het adjtimexconfig script zal adjtimex gebruiken om de eigenschappen voor de "
++"kernelvariablen tick en frequency te vinden. Dit zal zorgen dat de "
++"systeemklok gelijk loopt met de hardware klok (ook bekend onder de naam CMOS "
++"klok). Het slaat deze eigenschappen op in het configuratiebestand /etc/"
++"default/adjtimex, dus de instellingen worden bij elke "
++"systeemopstartprocedure hersteld als /etc/init.d/adjtimex draait."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"Het script doet er 70 seconden over om te draaien. Als alternatief kunt u "
++"adjtimexconfig later handmatig draaien, of de kerneleigenschappen op een "
++"andere manier bepalen (zie de adjtimex man-pagina) en deze zelf in /etc/"
++"default/adjtimex zetten."
+--- adjtimex-1.23.orig/debian/po/da.po
++++ adjtimex-1.23/debian/po/da.po
+@@ -0,0 +1,79 @@
++# translation of adjtimex_1.16-1-da.po to Danish
++# translation of adjtimex_1.16-1_templates.po to Danish
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
++#    Developers do not need to manually edit POT or PO files.
++# Claus Hindsgaul <claus_h@image.dk>, 2004.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: adjtimex_1.16-1-da\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2004-03-24 17:57+0100\n"
++"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
++"Language-Team: Danish <dansk@klid.dk>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.3.1\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr "Skal adjtimex køres under installation og ved hver opstart?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"adjtimex kan køres under opstart af systemet for at sætte kernens "
++"tidsparametre til værdierne i /etC/default/adjtimex. Acceptér ikke dette, "
++"hvis du kun vil bruge adjtimex til at gennemse de aktuelle parametre."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Skal adjtimexconfig køres under installationen?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"Skriftet adjtimexconfig vil bruge adjtimex til at finde de værdier til "
++"kernevariablene tick og frequency, der vil få systemuret til at passe med "
++"computerens indbyggede ur (CMOS-uret). Den gemmer derefter værdierne i "
++"opsætningsfilen /etc/default/edjtimex, så indstillingerne bliver sat under "
++"hver opstart, når skriptet /etC/init.d/adjtimex køres."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"Det tager 70 sekunder at køre skriptet. Alternativt kan du selv køre "
++"adjtimexconfig senere, eller finde kernevariablene på en anden måde (se "
++"manualsiden adjtimex) og installere dem i /etc/default/adjtimex."
+--- adjtimex-1.23.orig/debian/po/ja.po
++++ adjtimex-1.23/debian/po/ja.po
+@@ -0,0 +1,78 @@
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++#    Developers do not need to manually edit POT or PO files.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2003-11-21 00:02+0900\n"
++"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
++"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=EUC-JP\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr "adjtimex ¤ò¥¤¥ó¥¹¥È¡¼¥ë»þ¤ª¤è¤ÓËè²ó¤Îµ¯Æ°»þ¤ËÆ°ºî¤µ¤»¤Þ¤¹¤«?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"adjtimex ¤ò¥·¥¹¥Æ¥à¤Îµ¯Æ°»þ¤ËÆ°ºî¤µ¤»¤Æ¥«¡¼¥Í¥ë¤Î»þ´Ö¥Ñ¥é¥á¡¼¥¿¤ò /etc/"
++"default/adjtimex ¤ÎÃͤËÀßÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£ adjtimex ¤ò¸½ºß¤Î¥Ñ¥é¥á¡¼¥¿¤Î"
++"Ä´ºº¤Ë¤À¤±¤Ë»È¤¤¤¿¤¤¤È¤¤¤¦¾ì¹ç¤ÏÆ°ºî¤ò¤µ¤»¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "adjtimexconfig ¤ò¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÆ°ºî¤µ¤»¤Þ¤¹¤«?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"adjtimexconfig ¥¹¥¯¥ê¥×¥È¤Ï adjtimex ¤ò»ÈÍѤ·¤Æ¡¢¥·¥¹¥Æ¥à¥¯¥í¥Ã¥¯¤ò¥Ï¡¼¥É¥¦¥§"
++"¥¢¥¯¥í¥Ã¥¯ (CMOS ¥¯¥í¥Ã¥¯¤È¤·¤Æ¤âÃΤé¤ì¤Æ¤¤¤Þ¤¹) ¤È¤ª¤ª¤è¤½Æ±´ü¤¹¤ë¤è¤¦¤Ë¥«¡¼"
++"¥Í¥ëÊÑ¿ô tick ¤È frequency ¤ËÍ¿¤¨¤ëÃͤò¸«¤Ä¤±¤Þ¤¹¡£¤½¤·¤Æ¡¢¤³¤ÎÃͤòÀßÄê¥Õ¥¡¥¤"
++"¥ë /etc/default/adjtimex ¤ËÊݸ¤¹¤ë¤³¤È¤ÇËè²óµ¯Æ°»þ¤Ë /etc/init.d/adjtimex ¤¬"
++"Æ°ºî¤¹¤ëºÝ¤ËÀßÄ꤬Éü¸µ¤µ¤ì¤Þ¤¹¡£"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"¥¹¥¯¥ê¥×¥È¤ÏÆ°ºî¤Ë 70 É䫤«¤ê¤Þ¤¹¡£Ê̲ò¤È¤·¤Æ¤Ï adjtimexconfig ¤ò¸å¤Û¤É¼Â¹Ô"
++"¤¹¤ë¡¢¤Þ¤¿¤Ï¾¤ÎÊýË¡¤Ç¥«¡¼¥Í¥ëÊÑ¿ô¤ò·è¤á¤Æ (adjtimex ¤Î man ¥Ú¡¼¥¸¤ò»²¾È)  /"
++"etc/default/adjtimex ¤Ø¤ÎÀßÄê¤ò¹Ô¤¦¤Ê¤É¤¬²Äǽ¤Ç¤¹¡£"
+--- adjtimex-1.23.orig/debian/po/pt_BR.po
++++ adjtimex-1.23/debian/po/pt_BR.po
+@@ -0,0 +1,82 @@
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++#    Developers do not need to manually edit POT or PO files.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: adjtimex_1.16-1\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2004-01-17 20:55-0300\n"
++"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
++"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr "Executar o adjtimex durante a instalação e a cada reinicialização ?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"O adjtimex pode ser executado na inicialização do sistema para definir "
++"parâmetros de tempo de kernel para os valores em /etc/default/adjtimex. Não "
++"aceite caso você somente queira usar o adjtimex para inspecionar os "
++"parâmetros atuais."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Executar o adjtimexconfig durante a instalação ?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"O script adjtimex irá utilizar o adjtimex para encontrar valores para "
++"variáveis de kernel tick e frequency que farão com que o relógio do sistema "
++"concorde aproimadamente com o relógio de hardware (também conhecido como "
++"relógio CMOS). Ele irá então gravar esses valores no arquivo de "
++"configuração /etc/default/adjtimex de modo que as configurações sejam "
++"restauradas a cada renicialização, quando o /etc/init.d/adjtimex é executado."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"O script leva cerca de 70 segundos para ser executado. Alternativamente, "
++"você pode executar o adjtimexconfig você mesmo posteriormente, ou ainda "
++"determinar as variáveis de kernel usando uma das diversas maneiras possíveis "
++"(consulte a página de manul adjtimex) e instalar as mesmas em /etc/default/"
++"adjtimex."
+--- adjtimex-1.23.orig/debian/po/de.po
++++ adjtimex-1.23/debian/po/de.po
+@@ -0,0 +1,83 @@
++# translation of adjtimex_1.21.1-2_de.po to German
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
++#    Developers do not need to manually edit POT or PO files.
++#
++# Erik Schanze <eriks@debian.org>, 2004-2007.
++msgid ""
++msgstr ""
++"Project-Id-Version: adjtimex_1.21.1-2_de\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2007-08-06 20:50+0200\n"
++"Last-Translator: Erik Schanze <eriks@debian.org>\n"
++"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\n"
++"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr ""
++"Soll Adjtimex nach der Installation und bei jedem Hochfahren gestartet "
++"werden?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"Adjtimex kann beim Hochfahren des Systems ablaufen, um die Zeitparameter im "
++"Kernel auf die Werte in /etc/defaults/adjtimex zu setzen. Stimmen Sie dem "
++"nicht zu, wenn Sie mit Adjtimex nur die aktuellen Parameter ermitteln wollen."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Soll »adjtimexconfig« zur Installation aufgerufen werden?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"Das Skript »adjtimexconfig« nutzt Adjtimex, um die Werte der Kernelvariablen "
++"»tick« und »frequency« zu finden, damit die Systemuhr ungefähr mit der "
++"Rechneruhr (auch bekannt als CMOS-Uhr) übereinstimmt. Das Skript speichert "
++"diese Werte in der Konfigurationsdatei /etc/default/adjtimex, sodass die "
++"Einstellung bei jedem Systemstart wiederhergestellt wird, wenn /etc/init.d/"
++"adjtimex startet."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"Das Skript benötigt 70 Sekunden, um durchzulaufen. Andererseits können Sie "
++"»adjtimexconfig« später selbst starten oder finden die Kernelvariablen auf "
++"einem anderen Weg (siehe Handbuchseite von Adjtimex) und speichern die Werte "
++"in der Datei /etc/default/adjtimex."
+--- adjtimex-1.23.orig/debian/po/vi.po
++++ adjtimex-1.23/debian/po/vi.po
+@@ -0,0 +1,75 @@
++# Vietnamese Translation for adjtimex.
++# Copyright © 2005 Free Software Foundation, Inc.
++# Clytie Siddall <clytie@riverland.net.au>, 2005.
++# 
++msgid ""
++msgstr ""
++"Project-Id-Version: adjtimex 1.20-4\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2005-05-04 15:44+0930\n"
++"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
++"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=utf-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=1; plural=0\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr ""
++"Bạn có muốn chạy trình adjtimex khi cài đặt và m�i khi khởi động không?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"Trình adjtimex (adjust time: đi�u chỉnh th�i gian) thì có thể chạy khi khởi "
++"động hệ thống, để lập những tham số th�i gian của hạt nhân thành những giá "
++"trị trong /etc/default/adjtimex. �ừng hiệu lực tùy ch�n này nếu bạn chỉ muốn "
++"sử dụng trình adjtimex để kiểm tra những tham số hiện th�i."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Bạn có muốn chạy tập lệnh adjtimexconfig khi cài đặt không?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"Tập lệnh adjtimexconfig (adjust time configuration: đi�u chỉnh cấu hình th�i "
++"gian) thì sẽ dùng trinh adjtimex để tìm giá trị cho biến hạt nhân «tick» và "
++"«frequency» để khớp đồng hồ hệ thống xấp xi với đồng hồ phần cứng (cũng được "
++"biết như là đồng hồ CMOS). Như thế thì nó lưu nhưng giá trị này trong tập "
++"tin cấu hình /etc/default/adjtimex vì vậy sẽ phục hồi cách thiết lập ấy m�i "
++"khi khởi động, khi chạy /etc/init.d/adjtimex."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"Tập lệnh này chạy được 70 giây. Hoặc bạn có thể tự chạy tập lệnh "
++"adjtimexconfig vào lúc sau, hoặc quyết định những biến hạt nhân một của vài "
++"cách khác (hãy xem trang hướng dẫn: lệnh\n"
++"man adjtimex\n"
++"mà «man» là trình hiển thị trang hướng dẫn), và cài đặt chúng vào /etc/"
++"default/adjtimex."
+--- adjtimex-1.23.orig/debian/po/cs.po
++++ adjtimex-1.23/debian/po/cs.po
+@@ -0,0 +1,67 @@
++# Czech translation of adjtimex templates
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: adjtimex 1.20-3\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2005-4-10 22:13+0200\n"
++"Last-Translator: Martin Sin <martin.sin@seznam.cz>\n"
++"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-2\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr "Má být adjtimex spu¹tìn pøi instalaci a pøi ka¾dém spu¹tìní?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"adjtimex mù¾e bì¾et pøi ka¾dém startu systému a nastavit parametry jádra na "
++"hodnoty z /etc/default/adjtimex. Pøi nesouhlasu bude adjtimex nastaven na "
++"zji¹tìní aktuálních parametrù."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Má být adjtimexconfig spu¹tìn pøi instalaci?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"Skript adjtimexconfig pou¾ije adjtimex k nalezení hodnot pro promìnné "
++"èasovaèe a frekvence jádra tak, ¾e nastaví systémové hodiny pøibli¾nì na "
++"hodnotu hardwarových hodin (také známých jako CMOS hodiny). Pak ulo¾í tyto "
++"hodnoty do konfiguraèního souboru /etc/default/adjtimex aby mohlo být "
++"nastavení obnoveno pøi ka¾dém startu, v¾dy pøi spu¹tìní /etc/init.d/adjtimex."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"Spu¹tìní skriptu zabere 70 sekund. Nebo mù¾ete spustit adjtimexconfig "
++"samostatnì pozdìji, pøípadnì urèit promìnné jádra jedním z nìkolika rùzných "
++"zpùsobù (podívejte se na manuálovou stránku adjtimex)  a umístìte je do /etc/"
++"default/adjtimex."
+--- adjtimex-1.23.orig/debian/po/pt.po
++++ adjtimex-1.23/debian/po/pt.po
+@@ -0,0 +1,71 @@
++# 2005-10-27 - Marco Ferra <mferra@sdf.lonestar.org> (initial translation)
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: adjtimex 1.20-5\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2005-10-27 01:11+0100\n"
++"Last-Translator: Marco Ferra <mferra@sdf.lonestar.org>\n"
++"Language-Team: Portuguese <traduz@debianpt.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr ""
++"Deve o adjtimex correr enquanto o instala e depois sempre que o sistema "
++"inicia?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"O adjtimex pode correr quando o sistema inicia para ajustar os paramêtros "
++"temporais do kernel para os valores especificados em /etc/default/adjtimex. "
++"Por favor recuse se apenas deseja usar o adjtimex para inspecionar os "
++"paramêtros actuais."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Deve o adjtimexconfig correr enquanto o instala?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"O script adjtimexconfig irá usar o comando adjtimex para encontrar os "
++"valores para variáveis do kernel que o farão aproximar e estar de acordo com "
++"o relógio por hardware (tambem conhecido pelo CMOS clock).  Este então "
++"guarda esses valores no ficheiro /etc/default/adjtimex para que estes "
++"paramêtros sejam reavidos sempre que o sistema inicia, nomeadamente quando "
++"o /etc/init.d/adjtimex corre."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"Este script demora 70 segundos a correr.  De forma alternativa pode correr o "
++"adjtimexconfig por si próprio numa altura mais tarde ou determinar as "
++"variáveis do kernel de outras formas (leia a página do manual do adjtimex) e "
++"instale-os em /etc/default/adjtimex."
+--- adjtimex-1.23.orig/debian/po/sv.po
++++ adjtimex-1.23/debian/po/sv.po
+@@ -0,0 +1,77 @@
++# Translators, if you are not familiar with the PO format, gettext
++# documentation is worth reading, especially sections dedicated to
++# this format, e.g. by running:
++# info -n '(gettext)PO Files'
++# info -n '(gettext)Header Entry'
++# Some information specific to po-debconf are available at
++# /usr/share/doc/po-debconf/README-trans
++# or http://www.debian.org/intl/l10n/po-debconf/README-trans
++# Developers do not need to manually edit POT or PO files.
++# , fuzzy
++# 
++# 
++msgid ""
++msgstr ""
++"Project-Id-Version: adjtimex 1.20-5\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2005-10-11 16:31+0200\n"
++"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
++"Language-Team: Swedish <sv@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=iso-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr "Ska adjtimex köras vid installation och vid varje uppstart?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"adjtimex kan köra vid systemets uppstart för att sätta kärntidsparametrar "
++"till värdena i /etc/default/adjtimex. Acceptera inte om du bara vill använda "
++"adjtimex för att inspektera de nuvarande parametrarna."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Ska adjtimexconfig köras vid installationstid?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"Skriptet adjtimexconfig kommer att använda adjtimex för att hitta värden för "
++"kärnvariablerna tick och frequency som gör att systemklockan kommer överens "
++"med hårdvaruklockan (också kallad CMOS-klockan).  Den sparar sedan dessa "
++"värden i konfigurationsfilen /etc/default/adjtimex så att inställningarna "
++"kommer att användas vid varje uppstart, när /etc/init.d/adjtimex körs."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"Skriptet tar 70 sekunder att köras. Alternativt kan du köra adjtimexconfig "
++"själv vid en senare tid eller bestämma variabler för kärnan på ett eller "
++"flera sätt (se adjtimes manualsida) och installera dom i /etc/default/"
++"adjtimex)."
+--- adjtimex-1.23.orig/debian/po/ru.po
++++ adjtimex-1.23/debian/po/ru.po
+@@ -0,0 +1,80 @@
++# translation of adjtimex_1.20-5_templates_ru.po to Russian
++#
++#    Translators, if you are not familiar with the PO format, gettext
++#    documentation is worth reading, especially sections dedicated to
++#    this format, e.g. by running:
++#         info -n '(gettext)PO Files'
++#         info -n '(gettext)Header Entry'
++#    Some information specific to po-debconf are available at
++#            /usr/share/doc/po-debconf/README-trans
++#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
++#    Developers do not need to manually edit POT or PO files.
++# Yuri Kozlov <kozlov.y@gmail.com>, 2005.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: template_adjtimex_1.20-5\n"
++"Report-Msgid-Bugs-To: jrv@debian.org\n"
++"POT-Creation-Date: 2007-08-06 21:41-0400\n"
++"PO-Revision-Date: 2005-11-07 19:24+0300\n"
++"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
++"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.9.1\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Should adjtimex be run at installation and at every startup?"
++msgstr "Должен adjtimex быть запущен �ейча� и каждый раз при �тарте �и�темы?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"adjtimex can run at system startup to set the kernel time parameters to the "
++"values in /etc/default/adjtimex. Don't accept if you just want to use "
++"adjtimex to inspect the current parameters."
++msgstr ""
++"adjtimex можно запу�кать при �тарте �и�темы дл� у�тановки значений "
++"параметров времени �дра из файла /etc/default/adjtimex. �е �оглашайте�ь, "
++"е�ли про�то хотите и�пользовать adjtimex дл� проверки текущих параметров."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid "Should adjtimexconfig be run at installation time?"
++msgstr "Должен adjtimexconfig быть запущен �ейча�?"
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The adjtimexconfig script will use adjtimex to find values for the kernel "
++"variables tick and frequency that will make the system clock approximately "
++"agree with the hardware clock (also known as the CMOS clock).  It then saves "
++"these values in the configuration file /etc/default/adjtimex so the settings "
++"will be restored on every boot, when /etc/init.d/adjtimex runs."
++msgstr ""
++"Сценарий adjtimexconfig и�пользует adjtimex дл� пои�ка значений переменных "
++"�дра импуль�а �игнала и ча�тоты, которые помогают �огла�овывать �и�темные "
++"ча�ы � аппаратными ча�ами (так называемые ча�ы CMOS). Затем он �охран�ет �ти "
++"значени� в конфигурационный файл /etc/default/adjtimex, дл� того чтобы "
++"во��танавливать их при каждой загрузке � помощью �ценари� /etc/init.d/"
++"adjtimex."
++
++#. Type: boolean
++#. Description
++#: ../templates:2001
++msgid ""
++"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig "
++"yourself at a later time, or determine the kernel variables one of several "
++"other ways (see the adjtimex man page) and install them in /etc/default/"
++"adjtimex."
++msgstr ""
++"Длительно�ть работы �ценари� -- 70 �екунд. В каче�тве альтернативы вы можете "
++"запу�тить adjtimexconfig вручную позже, или определить переменные �дра одним "
++"из не�кольких других �по�обов (�мотрите �траницу руковод�тва по adjtimex) и "
++"�охранить их в файл /etc/default/adjtimex."
+--- adjtimex-1.23.orig/debian/README.Debian
++++ adjtimex-1.23/debian/README.Debian
+@@ -0,0 +1,21 @@
++adjtimex for DEBIAN
++----------------------
++
++This is the Debian Linux prepackaged version of adjtimex.
++
++This package was put together by Jim Van Zandt <jrv@debian.org>,
++who also maintains the program and therefore used the master sources.
++
++further Information:
++
++* adjtimex manpage
++* copying policy 
++	/usr/share/doc/adjtimex/copyright
++	(or debian/copyright in the source package)
++* changelog for debian package
++	/usr/share/doc/adjtimex/changelog.Debian	 
++* adjtimex's README:
++	/usr/share/doc/adjtimex/README
++
++
++James R. Van Zandt <jrv@debian.org>, Sun,  7 Mar 1999 21:58:51 -0500
+--- adjtimex-1.23.orig/debian/templates
++++ adjtimex-1.23/debian/templates
+@@ -0,0 +1,22 @@
++Template: adjtimex/run_daemon
++Type: boolean
++Default: true
++_Description: Should adjtimex be run at installation and at every startup?
++ adjtimex can run at system startup to set the kernel time parameters to
++ the values in /etc/default/adjtimex. Don't accept if you just want to
++ use adjtimex to inspect the current parameters.
++
++Template: adjtimex/compare_rtc
++Type: boolean
++Default: true
++_Description: Should adjtimexconfig be run at installation time?
++ The adjtimexconfig script will use adjtimex to find values for the kernel
++ variables tick and frequency that will make the system clock approximately
++ agree with the hardware clock (also known as the CMOS clock).  It then
++ saves these values in the configuration file /etc/default/adjtimex so the
++ settings will be restored on every boot, when /etc/init.d/adjtimex runs.
++ .
++ The script takes 70 sec to run. Alternatively, you can run adjtimexconfig
++ yourself at a later time, or determine the kernel variables one of several
++ other ways (see the adjtimex man page) and install them in
++ /etc/default/adjtimex.
+--- adjtimex-1.23.orig/debian/changelog
++++ adjtimex-1.23/debian/changelog
+@@ -0,0 +1,530 @@
++adjtimex (1.23-1) unstable; urgency=low
++
++  * New upstream release
++
++  * adjtimex.c (compare): In case of absence of /etc/adjtime, do not fail,
++    and do not force users to manually create it with 0.0
++    content. Instead, proceed assuming zero values (meaning RTC does not
++    drift). Also replace redundant code by a call to
++    get_cmos_adjustment(). README: Rewrite USAGE paragraph. Remove point
++    about creating zero adjfile. Document new behaviour without
++    adjfile. Remove reference to the long outdated clock(8). Update URL
++    for hwclock(8).  (Thanks to Alain Guibert <alguibert@free.fr>,
++    closes:bug#445448)
++
++  * adjtimex.c (busy_wait): timestamp more closely the RTC clock beat
++    (thanks to Alain Guibert <alguibert at free.fr>, see Debian
++    bug#443814). (usage): --directisa switch forces adjtimex to poll the
++    update-in-process (UIP) flag of the CMOS clock (thanks to Alain
++    Guibert <alguibert at free.fr>, closes:bug#443773).
++
++ -- James R. Van Zandt <jrv@debian.org>  Sat, 06 Oct 2007 21:57:04 -0400
++
++adjtimex (1.22-1) unstable; urgency=low
++
++  * New upstream release: fix these bugs in ntpdate output
++    interpretation (closes:bug#438718):
++    adjtimex has a bug in evaluating the output of ntpdate, because
++        1. it assumes ntpdate outputs "adjust time server", but ntpdate
++    may output "step time server" also
++        2. it doesnt stop at last line but as soon as it has found "filter
++    offset:" lines, and because of this it will not find the "offset ..."
++    information in the last line.
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun, 23 Sep 2007 12:51:52 -0400
++
++adjtimex (1.21.1-3) unstable; urgency=low
++
++  * update German translation of debconf templates, thanks to Erik Schanze
++    <eriks@debian.org> and Helge Kreutzmann
++    <debian@helgefjell.de>(closes:#436080)
++  
++  * debian/rules don't ignore failure of "make distclean"
++  
++  * debian/adjtimex.init: make LSB compliant
++
++ -- James R. Van Zandt <jrv@debian.org>  Mon, 06 Aug 2007 21:39:47 -0400
++
++adjtimex (1.21.1-2) unstable; urgency=low
++
++  * Update French translation of debconf templates, thanks to Christian
++    Perrier <bubulle@debian.org> (closes:Bug#403472)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun,  7 Jan 2007 18:10:32 -0500
++
++adjtimex (1.21.1-1) unstable; urgency=low
++
++  * New upstream release.
++
++  * adjtimex.c: don't declare adjtimex syscall (should already be getting
++    the declaration from sys/timex.h) Thanks to Andreas Jochens
++    <aj@andaco.de> (closes:#390989)
++  
++ -- James R. Van Zandt <jrv@debian.org>  Sat,  7 Oct 2006 08:04:52 -0400
++
++adjtimex (1.21-2) unstable; urgency=low
++
++  * Makefile: correct version number to 1.21 (error in importing upstream
++    sources)
++    
++  * debian/control: depend on po-debconf
++
++ -- James R. Van Zandt <jrv@debian.org>  Fri,  6 Oct 2006 20:41:00 -0400
++
++adjtimex (1.21-1) unstable; urgency=low
++
++  * New upstream release.  use /dev/rtc if available (closes:#196692). Use
++    heuristic to correct for DST changes or lacking --utc flag
++    (closes:#308396). check return code in probe_time() so if root
++    privileges are needed (e.g. "adjtimex -r") and lacking, command will
++    fail rather than printing bogus results. (closes:#364060)
++
++  * debian/postinst: start with invoke-rc.d if available (closes:#367746)
++  
++  * debian/control: update to policy 3.7.2
++
++ -- James R. Van Zandt <jrv@debian.org>  Sat, 20 May 2006 08:33:05 -0400
++
++adjtimex (1.20-7) unstable; urgency=low
++
++  * debian/README.Debian: correct references to files, which are no longer
++    in /usr/doc/adjtimex (closes:#365761)
++  * debian/rules: declare debhelper compat level 5
++  * debian/control: build-depends on debhelper ver 5
++
++ -- James R. Van Zandt <jrv@debian.org>  Thu,  4 May 2006 21:54:33 -0400
++
++adjtimex (1.20-6) unstable; urgency=low
++
++  * control: depend on debconf | debconf-2.0 (closes: #331733), update to
++    policy 3.6.2
++  * debian/po/de.po: fix spelling error in German translation, thanks to
++    Philipp Meier <meier@meisterbohne.de> (closes: #279254)
++  * debian/po/sv.po: Swedish translation for debconf template, courtesy
++    of Daniel Nylander <yeager@lidkoping.net> (closes: #333124)
++  * debian/po: Add Portugese  translation for debconf template, courtesy of
++    Miguel Figueiredo <elmig@debianpt.org> (closes: #336333)
++  * debian/po: Add Russian translation for debconf template, courtesy of
++    Yuri Kozlov <kozlov.y@gmail.com> (closes: #337967)
++  * debian/copyright: update FSF address.
++
++ -- James R. Van Zandt <jrv@debian.org>  Fri, 25 Nov 2005 21:04:08 -0500
++
++adjtimex (1.20-5) unstable; urgency=low
++
++  * debian/po/vi.po: Vietnamese translation for debconf template, courtesy
++    of Clytie Siddall <clytie@riverland.net.au> (closes:Bug#307600)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sat,  7 May 2005 11:58:47 -0400
++
++adjtimex (1.20-4) unstable; urgency=low
++
++  * debian/po/cs.po: Czech translation for debconf template, courtesy of
++    Martin Šín <martin.sin@seznam.cz> (closes:Bug#304377)
++
++ -- James R. Van Zandt <jrv@debian.org>  Mon, 25 Apr 2005 20:14:42 -0400
++
++adjtimex (1.20-3) unstable; urgency=low
++
++  * debian/adjtimex.init: adjust printout to conform to Debian standard,
++    output error to stderr (Thanks to Thomas Hood, closes:bug#294824)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun, 13 Mar 2005 17:20:28 -0500
++
++adjtimex (1.20-2) unstable; urgency=low
++
++  * debian/po/de.po: replace corrupted file (closes: #250250)
++
++ -- James R. Van Zandt <jrv@debian.org>  Mon, 20 Sep 2004 20:08:47 -0400
++
++adjtimex (1.20-1) unstable; urgency=low
++
++  * New upstream release
++
++  * adjtimex.c (compare): in "compare" or "adjust", return immediately
++    after printing last result, instead of sleeping an extra $interval
++    seconds. (Thanks to Alain Guibert <derogaton at oreka.com>,
++    closes:Bug#243652)
++
++  * postinst: remove /etc/rcS.d/S20adjtimex link if configured not to run
++    at startup (thanks to Mario 'BitKoenig' Holbe, closes:Bug#267229)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun, 19 Sep 2004 12:41:37 -0400
++
++adjtimex (1.19-1) unstable; urgency=high
++
++  * copyright: report upstream source address (closes:Bug#269691)
++
++  * control: don't depend on either mawk or awk, since either works and
++    awk is required (closes:Bug#267228)
++
++  * New upstream release
++
++  * adjtimex.c (compare): Account for the current frequency value
++  when calculating the recommended frequency value.  Simplify
++  calculation of recommended tick. (compare): print estimated system 
++  error in ppm instead of obscure "second diff".
++
++  * adjtimex.8: use 2^16 instead of the more obscure 1<<16.
++
++  * adjtimex.c: revert to poll-wait instead of using /dev/rtc, because the
++    latter only provides time with one second precision and so gives
++    wildly inaccurate adjustments. (closes:Bug#269498,Bug#265839)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sat, 11 Sep 2004 16:01:52 -0400
++
++adjtimex (1.18-1.1) unstable; urgency=medium
++
++  * Non-maintainer upload prepared by Joshua Kwan and Ken Bloom.
++  * Applied patch from Jurij Smakov <jurij@wooyd.org> to #263401:
++    - Fixes the regular expression used to extract the baseline value 
++      from the adjtimex output. Closes: #263401
++    - Replaces non-POSIX compliant calls to ('tail -1') by the 
++      POSIX-compliant ones ('tail -n 1')
++    - Cosmetic changes to the adjtimexconfig output, making it 
++      consistent with the general Debian style.
++  * Add German debconf template translations (closes: #250250)
++
++ -- Ken Bloom <kabloom@ucdavis.edu>  Thu, 12 Aug 2004 23:34:33 -0700
++
++adjtimex (1.18-1) unstable; urgency=low
++
++  * New upstream release
++  
++  * call reset_time_status() only when explicitly told to (thanks to Alain
++    Guibert <derogaton at oreka.com>, closes:bug#243031)
++
++  * Add debconf translations for Japanese (closes:bug#223462), Danish
++    (closes:bug#239865), and Brazilian Portuguese (closes:bug#228281).
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun, 11 Apr 2004 18:32:33 -0400
++
++adjtimex (1.17-1) unstable; urgency=low
++
++  * New upstream release
++
++  * control: compliant with Debian policy version 3.6.1
++
++  * es.po: decode "quoted-printable" encoding.
++  
++  * adjtimex.c: update email 
++    (main): If adjtimex() returns an error, print HZ and legal ranges
++    for tick and freq.  (thanks to Sami Farin <safari at iki.fi>)
++    (review): calculate reasonable tick and frequency when HZ != 100.
++    (cmos_init): use /dev/rtc when available (thanks to Richard
++    Henderson <rth at twiddle.net>).
++
++  * adjtimex.c: --status switch sets clock status (courtesy of Alain
++    Guibert <derogaton at oreka.com>) (closes:bug#242732)
++
++  * adjtimexconfig: set reasonable tick and frequency when HZ !=
++    100. (closes:Bug#241726)
++
++  * adjtimex.c (longopt): fix spelling to match documentation: --esterror
++    and --maxerror (thanks to Alain Guibert) (fixes:Bug#241863)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sat,  3 Apr 2004 21:13:09 -0500
++
++adjtimex (1.16-3) unstable; urgency=low
++
++  * Dutch translation of gettext debconf templates (courtesy of  Michiel Sikkes, closes:bug#215162)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun, 12 Oct 2003 17:33:55 -0400
++
++adjtimex (1.16-2) unstable; urgency=low
++
++  * Polish translation of gettext debconf templates (courtesy of  Bartosz
++    Zapalowski, closes:bug#208955)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun,  7 Sep 2003 16:26:30 -0400
++
++adjtimex (1.16-1) unstable; urgency=low
++
++  * New upstream release (closes:Bug#204382)(closes:Bug#204377)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sun, 24 Aug 2003 20:52:32 -0400
++
++adjtimex (1.15.1-2) unstable; urgency=low
++
++  * gettext-based debconf templates (closes:bug#205788)
++  * French translation of gettext debconf templates (closes:Bug#206430)
++  * Spanish translation of gettext debconf templates (closes:Bug#197485)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun, 24 Aug 2003 18:01:56 -0400
++
++adjtimex (1.15.1-1) unstable; urgency=low
++
++  * New upstream release. Add explicit newlines in multi-line help text
++    (closes:bug#194858) 
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sat, 31 May 2003 20:53:14 -0400
++
++adjtimex (1.15-1) unstable; urgency=low
++
++  * New upstream release.  Now compiles on ia64 (closes:bug#141655).
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Wed, 30 Apr 2003 19:38:11 -0400
++
++adjtimex (1.14-1) unstable; urgency=low
++
++  * New Upstream Release.  Expanded documentation (closes:bug#142967)
++  * convert to debhelper
++  * debian/control: depend on debconf
++  * debian/postinst: configure adjtimex to run on startup, and run
++    adjtimexconfig on installation, only if asked by sysadmin (via
++    debconf) (closes:bug#158047)
++  * debian/postrm: purge debconf db entry
++  * debian/adjtimexconfig: config file is now /etc/default/adjtimex
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun, 27 Apr 2003 21:28:40 -0400
++
++adjtimex (1.13-1) unstable; urgency=low
++
++  * New upstream release (closes:Bug#127483)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun,  6 Jan 2002 21:06:23 -0500
++
++adjtimex (1.12-3) unstable; urgency=low
++
++  * New maintainer email (fix remaining references)
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun,  9 Dec 2001 15:25:06 -0500
++
++adjtimex (1.12-2) unstable; urgency=low
++
++  * New maintainer email
++
++ -- James R. Van Zandt <jrv@debian.org>  Sun,  9 Dec 2001 13:24:59 -0500
++
++adjtimex (1.12-1) unstable; urgency=low
++
++  * New upstream release
++  * debian/control: move Build-Depends entry to source section
++    (closes:bug#91928).  Policy version 3.5.2 
++  * debian/rules: by default, compile without -g option.  Honor
++    DEB_BUILD_OPTIONS.  
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Wed, 22 Nov 2000 01:37:58 -0500
++
++adjtimex (1.11-3) unstable; urgency=low
++
++  * adjtimexconfig: install new values in /etc/adjtimex.conf rather than
++    the startup script /etc/init.d/adjtimex (thanks to Zsolt Szabo
++    <szazs@mm.bme.hu>).
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sat, 30 Sep 2000 09:34:58 -0400
++
++adjtimex (1.11-2) unstable; urgency=low
++
++  * build-depends on debmake
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sun,  3 Sep 2000 13:50:02 -0400
++
++adjtimex (1.11-1) unstable; urgency=low
++
++  * /etc/init.d/adjtimex: restart|force-reload also run adjtimex
++    (closes:bug#69514), add comment explaining precedence of
++    /etc/adjtimex.conf 
++
++  * New upstream release
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Mon, 28 Aug 2000 21:19:48 -0400
++
++adjtimex (1.10-1) frozen unstable; urgency=high
++
++  * New upstream release - security fix: use popen() to recover output from
++    ntpdate, instead of an unsafe temporary file (thanks to Colin Phipps
++    <crp22@cam.ac.uk>) (closes:bug#56752)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Tue,  1 Feb 2000 21:29:03 -0500
++
++adjtimex (1.9-2) unstable; urgency=low
++
++  * Suggest ntpdate (closes:bug#56751)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Mon, 31 Jan 2000 19:26:16 -0500
++
++adjtimex (1.9-1) unstable; urgency=low
++
++  * New upstream release
++  * Removed pointer to /usr/doc/copyright/GPL
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Mon,  3 Jan 2000 21:34:59 -0500
++
++adjtimex (1.8.1-1) unstable; urgency=low
++
++  * New upstream release (closes:bug#52637)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Thu, 16 Dec 1999 20:13:43 -0500
++
++adjtimex (1.8-4) unstable; urgency=low
++
++  * Change references from /usr/sbin/adjtimex to /sbin/adjtimex in
++    adjtimexconfig
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Tue,  2 Nov 1999 20:21:48 -0500
++
++adjtimex (1.8-3) unstable; urgency=low
++
++  * *Really* install binary into /sbin, so it is available
++    even if /usr is not mounted (closes:Bug#44399)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sat, 30 Oct 1999 17:57:57 -0400
++
++adjtimex (1.8-2) unstable; urgency=low
++
++  * Install compatibility symlink /usr/doc/adjtimex.
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sun, 24 Oct 1999 10:54:01 -0400
++
++adjtimex (1.8-1) unstable; urgency=low
++
++  * New upstream release: Install binary into /sbin, so it is available
++    even if /usr is not mounted (closes:Bug#44399)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Mon,  6 Sep 1999 13:08:15 -0400
++
++adjtimex (1.7-2) unstable; urgency=low
++
++  * Link against glibc2.1
++  * Upgrade to FHS
++  * Include full license statement in copyright file
++  * Revise GPL reference in copyright file
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sat,  4 Sep 1999 12:04:34 -0400
++
++adjtimex (1.7-1) unstable; urgency=low
++
++  * install configuration file in /etc/init.d rather than /etc/rc.boot
++  closes: #30120, #32436.
++  * New upstream release (incorporates Paul Slootman's alpha patch)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sat, 28 Nov 1998 20:33:38 -0500
++
++adjtimex (1.6-2) unstable; urgency=low
++
++  * corrected reference in man page: clock -> hwclock (Bug#27854)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sat, 24 Oct 1998 14:40:45 -0400
++
++adjtimex (1.6-1.1) unstable; urgency=low
++
++  * non-maintainer (binary-only) upload for Alpha
++  * changed architecture back to 'any'. Why should it be i386 only?
++  * don't use syscall1() to declare adjtimex() for Alpha
++
++ -- Paul Slootman <paul@debian.org>  Tue,  8 Sep 1998 20:42:52 +0200
++
++adjtimex (1.6-1) unstable; urgency=low
++
++  * New upstream release: Default log file is "/var/log/clocks.log".
++    Create log file if it does not exist. (Bug#25834)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sat, 22 Aug 1998 20:33:22 -0400
++
++adjtimex (1.5-3) unstable; urgency=low
++
++  * architecture is i386 only
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Mon, 29 Jun 1998 19:35:22 -0400
++
++adjtimex (1.5-2) unstable; urgency=low
++
++  * eliminate question in postinst, by eliminating postinst entirely
++    (Bug#22288) 
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sun,  7 Jun 1998 20:51:42 -0400
++
++adjtimex (1.5-1) frozen unstable; urgency=low
++
++  * New upstream release.  No functional changes, but adjtimex is now
++    covered by the GNU GPL. (Bug#21358)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Mon, 20 Apr 1998 21:38:53 -0400
++
++adjtimex (1.4-2) unstable; urgency=low
++
++  * Ensure that changelog is compressed *before* calculating md5sum
++    (Bug#19266)
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Sat, 14 Mar 1998 20:47:52 -0500
++
++adjtimex (1.4-1) unstable; urgency=low
++
++  * New upstream release.  Log times for long-term estimation of drifts.
++
++ -- James R. Van Zandt <jrv@vanzandt.mv.com>  Thu, 11 Dec 1997 21:48:01 -0500
++
++adjtimex (1.3-3) stable; urgency=medium
++
++  * Moved temporary files from /tmp to /etc, to eliminate security
++    hole (bug #11610).
++
++ -- Jim Van Zandt <jrv@vanzandt.mv.com>  Sun, 3 Aug 1997 11:34:48 -0400
++
++adjtimex (1.3-2) stable; urgency=medium
++
++  * Removed conflict with xntp, since ntpdate from the xntp package
++    is still compatible with adjtimex.
++
++ -- Jim Van Zandt <jrv@vanzandt.mv.com>  Wed, 12 Mar 1997 21:01:05 -0500
++
++adjtimex (1.3-1) unstable; urgency=HIGH
++
++  * New upstream version: Previous version allows 2.0 kernel to reset
++    the CMOS clock periodically.  Now using different method of
++    preventing this.
++  * New --compare switch to compare system and CMOS clocks (replacing
++    the separate program clockdiff) and suggest better values of time
++    parameters.  New --adjust switch to actually install the suggested
++    values.  GNU format long switches, including --help and --version.
++  * Revised conftimex to use --adjust switch instead of clockdiff.
++  * Renamed conftimex to adjtimexconfig per Debian recommendation.
++  * Added conftimex man page.
++  * Revised messages in postinst to better explain what is going on.
++  * Conflicts with xntp
++  * New maintainer
++
++ -- Jim Van Zandt <jrv@vanzandt.mv.com>  Sat, 1 Mar 1997 18:03:35 -0500
++
++adjtimex (1.2-5) unstable; urgency=LOW
++
++  * New packaging format
++  * Corrected comment in /etc/rc.boot/adjtimex
++  * Corrected the installation of doc files
++
++ -- Michael Meskes <meskes@debian.org>  Wed, 18 Sep 1996 09:22:51 +0200
++
++Fri May 17 12:48:07 MET DST 1996 Michael Meskes (meskes@debian.org)
++
++	adjtimex (1.2-1):
++	
++	* Added Debian Linux package maintenance system files.
++
++Fri May 17 20:39:30 MET DST 1996 Michael Meskes	(meskes@debian.org)
++
++        adjtimex (1.2-2):
++
++	* Corrected mode for /etc/rc.boot/adjtimex
++
++	* Added conftimex script
++
++	* Automatically configure system
++
++Sun Jun 30 13:17:53 MET DST 1996 Michael Meskes (meskes@debian.org)
++
++        adjtimex (1.2-3):
++
++	* Corrected rules file for new naming scheme
++
++	* Gzip manpage
++
++	* Strip binaries
++
++Tue Jul  2 10:01:35 MET DST 1996 Michael Meskes (meskes@debian.org)
++
++        adjtimex (1.2-4):
++
++	* Really say what we're doing in postinst (Bug#3474)
++
++
+--- adjtimex-1.23.orig/debian/dirs
++++ adjtimex-1.23/debian/dirs
+@@ -0,0 +1,4 @@
++usr/bin
++usr/sbin
++sbin
++usr/share/man/man8
+--- adjtimex-1.23.orig/debian/postrm
++++ adjtimex-1.23/debian/postrm
+@@ -0,0 +1,25 @@
++#! /bin/sh -e
++
++case "$1" in
++    purge)
++	rm -f /etc/adjtimex.conf /etc/default/adjtimex
++	update-rc.d adjtimex remove >/dev/null
++	if [ -e /usr/share/debconf/confmodule ]; then
++          # Source debconf library.
++	    . /usr/share/debconf/confmodule
++          # Remove my changes to the db.
++echo "removing debconf db entries"
++	    db_purge
++echo "removed debconf db entries"
++	fi
++	;;
++    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
++	exit 0
++	;;
++    *)
++	echo "postrm called with unknown argument \`$1'" >&2
++	exit 0
++	;;
++esac
++
++#DEBHELPER#
+--- adjtimex-1.23.orig/debian/copyright
++++ adjtimex-1.23/debian/copyright
+@@ -0,0 +1,28 @@
++This package was debianized by James R. Van Zandt jrv@debian.org on
++Thu, 11 Dec 1997 21:48:01 -0500.
++
++This package was put together by Jim Van Zandt <jrv@debian.org>,
++who also maintains the program and therefore used the master sources.
++
++Copyright:
++
++adjtimex is Copyright (C) 1997 Steven S. Dick and James R. Van Zandt
++
++   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; version 2 dated June,
++   1991, or 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 Public
++License can be found in `/usr/share/common-licenses/'
++
+--- adjtimex-1.23.orig/debian/rules
++++ adjtimex-1.23/debian/rules
+@@ -0,0 +1,113 @@
++#!/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
++
++# 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)
++
++
++package=adjtimex
++
++CFLAGS = -Wall -g
++INSTALL = install
++INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
++INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
++INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
++INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
++
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++CFLAGS += -O0
++else
++CFLAGS += -O2
++endif
++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++INSTALL_PROGRAM += -s
++endif
++
++
++config.status: configure
++	dh_testdir
++	# configure the package.
++	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
++
++
++build: build-stamp
++
++build-stamp:  config.status
++	dh_testdir
++
++	# compile the package.
++	$(MAKE) CFLAGS="$(CFLAGS)"
++	#/usr/bin/docbook-to-man debian/adjtimex.sgml > adjtimex.1
++
++	touch build-stamp
++
++clean:
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp 
++
++	# clean up after the build process.
++	debconf-updatepo
++	[ ! -f Makefile ] || $(MAKE) veryclean
++	rm -rf adjtimex *.o config.*
++	-test -r /usr/share/misc/config.sub && \
++	  cp -f /usr/share/misc/config.sub config.sub
++	-test -r /usr/share/misc/config.guess && \
++	  cp -f /usr/share/misc/config.guess config.guess
++
++
++	dh_clean
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	# install the package into debian/$(package).
++	$(INSTALL_PROGRAM) adjtimex $(CURDIR)/debian/$(package)/sbin
++	$(INSTALL_SCRIPT)  debian/adjtimexconfig			\
++		$(CURDIR)/debian/$(package)/usr/sbin/adjtimexconfig
++
++# Build architecture-independent files here.
++binary-indep: build install
++# We have nothing to do
++
++# Build architecture-dependent files here.
++binary-arch: build install
++	dh_testdir
++	dh_testroot
++	dh_installdebconf	
++	dh_installdocs
++	dh_installexamples
++	dh_installmenu
++#	dh_installlogrotate
++#	dh_installemacsen
++#	dh_installpam
++#	dh_installmime
++	dh_installinit -n
++	dh_installcron
++	dh_installman adjtimex.8 debian/adjtimexconfig.8
++	dh_installinfo
++#	dh_undocumented
++	dh_installchangelogs ChangeLog
++	dh_link
++	dh_strip
++	dh_compress
++	dh_fixperms
++#	dh_makeshlibs
++	dh_installdeb
++#	dh_perl
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install 
+--- adjtimex-1.23.orig/debian/docs
++++ adjtimex-1.23/debian/docs
+@@ -0,0 +1,2 @@
++README
++README.ru
+--- adjtimex-1.23.orig/debian/adjtimexconfig
++++ adjtimex-1.23/debian/adjtimexconfig
+@@ -0,0 +1,67 @@
++#!/bin/sh
++
++conffile=/etc/default/adjtimex
++startfile=/etc/init.d/adjtimex
++
++echo -n "Comparing clocks (this will take 70 sec)..."
++
++# Get the parameters
++
++/sbin/adjtimex --print --tick 0  >/etc/adj.adjust  2>/dev/null
++baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust`
++hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust`
++/sbin/adjtimex  --tick $baseline  --frequency 0
++/sbin/adjtimex  --adjust  >/etc/adj.adjust
++echo "done."
++ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'`
++freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'`
++# cat /etc/adj.adjust
++# echo hz=$hz baseline=$baseline ticks=$ticks freq=$freq
++rm /etc/adj.adjust
++adjt=`awk "BEGIN{print (($ticks-$baseline)*$hz + $freq/65536.)*.0864}"`
++echo -n "Adjusting system time by ${adjt} sec/day to agree with CMOS clock..."
++
++# Recreate /etc/adjtimex.conf if necessary
++
++if [ -f $conffile ]; then 
++#   echo "using existing $conffile";
++    true;
++else 
++cat >$conffile <<EOF
++#  $conffile - configuration file for adjtimex(8)
++#
++#  you may adjust these values manually or by calling /usr/sbin/adjtimexconfig
++#
++#  This file is sourced by $startfile
++#
++TICK=$TICK
++FREQ=$FREQ
++
++EOF
++fi
++
++# Reset values in $conffile
++
++sed -e "s/^TICK=.*/TICK=$ticks/"		\
++    -e "s/^FREQ=.*/FREQ=$freq/"			\
++    $conffile >$conffile.TMP &&			\
++    mv $conffile.TMP $conffile
++
++# grep "TICK=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.tick
++# grep "FREQ=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.freq
++# 
++# TICKLINE="`echo -n "TICK="$ticks" # old: "; cat /etc/adj.tick`"
++# FREQLINE="`echo -n "FREQ="$freq" # old: "; cat /etc/adj.freq`"
++# 
++# cp /etc/init.d/adjtimex /etc/init.d/adjtimex.TMP
++# sed -e "s/^TICK=.*/$TICKLINE/" -e "s/^FREQ=.*/$FREQLINE/" \
++#  < /etc/init.d/adjtimex.TMP > /etc/init.d/adjtimex
++# 
++# if [ -s /etc/init.d/adjtimex ]
++# then
++# 	  rm -f /etc/init.d/adjtimex.TMP
++# fi
++# rm -f /etc/adj.tick /etc/adj.freq /etc/adj.adjust
++rm -f /etc/adj.adjust
++echo "done."
++
+--- adjtimex-1.23.orig/debian/adjtimexconfig.8
++++ adjtimex-1.23/debian/adjtimexconfig.8
+@@ -0,0 +1,41 @@
++.\"{{{  Title                    Emacs major mode should be: -*- nroff -*-
++.TH ADJTIMEXCONFIG 8 "April 27, 2003"
++.\"}}}
++.\"{{{  Name
++.SH NAME
++adjtimexconfig \- find kernel clock variables and save for reboots
++.\"}}}
++.\"{{{  Synopsis
++.SH SYNOPSIS
++.ad l
++.\" commands only
++.B /sbin/adjtimexconfig
++.\"}}}
++.\"{{{  Config
++.SH DESCRIPTION
++This script uses \fBadjtimex\fP(8) to find values for the kernel
++variables \fBtick\fP and \fBfrequency\fP that will make the system
++clock approximately agree with the CMOS clock.  It then saves these
++values in the configuration file \fI/etc/default/adjtimex\fP so the
++settings will be restored on every boot, when
++\fI/etc/init.d/adjtimex\fP runs.
++.P
++\fPadjtimexconfig\fP uses the drift rate recorded in
++\fI/etc/adjtime\fP to adjust the times it reads from the CMOS clock.
++If you find the CMOS clock has a systematic drift, read the
++\fBclock\fP(8) or \fBhwclock\fP(8) manual page, modify
++\fI/etc/adjtime\fP as required, and run \fBadjtimexconfig\fP again.
++.SH AUTHOR
++Michael Meskes <meskes@debian.org>.
++.\"}}}
++.\"{{{
++.SH FILES
++.nf
++\fI/etc/default/adjtimex\fP
++\fI/etc/init.d/adjtimex\fP
++.fi
++.\"}}}
++.\"{{{  See also
++.SH "SEE ALSO"
++.BR adjtimex "(8), "clock "(8), "hwclock "(8), "ntpd (8)
++.\"}}}
+--- adjtimex-1.23.orig/debian/config
++++ adjtimex-1.23/debian/config
+@@ -0,0 +1,8 @@
++#! /bin/sh -e
++
++# Source debconf library.
++. /usr/share/debconf/confmodule
++
++db_input medium adjtimex/run_daemon || true
++db_input medium adjtimex/compare_rtc || true
++db_go
+--- adjtimex-1.23.orig/debian/postinst
++++ adjtimex-1.23/debian/postinst
+@@ -0,0 +1,119 @@
++#! /bin/sh
++
++set -e
++
++# Source debconf library.
++. /usr/share/debconf/confmodule
++
++#		 old scripts
++oldfile=/etc/adjtimex.conf
++olderfile=/etc/rc.boot/adjtimex
++#		 new starting script
++startfile=/etc/init.d/adjtimex
++#		 new configuration file
++conffile=/etc/default/adjtimex
++
++create_adjtimex_conf()
++{
++
++    TICK=10000
++    FREQ=0
++	
++    if [ -f $oldfile ]; then
++	TICK=`awk '
++	BEGIN{tick=10000;}
++	/[ \t]*TICK[ \t]*=[ \t]*"?[0-9]+"?/ {
++	    sub(/[ \t]*TICK[ \t]*=[ \t]*"?/,"");
++	    tick=$0+0;
++	}
++	END {print tick;}
++	' $oldfile` 
++
++	FREQ=`awk '
++	BEGIN{freq=0;}
++	/[ \t]*FREQ[ \t]*=[ \t]*"?[0-9]+"?/ {
++	    sub(/[ \t]*FREQ[ \t]*=[ \t]*"?/,"");
++	    freq=$0+0;
++	}
++	END {print freq;}
++	' $oldfile` 
++
++#	echo "parameters from $oldfile: TICK=$TICK FREQ=$FREQ";
++    else 
++	if [ -f $olderfile ]; then
++	    TICK=`awk '
++	    BEGIN{tick=10000;}
++	    /[ \t]*TICK[ \t]*=[ \t]*"?[0-9]+"?/ {
++		sub(/[ \t]*TICK[ \t]*=[ \t]*"?/,"");
++	    tick=$0+0;
++	}
++	END {print tick;}
++	' $olderfile` 
++	    
++	    FREQ=`awk '
++	    BEGIN{freq=0;}
++	    /[ \t]*FREQ[ \t]*=[ \t]*"?[0-9]+"?/ {
++		sub(/[ \t]*FREQ[ \t]*=[ \t]*"?/,"");
++		freq=$0+0;
++	    }
++	    END {print freq;}
++	    ' $olderfile` 
++
++#	    echo "parameters from $olderfile: TICK=$TICK FREQ=$FREQ";
++	fi
++    fi
++    
++	if [ -f $conffile ]; then 
++#	    echo "using existing $conffile";
++	    true;
++	else 
++	    if [ -d /etc/default ]; then true; else mkdir /etc/default; fi
++	    cat >$conffile <<EOF
++#  $conffile - configuration file for adjtimex(8)
++#
++#  you may adjust these values manually or by calling /usr/sbin/adjtimexconfig
++#
++#  This file is sourced by $startfile
++#
++TICK=$TICK
++FREQ=$FREQ
++
++EOF
++	fi
++
++	rm -f $oldfile $olderfile
++}
++
++
++case "$1" in
++    configure)
++
++	create_adjtimex_conf
++
++	db_get adjtimex/run_daemon
++	if [ "$RET" = "true" ]; then
++	    update-rc.d adjtimex start 20 S . >/dev/null
++    
++	    if which invoke-rc.d >/dev/null 2>&1; then
++		invoke-rc.d adjtimex start
++	    else
++		/etc/init.d/adjtimex start
++	    fi
++	fi
++
++	db_get adjtimex/compare_rtc
++	if [ "$RET" = "true" ]; then
++	    /usr/sbin/adjtimexconfig
++	fi
++
++	;;
++    abort-upgrade|abort-remove|abort-deconfigure)
++	exit 0
++	;;
++    *)
++	echo "postinst called with unknown argument \`$1'" >&2
++	exit 0
++	;;
++esac
++
++#DEBHELPER#
+--- adjtimex-1.23.orig/debian/adjtimex.init
++++ adjtimex-1.23/debian/adjtimex.init
+@@ -0,0 +1,45 @@
++#!/bin/sh
++#
++# Run ADJTIMEX at startup.
++
++### BEGIN INIT INFO
++# Provides:          adjtimex
++# Required-Start:    
++# Required-Stop:     
++# Should-Start:      
++# Should-Stop:       
++# Default-Start:     2 3 4 5
++# Default-Stop:      0 1 6
++# Short-Description: set the kernel time variables
++# Description:       set the kernel time variables
++### END INIT INFO
++
++test -x /sbin/adjtimex  || exit 0
++
++# default values
++TICK=10000
++FREQ=0
++ 
++# values in $cfg take precedence over the values here
++cfg=/etc/default/adjtimex
++
++if [ -f $cfg ]; then
++  . $cfg
++fi
++
++case "$1" in
++  start|restart|force-reload)
++    echo -n "Regulating system clock..."
++    /sbin/adjtimex -tick "$TICK" -frequency "$FREQ"
++    echo "done."
++    ;;
++  stop|status)
++    ;;
++  *)
++    echo "/etc/init.d/adjtimex: unknown command $1" >&2
++    echo "Usage: /etc/init.d/adjtimex {start|stop|restart|force-reload}" >&2
++    exit 3
++    ;;
++esac
++
++exit 0
+--- adjtimex-1.23.orig/debian/adjust
++++ adjtimex-1.23/debian/adjust
+@@ -0,0 +1,15 @@
++         mode: 16384
++       offset: 0
++    frequency: 0
++     maxerror: 0
++     esterror: 0
++       status: 0
++time_constant: 0
++    precision: 0
++    tolerance: 0
++         tick: 0
++     raw time:  0s 0us = 0.000000
++for this kernel:
++   USER_HZ = 100 (nominally 100 ticks per second)
++   9000 <= tick <= 11000
++   -33554432 <= frequency <= 33554432
+--- adjtimex-1.23.orig/debian/compat
++++ adjtimex-1.23/debian/compat
+@@ -0,0 +1 @@
++5
+--- adjtimex-1.23.orig/Makefile
++++ adjtimex-1.23/Makefile
+@@ -0,0 +1,70 @@
++# Generated automatically from Makefile.in by configure.
++#### Start of system configuration section.             -*-makefile-*- ####
++ srcdir = .
++
++VERSION=1.22
++
++CFLAGS = -g -O2 -Wall
++prefix = /usr
++man1dir=${prefix}/share/man/man1
++exec_prefix = ${prefix}
++bindir=/sbin
++
++INSTALL=/usr/bin/install -c
++
++# Extension (not including `.') for the manual page filenames.
++manext = 8
++# Where to put the manual pages.
++mandir = $(prefix)/share/man/man$(manext)
++
++#### End of system configuration section. ####
++
++SHELL = /bin/sh
++
++SRC = adjtimex.c adjtimex.8 mat.c mat.h install-sh configure.in		\
++ configure Makefile.in README README.ru adjtimex.lsm adjtimex.lsm.in	\
++ COPYING COPYRIGHT ChangeLog
++
++all: adjtimex adjtimex.lsm
++
++adjtimex: adjtimex.c mat.o
++	$(CC) $(CFLAGS) -I. -DVERSION=\"$(VERSION)\" -o adjtimex adjtimex.c  \
++		mat.o -lm
++
++adjtimex.lsm: adjtimex.lsm.in Makefile.in
++	sed -e 's/@VERSION@/$(VERSION)/'		\
++	  -e "s/@DATE@/`date +%d%b%y|tr [a-z] [A-Z]`/"	\
++	  adjtimex.lsm.in >adjtimex.lsm
++
++mat.o: mat.c
++	$(CC) $(CFLAGS) -c mat.c
++
++install: all
++	$(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex
++	$(INSTALL) -d -g root -m 755 -o root $(mandir)
++	-$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \
++		$(mandir)/adjtimex.$(manext)
++
++uninstall:
++	rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext)
++
++clean: 
++	rm -f core *.o
++veryclean: clean
++	rm -f adjtimex
++
++shar: $(SRC)
++	distname=adjtimex-$(VERSION);		\
++	shar $(SRC) >$$distname.shar 
++
++dist: $(SRC)
++	distname=adjtimex-$(VERSION);					      \
++	rm -fr $$distname;						      \
++	mkdir $$distname;						      \
++	for file in $(SRC); do						      \
++	  ln $$file $$distname/$$file					      \
++	  || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \
++	done;								      \
++	chmod -R a+rX $$distname;					      \
++	tar -chz -f $$distname.tar.gz $$distname;			      \
++	rm -fr $$distname
diff --git a/source/a/util-linux-ng/doinst.sh b/source/a/util-linux-ng/doinst.sh
new file mode 100644
index 000000000..678c228f1
--- /dev/null
+++ b/source/a/util-linux-ng/doinst.sh
@@ -0,0 +1,23 @@
+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...
+}
+
+# Keep same perms on rc.serial.new:
+if [ -e etc/rc.d/rc.serial ]; then
+  cp -a etc/rc.d/rc.serial etc/rc.d/rc.serial.new.incoming
+  cat etc/rc.d/rc.serial.new > etc/rc.d/rc.serial.new.incoming
+  mv etc/rc.d/rc.serial.new.incoming etc/rc.d/rc.serial.new
+fi
+
+config etc/rc.d/rc.serial.new
+config etc/serial.conf.new
+
diff --git a/source/a/util-linux-ng/net-tools.diff b/source/a/util-linux-ng/net-tools.diff
new file mode 100644
index 000000000..a19af2026
--- /dev/null
+++ b/source/a/util-linux-ng/net-tools.diff
@@ -0,0 +1,77 @@
+--- ./config.h.orig	Wed Mar 21 21:23:31 2001
++++ ./config.h	Wed Mar 21 21:23:12 2001
+@@ -0,0 +1,74 @@
++/*
++* 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 0
++#define HAVE_AFX25 1
++#define HAVE_AFECONET 0
++#define HAVE_AFDECnet 0
++#define HAVE_AFASH 0
++
++/* 
++ * 
++ * 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 0
++#define HAVE_HWNETROM 1
++#define HAVE_HWX25 1
++#define HAVE_HWFR 1
++#define HAVE_HWSIT 0
++#define HAVE_HWFDDI 0
++#define HAVE_HWHIPPI 0
++#define HAVE_HWASH 0
++#define HAVE_HWHDLCLAPB 0
++#define HAVE_HWIRDA 1
++#define HAVE_HWEC 0
++
++/* 
++ * 
++ * Other Features.
++ * 
++ */
++#define HAVE_FW_MASQUERADE 1
++#define HAVE_IP_TOOLS 1
++#define HAVE_MII 1
diff --git a/source/a/util-linux-ng/net-tools_1.60-19.diff b/source/a/util-linux-ng/net-tools_1.60-19.diff
new file mode 100644
index 000000000..f754f02d5
--- /dev/null
+++ b/source/a/util-linux-ng/net-tools_1.60-19.diff
@@ -0,0 +1,29401 @@
+--- 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/a/util-linux-ng/scsi_ioctl.h b/source/a/util-linux-ng/scsi_ioctl.h
new file mode 100644
index 000000000..edb952538
--- /dev/null
+++ b/source/a/util-linux-ng/scsi_ioctl.h
@@ -0,0 +1,48 @@
+#ifndef _SCSI_IOCTL_H
+#define _SCSI_IOCTL_H 
+
+#define SCSI_IOCTL_SEND_COMMAND 1
+#define SCSI_IOCTL_TEST_UNIT_READY 2
+#define SCSI_IOCTL_BENCHMARK_COMMAND 3
+#define SCSI_IOCTL_SYNC 4			/* Request synchronous parameters */
+#define SCSI_IOCTL_START_UNIT 5
+#define SCSI_IOCTL_STOP_UNIT 6
+/* The door lock/unlock constants are compatible with Sun constants for
+   the cdrom */
+#define SCSI_IOCTL_DOORLOCK 0x5380		/* lock the eject mechanism */
+#define SCSI_IOCTL_DOORUNLOCK 0x5381		/* unlock the mechanism	  */
+
+#define	SCSI_REMOVAL_PREVENT	1
+#define	SCSI_REMOVAL_ALLOW	0
+
+#ifdef __KERNEL__
+
+struct scsi_device;
+
+/*
+ * Structures used for scsi_ioctl et al.
+ */
+
+typedef struct scsi_ioctl_command {
+	unsigned int inlen;
+	unsigned int outlen;
+	unsigned char data[0];
+} Scsi_Ioctl_Command;
+
+typedef struct scsi_idlun {
+	__u32 dev_id;
+	__u32 host_unique_id;
+} Scsi_Idlun;
+
+/* Fibre Channel WWN, port_id struct */
+typedef struct scsi_fctargaddress {
+	__u32 host_port_id;
+	unsigned char host_wwn[8]; // include NULL term.
+} Scsi_FCTargAddress;
+
+extern int scsi_ioctl(struct scsi_device *, int, void __user *);
+extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
+				   void __user *arg, struct file *filp);
+
+#endif /* __KERNEL__ */
+#endif /* _SCSI_IOCTL_H */
diff --git a/source/a/util-linux-ng/setserial-rc.serial.diff b/source/a/util-linux-ng/setserial-rc.serial.diff
new file mode 100644
index 000000000..248d253bd
--- /dev/null
+++ b/source/a/util-linux-ng/setserial-rc.serial.diff
@@ -0,0 +1,49 @@
+--- ./rc.serial.orig	Thu Jan 27 07:47:30 2000
++++ ./rc.serial	Sun May 13 13:27:57 2001
+@@ -14,8 +14,6 @@
+ # XXXX For now, the autosave feature doesn't work if you are
+ # using the multiport feature; it doesn't save the multiport configuration
+ # (for now).  Autosave also doesn't work for the hayes devices.  
+-# Will fix later...
+-#
+ #
+ 
+ RCLOCKFILE=/var/lock/subsys/serial
+@@ -87,7 +85,7 @@
+ 		mv /etc/.serial.conf.new /etc/serial.conf
+ 		echo "done."
+ 	fi
+-	if test -n $MODULE ; then
++	if test -n "$MODULE" ; then
+ 		module=`grep $MODULE_REGEXP /proc/modules | awk '{print $1}'`
+ 		if test -z "$module" ; then 
+ 			echo "The $DRIVER_NAME driver is not loaded."
+@@ -108,22 +106,22 @@
+ # If not stop, it must be a start....
+ #
+ 
+-if test -n $MODULE -a "$LOADED" != "yes" ; then 
+-	if insmod -fm $MODULE $DRIVER_ARG \
+-		> /tmp/$DRIVER.map 2> /tmp/$DRIVER.$$; then :; 
++if test -n "$MODULE" -a "$LOADED" != "yes" ; then 
++	if insmod -f $MODULE $DRIVER_ARG ; then
++          true
+ 	else
+ 		echo "Couldn't load $DRIVER_NAME driver."
+-		echo "See error logs in /tmp/$DRIVER.$$"
+ 		exit 1
+ 	fi
+-	/bin/rm -f /tmp/$DRIVER.$$
+ fi
+ 
+ if test -f /etc/serial.conf ; then
+         if test -n ${SETSERIAL} ; then
+ 		grep -v ^# < /etc/serial.conf | while read device args
+ 		do
+-		    ${SETSERIAL} -z $device $args
++                    if [ ! "$device" = "" -a ! "$args" = "" ]; then
++                        ${SETSERIAL} -z $device $args
++                    fi
+ 		done 
+ 	fi
+ else
diff --git a/source/a/util-linux-ng/slack-desc b/source/a/util-linux-ng/slack-desc
new file mode 100644
index 000000000..e149d7b84
--- /dev/null
+++ b/source/a/util-linux-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------------------------------------------------|
+util-linux-ng: util-linux-ng (a huge collection of essential utilities) 
+util-linux-ng: 
+util-linux-ng: The util-linux package is a huge collection of random utilities
+util-linux-ng: that are essential to run a Linux system.  This is a fork of
+util-linux-ng: the original util-linux, based on version 2.13-pre7.
+util-linux-ng: 
+util-linux-ng: http://kernel.org/~kzak/util-linux-ng/
+util-linux-ng: 
+util-linux-ng: 
+util-linux-ng: 
+util-linux-ng: 
diff --git a/source/a/util-linux-ng/util-linux-ng.SlackBuild b/source/a/util-linux-ng/util-linux-ng.SlackBuild
new file mode 100755
index 000000000..2c2ea55e5
--- /dev/null
+++ b/source/a/util-linux-ng/util-linux-ng.SlackBuild
@@ -0,0 +1,284 @@
+#!/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.
+
+# Slackware build script for util-linux-ng
+
+VERSION=${VERSION:-2.14.2}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+ADJTIMEXVERS=1.23
+SETSERIALVERS=2.17
+ZIPTOOLVERS=1.4.0
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-util-linux-ng
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP || exit 1
+rm -rf util-linux-ng-$VERSION
+tar xvf $CWD/util-linux-ng-$VERSION.tar.bz2 || exit 1
+cd util-linux-ng-$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 {} \;
+
+# Disabled login and init stuff from being built, as this is provided by 
+# shadow and sysvinit
+#
+# /sbin/elvtune is not built, as configure says it only works with 2.2 and 
+#   2.4 kernels
+
+# This block is handled near the bottom of the script in symlink creation
+# /bin/setterm -- now located in /usr/bin/setterm 
+# /bin/getopt -- same as setterm
+# /usr/bin/readprofile -- now in /usr/sbin
+# /usr/bin/tunelp -- same as readprofile
+
+# Changing the fdisk -l output (this was done prior to util-linux-ng) broke
+# our installation scripts, so we have changed the name of partition type
+# 83 back to "Linux swap":
+zcat $CWD/util-linux-ng.fdisk-no-solaris.diff.gz | patch -p1 || exit 1
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/util-linux-ng-$VERSION \
+  --enable-arch \
+  --enable-agetty \
+  --disable-init \
+  --enable-kill \
+  --enable-rdev \
+  --disable-last \
+  --enable-mesg \
+  --enable-raw \
+  --enable-rename \
+  --enable-reset \
+  --disable-login-utils \
+  --enable-schedutils \
+  --enable-wall \
+  --enable-write \
+  --enable-use-tty-group \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux \
+  || exit 1
+
+make || exit 1
+make install DESTDIR=$PKG
+
+# Moving things around that have been in the same place
+# for 15 years is, IMHO, not a wise idea AT ALL.
+# If this had to be moved, some place out of /usr might
+# have shown a grain of insight...
+if [ -r $PKG/usr/sbin/fdformat ]; then
+  mkdir -p $PKG/usr/bin
+  mv $PKG/usr/sbin/fdformat $PKG/usr/bin/fdformat
+  # Now since stuff will start looking in this new place,
+  # we have no choice but to link these:
+  ( cd $PKG/usr/sbin
+    ln -sf ../bin/fdformat .
+  )
+fi
+
+# Install (probably obsolete) rdev manually:
+cat ./sys-utils/rdev > $PKG/sbin/rdev
+chown root:root $PKG/sbin/rdev
+chmod 755 $PKG/sbin/rdev
+#cat ./sys-utils/rdev.8 | gzip -9c > $PKG/usr/man/man8/rdev.8.gz
+
+# Build ziptool
+cd $TMP || exit 1
+rm -rf ziptool-$ZIPTOOLVERS
+tar xvf $CWD/ziptool-$ZIPTOOLVERS.tar.bz2 || exit 1
+cd ziptool-$ZIPTOOLVERS || exit 1
+zcat $CWD/ziptool-fix_build.patch.gz | patch -p1 || exit 1
+mkdir scsi
+cat $CWD/scsi_ioctl.h > scsi/scsi_ioctl.h
+chown -R root:root .
+make || exit 1
+strip ziptool
+cat ziptool > $PKG/sbin/ziptool
+chmod 0755 $PKG/sbin/ziptool
+mkdir -p $PKG/usr/doc/ziptool-$ZIPTOOLVERS
+cp -a README $PKG/usr/doc/ziptool-$ZIPTOOLVERS
+chmod 644 $PKG/usr/doc/ziptool-$ZIPTOOLVERS/*
+cat ziptool.1.gz > $PKG/usr/man/man1/ziptool.1.gz
+
+# Build bsdstrings
+cd $TMP || exit 1
+rm -rf bsdstrings
+tar xvf $CWD/bsdstrings.tar.gz || exit 1
+cd bsdstrings || exit 1
+make || exit 1
+strip strings
+cat strings > $PKG/usr/bin/strings
+chmod 0755 $PKG/usr/bin/strings
+cat strings.1 | gzip -9c > $PKG/usr/man/man1/strings.1.gz
+
+# Add just the hostname utilities from net-tools, so that anyone
+# installing just the A series will not have a hostname (null):
+cd $TMP || exit 1
+rm -rf net-tools-1.60
+tar xvf $CWD/net-tools-1.60.tar.bz2
+cd net-tools-1.60
+zcat $CWD/net-tools_1.60-19.diff.gz | patch -p1 || exit
+zcat $CWD/net-tools.diff.gz | patch -p1 || exit
+make
+make hostname
+strip hostname
+cat hostname > $PKG/bin/hostname
+chmod 755 $PKG/bin/hostname
+chown root:root $PKG/bin/hostname
+( cd $PKG/bin
+  ln -sf hostname dnsdomainname
+  ln -sf hostname nisdomainname
+  ln -sf hostname ypdomainname
+  ln -sf hostname domainname
+)
+cd man/en_US
+for page in hostname.1 dnsdomainname.1 nisdomainname.1 ypdomainname.1 \
+domainname.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
+done
+
+# Build adjtimex
+cd $TMP || exit 1
+rm -rf adjtimex-$ADJTIMEXVERS
+tar xvf $CWD/adjtimex_${ADJTIMEXVERS}.orig.tar.gz || exit 1
+cd adjtimex-$ADJTIMEXVERS || exit 1
+chown -R root:root .
+zcat $CWD/adjtimex_1.23-1.diff.gz | patch -p1 || exit 1
+CFLAGS=-O2 ./configure --prefix=/usr || exit 1
+make || exit 1
+strip adjtimex
+cat adjtimex > $PKG/sbin/adjtimex
+chmod 0755 $PKG/sbin/adjtimex
+cat adjtimex.8 | gzip -9c > $PKG/usr/man/man8/adjtimex.8.gz
+mkdir -p $PKG/usr/doc/adjtimex-$ADJTIMEXVERS
+cp -a COPYING COPYRIGHT README README.ru adjtimex.lsm \
+  $PKG/usr/doc/adjtimex-$ADJTIMEXVERS
+
+# Build setserial
+cd $TMP || exit 1
+rm -rf setserial-$SETSERIALVERS
+tar xvf $CWD/setserial-$SETSERIALVERS.tar.gz || exit 1
+cd setserial-$SETSERIALVERS || exit 1
+chown -R root:root .
+zcat $CWD/setserial-rc.serial.diff.gz | patch -E -p1 --verbose || exit 1
+# The original config.{guess,sub} do not work on x86_64
+cp -p /usr/share/libtool/config.{guess,sub} .
+./configure --prefix=/usr || exit 1
+make || exit 1
+strip setserial
+cat setserial > $PKG/sbin/setserial
+chmod 0755 $PKG/sbin/setserial
+mkdir -p $PKG/etc/rc.d
+cat rc.serial > $PKG/etc/rc.d/rc.serial.new
+cat serial.conf > $PKG/etc/serial.conf.new
+cat setserial.8 | gzip -9c > $PKG/usr/man/man8/setserial.8.gz
+
+# These have always traditionally been available before /usr
+# might be mounted:
+( cd $PKG/usr/bin
+  mv getopt setterm $PKG/bin
+  cd $PKG/usr/bin
+  ln -s ../../bin/getopt .
+  ln -s ../../bin/setterm .
+)
+
+cd $TMP/util-linux-ng-$VERSION # Go back home :)
+
+# Now let's add some important symlinks :)
+( cd $PKG/sbin
+  ln -s ../bin/mount .
+  ln -s ../bin/umount .
+  ln -s ziptool jaztool
+  ln -s hwclock clock
+  cd $PKG/usr/sbin
+  ln -s ../../sbin/cfdisk .
+  ln -s ../../sbin/ctrlaltdel .
+  ln -s ../../sbin/sfdisk .
+  cd $PKG/usr/bin
+  ln -s ../sbin/readprofile .
+  ln -s ../sbin/tunelp .
+  ln -s ../../bin/more .
+  ln -s ../../sbin/raw .
+  cd $PKG/usr/man/man1
+  ln -s ziptool.1 jaztool.1
+  cd $PKG/usr/man/man8
+  ln -s hwclock.8 clock.8
+)
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# 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
+
+# Compress info page and remove dir file
+rm $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/util-linux-ng-$VERSION
+cp ABOUT-NLS AUTHORS COPYING DEPRECATED NEWS README* TODO docs/* \
+  $PKG/usr/doc/util-linux-ng-$VERSION
+
+mkdir $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/util-linux-ng-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff b/source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff
new file mode 100644
index 000000000..a3aa100e9
--- /dev/null
+++ b/source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff
@@ -0,0 +1,11 @@
+--- ./fdisk/i386_sys_types.c.orig	2007-04-25 07:43:38.000000000 -0500
++++ ./fdisk/i386_sys_types.c	2008-03-31 14:53:52.000000000 -0500
+@@ -53,7 +53,7 @@
+ 	{0x75, N_("PC/IX")},
+ 	{0x80, N_("Old Minix")},	/* Minix 1.4a and earlier */
+ 	{0x81, N_("Minix / old Linux")},/* Minix 1.4b and later */
+-	{0x82, N_("Linux swap / Solaris")},
++	{0x82, N_("Linux swap")},
+ 	{0x83, N_("Linux")},
+ 	{0x84, N_("OS/2 hidden C: drive")},
+ 	{0x85, N_("Linux extended")},
diff --git a/source/a/util-linux-ng/ziptool-fix_build.patch b/source/a/util-linux-ng/ziptool-fix_build.patch
new file mode 100644
index 000000000..a2d3d5157
--- /dev/null
+++ b/source/a/util-linux-ng/ziptool-fix_build.patch
@@ -0,0 +1,24 @@
+diff -Nur ziptool-1.4.0.orig/Makefile ziptool-1.4.0/Makefile
+--- ziptool-1.4.0.orig/Makefile	2002-08-23 17:13:48.000000000 -0500
++++ ziptool-1.4.0/Makefile	2009-02-09 16:33:12.913637302 -0600
+@@ -5,10 +5,6 @@
+ #
+ CFLAGS = -O2 -g -Wall
+ 
+-# Path to linux kernel sources.
+-#
+-LINUX_SRC_DIR = /usr/src/linux
+-
+ # Installation directories
+ #
+ INSTALL_BIN_DIR = /usr/bin
+@@ -30,7 +26,7 @@
+ 	cd $(INSTALL_MAN_DIR)/man1; ln -sf ziptool.1.gz jaztool.1.gz
+ 
+ ziptool: ziptool.c
+-	cc $(CFLAGS) -I$(LINUX_SRC_DIR)/include -o ziptool ziptool.c
++	cc $(CFLAGS) -I. -o ziptool ziptool.c
+ 
+ jaztool: ziptool.c
+-	cc $(CFLAGS) -I$(LINUX_SRC_DIR)/include -o jaztool ziptool.c
++	cc $(CFLAGS) -I. -o jaztool ziptool.c
diff --git a/source/a/which/slack-desc b/source/a/which/slack-desc
new file mode 100644
index 000000000..75085fe10
--- /dev/null
+++ b/source/a/which/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------------------------------------------------------|
+which: which (shows the full path to shell commands)
+which:
+which: GNU 'which' takes one or more arguments.  For each of its arguments it
+which: prints to stdout the full path of the executables that would have been
+which: executed when this argument had been entered at the shell prompt.  It
+which: does this by searching for an executable or script in the directories
+which: listed in the environment variable PATH using the same algorithm as
+which: bash(1).  'Which' is a built-in function in many shells.
+which:
+which: The GNU version of which was written by Carlo Wood.
+which:
diff --git a/source/a/which/which.SlackBuild b/source/a/which/which.SlackBuild
new file mode 100755
index 000000000..f86fd1da8
--- /dev/null
+++ b/source/a/which/which.SlackBuild
@@ -0,0 +1,99 @@
+#!/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=2.20
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-which
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf which-$VERSION
+tar xvf $CWD/which-$VERSION.tar.gz || exit 1
+cd which-$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 {} \;
+
+CFLAGS=-O2 \
+./configure \
+  --prefix=/usr \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir $PKG/bin
+mv $PKG/usr/bin/which $PKG/bin
+( cd $PKG/usr/bin ; ln -sf ../../bin/which which )
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+mkdir -p $PKG/usr/doc/which-$VERSION
+cp -a \
+  AUTHORS COPYING EXAMPLES NEWS README README.alias \
+  $PKG/usr/doc/which-$VERSION
+
+# Strip everything for good measure:
+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/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/which-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/xfsprogs/slack-desc b/source/a/xfsprogs/slack-desc
new file mode 100644
index 000000000..25f37656e
--- /dev/null
+++ b/source/a/xfsprogs/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------------------------------------------------------|
+xfsprogs: xfsprogs (tools to use the XFS filesystem)
+xfsprogs:
+xfsprogs: XFS is a high performance journaling filesystem which originated
+xfsprogs: on the SGI IRIX platform.  It is completely multi-threaded, can
+xfsprogs: support large files and large filesystems, extended attributes,
+xfsprogs: variable block sizes, is extent based, and makes extensive use of
+xfsprogs: Btrees (directories, extents, free space) to aid both performance
+xfsprogs: and scalability.
+xfsprogs:
+xfsprogs:
+xfsprogs:
diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild
new file mode 100755
index 000000000..7ef1c07c6
--- /dev/null
+++ b/source/a/xfsprogs/xfsprogs.SlackBuild
@@ -0,0 +1,114 @@
+#!/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=3.0.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-xfsprogs
+
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf xfsprogs-$VERSION
+tar xvf $CWD/xfsprogs-$VERSION.tar.?z* || exit 1
+cd xfsprogs-$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 {} \;
+
+# Make sure you have the same version of autoconf as the
+# developers did...  ;-)
+autoconf
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/lib${LIBDIRSUFFIX} \
+  --sbindir=/sbin \
+  --bindir=/usr/sbin \
+  --datadir=/usr/share \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/xfsprogs-$VERSION \
+  --enable-shared=yes \
+  --enable-gettext=yes \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DIST_ROOT=$PKG
+make install-dev DIST_ROOT=$PKG
+
+mv $PKG/usr/share/doc $PKG/usr
+mv $PKG/usr/doc/xfsprogs $PKG/usr/doc/xfsprogs-$VERSION
+#It would be nice to keep the same timestamps that the files have in the source:
+cp -a README doc/COPYING doc/CREDITS doc/PORTING \
+  $PKG/usr/doc/xfsprogs-$VERSION
+
+# Remove bogus files:
+rm -f $PKG/lib${LIBDIRSUFFIX}/*.a $PKG/lib${LIBDIRSUFFIX}/*.so \
+  $PKG/lib${LIBDIRSUFFIX}/*.la $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+# Make /usr/lib/libhandle.so a symlink to /lib/libhandle.so.1:
+if [ -f $PKG/lib${LIBDIRSUFFIX}/libhandle.so.1 ]; then
+  ( cd $PKG/usr/lib${LIBDIRSUFFIX}
+    rm -f libhandle.so
+    ln -sf /lib${LIBDIRSUFFIX}/libhandle.so.1 libhandle.so
+  )
+else
+  exit 1
+  # and fix your script!  ;-)
+fi
+# Fix shared library perms:
+chmod 755 $PKG/lib${LIBDIRSUFFIX}/*
+
+# Strip libraries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+strip -g $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/xfsprogs-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/xz/slack-desc b/source/a/xz/slack-desc
new file mode 100644
index 000000000..af549b358
--- /dev/null
+++ b/source/a/xz/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------------------------------------------------------|
+xz: xz (compression utility based on the LZMA algorithm)
+xz:
+xz: LZMA is a general purporse compression algorithm designed by Igor
+xz: Pavlov as part of 7-Zip.  It provides high compression ratio while
+xz: keeping the decompression speed fast.  XZ Utils are an attempt to make
+xz: LZMA compression easy to use on free (as in freedom) operating
+xz: systems.
+xz:
+xz: The people most responsible for xz are Igor Pavlov, Ville Koskinen,
+xz: and Lasse Collin.  For more info:  http://tukaani.org/xz/
+xz:
diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild
new file mode 100755
index 000000000..240334178
--- /dev/null
+++ b/source/a/xz/xz.SlackBuild
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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=xz
+VERSION=${VERSION:-4.999.8beta}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+case "$ARCH" in
+  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+             LIBDIRSUFFIX=""
+             ;;
+  s390)      SLKCFLAGS="-O2"
+             LIBDIRSUFFIX=""
+             ;;
+  powerpc)   SLKCFLAGS="-O2"
+             LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             LIBDIRSUFFIX="64"
+             ;;
+  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
+             LIBDIRSUFFIX=""
+             ;;
+  arm)       SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+             LIBDIRSUFFIX=""
+             ;;
+  armel)     SLKCFLAGS="-O2 -march=armv4t"
+             LIBDIRSUFFIX=""
+             ;;
+
+esac
+
+CWD=$(pwd)
+# Temporary build location.  This should *NOT* be a directory
+# path a non-root user could create later...
+TMP=${TMP:-/xz-tmp-$(mcookie)}
+PKG=$TMP/package-$PRGNAM
+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
+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="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --enable-shared \
+  --disable-static \
+  --disable-rpath \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux
+
+make || exit 1
+make DESTDIR=$PKG install
+
+# It might be advisable to have the libraries in /lib${LIBDIRSUFFIX}:
+mkdir -p $PKG/lib${LIBDIRSUFFIX}
+mv $PKG/usr/lib${LIBDIRSUFFIX}/liblzma.so.* $PKG/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  rm -f liblzma.so
+  ln -sf ../../lib${LIBDIRSUFFIX}/liblzma.so.? liblzma.so
+)
+
+# At least the xz binary should also be in /bin:
+mkdir -p $PKG/bin
+mv $PKG/usr/bin/xz $PKG/bin
+( cd $PKG/usr/bin
+  ln -sf ../../bin/xz .
+)
+
+# 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
+)
+
+# 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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README* THANKS doc/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+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}.tgz
+
diff --git a/source/a/zoo/slack-desc b/source/a/zoo/slack-desc
new file mode 100644
index 000000000..f517e17a2
--- /dev/null
+++ b/source/a/zoo/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------------------------------------------------------|
+zoo: zoo (archiving and compressing utility)
+zoo:
+zoo: Zoo is used to create and maintain collections of files in compressed
+zoo: form.  It uses a Lempel-Ziv compression algorithm that gives space
+zoo: savings in the range of 20% to 80% depending on the type of file data.
+zoo: Zoo can store and selectively extract multiple generations of the same
+zoo: file.  Data can be recovered from damaged archives by skipping the
+zoo: damaged portion and locating undamaged data with the help of fiz(1).
+zoo:
+zoo: Zoo was written by Rahul Dhesi.
+zoo:
diff --git a/source/a/zoo/zoo.SlackBuild b/source/a/zoo/zoo.SlackBuild
new file mode 100755
index 000000000..c667b076e
--- /dev/null
+++ b/source/a/zoo/zoo.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=2.10
+DEBPATCH=18
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-zoo
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf zoo-$VERSION
+tar xzvf $CWD/zoo-$VERSION.tar.gz
+cd zoo-$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/zoo_${VERSION}-${DEBPATCH}.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1
+for diff in debian/patches/*.dpatch ; do
+  cat $diff | patch -p1 --verbose --backup --suffix=.orig || exit 1
+done
+make linux || exit 1
+mkdir -p $PKG/usr/bin
+cat fiz > $PKG/usr/bin/fiz
+cat zoo > $PKG/usr/bin/zoo
+chmod 755 $PKG/usr/bin/*
+mkdir -p $PKG/usr/man/man1
+for page in fiz.1 zoo.1 ; do
+  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
+done
+mkdir -p $PKG/usr/doc/zoo-${VERSION}
+cp -a \
+  Copyright Install \
+  $PKG/usr/doc/zoo-${VERSION}
+
+# Strip everything for good measure:
+( 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
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/zoo-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/a/zoo/zoo_2.10-18.diff b/source/a/zoo/zoo_2.10-18.diff
new file mode 100644
index 000000000..b0c741347
--- /dev/null
+++ b/source/a/zoo/zoo_2.10-18.diff
@@ -0,0 +1,1285 @@
+--- zoo-2.10.orig/debian/patches/01_old_fixes.dpatch
++++ zoo-2.10/debian/patches/01_old_fixes.dpatch
+@@ -0,0 +1,597 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 01_old_fixes.dpatch by Jose Carlos Medeiros <debian@psabs.com.br>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Old fixes, that were made before this package has changed to use dpatch.
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
++
++if [ $# -lt 1 ]; then
++  echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++  exit 1
++fi
++
++case "$1" in
++  -patch) patch $patch_opts -p1 < $0;;
++  -unpatch) patch $patch_opts -p1 -R < $0;;
++  *)
++    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++    exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad zoo-2.10~/ar.h zoo-2.10/ar.h
++--- zoo-2.10~/ar.h	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/ar.h	2005-11-16 17:28:23.308950960 -0200
++@@ -7,6 +7,7 @@
++ ***********************************************************/
++ 
++ #include <stdio.h>
+++#include <sys/types.h>
++ 
++ #ifdef ANSI_HDRS
++ # include <limits.h>
++@@ -15,9 +16,11 @@
++ /* uchar should be 8 bits or more */
++ /* typedef unsigned char  uchar;   -- already in zoo.h */
++ 
+++#ifndef _SYS_TYPES_H
++ typedef unsigned int   uint;    /* 16 bits or more */
++ typedef unsigned short ushort;  /* 16 bits or more */
++ typedef unsigned long  ulong;   /* 32 bits or more */
+++#endif
++ 
++ /* T_UINT16 must be #defined in options.h to be 
++ a 16-bit unsigned integer type */
++diff -urNad zoo-2.10~/basename.c zoo-2.10/basename.c
++--- zoo-2.10~/basename.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/basename.c	2005-11-16 17:28:23.308950960 -0200
++@@ -18,7 +18,7 @@
++ 
++ /* This function strips device/directory information from
++ a pathname and returns just the plain filename */
++-void basename (pathname, fname)
+++void zoo_basename (pathname, fname)
++ char *pathname;
++ char fname[];
++ {
++diff -urNad zoo-2.10~/fiz.1 zoo-2.10/fiz.1
++--- zoo-2.10~/fiz.1	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/fiz.1	2005-11-16 17:28:23.309950808 -0200
++@@ -5,7 +5,7 @@
++ .\"
++ .TH FIZ 1 "Jan 31, 1988"
++ .SH NAME
++-fiz \- analyze damaged zoo archive for data revovery
+++fiz \- analyze damaged zoo archive for data recovery
++ .SH SYNOPSIS
++ .I fiz
++ .RB archive[ .zoo ]
++diff -urNad zoo-2.10~/linux.c zoo-2.10/linux.c
++--- zoo-2.10~/linux.c	1969-12-31 21:00:00.000000000 -0300
+++++ zoo-2.10/linux.c	2005-11-16 17:28:23.310950656 -0200
++@@ -0,0 +1,73 @@
+++/* machine.c for Linux. */
+++
+++/* Basically code stolen from bsd.c, and adjusted for Linux. */
+++
+++#include <sys/stat.h>
+++#include <sys/time.h>
+++#include <unistd.h>
+++
+++/* Function isadir() returns 1 if the supplied handle is a directory,
+++ * else it returns 0. */
+++
+++int isadir (ZOOFILE f)
+++{
+++  struct stat buffer;           /* buffer to hold file information */
+++
+++  if (fstat (fileno (f), &buffer) == -1) 
+++    return (0);                 /* inaccessible -- assume not dir */
+++  else
+++    {
+++      if (buffer.st_mode & S_IFDIR)
+++	return (1);
+++      else
+++	return (0);
+++    }
+++}
+++
+++
+++/* Standard UNIX-compatible time routines */
+++#include "nixtime.i"
+++
+++/* Standard UNIX-specific file attribute routines */
+++#include "nixmode.i"
+++
+++/* Function gettz() returns the offset from GMT in seconds */
+++long gettz()
+++{
+++#define SEC_IN_DAY      (24L * 60L * 60L)
+++#define INV_VALUE       (SEC_IN_DAY + 1L)
+++
+++  static long retval = INV_VALUE;    /* cache, init to impossible value */
+++  struct timeval tp;
+++  struct timezone tzp;
+++
+++  if (retval != INV_VALUE)           /* if have cached value, return it */
+++    return retval;
+++  
+++   gettimeofday (&tp, &tzp);            
+++
+++   retval = tzp.tz_minuteswest * 60 - tzp.tz_dsttime * 3600L;
+++   return retval;
+++}
+++
+++/* Function fixfname() converts the supplied filename to a syntax
+++ * legal for the host system.  It is used during extraction.
+++ * Undocumented */
+++
+++char *fixfname(char *fname)
+++{
+++  return fname; /* default is no-op */
+++}
+++
+++/* Function zootrunc() truncates the file passed to it.
+++ * Undocumented. */
+++
+++int zootrunc(FILE *f)
+++{
+++  long seekpos;
+++  int fd = fileno(f);
+++
+++  seekpos = lseek(fd, 0L, SEEK_CUR);
+++  if (seekpos >= 0)
+++    return ftruncate(fd, seekpos);
+++}
++diff -urNad zoo-2.10~/machine.c zoo-2.10/machine.c
++--- zoo-2.10~/machine.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/machine.c	2005-11-16 17:28:23.310950656 -0200
++@@ -48,6 +48,10 @@
++ /* PART 2.  FOR EACH SPECIFIC SYSTEM, INCLUDE A C FILE HERE.           */
++ /***********************************************************************/
++ 
+++#ifdef LINUX
+++#include "linux.c"
+++#endif
+++
++ #ifdef SYS_V
++ #include "sysv.c"
++ #endif
++diff -urNad zoo-2.10~/makefile zoo-2.10/makefile
++--- zoo-2.10~/makefile	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/makefile	2005-11-16 17:28:23.311950504 -0200
++@@ -23,7 +23,7 @@
++ MODEL =
++ EXTRA = -DBIG_MEM -DNDEBUG
++ LINTFLAGS = -DLINT
++-OPTIM = -O
+++OPTIM = -O -Wall
++ DESTDIR = /usr/local/bin
++ 
++ #List of all object files created for Zoo
++@@ -53,6 +53,7 @@
++ 	@echo "ultrix:       ULTRIX 4.1"
++ 	@echo "convex:       Convex C200 series"
++ 	@echo "sysv:         System V Release 2 or 3; or SCO Xenix"
+++	@echo "linux:        Linux"
++ 	@echo "scodos:       Cross-compiler under SCO Xenix/UNIX for MS-DOS"
++ 	@echo "xenix286:     Older Xenix/286 (not tested)"
++ 	@echo "xenix68k:     Xenix/68000 (not tested)"
++@@ -94,6 +95,10 @@
++ bsd:
++ 	$(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3" $(TARGETS)
++ 
+++# Linux
+++linux:
+++	$(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" $(TARGETS)
+++
++ # ULTRIX 4.1
++ ultrix:
++ 	$(MAKE) CFLAGS="-c $(OPTIM) -DULTRIX" $(TARGETS)
++@@ -235,7 +240,11 @@
++ parse.o: zoofns.h zooio.h
++ portable.o: /usr/include/stdio.h assert.h debug.h machine.h options.h
++ portable.o: portable.h various.h zoo.h zoofns.h zooio.h
++-prterror.o: /usr/include/stdio.h /usr/include/varargs.h options.h various.h
+++
+++# I deleted varags.h dependancy from prterror.o since that is a
+++# dependancy covered by a #ifdef, and in Debian's case #undef'ed
+++
+++prterror.o: /usr/include/stdio.h options.h various.h
++ prterror.o: zoofns.h zooio.h
++ sysv.o: /usr/include/sys/stat.h /usr/include/sys/types.h /usr/include/time.h
++ sysv.o: nixmode.i nixtime.i
++diff -urNad zoo-2.10~/makelist.c zoo-2.10/makelist.c
++--- zoo-2.10~/makelist.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/makelist.c	2005-11-16 17:28:23.311950504 -0200
++@@ -21,6 +21,8 @@
++ 
++ char *nameptr PARMS((char *));
++ void modpath PARMS((char *));
+++int isadir PARMS((ZOOFILE));
+++int isfdir PARMS((char *));
++ 
++ /*******************/
++ /*
++diff -urNad zoo-2.10~/misc.c zoo-2.10/misc.c
++--- zoo-2.10~/misc.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/misc.c	2005-11-16 17:28:23.313950200 -0200
++@@ -8,6 +8,7 @@
++ Copyright (C) 1986, 1987 Rahul Dhesi -- All rights reserved
++ (C) Copyright 1988 Rahul Dhesi -- All rights reserved
++ */
+++#include <signal.h>
++ #include "options.h"
++ /* Miscellaneous functions needed by Zoo but not by Ooz */
++ 
++@@ -201,7 +202,7 @@
++ ZOOFILE zoo_file;
++ {
++ #ifndef NOSIGNAL  
++-   T_SIGNAL (*oldsignal)();
+++   T_SIGNAL (*oldsignal)(int);
++    oldsignal = signal (SIGINT, SIG_IGN);
++ #endif
++    if (fwr_dir (direntry, zoo_file) == -1)
++diff -urNad zoo-2.10~/misc2.c zoo-2.10/misc2.c
++--- zoo-2.10~/misc2.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/misc2.c	2005-11-16 17:28:23.312950352 -0200
++@@ -7,6 +7,10 @@
++ Copyright (C) 1986, 1987 Rahul Dhesi -- All rights reserved
++ (C) Copyright 1988 Rahul Dhesi -- All rights reserved
++ */
+++#include <sys/stat.h>
+++#include <sys/types.h>
+++#include <fcntl.h>
+++#include <unistd.h>
++ #include "options.h"
++ /* Miscellaneous routines */
++ #include "portable.h"
++diff -urNad zoo-2.10~/nixtime.i zoo-2.10/nixtime.i
++--- zoo-2.10~/nixtime.i	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/nixtime.i	2005-11-16 17:28:23.313950200 -0200
++@@ -10,6 +10,9 @@
++ 
++                                     -- Rahul Dhesi  1986/12/31
++ */
+++#include <sys/types.h>
+++#include <time.h>
+++#include <utime.h>
++ 
++ struct tm *localtime();
++ 
++@@ -51,9 +54,10 @@
++ {
++ 	long mstonix();
++ 	long gettz();
++-	long utimbuf[2];
++-	utimbuf[0] = utimbuf[1] = gettz() + mstonix (date, time);
++-	return (utime (path, utimbuf));
+++        struct utimbuf utbf;
+++
+++	utbf.actime = utbf.modtime = gettz() + mstonix (date, time);
+++	return (utime (path, &utbf));
++ }
++ 
++ /****************
++diff -urNad zoo-2.10~/options.h zoo-2.10/options.h
++--- zoo-2.10~/options.h	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/options.h	2005-11-16 17:28:23.314950048 -0200
++@@ -13,6 +13,32 @@
++ 
++ 
++ /***********************************************************************/
+++/* Linux                                                               */
+++/***********************************************************************/
+++
+++#ifdef LINUX
+++#define FILTER
+++#define IO_MACROS
+++#define EXISTS(f)		(access(f, 00) == 0)
+++#define FNLIMIT 1023
+++#define CHEKDIR
+++#define NIXTIME
+++#define NIXFNAME
+++#define NEEDCTYP
+++#define NOENUM
+++#define REN_STDC
+++#define SETBUF
+++#define GETTZ
+++#define FATTR
+++#define T_SIGNAL        void
+++#define STDARG
+++#define HAVE_ISATTY          /* undocumented #define option */
+++#define ANSI_PROTO
+++#define VOIDPTR  void * 
+++#define NO_STDIO_FN          /* Do we need this? RUARI QUINN */
+++#endif /* Linux */
+++
+++/***********************************************************************/
++ /* SYSTEM V (should be compatible with most releases)                  */
++ /***********************************************************************/
++ 
++diff -urNad zoo-2.10~/portable.h zoo-2.10/portable.h
++--- zoo-2.10~/portable.h	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/portable.h	2005-11-16 17:28:23.314950048 -0200
++@@ -90,6 +90,12 @@
++ #define  MKDIR(x)       mkdir(x, 0777)
++ #endif
++ 
+++/* Linux */
+++#ifdef LINUX
+++#define NIX_IO       /* standard **IX I/O */
+++#define  MKDIR(x)       mkdir(x, 0777)
+++#endif
+++
++ /* Amiga */
++ #ifdef MCH_AMIGA
++ # include "MCH_AMIGA NEEDS REVISION"
++diff -urNad zoo-2.10~/zoo.1 zoo-2.10/zoo.1
++--- zoo-2.10~/zoo.1	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zoo.1	2005-11-16 17:33:56.112357152 -0200
++@@ -955,7 +955,7 @@
++     2526: DIR  [changes] ==>   95
++     2587: DATA
++ ****************
++-    3909: DIR  [copyrite] ==> 1478
+++    3909: DIR  [copyright] ==> 1478
++     3970: DATA
++     4769: DATA
++ ****************
++@@ -1041,7 +1041,7 @@
++ Matches any sequence of zero or more characters.
++ .PP
++ .TP
++-.B \?
+++.B ?
++ Matches any single character.
++ .sp 1
++ Arbitrary combinations of 
++@@ -1466,23 +1466,12 @@
++ .I zoo
++ on all systems.  So far as I can tell, this
++ upward compatibility (all manipulations) and downward
++-compatiblity (ability to extract and list)
+++compatibility (ability to extract and list)
++ is maintained by
++ .I zoo
++ versions up to 2.01.  Version 2.1 adds the incompatibility
++ that if high-performance compression is used, earlier
++ versions cannot extract files compressed with version 2.1.
++-This is the only incompatibility that is permissible.
++-You are forbidden, with the force of
++-copyright law, to create from the
++-.I zoo
++-source code any derivative work
++-that violates this compatibility goal,
++-whether knowingly or through negligence.
++-If any violation of this
++-compatibility goal is observed,
++-this should be
++-considered a serious problem and reported to me.
++ .SH CHANGES
++ Here is a list of changes occurring from version 1.50 to
++ version 2.01.  In parentheses is given the version in which each
++@@ -1581,7 +1570,7 @@
++ .TP
++ \-
++ (2.01) Blanks around equal signs in commands given to "make"
++-were removed from the mk* scripts for better compatiblity
+++were removed from the mk* scripts for better compatibility
++ with more **IX implementations including Sun's.
++ .TP
++ \-
++diff -urNad zoo-2.10~/zoo.c zoo-2.10/zoo.c
++--- zoo-2.10~/zoo.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zoo.c	2005-11-16 17:28:23.319949288 -0200
++@@ -15,6 +15,7 @@
++ (C) Copyright 1988 Rahul Dhesi -- All rights reserved
++ (C) Copyright 1991 Rahul Dhesi -- All rights reserved
++ */
+++#include <unistd.h>
++ #include "options.h"
++ #include "zooio.h"
++ #include "various.h"
++diff -urNad zoo-2.10~/zoo.h zoo-2.10/zoo.h
++--- zoo-2.10~/zoo.h	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zoo.h	2005-11-16 17:28:23.321948984 -0200
++@@ -1,5 +1,6 @@
++ /* derived from: zoo.h 2.16 88/01/27 23:21:36 */
++-
+++#ifndef ZOO_H
+++#define ZOO_H
++ /*
++ The contents of this file are hereby released to the public domain.
++ 
++@@ -240,3 +241,4 @@
++ #define	MAXGEN				0x0f
++ /* version mask to prune down to correct size on large-word machines */
++ #define VER_MASK				0xffff
+++#endif
++diff -urNad zoo-2.10~/zooadd.c zoo-2.10/zooadd.c
++--- zoo-2.10~/zooadd.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zooadd.c	2005-11-16 17:28:23.318949440 -0200
++@@ -9,11 +9,13 @@
++ (C) Copyright 1988 Rahul Dhesi -- All rights reserved
++ (C) Copyright 1991 Rahul Dhesi -- All rights reserved
++ */
+++#include <unistd.h>
++ #include "options.h"
++ /* Adds files specified in parameter-list to archive zoo_path. */
++ 
++ #define LONGEST	20					/* assumed length of longest filename */
++ #include "zoomem.h"             /* to define MAXADD */
+++#undef PORTABLE
++ #include "zoo.h"
++ #include "zooio.h"
++ #include "various.h"
++@@ -37,6 +39,7 @@
++ void copyfields PARMS ((struct direntry *, struct tiny_header *));
++ void storefname PARMS ((struct direntry *, char *, int));
++ char *choosefname PARMS ((struct direntry *));
+++int isadir PARMS((ZOOFILE));
++ 
++ extern struct zoo_header zoo_header;
++ 
++@@ -132,7 +135,7 @@
++ 
++ if (zoo_file == NOFILE)
++    prterror ('f', could_not_open, zoo_path);
++-basename(zoo_path, zoo_fname);      /* get basename of archive */
+++zoo_basename(zoo_path, zoo_fname);  /* get basename of archive */
++ rootname (zoo_path, zoo_bak);       /* name without extension */
++ strcat (zoo_bak, BACKUP_EXT);       /* name of backup of this archive */
++ 
++@@ -222,7 +225,7 @@
++ 		break;
++ 	}
++ 
++-   basename (this_path, this_fname);   /* get just filename for later */
+++   zoo_basename (this_path, this_fname);   /* get just filename for later */
++ 
++    this_file = zooopen(this_path, Z_READ);
++    if (this_file == NOFILE) {
++diff -urNad zoo-2.10~/zooadd2.c zoo-2.10/zooadd2.c
++--- zoo-2.10~/zooadd2.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zooadd2.c	2005-11-16 17:28:23.317949592 -0200
++@@ -7,7 +7,9 @@
++ Copyright (C) 1986, 1987 Rahul Dhesi -- All rights reserved
++ (C) Copyright 1988 Rahul Dhesi -- All rights reserved
++ */
+++#include <unistd.h>
++ #include "options.h"
+++#undef PORTABLE
++ #include "zoo.h"
++ #ifndef	OK_STDIO
++ #include <stdio.h>
++@@ -20,7 +22,7 @@
++ #include "assert.h"
++ #include "debug.h"
++ #include "parse.h"
++-
+++int isfdir PARMS((char *));
++ /*
++ Miscellaneous routines to support zooadd().
++ */
++diff -urNad zoo-2.10~/zooext.c zoo-2.10/zooext.c
++--- zoo-2.10~/zooext.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zooext.c	2005-11-16 17:28:23.320949136 -0200
++@@ -14,7 +14,8 @@
++ /* Extract file from archive.  Extracts files specified in parameter-list
++    from archive zoo_path.  If none specified, extracts all files from
++    archive. */
++-
+++#include <unistd.h>
+++#include <signal.h>
++ #include "options.h"
++ #include "zoo.h"
++ #include "parse.h"      /* defines struct for parse() */
++@@ -62,7 +63,7 @@
++ char *whichname;                          /* which name to extract */
++ char matchname[PATHSIZE];                 /* for pattern matching only */
++ #ifndef NOSIGNAL
++-T_SIGNAL (*oldsignal)();        /* to save previous SIGINT handler */
+++T_SIGNAL (*oldsignal)(int);        /* to save previous SIGINT handler */
++ #endif
++ ZOOFILE zoo_file;                         /* open archive */
++ long next_ptr;                            /* pointer to within archive */
++@@ -626,7 +627,7 @@
++ 
++ /* Ctrl_c() is called if ^C is hit while a file is being extracted.
++    It closes the files, deletes it, and exits. */
++-T_SIGNAL ctrl_c()
+++T_SIGNAL ctrl_c(int dummy)
++ {
++ #ifndef NOSIGNAL
++    signal (SIGINT, SIG_IGN);     /* ignore any more */
++diff -urNad zoo-2.10~/zoofns.h zoo-2.10/zoofns.h
++--- zoo-2.10~/zoofns.h	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zoofns.h	2005-11-16 17:28:23.320949136 -0200
++@@ -42,12 +42,12 @@
++ int cfactor PARMS ((long, long));
++ int chname PARMS ((char *, char *));
++ int cmpnum PARMS ((unsigned int, unsigned int, unsigned int, unsigned int));
++-T_SIGNAL ctrl_c PARMS ((void));
+++T_SIGNAL ctrl_c PARMS ((int));
++ int exists PARMS ((char *));
++ int getfile PARMS ((ZOOFILE, ZOOFILE, long, int));
++ int getutime PARMS ((char *, unsigned *, unsigned *));
++ int gettime PARMS ((ZOOFILE, unsigned *, unsigned *));
++-T_SIGNAL handle_break PARMS ((void));
+++T_SIGNAL handle_break PARMS ((int));
++ 
++ #ifdef USE_ASCII
++ int isupper PARMS ((int));
++@@ -85,7 +85,7 @@
++ void addfname PARMS ((char *, long, unsigned int, unsigned int, 
++ 							unsigned, unsigned));
++ void add_version PARMS ((char *, struct direntry *));
++-void basename PARMS ((char *, char []));
+++void zoo_basename PARMS ((char *, char []));
++ void break_off PARMS ((void));
++ void close_file PARMS ((ZOOFILE));
++ void comment PARMS ((char *, char *));
++diff -urNad zoo-2.10~/zooio.h zoo-2.10/zooio.h
++--- zoo-2.10~/zooio.h	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zooio.h	2005-11-16 17:28:23.321948984 -0200
++@@ -7,6 +7,7 @@
++ 
++ 											-- Rahul Dhesi 1988/01/24
++ */
+++#include "zoo.h"
++ #ifndef	OK_STDIO
++ #include <stdio.h>
++ #define	OK_STDIO
++diff -urNad zoo-2.10~/zoolist.c zoo-2.10/zoolist.c
++--- zoo-2.10~/zoolist.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zoolist.c	2005-11-16 17:28:23.322948832 -0200
++@@ -47,6 +47,7 @@
++ int ver_too_high PARMS((struct zoo_header *));
++ int needed PARMS((char *, struct direntry *, struct zoo_header *));
++ void printtz PARMS((int));
+++int fputchar PARMS ((int));
++ 
++ void zoolist (argv, option, argc)
++ char **argv, *option;
++@@ -414,7 +415,7 @@
++ 					if (direntry.fattr == 0)
++ 						printf ("--- ");
++ 					else if ((direntry.fattr >> 22) == 1)
++-						printf ("%03o ", direntry.fattr & 0x1ff);
+++						printf ("%03lo ", direntry.fattr & 0x1ff);
++ 					else
++ 						printf ("??? ");
++ 				}
++diff -urNad zoo-2.10~/zoopack.c zoo-2.10/zoopack.c
++--- zoo-2.10~/zoopack.c	2005-11-16 17:11:21.000000000 -0200
+++++ zoo-2.10/zoopack.c	2005-11-16 17:28:23.323948680 -0200
++@@ -10,6 +10,7 @@
++ Copyright (C) 1986, 1987 Rahul Dhesi -- All rights reserved
++ (C) Copyright 1988 Rahul Dhesi -- All rights reserved
++ */
+++#include <unistd.h>
++ #include "options.h"
++ /* Packs an archive.  The sequence is:
++    1. Copy all files from current archive to new one.
++@@ -171,7 +172,7 @@
++ } else {
++    strcpy (temp_file, xes);
++ }
++-mktemp (temp_file);                    /* ... and make unique */
+++mkstemp (temp_file);                    /* ... and make unique */
++ new_file = zoocreate (temp_file);
++ if (new_file == NOFILE)
++    prterror ('f', "Could not create temporary file %s.\n", temp_file);
++@@ -388,7 +389,7 @@
++ 
++ /* handle_break() */
++ /* Sets break_hit to 1 when called */
++-T_SIGNAL handle_break()
+++T_SIGNAL handle_break(int dummy)
++ {
++ #ifndef NOSIGNAL
++    signal (SIGINT, SIG_IGN);     /* ignore future control ^Cs for now */
+--- zoo-2.10.orig/debian/patches/00options
++++ zoo-2.10/debian/patches/00options
+@@ -0,0 +1 @@
++DPEP_OPTION_EXEC_TEMPLATE=1
+--- zoo-2.10.orig/debian/patches/00list
++++ zoo-2.10/debian/patches/00list
+@@ -0,0 +1,5 @@
++01_old_fixes
++02_traversal_directory
++03_fix_manage_archive_under_AMD64
++04_fix_fullpath_buffer_overflow
++05_CVE-2006-1269.dpatch
+--- zoo-2.10.orig/debian/patches/00template
++++ zoo-2.10/debian/patches/00template
+@@ -0,0 +1,43 @@
++#!/bin/sh
++# Sample debian/patches/00template script
++# era Thu May 15 23:24:07 2003
++
++# This simply creates the equivalent of the hard-coded template.
++# Adapt and hack to suit your needs.
++
++file="$1"
++shift
++description="$@"
++
++fullnameguess="$(getent passwd $(id -un) | cut -f5 -d: | cut -f1 -d,)"
++domainguess=$([ -f /etc/mailname ] && cat /etc/mailname || hostname -f)
++emailguess="${DEBEMAIL:-${EMAIL:-$(logname)@${domainguess}}}"
++
++cat <<EOF
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## ${file} by ${DEBFULLNAME:-$fullnameguess} <$emailguess>
++##
++## All lines beginning with \`## DP:' are a description of the patch.
++## DP: ${description:-No description}
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="\${patch_opts:--f --no-backup-if-mismatch \${2:+-d \$2}}"
++
++if [ \$# -lt 1 ]; then
++  echo >&2 "\`basename \$0\`: script expects -patch|-unpatch as argument"
++  exit 1
++fi
++
++case "\$1" in
++  -patch) patch \$patch_opts -p1 < \$0;;
++  -unpatch) patch \$patch_opts -p1 -R < \$0;;
++  *)
++    echo >&2 "\`basename \$0\`: script expects -patch|-unpatch as argument"
++    exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++EOF
++
+--- zoo-2.10.orig/debian/patches/02_traversal_directory.dpatch
++++ zoo-2.10/debian/patches/02_traversal_directory.dpatch
+@@ -0,0 +1,70 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 02_traversal_directory.dpatch by Jose Carlos Medeiros <debian@psabs.com.br>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: patch to solve problem with "directory traversal bug" CVE id CAN-2005-2349
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
++
++if [ $# -lt 1 ]; then
++  echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++  exit 1
++fi
++
++case "$1" in
++  -patch) patch $patch_opts -p1 < $0;;
++  -unpatch) patch $patch_opts -p1 -R < $0;;
++  *)
++    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++    exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad zoo-2.10/portable.c /tmp/dpep.W7Aoaj/zoo-2.10/portable.c
++--- zoo-2.10/portable.c	2005-07-22 15:34:22.000000000 -0300
+++++ /tmp/dpep.W7Aoaj/zoo-2.10/portable.c	2005-07-25 14:43:57.757855384 -0300
++@@ -364,6 +364,41 @@
++       show_dir(direntry);
++    }
++ #endif
+++   /* #########################################################################
+++    * 
+++    *  THIS CODE WAS WRITTEN TO SOLVE PROBLEM WITH DIRECTORY TRAVERSAL SECURITY
+++    *  BUG (CVE id CAN-2005-2349).
+++    *  
+++    *  ########################################################################
+++    */
+++   char *p;
+++   /* take off '../'   */
+++   while ((p = strstr( direntry->dirname, "../" )) != NULL) {
+++      while (*(p+3) != '\0') {
+++        *p = *(p + 3);
+++        p++;
+++      }
+++      *p = *(p+3); /* move last null */
+++      //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname);
+++   }
+++   /* take off  '/'  */
+++   if ( direntry->dirname[0] == '/' ) {
+++      p = direntry->dirname;
+++      while (*p != '\0') {
+++        *p = *(p + 1);
+++        p++;
+++      }
+++      *p = *(p+1); /* move last null */
+++      //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname);
+++   }
+++   /* direntry->dirlen = strlen(direntry->dirname); */
+++
+++   /* ##################################################################
+++    * 
+++    * END
+++    *
+++    * ###################################################################
+++   */
++    return (0);
++ }
++ 
+--- zoo-2.10.orig/debian/patches/03_fix_manage_archive_under_AMD64.dpatch
++++ zoo-2.10/debian/patches/03_fix_manage_archive_under_AMD64.dpatch
+@@ -0,0 +1,107 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 03_fix_manage_archive_under_AMD64.dpatch by Jose Carlos Medeiros <debian@psabs.com.br>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: patch to solve problems managing files under AMD64 and maybe under others 64 archs.
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
++
++if [ $# -lt 1 ]; then
++  echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++  exit 1
++fi
++
++case "$1" in
++  -patch) patch $patch_opts -p1 < $0;;
++  -unpatch) patch $patch_opts -p1 -R < $0;;
++  *)
++    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++    exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad zoo-2.10~/makefile zoo-2.10/makefile
++--- zoo-2.10~/makefile	2005-11-16 12:10:06.773065688 -0200
+++++ zoo-2.10/makefile	2005-11-16 12:12:50.816127352 -0200
++@@ -54,6 +54,7 @@
++ 	@echo "convex:       Convex C200 series"
++ 	@echo "sysv:         System V Release 2 or 3; or SCO Xenix"
++ 	@echo "linux:        Linux"
+++	@echo "linux64:      Linux with 64 bit long"
++ 	@echo "scodos:       Cross-compiler under SCO Xenix/UNIX for MS-DOS"
++ 	@echo "xenix286:     Older Xenix/286 (not tested)"
++ 	@echo "xenix68k:     Xenix/68000 (not tested)"
++@@ -99,6 +100,10 @@
++ linux:
++ 	$(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" $(TARGETS)
++ 
+++# Linux64
+++linux64:
+++	$(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DLONG64 -DANSI_HDRS" $(TARGETS)
+++
++ # ULTRIX 4.1
++ ultrix:
++ 	$(MAKE) CFLAGS="-c $(OPTIM) -DULTRIX" $(TARGETS)
++diff -urNad zoo-2.10~/misc.c zoo-2.10/misc.c
++--- zoo-2.10~/misc.c	2005-11-16 12:10:06.775065384 -0200
+++++ zoo-2.10/misc.c	2005-11-16 12:20:48.366528656 -0200
++@@ -173,7 +173,11 @@
++ 
++    frd_zooh (header, zoo_file);
++ 
+++#ifdef LONG64
+++   if ((int)(header->zoo_start = header->zoo_minus) != 0)
+++#else
++    if ((header->zoo_start + header->zoo_minus) != 0L)
+++#endif
++       prterror ('f', failed_consistency);
++    if (ver_too_high (header))
++       prterror ('f', wrong_version, header->major_ver, header->minor_ver);
++diff -urNad zoo-2.10~/zoodel.c zoo-2.10/zoodel.c
++--- zoo-2.10~/zoodel.c	1991-07-05 13:00:00.000000000 -0300
+++++ zoo-2.10/zoodel.c	2005-11-16 12:20:19.776874944 -0200
++@@ -138,7 +138,11 @@
++    
++    /* read archive header */
++    frd_zooh (&zoo_header, zoo_file);
+++#ifdef LONG64
+++   if ((int)(zoo_header.zoo_start + zoo_header.zoo_minus) != 0)
+++#else
++    if ((zoo_header.zoo_start + zoo_header.zoo_minus) != 0L)
+++#endif
++       prterror ('f', failed_consistency);
++    if (ver_too_high (&zoo_header))
++       prterror ('f', wrong_version, zoo_header.major_ver, zoo_header.minor_ver);
++diff -urNad zoo-2.10~/zooext.c zoo-2.10/zooext.c
++--- zoo-2.10~/zooext.c	2005-11-16 12:10:06.783064168 -0200
+++++ zoo-2.10/zooext.c	2005-11-16 12:22:08.373365768 -0200
++@@ -164,7 +164,11 @@
++ } else {
++    /* read header */
++    frd_zooh (&zoo_header, zoo_file);
+++#ifdef LONG64
+++   if ((int)(zoo_header.zoo_start + zoo_header.zoo_minus) != 0) {
+++#else
++    if ((zoo_header.zoo_start + zoo_header.zoo_minus) != 0L) {
+++#endif
++       prterror ('w', failed_consistency);
++       bad_header++;
++ 		exit_status = 1;
++diff -urNad zoo-2.10~/zoopack.c zoo-2.10/zoopack.c
++--- zoo-2.10~/zoopack.c	2005-11-16 12:10:06.786063712 -0200
+++++ zoo-2.10/zoopack.c	2005-11-16 12:23:01.145343208 -0200
++@@ -140,7 +140,11 @@
++ /* Read the header of the old archive. */
++ frd_zooh(&old_zoo_header, zoo_file);
++ 
+++#ifdef LONG64
+++if ((int)(old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0) {
+++#else
++ if ((old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0L) {
+++#endif
++    prterror ('w', failed_consistency);
++    ++bad_header;                    /* remember for future error message */
++ }
+--- zoo-2.10.orig/debian/patches/04_fix_fullpath_buffer_overflow.dpatch
++++ zoo-2.10/debian/patches/04_fix_fullpath_buffer_overflow.dpatch
+@@ -0,0 +1,44 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 04_fix_fullpath_buffer_overflow.dpatch by Jose Carlos Medeiros <debian@psabs.com.br>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Fix  "fullpath()" File Name Handling Buffer Overflow, CAN-2006-0855
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
++
++if [ $# -lt 1 ]; then
++  echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++  exit 1
++fi
++
++case "$1" in
++  -patch) patch $patch_opts -p1 < $0;;
++  -unpatch) patch $patch_opts -p1 -R < $0;;
++  *)
++    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++    exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad zoo-2.10~/misc.c zoo-2.10/misc.c
++--- zoo-2.10~/misc.c	2006-03-03 18:51:31.000000000 -0300
+++++ zoo-2.10/misc.c	2006-03-03 18:54:29.000000000 -0300
++@@ -136,11 +136,14 @@
++ char *fullpath (direntry)
++ struct direntry *direntry;
++ {
++-	static char result[PATHSIZE];
+++	static char result[PATHSIZE+PATHSIZE+12]; // Room for enough space
++ 	combine (result,
++ 				direntry->dirlen != 0 ? direntry->dirname : "", 
++ 				(direntry->namlen != 0) ? direntry->lfname : direntry->fname
++ 			  );
+++	if (strlen (result) >= PATHSIZE) {
+++		prterror ('f', "Combined dirname and filename too long\n"); 
+++	}
++ 	return (result);
++ }
++ 
+--- zoo-2.10.orig/debian/patches/05_CVE-2006-1269.dpatch
++++ zoo-2.10/debian/patches/05_CVE-2006-1269.dpatch
+@@ -0,0 +1,37 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 05_CVE-2006-1269.dpatch by Alec Berryman <alec@thened.net>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183426
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
++
++if [ $# -lt 1 ]; then
++  echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++  exit 1
++fi
++
++case "$1" in
++  -patch) patch $patch_opts -p1 < $0;;
++  -unpatch) patch $patch_opts -p1 -R < $0;;
++  *)
++    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++    exit 1;;
++esac
++
++exit 0
++
++@DPATCH@
++diff -urNad zoo-2.10~/parse.c zoo-2.10/parse.c
++--- zoo-2.10~/parse.c	1991-07-05 17:00:00.000000000 +0100
+++++ zoo-2.10/parse.c	2006-05-18 14:16:32.000000000 +0100
++@@ -39,7 +39,7 @@
++    char *namep;                   /* points to relevant part of tempname */
++ 
++    char *p;
++-   strcpy (tempname, fname);
+++   strncpy (tempname, fname, LFNAMESIZE);
++ 
++ #ifdef DEBUG
++ printf ("parse:  supplied name is [%s].\n", tempname);
+--- zoo-2.10.orig/debian/compat
++++ zoo-2.10/debian/compat
+@@ -0,0 +1 @@
++5
+--- zoo-2.10.orig/debian/changelog
++++ zoo-2.10/debian/changelog
+@@ -0,0 +1,139 @@
++zoo (2.10-18) unstable; urgency=low
++
++  * Added patch to solve "CVE-2006-1269: local arbitrary code execution",
++    thanks to Alec Berryman <alec@thened.net> (closes: #367858)
++  * Updated to DH_COMPAT 5
++
++ -- Jose Carlos Medeiros <debian@psabs.com.br>  Fri, 19 May 2006 19:23:24 -0300
++
++zoo (2.10-17) unstable; urgency=low
++
++  * Added 04_fix_fullpath_buffer_overflow patch to fix a Buffer Overflow,
++    CAN-2006-0855. Thanks to Jean-SébastienGuay-Leroux 
++    <jean-sebastien_at_guay-leroux.com>, (closes: #354461)
++
++ -- Jose Carlos Medeiros <debian@psabs.com.br>  Fri,  3 Mar 2006 18:56:02 -0300
++
++zoo (2.10-16) unstable; urgency=low
++
++  * Added 03_fix_manage_archive_under_AMD64 patch, thanks to carlj
++    <Carl.Johnson.carlj@peak.org>. (closes: #335114)
++  * Updated debian/rules to test and compile to AMD64.
++  * Updated to Standards-Version 3.6.2.
++  * Changed 01_old_fixes dpatch to solve problem "missing \?" in zoo.1.
++
++ -- Jose Carlos Medeiros <debian@psabs.com.br>  Wed, 16 Nov 2005 16:48:24 -0200
++
++zoo (2.10-15) unstable; urgency=low
++
++  * Added dpatch as Build-Depends in debian/control.
++  * Added debian/watch file. (closes: #322246)
++  * Updated linux.c in 01_old_fixes. (closes: #322194)
++    Thanks to Robert Millan <rmh@aybabtu.com>
++
++ -- Jose Carlos Medeiros <debian@psabs.com.br>  Tue,  9 Aug 2005 15:07:48 -0300
++
++zoo (2.10-14) unstable; urgency=low
++
++  * Changed call from "mktemp" to "mkstemp" in zoopack.c file.
++  * Added debian/patches/00options, debian/patches/00list and
++    debian/patches/00template files.
++  * Updated rules and control to use dpatch.
++  * Added 01_old_fixes.dpatch file with old changes.
++  * Added 02_traversal_directory.dpatch to solve problem with "directory
++    traversal security bug - CVE id CAN-2005-2349". Thanks to 
++    Jorge Ventura <jorge.ventura@fusemail.com> (closes: #309594)
++  * Changed upstream source link in copyright file.
++
++ -- Jose Carlos Medeiros <debian@psabs.com.br>  Fri, 22 Jul 2005 12:59:07 -0300
++
++zoo (2.10-13) unstable; urgency=low
++
++  * Updated zoo.1 file (thanks to A Costa <agcosta@gis.net>). (closes: #302817)
++  * Changed email of Mantainer in control file.
++  * Updated fiz.1 file (thanks to A Costa <agcosta@gis.net>). (closes: #309874)
++
++ -- Jose Carlos Medeiros <debian@psabs.com.br>  Tue,  7 Jun 2005 20:47:51 -0300
++
++zoo (2.10-12) unstable; urgency=low
++
++  * New maintainer (closes: #302895)
++  * Created compat file.
++  * Deleted debian/docs unused file.
++  * Changed rules to complain debhelper > 4.0.
++  * Changed README.compilers to README.debian.
++
++ -- Jose Carlos Medeiros <jose@psabs.com.br>  Wed, 13 Apr 2005 18:39:14 -0300
++
++zoo (2.10-11) unstable; urgency=low
++
++  * New maintainer (closes: #258470)
++  * Move to main from non-free (zoo is now in public domain).
++  * Updated copyright file
++  * Updated zoo.1 file
++  * Removed unnecessary, compile related files from the binary package.
++  * Standards-Version: 3.6.1.0
++
++ -- Niklas Vainio <nvainio+deb@iki.fi>  Sat, 10 Jul 2004 21:29:26 +0300
++
++zoo (2.10-10) unstable; urgency=low
++
++  * Recompile to allow prelinking (closes: #231547).
++
++ -- Petr Cech <cech@debian.org>  Mon,  9 Feb 2004 12:02:32 +0100
++
++zoo (2.10-9) unstable; urgency=low
++
++  * Fix build with new glibc-2.2 (closes: #94865)
++
++ -- Petr Cech <cech@debian.org>  Sun, 22 Apr 2001 22:17:14 +0200
++
++zoo (2.10-8) unstable; urgency=low
++
++  * Added README.compilers.
++  * Standards-version: 3.2.1.
++  * Glibc-2.2 build.
++  * Fix long utibuf[2] to struct utimbuf.
++
++ -- Petr Cech <cech@debian.org>  Tue, 17 Oct 2000 15:07:50 +0200
++
++zoo (2.10-7) unstable; urgency=low
++
++  * Don't know how, but the copyright was gone
++  * Added documentation from source package
++
++ -- Petr Cech <cech@debian.org>  Sat, 16 May 1998 11:32:30 +0200
++
++zoo (2.10-6) frozen unstable; urgency=low
++
++  * Use debhelper.
++  * Added some includes and prototypes to have less warnings
++  * New maintainer.
++  * updated to 2.4.1
++
++ -- Petr CECH <Petr.Cech@st.mff.cuni.cz>  Fri,  8 May 1998 01:06:39 +0200
++
++zoo (2.10-5) unstable; urgency=low
++
++  * Orphaned the package.
++  * debian/control (Standards-Version): updated to 2.4.0.0 [#16772].
++  * debian/control (Section): changed to non-free/utils [fails #3 of DFSG].
++  * debian/control (Maintainer): set to debian-qa list.
++  * debian/rules: rewritten.
++
++ -- James Troup <jjtroup@comp.brad.ac.uk>  Wed,  4 Mar 1998 02:17:57 +0000
++
++zoo (2.10-4) unstable; urgency=low
++
++  * Rebuilt for libc6.
++
++ -- James Troup <jjtroup@comp.brad.ac.uk>  Wed, 25 Jun 1997 17:04:23 +0000
++
++zoo (2.10-3) unstable; urgency=low
++
++  * New maintainer.
++  * Updated package to standards version 2.1.1.2.
++  * Removed executables from source package.
++  * Added better linux support, fixes bug #3961 and #4904.
++
++ -- James Troup <jjtroup@comp.brad.ac.uk>  Wed, 22 Jan 1997 02:18:51 +0000
+--- zoo-2.10.orig/debian/watch
++++ zoo-2.10/debian/watch
+@@ -0,0 +1,3 @@
++version=3
++opts=dversionmangle=s/\.// \
++   http://www.ibiblio.org/pub/packages/ccic/software/unix/utils/zoo(.*)\.tar\.gz
+--- zoo-2.10.orig/debian/control
++++ zoo-2.10/debian/control
+@@ -0,0 +1,20 @@
++Source: zoo
++Section: utils
++Priority: optional
++Build-Depends: debhelper (>= 5.0.0), dpatch (>= 2.0.10)
++Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
++Uploaders: Ola Lundqvist <opal@debian.org>
++Standards-Version: 3.6.2
++
++Package: zoo
++Architecture: any
++Depends: ${shlibs:Depends}
++Description: manipulate zoo archives
++ Zoo is used to create and maintain collections of files in compressed
++ form.  It uses a Lempel-Ziv compression algorithm that gives space
++ savings in the range of 20% to 80% depending on the type of file data.
++ Zoo can store and selectively extract multiple generations of the same
++ file.
++ .
++ This package exists for its historical value. If you are looking for
++ a compression tool for serious use, check tar and gzip.
+--- zoo-2.10.orig/debian/rules
++++ zoo-2.10/debian/rules
+@@ -0,0 +1,94 @@
++#!/usr/bin/make -f
++# debian/rules file - for zoo (2.1).
++# Based on sample debian.rules file - for GNU Hello (1.3).
++# Copyright 1994,1995 by Ian Jackson.
++# Copyright 1997,1998 by James Troup.
++# Copyright 1998,1999,2000 by Petr Èech.
++# Copyright 2005 by Jose Carlos N. Medeiros.
++# I hereby give you perpetual unlimited permission to copy,
++# modify and relicense this file, provided that you do not remove
++# my name from the file itself.  (I assert my moral right of
++# paternity under the Copyright, Designs and Patents Act 1988.)
++# 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
++
++CFLAGS = -Wall
++
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++	CFLAGS += -O0
++else
++	CFLAGS += -O2
++endif
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++	CFLAGS += -g
++endif
++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++	INSTALL += -s
++endif
++
++DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
++PACKAGE = zoo
++
++# Include dpatch stuff.
++include /usr/share/dpatch/dpatch.make
++
++configure: configure-stamp
++configure-stamp:
++	dh_testdir
++	touch configure-stamp
++
++build: build-stamp
++
++build-stamp: configure-stamp patch
++	dh_testdir
++
++	echo $(DEB_HOST_ARCH)
++ifeq ($(DEB_HOST_ARCH),amd64)
++	$(MAKE) OPTIM="$(CFLAGS)" linux64
++else
++	$(MAKE) OPTIM="$(CFLAGS)" linux
++endif
++	touch build-stamp
++
++clean: unpatch
++	dh_testdir
++	dh_testroot
++	-$(MAKE) -i clean
++	dh_clean build-stamp configure-stamp zoo fiz
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k 
++	dh_installdirs
++
++	# Add here commands to install the package into debian/zoo.
++	install -m 755 -s zoo fiz debian/zoo/usr/bin
++
++# Build architecture-independent files here.
++binary-indep: build install
++# We have nothing to do by default.
++
++# Build architecture-dependent files here.
++binary-arch: build install
++	dh_testdir
++	dh_testroot
++	dh_installchangelogs 
++	dh_installdocs
++	dh_installman fiz.1 zoo.1
++	dh_link
++	dh_strip
++	dh_compress
++	dh_fixperms
++	dh_installdeb
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install configure
++
+--- zoo-2.10.orig/debian/copyright
++++ zoo-2.10/debian/copyright
+@@ -0,0 +1,64 @@
++This is Debian GNU/Linux's prepackaged version of the zoo archiver.
++
++This package was put together by James Troup from the original 
++source obtained from: 
++  http://www.ibiblio.org/pub/packages/ccic/software/unix/utils/zoo210.tar.gz
++ 
++From May 1998 to July 2004 it was maintained by Petr Èech and
++currently it is maintained by Niklas Vainio <nvainio+deb@iki.fi>
++
++Copyright and license:
++
++Zoo was written by Rahul Dhesi. He has now released it into the public
++domain:
++
++
++Return-Path: <dhesi@rahul.net>
++Date: Sat, 19 Jun 2004 13:50:26 -0700 (PDT)
++From: dhesi@rahul.net
++To: Niklas Vainio <nvainio@iki.fi>
++Subject: Re: License of Zoo
++
++Hi, the last release of the zoo archive program was marked entirely
++public domain, with no restrictions.  I'm sure this statement will be
++found somewhere in the files in the sources.  If not, I hope this email
++will suffice:  everything in the zoo package is entirely public domain,
++with no restrictions whatsoever.
++
++Rahul
++
++
++On Sat, 19 Jun 2004, Niklas Vainio wrote:
++
++> Dear Rahul Dhesi,
++> 
++> The Zoo archiving program you wrote, is part of the Debian GNU/Linux system,
++> in its unofficial section called "non-free". I'm asking you to relax licence
++> conditions of Zoo a bit to make it free software and allow it to move into
++> the official Debian distribution.
++> 
++> Zoo licensing conditions have two clauses that make it non-free software.
++> Those clauses are the following:
++> 
++> "(b) do not create, whether deliberately or through negligence, any 
++> derivative work that violates the compatibility goals describe in the
++> reference manual for zoo 2.1,"
++> 	       
++> "(d) make the fully commented source code of the derivative work available
++> to me at no cost if I so request, and make no attempt to restrict the
++> distribution or use of this source code."
++> 
++> Of course this is more of historical interest than any actual need, but
++> would you please consider licensing Zoo under a free license?
++> 
++> Best regards,
++>     - Nikke, a Debian volunteer
++> 
++> -- 
++> Niklas Vainio <niklas.vainio@iki.fi>
++> 
++
++
++
++
++
+--- zoo-2.10.orig/debian/dirs
++++ zoo-2.10/debian/dirs
+@@ -0,0 +1 @@
++usr/bin
+--- zoo-2.10.orig/debian/README.debian
++++ zoo-2.10/debian/README.debian
+@@ -0,0 +1,11 @@
++The linux target I created was based on the bsd 4.3 target, with the
++following differences :-
++
++     Linux has strchr().
++     Linux signal handler returns void data type.
++     (Debian GNU/)Linux uses stdarg.h in preference to varags.h.
++     Linux has memmove().
++     (Debian GNU/)Linux uses ansi C compilers (required for stdarg.h).
++     Linux malloc() returns a void pointer.
++     Linux has vprintf().
++     
diff --git a/source/ap/a2ps/a2ps.SlackBuild b/source/ap/a2ps/a2ps.SlackBuild
new file mode 100755
index 000000000..b8e5ed18e
--- /dev/null
+++ b/source/ap/a2ps/a2ps.SlackBuild
@@ -0,0 +1,158 @@
+#!/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.
+
+
+PKGNAM=a2ps
+PKGNAM2=psutils
+VERSION=${VERSION:-4.14}
+A2PS=${A2PS:-4.14}
+PSUTILS=${PSUTILS:-1.17}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-4}
+
+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
+
+# First, build and install psutils:
+cd $TMP
+tar xvf $CWD/$PKGNAM2-${PSUTILS}.tar.gz || exit 1
+cd $PKGNAM2
+
+# 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 {} \;
+
+zcat $CWD/psutils.diff.gz | patch -p1 --verbose -E --backup --suffix=.orig || exit 1
+zcat $CWD/psutils.destdir.diff.gz | patch -p1 --verbose -E --backup --suffix=.orig || exit 1
+
+# Build and install:
+make -f Makefile.unix || exit 1
+make -f Makefile.unix install DESTDIR=$PKG || exit 1
+
+# Add a documentation directory for psutils:
+mkdir -p $PKG/usr/doc/$PKGNAM2-$PSUTILS
+cp -a \
+  LICENSE README \
+  $PKG/usr/doc/$PKGNAM2-$PSUTILS
+
+# Build, install and delete temporary psutils package for a2ps
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM2-${PSUTILS}-$ARCH-$BUILD.txz || exit 1
+echo "Installing temporary $PKGNAM2 package (this will be removed when the SlackBuild finishes)"
+/sbin/installpkg $TMP/$PKGNAM2-${PSUTILS}-$ARCH-$BUILD.txz || exit 1
+rm $TMP/$PKGNAM2-${PSUTILS}-$ARCH-$BUILD.txz || exit 1
+
+# Then, build a2ps:
+cd $TMP
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$A2PS
+
+zcat $CWD/a2ps.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+zcat $CWD/a2ps.a2ps_cfg.in.diff.gz | patch -p1 --verbose --backup --suffix=.orig || 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 needs lispdir in case emacs is not installed at this moment:
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+lispdir="/usr/share/emacs/site-lisp" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --with-medium=letter \
+  $ARCH-slackware-linux
+
+# Build and install:
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Remove temporary psutils package:
+echo "Removing temporary psutils package"
+/sbin/removepkg $PKGNAM2-${PSUTILS}-$ARCH-$BUILD || exit 1
+
+# 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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/a2ps-$VERSION
+cp -a ABOUT-NLS ANNOUNCE AUTHORS COPYING ChangeLog \
+  FAQ INSTALL NEWS README THANKS TODO \
+  $PKG/usr/doc/a2ps-$VERSION
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# 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
+
+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/ap/a2ps/a2ps.a2ps_cfg.in.diff b/source/ap/a2ps/a2ps.a2ps_cfg.in.diff
new file mode 100644
index 000000000..38b9550a0
--- /dev/null
+++ b/source/ap/a2ps/a2ps.a2ps_cfg.in.diff
@@ -0,0 +1,11 @@
+--- ./etc/a2ps_cfg.in.orig	2007-12-28 19:38:58.000000000 -0600
++++ ./etc/a2ps_cfg.in	2009-03-30 20:11:06.000000000 -0500
+@@ -68,7 +68,7 @@
+ # 2)	Path to the a2ps resource				#
+ #################################################################
+ # Default path where a2ps dropped its library files.
+-LibraryPath: @libpath@
++LibraryPath: @libpath@:/usr/share/fonts/Type1
+ 
+ # It may be useful to extend it so that a2ps can see some
+ # TeX or X11 resources: it likes AFM files and PF[AB] files.
diff --git a/source/ap/a2ps/a2ps.diff b/source/ap/a2ps/a2ps.diff
new file mode 100644
index 000000000..b3140ad37
--- /dev/null
+++ b/source/ap/a2ps/a2ps.diff
@@ -0,0 +1,12 @@
+--- ./configure.orig	Thu Jan 18 21:14:51 2001
++++ ./configure	Thu Jan 18 21:15:16 2001
+@@ -8449,7 +8449,8 @@
+ # Find out if ghostscript is installed
+ ac_psfont_path=
+ for ac_dir in /usr/local/ghostscript/fonts \
+-  /usr/local/share/ghostscript/fonts;
++  /usr/local/share/ghostscript/fonts \
++  /usr/share/ghostscript/fonts ;
+ do
+   if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
+     ac_psfont_path="$ac_psfont_path:$ac_dir";
diff --git a/source/ap/a2ps/psutils.destdir.diff b/source/ap/a2ps/psutils.destdir.diff
new file mode 100644
index 000000000..f547b791e
--- /dev/null
+++ b/source/ap/a2ps/psutils.destdir.diff
@@ -0,0 +1,56 @@
+--- psutils/Makefile.unix.old	1997-11-03 23:52:00.000000000 +0000
++++ psutils/Makefile.unix	2008-09-10 08:31:00.000000000 +0000
+@@ -25,9 +25,9 @@
+ 
+ OS = UNIX
+ 
+-BINDIR = /usr/bin
++BINDIR = ${DESTDIR}/usr/bin
+ SCRIPTDIR = $(BINDIR)
+-INCLUDEDIR = /usr/share/psutils
++INCLUDEDIR = ${DESTDIR}/usr/share/psutils
+ PERL = /usr/bin/perl
+ 
+ BINMODE = 0755
+@@ -36,7 +36,7 @@
+ INSTALL = install -c -m $(BINMODE)
+ INSTALLMAN = install -c -m $(MANMODE)
+ MANEXT = 1
+-MANDIR = /usr/man/man$(MANEXT)
++MANDIR = ${DESTDIR}/usr/man/man$(MANEXT)
+ 
+ CC = gcc
+ CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
+@@ -219,28 +219,28 @@
+ install: install.bin install.script install.man install.include
+ 
+ install.bin: $(BIN)
+-	-mkdir $(BINDIR)
++	-mkdir -p $(BINDIR)
+ 	@for i in $(BIN); do \
+ 		echo Installing $$i; \
+ 		$(INSTALL) $$i $(BINDIR); \
+ 	done
+ 
+ install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS)
+-	-mkdir $(SCRIPTDIR)
++	-mkdir -p $(SCRIPTDIR)
+ 	@for i in $(PERLSCRIPTS) $(SHELLSCRIPTS); do \
+ 		echo Installing $$i; \
+ 		$(INSTALL) $$i $(SCRIPTDIR); \
+ 	done
+ 
+ install.include: $(INCLUDES)
+-	-mkdir $(INCLUDEDIR)
++	-mkdir -p $(INCLUDEDIR)
+ 	@for i in $(INCLUDES); do \
+ 		echo Installing $$i; \
+ 		$(INSTALLMAN) $$i $(INCLUDEDIR); \
+ 	done
+ 
+ install.man: $(MANPAGES)
+-	-mkdir $(MANDIR)
++	-mkdir -p $(MANDIR)
+ 	@for i in $(MANPAGES); do \
+ 		echo Installing manual page for $$i; \
+ 		$(INSTALLMAN) $$i $(MANDIR)/$$i; \
diff --git a/source/ap/a2ps/psutils.diff b/source/ap/a2ps/psutils.diff
new file mode 100644
index 000000000..4af32bd7f
--- /dev/null
+++ b/source/ap/a2ps/psutils.diff
@@ -0,0 +1,33 @@
+diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix
+--- psutils.orig/Makefile.unix	Tue Mar 11 14:52:59 1997
++++ psutils/Makefile.unix	Thu Jan 18 20:53:36 2001
+@@ -19,16 +19,16 @@
+ # psnup puts multiple logical pages on one physical page
+ # psresize scales and moves pages to fit on different paper sizes
+ 
+-PAPER=a4
++PAPER=letter
+ 
+ # Makefile for PSUtils under Unix
+ 
+ OS = UNIX
+ 
+-BINDIR = /usr/local/bin
++BINDIR = /usr/bin
+ SCRIPTDIR = $(BINDIR)
+-INCLUDEDIR = /usr/local/share/psutils
+-PERL = /usr/local/bin/perl
++INCLUDEDIR = /usr/share/psutils
++PERL = /usr/bin/perl
+ 
+ BINMODE = 0755
+ MANMODE = 0644
+@@ -36,7 +36,7 @@
+ INSTALL = install -c -m $(BINMODE)
+ INSTALLMAN = install -c -m $(MANMODE)
+ MANEXT = 1
+-MANDIR = /usr/local/share/man/man$(MANEXT)
++MANDIR = /usr/man/man$(MANEXT)
+ 
+ CC = gcc
+ CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
diff --git a/source/ap/a2ps/slack-desc b/source/ap/a2ps/slack-desc
new file mode 100644
index 000000000..6cdc18957
--- /dev/null
+++ b/source/ap/a2ps/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------------------------------------------------------|
+a2ps: a2ps (any to PostScript filter)
+a2ps:
+a2ps: GNU a2ps is an Any to PostScript filter.  Of course it processes
+a2ps: plain text files, but also pretty prints quite a few popular
+a2ps: programming languages.  Also contained in this package is psutils, a
+a2ps: collection of programs for manipulating PostScript files.
+a2ps:
+a2ps: a2ps is used by Apsfilter, so be sure to install this package if you
+a2ps: plan to do any printing.
+a2ps:
+a2ps:
diff --git a/source/ap/acct/acct-6.4pre1-6.diff b/source/ap/acct/acct-6.4pre1-6.diff
new file mode 100644
index 000000000..8db3d7be7
--- /dev/null
+++ b/source/ap/acct/acct-6.4pre1-6.diff
@@ -0,0 +1,2636 @@
+--- acct-6.4~pre1.orig/debian/rules
++++ acct-6.4~pre1/debian/rules
+@@ -0,0 +1,90 @@
++#!/usr/bin/make -f
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++include /usr/share/dpatch/dpatch.make
++
++# These are used for cross-compiling and for saving the configure script
++# from having to guess our platform (since we know it already)
++DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++
++CFLAGS = -Wall -g
++
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++	CFLAGS += -O0
++else
++	CFLAGS += -O2
++endif
++
++config.status: configure patch
++	dh_testdir
++
++	# Configuring package
++	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
++
++build: build-stamp
++build-stamp: config.status
++	dh_testdir
++
++	# Building package
++	$(MAKE)
++	texi2html -verbose -monolithic accounting.texi
++
++	touch build-stamp
++
++clean: unpatch
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp
++
++	# Cleaning package
++	[ ! -f Makefile ] || $(MAKE) distclean
++	rm -f accounting.html
++ifneq "$(wildcard /usr/share/misc/config.sub)" ""
++	cp -f /usr/share/misc/config.sub config.sub
++endif
++ifneq "$(wildcard /usr/share/misc/config.guess)" ""
++	cp -f /usr/share/misc/config.guess config.guess
++endif
++
++	dh_clean
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	# Installing package
++	$(MAKE) install DESTDIR=$(CURDIR)/debian/acct
++
++	# Removing last, it's in the sysvinit package instead.
++	rm -f debian/acct/usr/bin/last
++	rm -f debian/acct/usr/share/man/man1/last.1
++
++binary-indep: build install
++
++binary-arch: build install
++	dh_testdir
++	dh_testroot
++	dh_installchangelogs ChangeLog
++	dh_installdocs
++	dh_install
++	dh_installinit
++	dh_installcron
++	dh_installinfo
++	dh_installman
++	dh_link
++	dh_strip
++	dh_compress
++	dh_fixperms
++	dh_installdeb
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install
+--- acct-6.4~pre1.orig/debian/manpages
++++ acct-6.4~pre1/debian/manpages
+@@ -0,0 +1 @@
++debian/manpage/*
+--- acct-6.4~pre1.orig/debian/watch
++++ acct-6.4~pre1/debian/watch
+@@ -0,0 +1,2 @@
++version=3
++http://ftp.gnu.org/gnu/acct/acct-(.*)\.tar\.gz
+--- acct-6.4~pre1.orig/debian/postrm
++++ acct-6.4~pre1/debian/postrm
+@@ -0,0 +1,21 @@
++#!/bin/sh
++
++set -e
++
++case "$1" in
++	purge)
++		rm -rv /var/log/account
++		;;
++
++	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
++
++		;;
++
++	*)
++		echo "postrm called with unknown argument \`$1'" >&2
++		;;
++esac
++
++#DEBHELPER#
++
++exit 0
+--- acct-6.4~pre1.orig/debian/default
++++ acct-6.4~pre1/debian/default
+@@ -0,0 +1,9 @@
++# Defaults for acct
++
++# If you want to keep acct installed, but not started automatically, set this
++# variable to 0. Because /etc/cron.daily/acct calls the initscript daily, it is
++# not sufficient to stop acct once after booting if your machine remains up.
++ACCT_ENABLE="1"
++
++# Amount of days that the logs are kept.
++ACCT_LOGGING="30"
+--- acct-6.4~pre1.orig/debian/postinst
++++ acct-6.4~pre1/debian/postinst
+@@ -0,0 +1,24 @@
++#!/bin/sh
++
++set -e
++
++case "$1" in
++	configure)
++		mkdir -p /var/log/account
++		touch /var/log/account/pacct
++		chmod 0640 /var/log/account/pacct*
++		chown root:adm /var/log/account/pacct*
++		;;
++
++	abort-upgrade|abort-remove|abort-deconfigure)
++
++		;;
++
++	*)
++		echo "postinst called with unknown argument \`$1'" >&2
++		;;
++esac
++
++#DEBHELPER#
++
++exit 0
+--- acct-6.4~pre1.orig/debian/cron.monthly
++++ acct-6.4~pre1/debian/cron.monthly
+@@ -0,0 +1,45 @@
++#!/bin/sh
++
++LOGROTATE="/etc/cron.daily/logrotate"
++
++test -x /usr/sbin/accton || exit 0
++
++echo "Login accounting for the month ended `date`:" > /var/log/wtmp.report
++echo >> /var/log/wtmp.report
++
++# The logrotate script happens to run before this one, effectively swallowing
++# all information out of wtmp before we can use it. Hence, we need to use the
++# previous file. Bad hack. Too bad we never heard from the logrotate maintainer
++# about this ...
++
++if [ -f "${LOGROTATE}" ] && [ -x /usr/sbin/logrotate ]
++then
++	# make sure wtmp.1 exists
++	if [ -f /var/log/wtmp.1 ]
++	then
++		LOGFILE="/var/log/wtmp.1"
++	fi
++		if [ -f /var/log/wtmp.1.gz ]
++	then
++		LOGFILE2="`tempfile`"
++	fi
++		if [ -n "${LOGFILE}" ] && [ -n "${LOGFILE2}" ]
++	then
++		ac -f "${LOGFILE2}" -f "${LOGFILE}" -p | sort -nr -k2 >> /var/log/wtmp.report
++		echo >> /var/log/wtmp.report
++		last -f "${LOGFILE2}" >> /var/log/wtmp.report
++	elif [ -n "${LOGFILE}" ] && [ -z "${LOGFILE2}" ]
++	then
++		ac -f "${LOGFILE}" -p | sort -nr -k2 >> /var/log/wtmp.report
++		echo >> /var/log/wtmp.report
++		last -f "${LOGFILE}" >> /var/log/wtmp.report
++	fi
++		rm -f "${LOGFILE2}"
++else
++	ac -p | sort -nr -k2 >> /var/log/wtmp.report
++	echo >> /var/log/wtmp.report
++	last >> /var/log/wtmp.report
++fi
++
++chown root:adm /var/log/wtmp.report
++chmod 640 /var/log/wtmp.report
+--- acct-6.4~pre1.orig/debian/doc-base
++++ acct-6.4~pre1/debian/doc-base
+@@ -0,0 +1,15 @@
++Document: acct
++Title: The GNU Accounting utilities
++Author: Noel Cragg
++Abstract: The GNU Accounting utilities for process and login accounting
++ GNU Accounting Utilities is a set of utilities which reports and summarizes
++ data about user connect times and process execution statistics.
++ .
++ "Login accounting" provides summaries of system resource usage based on connect
++ time, and "process accounting" provides summaries based on the commands
++ executed on the system.
++Section: Apps/System
++
++Format: HTML
++Index: /usr/share/doc/acct/accounting.html
++Files: /usr/share/doc/acct/accounting.html
+--- acct-6.4~pre1.orig/debian/copyright
++++ acct-6.4~pre1/debian/copyright
+@@ -0,0 +1,34 @@
++This package was debianized by Daniel Baumann <daniel@debian.org> on
++Sat, 18 Mar 2006 18:38:00 +0100.
++
++It was downloaded from:
++
++	<http://ftp.gnu.org/gnu/acct/>
++
++Upstream Author:
++
++	Tim Schmielau <tim@physik3.uni-rostock.de>
++
++License:
++
++	Copyright (C) 1993-2006 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 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 systems, the complete text of the GNU General Public License
++can be found in /usr/share/common-licenses/GPL file.
++
++The Debian packaging is (C) 2006-2007, Daniel Baumann <daniel@debian.org> and
++is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
+--- acct-6.4~pre1.orig/debian/init.d
++++ acct-6.4~pre1/debian/init.d
+@@ -0,0 +1,97 @@
++#!/bin/sh
++
++### BEGIN INIT INFO
++# Provides:          acct
++# Required-Start:    $remote_fs $syslog
++# Required-Stop:     $remote_fs $syslog
++# Default-Start:     2 3 4 5
++# Default-Stop:      0 1 6
++# Short-Description: process and login accounting
++# Description:       GNU Accounting Utilities is a set of utilities which
++#                    reports and summarizes data about user connect times and
++#                    process execution statistics.
++### END INIT INFO
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++DAEMON=/usr/sbin/accton
++NAME=acct
++DESC="process accounting"
++
++test -x $DAEMON || exit 0
++
++# Include acct defaults if available
++if [ -f /etc/default/acct ]
++then
++	. /etc/default/acct
++else
++	ACCT_ENABLE="1"
++	ACCT_LOGGING="30"
++fi
++
++set -e
++
++case "$1" in
++	start)
++		if [ "${ACCT_ENABLE}" = "1" ]
++		then
++
++		# Have to turn this on to be able to test the return code
++		set +e
++
++		echo -n "Starting $DESC: "
++		/usr/sbin/accton /var/log/account/pacct 2>/dev/null
++
++		rv=$?
++		if [ $rv -eq 0 ]
++		then
++			echo "$NAME."
++		elif [ $rv -eq 38 ]
++		then
++			echo "failed."
++			echo "Process accounting not available on this system."
++		elif [ $rv -eq 16 ]
++		then
++			echo "failed."
++			echo "Process accounting already running on this system."
++		else
++			logger -p daemon.err "Unexpected error code $rv received in /etc/init.d/acct"
++		fi
++
++		fi
++
++		set -e
++		;;
++
++	stop)
++		echo -n "Stopping $DESC: "
++
++		# Have to turn this on to be able to test the return code
++		set +e
++
++		/usr/sbin/accton off 2>/dev/null
++
++		if [ $? -eq 0 ]
++		then
++			echo "$NAME."
++		else
++			echo "failed."
++			echo "Process accounting not available on this system."
++		fi
++
++		set -e
++		;;
++
++	restart|force-reload)
++		$0 stop
++		sleep 1
++		$0 start
++		;;
++
++	*)
++		N=/etc/init.d/$NAME
++		echo "Usage: $N {start|stop|restart|force-reload}" >&2
++		exit 1
++		;;
++esac
++
++exit 0
+--- acct-6.4~pre1.orig/debian/changelog
++++ acct-6.4~pre1/debian/changelog
+@@ -0,0 +1,602 @@
++acct (6.4~pre1-6) unstable; urgency=medium
++
++  * Adjusted lsb header of init script, thanks Petter Reinholdtsen
++    <pere@hungry.com> (Closes: #466279).
++
++ -- Daniel Baumann <daniel@debian.org>  Sat,  8 Mar 2008 09:04:00 +0100
++
++acct (6.4~pre1-5) unstable; urgency=low
++
++  * Bumped to new policy.
++  * Using new homepage field in control.
++  * Don't hide make errors in clean target.
++  * Removing historic changes entries in the first lines of changelog
++    entries, they are present in the actual entries anyway but are
++    causing lintian noise.
++
++ -- Daniel Baumann <daniel@debian.org>  Thu, 27 Dec 2007 08:45:00 +0100
++
++acct (6.4~pre1-4) unstable; urgency=low
++
++  * Minor cleanups.
++  * Bumped to debhelper 5.
++  * Added lsb header to init.d.
++  * Added the remaining things to cron.monthly, other things were solved
++    different already (Closes: #378359).
++
++ -- Daniel Baumann <daniel@debian.org>  Sun, 29 Apr 2007 12:27:00 +0200
++
++acct (6.4~pre1-3) unstable; urgency=medium
++
++  * Adapted the patch from Dean Gaudet <dean-debian@arctic.org> to add
++    lastcomm -f - stdin and --forwards support to current acct
++    (Closes: #262583).
++  * Fixed cron.monthly to not process the non-rotated logfile twice if the
++    rotated one isn't existing (Closes: #51796).
++
++ -- Daniel Baumann <daniel@debian.org>  Sun, 5 Nov 2006 13:55:00 +0100
++
++acct (6.4~pre1-2) unstable; urgency=medium
++
++  * Forgot to remove unused var in init.d (Closes: #397134).
++
++ -- Daniel Baumann <daniel@debian.org>  Sun, 5 Nov 2006 13:55:00 +0100
++
++acct (6.4~pre1-1) unstable; urgency=medium
++
++  * New email address.
++  * Hardcoding location of the log files, using environment variables does not
++    work for all binaries (Closes: #377835, #380744, #385626, #392045, #396444).
++  * Adjusted init.d script to log to syslog directly as suggested by
++    Gian Piero Carrubba <gpcarrubba@libero.it> (Closes: #208939).
++  * Updated sort call in cron.monthly to new syntax as found out by
++    Gilles Mocellin <gilles.mocellin@free.fr> and others
++    (Closes: #375712, #381492).
++  * Updated ac call in cron.monthly to process both $WTMP and /var/log/wtmp.1
++    (Closes: #324910).
++  * Fixed spelling mistake in default (Closes: #392023).
++  * Fixed spelling mistake and incompleteness in dump-acct.8 (Closes: #392134).
++
++ -- Daniel Baumann <daniel@debian.org>  Sat,  4 Nov 2006 10:10:00 +0100
++
++acct (6.3.99+6.4pre1-4) unstable; urgency=low
++
++  * Fixed typo in init.d (Closes: #361109, #361109).
++
++ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Sun, 25 Jun 2006 08:37:00 +0200
++
++acct (6.3.99+6.4pre1-3) unstable; urgency=low
++
++  * Storing logging information for a month instead of a week (Closes: #271466).
++  * Rewritten init.d and fixed accton call in init.d (Closes: #361109, #361109).
++  * Using /etc/default/acct now to store settings
++    (Closes: #219194, #353034, #361111).
++  * Fixed manpage error (Closes: #360098, #364589)
++
++ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Fri, 23 Jun 2006 06:53:00 +0200
++
++acct (6.3.99+6.4pre1-2) unstable; urgency=low
++
++  * Removed useless debconf message (Closes: #358698).
++  * Removed last documentation (Closes: #360302).
++
++ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Sun, 28 May 2006 05:36:00 +0200
++
++acct (6.3.99+6.4pre1-1) unstable; urgency=low
++
++  * New maintainer (Closes: #357362).
++  * New upstream release:
++    - supporting v3 file format (Closes: #289648, #291154, #327134)
++  * Redone debian directory:
++    - added watch file.
++    - corrected copyright file (Closes: #290052).
++    - fixed debconf depends (Closes: #331731).
++    - removed references to non-existing pacct in dump-acct.8 (Closes: #293837).
++    - removed dpatches: one was merged upstream, manpages are broken-out, and
++      /usr/bin/last ist removed after compilation (less intrusive).
++    - added Czech debconf translation (Closes: #282320, #287291).
++    - added Finnish debconf translation (Closes: #303851).
++    - added Vietnamese debconf translation (Closes: #307597).
++    - updated Dansk debconf translation (Closes: #241243).
++    - updated German debconf translation (Closes: #314136).
++  * Acknowledge NMU:
++    - fixed gzipped logfile handling in cron.monthly
++      (Closes: #187538, #208220, #212961).
++    - adjusted logfile path for logger call in init.d (Closes: #208939).
++
++ -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Sat, 18 Mar 2006 18:38:00 +0100
++
++acct (6.3.5-39) unstable; urgency=low
++
++  * Acknowledging NMU's. Thanks. (closes: #187539, #198581, #198581)
++  * Added Co-Maintainer (me) to Uploaders field.
++  * Added/updated polish, greek, portuguese, japanese translations.
++    (closes: #208954, #229531, #216200, #222063, #229499, #229523)
++  * Bumped Standars-Version to 3.6.1.
++
++ -- Andrés Roldán <aroldan@debian.org>  Sun,  1 Feb 2004 23:02:22 +0000
++
++acct (6.3.5-38.2) unstable; urgency=low
++
++  * Fix gzip support in cron.monthly to not delete/recreate the wtmp file
++    (gunzip: /var/log/wtmp.1 already exists; not overwritten)
++
++ -- Matt Zimmerman <mdz@debian.org>  Sun,  1 Feb 2004 12:00:00 -0800
++
++acct (6.3.5-38.1) unstable; urgency=low
++
++  * NMU with maintainer consent
++  * Handled gzipped wtmp file. Closes: #187539. Thanks Tero Tilus
++  * Switch to po-debconf templates. Closes: #198581
++  * Added danish templates translation (converted to gettext). Closes: #174728
++
++ -- Christian Perrier <bubulle@debian.org>  Mon, 28 Jul 2003 16:32:05 +0200
++
++acct (6.3.5-38) unstable; urgency=low
++
++  * New maintainer (closes: #177233).
++  * Package builded from the scratch.
++  * Fixed danish debconf template.
++  * Fixed broken output on ia64 and alpha (closes: #169099).
++
++ -- Luis Bustamante <luferbu@fluidsignal.com>  Sun, 19 Jan 2003 01:26:12 -0500
++
++acct (6.3.5-37) unstable; urgency=low
++
++  * debian/dump-acct.8: Clarified meaning of time field (Closes: #177020)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Fri, 17 Jan 2003 19:22:55 -0600
++
++acct (6.3.5-36) unstable; urgency=low
++
++  * debian/template: Added new debconf text in Danish (Closes: #174727)
++  * debian/control: Upped debconf versioned Depends to ">= 1.2.9" (lintian)
++  * debian/control: Small editing in Description (lintian)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Wed,  1 Jan 2003 08:56:23 -0600
++
++acct (6.3.5-35) unstable; urgency=low
++
++  * etc/init.d/acct: Applied patch by ralf.hildebrandt@charite.de to rely
++    only on 'uname -r' as 'uname -a' fails on hppa (Closes: 165535)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sun, 20 Oct 2002 19:17:43 -0500
++
++acct (6.3.5-34) unstable; urgency=low
++
++  * debian/control: s|Debian Linux|Debian GNU/Linux| (Closes: #150886)
++  * debian/rules: Move #DEBHELPER# to end so that /etc/init.d/acct is
++    called after modes/owner chg on /var/account/pacct (Closes: #153905)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Mon, 22 Jul 2002 19:44:05 -0500
++
++acct (6.3.5-33) unstable; urgency=low
++
++  * debian/cron.monthly: Test for /var/log/wtmp.1 (Closes: #146918)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sat, 18 May 2002 12:20:57 -0500
++
++acct (6.3.5-32) unstable; urgency=low
++
++  * debian/templates: Updated Russian debconf template (Closes: #136918)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sat, 18 May 2002 12:20:10 -0500
++
++acct (6.3.5-31) unstable; urgency=low
++
++  * debian/templates: Updated French debconf template (Closes: #134624)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue, 26 Feb 2002 20:49:57 -0600
++
++acct (6.3.5-30) unstable; urgency=low
++
++  * debian/templates: New debconf text in russian (Closes: #112535)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Fri, 14 Dec 2001 18:55:33 -0600
++
++acct (6.3.5-29) unstable; urgency=low
++
++  * debian/templates: Changed Type from text to note (Closes: #106327)
++  * debian/templates: New debconf text in spanish (Closes: #106935)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue, 31 Jul 2001 22:17:49 -0500
++
++acct (6.3.5-28) unstable; urgency=low
++
++  * sa.c: Applied patch by LaMont Jones which enables compilation by
++    gcc-3.0, the default compiler on the parisc architecure (Closes: #103147)
++  * debian/prerm: Don't call "/etc/init.d/acct stop" explicitly as
++    debhelper's dh_installinit also adds a call.
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Mon,  2 Jul 2001 21:40:05 -0500
++
++acct (6.3.5-27) unstable; urgency=low
++
++  * debian/{cron.daily,postinst}: change pacct to mode 0640,root.adm.
++    Thanks to Manuel López Moreno <mlm@luname.net> (Closes: #86045)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue,  1 May 2001 22:21:27 -0500
++
++acct (6.3.5-26) unstable; urgency=low
++
++  * debian/templates: Added text for pt translation (Closes: #89439)
++  * debian/{pre,post}{inst,rm}: lintian cleanups
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 19 Apr 2001 21:54:36 -0500
++
++acct (6.3.5-25) unstable; urgency=low
++
++  * debian/control: Added Standards-Version: back in (Closes: #86925)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Wed, 21 Feb 2001 21:01:50 -0600
++
++acct (6.3.5-24) unstable; urgency=low
++
++  * debian/control: Added Build-Depends on texinfo (Closes: #85073)
++  * For good measure, added a few more suggested by dpkg-genbuilddeps
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Wed,  7 Feb 2001 22:29:02 -0600
++
++acct (6.3.5-23) unstable; urgency=low
++
++  * debian/templates: Added non-English debconf text text for sv, nl, es
++    and a new one for fr. (Closes: #83478, #83583, #84017, #84411)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sun,  4 Feb 2001 19:56:09 -0600
++
++acct (6.3.5-22) unstable; urgency=low
++
++  * debian/control: Build-Depends on texi2html and no longer on tetex-bin
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Thu,  4 Jan 2001 20:42:54 -0600
++
++acct (6.3.5-21) unstable; urgency=low
++
++  * debian/cron.monthly: Special case for logrotate (Closes: #68043)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sun,  6 Aug 2000 16:15:23 -0400
++
++acct (6.3.5-20) unstable; urgency=low
++
++  * debian/control: Add texi2html to Build-Depends (Closes: #67531)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Fri, 21 Jul 2000 17:22:55 -0400
++
++acct (6.3.5-19) unstable; urgency=low
++
++  * debian/rules: Install dump-acct.8 and dump-utmp.8 which were
++    contributed by Ognyan Kulev <ogi@fmi.uni-sofia.bg>
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Wed, 19 Jul 2000 19:08:13 -0400
++
++acct (6.3.5-18) unstable; urgency=low
++
++  * debian/templates: Apply Italian debconf text (Closes: #64160)
++  * debian/templates: Also added German and French text
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sat, 27 May 2000 16:28:13 -0400
++
++acct (6.3.5-17) unstable; urgency=low
++
++  * debian/control: Added Build-Depends: information (Closes: #51840)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Wed, 15 Dec 1999 18:42:48 -0500
++
++acct (6.3.5-16) unstable; urgency=low
++
++  * postinst: Added db_stop upon Joey Hess' advice (Closes: #50043)
++  * control: Upgraded to Policy 3.1.0
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sun, 14 Nov 1999 19:39:17 -0500
++
++acct (6.3.5-15) unstable; urgency=low
++
++  * Ah, the joys of new technology. Helping out with the whirlwind upgrade
++    to the new debconf, we were bitten by a simple mistake in the config
++    file. Thanks again to Joey Hess for a quick fix  (Closes: #48861)
++  * control: Require debconf >= 0.2
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Mon,  1 Nov 1999 20:45:05 -0500
++
++acct (6.3.5-14) unstable; urgency=low
++
++  * preinst: Test for install-docs (fixes Lintian error)
++  * postinst, config: Small debconf changes, kindly supplied by Joey Hess
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sun, 31 Oct 1999 10:14:32 -0500
++
++acct (6.3.5-13) unstable; urgency=low
++
++  * Integrated Joey Hess' changes for debconf.
++
++  * debian/rules: Adapted to use /usr/share/ following the recommendation
++    on FHS transition from the Technical Committee
++  * debian/control: Upgraded to Debian Policy 3.0.1
++
++  * debian/control: Removed obsolete note about required kernel patch
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sat,  2 Oct 1999 11:35:22 -0400
++
++acct (6.3.5-12) unstable; urgency=low
++
++  * Upgraded to new Debian Perl Policy
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sun,  4 Jul 1999 14:19:41 -0400
++
++acct (6.3.5-11) unstable; urgency=low
++
++  * Recompiled on a 2.2.* system
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sun, 30 May 1999 11:59:22 -0400
++
++acct (6.3.5-10) unstable; urgency=low
++
++  * debian/rules: Define -DHAVE_LINUX_ACCT_H=1 in order to use acct.h from
++    the 2.2.9 kernel and not sys.h from glibc-2.0
++  * debian/acctdump: No longer installed as it works neither with
++    linux/acct.h, nor with sys/acct.h (and there still is dump-acct)
++  * compare_kernel_version:
++    -- changed to use POSIX::uname, not `uname`
++    -- added run-time flag -d for debug mode
++    -- corrected return value logic (fixes #37421)
++  * compare_kernel_version.8: added a simple manual page
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sun, 16 May 1999 21:52:52 -0400
++
++acct (6.3.5-9) unstable; urgency=low
++
++  * Recompiled under 2.2.* kernel (#18314, #24085)
++
++  * Added a simple script /usr/sbin/compare_kernel_version to test the
++    running kernel against a command-line argument specifying a minimum
++    kernel version
++  * postinst: test for kernel >= 2.2 and, if needed, display a message
++    suggesting the slink version of the package
++  * /etc/init.d/acct: test for kernel >= 2.2 and exit early with short
++    mesage if installed kernel does not match (ie < 2.2)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue,  4 May 1999 20:44:34 -0400
++
++acct (6.3.5-8) unstable; urgency=low
++
++  * debian/prerm: Call /etc/init.d/acct to stop accounting as this more
++    robust against missing Accounting support in the kernel. (fixes #32711)
++  * debian/control: Added note that Accounting support has to be compiled
++    into the kernel for this to work.
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue,  2 Feb 1999 18:30:56 -0500
++
++acct (6.3.5-7) unstable; urgency=low
++
++  * debian/control: Deleted stale text errenously left over (fixes #32616)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Fri, 29 Jan 1999 18:38:28 -0500
++
++acct (6.3.5-6) unstable; urgency=low
++
++  * debian/{rules,postinst,postrm}: Removed support for html documentation
++    through menu as it is now provided by doc-base
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 14 Jan 1999 20:50:25 -0500
++
++acct (6.3.5-5) unstable; urgency=low
++
++  * Added support for doc-base
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue,  5 Jan 1999 21:43:16 -0500
++
++acct (6.3.5-4) frozen unstable; urgency=low
++
++  * [cron.daily, cron.monthly] Added tests for the existence of
++    /usr/sbin/accton. This helps for cases where acct is removed, but not
++    purged, and these conffiles are still around. (fixes #29340)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Thu, 12 Nov 1998 21:32:37 -0500
++
++acct (6.3.5-3) unstable; urgency=low
++
++  * Corrected typos in console messages in /etc/init.d/acct (fixes #23480)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sat, 13 Jun 1998 11:57:14 -0400
++
++acct (6.3.5-2) unstable; urgency=low
++
++  * Changed /etc/init.d/acct by adding two 'set +e; ... set -e' blocks
++    so that missing accounting support is properly recognised in all
++    branches of the script  (fixes #23282)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue,  9 Jun 1998 21:36:16 -0400
++
++acct (6.3.5-1) unstable; urgency=low
++
++  * Upgraded to new upstream version 6.3.5 (fixes #3249)
++  * This version does not work under 2.1.* kernels which the upstream
++    author is trying to rectify.
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Wed, 27 May 1998 18:43:08 -0400
++
++acct (6.3.2-4) frozen unstable; urgency=low
++
++  * Changed debian/rules to not install last.1 as we don't install the
++    last(1) command from acct (but rather sysvinit's) (fixes #22215)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Thu,  7 May 1998 20:19:05 -0400
++
++acct (6.3.2-3) unstable; urgency=low
++
++  * Removed the note regarding accounting patch for kernels younger than
++    1.3.72 from debian/copyright and debian/control. Thanks to Richard
++    Braakman <dark@xs4all.nl> for pointing this out (fixes #21334)
++  * Added the 'acctdump' program which was provided by Ian Jackson
++    <ian@davenant.greenend.org.uk> (fixes #20839)
++  * Upgraded debian/rules to debhelper
++  * Upgraded to Debian Policy 2.4.1
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sat, 18 Apr 1998 16:12:41 -0400
++
++acct (6.3.2-2) frozen unstable; urgency=low
++
++  * Really changed /etc/init.d/acct so that logger reports to
++    /var/log/daemon.log and not to /var/adm/daemon.log (fixes #18763)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue, 24 Mar 1998 19:34:07 -0500
++
++acct (6.3.2-1) unstable; urgency=low
++
++  * Upgraded to new upstream version 6.3.2
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue, 10 Mar 1998 19:46:34 -0500
++
++acct (6.3-2) unstable; urgency=low
++
++  * Changed /etc/init.d/acct so that logger reports to /var/log/daemon.log
++    and not to /var/adm/daemon.log (fixes #18763)
++  * Fixed FSF address in copyright (lintian)
++  * Redirect update-rc.d call to /dev/null in postrm (lintian)
++  * Added force-reload and restart targets to /etc/init.d/acct (lintian)
++  * Created links to ../man7/undocumented.7.gz in lieu of manual pages
++    for the two utility programs dump-acct and dump-utmp (lintian)
++  * Upgraded to Debian Policy 2.4.0.0
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Mon,  9 Mar 1998 20:24:05 -0500
++
++acct (6.3-1) unstable; urgency=low
++
++  * Upgraded to new upstream version 6.3 (which has been promoted from
++    alpha.gnu.mit.edu to the brave GNU world of prep.ai.mit.edu)
++  * Compiled with GNU libc2 aka libc6
++  * Now ships the unmodified upstream source as acct_6.3.orig.tar.gz
++  * Changed debian/rules to also create accounting.html via texi2html
++  * Added menu entry for html documentation
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Tue, 19 Aug 1997 22:11:21 -0400
++
++acct (6.2-5) unstable; urgency=low
++
++  * Added a variable to /etc/init.d/acct so that acct is installed but
++    not started automatically if this variable is unset (fixes bug #11126)
++  * Changed /etc/cron.daily/acct to call acct via /etc/init.d/acct and not
++    directly so that the new variable is tested (fixes bug #11126)
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Wed, 9 Jul 1997 22:18:30 -0400
++
++acct (6.2-4) unstable; urgency=low
++
++  * The preinst no longer stops accounting during an upgrade as this is
++    already done by the the postrm of the replaced packaged (fixes bug#7320)
++
++  * No longer installs acct.5 which is provided by the manpages package
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Mon, 3 Mar 1997 20:57:37 -0500
++
++acct (6.2-3) unstable; urgency=low
++
++  * Use logger(1) to report unexpected return calls from accton(8) as
++    suggested by Russell John Coker <rjc@snoopy.virtual.net.au>
++
++  * Converted to Debian Standard 2.1.2.2 (fixes #7121)
++  * Changed maintainer email address to <edd@debian.org>
++
++ -- Dirk Eddelbuettel <edd@debian.org>  Sun, 9 Feb 1997 22:00:42 -0500
++
++Tue Jul  9 22:33:18 1996  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* acct-6.2-2 release
++
++	* debian.rules: fixed copyright installation (fixes bug#3738)
++
++Mon Jul  8 11:07:01 1996  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* acct-6.2-1 release
++
++	* acct.rc: /etc/init.d/acct tests for accton (fixes bug#3513)
++
++	* debian.rules: compress man pages with gzip -9
++	
++	* debian.postrm: "purge" now deletes /var/account directory
++
++	* debian.control: changed description
++
++Sat Apr 20 22:30:46 1996  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* acct-6.2-0 release: updated to new upstream version acct-6.2
++
++Wed Apr 10 19:38:37 1996  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* acct-6.1-0 release
++
++	* converted to new upstream version acct-6.1 (fixes bug#2069)
++
++	* added man pages for the acct commands that were provided by
++	  Susan G. Kleinmann <sgk@sgk.tiac.net> and a simple acct.5 man
++	  page (fixes bug#1737)
++
++	* ac.c: added a space to printf format (should fix bug#2283)
++	
++	* debian.rules: provide only acct, last is now provided by sysvinit
++
++	* debian.control: added Architecture: field
++
++	* acct.daily: exit(0) so that cron doesn't get the errno from accton.c
++
++Sat Dec  2 14:00:19 1995  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* acct-5-13 and last-5-13 release
++
++	* debian.control: ELF release, depends on libc5
++
++Fri Oct 13 09:41:36 1995  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* acct-5-12 and last-5-12 release
++
++	* uid_hash.h (NAME_LEN): fixed bug#1651 reported and patched by
++	  Austin Donnelly <and1000@cam.ac.uk>
++
++Wed Oct 11 08:53:29 1995  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* acct-5-11 and last-5-11 release
++
++	* debian.postinst: call update-rc.d (fixes bug #1622)
++
++Mon Oct  2 16:39:00 1995  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* dropped `alpha' from package names, now acct-5-10 and last-5-10
++
++	* accton.c: exit() now returns value of `errno' and /etc/init.d/acct
++	  examines that value; this gives better messages
++	  
++	* accounting.texi: added a missing formatter for @item
++
++	* last.1 man page addded
++
++Wed Sep 27 10:59:55 1995  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* debian.control, debian.README: fixed bug #1486 by adding a note
++	  that 'sa' is unavailable due to missing support in the current 
++	  kernel patch 
++
++Thu Sep 21 15:52:14 1995  Dirk Eddelbuettel  <edd@miles.econ.queensu.ca>
++
++	* acct-alpha-5-8 and last-alpha-5-8
++
++	* first separate release of 'last' package
++
++	* changed control file for acct (fixes bugs #1415, #1131 and #969)
++
++	* silent when accton fails during installation (fixes bug #1415)
++
++	* new maintainer
++
++
++[edd: Changes made by Ian Murdock follow]
++
++Changes:
++ * added Debian GNU/Linux package maintenance system files
++ * added scripts to rotate process accounting file (daily), to perform
++   monthly login accounting, and to start process accounting at system
++   start time
++ * added __linux__ definitions to files.h (we use /var/account/pacct
++   as ACCT_FILE, /var/account/wtmp as WTMP_FILE, /var/account/savacct
++   as SAVACCT_FILE, and /var/account/usracct as USRACCT_FILE)
++ * changed last to truncate ftp entries by default (as Unix does it)
++ * fixed a typo in accounting.texi
+--- acct-6.4~pre1.orig/debian/patches/04-lastcomm-forwards.dpatch
++++ acct-6.4~pre1/debian/patches/04-lastcomm-forwards.dpatch
+@@ -0,0 +1,126 @@
++#!/bin/sh /usr/share/dpatch/dpatch-run
++## 04-lastcomm-forwards.dpatch by Dean Gaudet <dean@arctic.org>
++##
++## DP: Adds lastcomm -f - stdin and --forwards support (Closes: #262583).
++
++@DPATCH@
++
++diff -Naur acct-6.4-pre1.orig/lastcomm.1 acct-6.4-pre1/lastcomm.1
++--- acct-6.4-pre1.orig/lastcomm.1	2006-01-07 21:55:07.000000000 +0000
+++++ acct-6.4-pre1/lastcomm.1	2006-12-04 11:52:49.000000000 +0000
++@@ -23,6 +23,10 @@
++ ]
++ .br
++ [
+++.B \-\-forwards
+++]
+++.br
+++[
++ .BI \-f " filename"
++ |
++ .BI \-\-file " filename"
++@@ -131,11 +135,25 @@
++ List records for tty
++ .I name.
++ .TP
+++.BI \-\-forwards
+++Read file forwards instead of backwards. This avoids trying to seek on the file
+++and can be used to read from a pipe. This must be specified prior to any
+++.BI \-f
+++arguments.
+++.TP
++ .BI \-f " filename, " \-\-file " filename"
++ Read from the file 
++ .I filename 
++ instead of
++-.I acct
+++.I acct.
+++A filename of "-" will result in reading from stdin. This must either be the
+++first
+++.BI \-f
+++option, or
+++.BI \-\-forwards
+++must precede all
+++.BI \-f
+++options.
++ .TP
++ .BI \-\-ahz " hz"
++ Use this flag to tell the program what
++diff -Naur acct-6.4-pre1.orig/lastcomm.c acct-6.4-pre1/lastcomm.c
++--- acct-6.4-pre1.orig/lastcomm.c	2006-01-07 21:56:46.000000000 +0000
+++++ acct-6.4-pre1/lastcomm.c	2006-12-04 11:59:16.000000000 +0000
++@@ -96,12 +96,9 @@
++   int c;
++   int other_pacct_file_specified = 0; /* nonzero if the user used the
++ 					 `-f' or `--file' flag */
+++  int backwards = 1; /* default to reading backwards */
++ 
++   program_name = argv[0];
++-  
++-  /* Tell the pacct reader that we want to do things backwards! */
++-
++-  pacct_init (1);
++ 
++   while (1)
++     {
++@@ -118,6 +115,7 @@
++ 	{ "tty", required_argument, NULL, 8 },
++ 	{ "command", required_argument, NULL, 9 },
++ 	{ "ahz", required_argument, NULL, 10 },
+++	{ "forwards", no_argument, NULL, 11 },
++ #ifdef HAVE_PAGING
++ 	{ "show-paging", no_argument, NULL, 11 },
++ #endif
++@@ -146,6 +144,18 @@
++ 	  break;
++ 	case 'f':
++ 	case 4:
+++	  if (strcmp(optarg, "-") == 0)
+++	    {
+++	      if (backwards && other_pacct_file_specified)
+++	        {
+++	          printf ("%s: -f - must be specified first, or --forwards must precede the first -f\n", program_name);
+++		  exit (1);
+++	        }
+++	      backwards = 0;
+++	      optarg = "/proc/self/fd/0";
+++	    }
+++	  if (other_pacct_file_specified == 0)
+++	    pacct_init(backwards);
++ 	  add_pacct_file (optarg);
++ 	  other_pacct_file_specified = 1;
++ 	  break;
++@@ -186,6 +196,14 @@
++ 	  show_paging = 1;
++           break;
++ #endif
+++	case 12:
+++	  if (other_pacct_file_specified)
+++	    {
+++	      printf ("%s: --forwards must come before -f\n", program_name);
+++	      exit (1);
+++	    }
+++	  backwards = 0;
+++	  break;
++ 	case 'h':
++ 	case 3:
++ 	  /* This should fall through to default! */
++@@ -196,6 +214,9 @@
++ 	}
++     }
++ 
+++  if (other_pacct_file_specified == 0)
+++    pacct_init(backwards);
+++
++   /* if we get here, we expect everything else to be a username,
++      terminal name, or command name */
++ 
++@@ -275,7 +296,7 @@
++              "p"
++ #endif
++               "V] [-f file] [command] ... [user] ... [terminal] ...\n"
++-"       [--file <file>] [--strict-match] [--print-controls]\n"
+++"       [--forwards] [--file <file>] [--strict-match] [--print-controls]\n"
++ "       [--user <name>] [--tty <name>] [--command <name>] [--debug]\n"
++ "       "
++ #ifdef HAVE_PAGING
+--- acct-6.4~pre1.orig/debian/patches/03-acct-file.dpatch
++++ acct-6.4~pre1/debian/patches/03-acct-file.dpatch
+@@ -0,0 +1,67 @@
++#!/bin/sh /usr/share/dpatch/dpatch-run
++## 03-acct-file.dpatch by Daniel Baumann <daniel@debian.org>
++##
++## DP: Adjusts location of the log files (Closes: #377835).
++
++@DPATCH@
++
++diff -Naur acct-6.4-pre1.orig/configure acct-6.4-pre1/configure
++--- acct-6.4-pre1.orig/configure	2006-01-07 22:24:37.000000000 +0000
+++++ acct-6.4-pre1/configure	2006-11-04 11:42:39.000000000 +0000
++@@ -6147,7 +6147,7 @@
++ 
++ #ifndef ACCT_FILE
++ #  if defined(__FreeBSD__) || defined(__linux__)
++-#    define ACCT_FILE "/var/account/pacct"
+++#    define ACCT_FILE "/var/log/account/pacct"
++ #  else
++ #    if defined(__NetBSD__)
++ #      define ACCT_FILE "/var/account/acct"
++@@ -6167,7 +6167,7 @@
++ 
++ #ifndef SAVACCT_FILE
++ #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
++-#    define SAVACCT_FILE "/var/account/savacct"
+++#    define SAVACCT_FILE "/var/log/account/savacct"
++ #  else
++ #    if defined(sun) || defined(AMIX)
++ #      define SAVACCT_FILE "/var/adm/savacct"
++@@ -6183,7 +6183,7 @@
++ 
++ #ifndef USRACCT_FILE
++ #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
++-#    define USRACCT_FILE "/var/account/usracct"
+++#    define USRACCT_FILE "/var/log/account/usracct"
++ #  else
++ #    if defined(sun) || defined(AMIX)
++ #      define USRACCT_FILE "/var/adm/usracct"
++diff -Naur acct-6.4-pre1.orig/configure.in acct-6.4-pre1/configure.in
++--- acct-6.4-pre1.orig/configure.in	2006-01-07 21:56:46.000000000 +0000
+++++ acct-6.4-pre1/configure.in	2006-11-04 11:43:54.000000000 +0000
++@@ -214,7 +214,7 @@
++ 
++ #ifndef ACCT_FILE
++ #  if defined(__FreeBSD__) || defined(__linux__)
++-#    define ACCT_FILE "/var/account/pacct"
+++#    define ACCT_FILE "/var/log/account/pacct"
++ #  else
++ #    if defined(__NetBSD__)
++ #      define ACCT_FILE "/var/account/acct"
++@@ -234,7 +234,7 @@
++ 
++ #ifndef SAVACCT_FILE
++ #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
++-#    define SAVACCT_FILE "/var/account/savacct"
+++#    define SAVACCT_FILE "/var/log/account/savacct"
++ #  else
++ #    if defined(sun) || defined(AMIX)
++ #      define SAVACCT_FILE "/var/adm/savacct"
++@@ -250,7 +250,7 @@
++ 
++ #ifndef USRACCT_FILE
++ #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
++-#    define USRACCT_FILE "/var/account/usracct"
+++#    define USRACCT_FILE "/var/log/account/usracct"
++ #  else
++ #    if defined(sun) || defined(AMIX)
++ #      define USRACCT_FILE "/var/adm/usracct"
+--- acct-6.4~pre1.orig/debian/patches/02-manpage.dpatch
++++ acct-6.4~pre1/debian/patches/02-manpage.dpatch
+@@ -0,0 +1,31 @@
++#!/bin/sh /usr/share/dpatch/dpatch-run
++## 02-manpage.dpatch by Daniel Baumann <daniel@debian.org>
++##
++## DP: Fixes manpage error
++
++@DPATCH@
++
++diff -Naur acct-6.3.99+6.4pre1.orig/accton.8 acct-6.3.99+6.4pre1/accton.8
++--- acct-6.3.99+6.4pre1.orig/accton.8	2003-06-05 16:46:12.000000000 +0000
+++++ acct-6.3.99+6.4pre1/accton.8	2006-06-23 06:06:38.000000000 +0000
++@@ -6,6 +6,10 @@
++ .na
++ .TP
++ .B accton
+++.RI [\| OPTION \|]
+++.RB on \||\| off \||\| filename
+++.TP
+++.B accton
++ [
++ .B \-V
++ |
++@@ -16,9 +20,6 @@
++ |
++ .B \-\-help
++ ]
++-[
++-.I filename
++-]
++ .SH DESCRIPTION
++ .LP
++ .B accton
+--- acct-6.4~pre1.orig/debian/patches/01-last.dpatch
++++ acct-6.4~pre1/debian/patches/01-last.dpatch
+@@ -0,0 +1,441 @@
++#!/bin/sh /usr/share/dpatch/dpatch-run
++## 01-last.dpatch by Daniel Baumann <daniel@debian.org>
++##
++## DP: Removing last, it's in the sysvinit package instead.
++
++@DPATCH@
++
++diff -Naur acct-6.3.99+6.4pre1.orig/accounting.info acct-6.3.99+6.4pre1/accounting.info
++--- acct-6.3.99+6.4pre1.orig/accounting.info	2006-01-07 22:46:25.000000000 +0000
+++++ acct-6.3.99+6.4pre1/accounting.info	2006-05-28 03:46:26.000000000 +0000
++@@ -35,7 +35,6 @@
++ 
++ * ac::                          print statistics about connect time
++ * accton::                      turns accounting on or off
++-* last::                        list last logins of users and terms
++ * lastcomm::                    list last commands executed
++ * sa::                          print accounting statistics
++ * dump-acct::                   print accounting file in human-readable form
++@@ -88,13 +87,6 @@
++ `accton'
++      turns accounting on or off.
++ 
++-`last'
++-     lists the logins on the system, most recent first.  With `last',
++-     you can search the `wtmp' file for a particular user or terminal
++-     name (to which the user was connected).  Of special interest are
++-     two fake users, `reboot' and `shutdown', which are recorded when
++-     the system is shut down or reboots.
++-
++ `lastcomm'
++      lists the commands executed on the system, most recent first,
++      showing the run state of each command.  With `last', you can
++@@ -458,7 +450,7 @@
++ processes.
++ 
++ 
++-File: accounting.info,  Node: accton,  Next: last,  Prev: ac,  Up: Top
+++File: accounting.info,  Node: accton,  Next: lastcom,  Prev: ac,  Up: Top
++ 
++ 2 `accton'
++ **********
++@@ -485,144 +477,9 @@
++ 
++ 
++ 
++-File: accounting.info,  Node: last,  Next: lastcomm,  Prev: accton,  Up: Top
++-
++-3 `last'
++-********
++-
++-`last' looks through the `wtmp' file (which records all logins/logouts)
++-and prints information about connect times of users.  Records are
++-printed from most recent to least recent.  Records can be specified by
++-tty and username.  tty names can be abbreviated: `last 0' is equivalent
++-to `last tty0'.
++-
++-   Multiple arguments can be specified: `last root console' will print
++-all of the entries for the user `root' and all entries logged in on the
++-`console' tty.
++-
++-   The special users `reboot' and `shutdown' log in when the system
++-reboots or (surprise) shuts down.  `last reboot' will produce a record
++-of reboot times.
++-
++-   If `last' is interrupted by a quit signal, it prints out how far its
++-search in the `wtmp' file had reached and then quits:
++-     weerapan  ttyq6    132.162.32.37    Mon Feb 15 19:07 - 19:21  (00:13)
++-     weerapan  ttyq6    132.162.32.37    Mon Feb 15 19:07 - 19:21  (00:13)
++-
++-     interrupted at Mon Feb 15 19:07:52 1993
++-
++-3.1 Flags
++-=========
++-
++-This program implements the features of regular u*x `last' with a few
++-extra flags.  When `last' is invoked with no arguments, the output
++-looks like this:
++-     gr151     ttyp2    ray.cs.oberlin.e Tue Feb 16 17:40   still logged in
++-     jhoggard  ttyp2    csts.cs.oberlin. Tue Feb 16 17:39 - 17:39  (00:00)
++-     jstarr    ttyp1    UNIX5.ANDREW.CMU Tue Feb 16 17:38   still logged in
++-     jberman   ttypb    132.162.32.25    Tue Feb 16 17:34   still logged in
++-     alee      ttyp7    csts.cs.oberlin. Tue Feb 16 17:34   still logged in
++-     jbrick    ttyp2    ocvaxa.cc.oberli Tue Feb 16 17:33 - 17:36  (00:03)
++-     mbastedo  ttypc    ocvaxa.cc.oberli Tue Feb 16 17:25 - 17:26  (00:01)
++-     rgoodste  ttypb    ocvaxa.cc.oberli Tue Feb 16 17:22 - 17:26  (00:03)
++-     huttar    ttyp9    lobby.ti.com     Tue Feb 16 17:19   still logged in
++-     klutz     ttyp3    132.162.32.25    Tue Feb 16 17:14   still logged in
++-
++-`--no-truncate-ftp-entries'
++-     When printing out the information, don't chop the number part off
++-     of `ftp'XXXX entries.
++-
++-`-NUMBER'
++-`-n NUMBER'
++-`--lines NUMBER'
++-     Limit the number of lines that `last' prints.
++-
++-`-f FILENAME'
++-`--file FILENAME'
++-     Read from the file FILENAME instead of the system's `wtmp' file.
++-
++-`-y'
++-`--print-year'
++-     Print out the year when displaying dates.
++-
++-`-s'
++-`--print-seconds'
++-     Print out seconds when displaying dates and durations.
++-
++-`--complain'
++-     When the `wtmp' file has a problem (a time-warp, missing record,
++-     or whatever), print out an appropriate error.
++-
++-`-x'
++-`--more-records'
++-     Print out run level changes, shutdowns, and time changes in
++-     addition to the normal records.
++-
++-`-a'
++-`--all-records'
++-     Print out all records in the `wtmp' file.
++-
++-`-i'
++-`--ip-address'
++-     Some machines store the IP address of a connection in a utmp
++-     record.  Enabling this option makes `last' print the IP address
++-     instead of the hostname.
++-
++-`--tw-leniency VALUE'
++-     Set the time warp leniency value (in seconds).  See the `ac'
++-     chapter for information.
+++File: accounting.info,  Node: lastcomm,  Next: sa,  Prev: accton,  Up: Top
++ 
++-`--tw-suspicious VALUE'
++-     Set the time warp suspicious value (in seconds).  See the `ac'
++-     chapter for information.
++-
++-`-w'
++-`--wide'
++-     By default, `last' tries to print each entry within in 80 columns.
++-     Use this option to instruct `last' to print out the fields in the
++-     `wtmp' file with full field widths.
++-
++-`--debug'
++-     Print verbose internal information.
++-
++-`-V'
++-`--version'
++-     Print `last''s version number.
++-
++-`-h'
++-`--help'
++-     Print `last''s usage string and default locations of system files
++-     to standard output.
++-
++-3.2 Problems
++-============
++-
++-The Clock Change Problem
++-........................
++-
++-Of the `last's I've tried, all of them have had problems parsing a
++-system clock change.  Instead of modifying the entries that have been
++-read, they just ignore the change and give you incorrect values.  GNU
++-`last' knows about clock changes and prints the correct times.
++-
++-*TANGIBLE RESULT:* if you `diff' the output of your `last' and GNU
++-`last', entries after (before, rather) a clock change will be off by
++-the amount of the clock change.
++-
++-The Ftp Problem
++-...............
++-
++-Most `last's that I've examined have the same problem here as `ac'
++-does--they log everyone out as soon as they see an ftp entry.
++-
++-*TANGIBLE RESULT:* GNU `last' will reflect the correct time spent in an
++-ftp session, so the totals that it gives will most likely be greater
++-than those given by the system `last'.
++-
++-
++-File: accounting.info,  Node: lastcomm,  Next: sa,  Prev: last,  Up: Top
++-
++-4 `lastcomm'
+++3 `lastcomm'
++ ************
++ 
++ `lastcomm' prints out information about previously executed commands.
++@@ -663,7 +520,7 @@
++ 
++    * time the process exited
++ 
++-4.1 Flags
+++3.1 Flags
++ =========
++ 
++ This program implements the features of regular u*x `lastcomm' with a
++@@ -719,7 +576,7 @@
++ 
++ File: accounting.info,  Node: sa,  Next: dump-acct,  Prev: lastcomm,  Up: Top
++ 
++-5 `sa'
+++4 `sa'
++ ******
++ 
++ `sa' summarizes information about previously executed commands as
++@@ -777,7 +634,7 @@
++    An asterisk will appear after the name of commands that forked but
++ didn't call `exec'.
++ 
++-5.1 Flags
+++4.1 Flags
++ =========
++ 
++ The availability of these program options depends on your operating
++@@ -918,7 +775,7 @@
++    *Note*: if more than one sorting option is specified, the list will
++ be sorted by the one specified last on the command line.
++ 
++-5.2 Problems
+++4.2 Problems
++ ============
++ 
++ I haven't been able to test this on many different machines because the
++@@ -930,7 +787,7 @@
++ commands when combined with the `--user-summary' or `--print-users'
++ flags.  GNU `sa' pays attention to these flags if they are applicable.
++ 
++-5.2.1 mips sa
+++4.2.1 mips sa
++ -------------
++ 
++ The average memory use is stored as a short rather than a double, so we
++@@ -940,7 +797,7 @@
++ 
++ File: accounting.info,  Node: dump-acct,  Prev: sa,  Up: Top
++ 
++-6 `dump-acct'
+++5 `dump-acct'
++ *************
++ 
++ `dump-acct' dumps some of the contents of one or more `acct' files in
++@@ -989,7 +846,7 @@
++ all of the above columns will actually appear, depending on what
++ information your operating system provides in it's `struct acct'.
++ 
++-6.1 Flags
+++5.1 Flags
++ =========
++ 
++ `--ahz HZ'
++@@ -1041,7 +898,6 @@
++ Node: Preface1764
++ Node: ac10432
++ Node: accton18745
++-Node: last19250
++ Node: lastcomm23726
++ Node: sa26898
++ Node: dump-acct33192
++diff -Naur acct-6.3.99+6.4pre1.orig/accounting.texi acct-6.3.99+6.4pre1/accounting.texi
++--- acct-6.3.99+6.4pre1.orig/accounting.texi	2006-01-07 22:46:25.000000000 +0000
+++++ acct-6.3.99+6.4pre1/accounting.texi	2006-05-28 03:59:51.000000000 +0000
++@@ -75,7 +75,6 @@
++ 
++ * ac::                          print statistics about connect time
++ * accton::                      turns accounting on or off
++-* last::                        list last logins of users and terms
++ * lastcomm::                    list last commands executed
++ * sa::                          print accounting statistics
++ * dump-acct::                   print accounting file in human-readable form
++@@ -130,13 +129,6 @@
++ @item accton
++ turns accounting on or off.
++ 
++-@item last
++-lists the logins on the system, most recent first.  With @code{last},
++-you can search the @code{wtmp} file for a particular user or
++-terminal name (to which the user was connected).  Of special interest
++-are two fake users, @samp{reboot} and @samp{shutdown}, which are
++-recorded when the system is shut down or reboots.
++-
++ @item lastcomm
++ lists the commands executed on the system, most recent first, showing
++ the run state of each command.  With @code{last}, you can search the
++@@ -515,7 +507,7 @@
++ anything but user processes.
++ 
++ @c ----------------------------------------------------------------------
++-@node accton, last, ac, Top
+++@node accton, lastcomm, ac, Top
++ @chapter @code{accton}
++ 
++ @code{accton} turns process accounting on or off.  To save process
++@@ -542,146 +534,7 @@
++ @end table
++ 
++ @c ----------------------------------------------------------------------
++-@node last, lastcomm, accton, Top
++-@chapter @code{last}
++-
++-@code{last} looks through the @code{wtmp} file (which records
++-all logins/logouts) and prints information about connect times of users.
++-Records are printed from most recent to least recent.  Records can be
++-specified by tty and username.  tty names can be abbreviated: @samp{last
++-0} is equivalent to @samp{last tty0}.
++-
++-Multiple arguments can be specified: @samp{last root console} will print
++-all of the entries for the user @code{root} and all entries logged in on
++-the @code{console} tty.
++-
++-The special users @code{reboot} and @code{shutdown} log in when the
++-system reboots or (surprise) shuts down.  @samp{last reboot} will
++-produce a record of reboot times.
++-
++-If @code{last} is interrupted by a quit signal, it prints out how far
++-its search in the @code{wtmp} file had reached and then
++-quits:
++-@example
++-weerapan  ttyq6    132.162.32.37    Mon Feb 15 19:07 - 19:21  (00:13)
++-weerapan  ttyq6    132.162.32.37    Mon Feb 15 19:07 - 19:21  (00:13)
++-
++-interrupted at Mon Feb 15 19:07:52 1993
++-@end example
++-
++-@section Flags
++-
++-This program implements the features of regular u*x @code{last} with a few
++-extra flags.  When @code{last} is invoked with no arguments, the output
++-looks like this:
++-@example
++-gr151     ttyp2    ray.cs.oberlin.e Tue Feb 16 17:40   still logged in
++-jhoggard  ttyp2    csts.cs.oberlin. Tue Feb 16 17:39 - 17:39  (00:00)
++-jstarr    ttyp1    UNIX5.ANDREW.CMU Tue Feb 16 17:38   still logged in
++-jberman   ttypb    132.162.32.25    Tue Feb 16 17:34   still logged in
++-alee      ttyp7    csts.cs.oberlin. Tue Feb 16 17:34   still logged in
++-jbrick    ttyp2    ocvaxa.cc.oberli Tue Feb 16 17:33 - 17:36  (00:03)
++-mbastedo  ttypc    ocvaxa.cc.oberli Tue Feb 16 17:25 - 17:26  (00:01)
++-rgoodste  ttypb    ocvaxa.cc.oberli Tue Feb 16 17:22 - 17:26  (00:03)
++-huttar    ttyp9    lobby.ti.com     Tue Feb 16 17:19   still logged in
++-klutz     ttyp3    132.162.32.25    Tue Feb 16 17:14   still logged in
++-@end example
++-
++-@table @code
++-@item --no-truncate-ftp-entries
++-When printing out the information, don't chop the number part off of
++-@code{ftp}@var{xxxx} entries.
++-
++-@item -@var{number}
++-@itemx -n @var{number}
++-@itemx --lines @var{number}
++-Limit the number of lines that @code{last} prints.
++-
++-@item -f @var{filename}
++-@itemx --file @var{filename}
++-Read from the file @var{filename} instead of the system's
++-@code{wtmp} file.
++-
++-@item -y
++-@itemx --print-year
++-Print out the year when displaying dates.
++-
++-@item -s
++-@itemx --print-seconds
++-Print out seconds when displaying dates and durations.
++-
++-@item --complain
++-When the @code{wtmp} file has a problem (a time-warp, missing
++-record, or whatever), print out an appropriate error.
++-
++-@item -x
++-@itemx --more-records
++-Print out run level changes, shutdowns, and time changes in addition to
++-the normal records.
++-
++-@item -a
++-@itemx --all-records
++-Print out all records in the @code{wtmp} file.
++-
++-@item -i
++-@itemx --ip-address
++-Some machines store the IP address of a connection in a utmp record.
++-Enabling this option makes @code{last} print the IP address instead of
++-the hostname.
++-
++-@item --tw-leniency @var{value}
++-Set the time warp leniency value (in seconds).  See the @code{ac}
++-chapter for information.
++-
++-@item --tw-suspicious @var{value}
++-Set the time warp suspicious value (in seconds).  See the @code{ac}
++-chapter for information.
++-
++-@item -w
++-@itemx --wide
++-By default, @code{last} tries to print each entry within in 80 columns.
++-Use this option to instruct @code{last} to print out the fields in the
++-@code{wtmp} file with full field widths.
++-
++-@item --debug
++-Print verbose internal information.
++-
++-@item -V
++-@itemx --version
++-Print @code{last}'s version number.
++-
++-@item -h
++-@itemx --help
++-Print @code{last}'s usage string and default locations of system files
++-to standard output.
++-@end table
++-
++-@section Problems
++-
++-@unnumberedsubsubsec The Clock Change Problem
++-
++-Of the @code{last}s I've tried, all of them have had problems parsing a
++-system clock change.  Instead of modifying the entries that have been
++-read, they just ignore the change and give you incorrect values.  GNU
++-@code{last} knows about clock changes and prints the correct times.
++-
++-@noindent
++-@strong{TANGIBLE RESULT:} if you @code{diff} the output of your
++-@code{last} and GNU @code{last}, entries after (before, rather) a clock
++-change will be off by the amount of the clock change.
++-
++-@unnumberedsubsubsec The Ftp Problem
++-
++-Most @code{last}s that I've examined have the same problem here as
++-@code{ac} does---they log everyone out as soon as they see an ftp entry.
++-
++-@noindent
++-@strong{TANGIBLE RESULT:} GNU @code{last} will reflect the correct time
++-spent in an ftp session, so the totals that it gives will most likely be
++-greater than those given by the system @code{last}.
++-
++-@c ----------------------------------------------------------------------
++-@node lastcomm, sa, last, Top
+++@node lastcomm, sa, accton, Top
++ @chapter @code{lastcomm}
++ 
++ @code{lastcomm} prints out information about previously executed
+--- acct-6.4~pre1.orig/debian/patches/00list
++++ acct-6.4~pre1/debian/patches/00list
+@@ -0,0 +1,4 @@
++01-last.dpatch
++02-manpage.dpatch
++03-acct-file.dpatch
++04-lastcomm-forwards.dpatch
+--- acct-6.4~pre1.orig/debian/compat
++++ acct-6.4~pre1/debian/compat
+@@ -0,0 +1 @@
++5
+--- acct-6.4~pre1.orig/debian/manpage/dump-acct.8
++++ acct-6.4~pre1/debian/manpage/dump-acct.8
+@@ -0,0 +1,73 @@
++.TH DUMP-ACCT 8 "2006-04-22" "6.4pre1" "GNU Accounting Utilities"
++
++.SH NAME
++dump-acct \- print an acct file in human-readable format.
++
++.SH SYNOPSIS
++.B dump-acct
++.RB [\| \-r \||\| \-\-reverse \|]
++.RB [\| \-R \||\| \-\-raw \|]
++.RB [\| \-n \||\| \-\-num
++.IR recs \|]
++.RB [\| \-h \||\| \-\-help \|]
++.RB [\|
++.IR files \|]
++
++.SH DESCRIPTION
++.B dump-acct
++.I filename
++prints a list of all executed processes. This list is written by the kernel
++which must be compiled with BSD process accounting enabled (Debian kernel image
++have it already enabled). It must be started with
++.BR accton (5).
++Note that on Debian systems, this is ensured via the init script
++.IR /etc/init.d/acct .
++.LP
++All fields are separated by vertical line. Fields are:
++.IR command ,
++.IR version ,
++.IR "user time" ,
++.IR "system time" ,
++.IR "effective time" ,
++.IR uid ,
++.IR gid ,
++.IR memory ,
++.IR io ,
++.IR time .
++User, system and effective times are ticks per second. One tick is usually 1/50
++of a second. The
++.I time
++field shows the start time of the process.
++
++.SH OPTIONS
++.TP
++.B \-h, \-\-help
++Prints the usage string and default locations of system files to standard output
++and exits.
++.TP
++.B \-n, \-\-num recs
++Number of lines to print.
++.TP
++.B \-r, \-\-reverse
++Start printing from last records.
++.TP
++.B \-R, \-\-raw
++Print raw records, not human-readable.
++
++.SH FILES
++.TP
++.I acct
++The system wide process accounting file. See
++.BR acct (5)
++for further details.
++
++.SH SEE ALSO
++.BR acct (5),
++.BR ac (8).
++
++.SH AUTHOR
++The GNU accounting utilities were written by Noel Cragg <noel@gnu.ai.mit.edu>.
++.PP
++This manual page was written by Ognyan Kulev <ogi@fmi.uni-sofia.bg> and updated
++by Daniel Baumann <daniel@debian.org> for the Debian project (but may be used by
++others).
+--- acct-6.4~pre1.orig/debian/manpage/dump-utmp.8
++++ acct-6.4~pre1/debian/manpage/dump-utmp.8
+@@ -0,0 +1,65 @@
++.TH DUMP-UTMP 8 "2006-04-22" "6.4pre1" "GNU Accounting Utilities"
++
++.SH NAME
++dump-utmp \- print an utmp file in human-readable format.
++
++.SH SYNOPSIS
++.B dump-acct
++.RB [\| \-r \||\| \-\-reverse \|]
++.RB [\| \-R \||\| \-\-raw \|]
++.RB [\| \-n \||\| \-\-num
++.IR recs \|]
++.RB [\| \-h \||\| \-\-help \|]
++.RB [\|
++.IR files \|]
++
++.SH DESCRIPTION
++.B dump-acct
++.I filename
++prints a list of all logins. This list is usually written in
++.IR /var/log/wtmp .
++.LP
++All fields are separated by vertical line. Fields are:
++.IR "user name" ,
++.IR tty ,
++.IR type ,
++.IR id ,
++.IR pid ,
++.IR hostaddr ,
++.IR host ,
++.IR time .
++
++.SH OPTIONS
++.TP
++.B \-h, \-\-help
++Prints the usage string and default locations of system files to standard output
++and exits.
++.TP
++.B \-n, \-\-num recs
++Number of lines to print.
++.TP
++.B \-r, \-\-reverse
++Start printing from last records.
++.TP
++.B \-R, \-\-raw
++Print raw records, not human-readable.
++
++.SH FILES
++.TP
++.I wtmp
++The system wide login record file. See
++.BR wtmp (5)
++for further details.
++
++.SH SEE ALSO
++.BR login (1),
++.BR wtmp (5),
++.BR init (8),
++.BR sa (8).
++
++.SH AUTHOR
++The GNU accounting utilities were written by Noel Cragg <noel@gnu.ai.mit.edu>.
++.PP
++This manual page was written by Ognyan Kulev <ogi@fmi.uni-sofia.bg> and updated
++by Daniel Baumann <daniel@debian.org> for the Debian project (but may be used by
++others).
+--- acct-6.4~pre1.orig/debian/docs
++++ acct-6.4~pre1/debian/docs
+@@ -0,0 +1,4 @@
++NEWS
++README
++TODO
++accounting.html
+--- acct-6.4~pre1.orig/debian/control
++++ acct-6.4~pre1/debian/control
+@@ -0,0 +1,20 @@
++Source: acct
++Section: admin
++Priority: optional
++Maintainer: Daniel Baumann <daniel@debian.org>
++Build-Depends: debhelper (>= 5), dpatch, autotools-dev, texi2html
++Standards-Version: 3.7.3
++Homepage: http://www.gnu.org/software/acct/
++
++Package: acct
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Description: The GNU Accounting utilities for process and login accounting
++ GNU Accounting Utilities is a set of utilities which reports and summarizes
++ data about user connect times and process execution statistics.
++ .
++ "Login accounting" provides summaries of system resource usage based on connect
++ time, and "process accounting" provides summaries based on the commands
++ executed on the system.
++ .
++ The 'last' command is provided by the sysvinit package and not included here.
+--- acct-6.4~pre1.orig/debian/cron.daily
++++ acct-6.4~pre1/debian/cron.daily
+@@ -0,0 +1,21 @@
++#!/bin/sh
++
++test -x /usr/sbin/accton || exit 0
++
++# Source defaults
++if [ -f /etc/default/acct ]
++then
++	. /etc/default/acct
++else
++	ACCT_LOGGING="30"
++fi
++
++# Save log file
++cd /var/log/account
++savelog -g adm -m 0640 -u root -c "${ACCT_LOGGING}" /var/log/account/pacct > /dev/null
++
++# Restart acct
++/etc/init.d/acct restart > /dev/null
++
++# This is needed because accton.c returns errno
++exit 0
+--- acct-6.4~pre1.orig/config.sub
++++ acct-6.4~pre1/config.sub
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++#   Free Software Foundation, Inc.
+ 
+-timestamp='2005-07-08'
++timestamp='2008-01-16'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -71,8 +72,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -119,8 +120,9 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -171,6 +173,10 @@
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
++	-sco6)
++		os=-sco5v6
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-sco5)
+ 		os=-sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -187,6 +193,10 @@
+ 		# Don't forget version if it is 3.2v4 or newer.
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -231,15 +241,16 @@
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+-	| fr30 | frv \
++	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
+-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| m32c | m32r | m32rle | m68000 | m68k | m88k \
++	| maxq | mb | microblaze | mcore | mep \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+@@ -257,28 +268,27 @@
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
+-	| ms1 \
++	| mt \
+ 	| msp430 \
++	| nios | nios2 \
+ 	| ns16k | ns32k \
+ 	| or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| score \
++	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+-	| sparcv8 | sparcv9 | sparcv9b \
+-	| strongarm \
++	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++	| spu | strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| v850 | v850e \
+ 	| we32k \
+-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ 	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m32c)
+-		basic_machine=$basic_machine-unknown
+-		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+@@ -286,6 +296,9 @@
+ 		;;
+ 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
++	ms1)
++		basic_machine=mt-unknown
++		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+@@ -305,18 +318,18 @@
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+-	| avr-* \
++	| avr-* | avr32-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
+-	| m32r-* | m32rle-* \
++	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | maxq-* | mcore-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+@@ -336,30 +349,33 @@
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| mmix-* \
+-	| ms1-* \
++	| mt-* \
+ 	| msp430-* \
++	| nios-* | nios2-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tron-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+-	| xstormy16-* | xtensa-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+ 	| z8k-*)
+ 		;;
+-	m32c-*)
++	# Recognize the basic CPU types without company name, with glob match.
++	xtensa*)
++		basic_machine=$basic_machine-unknown
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -431,6 +447,14 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	blackfin)
++		basic_machine=bfin-unknown
++		os=-linux
++		;;
++	blackfin-*)
++		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+@@ -463,8 +487,8 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16c)
+-		basic_machine=cr16c-unknown
++	cr16)
++		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+ 	crds | unos)
+@@ -656,6 +680,14 @@
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
++	m68knommu)
++		basic_machine=m68k-unknown
++		os=-linux
++		;;
++	m68knommu-*)
++		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -671,6 +703,10 @@
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
++	mingw32ce)
++		basic_machine=arm-unknown
++		os=-mingw32ce
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -696,6 +732,9 @@
+ 		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
++	ms1-*)
++		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+@@ -794,6 +833,14 @@
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
++	parisc)
++		basic_machine=hppa-unknown
++		os=-linux
++		;;
++	parisc-*)
++		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -803,6 +850,12 @@
+ 	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+@@ -859,6 +912,10 @@
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -885,6 +942,10 @@
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
++	sde)
++		basic_machine=mipsisa32-sde
++		os=-elf
++		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+@@ -896,6 +957,9 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
++	sh5el)
++		basic_machine=sh5le-unknown
++		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+@@ -985,6 +1049,10 @@
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
++	tile*)
++		basic_machine=tile-unknown
++		os=-linux-gnu
++		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+@@ -1101,7 +1169,7 @@
+ 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sparc | sparcv8 | sparcv9 | sparcv9b)
++	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+@@ -1174,21 +1242,23 @@
+ 	      | -aos* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1215,6 +1285,9 @@
+ 	-linux-dietlibc)
+ 		os=-linux-dietlibc
+ 		;;
++	-linux*)
++		os=`echo $os | sed -e 's|linux|linux-gnu|'`
++		;;
+ 	-sunos5*)
+ 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ 		;;
+@@ -1337,6 +1410,12 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
++        score-*)
++		os=-elf
++		;;
++        spu-*)
++		os=-elf
++		;;
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
+@@ -1346,9 +1425,9 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-    c4x-* | tic4x-*)
+-        os=-coff
+-        ;;
++        c4x-* | tic4x-*)
++        	os=-coff
++		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+@@ -1374,6 +1453,9 @@
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
++        mep-*)
++		os=-elf
++		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+--- acct-6.4~pre1.orig/config.guess
++++ acct-6.4~pre1/config.guess
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++#   Free Software Foundation, Inc.
+ 
+-timestamp='2005-07-08'
++timestamp='2008-01-23'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -55,8 +56,8 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -106,7 +107,7 @@
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+@@ -138,16 +139,6 @@
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-case "${UNAME_MACHINE}" in
+-    i?86)
+-	test -z "$VENDOR" && VENDOR=pc
+-	;;
+-    *)
+-	test -z "$VENDOR" && VENDOR=unknown
+-	;;
+-esac
+-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+-
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -170,6 +161,7 @@
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
++	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -216,8 +208,11 @@
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ 	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ 	exit ;;
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+@@ -335,7 +330,7 @@
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+-    i86pc:SunOS:5.*:*)
++    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+@@ -537,7 +532,7 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[45])
++    *:AIX:*:[456])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -774,12 +769,19 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:FreeBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
+ 	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
+-    i*:MINGW*:*)
++    *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
+     i*:windows32*:*)
+@@ -789,9 +791,18 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    x86:Interix*:[34]*)
+-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+-	exit ;;
++    *:Interix*:[3456]*)
++    	case ${UNAME_MACHINE} in
++	    x86)
++		echo i586-pc-interix${UNAME_RELEASE}
++		exit ;;
++	    EM64T | authenticamd)
++		echo x86_64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	    IA64)
++		echo ia64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
+@@ -804,7 +815,7 @@
+     i*:UWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-uwin
+ 	exit ;;
+-    amd64:CYGWIN*:*:*)
++    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+ 	exit ;;
+     p*:CYGWIN*:*)
+@@ -825,25 +836,35 @@
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     arm*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	eval $set_cc_for_build
++	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++	    | grep -q __ARM_EABI__
++	then
++	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	else
++	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	fi
++	exit ;;
++    avr32*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux
++	echo cris-axis-linux-gnu
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux
++	echo crisv32-axis-linux-gnu
+ 	exit ;;
+     frv:Linux:*:*)
+-    	echo frv-${VENDOR}-linux
++    	echo frv-unknown-linux-gnu
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     mips:Linux:*:*)
+ 	eval $set_cc_for_build
+@@ -861,8 +882,12 @@
+ 	#endif
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+@@ -880,14 +905,21 @@
+ 	#endif
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
++    or32:Linux:*:*)
++	echo or32-unknown-linux-gnu
++	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-${VENDOR}-linux
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-${VENDOR}-linux
++	echo powerpc64-unknown-linux-gnu
+ 	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -901,33 +933,39 @@
+         esac
+ 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+-	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
+-	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
+-	  *)    echo hppa-${VENDOR}-linux ;;
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-${VENDOR}-linux
++	echo hppa64-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit ;;
+     sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-${VENDOR}-linux
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-${VENDOR}-linux
++	echo x86_64-unknown-linux-gnu
++	exit ;;
++    xtensa*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+@@ -942,18 +980,18 @@
+ 				    p'`
+         case "$ld_supported_targets" in
+ 	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+ 	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ 		exit ;;
+ 	  coff-i386)
+-		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ 		exit ;;
+ 	  "")
+-		# Either a pre-BFD a.out linker (linuxoldld) or
++		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+ 		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ 		exit ;;
+ 	esac
+ 	# Determine whether the default compiler is a.out or elf
+@@ -971,7 +1009,7 @@
+ 	LIBC=gnulibc1
+ 	# endif
+ 	#else
+-	#ifdef __INTEL_COMPILER
++	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ 	LIBC=gnu
+ 	#else
+ 	LIBC=gnuaout
+@@ -981,9 +1019,13 @@
+ 	LIBC=dietlibc
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^LIBC/{
++		s: ::g
++		p
++	    }'`"
+ 	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/'
++		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 		exit
+ 	}
+ 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+@@ -1183,6 +1225,15 @@
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit ;;
++    SX-7:SUPER-UX:*:*)
++	echo sx7-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8:SUPER-UX:*:*)
++	echo sx8-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8R:SUPER-UX:*:*)
++	echo sx8r-nec-superux${UNAME_RELEASE}
++	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+@@ -1192,7 +1243,6 @@
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
+-	    *86) UNAME_PROCESSOR=i686 ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1271,6 +1321,9 @@
+     i*86:skyos:*:*)
+ 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ 	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1431,9 +1484,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+ 
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ 
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
diff --git a/source/ap/acct/acct.SlackBuild b/source/ap/acct/acct.SlackBuild
new file mode 100755
index 000000000..510b22a2d
--- /dev/null
+++ b/source/ap/acct/acct.SlackBuild
@@ -0,0 +1,137 @@
+#!/bin/sh
+# Copyright 2006, 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.
+
+
+PKGNAM=acct
+PKGVER=6.4-pre1
+VERSION=6.4pre1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-acct
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-$PKGVER
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-$PKGVER || exit 1
+zcat $CWD/acct-6.4pre1-6.diff.gz | patch -p1 || exit 1
+cat debian/patches/* | patch -p1
+zcat $CWD/acct.logdir.fhs.diff.gz | patch -p1 || 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= \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --enable-linux-multiformat \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# The sysvinit package already installs a "last" program, so
+# rename this one:
+mv $PKG/bin/last $PKG/bin/last-acct
+
+# I know this man page still says "last" in it, but presumably
+# anyone who uses "man last-acct" knows enough that this will
+# not spook them:
+mv $PKG/usr/man/man1/last.1 $PKG//usr/man/man1/last-acct.1
+
+# Put some binaries in the location where they have traditionally
+# been installed:
+mkdir -p $PKG/usr/bin
+mv $PKG/bin/{ac,last-acct,lastcomm} $PKG/usr/bin
+mv $PKG/sbin/sa $PKG/usr/bin
+mkdir -p $PKG/usr/sbin
+mv $PKG/sbin/dump* $PKG/usr/sbin
+
+# A couple of manpages are not automatically installed:
+cp -a debian/manpage/*.8 $PKG/usr/man/man8
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/acct-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/acct/acct.logdir.fhs.diff b/source/ap/acct/acct.logdir.fhs.diff
new file mode 100644
index 000000000..9fff1bac1
--- /dev/null
+++ b/source/ap/acct/acct.logdir.fhs.diff
@@ -0,0 +1,29 @@
+--- ./configure.in.orig	2008-11-12 12:09:44.000000000 -0600
++++ ./configure.in	2008-11-12 12:51:44.000000000 -0600
+@@ -214,7 +214,7 @@
+ 
+ #ifndef ACCT_FILE
+ #  if defined(__FreeBSD__) || defined(__linux__)
+-#    define ACCT_FILE "/var/log/account/pacct"
++#    define ACCT_FILE "/var/log/pacct"
+ #  else
+ #    if defined(__NetBSD__)
+ #      define ACCT_FILE "/var/account/acct"
+@@ -234,7 +234,7 @@
+ 
+ #ifndef SAVACCT_FILE
+ #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
+-#    define SAVACCT_FILE "/var/log/account/savacct"
++#    define SAVACCT_FILE "/var/log/savacct"
+ #  else
+ #    if defined(sun) || defined(AMIX)
+ #      define SAVACCT_FILE "/var/adm/savacct"
+@@ -250,7 +250,7 @@
+ 
+ #ifndef USRACCT_FILE
+ #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
+-#    define USRACCT_FILE "/var/log/account/usracct"
++#    define USRACCT_FILE "/var/log/usracct"
+ #  else
+ #    if defined(sun) || defined(AMIX)
+ #      define USRACCT_FILE "/var/adm/usracct"
diff --git a/source/ap/acct/slack-desc b/source/ap/acct/slack-desc
new file mode 100644
index 000000000..6cffcfcb4
--- /dev/null
+++ b/source/ap/acct/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------------------------------------------------------|
+acct: acct (process accounting utilities)
+acct:
+acct: This is a set of utilities which reports and summarizes data about
+acct: user connect times and process execution statistics.  To activate
+acct: process accounting, create the log file (touch /var/log/pacct), and
+acct: then use the accton command to start it (accton /var/log/pacct).
+acct: Be aware that the log file can grow to be quite large.
+acct:
+acct: The GNU process accounting utilities were written by Noel Cragg and
+acct: the software is currently maintained by Ciaran O'Riordan,
+acct: Manuel A. Fernandez Montecelo, and Tim Schmielau.
diff --git a/source/ap/alsa-utils/alsa-utils.SlackBuild b/source/ap/alsa-utils/alsa-utils.SlackBuild
new file mode 100755
index 000000000..c918ba526
--- /dev/null
+++ b/source/ap/alsa-utils/alsa-utils.SlackBuild
@@ -0,0 +1,106 @@
+#!/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=1.0.18
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+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"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-alsa-utils
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf alsa-utils-$VERSION
+tar xvf $CWD/alsa-utils-$VERSION.tar.bz2 || exit 1
+cd alsa-utils-$VERSION || exit 1
+zcat $CWD/alsa-utils.alsaconf.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit
+
+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="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG
+mkdir -p $PKG/etc/rc.d
+zcat $CWD/rc.alsa.gz > $PKG/etc/rc.d/rc.alsa
+chmod 755 $PKG/etc/rc.d/rc.alsa
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# 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/usr/doc/alsa-utils-$VERSION
+cp -a \
+  COPYING ChangeLog INSTALL TODO \
+  seq/aconnect/README.aconnect \
+  seq/aseqnet/README.aseqnet \
+  $PKG/usr/doc/alsa-utils-$VERSION
+cp -a alsamixer/README $PKG/usr/doc/alsa-utils-$VERSION/README.alsamixer
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/alsa-utils-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/alsa-utils/alsa-utils.alsaconf.diff b/source/ap/alsa-utils/alsa-utils.alsaconf.diff
new file mode 100644
index 000000000..c20bf72e7
--- /dev/null
+++ b/source/ap/alsa-utils/alsa-utils.alsaconf.diff
@@ -0,0 +1,54 @@
+--- ./alsaconf/alsaconf.in.orig	2007-05-31 03:07:21.000000000 -0500
++++ ./alsaconf/alsaconf.in	2007-06-05 19:01:03.000000000 -0500
+@@ -50,7 +50,9 @@
+ }
+ 
+ # Check for GNU/Linux distributions
+-if [ -f /etc/SuSE-release ]; then
++if [ -f /etc/slackware-version ]; then
++  distribution="slackware"
++elif [ -f /etc/SuSE-release ]; then
+   distribution="suse"
+   suse_version=$(grep 'VERSION = ' /etc/SuSE-release | sed -e s/'VERSION = '//)
+ elif [ -f /etc/UnitedLinux-release ]; then
+@@ -490,6 +492,8 @@
+ 
+ if [ "$distribution" = "debian" ]; then
+     rcalsasound=/etc/init.d/alsa
++elif [ -x /etc/rc.d/rc.alsa ]; then
++    rcalsasound=/etc/rc.d/rc.alsa
+ elif [ -x /etc/init.d/alsasound ]; then
+     rcalsasound=/etc/init.d/alsasound
+ elif [ -x /usr/sbin/rcalsasound ]; then
+--- ./alsaconf/alsaconf.8.orig	2007-05-31 03:07:21.000000000 -0500
++++ ./alsaconf/alsaconf.8	2007-06-05 19:01:03.000000000 -0500
+@@ -16,8 +16,6 @@
+ This manual page documents briefly the
+ .B alsaconf
+ command.
+-This manual page was written for the Debian distribution because the
+-original program does not have a manual page.
+ .PP
+ \fBAlsaconf\fP is a simple shell script which tries to detect the sound cards
+ on your system and writes a suitable configuration file for ALSA. It will try
+@@ -74,13 +72,6 @@
+ Set the uid for the ALSA devices (default = 0).
+ This option is obsolete in the recent ALSA version.
+ 
+-.SH DEBIAN SPECIFIC
+-In Debian, the default gid of the device files is 29 (corresponding to the
+-audio group) and the default device mode is 0660.
+-
+-For the ALSA base package, see also
+-.I /usr/share/doc/alsa\-base/
+-
+ .SH SEE ALSO
+ \fB
+ alsamixer(1),
+@@ -98,5 +89,4 @@
+ Bernd Kaindl <bk@suse.de> and
+ Jan Ondrej (SAL) <ondrejj@salstar.sk>
+ 
+-This manual page was written by Jordi Mallach <jordi@debian.org>,
+-for the Debian system (but may be used by others).
++This manual page was written by Jordi Mallach <jordi@debian.org>.
diff --git a/source/ap/alsa-utils/rc.alsa b/source/ap/alsa-utils/rc.alsa
new file mode 100644
index 000000000..9e3cae304
--- /dev/null
+++ b/source/ap/alsa-utils/rc.alsa
@@ -0,0 +1,93 @@
+#!/bin/sh
+# Load the mixer settings and OSS compatibility for ALSA.
+# (the Advanced Linux Sound Architecture)
+
+# A function to load the ALSA mixer settings:
+load_alsa_mixer() {
+  if [ -r /etc/asound.state ]; then
+    echo "Loading ALSA mixer settings:  /usr/sbin/alsactl restore"
+    /usr/sbin/alsactl restore
+  else
+    # It's possible a user might not want to set a default sound state.
+    # In that case, do this:  touch /etc/no.asound.state
+    if [ ! -r /etc/no.asound.state ]; then
+      echo "Setting default ALSA mixer settings."
+      # set default mixer volumes for ALSA
+      # Taken from the alsaconfig script.
+      amixer -s -q <<EOF
+set Master 75% unmute
+set Master -12dB
+set 'Master Mono' 75% unmute
+set 'Master Mono' -12dB
+set Front 75% unmute
+set Front -12dB
+set PCM 90% unmute
+set PCM 0dB
+mixer Synth 90% unmute
+mixer Synth 0dB
+mixer CD 90% unmute
+mixer CD 0dB
+# mute mic
+set Mic 0% mute
+# ESS 1969 chipset has 2 PCM channels
+set PCM,1 90% unmute
+set PCM,1 0dB
+# Trident/YMFPCI/emu10k1
+set Wave 100% unmute
+set Music 100% unmute
+set AC97 100% unmute
+# CS4237B chipset:
+set 'Master Digital' 75% unmute
+# Envy24 chips with analog outs
+set DAC 90% unmute
+set DAC -12dB
+set DAC,0 90% unmute
+set DAC,0 -12dB
+set DAC,1 90% unmute
+set DAC,1 -12dB
+# some notebooks use headphone instead of master
+set Headphone 75% unmute
+set Headphone -12dB
+set Playback 100% unmute
+# turn off digital switches
+set "SB Live Analog/Digital Output Jack" off
+set "Audigy Analog/Digital Output Jack" off
+EOF
+      echo "Storing default ALSA mixer settings:  /usr/sbin/alsactl store"
+      /usr/sbin/alsactl store
+    fi
+  fi
+}
+
+# A function to load the ALSA OSS compat modules:
+load_alsa_oss_modules() {
+  if ! cat /proc/modules | tr _ - | grep -wq snd-pcm-oss ; then
+    echo "Loading OSS compatibility modules for ALSA."
+    modprobe snd-pcm-oss
+    modprobe snd-seq-oss
+    modprobe snd-mixer-oss
+  fi
+}
+
+# If hotplug or something else has loaded the ALSA modules, then
+# simply load the mixer settings and make sure the OSS compat
+# modules are loaded:
+if [ -d /proc/asound ]; then
+  load_alsa_oss_modules
+  load_alsa_mixer
+else
+  # If there are ALSA modules defined in /etc/modprobe.conf, but
+  # ALSA is not yet loaded, then load the modules now:
+  DRIVERS=$(modprobe -c | grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | tr -s "[[:blank:]]" " " | cut -d " " -f 3)
+  if [ ! "$DRIVERS" = "" ]; then
+    echo "Loading ALSA kernel modules."
+    for module in $DRIVERS; do
+      modprobe $module
+    done
+  fi
+  # If ALSA is now up, then load the mixer settings and OSS modules:
+  if [ -d /proc/asound ]; then
+    load_alsa_oss_modules
+    load_alsa_mixer
+  fi
+fi
diff --git a/source/ap/alsa-utils/slack-desc b/source/ap/alsa-utils/slack-desc
new file mode 100644
index 000000000..06ca73c09
--- /dev/null
+++ b/source/ap/alsa-utils/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------------------------------------------------------|
+alsa-utils: alsa-utils (Advanced Linux Sound Architecture utilities) 
+alsa-utils:
+alsa-utils: The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
+alsa-utils: functionality to the Linux operating system.  This package contains
+alsa-utils: command line audio utilities for use with ALSA:
+alsa-utils:   alsactl        (manage soundcard settings)
+alsa-utils:   arecord/aplay  (capture and play audio)
+alsa-utils:   amixer         (adjust mixer settings from the command line)
+alsa-utils:   alsamixer      (an ncurses-based console mixer)
+alsa-utils:
+alsa-utils: For more information, see http://alsa-project.org
diff --git a/source/ap/amp/amp-gcc34.diff b/source/ap/amp/amp-gcc34.diff
new file mode 100644
index 000000000..6e04bebe7
--- /dev/null
+++ b/source/ap/amp/amp-gcc34.diff
@@ -0,0 +1,11 @@
+diff -Naur amp-0.7.6.orig/guicontrol.c amp-0.7.6/guicontrol.c
+--- amp-0.7.6.orig/guicontrol.c	1997-08-23 04:30:51.000000000 -0700
++++ amp-0.7.6/guicontrol.c	2004-07-07 15:27:54.694249000 -0700
+@@ -376,6 +376,7 @@
+       case GETHDR_SYN: warn("oops, we're out of sync.\n");
+ 	break;
+       default: 
++	break;
+       }
+       break;
+     }
diff --git a/source/ap/amp/amp.SlackBuild b/source/ap/amp/amp.SlackBuild
new file mode 100755
index 000000000..db7f49fe1
--- /dev/null
+++ b/source/ap/amp/amp.SlackBuild
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=0.7.6
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-amp
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_amp.tar.gz
+
+cd $TMP
+rm -rf amp-$VERSION
+tar xzvf $CWD/amp-$VERSION.tar.gz
+cd amp-$VERSION
+zcat $CWD/amp-gcc34.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+chown -R root:root .
+./configure --prefix=/usr $ARCH-slackware-linux
+make
+strip amp
+cat amp > $PKG/usr/bin/amp
+cat amp.1 | gzip -9c > $PKG/usr/man/man1/amp.1.gz
+mkdir -p $PKG/usr/doc/amp-$VERSION
+cp -a \
+  BUGS CHANGES README TODO doc/jukebox.txt doc/layer2.txt \
+  doc/linuxrealtime.txt doc/BeOS.txt \
+  $PKG/usr/doc/amp-$VERSION
+chmod 644 $PKG/usr/doc/amp-$VERSION/*
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/amp-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/amp/license_excerpts b/source/ap/amp/license_excerpts
new file mode 100644
index 000000000..11cf9ef87
--- /dev/null
+++ b/source/ap/amp/license_excerpts
@@ -0,0 +1,42 @@
+amp MPEG audio decoder readme file (version 0.7.5)
+(C) Tomislav Uzelac  1996,1997
+
+amp is free software and can be _used_ freely by anyone. If you want to
+do anything else with it, be sure to check the Legal section of this
+document for legal issues.
+
+THERE IS NO WARRANTY FOR THIS PROGRAM. Please check out the Legal section
+of this document.
+
+
+[snip]
+
+
+6. Legal
+
+This software can be used freely for any purpose. It can be distributed
+freely, as long as it is not sold commercially without permission from
+Tomislav Uzelac <tuzelac@rasip.fer.hr>. However, including this software
+on CD_ROMs containing other free software is explicitly permitted even
+when a modest distribution fee is charged for the CD, as long as this
+software is not a primary selling argument for the CD.
+
+Building derived versions of this software is permitted, as long as they
+are not sold commercially without permission from Tomislav Uzelac
+<tuzelac@rasip.fer.hr>. Any derived versions must be clearly marked as
+such, and must be called by a name other than amp. Any derived versions
+must retain this copyright notice.
+
+/* This license is itself copied from Tatu Ylonen's ssh package. It does
+ * not mention being copyrighted itself :)
+ */
+
+THERE IS NO WARRANTY FOR THIS PROGRAM - whatsoever. You use it entirely
+at your risk, and neither Tomislav Uzelac, nor FER will be liable for
+any damages that might occur to your computer, software, etc. in
+consequence of you using this freeware program.
+
+
+Tomislav Uzelac
+<tuzelac@rasip.fer.hr>
+
diff --git a/source/ap/amp/slack-desc b/source/ap/amp/slack-desc
new file mode 100644
index 000000000..9ecfb939b
--- /dev/null
+++ b/source/ap/amp/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------------------------------------------------------|
+amp: amp (An MP3 player)
+amp:
+amp: amp (Audio Mpeg Player) is a command-line MPEG audio decoder (MP3
+amp: player).  It works with both MPEG1 and MPEG2 audio streams (except for
+amp: the multichannel extensions defined in MPEG2), layers 2 and 3.
+amp:
+amp:
+amp:
+amp:
+amp:
+amp:
diff --git a/source/ap/ash/ash.SlackBuild b/source/ap/ash/ash.SlackBuild
new file mode 100755
index 000000000..deaad12d1
--- /dev/null
+++ b/source/ap/ash/ash.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=0.4.0
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-ash
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+tar xzvf $CWD/ash-$VERSION.tar.gz
+cd ash-$VERSION
+chown -R root:root .
+( cd $CWD/patches
+  for file in ash-builtin.patch.gz ash-echo.patch.gz ash-getcwd.patch.gz ash-getopt.patch.gz ash-glob.patch.gz ash-jobs.patch.gz ash-kill.patch.gz ash-makefile.patch.gz ash-manpage.patch.gz ash-hetio.patch.gz ash-memout.patch.gz ash-misc.patch.gz ash-redir.patch.gz ash-setmode.patch.gz ash-syntax.patch.gz ash-test.patch.gz ash-times.patch.gz ash-debian.patch.gz ash-ppid.patch.gz ash-freebsd.patch.gz ash-sighup.patch.gz ; do
+    zcat $file
+  done ) | patch -p1 --verbose
+sed -i -e 's#= {#{#' arith.y || exit 1 # prevent "syntax error, unexpected ="
+sed -i -e '/yyerrok;/d' arith.y || exit 1 # "error: 'yyerrstatus' undeclared"
+# Fred Emmott found this on the LFS mailing list:
+sed -i -e 's#extern int hetio_inter#static int hetio_inter#' hetio.h || exit 1
+make || exit 1
+strip sh
+mkdir -p $PKG/bin
+cat sh > $PKG/bin/ash
+chmod 755 $PKG/bin/ash
+mkdir -p $PKG/usr/man/man1
+cat sh.1 | gzip -9c > $PKG/usr/man/man1/ash.1.gz
+mkdir -p $PKG/usr/doc/ash-$VERSION
+chmod 644 TOUR
+cp -a TOUR $PKG/usr/doc/ash-$VERSION
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat << EOF > $PKG/install/doinst.sh
+if grep "bin/ash" etc/shells 1> /dev/null 2> /dev/null; then
+  true
+else
+  echo "/bin/ash" >> etc/shells
+fi
+EOF
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/ash-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/ash-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/ap/ash/patches/ash-builtin.patch b/source/ap/ash/patches/ash-builtin.patch
new file mode 100644
index 000000000..b812e6375
--- /dev/null
+++ b/source/ap/ash/patches/ash-builtin.patch
@@ -0,0 +1,843 @@
+diff -urN netbsd-sh/builtins.def ash-0.3.7.orig/builtins.def
+--- netbsd-sh/builtins.def	Mon Apr 10 13:02:58 2000
++++ ash-0.3.7.orig/builtins.def	Mon Apr 23 22:16:46 2001
+@@ -49,12 +49,13 @@
+ #
+ # NOTE: bltincmd must come first!
+ 
+-bltincmd	command
++bltincmd	builtin
+ #alloccmd	alloc
+ bgcmd -j	bg
+ breakcmd	break continue
+ #catfcmd	catf
+ cdcmd		cd chdir
++commandcmd	command
+ dotcmd		.
+ echocmd		echo
+ evalcmd		eval
+diff -urN netbsd-sh/eval.c ash-0.3.7.orig/eval.c
+--- netbsd-sh/eval.c	Tue May 23 12:03:18 2000
++++ ash-0.3.7.orig/eval.c	Mon Apr 23 22:16:46 2001
+@@ -45,7 +45,9 @@
+ #endif
+ #endif /* not lint */
+ 
++#include <sys/types.h>
+ #include <signal.h>
++#include <malloc.h>
+ #include <unistd.h>
+ 
+ /*
+@@ -101,6 +103,8 @@
+ STATIC void evalpipe __P((union node *));
+ STATIC void evalcommand __P((union node *, int, struct backcmd *));
+ STATIC void prehash __P((union node *));
++STATIC int is_assignment_builtin __P((const char *));
++STATIC const char *get_standard_path __P((void));
+ 
+ 
+ /*
+@@ -257,6 +261,11 @@
+ 		evalcase(n, flags);
+ 		break;
+ 	case NDEFUN:
++		if (is_special_builtin(n->narg.text)) {
++			outfmt(out2, "%s is a special built-in\n", n->narg.text);
++			exitstatus = 1;
++			break;
++		}
+ 		defun(n->narg.text, n->narg.next);
+ 		exitstatus = 0;
+ 		break;
+@@ -497,9 +507,14 @@
+ 				close(0);
+ 				copyfd(prevfd, 0);
+ 				close(prevfd);
++				if (pip[0] == 0) {
++					pip[0] = -1;
++				}
+ 			}
+ 			if (pip[1] >= 0) {
+-				close(pip[0]);
++				if (pip[0] >= 0) {
++					close(pip[0]);
++				}
+ 				if (pip[1] != 1) {
+ 					close(1);
+ 					copyfd(pip[1], 1);
+@@ -607,6 +622,7 @@
+ 	int argc;
+ 	char **envp;
+ 	int varflag;
++	int pseudovarflag;
+ 	struct strlist *sp;
+ 	int mode;
+ 	int pip[2];
+@@ -619,12 +635,17 @@
+ 	struct localvar *volatile savelocalvars;
+ 	volatile int e;
+ 	char *lastarg;
++	int not_special;
++	const char *path;
++	const char *standard_path;
+ #if __GNUC__
+ 	/* Avoid longjmp clobbering */
+ 	(void) &argv;
+ 	(void) &argc;
+ 	(void) &lastarg;
+ 	(void) &flags;
++	(void) &not_special;
++	(void) &standard_path;
+ #endif
+ 
+ 	/* First expand the arguments. */
+@@ -632,21 +653,31 @@
+ 	setstackmark(&smark);
+ 	arglist.lastp = &arglist.list;
+ 	varlist.lastp = &varlist.list;
++	arglist.list = 0;
+ 	varflag = 1;
++	pseudovarflag = 0;
+ 	oexitstatus = exitstatus;
+ 	exitstatus = 0;
++	not_special = 0;
++	path = pathval();
++	standard_path = NULL;
+ 	for (argp = cmd->ncmd.args ; argp ; argp = argp->narg.next) {
+ 		char *p = argp->narg.text;
+-		if (varflag && is_name(*p)) {
++		if ((varflag || pseudovarflag) && is_name(*p)) {
+ 			do {
+ 				p++;
+ 			} while (is_in_name(*p));
+ 			if (*p == '=') {
+-				expandarg(argp, &varlist, EXP_VARTILDE);
++				if (varflag)
++					expandarg(argp, &varlist, EXP_VARTILDE);
++				else
++					expandarg(argp, &arglist, EXP_VARTILDE);
+ 				continue;
+ 			}
+ 		}
+ 		expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
++		if (varflag && arglist.list && is_assignment_builtin(arglist.list->text))
++			pseudovarflag = 1;
+ 		varflag = 0;
+ 	}
+ 	*arglist.lastp = NULL;
+@@ -688,37 +719,75 @@
+ 		cmdentry.u.index = BLTINCMD;
+ 	} else {
+ 		static const char PATH[] = "PATH=";
+-		const char *path = pathval();
++		const char *oldpath = NULL;
++		int findflag = DO_ERR;
+ 
+ 		/*
+ 		 * Modify the command lookup path, if a PATH= assignment
+ 		 * is present
+ 		 */
+ 		for (sp = varlist.list ; sp ; sp = sp->next)
+-			if (strncmp(sp->text, PATH, sizeof(PATH) - 1) == 0)
++			if (strncmp(sp->text, PATH, sizeof(PATH) - 1) == 0) {
+ 				path = sp->text + sizeof(PATH) - 1;
+-
+-		find_command(argv[0], &cmdentry, DO_ERR, path);
+-		if (cmdentry.cmdtype == CMDUNKNOWN) {	/* command not found */
+-			exitstatus = 127;
+-			flushout(&errout);
+-			return;
+-		}
+-		/* implement the bltin builtin here */
+-		if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
+-			for (;;) {
++				findflag |= DO_BRUTE;
++			}
++		for(;;) {
++			find_command(argv[0], &cmdentry, findflag, path);
++			if (oldpath) {
++				path = oldpath;
++				oldpath = NULL;
++			}
++			if (cmdentry.cmdtype == CMDUNKNOWN) {	/* command not found */
++				exitstatus = 127;
++				flushout(&errout);
++				goto out;
++			}
++			/* implement the bltin builtin here */
++			if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
++				not_special = 1;
++				for(;;) {
++					argv++;
++					if (--argc == 0)
++						break;
++					if ((cmdentry.u.index = find_builtin(*argv)) < 0) {
++						outfmt(&errout, "%s: not found\n", *argv);
++						exitstatus = 127;
++						flushout(&errout);
++						goto out;
++					}
++					if (cmdentry.u.index != BLTINCMD)
++						break;
++				}
++			}
++			if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == COMMANDCMD) {
++				not_special = 1;
+ 				argv++;
+-				if (--argc == 0)
+-					break;
+-				if ((cmdentry.u.index = find_builtin(*argv)) < 0) {
+-					outfmt(&errout, "%s: not found\n", *argv);
+-					exitstatus = 127;
+-					flushout(&errout);
+-					return;
++				if (--argc == 0) {
++					exitstatus = 0;
++					goto out;
+ 				}
+-				if (cmdentry.u.index != BLTINCMD)
+-					break;
++				if (*argv[0] == '-') {
++					if (!equal(argv[0], "-p")) {
++						argv--;
++						argc++;
++						break;
++					}
++					argv++;
++					if (--argc == 0) {
++						exitstatus = 0;
++						goto out;
++					}
++					if (!standard_path) {
++						standard_path = get_standard_path();
++					}
++					oldpath = path;
++					path = standard_path;
++					findflag |= DO_BRUTE;
++				}
++				findflag |= DO_NOFUN;
++				continue;
+ 			}
++			break;
+ 		}
+ 	}
+ 
+@@ -756,13 +825,12 @@
+ #ifdef DEBUG
+ 		trputs("Shell function:  ");  trargs(argv);
+ #endif
++		exitstatus = oexitstatus;
+ 		redirect(cmd->ncmd.redirect, REDIR_PUSH);
+ 		saveparam = shellparam;
+ 		shellparam.malloc = 0;
+-		shellparam.reset = 1;
+ 		shellparam.nparam = argc - 1;
+ 		shellparam.p = argv + 1;
+-		shellparam.optnext = NULL;
+ 		INTOFF;
+ 		savelocalvars = localvars;
+ 		localvars = NULL;
+@@ -772,6 +840,8 @@
+ 				freeparam((volatile struct shparam *)
+ 				    &saveparam);
+ 			} else {
++				saveparam.optind = shellparam.optind;
++				saveparam.optoff = shellparam.optoff;
+ 				freeparam(&shellparam);
+ 				shellparam = saveparam;
+ 			}
+@@ -790,6 +860,8 @@
+ 		INTOFF;
+ 		poplocalvars();
+ 		localvars = savelocalvars;
++		saveparam.optind = shellparam.optind;
++		saveparam.optoff = shellparam.optoff;
+ 		freeparam(&shellparam);
+ 		shellparam = saveparam;
+ 		handler = savehandler;
+@@ -832,6 +908,8 @@
+ 		out1 = &output;
+ 		out2 = &errout;
+ 		freestdout();
++		if (!not_special && is_special_builtin(commandname))
++			listsetvar(cmdenviron);
+ 		cmdenviron = NULL;
+ 		if (e != EXSHELLPROC) {
+ 			commandname = savecmdname;
+@@ -867,7 +953,7 @@
+ 		for (sp = varlist.list ; sp ; sp = sp->next)
+ 			setvareq(sp->text, VEXPORT|VSTACK);
+ 		envp = environment();
+-		shellexec(argv, envp, pathval(), cmdentry.u.index);
++		shellexec(argv, envp, path, cmdentry.u.index);
+ 	}
+ 	goto out;
+ 
+@@ -1025,4 +1111,49 @@
+ 		shellexec(argv + 1, environment(), pathval(), 0);
+ 	}
+ 	return 0;
++}
++
++STATIC int
++is_assignment_builtin (command)
++	const char *command;
++{
++	static const char *assignment_builtins[] = {
++		"alias", "declare", "export", "local", "readonly", "typeset",
++		(char *)NULL
++	};
++	int i;
++
++	for (i = 0; assignment_builtins[i]; i++)
++		if (strcmp(command, assignment_builtins[i]) == 0) return 1;
++	return 0;
++}
++
++int
++is_special_builtin(name)
++	const char *name;
++{
++	static const char *special_builtins[] = {
++		"break", ":", ".", "continue", "eval", "exec", "exit",
++		"export", "readonly", "return", "set", "shift", "times",
++		"trap", "unset", (char *)NULL
++	};
++	int i;
++
++	if (!name) return 0;
++	for (i = 0; special_builtins[i]; i++)
++		if (equal(name, special_builtins[i])) return 1;
++	return 0;
++}
++
++STATIC const char *
++get_standard_path()
++{
++	char *p;
++	size_t len;
++
++	len = confstr(_CS_PATH, NULL, 0);
++	p = stalloc(len + 2);
++	*p = '\0';
++	confstr(_CS_PATH, p, len);
++	return p;
+ }
+diff -urN netbsd-sh/eval.h ash-0.3.7.orig/eval.h
+--- netbsd-sh/eval.h	Fri Jan 28 13:03:00 2000
++++ ash-0.3.7.orig/eval.h	Mon Apr 23 22:16:46 2001
+@@ -61,6 +61,7 @@
+ int falsecmd __P((int, char **));
+ int truecmd __P((int, char **));
+ int execcmd __P((int, char **));
++int is_special_builtin __P((const char *));
+ 
+ /* in_function returns nonzero if we are currently evaluating a function */
+ #define in_function()	funcnest
+diff -urN netbsd-sh/exec.c ash-0.3.7.orig/exec.c
+--- netbsd-sh/exec.c	Fri Jan 12 17:50:35 2001
++++ ash-0.3.7.orig/exec.c	Mon Apr 23 22:16:46 2001
+@@ -51,6 +51,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#include <sysexits.h>
+ 
+ /*
+  * When commands are first encountered, they are entered in a hash table.
+@@ -108,6 +109,9 @@
+ STATIC void clearcmdentry __P((int));
+ STATIC struct tblentry *cmdlookup __P((char *, int));
+ STATIC void delete_cmd_entry __P((void));
++STATIC int describe_command __P((char *, int));
++STATIC int path_change __P((const char *, int *));
++STATIC int is_regular_builtin __P((const char *));
+ 
+ 
+ 
+@@ -164,7 +172,7 @@
+ 	char **envp;
+ 	{
+ 	int e;
+-#ifndef BSD
++#if !defined(BSD) && !defined(linux)
+ 	char *p;
+ #endif
+ 
+@@ -180,7 +188,7 @@
+ 		initshellproc();
+ 		setinputfile(cmd, 0);
+ 		commandname = arg0 = savestr(argv[0]);
+-#ifndef BSD
++#if !defined(BSD) && !defined(linux)
+ 		pgetc(); pungetc();		/* fill up input buffer */
+ 		p = parsenextc;
+ 		if (parsenleft > 2 && p[0] == '#' && p[1] == '!') {
+@@ -195,7 +203,7 @@
+ }
+ 
+ 
+-#ifndef BSD
++#if !defined(BSD) && !defined(linux)
+ /*
+  * Execute an interpreter introduced by "#!", for systems where this
+  * feature has not been built into the kernel.  If the interpreter is
+@@ -351,27 +359,29 @@
+ 	if (*argptr == NULL) {
+ 		for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
+ 			for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
+-				printentry(cmdp, verbose);
++				if (cmdp->cmdtype != CMDBUILTIN) {
++					printentry(cmdp, verbose);
++				}
+ 			}
+ 		}
+ 		return 0;
+ 	}
++	c = 0;
+ 	while ((name = *argptr) != NULL) {
+ 		if ((cmdp = cmdlookup(name, 0)) != NULL
+ 		 && (cmdp->cmdtype == CMDNORMAL
+ 		     || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
+ 			delete_cmd_entry();
+ 		find_command(name, &entry, DO_ERR, pathval());
+-		if (verbose) {
+-			if (entry.cmdtype != CMDUNKNOWN) {	/* if no error msg */
+-				cmdp = cmdlookup(name, 0);
+-				printentry(cmdp, verbose);
+-			}
++		if (entry.cmdtype == CMDUNKNOWN) c = 1;
++		else if (verbose) {
++			cmdp = cmdlookup(name, 0);
++			if (cmdp) printentry(cmdp, verbose);
+ 			flushall();
+ 		}
+ 		argptr++;
+ 	}
+-	return 0;
++	return c;
+ }
+ 
+ 
+@@ -435,6 +445,10 @@
+ 	struct stat statb;
+ 	int e;
+ 	int i;
++	int bltin;
++	int firstchange;
++	int updatetbl;
++	int regular;
+ 
+ 	/* If name contains a slash, don't use the hash table */
+ 	if (strchr(name, '/') != NULL) {
+@@ -459,12 +473,54 @@
+ 		return;
+ 	}
+ 
++	updatetbl = 1;
++	if (act & DO_BRUTE) {
++		firstchange = path_change(path, &bltin);
++	} else {
++		bltin = builtinloc;
++		firstchange = 9999;
++	}
++
+ 	/* If name is in the table, and not invalidated by cd, we're done */
+-	if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0)
+-		goto success;
++	if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) {
++		if (cmdp->cmdtype == CMDFUNCTION) {
++			if (act & DO_NOFUN) {
++				updatetbl = 0;
++			} else {
++				goto success;
++			}
++		} else if (act & DO_BRUTE) {
++			if ((cmdp->cmdtype == CMDNORMAL &&
++			     cmdp->param.index >= firstchange) ||
++			    (cmdp->cmdtype == CMDBUILTIN &&
++			     ((builtinloc < 0 && bltin >= 0) ?
++			      bltin : builtinloc) >= firstchange)) {
++				/* need to recompute the entry */
++			} else {
++				goto success;
++			}
++		} else {
++			goto success;
++		}
++	}
++
++	if ((regular = is_regular_builtin(name))) {
++		if (cmdp && (cmdp->cmdtype == CMDBUILTIN)) {
++		    	goto success;
++		}
++	} else if (act & DO_BRUTE) {
++		if (firstchange == 0) {
++			updatetbl = 0;
++		}
++	}
+ 
+ 	/* If %builtin not in path, check for builtin next */
+-	if (builtinloc < 0 && (i = find_builtin(name)) >= 0) {
++	if ((bltin < 0 || regular) && (i = find_builtin(name)) >= 0) {
++		if (!updatetbl) {
++			entry->cmdtype = CMDBUILTIN;
++			entry->u.index = i;
++			return;
++		}
+ 		INTOFF;
+ 		cmdp = cmdlookup(name, 1);
+ 		cmdp->cmdtype = CMDBUILTIN;
+@@ -475,7 +531,7 @@
+ 
+ 	/* We have to search path. */
+ 	prev = -1;		/* where to start */
+-	if (cmdp) {		/* doing a rehash */
++	if (cmdp && cmdp->rehash) {	/* doing a rehash */
+ 		if (cmdp->cmdtype == CMDBUILTIN)
+ 			prev = builtinloc;
+ 		else
+@@ -488,26 +544,38 @@
+ 	while ((fullname = padvance(&path, name)) != NULL) {
+ 		stunalloc(fullname);
+ 		idx++;
++		if (idx >= firstchange) {
++			updatetbl = 0;
++		}
+ 		if (pathopt) {
+ 			if (prefix("builtin", pathopt)) {
+-				if ((i = find_builtin(name)) < 0)
+-					goto loop;
+-				INTOFF;
+-				cmdp = cmdlookup(name, 1);
+-				cmdp->cmdtype = CMDBUILTIN;
+-				cmdp->param.index = i;
+-				INTON;
+-				goto success;
+-			} else if (prefix("func", pathopt)) {
++				if ((i = find_builtin(name)) >= 0) {
++					if (!updatetbl) {
++						entry->cmdtype = CMDBUILTIN;
++						entry->u.index = i;
++						return;
++					}
++					INTOFF;
++					cmdp = cmdlookup(name, 1);
++					cmdp->cmdtype = CMDBUILTIN;
++					cmdp->param.index = i;
++					INTON;
++					goto success;
++				} else {
++					continue;
++				}
++			} else if (!(act & DO_NOFUN) &&
++				   prefix("func", pathopt)) {
+ 				/* handled below */
+ 			} else {
+-				goto loop;	/* ignore unimplemented options */
++				continue;	/* ignore unimplemented options */
+ 			}
+ 		}
+ 		/* if rehash, don't redo absolute path names */
+-		if (fullname[0] == '/' && idx <= prev) {
++		if (fullname[0] == '/' && idx <= prev &&
++		    idx < firstchange) {
+ 			if (idx < prev)
+-				goto loop;
++				continue;
+ 			TRACE(("searchexec \"%s\": no change\n", name));
+ 			goto success;
+ 		}
+@@ -522,7 +590,7 @@
+ 		}
+ 		e = EACCES;	/* if we fail, this will be the error */
+ 		if (!S_ISREG(statb.st_mode))
+-			goto loop;
++			continue;
+ 		if (pathopt) {		/* this is a %func directory */
+ 			stalloc(strlen(fullname) + 1);
+ 			readcmdfile(fullname);
+@@ -544,6 +612,13 @@
+ 		}
+ #endif
+ 		TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
++		/* If we aren't called with DO_BRUTE and cmdp is set, it must
++		   be a function and we're being called with DO_NOFUN */
++		if (!updatetbl) {
++			entry->cmdtype = CMDNORMAL;
++			entry->u.index = idx;
++			return;
++		}
+ 		INTOFF;
+ 		cmdp = cmdlookup(name, 1);
+ 		cmdp->cmdtype = CMDNORMAL;
+@@ -553,7 +628,7 @@
+ 	}
+ 
+ 	/* We failed.  If there was an entry for this command, delete it */
+-	if (cmdp)
++	if (cmdp && updatetbl)
+ 		delete_cmd_entry();
+ 	if (act & DO_ERR)
+ 		outfmt(out2, "%s: %s\n", name, errmsg(e, E_EXEC));
+@@ -618,37 +693,12 @@
+ changepath(newval)
+ 	const char *newval;
+ {
+-	const char *old, *new;
+-	int idx;
+ 	int firstchange;
+ 	int bltin;
+ 
+-	old = pathval();
+-	new = newval;
+-	firstchange = 9999;	/* assume no change */
+-	idx = 0;
+-	bltin = -1;
+-	for (;;) {
+-		if (*old != *new) {
+-			firstchange = idx;
+-			if ((*old == '\0' && *new == ':')
+-			 || (*old == ':' && *new == '\0'))
+-				firstchange++;
+-			old = new;	/* ignore subsequent differences */
+-		}
+-		if (*new == '\0')
+-			break;
+-		if (*new == '%' && bltin < 0 && prefix("builtin", new + 1))
+-			bltin = idx;
+-		if (*new == ':') {
+-			idx++;
+-		}
+-		new++, old++;
+-	}
++	firstchange = path_change(newval, &bltin);
+ 	if (builtinloc < 0 && bltin >= 0)
+ 		builtinloc = bltin;		/* zap builtins */
+-	if (builtinloc >= 0 && bltin < 0)
+-		firstchange = 0;
+ 	clearcmdentry(firstchange);
+ 	builtinloc = bltin;
+ }
+@@ -838,11 +888,9 @@
+ 	{
+ 	struct cmdentry entry;
+ 
+-	INTOFF;
+ 	entry.cmdtype = CMDFUNCTION;
+ 	entry.u.func = copyfunc(func);
+ 	addcmdentry(name, &entry);
+-	INTON;
+ }
+ 
+ 
+@@ -944,4 +992,190 @@
+ 		}
+ 	}
+ 	return err;
++}
++
++STATIC int
++describe_command(command, verbose)
++	char *command;
++	int verbose;
++{
++	struct cmdentry entry;
++	struct tblentry *cmdp;
++	char **pp;
++	struct alias *ap;
++	extern char *const parsekwd[];
++
++	for (pp = (char **)parsekwd; *pp; pp++)
++		if (**pp == *command && equal(*pp, command))
++			break;
++
++	if (*pp) {
++		if (verbose) {
++			out1fmt("%s is a reserved word\n", command);
++		} else {
++			out1fmt("%s\n", command);
++		}
++		return 0;
++	}
++
++	/* Then look at the aliases */
++	if ((ap = lookupalias(command, 1)) != NULL) {
++		if (verbose) {
++			out1fmt("%s is aliased to `%s'\n", command, ap->val);
++		} else {
++			out1fmt("alias %s='%s'\n", command, ap->val);
++		}
++		return 0;
++	}
++
++	/* Then check if it is a tracked alias */
++	if ((cmdp = cmdlookup(command, 0)) != NULL) {
++		entry.cmdtype = cmdp->cmdtype;
++		entry.u = cmdp->param;
++	}
++	else {
++		/* Finally use brute force */
++		find_command(command, &entry, DO_ABS, pathval());
++	}
++
++	switch (entry.cmdtype) {
++	case CMDNORMAL: {
++		int j = entry.u.index;
++		const char *path = pathval();
++		char *name;
++		if (j == -1) 
++			name = command;
++		else {
++			do { 
++				name = padvance(&path, command);
++				stunalloc(name);
++			} while (--j >= 0);
++		}
++		if (verbose) {
++			out1fmt("%s is %s\n", command, name);
++		} else {
++			out1fmt("%s\n", name);
++		}
++		break;
++	}
++	case CMDFUNCTION:
++		if (verbose) {
++			out1fmt("%s is a function\n", command);
++		} else {
++			out1fmt("%s\n", command);
++		}
++		break;
++	case CMDBUILTIN:
++		if (verbose) {
++			if (is_special_builtin(command)) {
++				out1fmt("%s is a special built-in utility\n", command);
++			} else {
++				out1fmt("%s is a built-in utility\n", command);
++			}
++		} else {
++			out1fmt("%s\n", command);
++		}
++		break;
++	default:
++		outfmt(out2, "%s not found\n", command);
++		return 127;
++	}
++
++	return 0;
++}
++
++int
++commandcmd(argc, argv)
++	int argc;
++	char **argv;
++{
++	int c;
++	int default_path = 0;
++	int verify_only = 0;
++	int verbose_verify_only = 0;
++
++	while ((c = nextopt("pvV")) != '\0')
++		switch (c) {
++		case 'p':
++			default_path = 1;
++			break;
++		case 'v':
++			verify_only = 1;
++			break;
++		case 'V':
++			verbose_verify_only = 1;
++			break;
++		default:
++			outfmt(out2,
++"command: nextopt returned character code 0%o\n", c);
++			return EX_SOFTWARE;
++		}
++
++	if (default_path + verify_only + verbose_verify_only > 1 ||
++	    !*argptr) {
++			outfmt(out2,
++"command [-p] command [arg ...]\n");
++			outfmt(out2,
++"command {-v|-V} command\n");
++			return EX_USAGE;
++	}
++
++	if (verify_only || verbose_verify_only) {
++		return describe_command(*argptr, verbose_verify_only);
++	}
++
++	return 0;
++}
++
++STATIC int
++path_change(newval, bltin)
++	const char *newval;
++	int *bltin;
++{
++	const char *old, *new;
++	int idx;
++	int firstchange;
++
++	old = pathval();
++	new = newval;
++	firstchange = 9999;	/* assume no change */
++	idx = 0;
++	*bltin = -1;
++	for (;;) {
++		if (*old != *new) {
++			firstchange = idx;
++			if ((*old == '\0' && *new == ':')
++			 || (*old == ':' && *new == '\0'))
++				firstchange++;
++			old = new;	/* ignore subsequent differences */
++		}
++		if (*new == '\0')
++			break;
++		if (*new == '%' && *bltin < 0 && prefix("builtin", new + 1))
++			*bltin = idx;
++		if (*new == ':') {
++			idx++;
++		}
++		new++, old++;
++	}
++	if (builtinloc >= 0 && *bltin < 0)
++		firstchange = 0;
++	return firstchange;
++}
++
++STATIC int
++is_regular_builtin(name)
++        const char *name;
++{
++        static const char *regular_builtins[] = {
++        	"alias", "bg", "cd", "command", "false", "fc", "fg",
++        	"getopts", "jobs", "kill", "newgrp", "read", "true",
++        	"umask", "unalias", "wait", (char *)NULL
++        };
++        int i;
++
++        if (!name) return 0;
++        for (i = 0; regular_builtins[i]; i++)
++                if (equal(name, regular_builtins[i])) return 1;
++        return 0;
+ }
+diff -urN netbsd-sh/exec.h ash-0.3.7.orig/exec.h
+--- netbsd-sh/exec.h	Tue May 23 12:03:19 2000
++++ ash-0.3.7.orig/exec.h	Mon Apr 23 22:16:46 2001
+@@ -56,6 +56,8 @@
+ 
+ #define DO_ERR	1		/* find_command prints errors */
+ #define DO_ABS	2		/* find_command checks absolute paths */
++#define DO_NOFUN	4	/* find_command ignores functions */
++#define DO_BRUTE	8	/* find_command ignores hash table */
+ 
+ extern const char *pathopt;	/* set by padvance */
+ extern int exerrno;		/* last exec error */
+@@ -74,3 +76,4 @@
+ void defun __P((char *, union node *));
+ int unsetfunc __P((char *));
+ int typecmd __P((int, char **));
++int commandcmd __P((int, char **));
+
diff --git a/source/ap/ash/patches/ash-debian.patch b/source/ap/ash/patches/ash-debian.patch
new file mode 100644
index 000000000..d3e79bfcd
--- /dev/null
+++ b/source/ap/ash/patches/ash-debian.patch
@@ -0,0 +1,702 @@
+diff -urN netbsd-sh/debian/README.debian ash-0.3.7.orig/debian/README.debian
+--- netbsd-sh/debian/README.debian	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/README.debian	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,14 @@
++ash for DEBIAN
++----------------------
++
++This is a very simple port of ash taken from NetBSD-current on 1997/06/18.  The
++file setmode.c was taken from src/libc/gen and is needed since the Linux libc
++does provide getmode(3) or setmode(3).  History editing is disabled to avoid
++code bloat.  This also means that building the package is possible without the
++BSD libedit.
++
++This port is preriodically revised to keep up to date with NetBSD's current
++release.
++
++Herbert Xu <herbert@debian.org>
++$Id: README.debian,v 1.6 2000/08/04 11:33:48 herbert Exp $
+diff -urN netbsd-sh/debian/ash-medium.README.Debian ash-0.3.7.orig/debian/ash-medium.README.Debian
+--- netbsd-sh/debian/ash-medium.README.Debian	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/ash-medium.README.Debian	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,14 @@
++ash for DEBIAN
++----------------------
++
++This is a very simple port of ash taken from NetBSD-current on 1997/06/18.  The
++file setmode.c was taken from src/libc/gen and is needed since the Linux libc
++does provide getmode(3) or setmode(3).  History editing is disabled to avoid
++code bloat.  This also means that building the package is possible without the
++BSD libedit.
++
++This port is preriodically revised to keep up to date with NetBSD's current
++release.
++
++Herbert Xu <herbert@debian.org>
++$Id: ash-medium.README.Debian,v 1.1 2000/08/04 11:49:01 herbert Exp $
+diff -urN netbsd-sh/debian/ash-medium.dirs ash-0.3.7.orig/debian/ash-medium.dirs
+--- netbsd-sh/debian/ash-medium.dirs	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/ash-medium.dirs	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,2 @@
++usr/bin
++usr/share/man/man1
+diff -urN netbsd-sh/debian/ash-udeb.dirs ash-0.3.7.orig/debian/ash-udeb.dirs
+--- netbsd-sh/debian/ash-udeb.dirs	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/ash-udeb.dirs	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1 @@
++bin
+diff -urN netbsd-sh/debian/bsdyacc ash-0.3.7.orig/debian/bsdyacc
+--- netbsd-sh/debian/bsdyacc	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/bsdyacc	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,20 @@
++#!/bin/sh -e
++
++if echo "$@" | grep -q -- -o; then
++	OUTPUT=$(echo "$@" |
++		 sed 's/.*-o[[:blank:]]\+\([^[:blank:]]\+\)\.c.*/\1/')
++	OPTIONS=$(echo "$@" |
++		 sed 's/\(.*\)-o[[:blank:]]\+[^[:blank:]]\+\(.*\)/\1\2/')
++	NEW=1
++else
++	OUTPUT=$(echo "$@" |
++		 sed -e 's/.*[[:blank:]]\+\([^[:blank:]]\+\)\.y.*/\1/')
++	OPTIONS="$@"
++	NEW=0
++fi
++
++byacc $OPTIONS
++if [ $NEW = 1 ]; then
++	mv y.tab.c $OUTPUT.c
++fi
++mv y.tab.h $OUTPUT.h
+diff -urN netbsd-sh/debian/changelog ash-0.3.7.orig/debian/changelog
+--- netbsd-sh/debian/changelog	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/changelog	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,429 @@
++ash (0.3.7-14) unstable; urgency=low
++
++  * Removed predependency from udeb (closes: #81995).
++  * Added /bin/sh symlink to udeb (closes: #81967).
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 13 Jan 2001 15:23:21 +1100
++
++ash (0.3.7-13) unstable; urgency=low
++
++  * Renamed the udeb to ash-udeb.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 20 Dec 2000 19:32:34 +1100
++
++ash (0.3.7-12) unstable; urgency=low
++
++  * Added support for udebs (Randolph Chung, closes: #79237).
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 16 Dec 2000 13:53:28 +1100
++
++ash (0.3.7-11) unstable; urgency=low
++
++  * Preserve the previous exit status upon entering a function
++    (closes: #78374).
++
++ -- Herbert Xu <herbert@debian.org>  Sun,  3 Dec 2000 13:34:27 +1100
++
++ash (0.3.7-10) unstable; urgency=low
++
++  * Merged changes for GNU from Igor Khavkine.
++  * Minimise the number of sigactions.
++
++ -- Herbert Xu <herbert@debian.org>  Fri,  3 Nov 2000 20:31:52 +1100
++
++ash (0.3.7-9) unstable; urgency=low
++
++  * Predepend on the libraries.
++  * Always save fd 2 when it is redirected (closes: #75302).
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 22 Oct 2000 08:40:40 +1100
++
++ash (0.3.7-8) unstable; urgency=high
++
++  * More redirection fixes (closes: #73613).
++
++ -- Herbert Xu <herbert@debian.org>  Thu,  5 Oct 2000 18:22:17 +1100
++
++ash (0.3.7-7) unstable; urgency=high
++
++  * Added missing break in redirection code (closes: #72956).
++
++ -- Herbert Xu <herbert@debian.org>  Tue,  3 Oct 2000 07:58:04 +1100
++
++ash (0.3.7-6) unstable; urgency=low
++
++  * command -[vV] no longer displays an error message on stdout.
++  * Redirecting to /proc/self/fd/* now works (closes: #72852).
++
++ -- Herbert Xu <herbert@debian.org>  Sun,  1 Oct 2000 12:56:39 +1100
++
++ash (0.3.7-5) unstable; urgency=low
++
++  * Implemented set -a.
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 30 Sep 2000 16:00:33 +1100
++
++ash (0.3.7-4) unstable; urgency=low
++
++  * Added build-time dependency on debhelper (closes: #69920).
++  * Extended maximum length of arithmetic expansions to match 32-bit integers.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 20 Sep 2000 14:28:16 +1100
++
++ash (0.3.7-3) unstable; urgency=low
++
++  * Switch to the old globbing code since glob(3) is hopelessly broken
++    (closes: #69455).
++
++ -- Herbert Xu <herbert@debian.org>  Mon, 21 Aug 2000 20:37:15 +1000
++
++ash (0.3.7-2) unstable; urgency=low
++
++  * Call glob(3) with GLOB_NOMAGIC (ouch).
++
++ -- Herbert Xu <herbert@debian.org>  Sun,  6 Aug 2000 17:47:08 +1000
++
++ash (0.3.7-1) unstable; urgency=low
++
++  * NetBSD-current version as of 20000729.
++  * Use fnmatch(3) and glob(3).
++  * Fixed the use of backslashes in the pattern in parameter substitutions,
++    hopefully for the last time.
++  * Applied HETIO patch and built ash.medium (closes: #50788).  Will do ash.big
++    when readline is fixed so that it doesn't leak anymore.
++
++ -- Herbert Xu <herbert@debian.org>  Fri,  4 Aug 2000 21:36:44 +1000
++
++ash (0.3.6-5) unstable; urgency=low
++
++  * Fixed manpage entry for read with patch from Kevin Ryde (closes: #62500).
++  * Fixed a file descriptor leak for pipelines.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 19 Apr 2000 18:56:20 +1000
++
++ash (0.3.6-4) unstable; urgency=low
++
++  * Fixed the case of an empty command with redirections.
++
++ -- Herbert Xu <herbert@debian.org>  Fri,  7 Apr 2000 12:07:18 +1000
++
++ash (0.3.6-3) unstable; urgency=low
++
++  * ! is now recognised correctly.
++  * Ash is now more strict on the syntax, e.g., a lone ! is no longer accepted
++    as an alternative to ! true.
++
++ -- Herbert Xu <herbert@debian.org>  Fri,  7 Apr 2000 10:46:06 +1000
++
++ash (0.3.6-2) unstable; urgency=low
++
++  * Fixed a problem with fmtstr() which broke getopts.
++
++ -- Herbert Xu <herbert@debian.org>  Sun,  2 Apr 2000 10:49:26 +1000
++
++ash (0.3.6-1) unstable; urgency=low
++
++  * NetBSD-current version as of 20000326.
++  * Added a Build-Depends on groff (closes: #61041).
++  * Implemented noclobber (closes: #59028).
++  * Rewrote output.c to use stream IO.
++
++ -- Herbert Xu <herbert@debian.org>  Sat,  1 Apr 2000 19:24:31 +1000
++
++ash (0.3.5-10) frozen unstable; urgency=low
++
++  * Don't stat mail boxes in non-interactive mode (closes: #59213).
++  * Added an fflush(stdout) to the times builtin (closes: #59027).
++  * Documented the times builtin.
++  * Added source depends.
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 18 Mar 2000 18:58:44 +1100
++
++ash (0.3.5-9) unstable; urgency=low
++
++  * Double quotes inside paramater substitutions inside double quotes are now
++    ignored as in bash (the originial behaviour was POSIX compliant too but
++    IMHO this one makes a little bit more sense).
++    This one broke mwm (but it was actually mwm's fault).
++  * Corrected backslash/CTLESC treatment for patterns in parameter
++    substitutions.
++
++ -- Herbert Xu <herbert@debian.org>  Sat,  6 Nov 1999 18:13:19 +1100
++
++ash (0.3.5-8) unstable; urgency=low
++
++  * Replaced use of echo -n in manual page with escape codes.
++  * Made FHS compliant (closes: #47978).
++  * Restored echo's option processing ability.
++
++ -- Herbert Xu <herbert@debian.org>  Fri, 22 Oct 1999 10:20:58 +1000
++
++ash (0.3.5-7) unstable; urgency=low
++
++  * echo no longer supports options.
++  * Don't quote patterns inside parameter substitutions enclosed by double
++    quotes (closes: #47842).
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 20 Oct 1999 20:28:14 +1000
++
++ash (0.3.5-6) unstable; urgency=low
++
++  * Use getcwd() instead of /bin/pwd -- Zack Weinberg (closes: #46981).
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 10 Oct 1999 16:31:49 +1000
++
++ash (0.3.5-5) unstable; urgency=low
++
++  * Only test for -e on simple commands (fixes #44559).
++
++ -- Herbert Xu <herbert@debian.org>  Wed,  8 Sep 1999 22:18:27 +1000
++
++ash (0.3.5-4) unstable; urgency=low
++
++  * Don't wait for stopped children if job control is disabled (fixes #42814).
++  * Allow an option '(' in a case statement (fixes #42364).
++
++ -- Herbert Xu <herbert@debian.org>  Thu, 12 Aug 1999 23:30:30 +1000
++
++ash (0.3.5-3) unstable; urgency=low
++
++  * OK, the fix to the esoteric problem in 0.3.5-1 actually breaks VSASSIGN
++    and VSQUESTION, they should work properly now (fixes #41327).
++
++ -- Herbert Xu <herbert@debian.org>  Thu, 15 Jul 1999 22:47:13 +1000
++
++ash (0.3.5-2) unstable; urgency=low
++
++  * PATH search and execution is now correct.
++  * hash no longer shows builtins.
++  * Added kill builtin.
++  * New description from James R. van Zandt reformatted by Josip Rodin.
++
++ -- Herbert Xu <herbert@debian.org>  Mon, 12 Jul 1999 18:51:42 +1000
++
++ash (0.3.5-1) unstable; urgency=low
++
++  * New upstream release.
++  * Adapted to new pmake (fixes #38737).
++  * Fixed behvaiour of backslashes preceding a closing brace for a parameter
++    substituion inside double quotes (even bash messes this one up :).
++  * Fixed command (fixes #34639).
++  * Fixed a pipe bug where stdin may be wrongly closed (fixes #35452).
++  * Revamped getopts (fixes #39694).
++
++ -- Herbert Xu <herbert@debian.org>  Sun,  4 Jul 1999 12:19:01 +1000
++
++ash (0.3.4-7) unstable; urgency=low
++
++  * Fixed a glibc 2.1 compatitibility problem.
++  * Fixed a PWD inconsistency that stuffed up the kernel compilation.
++
++ -- Herbert Xu <herbert@debian.org>  Mon, 17 May 1999 23:14:57 +1000
++
++ash (0.3.4-6) unstable; urgency=low
++
++  * Fixed incorrect -e test due to the last bug fix (fixes #26509).
++
++ -- Herbert Xu <herbert@debian.org>  Tue,  8 Sep 1998 10:02:46 +1000
++
++ash (0.3.4-5) unstable; urgency=low
++
++  * Use test_eaccess from bash instead of access(2) (fixes #26110).
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 26 Aug 1998 21:22:49 +1000
++
++ash (0.3.4-4) unstable; urgency=low
++
++  * Only upload to unstable.
++
++ -- Herbert Xu <herbert@debian.org>  Tue,  5 May 1998 18:01:02 +1000
++
++ash (0.3.4-3) frozen unstable; urgency=low
++
++  * Applied sparc patch (fixes #21562).
++
++ -- Herbert Xu <herbert@debian.org>  Fri,  1 May 1998 19:48:13 +1000
++
++ash (0.3.4-2) frozen unstable; urgency=low
++
++  * Fixed the incorrect trap fixes (fixes #20363).
++
++ -- Herbert Xu <herbert@debian.org>  Thu, 16 Apr 1998 21:07:10 +1000
++
++ash (0.3.4-1) unstable; urgency=low
++
++  * New upstream release.
++  * Reverted word splitting change in 0.3.2-1 since the fix was broken and
++    major work (the quote removal is done too quickly at the moment) is needed
++    to fix it properly.
++  * Fixed more trap noncompliance.
++
++ -- Herbert Xu <herbert@debian.org>  Thu, 19 Mar 1998 22:59:12 +1100
++
++ash (0.3.2-5) unstable; urgency=low
++
++  * Fixed a bug when doing pattern matching in parameter expansions.
++
++ -- Herbert Xu <herbert@debian.org>  Tue, 10 Mar 1998 21:25:40 +1100
++
++ash (0.3.2-4) unstable; urgency=low
++
++  * Allow ] to be quoted in bracket expressions (fixes #17533).
++  * Move dh_fixperms to second last spot (fixes #18267).
++  * Don't do field splitting in evalfor.
++
++ -- Herbert Xu <herbert@debian.org>  Tue, 17 Feb 1998 13:32:09 +1100
++
++ash (0.3.2-3) unstable; urgency=low
++
++  * Fixed stupid core dump.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 11 Feb 1998 21:33:55 +1100
++
++ash (0.3.2-2) unstable; urgency=low
++
++  * Hack for special builtins (fixes #18055).
++  * Hack for command.
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 11 Feb 1998 21:19:46 +1100
++
++ash (0.3.2-1) unstable; urgency=low
++
++  * NetBSD-current version as of 19980209.
++  * Fixed a word splitting problem after parameter expansion thanks to Alexey
++    Marinichev.
++  * Converted to debhelper (fixes #14612, #15005).
++
++ -- Herbert Xu <herbert@debian.org>  Mon,  9 Feb 1998 16:53:48 +1100
++
++ash (0.3.1-20) unstable; urgency=low
++
++  * Fixed -e problem with eval.
++
++ -- Herbert Xu <herbert@debian.org>  Sun,  7 Dec 1997 20:19:00 +1100
++
++ash (0.3.1-19) unstable; urgency=low
++
++  * Fixed -e problem with command substitution.
++
++ -- Herbert Xu <herbert@debian.org>  Sun,  7 Dec 1997 19:44:49 +1100
++
++ash (0.3.1-18) unstable; urgency=low
++
++  * Do not link with ncurses (#15485).
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 30 Nov 1997 12:00:11 +1100
++
++ash (0.3.1-17) unstable; urgency=low
++
++  * Set PATH like bash (#15238).
++
++ -- Herbert Xu <herbert@debian.org>  Wed, 26 Nov 1997 16:17:27 +1100
++
++ash (0.3.1-16) unstable; urgency=low
++
++  * Fixed incorrect assignment builtin code.
++
++ -- Herbert Xu <herbert@debian.org>  Mon, 24 Nov 1997 16:19:10 +1100
++
++ash (0.3.1-15) unstable; urgency=low
++
++  * hash now returns error codes (needed by the Linux kernel).
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 23 Nov 1997 21:37:08 +1100
++
++ash (0.3.1-14) unstable; urgency=low
++
++  * Disabled word-splitting for assignment builtins.
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 23 Nov 1997 12:45:15 +1100
++
++ash (0.3.1-13) unstable; urgency=low
++
++  * ! is now recognised even after &&/||.
++
++ -- Herbert Xu <herbert@debian.org>  Fri, 21 Nov 1997 22:09:05 +1100
++
++ash (0.3.1-12) unstable; urgency=low
++
++  * More fixes to the handling of SIGINT when forking.
++
++ -- Herbert Xu <herbert@debian.org>  Fri, 14 Nov 1997 15:14:32 +1100
++
++ash (0.3.1-11) unstable; urgency=low
++
++  * Ignore SIGINT when forking non-interactively.
++
++ -- Herbert Xu <herbert@debian.org>  Mon,  3 Nov 1997 12:00:02 +1100
++
++ash (0.3.1-10) unstable; urgency=low
++
++  * echo now handles options correctly.
++  * echo nolonger returns 0 if erorrs occured while writing to stdout.
++  * New code from GNU echo merged.
++  * Error messages from test now work.
++
++ -- Herbert Xu <herbert@debian.org>  Wed,  8 Oct 1997 21:47:13 +1000
++
++ash (0.3.1-9) unstable; urgency=low
++
++  * ! is recognised at pipeline level like bash.
++
++ -- Herbert Xu <herbert@debian.org>  Mon, 15 Sep 1997 23:13:45 +1000
++
++ash (0.3.1-8) unstable; urgency=medium
++
++  * Old patch regarding SIGCHLD in again.
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 31 Aug 1997 11:20:27 +1000
++
++ash (0.3.1-7) unstable; urgency=low
++
++  * /bin/sh -e is behaving even better now (for loops within conditionals).
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 23 Aug 1997 22:08:19 +1000
++
++ash (0.3.1-6) unstable; urgency=low
++
++  * /bin/sh -e is behaving better now.
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 23 Aug 1997 13:16:26 +1000
++
++ash (0.3.1-5) unstable; urgency=low
++
++  * hash -v /dir/command doesn't coredump anymore.
++  * type /dir/command now works correctly.
++
++ -- Herbert Xu <herbert@debian.org>  Fri,  1 Aug 1997 20:48:19 +1000
++
++ash (0.3.1-4) unstable; urgency=low
++
++  * trap now understands symbolic signal names.
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 26 Jul 1997 14:04:46 +1000
++
++ash (0.3.1-3) unstable; urgency=low
++
++  * Added the builtin test command.
++
++ -- Herbert Xu <herbert@debian.org>  Sun, 20 Jul 1997 15:00:14 +1000
++
++ash (0.3.1-2) unstable; urgency=medium
++
++  * Fixed a coredump involving $*.
++
++ -- Herbert Xu <herbert@debian.org>  Sat, 19 Jul 1997 12:03:02 +1000
++
++ash (0.3.1-1) unstable; urgency=medium
++
++  * NetBSD-current version as of 19970715.
++  * Fixed a "use after free" bug (#11294).
++
++ -- Herbert Xu <herbert@debian.org>  Fri, 18 Jul 1997 13:48:09 +1000
++
++ash (0.3-1) unstable; urgency=low
++
++  * Initial Release.
++
++ -- Herbert Xu <herbert@debian.org>  Thu, 19 Jun 1997 19:29:16 +1000
++
+diff -urN netbsd-sh/debian/control ash-0.3.7.orig/debian/control
+--- netbsd-sh/debian/control	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/control	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,69 @@
++Source: ash
++Section: shells
++Priority: optional
++Maintainer: Herbert Xu <herbert@debian.org>
++Build-Depends: byacc, debhelper, flex, pmake, groff
++Standards-Version: 3.2.1
++
++Package: ash
++Architecture: any
++Pre-Depends: ${shlibs:Depends}
++Description: NetBSD /bin/sh
++ "ash" is a POSIX compliant shell that is much smaller than "bash".
++ We take advantage of that by making it the shell on the installation
++ root floppy, where space is at a premium.
++ .
++ It can be usefully installed as /bin/sh (because it executes scripts
++ somewhat faster than "bash"), or as the default shell either of root
++ or of a second user with a userid of 0 (because it depends on fewer
++ libraries, and is therefore less likely to be affected by an upgrade
++ problem or a disk failure).  It is also useful for checking that a
++ script uses only POSIX syntax.
++ .
++ "bash" is a better shell for most users, since it has some nice
++ features absent from "ash", and is a required part of the system.
++
++Package: ash-medium
++Architecture: any
++Pre-Depends: ${shlibs:Depends}
++Priority: extra
++Description: NetBSD /bin/sh with HETIO
++ This is a slightly bigger version of the standard ash package with a
++ hack that provides primitive history support.  It may be useful on
++ boot floppies where space is at a premium, yet users still need the
++ ability to access previous commands in the same session.  If you're
++ not a boot floppies maintainer, you should probably go for ash,
++ ash.big (not yet available), or bash.
++ .
++ "ash" is a POSIX compliant shell that is much smaller than "bash".
++ We take advantage of that by making it the shell on the installation
++ root floppy, where space is at a premium.
++ .
++ It can be usefully installed as /bin/sh (because it executes scripts
++ somewhat faster than "bash"), or as the default shell either of root
++ or of a second user with a userid of 0 (because it depends on fewer
++ libraries, and is therefore less likely to be affected by an upgrade
++ problem or a disk failure).  It is also useful for checking that a
++ script uses only POSIX syntax.
++ .
++ "bash" is a better shell for most users, since it has some nice
++ features absent from "ash", and is a required part of the system.
++
++Package: ash-udeb
++Architecture: any
++Section: debian-installer
++Description: NetBSD /bin/sh for boot floppies
++ "ash" is a POSIX compliant shell that is much smaller than "bash".
++ We take advantage of that by making it the shell on the installation
++ root floppy, where space is at a premium.
++ .
++ It can be usefully installed as /bin/sh (because it executes scripts
++ somewhat faster than "bash"), or as the default shell either of root
++ or of a second user with a userid of 0 (because it depends on fewer
++ libraries, and is therefore less likely to be affected by an upgrade
++ problem or a disk failure).  It is also useful for checking that a
++ script uses only POSIX syntax.
++ .
++ "bash" is a better shell for most users, since it has some nice
++ features absent from "ash", and is a required part of the system.
++
+diff -urN netbsd-sh/debian/copyright ash-0.3.7.orig/debian/copyright
+--- netbsd-sh/debian/copyright	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/copyright	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,18 @@
++This package was debianized by Mark W. Eichin eichin@kitten.gen.ma.us on
++Mon, 24 Feb 1997 16:00:16 -0500.
++
++This package was re-ported from NetBSD and debianized by
++Herbert Xu herbert@debian.org on Thu, 19 Jun 1997 19:29:16 +1000.
++
++It was downloaded from ftp.netbsd.org.
++
++Copyright:
++
++Copyright (c) 1991, 1993
++	The Regents of the University of California.  All rights reserved.
++
++This code is derived from software contributed to Berkeley by Kenneth Almquist.
++
++Please refer to /usr/share/common-licenses/BSD for details.
++
++$Id: copyright,v 1.3 2000/08/04 11:48:49 herbert Exp $
+diff -urN netbsd-sh/debian/dirs ash-0.3.7.orig/debian/dirs
+--- netbsd-sh/debian/dirs	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/dirs	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,2 @@
++bin
++usr/share/man/man1
+diff -urN netbsd-sh/debian/rules ash-0.3.7.orig/debian/rules
+--- netbsd-sh/debian/rules	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/debian/rules	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,92 @@
++#!/usr/bin/make -f
++# $Id: rules,v 1.22 2001/01/13 04:23:49 herbert Exp $
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++CDEF = -g -O2 -Wall -DBSD=1 -DSMALL -D_GNU_SOURCE \
++       -DGLOB_BROKEN \
++       -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -D_DIAGASSERT\(x\)=
++CDEFSM = -Os -fomit-frame-pointer -Wall -DBSD=1 -DSMALL -D_GNU_SOURCE \
++       -DGLOB_BROKEN \
++       -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -D_DIAGASSERT\(x\)=
++
++sh.hetio:
++	chmod u+x debian/bsdyacc
++	rm -f *.o
++	pmake CFLAGS='$(CDEF)' HETIO= YACC=`pwd`/debian/bsdyacc
++	mv sh sh.hetio
++
++sh:
++	chmod u+x debian/bsdyacc
++	rm -f *.o
++	pmake CFLAGS='$(CDEF)' YACC=`pwd`/debian/bsdyacc
++
++sh.udeb:
++	chmod u+x debian/bsdyacc
++	rm -f *.o
++	pmake CFLAGS='$(CDEFSM)' YACC=`pwd`/debian/bsdyacc
++	mv sh sh.udeb
++
++build: build-stamp
++build-stamp: sh.hetio sh.udeb sh
++	dh_testdir
++
++	touch build-stamp
++
++clean:
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp
++
++	pmake clean HETIO=
++	rm -f sh.cat1 mksignames signames.h sh.hetio sh.udeb
++
++	dh_clean
++
++# Build architecture-independent files here.
++binary-indep: build
++# We have nothing to do by default.
++
++# Build architecture-dependent files here.
++binary-arch: build
++#	dh_testversion
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	install sh debian/tmp/bin/ash
++	install -m 644 sh.1 debian/tmp/usr/share/man/man1/ash.1
++	install sh.hetio debian/ash-medium/usr/bin/ash.medium
++	install -m 644 sh.1 debian/ash-medium/usr/share/man/man1/ash.medium.1
++	install sh.udeb debian/ash-udeb/bin/ash
++	ln -s ash debian/ash-udeb/bin/sh
++
++	dh_installdocs -Nash-udeb
++	dh_installexamples
++	dh_installmenu
++#	dh_installinit
++	dh_installcron
++#	dh_installmanpages
++#	dh_undocumented
++	dh_installchangelogs -Nash-udeb
++	dh_strip
++	dh_compress
++	dh_fixperms
++	dh_suidregister
++	dh_installdeb -Nash-udeb
++	dh_shlibdeps
++	dh_gencontrol
++#	dh_makeshlibs
++	dh_md5sums
++	dh_builddeb
++	for i in ../ash-udeb_*.deb; do mv $$i $${i%deb}udeb; done
++	sed '/^[^ ]*\.udeb/d; s/^\(ash-udeb_[^ ]*\.\)deb/\1udeb/' \
++		debian/files > debian/files.new
++	mv debian/files.new debian/files
++
++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
+
diff --git a/source/ap/ash/patches/ash-echo.patch b/source/ap/ash/patches/ash-echo.patch
new file mode 100644
index 000000000..89d93472f
--- /dev/null
+++ b/source/ap/ash/patches/ash-echo.patch
@@ -0,0 +1,91 @@
+diff -urN netbsd-sh/bltin/echo.c ash-0.3.7.orig/bltin/echo.c
+--- netbsd-sh/bltin/echo.c	Sun Nov  3 13:06:22 1996
++++ ash-0.3.7.orig/bltin/echo.c	Mon Apr 23 22:16:46 2001
+@@ -44,7 +44,13 @@
+ 
+ #define main echocmd
+ 
++#ifdef _GNU_SOURCE
++#include <stdio.h>
++
++#include "../mystring.h"
++#else
+ #include "bltin.h"
++#endif
+ 
+ /* #define eflag 1 */
+ 
+@@ -53,7 +59,6 @@
+ 	register char **ap;
+ 	register char *p;
+ 	register char c;
+-	int count;
+ 	int nflag = 0;
+ #ifndef eflag
+ 	int eflag = 0;
+@@ -62,21 +67,26 @@
+ 	ap = argv;
+ 	if (argc)
+ 		ap++;
+-	if ((p = *ap) != NULL) {
++	while ((p = *ap) != NULL && *p == '-') {
+ 		if (equal(p, "-n")) {
+-			nflag++;
+-			ap++;
++			nflag = 1;
+ 		} else if (equal(p, "-e")) {
+ #ifndef eflag
+-			eflag++;
++			eflag = 1;
++#endif
++		} else if (equal(p, "-E")) {
++#ifndef eflag
++			eflag = 0;
+ #endif
+-			ap++;
+ 		}
++		else break;
++		ap++;
+ 	}
+ 	while ((p = *ap++) != NULL) {
+ 		while ((c = *p++) != '\0') {
+ 			if (c == '\\' && eflag) {
+-				switch (*p++) {
++				switch (c = *p++) {
++				case 'a':  c = '\007'; break;
+ 				case 'b':  c = '\b';  break;
+ 				case 'c':  return 0;		/* exit */
+ 				case 'f':  c = '\f';  break;
+@@ -85,11 +95,13 @@
+ 				case 't':  c = '\t';  break;
+ 				case 'v':  c = '\v';  break;
+ 				case '\\':  break;		/* c = '\\' */
+-				case '0':
+-					c = 0;
+-					count = 3;
+-					while (--count >= 0 && (unsigned)(*p - '0') < 8)
+-						c = (c << 3) + (*p++ - '0');
++				case '0': case '1': case '2': case '3':
++				case '4': case '5': case '6': case '7':
++					c -= '0';
++					if (*p >= '0' && *p <= '7')
++						c = c * 8 + (*p++ - '0');
++					if (*p >= '0' && *p <= '7')
++					c = c * 8 + (*p++ - '0');
+ 					break;
+ 				default:
+ 					p--;
+@@ -103,5 +115,12 @@
+ 	}
+ 	if (! nflag)
+ 		putchar('\n');
++#ifdef _GNU_SOURCE
++	fflush(stdout);
++	if (ferror(stdout)) {
++		clearerr(stdout);
++		return 1;
++	}
++#endif
+ 	return 0;
+ }
+
diff --git a/source/ap/ash/patches/ash-freebsd.patch b/source/ap/ash/patches/ash-freebsd.patch
new file mode 100644
index 000000000..b0b114470
--- /dev/null
+++ b/source/ap/ash/patches/ash-freebsd.patch
@@ -0,0 +1,60 @@
+diff -ur ash-0.4.0/bltin/echo.c ash-0.4.0+free/bltin/echo.c
+--- ash-0.4.0/bltin/echo.c	Tue Apr 24 02:03:56 2001
++++ ash-0.4.0+free/bltin/echo.c	Tue Apr 24 01:43:15 2001
+@@ -89,6 +89,7 @@
+ 				case 'a':  c = '\007'; break;
+ 				case 'b':  c = '\b';  break;
+ 				case 'c':  return 0;		/* exit */
++				case 'e':  c = '\033';  break;
+ 				case 'f':  c = '\f';  break;
+ 				case 'n':  c = '\n';  break;
+ 				case 'r':  c = '\r';  break;
+diff -ur ash-0.4.0/cd.c ash-0.4.0+free/cd.c
+--- ash-0.4.0/cd.c	Tue Apr 24 02:03:56 2001
++++ ash-0.4.0+free/cd.c	Tue Apr 24 01:43:57 2001
+@@ -244,6 +244,7 @@
+ 		curdir = NULL;
+ 		getpwd();
+ 		setvar("PWD", curdir, VEXPORT|VTEXTFIXED);
++		setvar("OLDPWD", prevdir, VEXPORT|VTEXTFIXED);
+ 		INTON;
+ 		return;
+ 	}
+@@ -275,6 +276,7 @@
+ 	prevdir = curdir;
+ 	curdir = savestr(stackblock());
+ 	setvar("PWD", curdir, VEXPORT|VTEXTFIXED);
++	setvar("OLDPWD", prevdir, VEXPORT|VTEXTFIXED);
+ 	INTON;
+ }
+ 
+diff -ur ash-0.4.0/main.c ash-0.4.0+free/main.c
+--- ash-0.4.0/main.c	Tue Apr 24 02:03:57 2001
++++ ash-0.4.0+free/main.c	Tue Apr 24 02:03:26 2001
+@@ -115,6 +115,9 @@
+ 	struct stackmark smark;
+ 	volatile int state;
+ 	char *shinit;
++	int priviliged;
++
++	priviliged = getuid() != geteuid() || getgid() != getegid();
+ 
+ #if PROFILE
+ 	monitor(4, etext, profile_buf, sizeof profile_buf, 50);
+@@ -188,11 +191,14 @@
+ 		read_profile("/etc/profile");
+ state1:
+ 		state = 2;
+-		read_profile(".profile");
++		if (priviliged == 0)
++			read_profile(".profile");
++		else
++			read_profile("/etc/suid_profile");
+ 	}
+ state2:
+ 	state = 3;
+-	if (getuid() == geteuid() && getgid() == getegid()) {
++	if (iflag && !priviliged) {
+ 		if ((shinit = lookupvar("ENV")) != NULL && *shinit != '\0') {
+ 			state = 3;
+ 			read_profile(shinit);
diff --git a/source/ap/ash/patches/ash-getcwd.patch b/source/ap/ash/patches/ash-getcwd.patch
new file mode 100644
index 000000000..f98f487e3
--- /dev/null
+++ b/source/ap/ash/patches/ash-getcwd.patch
@@ -0,0 +1,13 @@
+diff -urN netbsd-sh/cd.c ash-0.3.7.orig/cd.c
+--- netbsd-sh/cd.c	Fri Jul  9 13:02:05 1999
++++ ash-0.3.7.orig/cd.c	Mon Apr 23 22:16:46 2001
+@@ -319,7 +319,7 @@
+ 	 * c implementation of getcwd, that does not open a pipe to
+ 	 * /bin/pwd.
+ 	 */
+-#if defined(__NetBSD__) || defined(__SVR4)
++#if defined(__NetBSD__) || defined(__SVR4) || defined(__GLIBC__)
+ 		
+ 	if (getcwd(buf, sizeof(buf)) == NULL) {
+ 		char *pwd = getenv("PWD");
+
diff --git a/source/ap/ash/patches/ash-getopt.patch b/source/ap/ash/patches/ash-getopt.patch
new file mode 100644
index 000000000..df88ba0df
--- /dev/null
+++ b/source/ap/ash/patches/ash-getopt.patch
@@ -0,0 +1,198 @@
+diff -urN netbsd-sh/options.c ash-0.3.7.orig/options.c
+--- netbsd-sh/options.c	Fri Jul  9 13:02:07 1999
++++ ash-0.3.7.orig/options.c	Mon Apr 23 22:16:46 2001
+@@ -79,7 +79,7 @@
+ STATIC void options __P((int));
+ STATIC void minus_o __P((char *, int));
+ STATIC void setoption __P((int, int));
+-STATIC int getopts __P((char *, char *, char **, char ***, char **));
++STATIC int getopts __P((char *, char *, char **, int *, int *));
+ 
+ 
+ /*
+@@ -118,7 +118,8 @@
+ 	        arg0 = *argptr++;
+ 
+ 	shellparam.p = argptr;
+-	shellparam.reset = 1;
++	shellparam.optind = 1;
++	shellparam.optoff = -1;
+ 	/* assert(shellparam.malloc == 0 && shellparam.nparam == 0); */
+ 	while (*argptr) {
+ 		shellparam.nparam++;
+@@ -282,7 +283,8 @@
+ 	shellparam.malloc = 1;
+ 	shellparam.nparam = nparam;
+ 	shellparam.p = newparam;
+-	shellparam.optnext = NULL;
++	shellparam.optind = 1;
++	shellparam.optoff = -1;
+ }
+ 
+ 
+@@ -330,7 +332,8 @@
+ 	}
+ 	ap2 = shellparam.p;
+ 	while ((*ap2++ = *ap1++) != NULL);
+-	shellparam.optnext = NULL;
++	shellparam.optind = 1;
++	shellparam.optoff = -1;
+ 	INTON;
+ 	return 0;
+ }
+@@ -363,10 +366,8 @@
+ getoptsreset(value)
+ 	const char *value;
+ {
+-	if (number(value) == 1) {
+-		shellparam.optnext = NULL;
+-		shellparam.reset = 1;
+-	}
++	shellparam.optind = number(value);
++	shellparam.optoff = -1;
+ }
+ 
+ /*
+@@ -385,50 +386,58 @@
+ 
+ 	if (argc < 3)
+ 		error("Usage: getopts optstring var [arg]");
+-	else if (argc == 3)
++	else if (argc == 3) {
+ 		optbase = shellparam.p;
+-	else
++		if (shellparam.optind > shellparam.nparam + 1) {
++			shellparam.optind = 1;
++			shellparam.optoff = -1;
++		}
++	}
++	else {
+ 		optbase = &argv[3];
+-
+-	if (shellparam.reset == 1) {
+-		shellparam.optnext = optbase;
+-		shellparam.optptr = NULL;
+-		shellparam.reset = 0;
++		if (shellparam.optind > argc - 2) {
++			shellparam.optind = 1;
++			shellparam.optoff = -1;
++		}
+ 	}
+ 
+-	return getopts(argv[1], argv[2], optbase, &shellparam.optnext,
+-		       &shellparam.optptr);
++	return getopts(argv[1], argv[2], optbase, &shellparam.optind,
++		       &shellparam.optoff);
+ }
+ 
+ STATIC int
+-getopts(optstr, optvar, optfirst, optnext, optpptr)
++getopts(optstr, optvar, optfirst, optind, optoff)
+ 	char *optstr;
+ 	char *optvar;
+ 	char **optfirst;
+-	char ***optnext;
+-	char **optpptr;
++	int *optind;
++	int *optoff;
+ {
+ 	char *p, *q;
+ 	char c = '?';
+ 	int done = 0;
+-	int ind = 0;
+ 	int err = 0;
+ 	char s[10];
++	char **optnext = optfirst + *optind - 1;
+ 
+-	if ((p = *optpptr) == NULL || *p == '\0') {
++	if (*optind <= 1 || *optoff < 0 || !(*(optnext - 1)) ||
++	    strlen(*(optnext - 1)) < *optoff)
++		p = NULL;
++	else
++		p = *(optnext - 1) + *optoff;
++	if (p == NULL || *p == '\0') {
+ 		/* Current word is done, advance */
+-		if (*optnext == NULL)
++		if (optnext == NULL)
+ 			return 1;
+-		p = **optnext;
++		p = *optnext;
+ 		if (p == NULL || *p != '-' || *++p == '\0') {
+ atend:
+-			ind = *optnext - optfirst + 1;
+-			*optnext = NULL;
++			*optind = optnext - optfirst + 1;
+ 			p = NULL;
+ 			done = 1;
+ 			goto out;
+ 		}
+-		(*optnext)++;
++		optnext++;
+ 		if (p[0] == '-' && p[1] == '\0')	/* check for "--" */
+ 			goto atend;
+ 	}
+@@ -453,7 +462,7 @@
+ 	}
+ 
+ 	if (*++q == ':') {
+-		if (*p == '\0' && (p = **optnext) == NULL) {
++		if (*p == '\0' && (p = *optnext) == NULL) {
+ 			if (optstr[0] == ':') {
+ 				s[0] = c;
+ 				s[1] = '\0';
+@@ -468,30 +477,29 @@
+ 			goto bad;
+ 		}
+ 
+-		if (p == **optnext)
+-			(*optnext)++;
++		if (p == *optnext)
++			optnext++;
+ 		setvarsafe("OPTARG", p, 0);
+ 		p = NULL;
+ 	}
+ 	else
+ 		setvarsafe("OPTARG", "", 0);
+-	ind = *optnext - optfirst + 1;
++	*optind = optnext - optfirst + 1;
+ 	goto out;
+ 
+ bad:
+-	ind = 1;
+-	*optnext = NULL;
++	*optind = 1;
+ 	p = NULL;
+ out:
+-	*optpptr = p;
+-	fmtstr(s, sizeof(s), "%d", ind);
++	*optoff = p ? p - *(optnext - 1) : -1;
++	fmtstr(s, sizeof(s), "%d", *optind);
+ 	err |= setvarsafe("OPTIND", s, VNOFUNC);
+ 	s[0] = c;
+ 	s[1] = '\0';
+ 	err |= setvarsafe(optvar, s, 0);
+ 	if (err) {
+-		*optnext = NULL;
+-		*optpptr = NULL;
++		*optind = 1;
++		*optoff = -1;
+ 		flushall();
+ 		exraise(EXERROR);
+ 	}
+diff -urN netbsd-sh/options.h ash-0.3.7.orig/options.h
+--- netbsd-sh/options.h	Fri Jul  9 13:02:07 1999
++++ ash-0.3.7.orig/options.h	Mon Apr 23 22:16:46 2001
+@@ -41,10 +41,9 @@
+ struct shparam {
+ 	int nparam;		/* # of positional parameters (without $0) */
+ 	unsigned char malloc;	/* if parameter list dynamically allocated */
+-	unsigned char reset;	/* if getopts has been reset */
+ 	char **p;		/* parameter list */
+-	char **optnext;		/* next parameter to be processed by getopts */
+-	char *optptr;		/* used by getopts */
++	int optind;		/* next parameter to be processed by getopts */
++	int optoff;		/* used by getopts */
+ };
+ 
+ 
+
diff --git a/source/ap/ash/patches/ash-glob.patch b/source/ap/ash/patches/ash-glob.patch
new file mode 100644
index 000000000..70013536e
--- /dev/null
+++ b/source/ap/ash/patches/ash-glob.patch
@@ -0,0 +1,445 @@
+diff -urN netbsd-sh/expand.c ash-0.3.7.orig/expand.c
+--- netbsd-sh/expand.c	Tue Mar 14 13:03:45 2000
++++ ash-0.3.7.orig/expand.c	Mon Apr 23 22:16:46 2001
+@@ -54,6 +54,10 @@
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
++#include <fnmatch.h>
++#include <glob.h>
++#endif
+ 
+ /*
+  * Routines to expand arguments to commands.  We have to deal with
+@@ -102,17 +106,30 @@
+ STATIC int subevalvar __P((char *, char *, int, int, int, int));
+ STATIC char *evalvar __P((char *, int));
+ STATIC int varisset __P((char *, int));
++STATIC char *strtodest __P((char *, int, int));
+ STATIC void varvalue __P((char *, int, int));
+ STATIC void recordregion __P((int, int, int));
+ STATIC void removerecordregions __P((int)); 
+ STATIC void ifsbreakup __P((char *, struct arglist *));
+ STATIC void ifsfree __P((void));
+ STATIC void expandmeta __P((struct strlist *, int));
++#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
++STATIC const char *preglob __P((const char *));
++STATIC void addglob __P((const glob_t *));
++#else
+ STATIC void expmeta __P((char *, char *));
++#endif
+ STATIC void addfname __P((char *));
++#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
++STATIC int patmatch __P((char *, char *, int));
++STATIC int patmatch2 __P((char *, char *, int));
++STATIC char * _rmescapes __P((char *, int));
++#else
+ STATIC struct strlist *expsort __P((struct strlist *));
+ STATIC struct strlist *msort __P((struct strlist *, int));
+ STATIC int pmatch __P((char *, char *, int));
++#define patmatch2 patmatch
++#endif
+ STATIC char *cvtnum __P((int, char *));
+ 
+ /*
+@@ -371,7 +388,7 @@
+ 	 * have to rescan starting from the beginning since CTLESC
+ 	 * characters have to be processed left to right.
+ 	 */
+-	CHECKSTRSPACE(8, expdest);
++	CHECKSTRSPACE(10, expdest);
+ 	USTPUTC('\0', expdest);
+ 	start = stackblock();
+ 	p = expdest - 1;
+@@ -393,7 +410,7 @@
+ 	if (quotes)
+ 		rmescapes(p+2);
+ 	result = arith(p+2);
+-	fmtstr(p, 10, "%d", result);
++	fmtstr(p, 12, "%d", result);
+ 
+ 	while (*p++)
+ 		;
+@@ -503,7 +520,7 @@
+ 	int amount;
+ 
+ 	herefd = -1;
+-	argstr(p, 0);
++	argstr(p, subtype != VSASSIGN && subtype != VSQUESTION ? EXP_CASE : 0);
+ 	STACKSTRNUL(expdest);
+ 	herefd = saveherefd;
+ 	argbackq = saveargbackq;
+@@ -535,7 +552,7 @@
+ 		for (loc = startp; loc < str; loc++) {
+ 			c = *loc;
+ 			*loc = '\0';
+-			if (patmatch(str, startp, varflags & VSQUOTE))
++			if (patmatch2(str, startp, varflags & VSQUOTE))
+ 				goto recordleft;
+ 			*loc = c;
+ 			if ((varflags & VSQUOTE) && *loc == CTLESC)
+@@ -547,7 +564,7 @@
+ 		for (loc = str - 1; loc >= startp;) {
+ 			c = *loc;
+ 			*loc = '\0';
+-			if (patmatch(str, startp, varflags & VSQUOTE))
++			if (patmatch2(str, startp, varflags & VSQUOTE))
+ 				goto recordleft;
+ 			*loc = c;
+ 			loc--;
+@@ -564,7 +581,7 @@
+ 
+ 	case VSTRIMRIGHT:
+ 	        for (loc = str - 1; loc >= startp;) {
+-			if (patmatch(str, loc, varflags & VSQUOTE))
++			if (patmatch2(str, loc, varflags & VSQUOTE))
+ 				goto recordright;
+ 			loc--;
+ 			if ((varflags & VSQUOTE) && loc > startp &&
+@@ -580,7 +597,7 @@
+ 
+ 	case VSTRIMRIGHTMAX:
+ 		for (loc = startp; loc < str - 1; loc++) {
+-			if (patmatch(str, loc, varflags & VSQUOTE))
++			if (patmatch2(str, loc, varflags & VSQUOTE))
+ 				goto recordright;
+ 			if ((varflags & VSQUOTE) && *loc == CTLESC)
+ 			        loc++;
+@@ -819,6 +836,34 @@
+ 
+ 
+ /*
++ * Put a string on the stack.
++ */
++
++STATIC char *
++strtodest(p, quoted, allow_split)
++	char *p;
++	int quoted;
++	int allow_split;
++{
++	char const *syntax;
++
++	if (allow_split) {
++		syntax = quoted ? DQSYNTAX : BASESYNTAX;
++		while (*p) {
++			if (syntax[(int) *p] == CCTL)
++				STPUTC(CTLESC, expdest);
++			STPUTC(*p++, expdest);
++		}
++	} else
++		while (*p)
++			STPUTC(*p++, expdest);
++
++	return p;
++}
++
++
++
++/*
+  * Add the value of a specialized variable to the stack string.
+  */
+ 
+@@ -834,22 +879,6 @@
+ 	extern int oexitstatus;
+ 	char sep;
+ 	char **ap;
+-	char const *syntax;
+-
+-#define STRTODEST(p) \
+-	do {\
+-	if (allow_split) { \
+-		syntax = quoted? DQSYNTAX : BASESYNTAX; \
+-		while (*p) { \
+-			if (syntax[(int)*p] == CCTL) \
+-				STPUTC(CTLESC, expdest); \
+-			STPUTC(*p++, expdest); \
+-		} \
+-	} else \
+-		while (*p) \
+-			STPUTC(*p++, expdest); \
+-	} while (0)
+-
+ 
+ 	switch (*name) {
+ 	case '$':
+@@ -875,7 +904,7 @@
+ 	case '@':
+ 		if (allow_split && quoted) {
+ 			for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
+-				STRTODEST(p);
++				p = strtodest(p, quoted, allow_split);
+ 				if (*ap)
+ 					STPUTC('\0', expdest);
+ 			}
+@@ -888,21 +917,20 @@
+ 		else
+ 			sep = ' ';
+ 		for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
+-			STRTODEST(p);
++			p = strtodest(p, quoted, allow_split);
+ 			if (*ap && sep)
+ 				STPUTC(sep, expdest);
+ 		}
+ 		break;
+ 	case '0':
+-		p = arg0;
+-		STRTODEST(p);
++		p = strtodest(arg0, quoted, allow_split);
+ 		break;
+ 	default:
+ 		if (is_digit(*name)) {
+ 			num = atoi(name);
+ 			if (num > 0 && num <= shellparam.nparam) {
+-				p = shellparam.p[num - 1];
+-				STRTODEST(p);
++				p = strtodest(shellparam.p[num - 1], quoted,
++					      allow_split);
+ 			}
+ 		}
+ 		break;
+@@ -1054,6 +1082,98 @@
+  * should be escapes.  The results are stored in the list exparg.
+  */
+ 
++#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
++STATIC void
++expandmeta(str, flag)
++	struct strlist *str;
++	int flag;
++{
++	const char *p;
++	glob_t pglob;
++	/* TODO - EXP_REDIR */
++
++	while (str) {
++		if (fflag)
++			goto nometa;
++		p = preglob(str->text);
++		INTOFF;
++		switch (glob(p, GLOB_NOMAGIC, 0, &pglob)) {
++		case 0:
++			if (!(pglob.gl_flags & GLOB_MAGCHAR))
++				goto nometa2;
++			addglob(&pglob);
++			globfree(&pglob);
++			INTON;
++			break;
++		case GLOB_NOMATCH:
++nometa2:
++			globfree(&pglob);
++			INTON;
++nometa:
++			*exparg.lastp = str;
++			rmescapes(str->text);
++			exparg.lastp = &str->next;
++			break;
++		default:	/* GLOB_NOSPACE */
++			error("Out of space");
++		}
++		str = str->next;
++	}
++}
++
++
++/*
++ * Prepare the string for glob(3).
++ */
++
++STATIC const char *
++preglob(str)
++	const char *str;
++{
++	const char *p;
++	char *q, *r;
++	size_t len;
++
++	p = str;
++	while (*p != CTLQUOTEMARK && *p != CTLESC) {
++		if (*p++ == '\0')
++			return str;
++	}
++	len = p - str;
++	q = r = stalloc(strlen(str) + 1);
++	if (len > 0) {
++		memcpy(q, str, len);
++		q += len;
++	}
++	do {
++		if (*p == CTLQUOTEMARK)
++			continue;
++		if (*p == CTLESC) {
++			if (*++p != '/')
++				*q++ = '\\';
++		}
++		*q++ = *p;
++	} while (*++p);
++	*q = '\0';
++	return r;
++}
++
++
++/*
++ * Add the result of glob(3) to the list.
++ */
++
++STATIC void
++addglob(pglob)
++	const glob_t *pglob;
++{
++	char **p = pglob->gl_pathv;
++
++	do {
++		addfname(*p);
++	} while (*++p);
++}
++#else
+ char *expdir;
+ 
+ 
+@@ -1238,6 +1358,7 @@
+ 	if (! atend)
+ 		endname[-1] = '/';
+ }
++#endif
+ 
+ 
+ /*
+@@ -1260,6 +1381,7 @@
+ }
+ 
+ 
++#if !(defined(__GLIBC__) && !defined(GLOB_BROKEN))
+ /*
+  * Sort the results of file name expansion.  It calculates the number of
+  * strings to sort and then calls msort (short for merge sort) to do the
+@@ -1321,6 +1443,7 @@
+ 	}
+ 	return list;
+ }
++#endif
+ 
+ 
+ 
+@@ -1328,6 +1451,39 @@
+  * Returns true if the pattern matches the string.
+  */
+ 
++#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
++STATIC int
++patmatch(pattern, string, squoted)
++	char *pattern;
++	char *string;
++	int squoted;	/* string might have quote chars */
++	{
++	const char *p;
++	char *q;
++
++	p = preglob(pattern);
++	q = squoted ? _rmescapes(string, 1) : string;
++
++	return !fnmatch(p, q, 0);
++}
++
++
++STATIC int
++patmatch2(pattern, string, squoted)
++	char *pattern;
++	char *string;
++	int squoted;	/* string might have quote chars */
++	{
++	char *p;
++	int res;
++
++	sstrnleft--;
++	p = grabstackstr(expdest);
++	res = patmatch(pattern, string, squoted);
++	ungrabstackstr(p, expdest);
++	return res;
++}
++#else
+ int
+ patmatch(pattern, string, squoted)
+ 	char *pattern;
+@@ -1462,6 +1618,7 @@
+ 		return 0;
+ 	return 1;
+ }
++#endif
+ 
+ 
+ 
+@@ -1469,6 +1626,50 @@
+  * Remove any CTLESC characters from a string.
+  */
+ 
++#if defined(__GLIBC__) && !defined(GLOB_BROKEN)
++void
++rmescapes(str)
++	char *str;
++{
++	_rmescapes(str, 0);
++}
++
++
++STATIC char *
++_rmescapes(str, flag)
++	char *str;
++	int flag;
++{
++	char *p, *q, *r;
++
++	p = str;
++	while (*p != CTLESC && *p != CTLQUOTEMARK) {
++		if (*p++ == '\0')
++			return str;
++	}
++	q = p;
++	r = str;
++	if (flag) {
++		size_t len = p - str;
++		q = r = stalloc(strlen(p) + len + 1);
++		if (len > 0) {
++			memcpy(q, str, len);
++			q += len;
++		}
++	}
++	while (*p) {
++		if (*p == CTLQUOTEMARK) {
++			p++;
++			continue;
++		}
++		if (*p == CTLESC)
++			p++;
++		*q++ = *p++;
++	}
++	*q = '\0';
++	return r;
++}
++#else
+ void
+ rmescapes(str)
+ 	char *str;
+@@ -1492,6 +1693,7 @@
+ 	}
+ 	*q = '\0';
+ }
++#endif
+ 
+ 
+ 
+
+diff -urN netbsd-sh/expand.h ash-0.3.7.orig/expand.h
+--- netbsd-sh/expand.h	Fri Jul  9 13:02:06 1999
++++ ash-0.3.7.orig/expand.h	Mon Apr 23 22:16:46 2001
+@@ -64,7 +64,9 @@
+ void expandhere __P((union node *, int));
+ void expandarg __P((union node *, struct arglist *, int));
+ void expari __P((int));
++#if !(defined(__GLIBC__) && !defined(GLOB_BROKEN))
+ int patmatch __P((char *, char *, int));
++#endif
+ void rmescapes __P((char *));
+ int casematch __P((union node *, char *));
+ 
diff --git a/source/ap/ash/patches/ash-hetio.patch b/source/ap/ash/patches/ash-hetio.patch
new file mode 100644
index 000000000..c416cde53
--- /dev/null
+++ b/source/ap/ash/patches/ash-hetio.patch
@@ -0,0 +1,559 @@
+diff -urN ash-0.4.0/Makefile ash-0.4.0-/Makefile
+--- ash-0.4.0/Makefile	Tue Apr 24 00:57:33 2001
++++ ash-0.4.0-/Makefile	Tue Apr 24 00:59:53 2001
+@@ -7,7 +7,7 @@
+ SHSRCS=	alias.c cd.c echo.c error.c eval.c exec.c expand.c \
+ 	histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \
+ 	mystring.c options.c parser.c redir.c show.c trap.c output.c var.c \
+-	test.c setmode.c test.c
++	test.c setmode.c test.c hetio.c
+ GENSRCS=builtins.c builtins.h init.c nodes.c arith.c arith.h lex.yy.c \
+ 	nodes.h syntax.c syntax.h token.h signames.c
+ SRCS=	${SHSRCS} ${GENSRCS}
+@@ -17,12 +17,13 @@
+ 	mystring.o options.o output.o parser.o redir.o show.o \
+ 	trap.o var.o bltin/test.o signames.o \
+ 	builtins.o init.o nodes.o syntax.o arith.o lex.yy.o \
+-	setmode.o bltin/times.o
++	setmode.o bltin/times.o hetio.o
+ 
+ OPT_FLAGS=-O2 -g
+ LDFLAGS=-g
+ CFLAGS=$(OPT_FLAGS) -DSHELL -I. -DNO_HISTORY -DBSD=1 -DSMALL -D_GNU_SOURCE \
+-	-DGLOB_BROKEN -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -D_DIAGASSERT\(x\)=
++	-DGLOB_BROKEN -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -D_DIAGASSERT\(x\)= \
++	-DHETIO
+ 
+ all: $(PROG)
+ 
+diff -urN ash-0.4.0/hetio.c ash-0.4.0-/hetio.c
+--- ash-0.4.0/hetio.c	Thu Jan  1 01:00:00 1970
++++ ash-0.4.0-/hetio.c	Tue Apr 24 01:06:59 2001
+@@ -0,0 +1,377 @@
++/*
++ * Termios command line History and Editting for NetBSD sh (ash)
++ * Copyright (c) 1999
++ *	Main code:	Adam Rogoyski <rogoyski@cs.utexas.edu> 
++ *	Etc:		Dave Cinege <dcinege@psychosis.com>
++ *
++ * You may use this code as you wish, so long as the original author(s)
++ * are attributed in any redistributions of the source code.
++ * This code is 'as is' with no warranty.
++ * This code may safely be consumed by a BSD or GPL license.
++ *
++ * v 0.5  19990328	Initial release 
++ *
++ * Future plans: Simple file and path name completion. (like BASH)
++ *
++ */
++
++/*
++Usage and Known bugs:
++	Terminal key codes are not extensive, and more will probably
++	need to be added. This version was created on Debian GNU/Linux 2.x.
++	Delete, Backspace, Home, End, and the arrow keys were tested
++	to work in an Xterm and console. Ctrl-A also works as Home.
++	Ctrl-E also works as End. The binary size increase is <3K.
++	
++	Editting will not display correctly for lines greater then the 
++	terminal width. (more then one line.) However, history will.
++*/
++
++#include <stdio.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <string.h>
++#include <termios.h>
++#include <ctype.h>
++#include <sys/ioctl.h>
++
++#include "input.h"
++#include "output.h"
++
++#ifdef HETIO
++
++#include "hetio.h"
++
++   
++#define  MAX_HISTORY   15			/* Maximum length of the linked list for the command line history */
++
++#define ESC	27
++#define DEL	127
++
++static struct history *his_front = NULL;	/* First element in command line list */
++static struct history *his_end = NULL;		/* Last element in command line list */
++static struct termios old_term, new_term;	/* Current termio and the previous termio before starting ash */
++
++static int history_counter = 0;			/* Number of commands in history list */
++static int reset_term = 0;			/* Set to true if the terminal needs to be reset upon exit */
++static int hetio_inter = 0;
++
++struct history
++{
++   char *s;
++   struct history *p;
++   struct history *n;
++};
++
++
++void input_delete    (int);
++void input_home      (int *);
++void input_end       (int *, int);
++void input_backspace (int *, int *);
++
++
++
++void hetio_init(void)
++{
++	hetio_inter = 1;
++}
++
++
++void hetio_reset_term(void)
++{
++	if (reset_term)
++		tcsetattr(1, TCSANOW, &old_term);
++}
++
++
++void setIO(struct termios *new, struct termios *old)	/* Set terminal IO to canonical mode, and save old term settings. */
++{
++	tcgetattr(0, old);
++	memcpy(new, old, sizeof(*new));
++	new->c_cc[VMIN] = 1;
++	new->c_cc[VTIME] = 0;
++	new->c_lflag &= ~ICANON; /* unbuffered input */
++	new->c_lflag &= ~ECHO;
++	tcsetattr(0, TCSANOW, new);
++}
++
++void input_home(int *cursor)				/* Command line input routines */
++{
++ 	while (*cursor > 0) {
++		out1c('\b');
++		--*cursor;
++	}
++	flushout(&output);
++}
++
++
++void input_delete(int cursor)
++{
++	int j = 0;
++
++	memmove(parsenextc + cursor, parsenextc + cursor + 1,
++		BUFSIZ - cursor - 1);
++	for (j = cursor; j < (BUFSIZ - 1); j++) {
++		if (!*(parsenextc + j))
++			break;
++		else
++			out1c(*(parsenextc + j));
++	}
++
++	out1str(" \b");
++	
++	while (j-- > cursor)
++		out1c('\b');
++	flushout(&output);
++}
++
++
++void input_end(int *cursor, int len)
++{
++	while (*cursor < len) {
++		out1str("\033[C");
++		++*cursor;
++	}
++	flushout(&output);
++}
++
++
++void
++input_backspace(int *cursor, int *len)
++{
++	int j = 0;
++
++	if (*cursor > 0) {
++		out1str("\b \b");
++		--*cursor;
++		memmove(parsenextc + *cursor, parsenextc + *cursor + 1, 
++			BUFSIZ - *cursor + 1);
++		
++		for (j = *cursor; j < (BUFSIZ - 1); j++) {
++			if (!*(parsenextc + j))
++				break;
++			else
++				out1c(*(parsenextc + j));
++		}
++		
++		out1str(" \b");
++		
++		while (j-- > *cursor)
++			out1c('\b');
++		
++		--*len;
++		flushout(&output);
++	}
++}
++
++int hetio_read_input(int fd)
++{
++	int nr = 0;
++
++	if (!hetio_inter) {		/* Are we an interactive shell? */
++		return -255;		
++	} else {
++		int len = 0;
++		int j = 0;
++		int cursor = 0;
++		int break_out = 0;
++		int ret = 0;
++		char c = 0;
++		struct history *hp = his_end;
++
++		if (!reset_term) {
++			setIO(&new_term, &old_term);
++			reset_term = 1;
++		} else {
++			tcsetattr(0, TCSANOW, &new_term);
++		}
++		
++		memset(parsenextc, 0, BUFSIZ);
++		
++		while (1) {
++			if ((ret = read(fd, &c, 1)) < 1)
++				return ret;
++			
++			switch (c) {
++   				case 1:		/* Control-A Beginning of line */
++   					input_home(&cursor);
++					break;
++				case 5:		/* Control-E EOL */
++					input_end(&cursor, len);
++					break;
++				case 4:		/* Control-D */
++#ifndef CTRL_D_DELETE
++					return 0;
++#else
++					if (cursor != len) {
++						input_delete(cursor);
++						len--;
++					}
++					break;
++#endif
++				case '\b':	/* Backspace */
++				case DEL:
++					input_backspace(&cursor, &len);
++					break;
++				case '\n':	/* Enter */
++					*(parsenextc + len++ + 1) = c;
++					out1c(c);
++					flushout(&output);
++					break_out = 1;
++					break;
++				case ESC:	/* escape sequence follows */
++					if ((ret = read(fd, &c, 1)) < 1)
++						return ret;
++										
++					if (c == '[' || c == 'O' ) {    /* 91 */
++						if ((ret = read(fd, &c, 1)) < 1)
++							return ret;
++						
++						switch (c) {
++							case 'A':
++								if (hp && hp->p) {		/* Up */
++									hp = hp->p;
++									goto hop;
++								}
++								break;
++							case 'B':
++								if (hp && hp->n && hp->n->s) {	/* Down */
++									hp = hp->n;
++									goto hop;
++								}
++								break;
++
++hop:						/* hop */							
++								len = strlen(parsenextc);
++
++								for (; cursor > 0; cursor--)		/* return to begining of line */
++									out1c('\b');
++
++		   						for (j = 0; j < len; j++)		/* erase old command */
++									out1c(' ');
++
++								for (j = len; j > 0; j--)		/* return to begining of line */
++									out1c('\b');
++
++								strcpy (parsenextc, hp->s);		/* write new command */
++								len = strlen (hp->s);
++								out1str(parsenextc);
++								flushout(&output);
++								cursor = len;
++								break;
++							case 'C':		/* Right */
++      								if (cursor < len) {
++									out1str("\033[C");
++									cursor++;
++									flushout(&output);
++						 		}
++								break;
++							case 'D':		/* Left */
++								if (cursor > 0) {
++									out1str("\033[D");
++									cursor--;
++									flushout(&output);
++								}
++								break;
++							case '3':		/* Delete */
++								if (cursor != len) {
++									input_delete(cursor);
++									len--;
++								}
++								break;								
++							case 'H':		/* Home (xterm) */
++							case '1':		/* Home (Ctrl-A) */
++      								input_home(&cursor);
++								break;
++							case 'F':		/* End (xterm_ */
++							case '4':		/* End (Ctrl-E) */
++								input_end(&cursor, len);
++								break;
++						}
++						if (c == '1' || c == '3' || c == '4')
++							if ((ret = read(fd, &c, 1)) < 1)
++								return ret;  /* read 126 (~) */
++					}
++			
++					c = 0;
++					break;
++		
++				default:				/* If it's regular input, do the normal thing */
++	       
++					if (!isprint(c))		/* Skip non-printable characters */
++						break;
++							       
++	       				if (len >= (BUFSIZ - 2))	/* Need to leave space for enter */
++		  				break;
++	       		
++					len++;
++			
++					if (cursor == (len - 1)) {	/* Append if at the end of the line */
++						*(parsenextc + cursor) = c;
++					} else {			/* Insert otherwise */
++						memmove(parsenextc + cursor + 1, parsenextc + cursor,
++							len - cursor - 1);
++					
++						*(parsenextc + cursor) = c;
++			
++						for (j = cursor; j < len; j++)
++							out1c(*(parsenextc + j));
++						for (; j > cursor; j--)
++							out1str("\033[D");
++					}
++		
++					cursor++;
++					out1c(c);
++					flushout(&output);
++					break;
++			}
++			
++			if (break_out)		/* Enter is the command terminator, no more input. */
++				break;
++		}
++	
++		nr = len + 1;
++		tcsetattr(0, TCSANOW, &old_term);
++		
++		
++		if (*(parsenextc)) {		/* Handle command history log */
++			struct history *h = his_end;
++  
++			if (!h) {       /* No previous history */
++				h = his_front = malloc(sizeof (struct history));
++				h->n = malloc(sizeof (struct history));
++				h->p = NULL;
++				h->s = strdup(parsenextc);
++
++				h->n->p = h;
++				h->n->n = NULL;
++				h->n->s = NULL;
++				his_end = h->n;
++				history_counter++;
++			} else {	/* Add a new history command */
++  
++				h->n = malloc(sizeof (struct history)); 
++
++				h->n->p = h;
++				h->n->n = NULL;
++				h->n->s = NULL;
++				h->s = strdup(parsenextc);
++				his_end = h->n;
++
++				if (history_counter >= MAX_HISTORY) {	/* After max history, remove the last known command */
++					struct history *p = his_front->n;
++					
++					p->p = NULL;
++					free(his_front->s);
++					free(his_front);
++					his_front = p;
++				} else {
++					history_counter++;
++				}
++			}
++		}
++	} 
++
++	return nr;
++}
++#endif
+diff -urN ash-0.4.0/hetio.h ash-0.4.0-/hetio.h
+--- ash-0.4.0/hetio.h	Thu Jan  1 01:00:00 1970
++++ ash-0.4.0-/hetio.h	Tue Apr 24 00:13:57 2001
+@@ -0,0 +1,22 @@
++/*
++ * Termios command line History and Editting for NetBSD sh (ash)
++ * Copyright (c) 1999
++ *	Main code:	Adam Rogoyski <rogoyski@cs.utexas.edu> 
++ *	Etc:		Dave Cinege <dcinege@psychosis.com>
++ *
++ * You may use this code as you wish, so long as the original author(s)
++ * are attributed in any redistributions of the source code.
++ * This code is 'as is' with no warranty.
++ * This code may safely be consumed by a BSD or GPL license.
++ *
++ * v 0.5  19990328	Initial release 
++ *
++ * Future plans: Simple file and path name completion. (like BASH)
++ *
++ */
++
++void hetio_init(void);
++int hetio_read_input(int fd);
++void hetio_reset_term(void);
++
++extern int hetio_inter;
+diff -urN ash-0.4.0/histedit.c ash-0.4.0-/histedit.c
+--- ash-0.4.0/histedit.c	Fri Jan 12 17:50:35 2001
++++ ash-0.4.0-/histedit.c	Tue Apr 24 00:13:57 2001
+@@ -60,9 +60,9 @@
+ #include "main.h"
+ #include "output.h"
+ #include "mystring.h"
+-#include "myhistedit.h"
+ #include "error.h"
+ #ifndef SMALL
++#include "myhistedit.h"
+ #include "eval.h"
+ #include "memalloc.h"
+ 
+@@ -219,7 +219,11 @@
+ 	if (argc == 1)
+ 		error("missing history argument");
+ 
++#ifdef __GLIBC__
++	optind = 1;
++#else
+ 	optreset = 1; optind = 1; /* initialize getopt */
++#endif
+ 	while (not_fcnumber(argv[optind]) &&
+ 	      (ch = getopt(argc, argv, ":e:lnrs")) != -1)
+ 		switch ((char)ch) {
+diff -urN ash-0.4.0/input.c ash-0.4.0-/input.c
+--- ash-0.4.0/input.c	Tue May 23 12:03:19 2000
++++ ash-0.4.0-/input.c	Tue Apr 24 00:13:57 2001
+@@ -66,7 +66,13 @@
+ #include "error.h"
+ #include "alias.h"
+ #include "parser.h"
++#ifndef SMALL
+ #include "myhistedit.h"
++#endif
++
++#ifdef HETIO
++#include "hetio.h"
++#endif
+ 
+ #define EOF_NLEFT -99		/* value of parsenleft when EOF pushed back */
+ 
+@@ -108,7 +114,9 @@
+ int init_editline = 0;		/* editline library initialized? */
+ int whichprompt;		/* 1 == PS1, 2 == PS2 */
+ 
++#ifndef SMALL
+ EditLine *el;			/* cookie for editline package */
++#endif
+ 
+ STATIC void pushfile __P((void));
+ static int preadfd __P((void));
+@@ -197,6 +205,11 @@
+ 			(void) strcpy(buf, rl_cp);
+ 		}
+ 	} else
++#endif
++
++#ifdef HETIO
++		nr = hetio_read_input(parsefile->fd);
++		if (nr == -255)
+ #endif
+ 		nr = read(parsefile->fd, buf, BUFSIZ - 1);
+ 
+diff -urN ash-0.4.0/main.c ash-0.4.0-/main.c
+--- ash-0.4.0/main.c	Tue Apr 24 00:57:33 2001
++++ ash-0.4.0-/main.c	Tue Apr 24 00:13:57 2001
+@@ -79,6 +79,10 @@
+ #include "exec.h"
+ #include "cd.h"
+ 
++#ifdef HETIO
++#include "hetio.h"
++#endif
++
+ #define PROFILE 0
+ 
+ int rootpid;
+@@ -242,6 +246,10 @@
+ 
+ 	TRACE(("cmdloop(%d) called\n", top));
+ 	setstackmark(&smark);
++#ifdef HETIO
++	if(iflag && top)
++		hetio_init();
++#endif
+ 	for (;;) {
+ 		if (pendingsigs)
+ 			dotrap();
+Binary files ash-0.4.0/mksignames and ash-0.4.0-/mksignames differ
+diff -urN ash-0.4.0/trap.c ash-0.4.0-/trap.c
+--- ash-0.4.0/trap.c	Tue Apr 24 00:57:33 2001
++++ ash-0.4.0-/trap.c	Tue Apr 24 00:13:57 2001
+@@ -62,7 +62,11 @@
+ #include "error.h"
+ #include "trap.h"
+ #include "mystring.h"
++#include "mail.h"
+ 
++#ifdef HETIO
++#include "hetio.h"
++#endif
+ 
+ /*
+  * Sigmode records the current value of the signal handlers for the various
+@@ -341,6 +345,7 @@
+ 	setsignal(SIGINT);
+ 	setsignal(SIGQUIT);
+ 	setsignal(SIGTERM);
++	chkmail(1);
+ 	is_interactive = on;
+ }
+ 
+@@ -358,6 +363,9 @@
+ 	char *p;
+ 
+ 	TRACE(("exitshell(%d) pid=%d\n", status, getpid()));
++#ifdef HETIO
++	hetio_reset_term();
++#endif
+ 	if (setjmp(loc1.loc)) {
+ 		goto l1;
+ 	}
diff --git a/source/ap/ash/patches/ash-jobs.patch b/source/ap/ash/patches/ash-jobs.patch
new file mode 100644
index 000000000..9e89118f5
--- /dev/null
+++ b/source/ap/ash/patches/ash-jobs.patch
@@ -0,0 +1,108 @@
+diff -ur netbsd-sh/jobs.c netbsd-sh-/jobs.c
+--- netbsd-sh/jobs.c	Tue May 23 12:03:19 2000
++++ netbsd-sh-/jobs.c	Mon Apr 23 23:31:47 2001
+@@ -92,6 +92,7 @@
+ int initialpgrp;		/* pgrp of shell on invocation */
+ short curjob;			/* current job */
+ #endif
++STATIC int intreceived;
+ 
+ STATIC void restartjob __P((struct job *));
+ STATIC void freejob __P((struct job *));
+@@ -101,8 +102,10 @@
+ STATIC int waitproc __P((int, int *));
+ STATIC void cmdtxt __P((union node *));
+ STATIC void cmdputs __P((const char *));
++STATIC void waitonint(int);
+ 
+ 
++#if JOBS
+ /*
+  * Turn job control on and off.
+  *
+@@ -171,6 +174,7 @@
+ 	}
+ 	jobctl = on;
+ }
++#endif
+ 
+ 
+ #ifdef mkinit
+@@ -594,9 +598,6 @@
+ 		TRACE(("Child shell %d\n", getpid()));
+ 		wasroot = rootshell;
+ 		rootshell = 0;
+-		for (i = njobs, p = jobtab ; --i >= 0 ; p++)
+-			if (p->used)
+-				freejob(p);
+ 		closescript();
+ 		INTON;
+ 		clear_traps();
+@@ -642,6 +643,9 @@
+ 			}
+ 		}
+ #endif
++		for (i = njobs, p = jobtab ; --i >= 0 ; p++)
++			if (p->used)
++				freejob(p);
+ 		if (wasroot && iflag) {
+ 			setsignal(SIGINT);
+ 			setsignal(SIGQUIT);
+@@ -701,13 +705,33 @@
+ #endif
+ 	int status;
+ 	int st;
++	struct sigaction act, oact;
+ 
+ 	INTOFF;
++	intreceived = 0;
++#if JOBS
++	if (!jobctl) {
++#else
++	if (!iflag) {
++#endif
++		sigaction(SIGINT, 0, &act);
++		act.sa_handler = waitonint;
++		sigaction(SIGINT, &act, &oact);
++	}
+ 	TRACE(("waitforjob(%%%d) called\n", jp - jobtab + 1));
+ 	while (jp->state == 0) {
+ 		dowait(1, jp);
+ 	}
+ #if JOBS
++	if (!jobctl) {
++#else
++	if (!iflag) {
++#endif
++		extern char *trap[];
++		sigaction(SIGINT, &oact, 0);
++		if (intreceived && trap[SIGINT]) kill(getpid(), SIGINT);
++	}
++#if JOBS
+ 	if (jp->jobctl) {
+ #ifdef OLD_TTY_DRIVER
+ 		if (ioctl(2, TIOCSPGRP, (char *)&mypgrp) < 0)
+@@ -896,10 +920,10 @@
+ #ifdef BSD
+ 	int flags;
+ 
+-#if JOBS
+-	flags = WUNTRACED;
+-#else
+ 	flags = 0;
++#if JOBS
++	if (jobctl)
++		flags |= WUNTRACED;
+ #endif
+ 	if (block == 0)
+ 		flags |= WNOHANG;
+@@ -1139,4 +1163,9 @@
+ 		}
+ 	}
+ 	cmdnextc = q;
++}
++
++STATIC void waitonint(int sig) {
++	intreceived = 1;
++	return;
+ }
diff --git a/source/ap/ash/patches/ash-kill.patch b/source/ap/ash/patches/ash-kill.patch
new file mode 100644
index 000000000..f2972d94c
--- /dev/null
+++ b/source/ap/ash/patches/ash-kill.patch
@@ -0,0 +1,675 @@
+diff -urN netbsd-sh/jobs.c ash-0.3.7.orig/jobs.c
+--- netbsd-sh/jobs.c	Tue May 23 12:03:19 2000
++++ ash-0.3.7.orig/jobs.c	Mon Apr 23 22:16:46 2001
+@@ -189,6 +193,94 @@
+ 
+ #if JOBS
+ int
++killcmd(argc, argv)
++	int argc;
++	char **argv;
++{
++	extern char *signal_names[];
++	int signo = -1;
++	int list = 0;
++	int i;
++	pid_t pid;
++	struct job *jp;
++
++	if (argc <= 1) {
++		error(
++"Usage: kill [-s sigspec | -signum | -sigspec] [pid | job]... or\n"
++"kill -l [exitstatus]"
++		);
++	}
++
++	if (*argv[1] == '-') {
++		signo = decode_signal(argv[1]+1);
++		if (signo < 0) {
++			int c;
++
++			while ((c = nextopt("ls:")) != '\0')
++				switch (c) {
++				case 'l':
++					list = 1;
++					break;
++				case 's':
++					signo = decode_signal(optarg);
++		                        break;
++				default:
++					error(
++	"nextopt returned character code 0%o", c);
++			}
++		} else
++			argptr++;
++	}
++
++	if (!list && signo < 0)
++		signo = SIGTERM;
++
++	if ((signo < 0 || !*argptr) ^ list) {
++		error(
++"Usage: kill [-s sigspec | -signum | -sigspec] [pid | job]... or\n"
++"kill -l [exitstatus]"
++		);
++	}
++
++	if (list) {
++		if (!*argptr) {
++			out1fmt("0\n");
++			for (i = 1; i < NSIG; i++) {
++				if (strncmp(signal_names[i], "SIGJUNK(", 8)
++				    == 0)
++					continue;
++				out1fmt("%s\n", signal_names[i] + 3);
++			}
++			return 0;
++		}
++		signo = atoi(*argptr);
++		if (signo > 128)
++			signo -= 128;
++		if (0 < signo && signo < NSIG)
++			out1fmt("%s\n", signal_names[signo] + 3);
++		else
++			error("invalid signal number or exit status: %s",
++			      *argptr);
++		return 0;
++	}
++
++	do {
++		if (**argptr == '%') {
++			jp = getjob(*argptr);
++			if (jp->jobctl == 0)
++				error("job %s not created under job control",
++				      *argptr);
++			pid = -jp->ps[0].pid;
++		} else
++			pid = atoi(*argptr);
++		if (kill(pid, signo) != 0)
++			error("%s: %s", *argptr, strerror(errno));
++	} while (*++argptr);
++
++	return 0;
++}
++
++int
+ fgcmd(argc, argv)
+ 	int argc;
+ 	char **argv;
+
+diff -urN netbsd-sh/jobs.h ash-0.3.7.orig/jobs.h
+--- netbsd-sh/jobs.h	Tue May 23 12:03:19 2000
++++ ash-0.3.7.orig/jobs.h	Mon Apr 23 22:16:46 2001
+@@ -80,6 +80,7 @@
+ extern int job_warning;		/* user was warned about stopped jobs */
+ 
+ void setjobctl __P((int));
++int killcmd __P((int, char **));
+ int fgcmd __P((int, char **));
+ int bgcmd __P((int, char **));
+ int jobscmd __P((int, char **));
+diff -urN netbsd-sh/builtins.def ash-0.3.7.orig/builtins.def
+--- netbsd-sh/builtins.def	Mon Apr 10 13:02:58 2000
++++ ash-0.3.7.orig/builtins.def	Mon Apr 23 22:16:46 2001
+@@ -70,6 +71,7 @@
+ hashcmd		hash
+ jobidcmd	jobid
+ jobscmd		jobs
++killcmd -j	kill
+ #linecmd		line
+ localcmd	local
+ #nlechocmd	nlecho
+diff -urN netbsd-sh/mksignames.c ash-0.3.7.orig/mksignames.c
+--- netbsd-sh/mksignames.c	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/mksignames.c	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,400 @@
++/* signames.c -- Create and write `signames.c', which contains an array of
++   signal names. */
++
++/* Copyright (C) 1992 Free Software Foundation, Inc.
++
++   This file is part of GNU Bash, the Bourne Again SHell.
++
++   Bash 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.
++
++   Bash 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 Bash; see the file COPYING.  If not, write to the Free Software
++   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
++
++#include <stdio.h>
++#include <sys/types.h>
++#include <signal.h>
++#include <stdlib.h>
++
++#if !defined (NSIG)
++#  define NSIG 64
++#endif
++
++char *signal_names[2 * NSIG];
++
++char *progname;
++
++#if defined (SIGRTMAX) || defined (SIGRTMIN)
++#  define RTLEN 14
++#  define RTLIM 256
++#endif
++
++void
++initialize_signames ()
++{
++  register int i;
++#if defined (SIGRTMAX) || defined (SIGRTMIN)
++  int rtmin, rtmax, rtcnt;
++#endif
++
++  for (i = 1; i < sizeof(signal_names)/sizeof(signal_names[0]); i++)
++    signal_names[i] = (char *)NULL;
++
++  /* `signal' 0 is what we do on exit. */
++  signal_names[0] = "EXIT";
++
++  /* Place signal names which can be aliases for more common signal
++     names first.  This allows (for example) SIGABRT to overwrite SIGLOST. */
++
++  /* POSIX 1003.1b-1993 real time signals, but take care of incomplete
++     implementations. Acoording to the standard, both, SIGRTMIN and
++     SIGRTMAX must be defined, SIGRTMIN must be stricly less than
++     SIGRTMAX, and the difference must be at least 7, that is, there
++     must be at least eight distinct real time signals. */
++
++  /* The generated signal names are SIGRTMIN, SIGRTMIN+1, ...,
++     SIGRTMIN+x, SIGRTMAX-x, ..., SIGRTMAX-1, SIGRTMAX. If the number
++     of RT signals is odd, there is an extra SIGRTMIN+(x+1).
++     These names are the ones used by ksh and /usr/xpg4/bin/sh on SunOS5. */
++
++#if defined (SIGRTMIN)
++  rtmin = SIGRTMIN;
++  signal_names[rtmin] = "SIGRTMIN";
++#endif
++
++#if defined (SIGRTMAX)
++  rtmax = SIGRTMAX;
++  signal_names[rtmax] = "SIGRTMAX";
++#endif
++
++#if defined (SIGRTMAX) && defined (SIGRTMIN)
++  if (rtmax > rtmin)
++    {
++      rtcnt = (rtmax - rtmin - 1) / 2;
++      /* croak if there are too many RT signals */
++      if (rtcnt >= RTLIM/2)
++	{
++	  rtcnt = RTLIM/2-1;
++	  fprintf(stderr, "%s: error: more than %i real time signals, fix `%s'\n",
++		  progname, RTLIM, progname);
++	}
++
++      for (i = 1; i <= rtcnt; i++)
++	{
++	  signal_names[rtmin+i] = (char *)malloc(RTLEN);
++	  sprintf (signal_names[rtmin+i], "SIGRTMIN+%d", i);
++	  signal_names[rtmax-i] = (char *)malloc(RTLEN);
++	  sprintf (signal_names[rtmax-i], "SIGRTMAX-%d", i);
++	}
++
++      if (rtcnt < RTLIM/2-1 && rtcnt != (rtmax-rtmin)/2)
++	{
++	  /* Need an extra RTMIN signal */
++	  signal_names[rtmin+rtcnt+1] = (char *)malloc(RTLEN);
++	  sprintf (signal_names[rtmin+rtcnt+1], "SIGRTMIN+%d", rtcnt+1);
++	}
++    }
++#endif /* SIGRTMIN && SIGRTMAX */
++
++/* AIX */
++#if defined (SIGLOST)	/* resource lost (eg, record-lock lost) */
++  signal_names[SIGLOST] = "SIGLOST";
++#endif
++
++#if defined (SIGMSG)	/* HFT input data pending */
++  signal_names[SIGMSG] = "SIGMSG";
++#endif
++
++#if defined (SIGDANGER)	/* system crash imminent */
++  signal_names[SIGDANGER] = "SIGDANGER";
++#endif
++
++#if defined (SIGMIGRATE) /* migrate process to another CPU */
++  signal_names[SIGMIGRATE] = "SIGMIGRATE";
++#endif
++
++#if defined (SIGPRE)	/* programming error */
++  signal_names[SIGPRE] = "SIGPRE";
++#endif
++
++#if defined (SIGVIRT)	/* AIX virtual time alarm */
++  signal_names[SIGVIRT] = "SIGVIRT";
++#endif
++
++#if defined (SIGALRM1)	/* m:n condition variables */
++  signal_names[SIGALRM1] = "SIGALRM1";
++#endif
++
++#if defined (SIGWAITING)	/* m:n scheduling */
++  signal_names[SIGWAITING] = "SIGWAITING";
++#endif
++
++#if defined (SIGGRANT)	/* HFT monitor mode granted */
++  signal_names[SIGGRANT] = "SIGGRANT";
++#endif
++
++#if defined (SIGKAP)	/* keep alive poll from native keyboard */
++  signal_names[SIGKAP] = "SIGKAP";
++#endif
++
++#if defined (SIGRETRACT) /* HFT monitor mode retracted */
++  signal_names[SIGRETRACT] = "SIGRETRACT";
++#endif
++
++#if defined (SIGSOUND)	/* HFT sound sequence has completed */
++  signal_names[SIGSOUND] = "SIGSOUND";
++#endif
++
++#if defined (SIGSAK)	/* Secure Attention Key */
++  signal_names[SIGSAK] = "SIGSAK";
++#endif
++
++/* SunOS5 */
++#if defined (SIGLWP)	/* special signal used by thread library */
++  signal_names[SIGLWP] = "SIGLWP";
++#endif
++
++#if defined (SIGFREEZE)	/* special signal used by CPR */
++  signal_names[SIGFREEZE] = "SIGFREEZE";
++#endif
++
++#if defined (SIGTHAW)	/* special signal used by CPR */
++  signal_names[SIGTHAW] = "SIGTHAW";
++#endif
++
++#if defined (SIGCANCEL)	/* thread cancellation signal used by libthread */
++  signal_names[SIGCANCEL] = "SIGCANCEL";
++#endif
++
++/* HP-UX */
++#if defined (SIGDIL)	/* DIL signal (?) */
++  signal_names[SIGDIL] = "SIGDIL";
++#endif
++
++/* System V */
++#if defined (SIGCLD)	/* Like SIGCHLD.  */
++  signal_names[SIGCLD] = "SIGCLD";
++#endif
++
++#if defined (SIGPWR)	/* power state indication */
++  signal_names[SIGPWR] = "SIGPWR";
++#endif
++
++#if defined (SIGPOLL)	/* Pollable event (for streams)  */
++  signal_names[SIGPOLL] = "SIGPOLL";
++#endif
++
++/* Unknown */
++#if defined (SIGWINDOW)
++  signal_names[SIGWINDOW] = "SIGWINDOW";
++#endif
++
++/* Common */
++#if defined (SIGHUP)	/* hangup */
++  signal_names[SIGHUP] = "SIGHUP";
++#endif
++
++#if defined (SIGINT)	/* interrupt */
++  signal_names[SIGINT] = "SIGINT";
++#endif
++
++#if defined (SIGQUIT)	/* quit */
++  signal_names[SIGQUIT] = "SIGQUIT";
++#endif
++
++#if defined (SIGILL)	/* illegal instruction (not reset when caught) */
++  signal_names[SIGILL] = "SIGILL";
++#endif
++
++#if defined (SIGTRAP)	/* trace trap (not reset when caught) */
++  signal_names[SIGTRAP] = "SIGTRAP";
++#endif
++
++#if defined (SIGIOT)	/* IOT instruction */
++  signal_names[SIGIOT] = "SIGIOT";
++#endif
++
++#if defined (SIGABRT)	/* Cause current process to dump core. */
++  signal_names[SIGABRT] = "SIGABRT";
++#endif
++
++#if defined (SIGEMT)	/* EMT instruction */
++  signal_names[SIGEMT] = "SIGEMT";
++#endif
++
++#if defined (SIGFPE)	/* floating point exception */
++  signal_names[SIGFPE] = "SIGFPE";
++#endif
++
++#if defined (SIGKILL)	/* kill (cannot be caught or ignored) */
++  signal_names[SIGKILL] = "SIGKILL";
++#endif
++
++#if defined (SIGBUS)	/* bus error */
++  signal_names[SIGBUS] = "SIGBUS";
++#endif
++
++#if defined (SIGSEGV)	/* segmentation violation */
++  signal_names[SIGSEGV] = "SIGSEGV";
++#endif
++
++#if defined (SIGSYS)	/* bad argument to system call */
++  signal_names[SIGSYS] = "SIGSYS";
++#endif
++
++#if defined (SIGPIPE)	/* write on a pipe with no one to read it */
++  signal_names[SIGPIPE] = "SIGPIPE";
++#endif
++
++#if defined (SIGALRM)	/* alarm clock */
++  signal_names[SIGALRM] = "SIGALRM";
++#endif
++
++#if defined (SIGTERM)	/* software termination signal from kill */
++  signal_names[SIGTERM] = "SIGTERM";
++#endif
++
++#if defined (SIGURG)	/* urgent condition on IO channel */
++  signal_names[SIGURG] = "SIGURG";
++#endif
++
++#if defined (SIGSTOP)	/* sendable stop signal not from tty */
++  signal_names[SIGSTOP] = "SIGSTOP";
++#endif
++
++#if defined (SIGTSTP)	/* stop signal from tty */
++  signal_names[SIGTSTP] = "SIGTSTP";
++#endif
++
++#if defined (SIGCONT)	/* continue a stopped process */
++  signal_names[SIGCONT] = "SIGCONT";
++#endif
++
++#if defined (SIGCHLD)	/* to parent on child stop or exit */
++  signal_names[SIGCHLD] = "SIGCHLD";
++#endif
++
++#if defined (SIGTTIN)	/* to readers pgrp upon background tty read */
++  signal_names[SIGTTIN] = "SIGTTIN";
++#endif
++
++#if defined (SIGTTOU)	/* like TTIN for output if (tp->t_local&LTOSTOP) */
++  signal_names[SIGTTOU] = "SIGTTOU";
++#endif
++
++#if defined (SIGIO)	/* input/output possible signal */
++  signal_names[SIGIO] = "SIGIO";
++#endif
++
++#if defined (SIGXCPU)	/* exceeded CPU time limit */
++  signal_names[SIGXCPU] = "SIGXCPU";
++#endif
++
++#if defined (SIGXFSZ)	/* exceeded file size limit */
++  signal_names[SIGXFSZ] = "SIGXFSZ";
++#endif
++
++#if defined (SIGVTALRM)	/* virtual time alarm */
++  signal_names[SIGVTALRM] = "SIGVTALRM";
++#endif
++
++#if defined (SIGPROF)	/* profiling time alarm */
++  signal_names[SIGPROF] = "SIGPROF";
++#endif
++
++#if defined (SIGWINCH)	/* window changed */
++  signal_names[SIGWINCH] = "SIGWINCH";
++#endif
++
++/* 4.4 BSD */
++#if defined (SIGINFO) && !defined (_SEQUENT_)	/* information request */
++  signal_names[SIGINFO] = "SIGINFO";
++#endif
++
++#if defined (SIGUSR1)	/* user defined signal 1 */
++  signal_names[SIGUSR1] = "SIGUSR1";
++#endif
++
++#if defined (SIGUSR2)	/* user defined signal 2 */
++  signal_names[SIGUSR2] = "SIGUSR2";
++#endif
++
++#if defined (SIGKILLTHR)	/* BeOS: Kill Thread */
++  signal_names[SIGKILLTHR] = "SIGKILLTHR";
++#endif
++
++  for (i = 0; i < NSIG; i++)
++    if (signal_names[i] == (char *)NULL)
++      {
++	signal_names[i] = (char *)malloc (18);
++	sprintf (signal_names[i], "SIGJUNK(%d)", i);
++      }
++
++  signal_names[NSIG] = "DEBUG";
++}
++
++void
++write_signames (stream)
++     FILE *stream;
++{
++  register int i;
++
++  fprintf (stream, "/* This file was automatically created by %s.\n",
++	   progname);
++  fprintf (stream, "   Do not edit.  Edit support/mksignames.c instead. */\n\n");
++  fprintf (stream, "#include <signal.h>\n\n");
++  fprintf (stream,
++	   "/* A translation list so we can be polite to our users. */\n");
++  fprintf (stream, "char *signal_names[NSIG + 2] = {\n");
++
++  for (i = 0; i <= NSIG; i++)
++    fprintf (stream, "    \"%s\",\n", signal_names[i]);
++
++  fprintf (stream, "    (char *)0x0,\n");
++  fprintf (stream, "};\n");
++}
++
++int
++main (argc, argv)
++     int argc;
++     char **argv;
++{
++  char *stream_name;
++  FILE *stream;
++
++  progname = argv[0];
++
++  if (argc == 1)
++    {
++      stream_name = "signames.c";
++    }
++  else if (argc == 2)
++    {
++      stream_name = argv[1];
++    }
++  else
++    {
++      fprintf (stderr, "Usage: %s [output-file]\n", progname);
++      exit (1);
++    }
++
++  stream = fopen (stream_name, "w");
++  if (!stream)
++    {
++      fprintf (stderr, "%s: %s: cannot open for writing\n",
++	       progname, stream_name);
++      exit (2);
++    }
++
++  initialize_signames ();
++  write_signames (stream);
++  exit (0);
++}
+diff -urN netbsd-sh/trap.c ash-0.3.7.orig/trap.c
+--- netbsd-sh/trap.c	Tue May 23 12:03:19 2000
++++ ash-0.3.7.orig/trap.c	Mon Apr 23 22:16:46 2001
+@@ -84,7 +88,7 @@
+ char gotsig[NSIG];		/* indicates specified signal received */
+ int pendingsigs;			/* indicates some signal received */
+ 
+-static int getsigaction __P((int, sig_t *));
++extern char *signal_names[];
+ 
+ /*
+  * The trap builtin.
+@@ -107,16 +111,20 @@
+ 		return 0;
+ 	}
+ 	ap = argv + 1;
+-	if (is_number(*ap))
++	if (argc == 2)
+ 		action = NULL;
+ 	else
+ 		action = *ap++;
+ 	while (*ap) {
+-		if ((signo = number(*ap)) < 0 || signo > NSIG)
++		if ((signo = decode_signal(*ap)) < 0)
+ 			error("%s: bad trap", *ap);
+ 		INTOFF;
+-		if (action)
+-			action = savestr(action);
++		if (action) {
++			if (action[0] == '-' && action[1] == '\0')
++				action = NULL;
++			else
++				action = savestr(action);
++		}
+ 		if (trap[signo])
+ 			ckfree(trap[signo]);
+ 		trap[signo] = action;
+@@ -157,13 +165,13 @@
+  * out what it should be set to.
+  */
+ 
+-long
++void
+ setsignal(signo)
+ 	int signo;
+ {
+ 	int action;
+-	sig_t sigact = SIG_DFL;
+ 	char *t;
++	struct sigaction act;
+ 
+ 	if ((t = trap[signo]) == NULL)
+ 		action = S_DFL;
+@@ -206,15 +214,15 @@
+ 		/*
+ 		 * current setting unknown
+ 		 */
+-		if (!getsigaction(signo, &sigact)) {
++		if (sigaction(signo, 0, &act) == -1) {
+ 			/*
+ 			 * Pretend it worked; maybe we should give a warning
+ 			 * here, but other shells don't. We don't alter
+ 			 * sigmode, so that we retry every time.
+ 			 */
+-			return 0;
++			return;
+ 		}
+-		if (sigact == SIG_IGN) {
++		if (act.sa_handler == SIG_IGN) {
+ 			if (mflag && (signo == SIGTSTP ||
+ 			     signo == SIGTTIN || signo == SIGTTOU)) {
+ 				*t = S_IGN;	/* don't hard ignore these */
+@@ -225,31 +233,21 @@
+ 		}
+ 	}
+ 	if (*t == S_HARD_IGN || *t == action)
+-		return 0;
++		return;
+ 	switch (action) {
+-		case S_DFL:	sigact = SIG_DFL;	break;
+-		case S_CATCH:  	sigact = onsig;		break;
+-		case S_IGN:	sigact = SIG_IGN;	break;
++	case S_CATCH:
++		act.sa_handler = onsig;
++		break;
++	case S_IGN:
++		act.sa_handler = SIG_IGN;
++		break;
++	default:
++		act.sa_handler = SIG_DFL;
+ 	}
+ 	*t = action;
+-	siginterrupt(signo, 1);
+-	return (long)signal(signo, sigact);
+-}
+-
+-/*
+- * Return the current setting for sig w/o changing it.
+- */
+-static int
+-getsigaction(signo, sigact)
+-	int signo;
+-	sig_t *sigact;
+-{
+-	struct sigaction sa;
+-
+-	if (sigaction(signo, (struct sigaction *)0, &sa) == -1)
+-		return 0;
+-	*sigact = (sig_t) sa.sa_handler;
+-	return 1;
++	act.sa_flags = 0;
++	sigemptyset(&act.sa_mask);
++	sigaction(signo, &act, 0);
+ }
+ 
+ /*
+@@ -382,4 +384,18 @@
+ #endif
+ l2:   _exit(status);
+ 	/* NOTREACHED */
++}
++
++int decode_signal(const char *string)
++{
++	int signo;
++
++	if (is_number(string)) return atoi(string);
++
++	for (signo=0; signo < NSIG; signo++)
++		if (strcasecmp(string, signal_names[signo]) == 0 ||
++			strcasecmp(string, &(signal_names[signo])[3]) == 0)
++			return signo;
++
++	return -1;
+ }
+diff -urN netbsd-sh/trap.h ash-0.3.7.orig/trap.h
+--- netbsd-sh/trap.h	Tue May 23 12:03:19 2000
++++ ash-0.3.7.orig/trap.h	Mon Apr 23 22:16:46 2001
+@@ -42,9 +42,10 @@
+ 
+ int trapcmd __P((int, char **));
+ void clear_traps __P((void));
+-long setsignal __P((int));
++void setsignal __P((int));
+ void ignoresig __P((int));
+ void onsig __P((int));
+ void dotrap __P((void));
+ void setinteractive __P((int));
+ void exitshell __P((int)) __attribute__((noreturn));
++int decode_signal __P((const char *));
diff --git a/source/ap/ash/patches/ash-makefile.patch b/source/ap/ash/patches/ash-makefile.patch
new file mode 100644
index 000000000..c3b16a1f5
--- /dev/null
+++ b/source/ap/ash/patches/ash-makefile.patch
@@ -0,0 +1,115 @@
+diff -u ash-0.4.0/Makefile ash-0.4.0-/Makefile
+--- ash-0.4.0/Makefile	Fri Jan 12 17:50:34 2001
++++ ash-0.4.0-/Makefile	Tue Apr 24 00:49:56 2001
+@@ -7,56 +7,68 @@
+ SHSRCS=	alias.c cd.c echo.c error.c eval.c exec.c expand.c \
+ 	histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \
+ 	mystring.c options.c parser.c redir.c show.c trap.c output.c var.c \
+-	test.c
+-GENSRCS=arith.c arith.h arith_lex.c builtins.c builtins.h init.c nodes.c \
+-	nodes.h syntax.c syntax.h token.h
++	test.c setmode.c test.c
++GENSRCS=builtins.c builtins.h init.c nodes.c arith.c arith.h lex.yy.c \
++	nodes.h syntax.c syntax.h token.h signames.c
+ SRCS=	${SHSRCS} ${GENSRCS}
+ 
+-LDADD+=	-ll -ledit -ltermcap
+-DPADD+=	${LIBL} ${LIBEDIT} ${LIBTERMCAP}
++OBJS=alias.o cd.o bltin/echo.o error.o eval.o exec.o expand.o \
++	histedit.o input.o jobs.o mail.o main.o memalloc.o miscbltin.o \
++	mystring.o options.o output.o parser.o redir.o show.o \
++	trap.o var.o bltin/test.o signames.o \
++	builtins.o init.o nodes.o syntax.o arith.o lex.yy.o \
++	setmode.o bltin/times.o
++
++OPT_FLAGS=-O2 -g
++LDFLAGS=-g
++CFLAGS=$(OPT_FLAGS) -DSHELL -I. -DNO_HISTORY -DBSD=1 -DSMALL -D_GNU_SOURCE \
++	-DGLOB_BROKEN -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -D_DIAGASSERT\(x\)=
++
++all: $(PROG)
++
++$(PROG): build-tools $(GENSRCS) $(GENHDRS) $(OBJS)
++	$(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LDLIBS) -lfl
++	
++lex.yy.c: arith_lex.l
++	flex -8 $< 
++	
++CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \
++	mksyntax mksyntax.o
++	
++CLEANFILES+= ${GENSRCS} ${GENHDRS}
++
++build-tools: mkinit mknodes mksyntax
++
++.ORDER: builtins.c builtins.h
++builtins.c builtins.h: mkbuiltins builtins.def
++	sh mkbuiltins shell.h builtins.def `pwd`
++
++INIT_DEPS = alias.c eval.c exec.c input.c jobs.c options.c parser.c \
++	redir.c trap.c var.c output.c
++	
++init.c: mkinit $(INIT_DEPS)
++	./mkinit $(INIT_DEPS)
++
++mkinit: mkinit.o
++mknodes: mknodes.o
++mksyntax: mksyntax.o
+ 
+-LFLAGS= -8	# 8-bit lex scanner for arithmetic
+-YFLAGS=	-d
+-
+-CPPFLAGS+=-DSHELL -I. -I${.CURDIR}
+-
+-.PATH:	${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf ${.CURDIR}/../test
+-
+-CLEANFILES+= mkinit mknodes mksyntax
+-CLEANFILES+= ${GENSRCS} y.tab.h
+-
+-token.h: mktokens
+-	sh ${.ALLSRC}
+-
+-builtins.c builtins.h: mkbuiltins shell.h builtins.def
+-	sh ${.ALLSRC} ${.OBJDIR}
+-
+-init.c: mkinit ${SHSRCS}
+-	./${.ALLSRC}
++signames.c: mksignames
++	./mksignames
+ 
+ nodes.c nodes.h: mknodes nodetypes nodes.c.pat
+-	./${.ALLSRC}
++	./mknodes ./nodetypes ./nodes.c.pat
+ 
+ syntax.c syntax.h: mksyntax
+-	./${.ALLSRC}
+-
+-mkinit: mkinit.c
+-	${HOST_LINK.c} -o mkinit ${.IMPSRC}
+-
+-mknodes: mknodes.c
+-	${HOST_LINK.c} -o mknodes ${.IMPSRC}
++	./mksyntax
+ 
+-.if	(${MACHINE_ARCH} == "powerpc") || \
+-	(${MACHINE_ARCH} == "arm32") || \
+-	(${MACHINE_ARCH} == "arm26")
+-TARGET_CHARFLAG= -DTARGET_CHAR="u_int8_t"
+-.else
+-TARGET_CHARFLAG= -DTARGET_CHAR="int8_t"
+-.endif
++arith.c arith.h: arith.y
++	yacc -d arith.y
++	mv y.tab.h arith.h
++	mv y.tab.c arith.c
+ 
+-mksyntax: mksyntax.c
+-	${HOST_LINK.c} ${TARGET_CHARFLAG} -o mksyntax ${.IMPSRC}
+-
+-.include <bsd.prog.mk>
++token.h: mktokens
++	sh ./mktokens
+ 
+-${OBJS}: builtins.h nodes.h syntax.h token.h
++clean:
++	rm -f $(PROG) $(OBJS) $(CLEANFILES) core
diff --git a/source/ap/ash/patches/ash-manpage.patch b/source/ap/ash/patches/ash-manpage.patch
new file mode 100644
index 000000000..458367e79
--- /dev/null
+++ b/source/ap/ash/patches/ash-manpage.patch
@@ -0,0 +1,42 @@
+diff -urN netbsd-sh/sh.1 ash-0.3.7.orig/sh.1
+--- netbsd-sh/sh.1	Fri Jan 12 17:50:40 2001
++++ ash-0.3.7.orig/sh.1	Mon Apr 23 22:16:46 2001
+@@ -649,7 +649,7 @@
+ they were one program:
+ .Pp
+ .Bd -literal -offset indent
+-{ echo -n \*q hello \*q ; echo \*q world" } > greeting
++{ echo \*q hello \\c\*q ; echo \*q world" } > greeting
+ .Ed
+ .Pp
+ .Ss Functions
+@@ -1306,14 +1306,16 @@
+ will continue to print the old name for the directory.
+ .It Xo read Op Fl p Ar prompt
+ .Op Fl r
+-.Op Ar variable...
++.Ar variable...
+ .Xc
+ The prompt is printed if the
+ .Fl p
+ option is specified and the standard input is a terminal.  Then a line is
+ read from the standard input.  The trailing newline is deleted from the
+ line and the line is split as described in the section on word splitting
+-above, and the pieces are assigned to the variables in order. If there are
++above, and the pieces are assigned to the variables in order.
++At least one variable must be specified.
++If there are
+ more pieces than variables, the remaining pieces (along with the
+ characters in
+ .Ev IFS
+@@ -1394,6 +1396,9 @@
+ by one. If there are zero positional parameters,
+ .Ic shift
+ does nothing.
++.It times
++Print the accumulated user and system times for the shell and for processes
++run from the shell.  The return status is 0.
+ .It Xo trap
+ .Op Ar action
+ .Ar signal...
+
diff --git a/source/ap/ash/patches/ash-memout.patch b/source/ap/ash/patches/ash-memout.patch
new file mode 100644
index 000000000..1bfedadaa
--- /dev/null
+++ b/source/ap/ash/patches/ash-memout.patch
@@ -0,0 +1,333 @@
+diff -u ash-0.4.0/eval.c ash-0.4.0-/eval.c
+--- ash-0.4.0/eval.c	Tue Apr 24 00:53:12 2001
++++ ash-0.4.0-/eval.c	Tue Apr 24 00:13:57 2001
+@@ -879,9 +879,13 @@
+ #endif
+ 		mode = (cmdentry.u.index == EXECCMD)? 0 : REDIR_PUSH;
+ 		if (flags == EV_BACKCMD) {
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++			openmemout();
++#else
+ 			memout.nleft = 0;
+ 			memout.nextc = memout.buf;
+ 			memout.bufsize = 64;
++#endif
+ 			mode |= REDIR_BACKQ;
+ 		}
+ 		redirect(cmd->ncmd.redirect, mode);
+@@ -928,10 +932,18 @@
+ 		if (cmdentry.u.index != EXECCMD)
+ 			popredir();
+ 		if (flags == EV_BACKCMD) {
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++			closememout();
++#endif
+ 			backcmd->buf = memout.buf;
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++			backcmd->nleft = memout.bufsize;
++#else
+ 			backcmd->nleft = memout.nextc - memout.buf;
++#endif
+ 			memout.buf = NULL;
+ 		}
++		cmdenviron = NULL;
+ 	} else {
+ #ifdef DEBUG
+ 		trputs("normal command:  ");  trargs(argv);
+Common subdirectories: ash-0.4.0/funcs and ash-0.4.0-/funcs
+diff -u ash-0.4.0/output.c ash-0.4.0-/output.c
+--- ash-0.4.0/output.c	Fri Jan 12 17:50:39 2001
++++ ash-0.4.0-/output.c	Tue Apr 24 00:43:44 2001
+@@ -65,6 +65,10 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++#undef CEOF			/* get rid of the redefine warning */
++#include <fcntl.h>
++#endif
+ 
+ #include "shell.h"
+ #include "syntax.h"
+@@ -79,9 +83,15 @@
+ #define OUTPUT_ERR 01		/* error occurred on output */
+ 
+ 
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++struct output output = {NULL, NULL, 0, NULL, 0, 1, 0};
++struct output errout = {NULL, NULL, 0, NULL, 0, 2, 0};
++struct output memout = {NULL, NULL, 0, NULL, 0, MEM_OUT, 0};
++#else
+ struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0};
+ struct output errout = {NULL, 0, NULL, 100, 2, 0};
+ struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0};
++#endif
+ struct output *out1 = &output;
+ struct output *out2 = &errout;
+ 
+@@ -92,9 +102,19 @@
+ INCLUDE "output.h"
+ INCLUDE "memalloc.h"
+ 
++INIT {
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++	initstreams();
++#endif
++}
++
+ RESET {
+ 	out1 = &output;
+ 	out2 = &errout;
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++	if (memout.stream != NULL)
++		closememout();
++#endif
+ 	if (memout.buf != NULL) {
+ 		ckfree(memout.buf);
+ 		memout.buf = NULL;
+@@ -124,33 +144,22 @@
+ 
+ 
+ void
+-out1str(p)
+-	const char *p;
+-	{
+-	outstr(p, out1);
+-}
+-
+-
+-void
+-out2str(p)
+-	const char *p;
+-	{
+-	outstr(p, out2);
+-}
+-
+-
+-void
+ outstr(p, file)
+ 	const char *p;
+ 	struct output *file;
+ 	{
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++	fputs(p, file->stream);
++#else
+ 	while (*p)
+ 		outc(*p++, file);
++#endif
+ 	if (file == out2)
+ 		flushout(file);
+ }
+ 
+ 
++#if !defined(_GNU_SOURCE) || defined(__UCLIBC__)
+ char out_junk[16];
+ 
+ 
+@@ -183,6 +192,7 @@
+ 	}
+ 	dest->nleft--;
+ }
++#endif
+ 
+ 
+ void
+@@ -192,11 +202,11 @@
+ }
+ 
+ 
++#if !defined(_GNU_SOURCE) || defined(__UCLIBC__)
+ void
+ flushout(dest)
+ 	struct output *dest;
+ 	{
+-
+ 	if (dest->buf == NULL || dest->nextc == dest->buf || dest->fd < 0)
+ 		return;
+ 	if (xwrite(dest->fd, dest->buf, dest->nextc - dest->buf) < 0)
+@@ -204,6 +214,7 @@
+ 	dest->nextc = dest->buf;
+ 	dest->nleft = dest->bufsize;
+ }
++#endif
+ 
+ 
+ void
+@@ -264,6 +275,7 @@
+ 	va_end(ap);
+ }
+ 
++#if !defined(__GLIBC__) && !defined(__UCLIBC__)
+ void
+ #ifdef __STDC__
+ dprintf(const char *fmt, ...)
+@@ -285,6 +297,7 @@
+ 	va_end(ap);
+ 	flushout(out2);
+ }
++#endif
+ 
+ void
+ #ifdef __STDC__
+@@ -295,7 +308,9 @@
+ #endif
+ {
+ 	va_list ap;
++#if !defined(_GNU_SOURCE) || defined(__UCLIBC__)
+ 	struct output strout;
++#endif
+ #ifndef __STDC__
+ 	char *outbuf;
+ 	size_t length;
+@@ -308,6 +323,9 @@
+ #else
+ 	va_start(ap, fmt);
+ #endif
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++	vsnprintf(outbuf, length, fmt, ap);
++#else
+ 	strout.nextc = outbuf;
+ 	strout.nleft = length;
+ 	strout.fd = BLOCK_OUT;
+@@ -316,8 +334,10 @@
+ 	outc('\0', &strout);
+ 	if (strout.flags & OUTPUT_ERR)
+ 		outbuf[length - 1] = '\0';
++#endif
+ }
+ 
++#if !defined(_GNU_SOURCE) || defined(__UCLIBC__)
+ /*
+  * Formatted output.  This routine handles a subset of the printf formats:
+  * - Formats supported: d, u, o, p, X, s, and c.
+@@ -534,7 +554,7 @@
+ 	}
+ #endif	/* !HAVE_VASPRINTF */
+ }
+-
++#endif
+ 
+ 
+ /*
+@@ -544,7 +564,7 @@
+ int
+ xwrite(fd, buf, nbytes)
+ 	int fd;
+-	char *buf;
++	const char *buf;
+ 	int nbytes;
+ 	{
+ 	int ntry;
+@@ -570,6 +590,8 @@
+ }
+ 
+ 
++
++#ifdef notdef
+ /*
+  * Version of ioctl that retries after a signal is caught.
+  * XXX unused function
+@@ -586,3 +608,27 @@
+ 	while ((i = ioctl(fd, request, arg)) == -1 && errno == EINTR);
+ 	return i;
+ }
++#endif
++
++
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++void initstreams() {
++	output.stream = stdout;
++	errout.stream = stderr;
++}
++
++
++void
++openmemout() {
++	memout.stream = open_memstream(&memout.buf, &memout.bufsize);
++}
++
++
++void
++closememout() {
++	INTOFF;
++	fclose(memout.stream);
++	memout.stream = NULL;
++	INTON;
++}
++#endif
+diff -u ash-0.4.0/output.h ash-0.4.0-/output.h
+--- ash-0.4.0/output.h	Sat Jan 31 19:28:11 1998
++++ ash-0.4.0-/output.h	Tue Apr 24 00:13:57 2001
+@@ -45,13 +45,19 @@
+ #else
+ #include <varargs.h>
+ #endif
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++#include <stdio.h>
++#endif
+ 
+ struct output {
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++	FILE *stream;
++#endif
+ 	char *nextc;
+ 	int nleft;
+ 	char *buf;
+ 	int bufsize;
+-	short fd;
++	int fd;
+ 	short flags;
+ };
+ 
+@@ -61,29 +67,44 @@
+ extern struct output *out1;
+ extern struct output *out2;
+ 
+-void open_mem __P((char *, int, struct output *));
+-void out1str __P((const char *));
+-void out2str __P((const char *));
+ void outstr __P((const char *, struct output *));
++#ifndef _GNU_SOURCE
+ void emptyoutbuf __P((struct output *));
++#endif
+ void flushall __P((void));
++#ifndef _GNU_SOURCE
+ void flushout __P((struct output *));
++#endif
+ void freestdout __P((void));
+ void outfmt __P((struct output *, const char *, ...))
+     __attribute__((__format__(__printf__,2,3)));
+ void out1fmt __P((const char *, ...))
+     __attribute__((__format__(__printf__,1,2)));
++#if !defined(__GLIBC__) && !defined(__UCLIBC__)
+ void dprintf __P((const char *, ...))
+     __attribute__((__format__(__printf__,1,2)));
++#endif
+ void fmtstr __P((char *, size_t, const char *, ...))
+     __attribute__((__format__(__printf__,3,4)));
++#ifndef _GNU_SOURCE
+ void doformat __P((struct output *, const char *, va_list));
+-int xwrite __P((int, char *, int));
+-int xioctl __P((int, unsigned long, char *));
++#endif
++int xwrite __P((int, const char *, int));
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
++void initstreams __P((void));
++void openmemout __P((void));
++void closememout __P((void));
+ 
++#define outc(c, o)	putc(c, (o)->stream)
++#define flushout(o)	fflush((o)->stream)
++#define doformat(d, f, a)	vfprintf((d)->stream, f, a)
++#else
+ #define outc(c, file)	(--(file)->nleft < 0? (emptyoutbuf(file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c)))
+-#define out1c(c)	outc(c, out1);
+-#define out2c(c)	outc(c, out2);
++#endif
++#define out1c(c)	outc(c, out1)
++#define out2c(c)	outc(c, out2)
++#define out1str(s)	outstr(s, out1)
++#define out2str(s)	outstr(s, out2)
+ 
+ #define OUTPUT_INCL
+ #endif
diff --git a/source/ap/ash/patches/ash-misc.patch b/source/ap/ash/patches/ash-misc.patch
new file mode 100644
index 000000000..9845a2325
--- /dev/null
+++ b/source/ap/ash/patches/ash-misc.patch
@@ -0,0 +1,122 @@
+diff -urN netbsd-sh/error.c ash-0.3.7.orig/error.c
+--- netbsd-sh/error.c	Fri Jan 12 17:50:35 2001
++++ ash-0.3.7.orig/error.c	Mon Apr 23 22:16:46 2001
+@@ -233,6 +233,7 @@
+ 	{ ENOTDIR,	E_CREAT,"directory nonexistent" },
+ 	{ ENOTDIR,	E_EXEC,	"not found" },
+ 	{ EISDIR,	ALL,	"is a directory" },
++	{ EEXIST,	E_CREAT,"file exists" },
+ #ifdef notdef
+ 	{ EMFILE,	ALL,	"too many open files" },
+ #endif
+diff -urN netbsd-sh/error.h ash-0.3.7.orig/error.h
+--- netbsd-sh/error.h	Fri Jul  9 13:02:05 1999
++++ ash-0.3.7.orig/error.h	Mon Apr 23 22:16:46 2001
+@@ -102,7 +102,7 @@
+  * so we use _setjmp instead.
+  */
+ 
+-#if defined(BSD) && !defined(__SVR4)
++#if defined(BSD) && !defined(__SVR4) && !defined(__GLIBC__)
+ #define setjmp(jmploc)	_setjmp(jmploc)
+ #define longjmp(jmploc, val)	_longjmp(jmploc, val)
+ #endif
+diff -urN netbsd-sh/bltin/bltin.h ash-0.3.7.orig/bltin/bltin.h
+--- netbsd-sh/bltin/bltin.h	Sat Jul  5 13:12:37 1997
++++ ash-0.3.7.orig/bltin/bltin.h	Mon Apr 23 22:16:46 2001
+@@ -46,8 +46,10 @@
+ 
+ #include "../shell.h"
+ #include "../mystring.h"
++#include "../memalloc.h"
+ #ifdef SHELL
+ #include "../output.h"
++#ifndef _GNU_SOURCE
+ #define stdout out1
+ #define stderr out2
+ #define printf out1fmt
+@@ -56,12 +58,13 @@
+ #define fprintf outfmt
+ #define fputs outstr
+ #define fflush flushout
+-#define INITARGS(argv)
+ #define warnx(a, b, c) {				\
+ 	char buf[64];					\
+ 	(void)snprintf(buf, sizeof(buf), a, b, c);	\
+ 	error("%s", buf);				\
+ }
++#endif
++#define INITARGS(argv)
+ 
+ #else
+ #undef NULL
+diff -urN netbsd-sh/main.c ash-0.3.7.orig/main.c
+--- netbsd-sh/main.c	Fri Jan 12 17:50:36 2001
++++ ash-0.3.7.orig/main.c	Mon Apr 23 22:16:46 2001
+@@ -115,6 +119,9 @@
+ #if PROFILE
+ 	monitor(4, etext, profile_buf, sizeof profile_buf, 50);
+ #endif
++#if defined(linux) || defined(__GNU__)
++	signal(SIGCHLD, SIG_DFL);
++#endif
+ 	state = 0;
+ 	if (setjmp(jmploc.loc)) {
+ 		/*
+diff -urN netbsd-sh/var.c ash-0.3.7.orig/var.c
+--- netbsd-sh/var.c	Fri Jan 12 17:50:40 2001
++++ ash-0.3.7.orig/var.c	Mon Apr 23 22:19:54 2001
+@@ -114,7 +114,7 @@
+ 	  NULL },
+ 	{ &vmpath,	VSTRFIXED|VTEXTFIXED|VUNSET,	"MAILPATH=",
+ 	  NULL },
+-	{ &vpath,	VSTRFIXED|VTEXTFIXED,		"PATH=" _PATH_DEFPATH,
++ 	{ &vpath,	VSTRFIXED|VTEXTFIXED,		"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+ 	  changepath },
+ 	/*
+ 	 * vps1 depends on uid
+@@ -138,13 +138,16 @@
+ 
+ /*
+  * Initialize the varable symbol tables and import the environment
++ * Setting PWD added by herbert
+  */
+ 
+ #ifdef mkinit
++INCLUDE "cd.h"
+ INCLUDE "var.h"
+ INIT {
+ 	char **envp;
+ 	extern char **environ;
++	extern char *curdir;
+ 
+ 	initvar();
+ 	for (envp = environ ; *envp ; envp++) {
+@@ -152,6 +155,9 @@
+ 			setvareq(*envp, VEXPORT|VTEXTFIXED);
+ 		}
+ 	}
++
++	getpwd();
++	setvar("PWD", curdir, VEXPORT|VTEXTFIXED);
+ }
+ #endif
+ 
+@@ -283,6 +289,7 @@
+ 	struct var *vp, **vpp;
+ 
+ 	vpp = hashvar(s);
++	flags |= (VEXPORT & (((unsigned) (1 - aflag)) - 1));
+ 	for (vp = *vpp ; vp ; vp = vp->next) {
+ 		if (varequal(s, vp->text)) {
+ 			if (vp->flags & VREADONLY) {
+@@ -305,7 +312,8 @@
+ 			 * We could roll this to a function, to handle it as
+ 			 * a regular variable function callback, but why bother?
+ 			 */
+-			if (vp == &vmpath || (vp == &vmail && ! mpathset()))
++			if (iflag &&
++			    (vp == &vmpath || (vp == &vmail && ! mpathset())))
+ 				chkmail(1);
+ 			INTON;
+ 			return;
diff --git a/source/ap/ash/patches/ash-ppid.patch b/source/ap/ash/patches/ash-ppid.patch
new file mode 100644
index 000000000..954b509d4
--- /dev/null
+++ b/source/ap/ash/patches/ash-ppid.patch
@@ -0,0 +1,21 @@
+diff -ur ash-0.4.0/var.c ash-0.4.0-ppid/var.c
+--- ash-0.4.0/var.c	Tue Apr 24 01:23:17 2001
++++ ash-0.4.0-ppid/var.c	Tue Apr 24 01:22:07 2001
+@@ -172,6 +172,7 @@
+ 	const struct varinit *ip;
+ 	struct var *vp;
+ 	struct var **vpp;
++	char ppid[30];
+ 
+ 	for (ip = varinit ; (vp = ip->var) != NULL ; ip++) {
+ 		if ((vp->flags & VEXPORT) == 0) {
+@@ -193,6 +194,9 @@
+ 		vps1.text = strdup(geteuid() ? "PS1=$ " : "PS1=# ");
+ 		vps1.flags = VSTRFIXED|VTEXTFIXED;
+ 	}
++	
++	snprintf(ppid, 29, "%ld", (long)getppid());
++	setvar("PPID", ppid, VREADONLY|VNOFUNC);
+ }
+ 
+ /*
diff --git a/source/ap/ash/patches/ash-redir.patch b/source/ap/ash/patches/ash-redir.patch
new file mode 100644
index 000000000..40cdbe9ac
--- /dev/null
+++ b/source/ap/ash/patches/ash-redir.patch
@@ -0,0 +1,463 @@
+diff -ur netbsd-sh/eval.c netbsd-sh-/eval.c
+--- netbsd-sh/eval.c	Tue May 23 12:03:18 2000
++++ netbsd-sh-/eval.c	Mon Apr 23 23:33:34 2001
+@@ -442,6 +442,7 @@
+ 		case NFROM:
+ 		case NTO:
+ 		case NAPPEND:
++		case NTOOV:
+ 			expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR);
+ 			redir->nfile.expfname = fn.list->text;
+ 			break;
+diff -ur netbsd-sh/exec.c netbsd-sh-/exec.c
+--- netbsd-sh/exec.c	Fri Jan 12 17:50:35 2001
++++ netbsd-sh-/exec.c	Mon Apr 23 23:33:34 2001
+@@ -125,6 +125,10 @@
+ 	char *cmdname;
+ 	int e;
+ 
++	if (fd2 >= 0 && fd2 != 2) {
++		close(fd2);
++	}
++
+ 	if (strchr(argv[0], '/') != NULL) {
+ 		tryexec(argv[0], argv, envp);
+ 		e = errno;
+diff -ur netbsd-sh/jobs.c netbsd-sh-/jobs.c
+--- netbsd-sh/jobs.c	Mon Apr 23 23:34:53 2001
++++ netbsd-sh-/jobs.c	Mon Apr 23 23:34:30 2001
+@@ -129,9 +129,9 @@
+ 	if (on) {
+ 		do { /* while we are in the background */
+ #ifdef OLD_TTY_DRIVER
+-			if (ioctl(2, TIOCGPGRP, (char *)&initialpgrp) < 0) {
++			if (ioctl(fd2, TIOCGPGRP, (char *)&initialpgrp) < 0) {
+ #else
+-			initialpgrp = tcgetpgrp(2);
++			initialpgrp = tcgetpgrp(fd2);
+ 			if (initialpgrp < 0) {
+ #endif
+ 				out2str("sh: can't access tty; job control turned off\n");
+@@ -146,7 +146,7 @@
+ 			}
+ 		} while (0);
+ #ifdef OLD_TTY_DRIVER
+-		if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) {
++		if (ioctl(fd2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) {
+ 			out2str("sh: need new tty driver to run job control; job control turned off\n");
+ 			mflag = 0;
+ 			return;
+@@ -157,16 +157,16 @@
+ 		setsignal(SIGTTIN);
+ 		setpgid(0, rootpid);
+ #ifdef OLD_TTY_DRIVER
+-		ioctl(2, TIOCSPGRP, (char *)&rootpid);
++		ioctl(fd2, TIOCSPGRP, (char *)&rootpid);
+ #else
+-		tcsetpgrp(2, rootpid);
++		tcsetpgrp(fd2, rootpid);
+ #endif
+ 	} else { /* turning job control off */
+ 		setpgid(0, initialpgrp);
+ #ifdef OLD_TTY_DRIVER
+-		ioctl(2, TIOCSPGRP, (char *)&initialpgrp);
++		ioctl(fd2, TIOCSPGRP, (char *)&initialpgrp);
+ #else
+-		tcsetpgrp(2, initialpgrp);
++		tcsetpgrp(fd2, initialpgrp);
+ #endif
+ 		setsignal(SIGTSTP);
+ 		setsignal(SIGTTOU);
+@@ -206,9 +206,9 @@
+ 		error("job not created under job control");
+ 	pgrp = jp->ps[0].pid;
+ #ifdef OLD_TTY_DRIVER
+-	ioctl(2, TIOCSPGRP, (char *)&pgrp);
++	ioctl(fd2, TIOCSPGRP, (char *)&pgrp);
+ #else
+-	tcsetpgrp(2, pgrp);
++	tcsetpgrp(fd2, pgrp);
+ #endif
+ 	restartjob(jp);
+ 	INTOFF;
+@@ -612,10 +612,10 @@
+ 			if (mode == FORK_FG) {
+ 				/*** this causes superfluous TIOCSPGRPS ***/
+ #ifdef OLD_TTY_DRIVER
+-				if (ioctl(2, TIOCSPGRP, (char *)&pgrp) < 0)
++				if (ioctl(fd2, TIOCSPGRP, (char *)&pgrp) < 0)
+ 					error("TIOCSPGRP failed, errno=%d", errno);
+ #else
+-				if (tcsetpgrp(2, pgrp) < 0)
++				if (tcsetpgrp(fd2, pgrp) < 0)
+ 					error("tcsetpgrp failed, errno=%d", errno);
+ #endif
+ 			}
+@@ -734,10 +734,10 @@
+ #if JOBS
+ 	if (jp->jobctl) {
+ #ifdef OLD_TTY_DRIVER
+-		if (ioctl(2, TIOCSPGRP, (char *)&mypgrp) < 0)
++		if (ioctl(fd2, TIOCSPGRP, (char *)&mypgrp) < 0)
+ 			error("TIOCSPGRP failed, errno=%d\n", errno);
+ #else
+-		if (tcsetpgrp(2, mypgrp) < 0)
++		if (tcsetpgrp(fd2, mypgrp) < 0)
+ 			error("tcsetpgrp failed, errno=%d\n", errno);
+ #endif
+ 	}
+@@ -1092,6 +1092,8 @@
+ 		p = ">>";  i = 1;  goto redir;
+ 	case NTOFD:
+ 		p = ">&";  i = 1;  goto redir;
++	case NTOOV:
++		p = ">|";  i = 1;  goto redir;
+ 	case NFROM:
+ 		p = "<";  i = 0;  goto redir;
+ 	case NFROMFD:
+Only in netbsd-sh-: jobs.c.orig
+diff -ur netbsd-sh/nodetypes netbsd-sh-/nodetypes
+--- netbsd-sh/nodetypes	Fri Feb  5 13:04:52 1999
++++ netbsd-sh-/nodetypes	Mon Apr 23 23:33:34 2001
+@@ -119,6 +119,7 @@
+ NFROM nfile			# fd< fname
+ NFROMTO nfile			# fd<> fname
+ NAPPEND nfile			# fd>> fname
++NTOOV nfile			# fd>| fname
+ 	type	  int
+ 	next	  nodeptr		# next redirection in list
+ 	fd	  int			# file descriptor being redirected
+diff -ur netbsd-sh/parser.c netbsd-sh-/parser.c
+--- netbsd-sh/parser.c	Fri Jan 12 17:50:39 2001
++++ netbsd-sh-/parser.c	Mon Apr 23 23:33:34 2001
+@@ -1125,6 +1125,8 @@
+ 			np->type = NAPPEND;
+ 		else if (c == '&')
+ 			np->type = NTOFD;
++		else if (c == '|')
++			np->type = NTOOV;
+ 		else {
+ 			np->type = NTO;
+ 			pungetc();
+diff -ur netbsd-sh/redir.c netbsd-sh-/redir.c
+--- netbsd-sh/redir.c	Tue May 23 12:03:19 2000
++++ netbsd-sh-/redir.c	Mon Apr 23 23:33:34 2001
+@@ -45,6 +45,7 @@
+ #endif
+ #endif /* not lint */
+ 
++#include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/param.h>	/* PIPE_BUF */
+ #include <signal.h>
+@@ -66,6 +67,7 @@
+ #include "output.h"
+ #include "memalloc.h"
+ #include "error.h"
++#include "options.h"
+ 
+ 
+ #define EMPTY -2		/* marks an unused slot in redirtab */
+@@ -92,8 +94,15 @@
+ */
+ int fd0_redirected = 0;
+ 
+-STATIC void openredirect __P((union node *, char[10 ]));
++/*
++ * We also keep track of where fd2 goes.
++ */
++int fd2 = 2;
++
++STATIC int openredirect __P((union node *));
++STATIC void dupredirect __P((union node *, int, char[10 ]));
+ STATIC int openhere __P((union node *));
++STATIC int noclobberopen __P((const char *));
+ 
+ 
+ /*
+@@ -113,6 +122,7 @@
+ 	struct redirtab *sv = NULL;
+ 	int i;
+ 	int fd;
++	int newfd;
+ 	int try;
+ 	char memory[10];	/* file descriptors to write to memory */
+ 
+@@ -133,36 +143,47 @@
+ 		    n->ndup.dupfd == fd)
+ 			continue; /* redirect from/to same file descriptor */
+ 
+-		if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) {
+-			INTOFF;
+-again:
+-			if ((i = fcntl(fd, F_DUPFD, 10)) == -1) {
++		INTOFF;
++		newfd = openredirect(n);
++		if (((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) ||
++		    (fd == fd2)) {
++			if (newfd == fd) {
++				try++;
++			} else if ((i = fcntl(fd, F_DUPFD, 10)) == -1) {
+ 				switch (errno) {
+ 				case EBADF:
+ 					if (!try) {
+-						openredirect(n, memory);
++						dupredirect(n, newfd, memory);
+ 						try++;
+-						goto again;
++						break;
+ 					}
+ 					/* FALLTHROUGH*/
+ 				default:
++					if (newfd >= 0) {
++						close(newfd);
++					}
+ 					INTON;
+ 					error("%d: %s", fd, strerror(errno));
+ 					/* NOTREACHED */
+ 				}
+ 			}
+ 			if (!try) {
+-				sv->renamed[fd] = i;
+ 				close(fd);
++				if (flags & REDIR_PUSH) {
++					sv->renamed[fd] = i;
++				}
++				if (fd == fd2) {
++					fd2 = i;
++				}
+ 			}
+-			INTON;
+-		} else {
++		} else if (fd != newfd) {
+ 			close(fd);
+ 		}
+                 if (fd == 0)
+                         fd0_redirected++;
+ 		if (!try)
+-			openredirect(n, memory);
++			dupredirect(n, newfd, memory);
++		INTON;
+ 	}
+ 	if (memory[1])
+ 		out1 = &memout;
+@@ -171,22 +192,13 @@
+ }
+ 
+ 
+-STATIC void
+-openredirect(redir, memory)
++STATIC int
++openredirect(redir)
+ 	union node *redir;
+-	char memory[10];
+ 	{
+-	int fd = redir->nfile.fd;
+ 	char *fname;
+ 	int f;
+ 
+-	/*
+-	 * We suppress interrupts so that we won't leave open file
+-	 * descriptors around.  This may not be such a good idea because
+-	 * an open of a device or a fifo can block indefinitely.
+-	 */
+-	INTOFF;
+-	memory[fd] = 0;
+ 	switch (redir->nfile.type) {
+ 	case NFROM:
+ 		fname = redir->nfile.expfname;
+@@ -199,6 +211,14 @@
+ 			goto ecreate;
+ 		break;
+ 	case NTO:
++		/* Take care of noclobber mode. */
++		if (Cflag) {
++			fname = redir->nfile.expfname;
++			if ((f = noclobberopen(fname)) < 0)
++				goto ecreate;
++			break;
++		}
++	case NTOOV:
+ 		fname = redir->nfile.expfname;
+ #ifdef O_CREAT
+ 		if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
+@@ -222,32 +242,48 @@
+ 		break;
+ 	case NTOFD:
+ 	case NFROMFD:
++		f = -1;
++		break;
++	case NHERE:
++	case NXHERE:
++		f = openhere(redir);
++		break;
++	default:
++		abort();
++	}
++
++	return f;
++ecreate:
++	error("cannot create %s: %s", fname, errmsg(errno, E_CREAT));
++eopen:
++	error("cannot open %s: %s", fname, errmsg(errno, E_OPEN));
++}
++
++
++STATIC void
++dupredirect(redir, f, memory)
++	union node *redir;
++	int f;
++	char memory[10];
++	{
++	int fd = redir->nfile.fd;
++
++	memory[fd] = 0;
++	if (redir->nfile.type == NTOFD || redir->nfile.type == NFROMFD) {
+ 		if (redir->ndup.dupfd >= 0) {	/* if not ">&-" */
+ 			if (memory[redir->ndup.dupfd])
+ 				memory[fd] = 1;
+ 			else
+ 				copyfd(redir->ndup.dupfd, fd);
+ 		}
+-		INTON;
+ 		return;
+-	case NHERE:
+-	case NXHERE:
+-		f = openhere(redir);
+-		break;
+-	default:
+-		abort();
+ 	}
+ 
+ 	if (f != fd) {
+ 		copyfd(f, fd);
+ 		close(f);
+ 	}
+-	INTON;
+ 	return;
+-ecreate:
+-	error("cannot create %s: %s", fname, errmsg(errno, E_CREAT));
+-eopen:
+-	error("cannot open %s: %s", fname, errmsg(errno, E_OPEN));
+ }
+ 
+ 
+@@ -304,6 +340,7 @@
+ 	struct redirtab *rp = redirlist;
+ 	int i;
+ 
++	INTOFF;
+ 	for (i = 0 ; i < 10 ; i++) {
+ 		if (rp->renamed[i] != EMPTY) {
+                         if (i == 0)
+@@ -313,9 +350,11 @@
+ 				copyfd(rp->renamed[i], i);
+ 				close(rp->renamed[i]);
+ 			}
++			if (rp->renamed[i] == fd2) {
++				fd2 = i;
++			}
+ 		}
+ 	}
+-	INTOFF;
+ 	redirlist = rp->next;
+ 	ckfree(rp);
+ 	INTON;
+@@ -359,6 +398,9 @@
+ 		for (i = 0 ; i < 10 ; i++) {
+ 			if (rp->renamed[i] >= 0) {
+ 				close(rp->renamed[i]);
++				if (rp->renamed[i] == fd2) {
++					fd2 = -1;
++				}
+ 			}
+ 			rp->renamed[i] = EMPTY;
+ 		}
+@@ -388,4 +430,63 @@
+ 			error("%d: %s", from, strerror(errno));
+ 	}
+ 	return newfd;
++}
++
++/*
++ * Open a file in noclobber mode.
++ * The code was copied from bash.
++ */
++int
++noclobberopen(fname)
++	const char *fname;
++{
++	int r, fd;
++	struct stat finfo, finfo2;
++
++	/*
++	 * If the file exists and is a regular file, return an error
++	 * immediately.
++	 */
++	r = stat(fname, &finfo);
++	if (r == 0 && S_ISREG(finfo.st_mode)) {
++		errno = EEXIST;
++		return -1;
++	}
++
++	/*
++	 * If the file was not present (r != 0), make sure we open it
++	 * exclusively so that if it is created before we open it, our open
++	 * will fail.  Make sure that we do not truncate an existing file.
++	 * Note that we don't turn on O_EXCL unless the stat failed -- if the
++	 * file was not a regular file, we leave O_EXCL off.
++	 */
++	if (r != 0)
++		return open(fname, O_WRONLY|O_CREAT|O_EXCL, 0666);
++	fd = open(fname, O_WRONLY|O_CREAT, 0666);
++
++	/* If the open failed, return the file descriptor right away. */
++	if (fd < 0)
++		return fd;
++
++	/*
++	 * OK, the open succeeded, but the file may have been changed from a
++	 * non-regular file to a regular file between the stat and the open.
++	 * We are assuming that the O_EXCL open handles the case where FILENAME
++	 * did not exist and is symlinked to an existing file between the stat
++	 * and open.
++	 */
++
++	/*
++	 * If we can open it and fstat the file descriptor, and neither check
++	 * revealed that it was a regular file, and the file has not been
++	 * replaced, return the file descriptor.
++	 */
++	 if (fstat(fd, &finfo2) == 0 && !S_ISREG(finfo2.st_mode) &&
++	     finfo.st_dev == finfo2.st_dev && finfo.st_ino == finfo2.st_ino)
++	 	return fd;
++
++	/* The file has been replaced.  badness. */
++	close(fd);
++	errno = EEXIST;
++	return -1;
+ }
+Only in netbsd-sh-: redir.c.orig
+diff -ur netbsd-sh/redir.h netbsd-sh-/redir.h
+--- netbsd-sh/redir.h	Tue May 23 12:03:19 2000
++++ netbsd-sh-/redir.h	Mon Apr 23 23:33:34 2001
+@@ -42,6 +42,8 @@
+ #define REDIR_PUSH 01		/* save previous values of file descriptors */
+ #define REDIR_BACKQ 02		/* save the command output in memory */
+ 
++extern int fd2;
++
+ union node;
+ void redirect __P((union node *, int));
+ void popredir __P((void));
+diff -ur netbsd-sh/show.c netbsd-sh-/show.c
+--- netbsd-sh/show.c	Sat Oct  9 13:02:09 1999
++++ netbsd-sh-/show.c	Mon Apr 23 23:33:34 2001
+@@ -155,6 +155,7 @@
+ 			case NTO:	s = ">";  dftfd = 1; break;
+ 			case NAPPEND:	s = ">>"; dftfd = 1; break;
+ 			case NTOFD:	s = ">&"; dftfd = 1; break;
++			case NTOOV:	s = ">|"; dftfd = 1; break;
+ 			case NFROM:	s = "<";  dftfd = 0; break;
+ 			case NFROMFD:	s = "<&"; dftfd = 0; break;
+ 			case NFROMTO:	s = "<>"; dftfd = 0; break;
diff --git a/source/ap/ash/patches/ash-setmode.patch b/source/ap/ash/patches/ash-setmode.patch
new file mode 100644
index 000000000..b9a26d9ca
--- /dev/null
+++ b/source/ap/ash/patches/ash-setmode.patch
@@ -0,0 +1,510 @@
+diff -urN netbsd-sh/miscbltin.c ash-0.3.7.orig/miscbltin.c
+--- netbsd-sh/miscbltin.c	Fri Jan 12 17:50:37 2001
++++ ash-0.3.7.orig/miscbltin.c	Mon Apr 23 22:16:46 2001
+@@ -70,6 +70,15 @@
+ 
+ #undef rflag
+ 
++#ifdef __GLIBC__
++mode_t getmode(const void *, mode_t);
++void *setmode(const char *);
++
++#if !defined(__GLIBC__) || __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
++typedef enum __rlimit_resource rlim_t;
++#endif
++#endif
++
+ extern char **argptr;		/* argument list for builtin command */
+ 
+ 
+diff -urN netbsd-sh/setmode.c ash-0.3.7.orig/setmode.c
+--- netbsd-sh/setmode.c	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/setmode.c	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,486 @@
++/*	$NetBSD: setmode.c,v 1.28 2000/01/25 15:43:43 enami Exp $	*/
++
++/*
++ * Copyright (c) 1989, 1993, 1994
++ *	The Regents of the University of California.  All rights reserved.
++ *
++ * This code is derived from software contributed to Berkeley by
++ * Dave Borman at Cray Research, Inc.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. All advertising materials mentioning features or use of this software
++ *    must display the following acknowledgement:
++ *	This product includes software developed by the University of
++ *	California, Berkeley and its contributors.
++ * 4. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
++ */
++
++#include <sys/cdefs.h>
++#if defined(LIBC_SCCS) && !defined(lint)
++#if 0
++static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
++#else
++__RCSID("$NetBSD: setmode.c,v 1.28 2000/01/25 15:43:43 enami Exp $");
++#endif
++#endif /* LIBC_SCCS and not lint */
++
++#include <sys/types.h>
++#include <sys/stat.h>
++
++#include <assert.h>
++#include <ctype.h>
++#include <errno.h>
++#include <signal.h>
++#include <stdlib.h>
++#include <unistd.h>
++
++#ifdef SETMODE_DEBUG
++#include <stdio.h>
++#endif
++
++#ifdef __weak_alias
++__weak_alias(getmode,_getmode)
++__weak_alias(setmode,_setmode)
++#endif
++
++#ifdef __GLIBC__
++#define S_ISTXT __S_ISVTX
++#endif
++
++#define	SET_LEN	6		/* initial # of bitcmd struct to malloc */
++#define	SET_LEN_INCR 4		/* # of bitcmd structs to add as needed */
++
++typedef struct bitcmd {
++	char	cmd;
++	char	cmd2;
++	mode_t	bits;
++} BITCMD;
++
++#define	CMD2_CLR	0x01
++#define	CMD2_SET	0x02
++#define	CMD2_GBITS	0x04
++#define	CMD2_OBITS	0x08
++#define	CMD2_UBITS	0x10
++
++static BITCMD	*addcmd __P((BITCMD *, int, int, int, u_int));
++static void	 compress_mode __P((BITCMD *));
++#ifdef SETMODE_DEBUG
++static void	 dumpmode __P((BITCMD *));
++#endif
++
++/*
++ * Given the old mode and an array of bitcmd structures, apply the operations
++ * described in the bitcmd structures to the old mode, and return the new mode.
++ * Note that there is no '=' command; a strict assignment is just a '-' (clear
++ * bits) followed by a '+' (set bits).
++ */
++mode_t
++getmode(bbox, omode)
++	const void *bbox;
++	mode_t omode;
++{
++	const BITCMD *set;
++	mode_t clrval, newmode, value;
++
++	_DIAGASSERT(bbox != NULL);
++
++	set = (const BITCMD *)bbox;
++	newmode = omode;
++	for (value = 0;; set++)
++		switch(set->cmd) {
++		/*
++		 * When copying the user, group or other bits around, we "know"
++		 * where the bits are in the mode so that we can do shifts to
++		 * copy them around.  If we don't use shifts, it gets real
++		 * grundgy with lots of single bit checks and bit sets.
++		 */
++		case 'u':
++			value = (newmode & S_IRWXU) >> 6;
++			goto common;
++
++		case 'g':
++			value = (newmode & S_IRWXG) >> 3;
++			goto common;
++
++		case 'o':
++			value = newmode & S_IRWXO;
++common:			if (set->cmd2 & CMD2_CLR) {
++				clrval =
++				    (set->cmd2 & CMD2_SET) ?  S_IRWXO : value;
++				if (set->cmd2 & CMD2_UBITS)
++					newmode &= ~((clrval<<6) & set->bits);
++				if (set->cmd2 & CMD2_GBITS)
++					newmode &= ~((clrval<<3) & set->bits);
++				if (set->cmd2 & CMD2_OBITS)
++					newmode &= ~(clrval & set->bits);
++			}
++			if (set->cmd2 & CMD2_SET) {
++				if (set->cmd2 & CMD2_UBITS)
++					newmode |= (value<<6) & set->bits;
++				if (set->cmd2 & CMD2_GBITS)
++					newmode |= (value<<3) & set->bits;
++				if (set->cmd2 & CMD2_OBITS)
++					newmode |= value & set->bits;
++			}
++			break;
++
++		case '+':
++			newmode |= set->bits;
++			break;
++
++		case '-':
++			newmode &= ~set->bits;
++			break;
++
++		case 'X':
++			if (omode & (S_IFDIR|S_IXUSR|S_IXGRP|S_IXOTH))
++				newmode |= set->bits;
++			break;
++
++		case '\0':
++		default:
++#ifdef SETMODE_DEBUG
++			(void)printf("getmode:%04o -> %04o\n", omode, newmode);
++#endif
++			return (newmode);
++		}
++}
++
++#define	ADDCMD(a, b, c, d) do {						\
++	if (set >= endset) {						\
++		BITCMD *newset;						\
++		setlen += SET_LEN_INCR;					\
++		newset = realloc(saveset, sizeof(BITCMD) * setlen);	\
++		if (newset == NULL) {					\
++			free(saveset);					\
++			return (NULL);					\
++		}							\
++		set = newset + (set - saveset);				\
++		saveset = newset;					\
++		endset = newset + (setlen - 2);				\
++	}								\
++	set = addcmd(set, (a), (b), (c), (d));				\
++} while (/*CONSTCOND*/0)
++
++#define	STANDARD_BITS	(S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
++
++void *
++setmode(p)
++	const char *p;
++{
++	int perm, who;
++	char op, *ep;
++	BITCMD *set, *saveset, *endset;
++	sigset_t sigset, sigoset;
++	mode_t mask;
++	int equalopdone = 0;	/* pacify gcc */
++	int permXbits, setlen;
++
++	if (!*p)
++		return (NULL);
++
++	/*
++	 * Get a copy of the mask for the permissions that are mask relative.
++	 * Flip the bits, we want what's not set.  Since it's possible that
++	 * the caller is opening files inside a signal handler, protect them
++	 * as best we can.
++	 */
++	sigfillset(&sigset);
++	(void)sigprocmask(SIG_BLOCK, &sigset, &sigoset);
++	(void)umask(mask = umask(0));
++	mask = ~mask;
++	(void)sigprocmask(SIG_SETMASK, &sigoset, NULL);
++
++	setlen = SET_LEN + 2;
++	
++	if ((set = malloc((u_int)(sizeof(BITCMD) * setlen))) == NULL)
++		return (NULL);
++	saveset = set;
++	endset = set + (setlen - 2);
++
++	/*
++	 * If an absolute number, get it and return; disallow non-octal digits
++	 * or illegal bits.
++	 */
++	if (isdigit((unsigned char)*p)) {
++		perm = (mode_t)strtol(p, &ep, 8);
++		if (*ep || perm & ~(STANDARD_BITS|S_ISTXT)) {
++			free(saveset);
++			return (NULL);
++		}
++		ADDCMD('=', (STANDARD_BITS|S_ISTXT), perm, mask);
++		set->cmd = 0;
++		return (saveset);
++	}
++
++	/*
++	 * Build list of structures to set/clear/copy bits as described by
++	 * each clause of the symbolic mode.
++	 */
++	for (;;) {
++		/* First, find out which bits might be modified. */
++		for (who = 0;; ++p) {
++			switch (*p) {
++			case 'a':
++				who |= STANDARD_BITS;
++				break;
++			case 'u':
++				who |= S_ISUID|S_IRWXU;
++				break;
++			case 'g':
++				who |= S_ISGID|S_IRWXG;
++				break;
++			case 'o':
++				who |= S_IRWXO;
++				break;
++			default:
++				goto getop;
++			}
++		}
++
++getop:		if ((op = *p++) != '+' && op != '-' && op != '=') {
++			free(saveset);
++			return (NULL);
++		}
++		if (op == '=')
++			equalopdone = 0;
++
++		who &= ~S_ISTXT;
++		for (perm = 0, permXbits = 0;; ++p) {
++			switch (*p) {
++			case 'r':
++				perm |= S_IRUSR|S_IRGRP|S_IROTH;
++				break;
++			case 's':
++				/*
++				 * If specific bits where requested and 
++				 * only "other" bits ignore set-id. 
++				 */
++				if (who == 0 || (who & ~S_IRWXO))
++					perm |= S_ISUID|S_ISGID;
++				break;
++			case 't':
++				/*
++				 * If specific bits where requested and 
++				 * only "other" bits ignore set-id. 
++				 */
++				if (who == 0 || (who & ~S_IRWXO)) {
++					who |= S_ISTXT;
++					perm |= S_ISTXT;
++				}
++				break;
++			case 'w':
++				perm |= S_IWUSR|S_IWGRP|S_IWOTH;
++				break;
++			case 'X':
++				permXbits = S_IXUSR|S_IXGRP|S_IXOTH;
++				break;
++			case 'x':
++				perm |= S_IXUSR|S_IXGRP|S_IXOTH;
++				break;
++			case 'u':
++			case 'g':
++			case 'o':
++				/*
++				 * When ever we hit 'u', 'g', or 'o', we have
++				 * to flush out any partial mode that we have,
++				 * and then do the copying of the mode bits.
++				 */
++				if (perm) {
++					ADDCMD(op, who, perm, mask);
++					perm = 0;
++				}
++				if (op == '=')
++					equalopdone = 1;
++				if (op == '+' && permXbits) {
++					ADDCMD('X', who, permXbits, mask);
++					permXbits = 0;
++				}
++				ADDCMD(*p, who, op, mask);
++				break;
++
++			default:
++				/*
++				 * Add any permissions that we haven't already
++				 * done.
++				 */
++				if (perm || (op == '=' && !equalopdone)) {
++					if (op == '=')
++						equalopdone = 1;
++					ADDCMD(op, who, perm, mask);
++					perm = 0;
++				}
++				if (permXbits) {
++					ADDCMD('X', who, permXbits, mask);
++					permXbits = 0;
++				}
++				goto apply;
++			}
++		}
++
++apply:		if (!*p)
++			break;
++		if (*p != ',')
++			goto getop;
++		++p;
++	}
++	set->cmd = 0;
++#ifdef SETMODE_DEBUG
++	(void)printf("Before compress_mode()\n");
++	dumpmode(saveset);
++#endif
++	compress_mode(saveset);
++#ifdef SETMODE_DEBUG
++	(void)printf("After compress_mode()\n");
++	dumpmode(saveset);
++#endif
++	return (saveset);
++}
++
++static BITCMD *
++addcmd(set, op, who, oparg, mask)
++	BITCMD *set;
++	int oparg, who;
++	int op;
++	u_int mask;
++{
++
++	_DIAGASSERT(set != NULL);
++
++	switch (op) {
++	case '=':
++		set->cmd = '-';
++		set->bits = who ? who : STANDARD_BITS;
++		set++;
++
++		op = '+';
++		/* FALLTHROUGH */
++	case '+':
++	case '-':
++	case 'X':
++		set->cmd = op;
++		set->bits = (who ? who : mask) & oparg;
++		break;
++
++	case 'u':
++	case 'g':
++	case 'o':
++		set->cmd = op;
++		if (who) {
++			set->cmd2 = ((who & S_IRUSR) ? CMD2_UBITS : 0) |
++				    ((who & S_IRGRP) ? CMD2_GBITS : 0) |
++				    ((who & S_IROTH) ? CMD2_OBITS : 0);
++			set->bits = (mode_t)~0;
++		} else {
++			set->cmd2 = CMD2_UBITS | CMD2_GBITS | CMD2_OBITS;
++			set->bits = mask;
++		}
++	
++		if (oparg == '+')
++			set->cmd2 |= CMD2_SET;
++		else if (oparg == '-')
++			set->cmd2 |= CMD2_CLR;
++		else if (oparg == '=')
++			set->cmd2 |= CMD2_SET|CMD2_CLR;
++		break;
++	}
++	return (set + 1);
++}
++
++#ifdef SETMODE_DEBUG
++static void
++dumpmode(set)
++	BITCMD *set;
++{
++
++	_DIAGASSERT(set != NULL);
++
++	for (; set->cmd; ++set)
++		(void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n",
++		    set->cmd, set->bits, set->cmd2 ? " cmd2:" : "",
++		    set->cmd2 & CMD2_CLR ? " CLR" : "",
++		    set->cmd2 & CMD2_SET ? " SET" : "",
++		    set->cmd2 & CMD2_UBITS ? " UBITS" : "",
++		    set->cmd2 & CMD2_GBITS ? " GBITS" : "",
++		    set->cmd2 & CMD2_OBITS ? " OBITS" : "");
++}
++#endif
++
++/*
++ * Given an array of bitcmd structures, compress by compacting consecutive
++ * '+', '-' and 'X' commands into at most 3 commands, one of each.  The 'u',
++ * 'g' and 'o' commands continue to be separate.  They could probably be 
++ * compacted, but it's not worth the effort.
++ */
++static void
++compress_mode(set)
++	BITCMD *set;
++{
++	BITCMD *nset;
++	int setbits, clrbits, Xbits, op;
++
++	_DIAGASSERT(set != NULL);
++
++	for (nset = set;;) {
++		/* Copy over any 'u', 'g' and 'o' commands. */
++		while ((op = nset->cmd) != '+' && op != '-' && op != 'X') {
++			*set++ = *nset++;
++			if (!op)
++				return;
++		}
++
++		for (setbits = clrbits = Xbits = 0;; nset++) {
++			if ((op = nset->cmd) == '-') {
++				clrbits |= nset->bits;
++				setbits &= ~nset->bits;
++				Xbits &= ~nset->bits;
++			} else if (op == '+') {
++				setbits |= nset->bits;
++				clrbits &= ~nset->bits;
++				Xbits &= ~nset->bits;
++			} else if (op == 'X')
++				Xbits |= nset->bits & ~setbits;
++			else
++				break;
++		}
++		if (clrbits) {
++			set->cmd = '-';
++			set->cmd2 = 0;
++			set->bits = clrbits;
++			set++;
++		}
++		if (setbits) {
++			set->cmd = '+';
++			set->cmd2 = 0;
++			set->bits = setbits;
++			set++;
++		}
++		if (Xbits) {
++			set->cmd = 'X';
++			set->cmd2 = 0;
++			set->bits = Xbits;
++			set++;
++		}
++	}
++}
+
diff --git a/source/ap/ash/patches/ash-sighup.patch b/source/ap/ash/patches/ash-sighup.patch
new file mode 100644
index 000000000..b4d1bc041
--- /dev/null
+++ b/source/ap/ash/patches/ash-sighup.patch
@@ -0,0 +1,18 @@
+--- ash-0.4.0/jobs.c.orig	Tue Jul  3 19:10:28 2001
++++ ash-0.4.0/jobs.c	Tue Jul  3 19:12:11 2001
+@@ -712,6 +712,7 @@
+ 		} else if (mode == FORK_BG) {
+ 			ignoresig(SIGINT);
+ 			ignoresig(SIGQUIT);
++			ignoresig(SIGHUP);
+ 			if ((jp == NULL || jp->nprocs == 0) &&
+ 			    ! fd0_redirected_p ()) {
+ 				close(0);
+@@ -723,6 +724,7 @@
+ 		if (mode == FORK_BG) {
+ 			ignoresig(SIGINT);
+ 			ignoresig(SIGQUIT);
++			ignoresig(SIGHUP);
+ 			if ((jp == NULL || jp->nprocs == 0) &&
+ 			    ! fd0_redirected_p ()) {
+ 				close(0);
diff --git a/source/ap/ash/patches/ash-syntax.patch b/source/ap/ash/patches/ash-syntax.patch
new file mode 100644
index 000000000..43ce78660
--- /dev/null
+++ b/source/ap/ash/patches/ash-syntax.patch
@@ -0,0 +1,270 @@
+diff -urN netbsd-sh/mksyntax.c ash-0.3.7.orig/mksyntax.c
+--- netbsd-sh/mksyntax.c	Fri Jan 12 17:50:38 2001
++++ ash-0.3.7.orig/mksyntax.c	Mon Apr 23 22:16:46 2001
+@@ -238,14 +238,14 @@
+ 	add("$", "CVAR");
+ 	add("}", "CENDVAR");
+ 	/* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */
+-	add("!*?[=~:/-", "CCTL");
++	add("!*?[=~:/-]", "CCTL");
+ 	print("dqsyntax");
+ 	init();
+ 	fputs("\n/* syntax table used when in single quotes */\n", cfile);
+ 	add("\n", "CNL");
+ 	add("'", "CENDQUOTE");
+ 	/* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */
+-	add("!*?[=~:/-", "CCTL");
++	add("!*?[=~:/-]\\", "CCTL");
+ 	print("sqsyntax");
+ 	init();
+ 	fputs("\n/* syntax table used when in arithmetic */\n", cfile);
+diff -urN netbsd-sh/parser.c ash-0.3.7.orig/parser.c
+--- netbsd-sh/parser.c	Fri Jan 12 17:50:39 2001
++++ ash-0.3.7.orig/parser.c	Mon Apr 23 22:16:46 2001
+@@ -221,6 +221,7 @@
+ 	union node *n1, *n2, *n3;
+ 	int t;
+ 
++	checkkwd = 1;
+ 	n1 = pipeline();
+ 	for (;;) {
+ 		if ((t = readtoken()) == TAND) {
+@@ -231,6 +232,7 @@
+ 			tokpushback++;
+ 			return n1;
+ 		}
++		checkkwd = 2;
+ 		n2 = pipeline();
+ 		n3 = (union node *)stalloc(sizeof (struct nbinary));
+ 		n3->type = t;
+@@ -250,9 +252,11 @@
+ 
+ 	negate = 0;
+ 	TRACE(("pipeline: entered\n"));
+-	while (readtoken() == TNOT)
++	if (readtoken() == TNOT) {
+ 		negate = !negate;
+-	tokpushback++;
++		checkkwd = 1;
++	} else
++		tokpushback++;
+ 	n1 = command();
+ 	if (readtoken() == TPIPE) {
+ 		pipenode = (union node *)stalloc(sizeof (struct npipe));
+@@ -264,6 +268,7 @@
+ 		do {
+ 			prev = lp;
+ 			lp = (struct nodelist *)stalloc(sizeof (struct nodelist));
++			checkkwd = 2;
+ 			lp->n = command();
+ 			prev->next = lp;
+ 		} while (readtoken() == TPIPE);
+@@ -288,9 +293,8 @@
+ 	union node *ap, **app;
+ 	union node *cp, **cpp;
+ 	union node *redir, **rpp;
+-	int t, negate = 0;
++	int t;
+ 
+-	checkkwd = 2;
+ 	redir = NULL;
+ 	n1 = NULL;
+ 	rpp = &redir;
+@@ -303,12 +307,6 @@
+ 	}
+ 	tokpushback++;
+ 
+-	while (readtoken() == TNOT) {
+-		TRACE(("command: TNOT recognized\n"));
+-		negate = !negate;
+-	}
+-	tokpushback++;
+-
+ 	switch (readtoken()) {
+ 	case TIF:
+ 		n1 = (union node *)stalloc(sizeof (struct nif));
+@@ -417,6 +415,8 @@
+ 		cpp = &n1->ncase.cases;
+ 		checkkwd = 2, readtoken();
+ 		do {
++			if (lasttoken == TLP)
++				readtoken();
+ 			*cpp = cp = (union node *)stalloc(sizeof (struct nclist));
+ 			cp->type = NCLIST;
+ 			app = &cp->nclist.pattern;
+@@ -464,21 +464,22 @@
+ 		break;
+ 	/* Handle an empty command like other simple commands.  */
+ 	case TSEMI:
++	case TAND:
++	case TOR:
++	case TNL:
++	case TEOF:
++	case TRP:
++	case TBACKGND:
+ 		/*
+ 		 * An empty command before a ; doesn't make much sense, and
+ 		 * should certainly be disallowed in the case of `if ;'.
+ 		 */
+ 		if (!redir)
+ 			synexpect(-1);
+-	case TAND:
+-	case TOR:
+-	case TNL:
+-	case TEOF:
+ 	case TWORD:
+-	case TRP:
+ 		tokpushback++;
+ 		n1 = simplecmd(rpp, redir);
+-		goto checkneg;
++		return n1;
+ 	default:
+ 		synexpect(-1);
+ 		/* NOTREACHED */
+@@ -502,15 +503,7 @@
+ 		n1->nredir.redirect = redir;
+ 	}
+ 
+-checkneg:
+-	if (negate) {
+-		n2 = (union node *)stalloc(sizeof (struct nnot));
+-		n2->type = NNOT;
+-		n2->nnot.com = n1;
+-		return n2;
+-	}
+-	else
+-		return n1;
++	return n1;
+ }
+ 
+ 
+@@ -520,8 +513,7 @@
+ 	{
+ 	union node *args, **app;
+ 	union node **orig_rpp = rpp;
+-	union node *n = NULL, *n2;
+-	int negate = 0;
++	union node *n = NULL;
+ 
+ 	/* If we don't have any redirections already, then we must reset */
+ 	/* rpp to be the address of the local redir variable.  */
+@@ -537,12 +529,6 @@
+ 	 */
+ 	orig_rpp = rpp;
+ 
+-	while (readtoken() == TNOT) {
+-		TRACE(("command: TNOT recognized\n"));
+-		negate = !negate;
+-	}
+-	tokpushback++;
+-
+ 	for (;;) {
+ 		if (readtoken() == TWORD) {
+ 			n = (union node *)stalloc(sizeof (struct narg));
+@@ -565,8 +551,9 @@
+ 				synerror("Bad function name");
+ #endif
+ 			n->type = NDEFUN;
++			checkkwd = 2;
+ 			n->narg.next = command();
+-			goto checkneg;
++			return n;
+ 		} else {
+ 			tokpushback++;
+ 			break;
+@@ -579,16 +566,7 @@
+ 	n->ncmd.backgnd = 0;
+ 	n->ncmd.args = args;
+ 	n->ncmd.redirect = redir;
+-
+-checkneg:
+-	if (negate) {
+-		n2 = (union node *)stalloc(sizeof (struct nnot));
+-		n2->type = NNOT;
+-		n2->nnot.com = n;
+-		return n2;
+-	}
+-	else
+-		return n;
++	return n;
+ }
+ 
+ STATIC union node *
+@@ -743,7 +721,7 @@
+ 			}
+ 		}
+ out:
+-		checkkwd = (t == TNOT) ? savecheckkwd : 0;
++		checkkwd = 0;
+ 	}
+ #ifdef DEBUG
+ 	if (!alreadyseen)
+@@ -882,6 +860,7 @@
+ 	int varnest;	/* levels of variables expansion */
+ 	int arinest;	/* levels of arithmetic expansion */
+ 	int parenlevel;	/* levels of parens in arithmetic */
++	int dqvarnest;	/* levels of variables expansion within double quotes */
+ 	int oldstyle;
+ 	char const *prevsyntax;	/* syntax before arithmetic */
+ #if __GNUC__
+@@ -892,6 +871,7 @@
+ 	(void) &varnest;
+ 	(void) &arinest;
+ 	(void) &parenlevel;
++	(void) &dqvarnest;
+ 	(void) &oldstyle;
+ 	(void) &prevsyntax;
+ 	(void) &syntax;
+@@ -906,6 +886,7 @@
+ 	varnest = 0;
+ 	arinest = 0;
+ 	parenlevel = 0;
++	dqvarnest = 0;
+ 
+ 	STARTSTACKSTR(out);
+ 	loop: {	/* for each line, until end of word */
+@@ -938,7 +919,8 @@
+ 				USTPUTC(c, out);
+ 				break;
+ 			case CCTL:
+-				if (eofmark == NULL || dblquote)
++				if ((eofmark == NULL || dblquote) &&
++				    dqvarnest == 0)
+ 					USTPUTC(CTLESC, out);
+ 				USTPUTC(c, out);
+ 				break;
+@@ -983,7 +965,8 @@
+ 					if (arinest) {
+ 						syntax = ARISYNTAX;
+ 						dblquote = 0;
+-					} else if (eofmark == NULL) {
++					} else if (eofmark == NULL &&
++						   dqvarnest == 0) {
+ 						syntax = BASESYNTAX;
+ 						dblquote = 0;
+ 					}
+@@ -996,6 +979,9 @@
+ 			case CENDVAR:	/* '}' */
+ 				if (varnest > 0) {
+ 					varnest--;
++					if (dqvarnest > 0) {
++						dqvarnest--;
++					}
+ 					USTPUTC(CTLENDVAR, out);
+ 				} else {
+ 					USTPUTC(c, out);
+@@ -1260,8 +1248,12 @@
+ 		if (dblquote || arinest)
+ 			flags |= VSQUOTE;
+ 		*(stackblock() + typeloc) = subtype | flags;
+-		if (subtype != VSNORMAL)
++		if (subtype != VSNORMAL) {
+ 			varnest++;
++			if (dblquote) {
++				dqvarnest++;
++			}
++		}
+ 	}
+ 	goto parsesub_return;
+ }
+
diff --git a/source/ap/ash/patches/ash-test.patch b/source/ap/ash/patches/ash-test.patch
new file mode 100644
index 000000000..14c9f6802
--- /dev/null
+++ b/source/ap/ash/patches/ash-test.patch
@@ -0,0 +1,588 @@
+diff -urN netbsd-sh/bltin/test.c ash-0.3.7.orig/bltin/test.c
+--- netbsd-sh/bltin/test.c	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/bltin/test.c	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,583 @@
++/*	$NetBSD: test.c,v 1.22 2000/04/09 23:24:59 christos Exp $	*/
++
++/*
++ * test(1); version 7-like  --  author Erik Baalbergen
++ * modified by Eric Gisin to be used as built-in.
++ * modified by Arnold Robbins to add SVR3 compatibility
++ * (-x -c -b -p -u -g -k) plus Korn's -L -nt -ot -ef and new -S (socket).
++ * modified by J.T. Conklin for NetBSD.
++ *
++ * This program is in the Public Domain.
++ */
++
++#include <sys/cdefs.h>
++#ifndef lint
++__RCSID("$NetBSD: test.c,v 1.22 2000/04/09 23:24:59 christos Exp $");
++#endif
++
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++#include <ctype.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <err.h>
++#ifdef __STDC__
++#include <stdarg.h>
++#else
++#include <varargs.h>
++#endif
++
++/* test(1) accepts the following grammar:
++	oexpr	::= aexpr | aexpr "-o" oexpr ;
++	aexpr	::= nexpr | nexpr "-a" aexpr ;
++	nexpr	::= primary | "!" primary
++	primary	::= unary-operator operand
++		| operand binary-operator operand
++		| operand
++		| "(" oexpr ")"
++		;
++	unary-operator ::= "-r"|"-w"|"-x"|"-f"|"-d"|"-c"|"-b"|"-p"|
++		"-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S";
++
++	binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"|
++			"-nt"|"-ot"|"-ef";
++	operand ::= <any legal UNIX file name>
++*/
++
++enum token {
++	EOI,
++	FILRD,
++	FILWR,
++	FILEX,
++	FILEXIST,
++	FILREG,
++	FILDIR,
++	FILCDEV,
++	FILBDEV,
++	FILFIFO,
++	FILSOCK,
++	FILSYM,
++	FILGZ,
++	FILTT,
++	FILSUID,
++	FILSGID,
++	FILSTCK,
++	FILNT,
++	FILOT,
++	FILEQ,
++	FILUID,
++	FILGID,
++	STREZ,
++	STRNZ,
++	STREQ,
++	STRNE,
++	STRLT,
++	STRGT,
++	INTEQ,
++	INTNE,
++	INTGE,
++	INTGT,
++	INTLE,
++	INTLT,
++	UNOT,
++	BAND,
++	BOR,
++	LPAREN,
++	RPAREN,
++	OPERAND
++};
++
++enum token_types {
++	UNOP,
++	BINOP,
++	BUNOP,
++	BBINOP,
++	PAREN
++};
++
++static struct t_op {
++	const char *op_text;
++	short op_num, op_type;
++} const ops [] = {
++	{"-r",	FILRD,	UNOP},
++	{"-w",	FILWR,	UNOP},
++	{"-x",	FILEX,	UNOP},
++	{"-e",	FILEXIST,UNOP},
++	{"-f",	FILREG,	UNOP},
++	{"-d",	FILDIR,	UNOP},
++	{"-c",	FILCDEV,UNOP},
++	{"-b",	FILBDEV,UNOP},
++	{"-p",	FILFIFO,UNOP},
++	{"-u",	FILSUID,UNOP},
++	{"-g",	FILSGID,UNOP},
++	{"-k",	FILSTCK,UNOP},
++	{"-s",	FILGZ,	UNOP},
++	{"-t",	FILTT,	UNOP},
++	{"-z",	STREZ,	UNOP},
++	{"-n",	STRNZ,	UNOP},
++	{"-h",	FILSYM,	UNOP},		/* for backwards compat */
++	{"-O",	FILUID,	UNOP},
++	{"-G",	FILGID,	UNOP},
++	{"-L",	FILSYM,	UNOP},
++	{"-S",	FILSOCK,UNOP},
++	{"=",	STREQ,	BINOP},
++	{"!=",	STRNE,	BINOP},
++	{"<",	STRLT,	BINOP},
++	{">",	STRGT,	BINOP},
++	{"-eq",	INTEQ,	BINOP},
++	{"-ne",	INTNE,	BINOP},
++	{"-ge",	INTGE,	BINOP},
++	{"-gt",	INTGT,	BINOP},
++	{"-le",	INTLE,	BINOP},
++	{"-lt",	INTLT,	BINOP},
++	{"-nt",	FILNT,	BINOP},
++	{"-ot",	FILOT,	BINOP},
++	{"-ef",	FILEQ,	BINOP},
++	{"!",	UNOT,	BUNOP},
++	{"-a",	BAND,	BBINOP},
++	{"-o",	BOR,	BBINOP},
++	{"(",	LPAREN,	PAREN},
++	{")",	RPAREN,	PAREN},
++	{0,	0,	0}
++};
++
++static char **t_wp;
++static struct t_op const *t_wp_op;
++static gid_t *group_array = NULL;
++static int ngroups;
++
++static void syntax __P((const char *, const char *));
++static int oexpr __P((enum token));
++static int aexpr __P((enum token));
++static int nexpr __P((enum token));
++static int primary __P((enum token));
++static int binop __P((void));
++static int filstat __P((char *, enum token));
++static enum token t_lex __P((char *));
++static int isoperand __P((void));
++static int getn __P((const char *));
++static int newerf __P((const char *, const char *));
++static int olderf __P((const char *, const char *));
++static int equalf __P((const char *, const char *));
++static int test_eaccess();
++static int bash_group_member();
++static void initialize_group_array();
++
++#if defined(SHELL)
++extern void error __P((const char *, ...)) __attribute__((__noreturn__));
++#else
++static void error __P((const char *, ...)) __attribute__((__noreturn__));
++
++static void
++#ifdef __STDC__
++error(const char *msg, ...)
++#else
++error(va_alist)
++	va_dcl
++#endif
++{
++	va_list ap;
++#ifndef __STDC__
++	const char *msg;
++
++	va_start(ap);
++	msg = va_arg(ap, const char *);
++#else
++	va_start(ap, msg);
++#endif
++	verrx(2, msg, ap);
++	/*NOTREACHED*/
++	va_end(ap);
++}
++#endif
++
++#ifdef SHELL
++int testcmd __P((int, char **));
++
++int
++testcmd(argc, argv)
++	int argc;
++	char **argv;
++#else
++int main __P((int, char **));
++
++int
++main(argc, argv)
++	int argc;
++	char **argv;
++#endif
++{
++	int	res;
++
++
++	if (strcmp(argv[0], "[") == 0) {
++		if (strcmp(argv[--argc], "]"))
++			error("missing ]");
++		argv[argc] = NULL;
++	}
++
++	if (argc < 2)
++		return 1;
++
++	t_wp = &argv[1];
++	res = !oexpr(t_lex(*t_wp));
++
++	if (*t_wp != NULL && *++t_wp != NULL)
++		syntax(*t_wp, "unexpected operator");
++
++	return res;
++}
++
++static void
++syntax(op, msg)
++	const char	*op;
++	const char	*msg;
++{
++	if (op && *op)
++		error("%s: %s", op, msg);
++	else
++		error("%s", msg);
++}
++
++static int
++oexpr(n)
++	enum token n;
++{
++	int res;
++
++	res = aexpr(n);
++	if (t_lex(*++t_wp) == BOR)
++		return oexpr(t_lex(*++t_wp)) || res;
++	t_wp--;
++	return res;
++}
++
++static int
++aexpr(n)
++	enum token n;
++{
++	int res;
++
++	res = nexpr(n);
++	if (t_lex(*++t_wp) == BAND)
++		return aexpr(t_lex(*++t_wp)) && res;
++	t_wp--;
++	return res;
++}
++
++static int
++nexpr(n)
++	enum token n;			/* token */
++{
++	if (n == UNOT)
++		return !nexpr(t_lex(*++t_wp));
++	return primary(n);
++}
++
++static int
++primary(n)
++	enum token n;
++{
++	enum token nn;
++	int res;
++
++	if (n == EOI)
++		return 0;		/* missing expression */
++	if (n == LPAREN) {
++		if ((nn = t_lex(*++t_wp)) == RPAREN)
++			return 0;	/* missing expression */
++		res = oexpr(nn);
++		if (t_lex(*++t_wp) != RPAREN)
++			syntax(NULL, "closing paren expected");
++		return res;
++	}
++	if (t_wp_op && t_wp_op->op_type == UNOP) {
++		/* unary expression */
++		if (*++t_wp == NULL)
++			syntax(t_wp_op->op_text, "argument expected");
++		switch (n) {
++		case STREZ:
++			return strlen(*t_wp) == 0;
++		case STRNZ:
++			return strlen(*t_wp) != 0;
++		case FILTT:
++			return isatty(getn(*t_wp));
++		default:
++			return filstat(*t_wp, n);
++		}
++	}
++
++	if (t_lex(t_wp[1]), t_wp_op && t_wp_op->op_type == BINOP) {
++		return binop();
++	}	  
++
++	return strlen(*t_wp) > 0;
++}
++
++static int
++binop()
++{
++	const char *opnd1, *opnd2;
++	struct t_op const *op;
++
++	opnd1 = *t_wp;
++	(void) t_lex(*++t_wp);
++	op = t_wp_op;
++
++	if ((opnd2 = *++t_wp) == (char *)0)
++		syntax(op->op_text, "argument expected");
++		
++	switch (op->op_num) {
++	case STREQ:
++		return strcmp(opnd1, opnd2) == 0;
++	case STRNE:
++		return strcmp(opnd1, opnd2) != 0;
++	case STRLT:
++		return strcmp(opnd1, opnd2) < 0;
++	case STRGT:
++		return strcmp(opnd1, opnd2) > 0;
++	case INTEQ:
++		return getn(opnd1) == getn(opnd2);
++	case INTNE:
++		return getn(opnd1) != getn(opnd2);
++	case INTGE:
++		return getn(opnd1) >= getn(opnd2);
++	case INTGT:
++		return getn(opnd1) > getn(opnd2);
++	case INTLE:
++		return getn(opnd1) <= getn(opnd2);
++	case INTLT:
++		return getn(opnd1) < getn(opnd2);
++	case FILNT:
++		return newerf (opnd1, opnd2);
++	case FILOT:
++		return olderf (opnd1, opnd2);
++	case FILEQ:
++		return equalf (opnd1, opnd2);
++	default:
++		abort();
++		/* NOTREACHED */
++	}
++}
++
++static int
++filstat(nm, mode)
++	char *nm;
++	enum token mode;
++{
++	struct stat s;
++
++	if (mode == FILSYM ? lstat(nm, &s) : stat(nm, &s))
++		return 0;
++
++	switch (mode) {
++	case FILRD:
++		return test_eaccess(nm, R_OK) == 0;
++	case FILWR:
++		return test_eaccess(nm, W_OK) == 0;
++	case FILEX:
++		return test_eaccess(nm, X_OK) == 0;
++	case FILEXIST:
++		return 1;
++	case FILREG:
++		return S_ISREG(s.st_mode);
++	case FILDIR:
++		return S_ISDIR(s.st_mode);
++	case FILCDEV:
++		return S_ISCHR(s.st_mode);
++	case FILBDEV:
++		return S_ISBLK(s.st_mode);
++	case FILFIFO:
++		return S_ISFIFO(s.st_mode);
++	case FILSOCK:
++		return S_ISSOCK(s.st_mode);
++	case FILSYM:
++		return S_ISLNK(s.st_mode);
++	case FILSUID:
++		return (s.st_mode & S_ISUID) != 0;
++	case FILSGID:
++		return (s.st_mode & S_ISGID) != 0;
++	case FILSTCK:
++		return (s.st_mode & S_ISVTX) != 0;
++	case FILGZ:
++		return s.st_size > (off_t)0;
++	case FILUID:
++		return s.st_uid == geteuid();
++	case FILGID:
++		return s.st_gid == getegid();
++	default:
++		return 1;
++	}
++}
++
++static enum token
++t_lex(s)
++	char *s;
++{
++	struct t_op const *op = ops;
++
++	if (s == 0) {
++		t_wp_op = (struct t_op *)0;
++		return EOI;
++	}
++	while (op->op_text) {
++		if (strcmp(s, op->op_text) == 0) {
++			if ((op->op_type == UNOP && isoperand()) ||
++			    (op->op_num == LPAREN && *(t_wp+1) == 0))
++				break;
++			t_wp_op = op;
++			return op->op_num;
++		}
++		op++;
++	}
++	t_wp_op = (struct t_op *)0;
++	return OPERAND;
++}
++
++static int
++isoperand()
++{
++	struct t_op const *op = ops;
++	char *s;
++	char *t;
++
++	if ((s  = *(t_wp+1)) == 0)
++		return 1;
++	if ((t = *(t_wp+2)) == 0)
++		return 0;
++	while (op->op_text) {
++		if (strcmp(s, op->op_text) == 0)
++	    		return op->op_type == BINOP &&
++	    		    (t[0] != ')' || t[1] != '\0'); 
++		op++;
++	}
++	return 0;
++}
++
++/* atoi with error detection */
++static int
++getn(s)
++	const char *s;
++{
++	char *p;
++	long r;
++
++	errno = 0;
++	r = strtol(s, &p, 10);
++
++	if (errno != 0)
++	      error("%s: out of range", s);
++
++	while (isspace((unsigned char)*p))
++	      p++;
++	
++	if (*p)
++	      error("%s: bad number", s);
++
++	return (int) r;
++}
++
++static int
++newerf (f1, f2)
++const char *f1, *f2;
++{
++	struct stat b1, b2;
++
++	return (stat (f1, &b1) == 0 &&
++		stat (f2, &b2) == 0 &&
++		b1.st_mtime > b2.st_mtime);
++}
++
++static int
++olderf (f1, f2)
++const char *f1, *f2;
++{
++	struct stat b1, b2;
++
++	return (stat (f1, &b1) == 0 &&
++		stat (f2, &b2) == 0 &&
++		b1.st_mtime < b2.st_mtime);
++}
++
++static int
++equalf (f1, f2)
++const char *f1, *f2;
++{
++	struct stat b1, b2;
++
++	return (stat (f1, &b1) == 0 &&
++		stat (f2, &b2) == 0 &&
++		b1.st_dev == b2.st_dev &&
++		b1.st_ino == b2.st_ino);
++}
++
++/* Do the same thing access(2) does, but use the effective uid and gid,
++   and don't make the mistake of telling root that any file is
++   executable. */
++static int
++test_eaccess (path, mode)
++char *path;
++int mode;
++{
++	struct stat st;
++	int euid = geteuid();
++
++	if (stat (path, &st) < 0)
++		return (-1);
++
++	if (euid == 0) {
++		/* Root can read or write any file. */
++		if (mode != X_OK)
++		return (0);
++
++		/* Root can execute any file that has any one of the execute
++		   bits set. */
++		if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
++			return (0);
++	}
++
++	if (st.st_uid == euid)		/* owner */
++		mode <<= 6;
++	else if (bash_group_member (st.st_gid))
++		mode <<= 3;
++
++	if (st.st_mode & mode)
++		return (0);
++
++	return (-1);
++}
++
++static void
++initialize_group_array ()
++{
++	ngroups = getgroups(0, NULL);
++	group_array = malloc(ngroups * sizeof(gid_t));
++	if (!group_array)
++		error(strerror(ENOMEM));
++	getgroups(ngroups, group_array);
++}
++
++/* Return non-zero if GID is one that we have in our groups list. */
++static int
++bash_group_member (gid)
++gid_t gid;
++{
++	register int i;
++
++	/* Short-circuit if possible, maybe saving a call to getgroups(). */
++	if (gid == getgid() || gid == getegid())
++		return (1);
++
++	if (ngroups == 0)
++		initialize_group_array ();
++
++	/* Search through the list looking for GID. */
++	for (i = 0; i < ngroups; i++)
++		if (gid == group_array[i])
++			return (1);
++
++	return (0);
++}
+
diff --git a/source/ap/ash/patches/ash-times.patch b/source/ap/ash/patches/ash-times.patch
new file mode 100644
index 000000000..4c24f9a66
--- /dev/null
+++ b/source/ap/ash/patches/ash-times.patch
@@ -0,0 +1,42 @@
+diff -urN netbsd-sh/bltin/times.c ash-0.3.7.orig/bltin/times.c
+--- netbsd-sh/bltin/times.c	Thu Jan  1 01:00:00 1970
++++ ash-0.3.7.orig/bltin/times.c	Mon Apr 23 22:16:46 2001
+@@ -0,0 +1,30 @@
++#ifdef _GNU_SOURCE
++/*
++ * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
++ * This file contains code for the times builtin.
++ * $Id: times.c,v 1.4 2000/04/01 09:23:02 herbert Exp $
++ */
++
++#include <stdio.h>
++#include <sys/times.h>
++#include <unistd.h>
++
++#define main timescmd
++
++int main() {
++	struct tms buf;
++	long int clk_tck = sysconf(_SC_CLK_TCK);
++
++	times(&buf);
++	printf("%dm%fs %dm%fs\n%dm%fs %dm%fs\n",
++	       (int) (buf.tms_utime / clk_tck / 60),
++	       ((double) buf.tms_utime) / clk_tck,
++	       (int) (buf.tms_stime / clk_tck / 60),
++	       ((double) buf.tms_stime) / clk_tck,
++	       (int) (buf.tms_cutime / clk_tck / 60),
++	       ((double) buf.tms_cutime) / clk_tck,
++	       (int) (buf.tms_cstime / clk_tck / 60),
++	       ((double) buf.tms_cstime) / clk_tck);
++	return 0;
++}
++#endif	/* _GNU_SOURCE */
+diff -urN netbsd-sh/builtins.def ash-0.3.7.orig/builtins.def
+--- netbsd-sh/builtins.def	Mon Apr 10 13:02:58 2000
++++ ash-0.3.7.orig/builtins.def	Mon Apr 23 22:16:46 2001
+@@ -91,3 +93,4 @@
+ aliascmd	alias
+ ulimitcmd	ulimit
+ testcmd		test [
++timescmd	times
diff --git a/source/ap/ash/slack-desc b/source/ap/ash/slack-desc
new file mode 100644
index 000000000..e8d2c9c29
--- /dev/null
+++ b/source/ap/ash/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------------------------------------------------------|
+ash: ash (Kenneth Almquist's ash shell)
+ash:
+ash: A lightweight (92K) Bourne compatible shell.  Great for machines with
+ash: low memory, but does not provide all the extras of shells like bash,
+ash: tcsh, and zsh.  Runs most shell scripts compatible with the Bourne
+ash: shell.  Note that under Linux, most scripts seem to use at least some
+ash: bash-specific syntax.  The Slackware setup scripts are a notable
+ash: exception, since ash is the shell used on the install disks.  NetBSD
+ash: uses ash as its /bin/sh.
+ash:
+ash:
diff --git a/source/ap/at/at.SlackBuild b/source/ap/at/at.SlackBuild
new file mode 100755
index 000000000..2751bfc9e
--- /dev/null
+++ b/source/ap/at/at.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=${VERSION:-3.1.10}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-at
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf at-$VERSION
+tar xvf $CWD/at-${VERSION}.tar.bz2 || exit 1
+cd at-$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 {} \;
+
+# Or else /var/spool/cron will be used:
+mkdir -p /var/spool/at{jobs,spool}
+chmod 770 /var/spool/at{jobs,spool}
+chown daemon:daemon /var/spool/at{jobs,spool}
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  $ARCH-slackware-linux
+
+# Does not like parallel builds:
+make || exit 1
+make install IROOT=$PKG || exit
+
+mv $PKG/etc/at.deny $PKG/etc/at.deny.new
+chown root:root $PKG/var $PKG/var/spool
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+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
+
+rm -rf $PKG/usr/doc/at
+mkdir -p $PKG/usr/doc/at-$VERSION
+cp -a \
+  COPYING ChangeLog debian/copyright Problems README timespec \
+  $PKG/usr/doc/at-$VERSION
+mv $PKG/usr/doc/at-$VERSION/copyright $PKG/usr/doc/at-$VERSION/Copyright
+chmod 644 $PKG/usr/doc/at-$VERSION/Copyright
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/at-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/at/doinst.sh b/source/ap/at/doinst.sh
new file mode 100644
index 000000000..555d8319b
--- /dev/null
+++ b/source/ap/at/doinst.sh
@@ -0,0 +1,30 @@
+#!/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 etc/at.deny.new
+if [ ! -r var/spool/atjobs/.SEQ ]; then
+  touch var/spool/atjobs/.SEQ
+  chmod 660 var/spool/atjobs/.SEQ
+  chown daemon.daemon var/spool/atjobs/.SEQ
+fi
+( cd usr/bin ; rm -rf atq )
+( cd usr/bin ; ln -sf at atq )
+( cd usr/bin ; rm -rf atrm )
+( cd usr/bin ; ln -sf at atrm )
+( cd usr/man/man1 ; rm -rf atq.1.gz )
+( cd usr/man/man1 ; ln -sf at.1.gz atq.1.gz )
+( cd usr/man/man1 ; rm -rf atrm.1.gz )
+( cd usr/man/man1 ; ln -sf at.1.gz atrm.1.gz )
+( cd usr/man/man1 ; rm -rf batch.1.gz )
+( cd usr/man/man1 ; ln -sf at.1.gz batch.1.gz )
+( cd usr/man/man5 ; rm -rf at_deny.5.gz )
+( cd usr/man/man5 ; ln -sf at_allow.5.gz at_deny.5.gz )
diff --git a/source/ap/at/slack-desc b/source/ap/at/slack-desc
new file mode 100644
index 000000000..ba276df62
--- /dev/null
+++ b/source/ap/at/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------------------------------------------------------|
+at: at (delayed command execution)
+at:
+at: at and batch read shell commands from standard input (or a specified
+at: file) storing them as a job to be scheduled for execution at a later
+at: time.
+at:
+at: The 'at' command was written by David Parsons and Thomas Koenig.
+at:
+at:
+at:
+at:
diff --git a/source/ap/aumix/aumix.SlackBuild b/source/ap/aumix/aumix.SlackBuild
new file mode 100755
index 000000000..7261ba64e
--- /dev/null
+++ b/source/ap/aumix/aumix.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=2.8
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+if [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-aumix
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf aumix-$VERSION
+tar xjvf $CWD/aumix-$VERSION.tar.bz2
+cd aumix-$VERSION
+zcat $CWD/aumix.alsa.diff.gz | patch -p1 --verbose --backup --suffix=.orig
+chown -R root:root .
+CFLAGS="$SLKCFLAGS" \
+./configure --prefix=/usr \
+            --without-gtk1
+make || exit 1
+make install DESTDIR=$PKG
+strip $PKG/usr/bin/*
+mkdir -p $PKG/usr/doc/aumix-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS README TODO \
+  $PKG/usr/doc/aumix-$VERSION
+# This is obsolete (besides being broken)
+rm -f $PKG/usr/bin/xaumix $PKG/usr/man/man1/xaumix.1
+# More fluff, doesn't deserve mainsteam placement
+mv $PKG/usr/bin/mute $PKG/usr/doc/aumix-$VERSION/mute.sh
+gzip -9 $PKG/usr/man/man1/*
+mkdir $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/aumix-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/aumix/aumix.alsa.diff b/source/ap/aumix/aumix.alsa.diff
new file mode 100644
index 000000000..6d632cf5f
--- /dev/null
+++ b/source/ap/aumix/aumix.alsa.diff
@@ -0,0 +1,34 @@
+--- ./src/common.h.orig	2002-10-29 13:27:51.000000000 -0800
++++ ./src/common.h	2003-08-28 23:16:53.000000000 -0700
+@@ -55,7 +55,7 @@
+ #endif				/* HAVE_SYS_SOUNDCARD_H */
+ 
+ #ifdef HAVE_ALSA
+-#include <sys/asoundlib.h>
++#include <alsa/asoundlib.h>
+ #endif				/* HAVE_ALSA */
+ #define MAXLEVEL 100		/* highest level permitted by OSS drivers */
+ enum {
+--- ./configure.orig	2002-11-24 17:35:48.000000000 -0800
++++ ./configure	2003-08-28 23:14:46.000000000 -0700
+@@ -1890,16 +1890,16 @@
+ fi
+ 
+ if test $alsa_must = on; then
+-    ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
+-echo "configure:1896: checking for sys/asoundlib.h" >&5
++    ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
++echo "configure:1896: checking for alsa/asoundlib.h" >&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 1901 "configure"
+ #include "confdefs.h"
+-#include <sys/asoundlib.h>
++#include <alsa/asoundlib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:1906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/source/ap/aumix/slack-desc b/source/ap/aumix/slack-desc
new file mode 100644
index 000000000..70e780877
--- /dev/null
+++ b/source/ap/aumix/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------------------------------------------------------|
+aumix: aumix (GTK+/ncurses audio mixer)
+aumix:
+aumix: This is a program for adjusting audio mixers from the command line or
+aumix: scripts, or interactively at the console or a terminal with a 
+aumix: full-screen, ncurses-based interface or a GTK-based X interface.
+aumix:
+aumix:
+aumix:
+aumix:
+aumix:
+aumix:
diff --git a/source/ap/bc/bc.SlackBuild b/source/ap/bc/bc.SlackBuild
new file mode 100755
index 000000000..a8ebb8ebc
--- /dev/null
+++ b/source/ap/bc/bc.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=bc
+VERSION=${VERSION:-1.06.95}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+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"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION
+
+# 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 \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --with-readline \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make -j4 || 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-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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING COPYING.LIB Examples FAQ INSTALL NEWS README Test \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+#zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/bc/slack-desc b/source/ap/bc/slack-desc
new file mode 100644
index 000000000..765f6d824
--- /dev/null
+++ b/source/ap/bc/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------------------------------------------------------|
+bc: bc (An arbitrary precision calculator language)
+bc:
+bc: bc is an arbitrary precision numeric processing language.  Syntax is
+bc: similar to C, but differs in many substantial areas.  It supports
+bc: interactive execution of statements.  bc is a utility included in the
+bc: POSIX P1003.2/D11 draft standard.
+bc:
+bc: The GNU version of bc was written by Philip A. Nelson.
+bc:
+bc:
+bc:
diff --git a/source/ap/bpe/bpe.SlackBuild b/source/ap/bpe/bpe.SlackBuild
new file mode 100755
index 000000000..44fde4c8f
--- /dev/null
+++ b/source/ap/bpe/bpe.SlackBuild
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=2.01.00
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-bpe
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf bpe-$VERSION
+tar xzvf $CWD/bpe-$VERSION.tar.gz
+cd bpe-$VERSION
+chown -R root:root .
+find . -perm 777 -exec chmod 755 {} \;
+find . -perm 664 -exec chmod 644 {} \;
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr
+make
+make install DESTDIR=$PKG
+( 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
+)
+mkdir -p $PKG/usr/doc/bpe-$VERSION
+cp -a \
+  HISTORY LICENSE README-bpe \
+  $PKG/usr/doc/bpe-$VERSION
+gzip -9 $PKG/usr/man/man?/*.?
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/bpe-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/bpe/slack-desc b/source/ap/bpe/slack-desc
new file mode 100644
index 000000000..7c2de23c7
--- /dev/null
+++ b/source/ap/bpe/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------------------------------------------------------|
+bpe: bpe (Binary Patch Editor)
+bpe:
+bpe: bpe is a simple, screen-oriented editor for searching and editing
+bpe: ordinary files in either ASCII or hexadecimal modes.
+bpe:
+bpe: bpe was written by Andreas Pleschutznig.  Bill Davidsen contributed
+bpe: additional features, as did Ralphe Neill (the current maintainer).
+bpe:
+bpe:
+bpe:
+bpe:
diff --git a/source/ap/cdparanoia/cdparanoia-III-10.2_cdda_private.patch b/source/ap/cdparanoia/cdparanoia-III-10.2_cdda_private.patch
new file mode 100644
index 000000000..9181218f4
--- /dev/null
+++ b/source/ap/cdparanoia/cdparanoia-III-10.2_cdda_private.patch
@@ -0,0 +1,481 @@
+Index: /trunk/cdparanoia/interface/test_interface.c
+===================================================================
+--- /trunk/cdparanoia/interface/test_interface.c (revision 15299)
++++ /trunk/cdparanoia/interface/test_interface.c (revision 15338)
+@@ -67,7 +67,7 @@
+ 
+   if(begin<lastread)
+-    d->private->last_milliseconds=20;
++    d->private_data->last_milliseconds=20;
+   else
+-    d->private->last_milliseconds=sectors;
++    d->private_data->last_milliseconds=sectors;
+ 
+ #ifdef CDDA_TEST_UNDERRUN
+Index: /trunk/cdparanoia/interface/cdda_interface.h
+===================================================================
+--- /trunk/cdparanoia/interface/cdda_interface.h (revision 15290)
++++ /trunk/cdparanoia/interface/cdda_interface.h (revision 15338)
+@@ -85,5 +85,5 @@
+   int is_mmc;
+ 
+-  cdda_private_data_t *private;
++  cdda_private_data_t *private_data;
+   void         *reserved;
+   unsigned char inqbytes[4];
+Index: /trunk/cdparanoia/interface/interface.c
+===================================================================
+--- /trunk/cdparanoia/interface/interface.c (revision 15314)
++++ /trunk/cdparanoia/interface/interface.c (revision 15338)
+@@ -40,7 +40,7 @@
+     if(d->cdda_fd!=-1)close(d->cdda_fd);
+     if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
+-    if(d->private){
+-      if(d->private->sg_hd)free(d->private->sg_hd);
+-      free(d->private);
++    if(d->private_data){
++      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
++      free(d->private_data);
+     }
+ 
+@@ -128,5 +128,5 @@
+       }	
+     }
+-    if(ms)*ms=d->private->last_milliseconds;
++    if(ms)*ms=d->private_data->last_milliseconds;
+     return(sectors);
+   }
+Index: /trunk/cdparanoia/interface/scsi_interface.c
+===================================================================
+--- /trunk/cdparanoia/interface/scsi_interface.c (revision 15314)
++++ /trunk/cdparanoia/interface/scsi_interface.c (revision 15338)
+@@ -16,11 +16,11 @@
+   struct timespec tv1;
+   struct timespec tv2;
+-  int ret1=clock_gettime(d->private->clock,&tv1);
++  int ret1=clock_gettime(d->private_data->clock,&tv1);
+   int ret2=ioctl(fd, command,arg);
+-  int ret3=clock_gettime(d->private->clock,&tv2);
++  int ret3=clock_gettime(d->private_data->clock,&tv2);
+   if(ret1<0 || ret3<0){
+-    d->private->last_milliseconds=-1;
++    d->private_data->last_milliseconds=-1;
+   }else{
+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
+   }
+   return ret2;
+@@ -97,5 +97,5 @@
+   fd_set fdset;
+   struct timeval tv;
+-  struct sg_header *sg_hd=d->private->sg_hd;
++  struct sg_header *sg_hd=d->private_data->sg_hd;
+   int flag=0;
+ 
+@@ -186,5 +186,5 @@
+   int tret1,tret2;
+   int status = 0;
+-  struct sg_header *sg_hd=d->private->sg_hd;
++  struct sg_header *sg_hd=d->private_data->sg_hd;
+   long writebytes=SG_OFF+cmd_len+in_size;
+ 
+@@ -196,5 +196,5 @@
+   memset(sg_hd,0,sizeof(sg_hd)); 
+   memset(sense_buffer,0,SG_MAX_SENSE); 
+-  memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
++  memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
+   sg_hd->twelve_byte = cmd_len == 12;
+   sg_hd->result = 0;
+@@ -210,5 +210,5 @@
+ 
+   if(bytecheck && out_size>in_size){
+-    memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
++    memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
+     /* the size does not remove cmd_len due to the way the kernel
+        driver copies buffers */
+@@ -244,5 +244,5 @@
+ 
+   sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
+-  tret1=clock_gettime(d->private->clock,&tv1);  
++  tret1=clock_gettime(d->private_data->clock,&tv1);  
+   errno=0;
+   status = write(d->cdda_fd, sg_hd, writebytes );
+@@ -290,5 +290,5 @@
+   }
+ 
+-  tret2=clock_gettime(d->private->clock,&tv2);  
++  tret2=clock_gettime(d->private_data->clock,&tv2);  
+   errno=0;
+   status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
+@@ -314,5 +314,5 @@
+     long i,flag=0;
+     for(i=in_size;i<out_size;i++)
+-      if(d->private->sg_buffer[i]!=bytefill){
++      if(d->private_data->sg_buffer[i]!=bytefill){
+ 	flag=1;
+ 	break;
+@@ -327,7 +327,7 @@
+   errno=0;
+   if(tret1<0 || tret2<0){
+-    d->private->last_milliseconds=-1;
++    d->private_data->last_milliseconds=-1;
+   }else{
+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
+   }
+   return(0);
+@@ -348,5 +348,5 @@
+   memset(&hdr,0,sizeof(hdr));
+   memset(sense,0,sizeof(sense));
+-  memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
++  memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
+ 
+   hdr.cmdp = cmd;
+@@ -356,5 +356,5 @@
+   hdr.timeout = 50000;
+   hdr.interface_id = 'S';
+-  hdr.dxferp =  d->private->sg_buffer;
++  hdr.dxferp =  d->private_data->sg_buffer;
+   hdr.flags = SG_FLAG_DIRECT_IO;  /* direct IO if we can get it */
+ 
+@@ -401,5 +401,5 @@
+     long i,flag=0;
+     for(i=in_size;i<out_size;i++)
+-      if(d->private->sg_buffer[i]!=bytefill){
++      if(d->private_data->sg_buffer[i]!=bytefill){
+ 	flag=1;
+ 	break;
+@@ -413,5 +413,5 @@
+ 
+   /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
+-  /* d->private->last_milliseconds = hdr.duration; */
++  /* d->private_data->last_milliseconds = hdr.duration; */
+ 
+   errno = 0;
+@@ -446,7 +446,7 @@
+   handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
+ 
+-  key = d->private->sg_buffer[2] & 0xf;
+-  ASC = d->private->sg_buffer[12];
+-  ASCQ = d->private->sg_buffer[13];
++  key = d->private_data->sg_buffer[2] & 0xf;
++  ASC = d->private_data->sg_buffer[12];
++  ASCQ = d->private_data->sg_buffer[13];
+   
+   if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
+@@ -493,5 +493,5 @@
+ 
+   {
+-    unsigned char *b=d->private->sg_buffer;
++    unsigned char *b=d->private_data->sg_buffer;
+     if(b[0])return(1); /* Handles only up to 256 bytes */
+     if(b[6])return(1); /* Handles only up to 256 bytes */
+@@ -605,6 +605,6 @@
+   if(mode_sense(d,12,0x01))return(-1);
+ 
+-  d->orgdens = d->private->sg_buffer[4];
+-  return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);
++  d->orgdens = d->private_data->sg_buffer[4];
++  return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
+ }
+ 
+@@ -665,6 +665,6 @@
+   }
+ 
+-  first=d->private->sg_buffer[2];
+-  last=d->private->sg_buffer[3];
++  first=d->private_data->sg_buffer[2];
++  last=d->private_data->sg_buffer[3];
+   tracks=last-first+1;
+ 
+@@ -684,5 +684,5 @@
+     }
+     {
+-      scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
++      scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
+ 
+       d->disc_toc[i-first].bFlags=toc->bFlags;
+@@ -705,5 +705,5 @@
+   }
+   {
+-    scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
++    scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
+     
+     d->disc_toc[i-first].bFlags=toc->bFlags;
+@@ -739,5 +739,5 @@
+ 
+   /* copy to our structure and convert start sector */
+-  tracks = d->private->sg_buffer[1];
++  tracks = d->private_data->sg_buffer[1];
+   if (tracks > MAXTRK) {
+     cderror(d,"003: CDROM reporting illegal number of tracks\n");
+@@ -755,31 +755,31 @@
+     }
+     
+-    d->disc_toc[i].bFlags = d->private->sg_buffer[10];
++    d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
+     d->disc_toc[i].bTrack = i + 1;
+ 
+     d->disc_toc[i].dwStartSector= d->adjust_ssize * 
+-	(((signed char)(d->private->sg_buffer[2])<<24) | 
+-	 (d->private->sg_buffer[3]<<16)|
+-	 (d->private->sg_buffer[4]<<8)|
+-	 (d->private->sg_buffer[5]));
++	(((signed char)(d->private_data->sg_buffer[2])<<24) | 
++	 (d->private_data->sg_buffer[3]<<16)|
++	 (d->private_data->sg_buffer[4]<<8)|
++	 (d->private_data->sg_buffer[5]));
+   }
+ 
+   d->disc_toc[i].bFlags = 0;
+   d->disc_toc[i].bTrack = i + 1;
+-  memcpy (&foo, d->private->sg_buffer+2, 4);
+-  memcpy (&bar, d->private->sg_buffer+6, 4);
++  memcpy (&foo, d->private_data->sg_buffer+2, 4);
++  memcpy (&bar, d->private_data->sg_buffer+6, 4);
+   d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
+ 						    be32_to_cpu(bar));
+ 
+   d->disc_toc[i].dwStartSector= d->adjust_ssize * 
+-    ((((signed char)(d->private->sg_buffer[2])<<24) | 
+-      (d->private->sg_buffer[3]<<16)|
+-      (d->private->sg_buffer[4]<<8)|
+-      (d->private->sg_buffer[5]))+
++    ((((signed char)(d->private_data->sg_buffer[2])<<24) | 
++      (d->private_data->sg_buffer[3]<<16)|
++      (d->private_data->sg_buffer[4]<<8)|
++      (d->private_data->sg_buffer[5]))+
+      
+-     ((((signed char)(d->private->sg_buffer[6])<<24) | 
+-       (d->private->sg_buffer[7]<<16)|
+-       (d->private->sg_buffer[8]<<8)|
+-       (d->private->sg_buffer[9]))));
++     ((((signed char)(d->private_data->sg_buffer[6])<<24) | 
++       (d->private_data->sg_buffer[7]<<16)|
++       (d->private_data->sg_buffer[8]<<8)|
++       (d->private_data->sg_buffer[9]))));
+ 
+ 
+@@ -818,5 +818,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -837,5 +837,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -855,5 +855,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -873,5 +873,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -891,5 +891,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -909,5 +909,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -923,5 +923,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -937,5 +937,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -951,5 +951,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -965,5 +965,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -979,5 +979,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -993,5 +993,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -1027,5 +1027,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -1040,5 +1040,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -1053,5 +1053,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -1276,5 +1276,5 @@
+   long i;
+   for(i=2351;i>=0;i--)
+-    if(d->private->sg_buffer[i]!=(unsigned char)'\177')
++    if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
+       return(((i+3)>>2)<<2);
+ 
+@@ -1285,5 +1285,5 @@
+   long i,flag=0;
+   for(i=0;i<2352;i++)
+-    if(d->private->sg_buffer[i]!=0){
++    if(d->private_data->sg_buffer[i]!=0){
+       flag=1;
+       break;
+@@ -1622,5 +1622,5 @@
+   if(mode_sense(d,22,0x2A)==0){
+   
+-    b=d->private->sg_buffer;
++    b=d->private_data->sg_buffer;
+     b+=b[3]+4;
+     
+@@ -1670,5 +1670,5 @@
+     return(NULL);
+   }
+-  return (d->private->sg_buffer);
++  return (d->private_data->sg_buffer);
+ }
+ 
+@@ -1726,6 +1726,6 @@
+ 
+   d->error_retry=1;
+-  d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
+-  d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
++  d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
++  d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
+   d->report_all=1;
+   return(0);
+Index: /trunk/cdparanoia/interface/cooked_interface.c
+===================================================================
+--- /trunk/cdparanoia/interface/cooked_interface.c (revision 15202)
++++ /trunk/cdparanoia/interface/cooked_interface.c (revision 15338)
+@@ -14,11 +14,11 @@
+   struct timespec tv1;
+   struct timespec tv2;
+-  int ret1=clock_gettime(d->private->clock,&tv1);
++  int ret1=clock_gettime(d->private_data->clock,&tv1);
+   int ret2=ioctl(fd, command,arg);
+-  int ret3=clock_gettime(d->private->clock,&tv2);
++  int ret3=clock_gettime(d->private_data->clock,&tv2);
+   if(ret1<0 || ret3<0){
+-    d->private->last_milliseconds=-1;
++    d->private_data->last_milliseconds=-1;
+   }else{
+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
+   }
+   return ret2;
+Index: /trunk/cdparanoia/interface/scan_devices.c
+===================================================================
+--- /trunk/cdparanoia/interface/scan_devices.c (revision 15202)
++++ /trunk/cdparanoia/interface/scan_devices.c (revision 15338)
+@@ -265,9 +265,9 @@
+   d->bigendianp=-1; /* We don't know yet... */
+   d->nsectors=-1;
+-  d->private=calloc(1,sizeof(*d->private));
++  d->private_data=calloc(1,sizeof(*d->private_data));
+   {
+     /* goddamnit */
+     struct timespec tv;
+-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
++    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
+   }
+   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
+@@ -675,13 +675,13 @@
+   d->nsectors=-1;
+   d->messagedest = messagedest;
+-  d->private=calloc(1,sizeof(*d->private));
++  d->private_data=calloc(1,sizeof(*d->private_data));
+   {
+     /* goddamnit */
+     struct timespec tv;
+-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
++    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
+   }
+   if(use_sgio){
+     d->interface=SGIO_SCSI;
+-    d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
++    d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
+     g_fd=d->cdda_fd=dup(d->ioctl_fd);
+   }else{
+@@ -697,6 +697,6 @@
+ 
+     /* malloc our big buffer for scsi commands */
+-    d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
+-    d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
++    d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
++    d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
+   }
+ 
+@@ -773,7 +773,7 @@
+   if(g_fd!=-1)close(g_fd);
+   if(d){
+-    if(d->private){
+-      if(d->private->sg_hd)free(d->private->sg_hd);
+-      free(d->private);
++    if(d->private_data){
++      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
++      free(d->private_data);
+     }
+     free(d);
+@@ -822,5 +822,5 @@
+   d->bigendianp=-1; /* We don't know yet... */
+   d->nsectors=-1;
+-  d->private=calloc(1,sizeof(*d->private));
++  d->private_data=calloc(1,sizeof(*d->private_data));
+   d->drive_model=copystring("File based test interface");
+   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
+
diff --git a/source/ap/cdparanoia/cdparanoia.SlackBuild b/source/ap/cdparanoia/cdparanoia.SlackBuild
new file mode 100755
index 000000000..200fc6bbe
--- /dev/null
+++ b/source/ap/cdparanoia/cdparanoia.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=III-10.2
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-cdparanoia
+
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf cdparanoia-${VERSION}
+tar xvf $CWD/cdparanoia-$VERSION.src.tar.gz || exit 1
+cd cdparanoia-$VERSION || exit 1
+# Patch for changes in cdda headers:
+zcat $CWD/cdparanoia-III-10.2_cdda_private.patch.gz | patch -p3 --verbose --backup --suffix=.orig || 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 {} \;
+
+OPT="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --includedir=/usr/include/cdda \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS OPT="$SLKCFLAGS" || make OPT="$SLKCFLAGS" || exit 1
+
+# Manual install:
+install -d $PKG/usr/bin
+install -d $PKG/usr/include/cdda
+install -d $PKG/usr/lib${LIBDIRSUFFIX}
+install -d $PKG/usr/man/man1
+install -m 0755 cdparanoia $PKG/usr/bin/
+install -m 0644 cdparanoia.1  $PKG/usr/man/man1/
+install -m 0644 utils.h paranoia/cdda_paranoia.h interface/cdda_interface.h \
+	$PKG/usr/include/cdda/
+install -m 0755 paranoia/libcdda_paranoia.so.0.10.? \
+	interface/libcdda_interface.so.0.10.? \
+	$PKG/usr/lib${LIBDIRSUFFIX}/
+install -m 0644 paranoia/libcdda_paranoia.a interface/libcdda_interface.a \
+	$PKG/usr/lib${LIBDIRSUFFIX}/
+
+ldconfig -n $PKG/usr/lib${LIBDIRSUFFIX}
+
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  ln -sf libcdda_paranoia.so.0.10.? libcdda_paranoia.so
+  ln -sf libcdda_interface.so.0.10.? libcdda_interface.so
+)
+
+mkdir -p $PKG/usr/man/jp/man1
+cp -a cdparanoia.1.jp $PKG/usr/man/jp/man1/cdparanoia.1
+
+# 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
+
+mkdir -p $PKG/usr/doc/cdparanoia-$VERSION
+cp -a \
+  FAQ.txt GPL* COPYING* README* \
+  $PKG/usr/doc/cdparanoia-$VERSION
+chown -R root:root $PKG/usr/doc/cdparanoia-$VERSION
+chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/libcdda*.so
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/cdparanoia-$(echo $VERSION | tr '-' '_')-$ARCH-$BUILD.txz
+
diff --git a/source/ap/cdparanoia/slack-desc b/source/ap/cdparanoia/slack-desc
new file mode 100644
index 000000000..0c3057ed7
--- /dev/null
+++ b/source/ap/cdparanoia/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------------------------------------------------------|
+cdparanoia: cdparanoia (digital audio extraction tool)
+cdparanoia:
+cdparanoia: cdparanoia is a Compact Disc Digital Audio (CDDA) extraction tool,
+cdparanoia: commonly known on the net as a 'ripper'.  It reads digital audio data
+cdparanoia: from a Compact Disc and saves it to sound files.  cdparanoia has been
+cdparanoia: designed to read correct audio data even using cheap CD-ROM drives
+cdparanoia: prone to misalignment, frame jitter and loss of streaming.
+cdparanoia: cdparanoia will also read and repair data from CDs that have been
+cdparanoia: damaged in some way.
+cdparanoia:
+cdparanoia:
diff --git a/source/ap/cdrdao/cdrdao.SlackBuild b/source/ap/cdrdao/cdrdao.SlackBuild
new file mode 100755
index 000000000..fccf3ab83
--- /dev/null
+++ b/source/ap/cdrdao/cdrdao.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=1.2.1
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-cdrdao
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf cdrdao-$VERSION
+tar xvf $CWD/cdrdao-$VERSION.tar.bz2 || exit 1
+cd cdrdao-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  $ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+gzip -9 $PKG/usr/man/man1/*.?
+
+mkdir -p $PKG/usr/doc/cdrdao-$VERSION
+cp -a \
+  AUTHORS COPYING CREDITS INSTALL NEWS README* \
+  cdrdao.lsm \
+  contrib \
+  $PKG/usr/doc/cdrdao-$VERSION
+
+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/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/cdrdao-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/cdrdao/slack-desc b/source/ap/cdrdao/slack-desc
new file mode 100644
index 000000000..e3c037fed
--- /dev/null
+++ b/source/ap/cdrdao/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------------------------------------------------------|
+cdrdao: cdrdao (CD burning utility)
+cdrdao:
+cdrdao: cdrdao burns proper disc-at-once (DAO) audio discs.  In DAO mode the
+cdrdao: disc is written in one shot, so you don't have to have irritating 2
+cdrdao: second gaps interrupting a live recording.
+cdrdao:
+cdrdao:
+cdrdao:
+cdrdao:
+cdrdao:
+cdrdao:
diff --git a/source/ap/cdrtools/cdrtools.SlackBuild b/source/ap/cdrtools/cdrtools.SlackBuild
new file mode 100755
index 000000000..49aa08c08
--- /dev/null
+++ b/source/ap/cdrtools/cdrtools.SlackBuild
@@ -0,0 +1,138 @@
+#!/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=2.01.01a57
+ZISOFSTOOLS=1.0.8
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-3}
+
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-cdrtools
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr
+
+cd $TMP
+rm -rf cdrtools-$(echo $VERSION | cut -f 1 -d a)
+tar xvf $CWD/cdrtools-$VERSION.tar.bz2 || exit 1
+cd cdrtools-$(echo $VERSION | cut -f 1 -d a) || 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 {} \;
+
+INS_BASE=/usr make -e $NUMJOBS || exit 1
+# Without this second run, cdda2wav is skipped...
+INS_BASE=/usr make -e || exit 1
+INS_BASE=$PKG/usr make -e install || exit 1
+
+# Remove dupes:
+rm -rf $PKG/usr/share/doc
+rmdir $PKG/usr/share
+
+# I don't know why this couldn't be "/etc/cdrtools" or something, but since
+# getty uses it already I'm not going to argue the point.
+mkdir -p $PKG/etc/default
+cat cdrecord/cdrecord.dfl > $PKG/etc/default/cdrecord.new
+cat rscsi/rscsi.dfl > $PKG/etc/default/rscsi.new
+
+mkdir -p $PKG/usr/doc/cdrtools-$VERSION
+cp -a \
+  ABOUT AN-* BUILD CDDL* COMPILE CONTRIBUTING COPYING* Changelog \
+  *GPL* INSTALL README* START \
+  $PKG/usr/doc/cdrtools-$VERSION
+chown -R root:root $PKG/usr/doc/cdrtools-$VERSION/*
+find $PKG/usr/doc/cdrtools-$VERSION -type f -exec chmod 644 {} \;
+
+(
+   cd mkisofs
+   mkdir -p $PKG/usr/doc/cdrtools-$VERSION/mkisofs
+   cp -a \
+     COPYING* ChangeLog* README* RELEASE TODO \
+     $PKG/usr/doc/cdrtools-$VERSION/mkisofs
+   chown root:root $PKG/usr/doc/cdrtools-$VERSION/mkisofs/*
+   chmod 644 $PKG/usr/doc/cdrtools-$VERSION/mkisofs/*
+)
+(
+   cd cdda2wav
+   mkdir -p $PKG/usr/doc/cdrtools-$VERSION/cdda2wav
+   cp -a \
+     Changelog FAQ Frontends HOWTOUSE NEEDED OtherProgs README THANKS TODO \
+     $PKG/usr/doc/cdrtools-$VERSION/cdda2wav
+   chown root:root $PKG/usr/doc/cdrtools-$VERSION/cdda2wav/*
+   chmod 644 $PKG/usr/doc/cdrtools-$VERSION/cdda2wav/*
+)
+
+# These don't need to be in the package, IMHO.
+rm -rf $PKG/usr/include $PKG/usr/man/man5 $PKG/usr/man/man1/cdda2ogg.1 $PKG/usr/lib/profiled $PKG/usr/lib/*.a
+
+# Fix permissions:
+cd $PKG
+find . -type d -exec chmod 755 {} \;
+chown root:root -R $PKG
+find $PKG/usr/man -type f -exec chmod 644 {} \;
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+chmod 755 $PKG/usr/bin/*
+
+( cd $PKG/usr/bin ; ln -sf mkisofs mkhybrid )
+
+# Next big hole? ;)
+rm -r $PKG/usr/sbin
+rm -f $PKG/usr/doc/cdrtools-$VERSION/README.rscsi
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Add the mkzftree tool for zisofs:
+cd $TMP
+rm -rf zisofs-tools-$ZISOFSTOOLS
+tar xf $CWD/zisofs-tools-$ZISOFSTOOLS.tar.bz2 || exit 1
+cd zisofs-tools-$ZISOFSTOOLS
+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 --prefix=/usr
+make $NUMJOBS || make || exit 1
+cat mkzftree > $PKG/usr/bin/mkzftree
+chmod 755 $PKG/usr/bin/mkzftree
+cat mkzftree.1 | gzip -9c > $PKG/usr/man/man1/mkzftree.1.gz
+mkdir -p $PKG/usr/doc/zisofs-tools-$ZISOFSTOOLS
+cp -a \
+  CHANGES COPYING INSTALL README zisofs.magic \
+  $PKG/usr/doc/zisofs-tools-$ZISOFSTOOLS
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/cdrtools-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/cdrtools/doinst.sh b/source/ap/cdrtools/doinst.sh
new file mode 100644
index 000000000..78d62faa9
--- /dev/null
+++ b/source/ap/cdrtools/doinst.sh
@@ -0,0 +1,14 @@
+#!/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 etc/default/cdrecord.new
+config etc/default/rscsi.new
diff --git a/source/ap/cdrtools/slack-desc b/source/ap/cdrtools/slack-desc
new file mode 100644
index 000000000..b858d4f63
--- /dev/null
+++ b/source/ap/cdrtools/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------------------------------------------------------|
+cdrtools: cdrtools (CD-R, ISO and related tools)
+cdrtools:
+cdrtools: Tools for mastering and writing compact discs.
+cdrtools:
+cdrtools: cdda2wav -- CD audio sampling utility.
+cdrtools: cdrecord -- burn discs in most ATAPI and SCSI CD-R drives.
+cdrtools: mkisofs  -- create ISO9660/HFS/Joliet CD-ROM images.
+cdrtools: mkzftree -- compress a file tree to make a compressed CD-ROM.
+cdrtools:
+cdrtools:
+cdrtools:
diff --git a/source/ap/cdrtools/zisofs-tools-1.0.8.tar.bz2.sign b/source/ap/cdrtools/zisofs-tools-1.0.8.tar.bz2.sign
new file mode 100644
index 000000000..b88c45f71
--- /dev/null
+++ b/source/ap/cdrtools/zisofs-tools-1.0.8.tar.bz2.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBGS/EFyGugalF9Dw4RAmlCAJ9LvLxlqLTQBMTiExL8bLDxP78CwACeMYVb
+Dp91koXYTyTrYDA5zfj6khE=
+=l8pk
+-----END PGP SIGNATURE-----
diff --git a/source/ap/cupsddk/cupsddk.SlackBuild b/source/ap/cupsddk/cupsddk.SlackBuild
new file mode 100755
index 000000000..48157ffc9
--- /dev/null
+++ b/source/ap/cupsddk/cupsddk.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Copyright 2009  Robby Workman, Northport, AL, USA
+# Copyright 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.
+
+# Slackware build script for cupsddk
+
+
+VERSION=${VERSION:-1.2.3}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-cupsddk
+
+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"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP || exit 1
+rm -rf cupsddk-$VERSION
+tar xvf $CWD/cupsddk-${VERSION}-source.tar.bz2 || exit 1
+cd cupsddk-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --with-docdir=/usr/doc/cupsddk-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install BUILDROOT=$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
+
+cp -a \
+  *.txt doc/*.html doc/images \
+  $PKG/usr/doc/cupsddk-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/cupsddk-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/cupsddk/slack-desc b/source/ap/cupsddk/slack-desc
new file mode 100644
index 000000000..e4afd3522
--- /dev/null
+++ b/source/ap/cupsddk/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------------------------------------------------------|
+cupsddk: cupsddk (CUPS Driver Development Kit)
+cupsddk:
+cupsddk: The CUPS Driver Development Kit (DDK) provides a suite of standard
+cupsddk: drivers, a PPD file compiler, and other utilities that can be used
+cupsddk: to develop printer drivers for CUPS and other printing environments.
+cupsddk: CUPS provides a portable printing layer for UNIX®-based operatin
+cupsddk: systems.  The CUPS DDK provides the means for mass-producing PPD
+cupsddk: files and drivers/filters for CUPS-based printer drivers.
+cupsddk: 
+cupsddk: 
+cupsddk:
diff --git a/source/ap/dc3dd/dc3dd.SlackBuild b/source/ap/dc3dd/dc3dd.SlackBuild
new file mode 100755
index 000000000..87324faca
--- /dev/null
+++ b/source/ap/dc3dd/dc3dd.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for dc3dd
+
+# Copyright 2008 Barry J. Grundy <http://www.linuxleo.com>
+# 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=dc3dd		
+VERSION=${VERSION:-6.12.3}	
+ARCH=${ARCH:-x86_64}	
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+ 
+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"
+fi
+
+rm -rf $PKG 
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP 
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
+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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make -j3 || 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 || true
+
+( cd $PKG/usr/man || exit 1
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS Options_Reference.txt \
+  README* Sample_Commands.txt THANKS THANKS-to-translators TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/dc3dd/slack-desc b/source/ap/dc3dd/slack-desc
new file mode 100644
index 000000000..1dfd5e024
--- /dev/null
+++ b/source/ap/dc3dd/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-------------------------------------------------------|
+dc3dd: dc3dd (version of dd designed for computer forensics)
+dc3dd:
+dc3dd: dc3dd is a patched version of GNU dd to include a number of features 
+dc3dd: useful for computer forensics. Many of these features were inspired by
+dc3dd: dcfldd, but were rewritten for dc3dd.  Added features include robust
+dc3dd: error handling, logging, progress meter, image verification, split 
+dc3dd: output and more.
+dc3dd:
+dc3dd: http://dc3dd.sourceforge.net/
+dc3dd:
+dc3dd:
diff --git a/source/ap/diffstat/diffstat.SlackBuild b/source/ap/diffstat/diffstat.SlackBuild
new file mode 100755
index 000000000..5066f215c
--- /dev/null
+++ b/source/ap/diffstat/diffstat.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Copyright 2006, 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.
+
+
+PKGNAM=diffstat
+VERSION=${VERSION:-1.43}
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+
+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"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION
+
+# 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 \
+  $ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# 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
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  CHANGES README \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $TMP/package-${PKGNAM}
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/diffstat/slack-desc b/source/ap/diffstat/slack-desc
new file mode 100644
index 000000000..1ca1fded9
--- /dev/null
+++ b/source/ap/diffstat/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------------------------------------------------------|
+diffstat: diffstat (produces statistics from diff output)
+diffstat:
+diffstat: DiffStat is a simple filter that reads the output of the 'diff'
+diffstat: program and displays a histogram of insertions, deletions, and
+diffstat: modifications per-file.  It is useful for reviewing large, complex
+diffstat: patch files.
+diffstat:
+diffstat: Thomas E. Dickey is the author of DiffStat.
+diffstat:
+diffstat:
+diffstat:
diff --git a/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch b/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch
new file mode 100644
index 000000000..a41b11648
--- /dev/null
+++ b/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch
@@ -0,0 +1,23 @@
+--- diffutils-2.8.4/src/sdiff.c.orig	2002-06-17 00:55:42.000000000 -0500
++++ diffutils-2.8.4/src/sdiff.c	2003-01-08 03:04:02.000000000 -0600
+@@ -692,7 +692,7 @@
+       ck_fclose (out);
+ 
+       {
+-	int wstatus;
++	int wstatus = 0;
+ 	int werrno = 0;
+ 
+ #if ! (HAVE_WORKING_FORK || HAVE_WORKING_VFORK)
+@@ -701,11 +701,6 @@
+ 	  werrno = errno;
+ #else
+ 	ck_fclose (diffout);
+-	while (waitpid (diffpid, &wstatus, 0) < 0)
+-	  if (errno == EINTR)
+-	    checksigs ();
+-	  else
+-	    perror_fatal ("waitpid");
+ 	diffpid = 0;
+ #endif
+ 
diff --git a/source/ap/diffutils/diffutils.SlackBuild b/source/ap/diffutils/diffutils.SlackBuild
new file mode 100755
index 000000000..50ac985d3
--- /dev/null
+++ b/source/ap/diffutils/diffutils.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Copyright 2005-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=2.8.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-diffutils
+
+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"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf diffutils-$VERSION
+tar xzvf $CWD/diffutils-$VERSION.tar.gz
+cd diffutils-$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/diffutils-sdiff-no-waitpid.patch.gz | patch -p1 || exit 1
+# Prevent ruining sdiff.1 by touching it so it won't "regenerate":
+touch man/sdiff.1
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --program-prefix="" \
+  --program-suffix="" \
+  $ARCH-slackware-linux
+
+make || exit 1
+make 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
+)
+
+# 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
+
+# Compress info pages and purge "dir" file from the package:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+mkdir -p $PKG/usr/doc/diffutils-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING INSTALLME NEWS README THANKS \
+  $PKG/usr/doc/diffutils-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+cd $PKG
+makepkg -l y -c n $TMP/diffutils-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/diffutils/doinst.sh b/source/ap/diffutils/doinst.sh
new file mode 100644
index 000000000..cf23d0928
--- /dev/null
+++ b/source/ap/diffutils/doinst.sh
@@ -0,0 +1,16 @@
+if [ -x /usr/bin/install-info ] ; then
+  install-info --info-dir=/usr/info /usr/info/diff.info.gz 2>/dev/null
+elif ! grep "diff3" usr/info/dir 1> /dev/null 2> /dev/null ; then
+cat << EOF >> usr/info/dir
+
+GNU packages
+* Diff: (diff).                 Comparing and merging files.
+
+Individual utilities
+* cmp: (diff)Invoking cmp.                      Compare 2 files byte by byte.
+* diff3: (diff)Invoking diff3.                  Compare 3 files line by line.
+* diff: (diff)Invoking diff.                    Compare 2 files line by line.
+* patch: (diff)Invoking patch.                  Apply a patch to a file.
+* sdiff: (diff)Invoking sdiff.                  Merge 2 files side-by-side.
+EOF
+fi
diff --git a/source/ap/diffutils/slack-desc b/source/ap/diffutils/slack-desc
new file mode 100644
index 000000000..79873c066
--- /dev/null
+++ b/source/ap/diffutils/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------------------------------------------------------|
+diffutils: diffutils (finds differences between files)
+diffutils:
+diffutils: The GNU diff utilities finds differences between files.  A major use
+diffutils: for this package is to make source code patches.
+diffutils:
+diffutils:
+diffutils:
+diffutils:
+diffutils:
+diffutils:
+diffutils:
diff --git a/source/ap/dmapi/dmapi.SlackBuild b/source/ap/dmapi/dmapi.SlackBuild
new file mode 100755
index 000000000..9b57b2fdd
--- /dev/null
+++ b/source/ap/dmapi/dmapi.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=2.2.10
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-dmapi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf dmapi-$(echo $VERSION | cut -f 1 -d '-')
+tar xvf $CWD/dmapi-$VERSION.tar.?z* || exit 1
+cd dmapi-$(echo $VERSION | cut -f 1 -d '-')
+
+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 {} \;
+
+# Add DESTDIR support and improve docs install location:
+zcat $CWD/dmapi.destdir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
+# Make sure you have the same version of autoconf as the
+# developers did...  ;-)
+autoconf
+
+./configure \
+  --prefix=/ \
+  --exec-prefix=/ \
+  --sbindir=/bin \
+  --bindir=/usr/bin \
+  --libdir=/lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/lib${LIBDIRSUFFIX} \
+  --includedir=/usr/include \
+  --mandir=/usr/man \
+  --datadir=/usr/share
+
+make || exit 1
+make install DESTDIR=$PKG
+make install-dev DESTDIR=$PKG
+make install-lib DESTDIR=$PKG
+
+mv $PKG/usr/share/doc $PKG/usr
+( cd $PKG/usr/doc ; mv dmapi dmapi-$VERSION )
+#It would be nice to keep the same timestamps that the files have in the source:
+rm -rf $PKG/usr/doc/dmapi-$VERSION/ea-conv
+cp -a \
+  README doc/COPYING doc/PORTING doc/ea-conv \
+  $PKG/usr/doc/dmapi-$VERSION
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+strip -g $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+# Remove bogus files:
+rm -f $PKG/lib${LIBDIRSUFFIX}/*.a $PKG/lib${LIBDIRSUFFIX}/libdm.so $PKG/lib${LIBDIRSUFFIX}/*.la $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+# Make /usr/lib/libdm.so a symlink to /lib:
+if [ -f $PKG/lib${LIBDIRSUFFIX}/libdm.so.0 ]; then
+  ( cd $PKG/usr/lib${LIBDIRSUFFIX} ; rm -f libdm.so ; ln -sf /lib${LIBDIRSUFFIX}/libdm.so.0 libdm.so )
+else
+  exit 1
+  # and fix yer script!!!
+fi
+# Fix shared library perms:
+chmod 755 $PKG/lib${LIBDIRSUFFIX}/*
+
+# Gzip the man pages:
+( cd $PKG/usr/man
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+  gzip -9 */*.?
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/dmapi-$(echo $VERSION | tr - _ )-$ARCH-$BUILD.txz
+
diff --git a/source/ap/dmapi/dmapi.destdir.diff b/source/ap/dmapi/dmapi.destdir.diff
new file mode 100644
index 000000000..829d14e7f
--- /dev/null
+++ b/source/ap/dmapi/dmapi.destdir.diff
@@ -0,0 +1,36 @@
+--- ./include/buildmacros.orig	2007-01-22 23:56:41.000000000 -0600
++++ ./include/buildmacros	2008-04-01 00:04:57.000000000 -0500
+@@ -26,7 +26,7 @@
+ 	  $(LFILES:.l=.o) \
+ 	  $(YFILES:%.y=%.tab.o)
+ 
+-INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/install-sh
+ 
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
+--- ./include/builddefs.in.orig	2007-05-28 02:00:24.000000000 -0500
++++ ./include/builddefs.in	2008-04-01 00:04:57.000000000 -0500
+@@ -23,14 +23,14 @@
+ PKG_VERSION	= @pkg_version@
+ PKG_PLATFORM	= @pkg_platform@
+ PKG_DISTRIBUTION= @pkg_distribution@
+-PKG_BIN_DIR	= @bindir@
+-PKG_SBIN_DIR	= @sbindir@
+-PKG_LIB_DIR	= @libdir@@libdirsuffix@
+-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
+-PKG_INC_DIR	= @includedir@/xfs
+-PKG_MAN_DIR	= @mandir@
+-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
+-PKG_LOCALE_DIR	= @datadir@/locale
++PKG_BIN_DIR	= $(DESTDIR)@bindir@
++PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
++PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
++PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
++PKG_INC_DIR	= $(DESTDIR)@includedir@/xfs
++PKG_MAN_DIR	= $(DESTDIR)@mandir@
++PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@
++PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
+ 
+ CC		= @cc@
+ AWK		= @awk@
diff --git a/source/ap/dmapi/slack-desc b/source/ap/dmapi/slack-desc
new file mode 100644
index 000000000..c5acf4919
--- /dev/null
+++ b/source/ap/dmapi/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------------------------------------------------------|
+dmapi: dmapi (Data Management API library)
+dmapi:
+dmapi: A library required to use the Data Management API (DMAPI).
+dmapi: This interface is defined in the X/Open document 'Systems Management:
+dmapi: Data Storage Managment (XDSM) API' dated February 1997.
+dmapi:
+dmapi: The DMAPI library is used by the xfsdump utility.
+dmapi:
+dmapi:
+dmapi:
+dmapi:
diff --git a/source/ap/dmidecode/dmidecode.SlackBuild b/source/ap/dmidecode/dmidecode.SlackBuild
new file mode 100755
index 000000000..2a897acee
--- /dev/null
+++ b/source/ap/dmidecode/dmidecode.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=dmidecode
+VERSION=${VERSION:-2.10}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+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"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION || 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 {} \;
+
+zcat $CWD/dmidecode.makefile.diff.gz | patch -p1 --verbose || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# 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
+
+# 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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc/${PKGNAM} $PKG/usr/doc/${PKGNAM}-$VERSION
+rmdir $PKG/usr/share/doc
+rmdir $PKG/usr/share
+
+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/ap/dmidecode/dmidecode.makefile.diff b/source/ap/dmidecode/dmidecode.makefile.diff
new file mode 100644
index 000000000..08326774b
--- /dev/null
+++ b/source/ap/dmidecode/dmidecode.makefile.diff
@@ -0,0 +1,14 @@
+--- ./Makefile.orig	2007-02-16 05:00:12.000000000 -0600
++++ ./Makefile	2007-05-02 14:54:09.000000000 -0500
+@@ -22,9 +22,9 @@
+ LDFLAGS =
+ 
+ DESTDIR =
+-prefix  = /usr/local
++prefix  = /usr
+ sbindir = $(prefix)/sbin
+-mandir  = $(prefix)/share/man
++mandir  = $(prefix)/man
+ man8dir = $(mandir)/man8
+ docdir  = $(prefix)/share/doc/dmidecode
+ 
diff --git a/source/ap/dmidecode/slack-desc b/source/ap/dmidecode/slack-desc
new file mode 100644
index 000000000..d7fd45cd9
--- /dev/null
+++ b/source/ap/dmidecode/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------------------------------------------------------|
+dmidecode: dmidecode (DMI table decoder)
+dmidecode:
+dmidecode: dmidecode is a tool for dumping a computer's DMI table (some say
+dmidecode: SMBIOS) contents in a human-readable format.  This table contains a
+dmidecode: description of the system's hardware components, as well as other
+dmidecode: useful pieces of information such as serial numbers and BIOS
+dmidecode: revision.
+dmidecode:
+dmidecode: dmidecode was written by Alan Cox and Jean Delvare.
+dmidecode:
+dmidecode:
diff --git a/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild b/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild
new file mode 100755
index 000000000..ac149131d
--- /dev/null
+++ b/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild
@@ -0,0 +1,78 @@
+#!/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.
+
+
+# Why do people do things like this?
+VERSION=7.1
+PKGVER=7.1
+DIRVER=7.1
+
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-dvd+rw-tools
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf dvd+rw-tools-$VERSION
+tar xvf $CWD/dvd+rw-tools-$VERSION.tar.gz || exit 1
+cd dvd+rw-tools-$DIRVER
+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/dvd+rw-tools.limits.h.diff.gz | patch -p1 --verbose || exit 1
+
+make $NUMJOBS || make || exit 1
+
+mkdir -p $PKG/usr/bin
+cat dvd+rw-booktype > $PKG/usr/bin/dvd+rw-booktype
+cat dvd+rw-format > $PKG/usr/bin/dvd+rw-format
+cat dvd+rw-mediainfo > $PKG/usr/bin/dvd+rw-mediainfo
+cat dvd-ram-control > $PKG/usr/bin/dvd-ram-control
+cat growisofs > $PKG/usr/bin/growisofs
+strip $PKG/usr/bin/*
+chmod 755 $PKG/usr/bin/*
+
+mkdir -p $PKG/usr/man/man1
+cat growisofs.1 | gzip -9c > $PKG/usr/man/man1/growisofs.1.gz
+
+mkdir -p $PKG/usr/doc/dvd+rw-tools-$VERSION
+cp -a \
+  index.html \
+  LICENSE \
+  $PKG/usr/doc/dvd+rw-tools-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/dvd+rw-tools-$PKGVER-$ARCH-$BUILD.txz
+
diff --git a/source/ap/dvd+rw-tools/dvd+rw-tools.limits.h.diff b/source/ap/dvd+rw-tools/dvd+rw-tools.limits.h.diff
new file mode 100644
index 000000000..e8b8d986c
--- /dev/null
+++ b/source/ap/dvd+rw-tools/dvd+rw-tools.limits.h.diff
@@ -0,0 +1,10 @@
+--- ./transport.hxx.orig	2008-03-01 04:34:43.000000000 -0600
++++ ./transport.hxx	2008-04-06 23:05:58.000000000 -0500
+@@ -9,6 +9,7 @@
+ #if defined(__unix) || defined(__unix__)
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/types.h>
diff --git a/source/ap/dvd+rw-tools/dvd+rw-tools.url b/source/ap/dvd+rw-tools/dvd+rw-tools.url
new file mode 100644
index 000000000..0a8eb6bf3
--- /dev/null
+++ b/source/ap/dvd+rw-tools/dvd+rw-tools.url
@@ -0,0 +1 @@
+http://fy.chalmers.se/~appro/linux/DVD+RW/tools/
diff --git a/source/ap/dvd+rw-tools/slack-desc b/source/ap/dvd+rw-tools/slack-desc
new file mode 100644
index 000000000..ba1be820b
--- /dev/null
+++ b/source/ap/dvd+rw-tools/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------------------------------------------------------|
+dvd+rw-tools: dvd+rw-tools (DVD+-RW tools)
+dvd+rw-tools:
+dvd+rw-tools: A collection of tools to master DVD+RW/+R/-R/-RW media.  For further
+dvd+rw-tools: information see http://fy.chalmers.se/~appro/linux/DVD+RW/.
+dvd+rw-tools:
+dvd+rw-tools: The DVD+RW tools were written by Andy Polyakov.
+dvd+rw-tools:
+dvd+rw-tools:
+dvd+rw-tools:
+dvd+rw-tools:
+dvd+rw-tools:
diff --git a/source/ap/enscript/enscript.SlackBuild b/source/ap/enscript/enscript.SlackBuild
new file mode 100755
index 000000000..e7bc7ff97
--- /dev/null
+++ b/source/ap/enscript/enscript.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=1.6.3
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-enscript
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf enscript-$VERSION
+tar xvf $CWD/enscript-$VERSION.tar.gz || exit 1
+cd enscript-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --with-media=Letter \
+  --sysconfdir=/etc \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install prefix=$PKG/usr sysconfdir=$PKG/etc || exit 1
+
+# 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
+
+( 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
+)
+
+( cd $PKG/usr/info
+  rm -f dir
+  gzip -9 *
+)
+
+mkdir -p $PKG/usr/doc/enscript-$VERSION
+cp -a \
+  *.txt ABOUT-NLS AUTHORS COPYING ChangeLog docs/FAQ.html INSTALL NEWS \
+  README* THANKS TODO \
+  $PKG/usr/doc/enscript-$VERSION
+chmod 644 $PKG/usr/doc/enscript-$VERSION/*
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/enscript-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/enscript/slack-desc b/source/ap/enscript/slack-desc
new file mode 100644
index 000000000..877b8a480
--- /dev/null
+++ b/source/ap/enscript/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------------------------------------------------------|
+enscript: enscript (converts text files to PostScript and other formats)
+enscript:
+enscript: Enscript converts text files to PostScript and spools the generated
+enscript: output to a printer or saves it to a file.  If no input files are
+enscript: given, enscript processes standard input.  Enscript can be extended to
+enscript: handle different output media and it has many options for customizing
+enscript: printouts.  
+enscript:
+enscript:
+enscript:
+enscript:
diff --git a/source/ap/flac/flac.SlackBuild b/source/ap/flac/flac.SlackBuild
new file mode 100755
index 000000000..7f2d02d31
--- /dev/null
+++ b/source/ap/flac/flac.SlackBuild
@@ -0,0 +1,109 @@
+#!/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=1.2.1
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-flac
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf flac-$VERSION
+tar xvf $CWD/flac-$VERSION.tar.bz2 || exit 1
+cd flac-$VERSION
+zcat $CWD/flac.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig
+
+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 {} \;
+
+if [ "$ARCH" != "x86_64" ]; then
+  # We disable assembly optimizations to ensure compatibility with older
+  # hardware, but you're welcome to comment this out and give it a try.
+  # I've heard it gives a noticable speedup.
+  DISABLE_ASM_OPTIMIZATIONS=${DISABLE_ASM_OPTIMIZATIONS:-"--disable-asm-optimizations"}
+else
+  DISABLE_ASM_OPTIMIZATIONS=${DISABLE_ASM_OPTIMIZATIONS:-""}
+fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  $DISABLE_ASM_OPTIMIZATIONS \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Adjust docs to traditional Slackware location:
+mv $PKG/usr/share/doc $PKG/usr
+rm $PKG/usr/doc/flac-$VERSION/FLAC.tag
+mv $PKG/usr/doc/flac-$VERSION/html/* $PKG/usr/doc/flac-$VERSION
+rmdir $PKG/usr/doc/flac-$VERSION/html
+# we're not putting 3MB of API docs in the binary package...
+( cd $PKG/usr/doc/flac-$VERSION/api && rm -r * )
+cat << EOF > $PKG/usr/doc/flac-$VERSION/api/README
+Full HTML based API documentation may be found in the FLAC
+source package.  It is not included in the binary package due
+to size.
+EOF
+# Add a few more docs:
+cp -a \
+  AUTHORS COPYING* README \
+  $PKG/usr/doc/flac-$VERSION
+
+# Strip files
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+gzip -9 $PKG/usr/man/man?/*.?
+
+mkdir $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/flac-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/flac/flac.man.diff b/source/ap/flac/flac.man.diff
new file mode 100644
index 000000000..f96eebc60
--- /dev/null
+++ b/source/ap/flac/flac.man.diff
@@ -0,0 +1,12 @@
+--- ./man/flac.1.orig	2007-09-14 10:08:05.000000000 -0500
++++ ./man/flac.1	2008-03-08 15:48:37.000000000 -0600
+@@ -325,7 +325,8 @@
+ .PP
+ metaflac(1).
+ .PP
+-The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/flac/html\fR on Debian GNU/Linux systems.
++The programs are documented fully by HTML format documentation, available in \fI/usr/doc/flac-*.*.*/html\fR on Slackware GNU/Linux systems.
+ .SH "AUTHOR"
+ .PP
++The flac program was developed by Josh Coalson.
+ This manual page was written by Matt Zimmerman <mdz@debian.org> for the Debian GNU/Linux system (but may be used by others).
diff --git a/source/ap/flac/slack-desc b/source/ap/flac/slack-desc
new file mode 100644
index 000000000..9fde39d4e
--- /dev/null
+++ b/source/ap/flac/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------------------------------------------------------|
+flac: flac (Free Lossless Audio Codec)
+flac:
+flac: FLAC stands for Free Lossless Audio Codec. Grossly oversimplified,
+flac: FLAC is similar to MP3, but lossless.  "Free" means that the
+flac: specification of the stream format is in the public domain, and that
+flac: neither the FLAC format nor any of the implemented encoding/decoding
+flac: methods are covered by any patent. It also means that the sources for
+flac: libFLAC and libFLAC++ are available under the LGPL and the sources for
+flac: flac, metaflac, and the plugins are available under the GPL.
+flac:
+flac: FLAC was developed by Josh Coalson.
diff --git a/source/ap/foomatic-filters/doinst.sh b/source/ap/foomatic-filters/doinst.sh
new file mode 100644
index 000000000..d7bcdf8bd
--- /dev/null
+++ b/source/ap/foomatic-filters/doinst.sh
@@ -0,0 +1,13 @@
+#!/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 etc/foomatic/filter.conf.new
diff --git a/source/ap/foomatic-filters/foomatic-filters.SlackBuild b/source/ap/foomatic-filters/foomatic-filters.SlackBuild
new file mode 100755
index 000000000..fbf949039
--- /dev/null
+++ b/source/ap/foomatic-filters/foomatic-filters.SlackBuild
@@ -0,0 +1,123 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=foomatic-filters
+VERSION=${VERSION:-4.0.2}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+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"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.gz || exit 1
+cd ${PKGNAM}-$VERSION || 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 {} \;
+
+sed -i -e "s#/usr/lib/cups#/usr/lib${LIBDIRSUFFIX}/cups#" \
+       -e "s#/usr/lib/pdq#/usr/lib${LIBDIRSUFFIX}/pdq#" \
+       -e "s#/usr/lib/ppr#/usr/lib${LIBDIRSUFFIX}/ppr#" \
+       -e "s#^LIBSEARCHPATH=#LIBSEARCHPATH=\${prefix}/lib${LIBDIRSUFFIX}:\${prefix}/usr/lib${LIBDIRSUFFIX}:#" \
+  configure
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mv $PKG/etc/foomatic/filter.conf $PKG/etc/foomatic/filter.conf.new
+rm -f $PKG/etc/foomatic/filter.conf.sample
+
+# 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
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  COPYING ChangeLog README STANDARD_installation TODO USAGE \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+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/ap/foomatic-filters/slack-desc b/source/ap/foomatic-filters/slack-desc
new file mode 100644
index 000000000..fcb34ffd6
--- /dev/null
+++ b/source/ap/foomatic-filters/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------------------------------------------------------|
+foomatic-filters: foomatic-filters (Universal print filter/RIP wrapper)
+foomatic-filters:
+foomatic-filters: foomatic-rip is a universal print filter, which is used by CUPS with
+foomatic-filters: the gutenprint and hplip printer drivers.  It translates PostScript
+foomatic-filters: (and also other file formats) to the printer's native language,
+foomatic-filters: usually using Ghostscript (gs) as the external renderer.  The way
+foomatic-filters: this translation is done is described in a PPD file.
+foomatic-filters:
+foomatic-filters: For more information on foomatic, see:  http://linuxprinting.org
+foomatic-filters:
+foomatic-filters:
diff --git a/source/ap/ghostscript-fonts-std/doinst.sh b/source/ap/ghostscript-fonts-std/doinst.sh
new file mode 100644
index 000000000..3d8d40100
--- /dev/null
+++ b/source/ap/ghostscript-fonts-std/doinst.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Update the X font indexes:
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
+if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/Type1
+    mkfontdir .
+    mkfontscale .
+  )
+fi
diff --git a/source/ap/ghostscript-fonts-std/ghostscript-fonts-std.SlackBuild b/source/ap/ghostscript-fonts-std/ghostscript-fonts-std.SlackBuild
new file mode 100755
index 000000000..635789495
--- /dev/null
+++ b/source/ap/ghostscript-fonts-std/ghostscript-fonts-std.SlackBuild
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=ghostscript-fonts-std
+VERSION=${VERSION:-8.11}
+ARCH=${ARCH:-noarch}
+BUILD=${BUILD:-1}
+
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf fonts
+tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd fonts || 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 -o -perm 500 \) \
+  -exec chmod 644 {} \;
+
+# Move everything:
+mkdir -p $PKG/usr/share/fonts/Type1
+mv * $PKG/usr/share/fonts/Type1
+mkdir -p $PKG/usr/share/ghostscript
+( cd $PKG/usr/share/ghostscript ; ln -sf /usr/share/fonts/Type1 fonts )
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+( cd $PKG/usr/share/fonts/Type1
+  mv \
+    COPYING ChangeLog README* TODO \
+    $PKG/usr/doc/${PKGNAM}-$VERSION
+)
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/ghostscript-fonts-std/slack-desc b/source/ap/ghostscript-fonts-std/slack-desc
new file mode 100644
index 000000000..a2b9459ed
--- /dev/null
+++ b/source/ap/ghostscript-fonts-std/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------------------------------------------------------|
+ghostscript-fonts-std: ghostscript-fonts-std (fonts for the Ghostscript interpreter)
+ghostscript-fonts-std:
+ghostscript-fonts-std: These fonts are used by the GhostScript interpreter.
+ghostscript-fonts-std:
+ghostscript-fonts-std:
+ghostscript-fonts-std:
+ghostscript-fonts-std:
+ghostscript-fonts-std:
+ghostscript-fonts-std:
+ghostscript-fonts-std:
+ghostscript-fonts-std:
diff --git a/source/ap/ghostscript/cidfmap b/source/ap/ghostscript/cidfmap
new file mode 100644
index 000000000..0303f66f5
--- /dev/null
+++ b/source/ap/ghostscript/cidfmap
@@ -0,0 +1,118 @@
+%!
+% $Id: cidfmap 6300 2005-12-28 19:56:24Z giles $
+% This is a sample map file for CIDFont category.
+
+%
+% The map is a set of records, which must use one of the two formats :
+%
+% 1. A substutution of a CIF font with another CID font :
+%
+%    /substituted /original ;
+%
+%    Where 'substituted' is a name being used in a document,
+%    'original' is a name of an available resource.
+%
+% 2. A substutution of a CIF font with a True Type font :
+%
+%    /substituted << /FileType /TrueType /Path (path) /SunfontID 1 /CSI [(ordering) supplement] >> ;
+%
+%    Where 'substituted' is a name being used in a document,
+%    'path' is a path to a True Type font file,
+%    'ordering' is a value of Ordering required for CIDSystemInfo dictionary,
+%    'supplement' is a value of Supplement required for CIDSystemInfo dictionary.
+%
+% Examples :
+%
+%   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
+%   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
+%
+
+
+%% cidfmap.zh_CN (simplified Chinese ; zh_CN)
+%% This font will produce better results than the wqy-zenhei.ttf that we use
+%% to get out-of-the-box output.
+%% If you install it, uncomment the line below and comment the one below that.
+%/BousungEG-Light-GB            << /FileType /TrueType /Path (uming.ttf) /CSI [(GB1) 4] >> ;
+/BousungEG-Light-GB             << /FileType /TrueType /Path (wqy-zenhei.ttf) /CSI [(GB1) 4] >> ;
+%% This font will produce better results than the wqy-zenhei.ttf that we use
+%% to get out-of-the-box output.
+%% If you install it, uncomment the line below and comment the one below that.
+%/GBZenKai-Medium		<< /FileType /TrueType /Path (ukai.ttf) /CSI [(GB1) 4] >> ;
+/GBZenKai-Medium		<< /FileType /TrueType /Path (wqy-zenhei.ttf) /CSI [(GB1) 4] >> ;
+/MSungGBK-Light			<< /FileType /TrueType /Path (wqy-zenhei.ttf) /CSI [(GB1) 4] >> ;
+/MSung-Light			/MSungGBK-Light ;
+/MSung-Medium			/GBZenKai-Medium ;
+/MHei-Medium			/BousungEG-Light-GB ;
+/MKai-Medium			/GBZenKai-Medium ;
+/STSong-Light			/BousungEG-Light-GB ;
+/STFangsong-Light		/BousungEG-Light-GB ;
+/STHeiti-Regular		/MSungGBK-Light ;
+/STKaiti-Regular		/GBZenKai-Medium ;
+/Adobe-GB1                      /BousungEG-Light-GB ;
+
+%% cidfmap.zh_TW (traditional Chinese ; zh_TW)
+%% To use this example, install the missing uming.ttf and ukai.ttf fonts, and
+%% uncomment everything in the block below.  Also, fix the simplified Chinese
+%% block as described above for "better output" so that there is no
+%% interference (or comment the whole block out).
+%/BousungEG-Light-GB		<< /FileType /TrueType /Path (uming.ttf) /CSI [(CNS1) 4] >> ;
+%/ZenKai-Medium			<< /FileType /TrueType /Path (ukai.ttf) /CSI [(CNS1) 4] >> ;
+%/ShanHeiSun-Light		<< /FileType /TrueType /Path (wqy-zenhei.ttf) /CSI [(CNS1) 4] >> ;
+%/STSong-Light			/BousungEG-Light-GB ;
+%/STKaiti-Regular		/ZenKai-Medium-GB ;
+%/STFangsong-Light		/BousungEG-Light ;
+%/STHeiti-Regular		/MHei-Medium ;
+%/MSung-Light			/BousungEG-Light-GB ;
+%/MSung-Medium			/ZenKai-Medium ;
+%/MHei-Medium			/ShanHeiSun-Light ;
+%/MKai-Medium			/ZenKai-Medium ;
+%/Adobe-CNS1			/BousungEG-Light-GB ;
+
+%% cidfmap.ja
+/Sazanami-Gothic 		<< /FileType /TrueType /Path (sazanami-gothic.ttf) /CSI [(Japan1) 6] >> ;
+/Sazanami-Gothic-Regular 	/Sazanami-Gothic ;
+/Sazanami-Gothic-JaH 		<< /FileType /TrueType /Path (sazanami-gothic.ttf) /CSI [(Japan2) 0] >> ;
+/Sazanami-Gothic-Regular-JaH 	/Sazanami-Gothic-JaH ;
+/Sazanami-Mincho 		<< /FileType /TrueType /Path (sazanami-mincho.ttf) /CSI [(Japan1) 6] >> ;
+/Sazanami-Mincho-Regular 	/Sazanami-Mincho ;
+/Sazanami-Mincho-JaH 		<< /FileType /TrueType /Path (sazanami-mincho.ttf) /CSI [(Japan2) 0] >> ;
+/Sazanami-Mincho-Regular-JaH 	/Sazanami-Mincho-JaH ;
+/Ryumin-Light           	/Sazanami-Mincho        ;
+/Ryumin-Light-H         	/Sazanami-Mincho        ;
+/GothicBBB-Medium       	/Sazanami-Gothic        ;
+/GothicBBB-Medium-V     	/Sazanami-Gothic        ;
+/HeiseiMin-W3           	/Ryumin-Light           ;
+/HeiseiKakuGo-W5        	/GothicBBB-Medium       ;
+/HeiseiMin-W3-Acro      	/Ryumin-Light           ;
+/HeiseiKaKuGo-W5-Acro   	/GothicBBB-Medium       ;
+/Kochi-Gothic           	/Sazanami-Gothic        ;
+/Kochi-Mincho           	/Sazanami-Mincho        ;
+/WadaMin-Regular        	/Sazanami-Mincho        ;
+/WadaMin-Bold           	/Sazanami-Mincho        ;
+/WadaGo-Regular         	/Sazanami-Gothic        ;
+/WadaGo-Bold            	/Sazanami-Gothic        ;
+/Adobe-Japan1           	/Sazanami-Gothic        ;
+/Adobe-Japan2           	/Sazanami-Gothic-JaH    ;
+
+%% cidfmap.ko
+%% To enable Korean printing support, install the fonts shown in the example
+%% here and uncomment the block below:
+%/Baekmuk-Batang		<< /FileType /TrueType /Path (batang.ttf) /CSI [(Korea1) 2] >> ;
+%/Baekmuk-Batang-Regular	/Baekmuk-Batang ;
+%/Baekmuk-Dotum			<< /FileType /TrueType /Path (dotum.ttf) /CSI [(Korea1) 2] >> ;
+%/Baekmuk-Dotum-Regular		/Baekmuk-Dotum ;
+%/Baekmuk-Gulim			<< /FileType /TrueType /Path (gulim.ttf) /CSI [(Korea1) 2] >> ;
+%/Baekmuk-Gulim-Regular		/Baekmuk-Gulim ;
+%/Baekmuk-Headline		<< /FileType /TrueType /Path (hline.ttf) /CSI [(Korea1) 2] >> ;
+%/Baekmuk-Headline-Regular	/Baekmuk-Headline ;
+%/Adobe-Korea1			/Baekmuk-Batang ;
+
+%/BousungEG-Light-GB	<< /FileType /TrueType /Path (uming.ttf) /CSI [(GB1) 4] >> ;
+%/GBZenKai-Medium	<< /FileType /TrueType /Path (ukai.ttf) /CSI [(GB1) 4] >> ;
+%/MSungGBK-Light	/BousungEG-Light-GB ;
+%/Adobe-GB1		/BousungEG-Light-GB ;
+
+%/ZenKai-Medium		<< /FileType /TrueType /Path (ukai.ttf) /CSI [(CNS1) 4] >> ;
+%/ShanHeiSun-Light	<< /FileType /TrueType /Path (uming.ttf) /CSI [(CNS1) 4] >> ;
+%/Adobe-CNS1		/ShanHeiSun-Light ;
+
diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild
new file mode 100755
index 000000000..b0bb34ba3
--- /dev/null
+++ b/source/ap/ghostscript/ghostscript.SlackBuild
@@ -0,0 +1,176 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=ghostscript
+VERSION=${VERSION:-8.70}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+
+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.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION
+
+## Regenerate ./configure:
+#sh autogen.sh
+
+# 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 {} \;
+
+# Build/install IJS:
+( cd ijs
+  if [ ! -r configure ]; then
+    sh autogen.sh
+  fi
+  CFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux
+  make
+  make install
+  make install DESTDIR=$PKG
+) || exit 1
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --with-fontpath=/usr/share/fonts/TTF \
+  --with-ijs \
+  --disable-compile-inits \
+  --enable-dynamic \
+  --enable-cairo=no \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+make clean || exit 1
+make so || exit 1
+make soinstall DESTDIR=$PKG || exit 1
+
+# Replace the default cidfmap with one containing additional
+# support for CJK printing:
+
+if [ -r $PKG/usr/share/ghostscript/${VERSION}/Resource/Init/cidfmap ]; then
+  mv $PKG/usr/share/ghostscript/${VERSION}/Resource/Init/cidfmap $PKG/usr/share/ghostscript/${VERSION}/Resource/Init/cidfmap.default.ghostscript-${VERSION}
+  zcat $CWD/cidfmap.gz > $PKG/usr/share/ghostscript/${VERSION}/Resource/Init/cidfmap.new
+fi
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+( cd doc
+  cp -a \
+    COPYING ../LICENSE README \
+    $PKG/usr/doc/${PKGNAM}-$VERSION
+)
+( cd $PKG/usr/doc/${PKGNAM}-$VERSION
+  ln -sf /usr/share/ghostscript/$VERSION/doc doc
+)
+
+cd $TMP
+cp -a ${PKGNAM}-${VERSION}/examples/cjk $PKG/usr/share/ghostscript/${VERSION}/examples/
+
+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...
+}
+config usr/share/ghostscript/${VERSION}/Resource/Init/cidfmap.new
+EOF
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/ghostscript/slack-desc b/source/ap/ghostscript/slack-desc
new file mode 100644
index 000000000..1ac40827a
--- /dev/null
+++ b/source/ap/ghostscript/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------------------------------------------------------|
+ghostscript: ghostscript (GPL Ghostscript)
+ghostscript:
+ghostscript: GPL Ghostscript is an interpreter of Adobe Systems' PostScript(tm)
+ghostscript: and Portable Document Format (PDF) languages.  Ghostscript is an
+ghostscript: essential part of the printing subsystem, taking PostScript output
+ghostscript: from applications and converting it into an appropriate printer or
+ghostscript: display format.  Ghostscript supports many printers directly, and
+ghostscript: more are supported through add-on packages.
+ghostscript:
+ghostscript:
+ghostscript:
diff --git a/source/ap/gphoto2/gphoto2.SlackBuild b/source/ap/gphoto2/gphoto2.SlackBuild
new file mode 100755
index 000000000..9670b082f
--- /dev/null
+++ b/source/ap/gphoto2/gphoto2.SlackBuild
@@ -0,0 +1,98 @@
+#!/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.
+
+
+PRGNAM=gphoto2
+VERSION=2.4.5
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:--j6}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
+cd $PRGNAM-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/gphoto2-${VERSION} \
+  --without-cdk \
+  --enable-static=no \
+  --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
+
+# 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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$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
+
diff --git a/source/ap/gphoto2/slack-desc b/source/ap/gphoto2/slack-desc
new file mode 100644
index 000000000..681c45dfa
--- /dev/null
+++ b/source/ap/gphoto2/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-------------------------------------------------------|
+gphoto2: gphoto2 (A command-line frontend to libgphoto2)
+gphoto2:
+gphoto2: libgphoto2 is a cross-platform digital camera library, and gphoto2 is
+gphoto2: a command-line client for it.
+gphoto2:
+gphoto2: Visit the gphoto project online:  http://www.gphoto.org
+gphoto2:
+gphoto2:
+gphoto2:
+gphoto2:
+gphoto2:
diff --git a/source/ap/groff/groff.SlackBuild b/source/ap/groff/groff.SlackBuild
new file mode 100755
index 000000000..e9b35d3ee
--- /dev/null
+++ b/source/ap/groff/groff.SlackBuild
@@ -0,0 +1,129 @@
+#!/bin/sh
+
+# Copyright 2005-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:-1.20.1}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-groff
+
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf groff-$VERSION
+tar xvf $CWD/groff-$VERSION.tar.bz2 || exit 1
+cd groff-$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 this thing respect our declared docdir setting
+zcat $CWD/groff.docdir.diff.gz | patch -p1 --verbose || exit 1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/groff-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+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
+
+( cd src/devices/xditview
+  mkdir -p $PKG/etc/X11/app-defaults
+  cp -a GXditview.ad $PKG/etc/X11/app-defaults/GXditview
+)
+
+mkdir -p $PKG/usr/doc/groff-$VERSION/xditview
+cp -a \
+  BUG-REPORT COPYING FDL INSTALL INSTALL.gen MORE.STUFF \
+  NEWS PROBLEMS PROJECTS README TODO VERSION \
+  $PKG/usr/doc/groff-$VERSION
+cp -a src/devices/xditview/{README,TODO} $PKG/usr/doc/groff-$VERSION/xditview
+
+# If you want all this stuff, it's in the source tarball:
+rm -rf $PKG/usr/doc/groff-$VERSION/*.ps \
+  $PKG/usr/doc/groff-$VERSION/examples \
+  $PKG/usr/doc/groff-$VERSION/html \
+  $PKG/usr/doc/groff-$VERSION/pdf
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+# Do not use color ANSI output by default for man pages.
+# A silly "innovation" if ever there was one, sure to break
+# a ton of existing scripts otherwise...
+zcat $CWD/groff.man.mdoc.local.gz >> $PKG/usr/share/groff/site-tmac/man.local
+zcat $CWD/groff.man.mdoc.local.gz >> $PKG/usr/share/groff/site-tmac/mdoc.local
+
+( cd $PKG/usr/bin
+  rm -rf geqn ; ln -sf eqn geqn
+  rm -rf gindxbib ; ln -sf indxbib gindxbib
+  rm -rf gpic ; ln -sf pic gpic
+  rm -rf grefer ; ln -sf refer grefer
+  rm -rf gsoelim ; ln -sf soelim gsoelim
+  rm -rf zsoelim ; ln -sf soelim zsoelim
+  rm -rf gtbl ; ln -sf tbl gtbl
+  rm -rf gtroff ; ln -sf troff gtroff
+  rm -rf glookbib ; ln -sf lookbib glookbib
+  rm -rf gnroff ; ln -sf nroff gnroff
+  rm -rf gneqn ; ln -sf neqn gneqn
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/groff-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/groff/groff.docdir.diff b/source/ap/groff/groff.docdir.diff
new file mode 100644
index 000000000..a73a3bf59
--- /dev/null
+++ b/source/ap/groff/groff.docdir.diff
@@ -0,0 +1,12 @@
+diff -Nur groff-1.20.orig/Makefile.in groff-1.20/Makefile.in
+--- groff-1.20.orig/Makefile.in	2009-01-05 14:45:13.000000000 -0600
++++ groff-1.20/Makefile.in	2009-01-13 22:14:58.237116441 -0600
+@@ -146,7 +146,7 @@
+ infodir=@infodir@
+ 
+ # `docdir' says where to install documentation files.
+-docdir=$(datadir)/doc/groff/$(version)$(revision)
++docdir=@docdir@
+ 
+ # `exampledir' says where to install example files.
+ exampledir=$(docdir)/examples
diff --git a/source/ap/groff/groff.man.mdoc.local b/source/ap/groff/groff.man.mdoc.local
new file mode 100644
index 000000000..4de5a0f1a
--- /dev/null
+++ b/source/ap/groff/groff.man.mdoc.local
@@ -0,0 +1,24 @@
+.
+.if n \{\
+.  \" Map \(oq to ' rather than ` in nroff mode for devices other
+.  \" than utf8.
+.  if !'\*[.T]'utf8' \
+.    tr \[oq]'
+.
+.  \" Disable the use of SGR (ANSI colour) escape sequences by
+.  \" grotty.
+.  if '\V[GROFF_SGR]'' \
+.    output x X tty: sgr 0
+.
+.  \" Map \- to the Unicode HYPHEN-MINUS character, to make
+.  \" searching in man pages easier.
+.  if '\*[.T]'utf8' \
+.    char \- \N'45'
+.
+.  \" Many UTF-8 man pages use "-" instead of "\-" for dashes such as those
+.  \" in command-line options. This is a bug in those pages, but if you want
+.  \" all hyphens to be rendered as the ASCII-compatible HYPHEN-MINUS
+.  \" anyway, then uncomment this.
+.  \" if '\*[.T]'utf8' \
+.  \"   char - \N'45'
+.\}
diff --git a/source/ap/groff/slack-desc b/source/ap/groff/slack-desc
new file mode 100644
index 000000000..b9e5af829
--- /dev/null
+++ b/source/ap/groff/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------------------------------------------------------|
+groff: groff (document formatting system)
+groff:
+groff: The GNU groff package provides versions of troff, nroff, eqn, tbl, and 
+groff: other Unix text-formatting utilities.  Groff is used to 'compile' man
+groff: pages stored in groff/nroff format into a form which can be printed or
+groff: displayed on the screen.  These man pages are stored in compressed
+groff: form in the /usr/man/man? directories.
+groff:
+groff:
+groff:
+groff:
diff --git a/source/ap/gutenprint/gutenprint.SlackBuild b/source/ap/gutenprint/gutenprint.SlackBuild
new file mode 100755
index 000000000..94fb1cbc0
--- /dev/null
+++ b/source/ap/gutenprint/gutenprint.SlackBuild
@@ -0,0 +1,115 @@
+#!/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=5.2.4
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+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"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-gutenprint
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf gutenprint-${VERSION}
+tar xvf $CWD/gutenprint-${VERSION}.tar.?z* || exit 1
+cd gutenprint-${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 \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --with-cups \
+  --with-gimp2 \
+  --with-gimp2-as-gutenprint \
+  --disable-libgutenprintui \
+  --enable-libgutenprintui2 \
+  --enable-escputil \
+  --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
+
+# 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/usr/doc/gutenprint-${VERSION}
+cp -a \
+  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* \
+  $PKG/usr/doc/gutenprint-${VERSION}
+  ( cd $PKG/usr/doc/gutenprint-${VERSION}
+    ln -sf /usr/share/gutenprint/samples .
+  )
+mv $PKG/usr/share/gutenprint/doc/* $PKG/usr/doc/gutenprint-${VERSION}
+rmdir $PKG/usr/share/gutenprint/doc
+
+# If you want 1MB of ChangeLog, it's in the source...
+rm -f $PKG/usr/doc/gutenprint-${VERSION}/ChangeLog
+
+# Big...  again, it's in the source if you want it.
+rm -f $PKG/usr/share/gutenprint/samples/profile.jpg
+rm -f $PKG/usr/doc/gutenprint-${VERSION}/*.pdf
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg --prepend -l y -c n $TMP/gutenprint-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/gutenprint/slack-desc b/source/ap/gutenprint/slack-desc
new file mode 100644
index 000000000..ac2bdb93e
--- /dev/null
+++ b/source/ap/gutenprint/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------------------------------------------------------|
+gutenprint: gutenprint (IJS printer driver for Ghostscript and CUPS)
+gutenprint:
+gutenprint: Gutenprint (formerly named Gimp-Print) is a suite of printer drivers
+gutenprint: that may be used with most common print spooling systems, including
+gutenprint: CUPS, LPRng, or others.  These drivers provide high quality printing
+gutenprint: in many cases equal to or better than proprietary vendor-supplied
+gutenprint: drivers.  Gutenprint also includes an enhanced print plug-in for the
+gutenprint: GIMP image editor.
+gutenprint:
+gutenprint:
+gutenprint:
diff --git a/source/ap/hplip/doinst.sh b/source/ap/hplip/doinst.sh
new file mode 100644
index 000000000..8f9648e07
--- /dev/null
+++ b/source/ap/hplip/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
new file mode 100755
index 000000000..64462a78e
--- /dev/null
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Slackware build script for hplip
+
+# Copyright 2006-2009  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-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.
+
+PRGNAM=hplip
+VERSION=${VERSION:-3.9.4b}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+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"
+fi
+
+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.bz2 || exit 1
+cd $PRGNAM-$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 {} \;
+
+# Fix a segfault bug
+zcat $CWD/hplip.prevent_segfault.diff.gz | patch -p1 || exit 1
+
+# Fix udev rules for current versions of udev
+sed -i 's/SYSFS/ATTR/g' data/rules/*.rules
+# Fix ownership in udev rules file
+sed -i 's%OWNER="lp"%OWNER="root"%g' data/rules/*.rules
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-cupsbackenddir=/usr/lib${LIBDIRSUFFIX}/cups/backend \
+  --with-cupsfilterdir=/usr/lib${LIBDIRSUFFIX}/cups/filter \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/hplip-$VERSION \
+  --with-docdir=/usr/doc/hplip-$VERSION \
+  --with-hpppddir=/usr/share/cups/model/HP \
+  --with-drvdir=/usr/share/cups/drv/hp \
+  --enable-shadow-build \
+  --enable-scan-build \
+  --enable-gui-build \
+  --enable-fax-build \
+  --enable-foomatic-rip-hplip-install \
+  --disable-foomatic-ppd-install \
+  --enable-foomatic-drv-install \
+  --enable-network-build=yes \
+  --enable-qt4 \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux \
+  || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG rulesdir=/lib/udev/rules.d || 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
+
+# No thanks, we don't replace/add files which are part of other packages
+rm -rf $PKG/etc/sane.d
+
+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/ap/hplip/hplip.prevent_segfault.diff b/source/ap/hplip/hplip.prevent_segfault.diff
new file mode 100644
index 000000000..1021a2e65
--- /dev/null
+++ b/source/ap/hplip/hplip.prevent_segfault.diff
@@ -0,0 +1,23 @@
+Thanks to Tim Waugh <twaugh redhat com> for the patch
+Prevent crash when DEVICE_URI/PRINTER environment variables are not
+  set (https://bugzilla.redhat.com/show_bug.cgi?id=479808 comment 6)
+
+diff -Nur hplip-3.9.4b.old/prnt/hpijs/hpijs.cpp hplip-3.9.4b.new/prnt/hpijs/hpijs.cpp
+--- hplip-3.9.4b.old/prnt/hpijs/hpijs.cpp	2009-04-29 15:36:54.000000000 -0500
++++ hplip-3.9.4b.new/prnt/hpijs/hpijs.cpp	2009-06-09 00:41:44.684172840 -0500
+@@ -218,8 +218,14 @@
+ 		// call dbus here
+ 		const char    *user_name = " ";
+ 		const char    *title     = " ";
++		char *device_uri = getenv ("DEVICE_URI");
++		char *printer = getenv("PRINTER");
+ 		int     job_id = 0;
+-                SendDbusMessage (getenv ("DEVICE_URI"), getenv("PRINTER"),
++		if (!device_uri)
++		    device_uri = "";
++		if (!printer)
++		    printer = "";
++                SendDbusMessage (device_uri, printer,
+ 	     	                 EVENT_PRINT_FAILED_MISSING_PLUGIN,
+ 				 user_name, job_id, title);
+                 BUG("unable to set device=%s, err=%d\n", svalue, r);
diff --git a/source/ap/hplip/slack-desc b/source/ap/hplip/slack-desc
new file mode 100644
index 000000000..874e6ed69
--- /dev/null
+++ b/source/ap/hplip/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--------------------------------------------------------|
+hplip: hplip (HP print/scan/fax support)
+hplip:
+hplip: HPLIP is an HP developed solution for printing, scanning, and faxing
+hplip: with HP inkjet and laser based printers in Linux.  The HPLIP project
+hplip: provides printing support for more than 1400 HP printer models,
+hplip: including Deskjet, Officejet, Photosmart, PSC (Print Scan Copy),
+hplip: Business Inkjet, LaserJet, and LaserJet MFP.
+hplip:
+hplip: For more information, see: http://hplipopensource.com
+hplip:
+hplip:
diff --git a/source/ap/ispell/ispell.SlackBuild b/source/ap/ispell/ispell.SlackBuild
new file mode 100755
index 000000000..cf6b4c6b2
--- /dev/null
+++ b/source/ap/ispell/ispell.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Copyright 2002-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=3.2.06
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-ispell
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $PKG $PKG
+
+cd $TMP
+rm -rf ispell-$VERSION
+tar xvf $CWD/ispell-$VERSION.tar.gz || exit 1
+cd ispell-$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 {} \;
+
+zcat $CWD/ispell.diff.gz | patch -p1 --verbose
+sed -i -e "s#/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" local.h
+
+make || exit 1
+
+sleep 2 # to make absolutely sure that config will have a later timestamp
+        # than local.h and will not get rebuilt by `make install`
+sed -i -e "s#/usr#$PKG&#g" config.sh
+
+mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},man}
+make install
+
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/ispell
+  ln -sf americanmed.hash american.hash
+  ln -sf americanmed.hash english.hash
+)
+
+# 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
+
+# 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
+
+# Add documentation to the package:
+mkdir -p $PKG/usr/doc/ispell-$VERSION
+cp -a \
+  Contributors Magiclines README WISHES \
+  $PKG/usr/doc/ispell-$VERSION
+chown -R root:root $PKG/usr/doc/ispell-$VERSION
+
+# Add the package description:
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Make the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/ispell-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/ispell/ispell.diff b/source/ap/ispell/ispell.diff
new file mode 100644
index 000000000..23f9aa9de
--- /dev/null
+++ b/source/ap/ispell/ispell.diff
@@ -0,0 +1,484 @@
+--- ./local.h.orig	Fri Jun  8 13:44:56 2001
++++ ./local.h	Fri Jun  8 13:51:33 2001
+@@ -0,0 +1,112 @@
++/*
++ * $Id: local.h.samp,v 1.18 2001/05/30 21:14:47 geoff Exp $
++ */
++
++/*
++ * Copyright 1992, 1993, 1999, Geoff Kuenning, Claremont, CA
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. All modifications to the source code must be clearly marked as
++ *    such.  Binary redistributions based on modified source code
++ *    must be clearly marked as modified versions in the documentation
++ *    and/or other materials provided with the distribution.
++ * 4. All advertising materials mentioning features or use of this software
++ *    must display the following acknowledgment:
++ *      This product includes software developed by Geoff Kuenning and
++ *      other unpaid contributors.
++ * 5. The name of Geoff Kuenning may not be used to endorse or promote
++ *    products derived from this software without specific prior
++ *    written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``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 GEOFF KUENNING OR CONTRIBUTORS 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.
++ */
++
++/*
++ * This file is a sample local.h file.  It shows what I believe nearly every
++ * site will want to include in their local.h.  You will probably want to
++ * expand this file;  see "config.X" to learn of #defines that you might
++ * like to add to.
++ */
++
++/*
++ * $Log: local.h.samp,v $
++ * Revision 1.18  2001/05/30 21:14:47  geoff
++ * Invert the fcntl/mkstemp options so they will default to being used.
++ *
++ * Revision 1.17  2001/05/30 21:04:25  geoff
++ * Add HAS_FCNTL_H and HAS_MKSTEMP.  Also give better comments on the USG
++ * option.
++ *
++ * Revision 1.16  1999/01/08 04:34:43  geoff
++ * Get rid of ELISPDIR and TEXINFODIR
++ *
++ * Revision 1.15  1999/01/07  01:57:57  geoff
++ * Update the copyright.
++ *
++ * Revision 1.14  1995/01/08  23:23:56  geoff
++ * Do some minor clarification of the instructional comments.
++ *
++ * Revision 1.13  1994/05/17  06:37:25  geoff
++ * Add one more item of warning advice to the comments.
++ *
++ * Revision 1.12  1994/02/07  06:00:00  geoff
++ * Add a warning about shell processing restrictions
++ *
++ * Revision 1.11  1994/01/25  07:11:50  geoff
++ * Get rid of all old RCS log lines in preparation for the 3.1 release.
++ *
++ */
++
++/*
++ * WARNING WARNING WARNING
++ *
++ * This file is *NOT* a normal C header file!  Although it uses C
++ * syntax and is included in C programs, it is also processed by shell
++ * scripts that are very stupid about format.
++ *
++ * Do not try to use #if constructs to configure this file for more
++ * than one configuration.  Do not place whitespace after the "#" in
++ * "#define".  Do not attempt to disable lines by commenting them out.
++ * Do not use backslashes to reduce the length of long lines.
++ * None of these things will work the way you expect them to.
++ *
++ * WARNING WARNING WARNING
++ */
++
++#define MINIMENU	/* Display a mini-menu at the bottom of the screen */
++#undef NO8BIT		/* Remove this if you use ISO character sets */
++#define USG		/* Define on System V or if term.c won't compile */
++#undef NO_FCNTL_H	/* Define if you get compile errors on fcntl.h */
++#undef NO_MKSTEMP	/* Define if you get compile or link errors */
++#define CFLAGS  "-O2 -Wall -I ."
++
++/*
++ * Important directory paths
++ */
++#define BINDIR	"/usr/bin"
++#define LIBDIR	"/usr/lib/ispell"
++#define MAN1DIR	"/usr/man/man1"
++#define MAN4DIR	"/usr/man/man4"
++
++/*
++ * Place any locally-required #include statements here
++ */
+--- ./string.h.orig	Fri Jun  8 13:49:03 2001
++++ ./string.h	Fri Jun  8 13:50:38 2001
+@@ -0,0 +1,366 @@
++/* Copyright (C) 1991,92,93,95,96,97,98,99,2000,2001 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., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.  */
++
++/*
++ *	ISO C99 Standard: 7.21 String handling	<string.h>
++ */
++
++#ifndef	_STRING_H
++#define	_STRING_H	1
++
++#include <features.h>
++
++__BEGIN_DECLS
++
++/* Get size_t and NULL from <stddef.h>.  */
++#define	__need_size_t
++#define	__need_NULL
++#include <stddef.h>
++
++
++/* Copy N bytes of SRC to DEST.  */
++extern void *memcpy (void *__restrict __dest,
++		     __const void *__restrict __src, size_t __n) __THROW;
++/* Copy N bytes of SRC to DEST, guaranteeing
++   correct behavior for overlapping strings.  */
++extern void *memmove (void *__dest, __const void *__src, size_t __n)
++     __THROW;
++
++/* Copy no more than N bytes of SRC to DEST, stopping when C is found.
++   Return the position in DEST one byte past where C was copied,
++   or NULL if C was not found in the first N bytes of SRC.  */
++#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN
++extern void *memccpy (void *__restrict __dest, __const void *__restrict __src,
++		      int __c, size_t __n)
++     __THROW;
++#endif /* SVID.  */
++
++
++/* Set N bytes of S to C.  */
++extern void *memset (void *__s, int __c, size_t __n) __THROW;
++
++/* Compare N bytes of S1 and S2.  */
++extern int memcmp (__const void *__s1, __const void *__s2, size_t __n)
++     __THROW __attribute_pure__;
++
++/* Search N bytes of S for C.  */
++extern void *memchr (__const void *__s, int __c, size_t __n)
++      __THROW __attribute_pure__;
++
++#ifdef __USE_GNU
++/* Search in S for C.  This is similar to `memchr' but there is no
++   length limit.  */
++extern void *rawmemchr (__const void *__s, int __c) __THROW __attribute_pure__;
++
++/* Search N bytes of S for the final occurrence of C.  */
++extern void *memrchr (__const void *__s, int __c, size_t __n)
++      __THROW __attribute_pure__;
++#endif
++
++
++/* Copy SRC to DEST.  */
++extern char *strcpy (char *__restrict __dest, __const char *__restrict __src)
++     __THROW;
++/* Copy no more than N characters of SRC to DEST.  */
++extern char *strncpy (char *__restrict __dest,
++		      __const char *__restrict __src, size_t __n) __THROW;
++
++/* Append SRC onto DEST.  */
++extern char *strcat (char *__restrict __dest, __const char *__restrict __src)
++     __THROW;
++/* Append no more than N characters from SRC onto DEST.  */
++extern char *strncat (char *__restrict __dest, __const char *__restrict __src,
++		      size_t __n) __THROW;
++
++/* Compare S1 and S2.  */
++extern int strcmp (__const char *__s1, __const char *__s2)
++     __THROW __attribute_pure__;
++/* Compare N characters of S1 and S2.  */
++extern int strncmp (__const char *__s1, __const char *__s2, size_t __n)
++     __THROW __attribute_pure__;
++
++/* Compare the collated forms of S1 and S2.  */
++extern int strcoll (__const char *__s1, __const char *__s2)
++     __THROW __attribute_pure__;
++/* Put a transformation of SRC into no more than N bytes of DEST.  */
++extern size_t strxfrm (char *__restrict __dest,
++		       __const char *__restrict __src, size_t __n) __THROW;
++
++#ifdef __USE_GNU
++/* The following functions are equivalent to the both above but they
++   take the locale they use for the collation as an extra argument.
++   This is not standardsized but something like will come.  */
++# include <xlocale.h>
++
++/* Compare the collated forms of S1 and S2 using rules from L.  */
++extern int __strcoll_l (__const char *__s1, __const char *__s2, __locale_t __l)
++     __THROW __attribute_pure__;
++/* Put a transformation of SRC into no more than N bytes of DEST.  */
++extern size_t __strxfrm_l (char *__dest, __const char *__src, size_t __n,
++			   __locale_t __l) __THROW;
++#endif
++
++#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
++/* Duplicate S, returning an identical malloc'd string.  */
++extern char *strdup (__const char *__s) __THROW __attribute_malloc__;
++#endif
++
++/* Return a malloc'd copy of at most N bytes of STRING.  The
++   resultant string is terminated even if no null terminator
++   appears before STRING[N].  */
++#if defined __USE_GNU
++extern char *strndup (__const char *__string, size_t __n)
++     __THROW __attribute_malloc__;
++#endif
++
++#if defined __USE_GNU && defined __GNUC__
++/* Duplicate S, returning an identical alloca'd string.  */
++# define strdupa(s)							      \
++  (__extension__							      \
++    ({									      \
++      __const char *__old = (s);					      \
++      size_t __len = strlen (__old) + 1;				      \
++      char *__new = (char *) __builtin_alloca (__len);			      \
++      (char *) memcpy (__new, __old, __len);				      \
++    }))
++
++/* Return an alloca'd copy of at most N bytes of string.  */
++# define strndupa(s, n)							      \
++  (__extension__							      \
++    ({									      \
++      __const char *__old = (s);					      \
++      size_t __len = strnlen (__old, (n));				      \
++      char *__new = (char *) __builtin_alloca (__len + 1);		      \
++      __new[__len] = '\0';						      \
++      (char *) memcpy (__new, __old, __len);				      \
++    }))
++#endif
++
++/* Find the first occurrence of C in S.  */
++extern char *strchr (__const char *__s, int __c) __THROW __attribute_pure__;
++/* Find the last occurrence of C in S.  */
++extern char *strrchr (__const char *__s, int __c) __THROW __attribute_pure__;
++
++#ifdef __USE_GNU
++/* This funciton is similar to `strchr'.  But it returns a pointer to
++   the closing NUL byte in case C is not found in S.  */
++extern char *strchrnul (__const char *__s, int __c) __THROW __attribute_pure__;
++#endif
++
++/* Return the length of the initial segment of S which
++   consists entirely of characters not in REJECT.  */
++extern size_t strcspn (__const char *__s, __const char *__reject)
++     __THROW __attribute_pure__;
++/* Return the length of the initial segment of S which
++   consists entirely of characters in ACCEPT.  */
++extern size_t strspn (__const char *__s, __const char *__accept)
++     __THROW __attribute_pure__;
++/* Find the first occurrence in S of any character in ACCEPT.  */
++extern char *strpbrk (__const char *__s, __const char *__accept)
++     __THROW __attribute_pure__;
++/* Find the first occurrence of NEEDLE in HAYSTACK.  */
++extern char *strstr (__const char *__haystack, __const char *__needle)
++     __THROW __attribute_pure__;
++
++#ifdef __USE_GNU
++/* Similar to `strstr' but this function ignores the case of both strings.  */
++extern char *strcasestr (__const char *__haystack, __const char *__needle)
++     __THROW __attribute_pure__;
++#endif
++
++/* Divide S into tokens separated by characters in DELIM.  */
++extern char *strtok (char *__restrict __s, __const char *__restrict __delim)
++     __THROW;
++
++/* Divide S into tokens separated by characters in DELIM.  Information
++   passed between calls are stored in SAVE_PTR.  */
++extern char *__strtok_r (char *__restrict __s,
++			 __const char *__restrict __delim,
++			 char **__restrict __save_ptr) __THROW;
++#if defined __USE_POSIX || defined __USE_MISC
++extern char *strtok_r (char *__restrict __s, __const char *__restrict __delim,
++		       char **__restrict __save_ptr) __THROW;
++#endif
++
++#ifdef __USE_GNU
++/* Find the first occurrence of NEEDLE in HAYSTACK.
++   NEEDLE is NEEDLELEN bytes long;
++   HAYSTACK is HAYSTACKLEN bytes long.  */
++extern void *memmem (__const void *__haystack, size_t __haystacklen,
++		     __const void *__needle, size_t __needlelen)
++     __THROW __attribute_pure__;
++
++/* Copy N bytes of SRC to DEST, return pointer to bytes after the
++   last written byte.  */
++extern void *__mempcpy (void *__restrict __dest,
++			__const void *__restrict __src, size_t __n) __THROW;
++extern void *mempcpy (void *__restrict __dest,
++		      __const void *__restrict __src, size_t __n) __THROW;
++#endif
++
++
++/* Return the length of S.  */
++extern size_t strlen (__const char *__s) __THROW __attribute_pure__;
++
++#ifdef	__USE_GNU
++/* Find the length of STRING, but scan at most MAXLEN characters.
++   If no '\0' terminator is found in that many characters, return MAXLEN.  */
++extern size_t strnlen (__const char *__string, size_t __maxlen)
++     __THROW __attribute_pure__;
++#endif
++
++
++/* Return a string describing the meaning of the `errno' code in ERRNUM.  */
++extern char *strerror (int __errnum) __THROW;
++#ifdef	__USE_MISC
++/* Reentrant version of `strerror'.  If a temporary buffer is required, at
++   most BUFLEN bytes of BUF will be used.  */
++extern char *strerror_r (int __errnum, char *__buf, size_t __buflen) __THROW;
++#endif
++
++/* We define this function always since `bzero' is sometimes needed when
++   the namespace rules does not allow this.  */
++extern void __bzero (void *__s, size_t __n) __THROW;
++
++#undef __USE_BSD
++#if defined __USE_BSD
++/* Copy N bytes of SRC to DEST (like memmove, but args reversed).  */
++extern void bcopy (__const void *__src, void *__dest, size_t __n) __THROW;
++
++/* Set N bytes of S to 0.  */
++extern void bzero (void *__s, size_t __n) __THROW;
++
++/* Compare N bytes of S1 and S2 (same as memcmp).  */
++extern int bcmp (__const void *__s1, __const void *__s2, size_t __n)
++     __THROW __attribute_pure__;
++
++/* Find the first occurrence of C in S (same as strchr).  */
++extern char *index (__const char *__s, int __c) __THROW __attribute_pure__;
++
++/* Find the last occurrence of C in S (same as strrchr).  */
++extern char *rindex (__const char *__s, int __c) __THROW __attribute_pure__;
++
++/* Return the position of the first bit set in I, or 0 if none are set.
++   The least-significant bit is position 1, the most-significant 32.  */
++extern int ffs (int __i) __THROW __attribute__ ((__const__));
++
++/* The following two functions are non-standard but necessary for non-32 bit
++   platforms.  */
++# ifdef	__USE_GNU
++extern int ffsl (long int __l) __THROW __attribute__ ((__const__));
++#  ifdef __GNUC__
++__extension__ extern int ffsll (long long int __ll)
++     __THROW __attribute__ ((__const__));
++#  endif
++# endif
++
++/* Compare S1 and S2, ignoring case.  */
++extern int strcasecmp (__const char *__s1, __const char *__s2)
++     __THROW __attribute_pure__;
++
++/* Compare no more than N chars of S1 and S2, ignoring case.  */
++extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n)
++     __THROW __attribute_pure__;
++#endif /* Use BSD.  */
++
++#ifdef	__USE_GNU
++/* Again versions of a few functions which use the given locale instead
++   of the global one.  */
++extern int __strcasecmp_l (__const char *__s1, __const char *__s2,
++			   __locale_t __loc) __THROW __attribute_pure__;
++
++extern int __strncasecmp_l (__const char *__s1, __const char *__s2,
++			    size_t __n, __locale_t __loc)
++     __THROW __attribute_pure__;
++#endif
++
++#ifdef	__USE_BSD
++/* Return the next DELIM-delimited token from *STRINGP,
++   terminating it with a '\0', and update *STRINGP to point past it.  */
++extern char *strsep (char **__restrict __stringp,
++		     __const char *__restrict __delim) __THROW;
++#endif
++
++#ifdef	__USE_GNU
++/* Compare S1 and S2 as strings holding name & indices/version numbers.  */
++extern int strverscmp (__const char *__s1, __const char *__s2)
++     __THROW __attribute_pure__;
++
++/* Return a string describing the meaning of the signal number in SIG.  */
++extern char *strsignal (int __sig) __THROW;
++
++/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
++extern char *__stpcpy (char *__restrict __dest, __const char *__restrict __src)
++     __THROW;
++extern char *stpcpy (char *__restrict __dest, __const char *__restrict __src)
++     __THROW;
++
++/* Copy no more than N characters of SRC to DEST, returning the address of
++   the last character written into DEST.  */
++extern char *__stpncpy (char *__restrict __dest,
++			__const char *__restrict __src, size_t __n) __THROW;
++extern char *stpncpy (char *__restrict __dest,
++		      __const char *__restrict __src, size_t __n) __THROW;
++
++/* Sautee STRING briskly.  */
++extern char *strfry (char *__string) __THROW;
++
++/* Frobnicate N bytes of S.  */
++extern void *memfrob (void *__s, size_t __n) __THROW;
++
++# ifndef basename
++/* Return the file name within directory of FILENAME.  We don't
++   declare the function if the `basename' macro is available (defined
++   in <libgen.h>) which makes the XPG version of this function
++   available.  */
++extern char *basename (__const char *__filename) __THROW;
++# endif
++#endif
++
++
++#if defined __GNUC__ && __GNUC__ >= 2
++# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined __cplusplus
++/* When using GNU CC we provide some optimized versions of selected
++   functions from this header.  There are two kinds of optimizations:
++
++   - machine-dependent optimizations, most probably using inline
++     assembler code; these might be quite expensive since the code
++     size can increase significantly.
++     These optimizations are not used unless the symbol
++	__USE_STRING_INLINES
++     is defined before including this header.
++
++   - machine-independent optimizations which do not increase the
++     code size significantly and which optimize mainly situations
++     where one or more arguments are compile-time constants.
++     These optimizations are used always when the compiler is
++     taught to optimize.
++
++   One can inhibit all optimizations by defining __NO_STRING_INLINES.  */
++
++/* Get the machine-dependent optimizations (if any).  */
++#  include <bits/string.h>
++
++/* These are generic optimizations which do not add too much inline code.  */
++#  include <bits/string2.h>
++# endif
++#endif
++
++__END_DECLS
++
++#endif /* string.h  */
diff --git a/source/ap/ispell/slack-desc b/source/ap/ispell/slack-desc
new file mode 100644
index 000000000..46c648623
--- /dev/null
+++ b/source/ap/ispell/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------------------------------------------------------|
+ispell: ispell (spelling checker)
+ispell:
+ispell: Ispell is a fast screen-oriented spelling checker that shows you your
+ispell: errors in the context of the original file, and suggests possible 
+ispell: corrections when it can figure them out.  Compared to UNIX spell, it
+ispell: is faster and much easier to use.  Ispell can also handle languages
+ispell: other than English.  Ispell has a long history, and many people have
+ispell: contributed to the current version -- some of the major contributors
+ispell: include R. E. Gorin, Pace Willisson, Walt Buehring, and Geoff 
+ispell: Kuenning. 
+ispell:
diff --git a/source/ap/jed/jed.SlackBuild b/source/ap/jed/jed.SlackBuild
new file mode 100755
index 000000000..68c851ff8
--- /dev/null
+++ b/source/ap/jed/jed.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=0.99-18
+PKGVER=0.99_18
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-3}
+
+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"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-jed
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf jed-$VERSION
+tar xvf $CWD/jed-$VERSION.tar.bz2 || exit 1
+cd jed-$VERSION
+zcat $CWD/jed.mouse.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+zcat $CWD/jed.multibyte.diff.gz | patch -p1 --verbose --backup --suffix=.orig || 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 {} \;
+
+JED_ROOT=/usr/share/jed \
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --with-slang=/usr \
+  --build=$ARCH-slackware-linux
+
+make clean
+make all rgrep $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+cp src/objs/rgrep $PKG/usr/bin
+
+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
+( cd $PKG/usr/doc ; rm -f jed-$VERSION )
+( cd $PKG/usr/doc ; ln -sf /usr/share/jed jed-$VERSION )
+( cd $PKG/usr/share/jed
+  rm -rf info
+  ln -sf /usr/info info
+)
+
+gzip -9 $PKG/usr/man/man1/*
+
+cp -a COPYING COPYRIGHT INSTALL INSTALL.unx README changes.txt \
+  $PKG/usr/share/jed
+
+mkdir -p $PKG/usr/info
+for file in info/jed* ; do
+  cat $file | gzip -9c > $PKG/usr/$file.gz
+done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/jed-$PKGVER-$ARCH-$BUILD.txz
+
diff --git a/source/ap/jed/jed.mouse.diff b/source/ap/jed/jed.mouse.diff
new file mode 100644
index 000000000..4ff607169
--- /dev/null
+++ b/source/ap/jed/jed.mouse.diff
@@ -0,0 +1,17 @@
+--- ./src/Makefile.in.orig	2006-02-15 21:09:50.000000000 -0600
++++ ./src/Makefile.in	2006-06-25 23:10:19.000000000 -0500
+@@ -52,10 +52,10 @@
+ #---------------------------------------------------------------------------
+ # 1. Linux GPM Mouse support
+ #    Uncomment next FOUR lines for GPM mouse support
+-#MOUSEFLAGS = -DUSE_GPM_MOUSE
+-#MOUSELIB = -lgpm
+-#GPMMOUSEO = gpmmouse.o
+-#OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
++MOUSEFLAGS = -DUSE_GPM_MOUSE
++MOUSELIB = -lgpm
++GPMMOUSEO = gpmmouse.o
++OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
+ 
+  
+ # 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
diff --git a/source/ap/jed/jed.multibyte.diff b/source/ap/jed/jed.multibyte.diff
new file mode 100644
index 000000000..266fece72
--- /dev/null
+++ b/source/ap/jed/jed.multibyte.diff
@@ -0,0 +1,11 @@
+--- ./src/misc.c.orig	2006-03-04 01:55:05.000000000 -0600
++++ ./src/misc.c	2006-06-25 23:14:32.000000000 -0500
+@@ -741,7 +741,7 @@
+ 
+ void jed_ungetkey_wchar (SLwchar_Type wc)
+ {
+-   SLuchar_Type *b, buf[SLUTF8_MAX_MBLEN];
++   SLuchar_Type *b, buf[JED_MAX_MULTIBYTE_SIZE];
+ 
+    if (NULL == (b = jed_wchar_to_multibyte (wc, buf)))
+      return;
diff --git a/source/ap/jed/slack-desc b/source/ap/jed/slack-desc
new file mode 100644
index 000000000..8c7b15192
--- /dev/null
+++ b/source/ap/jed/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------------------------------------------------------|
+jed: jed (programmer's editor)
+jed:
+jed: JED (by John E. Davis) is an extremely powerful but small emacs-like
+jed: programmer's editor that is extensible in a C-like macro language and
+jed: can do color syntax highlighting.  Among the many features:
+jed:     Emacs, wordstar, EDT emulation;
+jed:     C, Fortran, TeX, text editing modes;  Full undo;
+jed:     GNU Emacs compatible info reader, and lots more.
+jed:
+jed: JED is also 8 bit clean, so you can even edit binary files!  
+jed:
diff --git a/source/ap/joe/joe.SlackBuild b/source/ap/joe/joe.SlackBuild
new file mode 100755
index 000000000..f3672e24e
--- /dev/null
+++ b/source/ap/joe/joe.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=3.5
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-joe
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf joe-$VERSION
+tar xvf $CWD/joe-$VERSION.tar.bz2 || exit 1
+cd joe-$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 {} \;
+
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --program-prefix="" \
+  --program-suffix="" \
+  $ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Wrong place for this...
+rm -rf $PKG/etc/joe/doc
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+( cd $PKG/usr/man
+  find . -type f -name "*.?" -exec gzip -9 {} \;
+)
+
+mkdir -p $PKG/usr/doc/joe-$VERSION
+cp -a \
+  COPYING HACKING HINTS LIST NEWS README TODO docs/help-system.html \
+  $PKG/usr/doc/joe-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/joe-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/joe/slack-desc b/source/ap/joe/slack-desc
new file mode 100644
index 000000000..2827441f1
--- /dev/null
+++ b/source/ap/joe/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------------------------------------------------------|
+joe: joe (Joe text editor)
+joe:
+joe: Joseph H. Allen's easy to use text editor, similar to WordStar[tm].
+joe:
+joe:
+joe:
+joe:
+joe:
+joe:
+joe:
+joe:
diff --git a/source/ap/jove/jove.SlackBuild b/source/ap/jove/jove.SlackBuild
new file mode 100755
index 000000000..0fa524d05
--- /dev/null
+++ b/source/ap/jove/jove.SlackBuild
@@ -0,0 +1,95 @@
+#!/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=4.16.0.70
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+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"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-jove
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf jove$VERSION
+tar xvf $CWD/jove$VERSION.tar.?z* || exit 1
+cd jove$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 {} \;
+
+zcat $CWD/jove.makefile.diff.gz | patch -p1 --verbose --backup
+# More patching needed now:
+sed -i -e "s#/lib/jove#/lib${LIBDIRSUFFIX}/jove#" \
+  -e "s#^OPTFLAGS = .*#OPTFLAGS = $SLKCFLAGS#" Makefile
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG
+
+# Create jove-recover symlink
+( cd $PKG/usr/bin
+  ln -s ../lib${LIBDIRSUFFIX}/jove/recover jove-recover
+)
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress man pages
+( cd $PKG/usr/man
+  rm man1/jovetool.1 man1/xjove.1
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do
+    ln -s $( readlink $i ).gz $i.gz ; rm $i
+  done
+)
+
+# Copy program documentation into the package
+mkdir -p $PKG/usr/doc/jove$VERSION
+cp -a \
+  README* $PKG/usr/doc/jove$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/jove-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/jove/jove.makefile.diff b/source/ap/jove/jove.makefile.diff
new file mode 100644
index 000000000..8bf2be4bc
--- /dev/null
+++ b/source/ap/jove/jove.makefile.diff
@@ -0,0 +1,132 @@
+--- jove4.16.0.70/Makefile	2005-09-30 19:14:41.000000000 -0300
++++ jove4.16.0.70.new/Makefile	2009-03-04 02:01:26.000000000 -0300
+@@ -21,13 +21,14 @@
+ # If they don't exist, this makefile will try to create the directories
+ # LIBDIR and SHAREDIR.  All others must already exist.
+ 
+-JOVEHOME = /usr/local
++JOVEHOME = /usr
+ SHAREDIR = $(JOVEHOME)/lib/jove
+ LIBDIR = $(JOVEHOME)/lib/jove
+ BINDIR = $(JOVEHOME)/bin
+ XEXT=
+ MANDIR = $(JOVEHOME)/man/man$(MANEXT)
+ MANEXT = 1
++DESTDIR := ${DESTDIR}
+ 
+ # TMPDIR is where the tmp files get stored, usually /tmp, /var/tmp, or
+ # /usr/tmp.  If you wish to be able to recover buffers after a system
+@@ -56,12 +57,12 @@
+ INSTALLFLAGS = # -g bin -o root
+ 
+ # to install executable files
+-XINSTALL=cp
++XINSTALL=/usr/bin/install -c -m 755 -D
+ #XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
+ #CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755
+ 
+ # to install text files
+-TINSTALL=cp
++TINSTALL=/usr/bin/install -c -m 644 -D
+ #TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
+ #CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
+ 
+@@ -137,7 +138,7 @@
+ # Add -DUSE_EXIT if you're profiling or using purify (this causes Jove
+ # to exit using exit(), instead of _exit()).
+ 
+-SYSDEFS = -DBSDPOSIX_STDC
++SYSDEFS = -DSYSVR4 -D_XOPEN_SOURCE=500
+ 
+ # Select optimization level (flags passed to compiling and linking steps).
+ # On most systems: -g for debugging, -O for optimization.
+@@ -146,7 +147,7 @@
+ # On DEC OSF/1 and Digital UNIX VV4.0, add -std1 to enable ANSI C features
+ # and perhaps -g3 for more debugging info with optimization.
+ 
+-OPTFLAGS = -O
++OPTFLAGS := ${OPTFLAGS}
+ 
+ # For making dependencies under BSD systems
+ DEPENDFLAG = -M
+@@ -360,7 +361,7 @@
+ install: $(LIBDIR) $(SHAREDIR) \
+ 	 $(TEACH-JOVE) $(CMDS.DOC) $(TERMSDIR)docs \
+ 	 $(PORTSRVINST) $(RECOVER) $(JOVE) $(TEACHJOVE) $(MANUALS)
+-	$(TINSTALL) doc/jove.rc $(JOVERC)
++	$(TINSTALL) doc/jove.rc $(DESTDIR)$(JOVERC)
+ 	@echo See the README about changes to /etc/rc or /etc/rc.local
+ 	@echo so that the system recovers jove files on reboot after a crash
+ 
+@@ -371,7 +372,7 @@
+ 	test -d $(SHAREDIR) || mkdir $(SHAREDIR)
+ 
+ $(TEACH-JOVE): doc/teach-jove
+-	$(TINSTALL) doc/teach-jove $(TEACH-JOVE)
++	$(TINSTALL) doc/teach-jove $(DESTDIR)$(TEACH-JOVE)
+ 
+ doc/cmds.doc:	doc/cmds.macros.nr doc/cmds.nr
+ 	$(NROFF) doc/cmds.macros.nr doc/cmds.nr > doc/cmds.doc
+@@ -383,25 +384,25 @@
+ 	( cd doc; tbl intro.nr | $(TROFF) -ms - cmds.nr contents.nr $(TROFFPOST) >jove.man.ps )
+ 
+ $(CMDS.DOC): doc/cmds.doc
+-	$(TINSTALL) doc/cmds.doc $(CMDS.DOC)
++	$(TINSTALL) doc/cmds.doc $(DESTDIR)$(CMDS.DOC)
+ 
+ $(JOVERC): doc/jove.rc
+-	$(TINSTALL) doc/jove.rc $(JOVERC)
++	$(TINSTALL) doc/jove.rc $(DESTDIR)$(JOVERC)
+ 
+ $(TERMSDIR)docs: $(DOCTERMS)
+-	$(TINSTALL) $(DOCTERMS) $(TERMSDIR)
++	$(TINSTALL) $(DOCTERMS) $(DESTDIR)$(TERMSDIR)
+ 
+ $(PORTSRV): portsrv$(XEXT)
+-	$(XINSTALL) portsrv$(XEXT) $(PORTSRV)
++	$(XINSTALL) portsrv$(XEXT) $(DESTDIR)$(PORTSRV)
+ 
+ $(RECOVER): recover$(XEXT)
+-	$(XINSTALL) recover$(XEXT) $(RECOVER)
++	$(XINSTALL) recover$(XEXT) $(DESTDIR)$(RECOVER)
+ 
+ $(JOVE): jjove$(XEXT)
+-	$(XINSTALL) jjove$(XEXT) $(JOVE)
++	$(XINSTALL) jjove$(XEXT) $(DESTDIR)$(JOVE)
+ 
+ $(TEACHJOVE): teachjove$(XEXT)
+-	$(XINSTALL) teachjove$(XEXT) $(TEACHJOVE)
++	$(XINSTALL) teachjove$(XEXT) $(DESTDIR)$(TEACHJOVE)
+ 
+ doc/jove.$(MANEXT): doc/jove.nr
+ 	sed -e 's;<TMPDIR>;$(TMPDIR);' \
+@@ -410,7 +411,7 @@
+ 	     -e 's;<SHELL>;$(DFLTSHELL);' doc/jove.nr > doc/jove.$(MANEXT)
+ 
+ $(JOVEM): doc/jove.$(MANEXT)
+-	$(TINSTALL) doc/jove.$(MANEXT) $(JOVEM)
++	$(TINSTALL) doc/jove.$(MANEXT) $(DESTDIR)$(JOVEM)
+ 
+ # doc/jove.doc is the formatted manpage (only needed by DOS)
+ # Building it should be like building $(JOVEM) except that we
+@@ -427,17 +428,17 @@
+ 	     -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > doc/teachjove.$(MANEXT)
+ 
+ $(TEACHJOVEM): doc/teachjove.$(MANEXT)
+-	$(TINSTALL) doc/teachjove.$(MANEXT) $(TEACHJOVEM)
++	$(TINSTALL) doc/teachjove.$(MANEXT) $(DESTDIR)$(TEACHJOVEM)
+ 
+ $(XJOVEM): doc/xjove.nr
+-	$(TINSTALL) doc/xjove.nr $(XJOVEM)
++	$(TINSTALL) doc/xjove.nr $(DESTDIR)$(XJOVEM)
+ 
+ doc/jovetool.$(MANEXT): doc/jovetool.nr
+ 	sed -e 's;<MANDIR>;$(MANDIR);' \
+ 	     -e 's;<MANEXT>;$(MANEXT);' doc/jovetool.nr > doc/jovetool.$(MANEXT)
+ 
+ $(JOVETOOLM): doc/jovetool.$(MANEXT)
+-	$(TINSTALL) doc/jovetool.$(MANEXT) $(JOVETOOLM)
++	$(TINSTALL) doc/jovetool.$(MANEXT) $(DESTDIR)$(JOVETOOLM)
+ 
+ echo:
+ 	@echo $(C-FILES) $(HEADERS)
diff --git a/source/ap/jove/slack-desc b/source/ap/jove/slack-desc
new file mode 100644
index 000000000..ea95435ff
--- /dev/null
+++ b/source/ap/jove/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------------------------------------------------------|
+jove: jove (Jonathan's Own Version of Emacs)
+jove:
+jove: A mostly Emacs compatible text editor, with man pages and the 
+jove: 'teachjove' tutorial program.  If you'd rather have the real thing, 
+jove: the actual Emacs editor/environment is available in series 'E'.
+jove:
+jove: JOVE was written by Jonathan Payne.
+jove:
+jove:
+jove:
+jove:
diff --git a/source/ap/ksh93/CPL b/source/ap/ksh93/CPL
new file mode 100644
index 000000000..50c6364c0
--- /dev/null
+++ b/source/ap/ksh93/CPL
@@ -0,0 +1,245 @@
++------------------------------------------------------------------------------+
+|          This license covers all software that refers to the URL             |
+|               http://www.opensource.org/licenses/cpl1.0.txt                  |
++------------------------------------------------------------------------------+
+
+Common Public License Version 1.0
+
+   THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
+   PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
+   THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+   
+   1. DEFINITIONS 
+   
+   "Contribution" means:
+   
+     a) in the case of the initial Contributor, the initial code and
+     documentation distributed under this Agreement, and
+     
+     b) in the case of each subsequent Contributor:
+     
+     i) changes to the Program, and
+     
+     ii) additions to the Program;
+     
+     where such changes and/or additions to the Program originate from
+     and are distributed by that particular Contributor. A Contribution
+     'originates' from a Contributor if it was added to the Program by
+     such Contributor itself or anyone acting on such Contributor's
+     behalf. Contributions do not include additions to the Program
+     which: (i) are separate modules of software distributed in
+     conjunction with the Program under their own license agreement, and
+     (ii) are not derivative works of the Program.
+     
+   "Contributor" means any person or entity that distributes the Program.
+   
+   "Licensed Patents " mean patent claims licensable by a Contributor
+   which are necessarily infringed by the use or sale of its Contribution
+   alone or when combined with the Program.
+   
+   "Program" means the Contributions distributed in accordance with this
+   Agreement.
+   
+   "Recipient" means anyone who receives the Program under this
+   Agreement, including all Contributors.
+   
+   2. GRANT OF RIGHTS
+   
+     a) Subject to the terms of this Agreement, each Contributor hereby
+     grants Recipient a non-exclusive, worldwide, royalty-free copyright
+     license to reproduce, prepare derivative works of, publicly
+     display, publicly perform, distribute and sublicense the
+     Contribution of such Contributor, if any, and such derivative
+     works, in source code and object code form.
+     
+     b) Subject to the terms of this Agreement, each Contributor hereby
+     grants Recipient a non-exclusive, worldwide, royalty-free patent
+     license under Licensed Patents to make, use, sell, offer to sell,
+     import and otherwise transfer the Contribution of such Contributor,
+     if any, in source code and object code form. This patent license
+     shall apply to the combination of the Contribution and the Program
+     if, at the time the Contribution is added by the Contributor, such
+     addition of the Contribution causes such combination to be covered
+     by the Licensed Patents. The patent license shall not apply to any
+     other combinations which include the Contribution. No hardware per
+     se is licensed hereunder.
+     
+     c) Recipient understands that although each Contributor grants the
+     licenses to its Contributions set forth herein, no assurances are
+     provided by any Contributor that the Program does not infringe the
+     patent or other intellectual property rights of any other entity.
+     Each Contributor disclaims any liability to Recipient for claims
+     brought by any other entity based on infringement of intellectual
+     property rights or otherwise. As a condition to exercising the
+     rights and licenses granted hereunder, each Recipient hereby
+     assumes sole responsibility to secure any other intellectual
+     property rights needed, if any. For example, if a third party
+     patent license is required to allow Recipient to distribute the
+     Program, it is Recipient's responsibility to acquire that license
+     before distributing the Program.
+     
+     d) Each Contributor represents that to its knowledge it has
+     sufficient copyright rights in its Contribution, if any, to grant
+     the copyright license set forth in this Agreement.
+     
+   3. REQUIREMENTS
+   
+   A Contributor may choose to distribute the Program in object code form
+   under its own license agreement, provided that:
+   
+     a) it complies with the terms and conditions of this Agreement; and
+     
+     b) its license agreement:
+     
+     i) effectively disclaims on behalf of all Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and implied
+     warranties or conditions of merchantability and fitness for a
+     particular purpose;
+     
+     ii) effectively excludes on behalf of all Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+     
+     iii) states that any provisions which differ from this Agreement
+     are offered by that Contributor alone and not by any other party;
+     and
+     
+     iv) states that source code for the Program is available from such
+     Contributor, and informs licensees how to obtain it in a reasonable
+     manner on or through a medium customarily used for software
+     exchange.
+     
+   When the Program is made available in source code form:
+   
+     a) it must be made available under this Agreement; and
+     
+     b) a copy of this Agreement must be included with each copy of the
+     Program.
+     
+   Contributors may not remove or alter any copyright notices contained
+   within the Program.
+   
+   Each Contributor must identify itself as the originator of its
+   Contribution, if any, in a manner that reasonably allows subsequent
+   Recipients to identify the originator of the Contribution.
+   
+   4. COMMERCIAL DISTRIBUTION
+   
+   Commercial distributors of software may accept certain
+   responsibilities with respect to end users, business partners and the
+   like. While this license is intended to facilitate the commercial use
+   of the Program, the Contributor who includes the Program in a
+   commercial product offering should do so in a manner which does not
+   create potential liability for other Contributors. Therefore, if a
+   Contributor includes the Program in a commercial product offering,
+   such Contributor ("Commercial Contributor") hereby agrees to defend
+   and indemnify every other Contributor ("Indemnified Contributor")
+   against any losses, damages and costs (collectively "Losses") arising
+   from claims, lawsuits and other legal actions brought by a third party
+   against the Indemnified Contributor to the extent caused by the acts
+   or omissions of such Commercial Contributor in connection with its
+   distribution of the Program in a commercial product offering. The
+   obligations in this section do not apply to any claims or Losses
+   relating to any actual or alleged intellectual property infringement.
+   In order to qualify, an Indemnified Contributor must: a) promptly
+   notify the Commercial Contributor in writing of such claim, and b)
+   allow the Commercial Contributor to control, and cooperate with the
+   Commercial Contributor in, the defense and any related settlement
+   negotiations. The Indemnified Contributor may participate in any such
+   claim at its own expense.
+   
+   For example, a Contributor might include the Program in a commercial
+   product offering, Product X. That Contributor is then a Commercial
+   Contributor. If that Commercial Contributor then makes performance
+   claims, or offers warranties related to Product X, those performance
+   claims and warranties are such Commercial Contributor's responsibility
+   alone. Under this section, the Commercial Contributor would have to
+   defend claims against the other Contributors related to those
+   performance claims and warranties, and if a court requires any other
+   Contributor to pay any damages as a result, the Commercial Contributor
+   must pay those damages.
+   
+   5. NO WARRANTY
+   
+   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+   PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
+   WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+   OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+   responsible for determining the appropriateness of using and
+   distributing the Program and assumes all risks associated with its
+   exercise of rights under this Agreement, including but not limited to
+   the risks and costs of program errors, compliance with applicable
+   laws, damage to or loss of data, programs or equipment, and
+   unavailability or interruption of operations.
+   
+   6. DISCLAIMER OF LIABILITY 
+   
+   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
+   ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+   WITHOUT LIMITATION LOST PROFITS), 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 OR
+   DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+   HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+   
+   7. GENERAL
+   
+   If any provision of this Agreement is invalid or unenforceable under
+   applicable law, it shall not affect the validity or enforceability of
+   the remainder of the terms of this Agreement, and without further
+   action by the parties hereto, such provision shall be reformed to the
+   minimum extent necessary to make such provision valid and enforceable.
+   
+   If Recipient institutes patent litigation against a Contributor with
+   respect to a patent applicable to software (including a cross-claim or
+   counterclaim in a lawsuit), then any patent licenses granted by that
+   Contributor to such Recipient under this Agreement shall terminate as
+   of the date such litigation is filed. In addition, if Recipient
+   institutes patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Program
+   itself (excluding combinations of the Program with other software or
+   hardware) infringes such Recipient's patent(s), then such Recipient's
+   rights granted under Section 2(b) shall terminate as of the date such
+   litigation is filed.
+   
+   All Recipient's rights under this Agreement shall terminate if it
+   fails to comply with any of the material terms or conditions of this
+   Agreement and does not cure such failure in a reasonable period of
+   time after becoming aware of such noncompliance. If all Recipient's
+   rights under this Agreement terminate, Recipient agrees to cease use
+   and distribution of the Program as soon as reasonably practicable.
+   However, Recipient's obligations under this Agreement and any licenses
+   granted by Recipient relating to the Program shall continue and
+   survive.
+   
+   Everyone is permitted to copy and distribute copies of this Agreement,
+   but in order to avoid inconsistency the Agreement is copyrighted and
+   may only be modified in the following manner. The Agreement Steward
+   reserves the right to publish new versions (including revisions) of
+   this Agreement from time to time. No one other than the Agreement
+   Steward has the right to modify this Agreement. IBM is the initial
+   Agreement Steward. IBM may assign the responsibility to serve as the
+   Agreement Steward to a suitable separate entity. Each new version of
+   the Agreement will be given a distinguishing version number. The
+   Program (including Contributions) may always be distributed subject to
+   the version of the Agreement under which it was received. In addition,
+   after a new version of the Agreement is published, Contributor may
+   elect to distribute the Program (including its Contributions) under
+   the new version. Except as expressly stated in Sections 2(a) and 2(b)
+   above, Recipient receives no rights or licenses to the intellectual
+   property of any Contributor under this Agreement, whether expressly,
+   by implication, estoppel or otherwise. All rights in the Program not
+   expressly granted under this Agreement are reserved.
+   
+   This Agreement is governed by the laws of the State of New York and
+   the intellectual property laws of the United States of America. No
+   party to this Agreement will bring a legal action under this Agreement
+   more than one year after the cause of action arose. Each party waives
+   its rights to a jury trial in any resulting litigation.
+
+Copyright (c) 2004 by the Open Source Initiative
+This is a copy of the license posted on 2004-10-06 at:
+   http://www.opensource.org/licenses/cpl
diff --git a/source/ap/ksh93/ksh93.SlackBuild b/source/ap/ksh93/ksh93.SlackBuild
new file mode 100755
index 000000000..8653c89de
--- /dev/null
+++ b/source/ap/ksh93/ksh93.SlackBuild
@@ -0,0 +1,151 @@
+#!/bin/sh
+# Copyright 2001 BSDi, Inc. Concord, CA, USA
+# Copyright 2004 Slackware Linux, Inc.  Concord, CA, USA
+# Copyright 2007, 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=2007-03-28
+PKGVER=2007_03_28
+# ast still considers this an i386 arch, so we'll humor it
+# but package with our real arch label...
+ARCH=${ARCH:-x86_64}
+if [ "$ARCH" = "x86_64" ]; then
+  SARCH=i386-64
+else
+  SARCH=i386
+fi
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=/tmp/build-ksh93
+PKG=/tmp/package-ksh93
+
+rm -rf $TMP $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+
+mkdir -p ast-base/lib/package/tgz
+cp $CWD/*.tgz ast-base/lib/package/tgz
+cd ast-base/
+
+tar -xzf lib/package/tgz/INIT.$VERSION.tgz || 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 {} \;
+
+bin/package read || exit 1
+bin/package make SHELL=/bin/ash || exit 1
+
+mkdir -p $PKG/bin
+cp arch/linux.$SARCH/bin/ksh $PKG/bin/ksh.new
+strip --strip-unneeded $PKG/bin/ksh.new
+
+#cp arch/linux.$SARCH/lib/libshell.so.1.1 /usr/lib
+#cp arch/linux.$SARCH/lib/libshell.a /usr/lib
+#cp arch/linux.$SARCH/lib/libast.so.5.4 /usr/lib
+#cp arch/linux.$SARCH/lib/libast.a /usr/lib
+#cp arch/linux.$SARCH/src/cmd/ksh93/cc-g,-fpic/libshell.so.1.1 /usr/lib
+#cp arch/linux.$SARCH/src/cmd/ksh93/cc-g,-fpic/libshell.a /usr/lib
+#cp arch/linux.$SARCH/src/lib/libast/libast.so.5.4 /usr/lib
+#cp arch/linux.$SARCH/src/cmd/ksh93/cc-g,-fpic/libast.a /usr/lib
+#strip /usr/lib/libast.so.5.4 /usr/lib/libshell.so.1.1
+
+mkdir -p $PKG/usr/man/man1
+sed -e "s#\.nr Z 0#\.nr Z 1#g" src/cmd/ksh93/sh.1 > \
+       $PKG/usr/man/man1/ksh.1
+#mkdir -p $PKG/usr/man/man1
+#cp src/cmd/ksh93/shell.3 $PKG/usr/man/man3
+#cp src/cmd/ksh93/nval.3 $PKG/usr/man/man3
+gzip -9 $PKG/usr/man/man?/*
+
+# Install locale files:
+mkdir -p $PKG/usr/share
+cp -a share/lib/locale $PKG/usr/share
+chown -R root:root $PKG/usr/share
+( cd $PKG/usr/share
+  find . -type d -exec chmod 755 {} \;
+  find . -type f -exec chmod 644 {} \;
+)
+
+#cp src/cmd/ksh93/include/shell.h /usr/include
+
+# If anyone is actually using the ksh libraries, drop me some mail
+# and explain which libs you use and what they're for.  As it is, I
+# don't see a compeling reason to include them, as ksh itself doesn't
+# use them.
+#( cd /usr/lib ; ln -sf libshell.so.1.1 libshell.so )
+#( cd /usr/lib rm -rf libast.so ; ln -sf libast.so.5.4 libast.so )
+
+( cd $PKG/bin ; ln -sf ksh rksh )
+( cd $PKG/usr/man/man1 ; ln -sf ksh.1.gz rksh.1.gz )
+
+mkdir -p $PKG/usr/doc/ksh93-$VERSION
+( cd src/cmd/ksh93
+  cp -a COMPATIBILITY DESIGN OBSOLETE PROMO.mm README RELEASE* \
+     $PKG/usr/doc/ksh93-$VERSION
+)
+( cd /tmp/build-ksh93/ast-base
+  mkdir -p $PKG/usr/doc/ksh93-$VERSION/LICENSE
+  cp -a README $PKG/usr/doc/ksh93-$VERSION/LICENSE
+  cp -a $CWD/CPL $PKG/usr/doc/ksh93-$VERSION
+  chmod 644 $PKG/usr/doc/ksh93-$VERSION/CPL
+  chown root:root $PKG/usr/doc/ksh93-$VERSION/CPL
+  cp -a lib/package/LICENSES/ast $PKG/usr/doc/ksh93-$VERSION/LICENSE/LICENSE.ast )
+
+chown -R root:root $PKG/usr/doc/ksh93-$VERSION
+find $PKG/usr/doc/ksh93-$VERSION -type f -exec chmod 644 "{}" \;
+find $PKG/usr/doc/ksh93-$VERSION -type d -exec chmod 755 "{}" \;
+
+#chmod 755 $PKG/usr/lib/libshell.so.1.1
+#chmod 755 $PKG/usr/lib/libast.so.5.4
+
+mkdir -p $PKG/install
+cat <<EOF >> $PKG/install/doinst.sh
+# Backup the old copy if we find one, move the new one in place
+if [ -f bin/ksh ]; then
+   mv bin/ksh bin/ksh.old
+fi
+mv bin/ksh.new bin/ksh
+if [ -f bin/ksh.old ]; then
+  rm -f bin/ksh.old
+fi
+
+# Add entries to /etc/shells if we need them
+if [ ! -r etc/shells ] ; then
+   touch etc/shells
+   chmod 644 etc/shells
+fi
+ 
+if ! grep -q "/bin/ksh" etc/shells ; then
+   echo "/bin/ksh" >> etc/shells
+fi
+EOF
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n /tmp/ksh93-$PKGVER-$ARCH-$BUILD.txz
+
diff --git a/source/ap/ksh93/slack-desc b/source/ap/ksh93/slack-desc
new file mode 100644
index 000000000..b2e7d5624
--- /dev/null
+++ b/source/ap/ksh93/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------------------------------------------------------|
+ksh93: ksh (AT&T Korn Shell 93)
+ksh93:
+ksh93: The KornShell language and interactive shell were designed by
+ksh93: David G. Korn at AT&T Bell Laboratories.  Besides offering a powerful
+ksh93: interactive shell, it also offers a robust programming language with
+ksh93: such features as associative arrays and built in integer math
+ksh93: operations.  ksh is an excellent choice for system administration
+ksh93: scripts and for everyday interactive use.
+ksh93: 
+ksh93: The official site for the Korn Shell is http://www.kornshell.com/
+ksh93:
diff --git a/source/ap/libx86/libx86.SlackBuild b/source/ap/libx86/libx86.SlackBuild
new file mode 100755
index 000000000..02c54a098
--- /dev/null
+++ b/source/ap/libx86/libx86.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Slackware build script for libx86
+
+# Copyright 2008  Robby Workman, Northport, Alabama, USA
+# 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:-1.1}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-libx86
+
+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"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf libx86-$VERSION
+tar xvf $CWD/libx86-$VERSION.tar.gz
+cd libx86-$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 {} \;
+
+# Add a patch from Gentoo to make this build on 2.6.26+
+zcat $CWD/lrmi.c.diff.gz | patch -p1 || exit 1
+
+make BACKEND=x86emu LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1
+make install DESTDIR=$PKG LIBDIR=/usr/lib${LIBDIRSUFFIX}
+
+# Kill the static library; we shouldn't need it
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libx86.a
+
+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/libx86-$VERSION
+cp -a COPYRIGHT $PKG/usr/doc/libx86-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/libx86-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/libx86/libx86.info b/source/ap/libx86/libx86.info
new file mode 100644
index 000000000..1b9bef5c2
--- /dev/null
+++ b/source/ap/libx86/libx86.info
@@ -0,0 +1,2 @@
+HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86/"
+DOWNLOAD="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz"
diff --git a/source/ap/libx86/lrmi.c.diff b/source/ap/libx86/lrmi.c.diff
new file mode 100644
index 000000000..24f4510ff
--- /dev/null
+++ b/source/ap/libx86/lrmi.c.diff
@@ -0,0 +1,18 @@
+# Patch from Gentoo: http://bugs.gentoo.org/235599
+
+--- old/lrmi.c	2006-10-30 21:10:16.000000000 +0100
++++ new/lrmi.c	2008-08-27 11:32:40.000000000 +0200
+@@ -64,6 +64,13 @@
+ #define DEFAULT_STACK_SIZE 	0x1000
+ #define RETURN_TO_32_INT 	255
+ 
++#ifndef IF_MASK
++#define IF_MASK X86_EFLAGS_VIF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define VIF_MASK X86_EFLAGS_VIF
++#define TF_MASK X86_EFLAGS_TF
++#endif
++
+ #if defined(__linux__)
+ #define CONTEXT_REGS	context.vm.regs
+ #define REG(x)	
diff --git a/source/ap/libx86/slack-desc b/source/ap/libx86/slack-desc
new file mode 100644
index 000000000..b1e743932
--- /dev/null
+++ b/source/ap/libx86/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--------------------------------------------------|
+libx86: libx86 (hardware-independent library for x86 code execution)
+libx86: 
+libx86: libx86 is a hardware-independent library for executing
+libx86: real-mode x86 code, such as bios calls, from userspace.
+libx86: 
+libx86: Homepage: http://www.codon.org.uk/~mjg59/libx86/
+libx86: 
+libx86: 
+libx86: 
+libx86: 
+libx86: 
diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt
new file mode 100644
index 000000000..86f1eb7f8
--- /dev/null
+++ b/source/ap/linuxdoc-tools/ChangeLog.txt
@@ -0,0 +1,113 @@
+Sun Aug  2 19:07:43 BST 2009
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools-0.9.56, build 5.
+ * Replace /usr/share/xml/docbook/xml-dtd-4.5/ent/isogrk4.ent with
+   the Unicode-4 entity map from sgml-common, to fix errors such as
+   ""1D6C2" is not a character number in the document character set"
+   Thanks to Niels Horn for the fix and Ron Parker for the report.
+
+Thu Jul 30 15:56:10 BST 2009
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools-0.9.56, build 4.
+* Upgraded to:
+   docbook-xsl-1.75.1
+   docbook-xsl-doc-1.75.1
+   gnome-doc-utils-0.17.2
+   asciidoc-8.4.5
+   OpenJade-1.3.3-pre1
+
+This package has a problem producing simple docbook documents
+though, as reported by Ron Parker.
+
+ For example:
+  # cat << EOF > /tmp/test.txt
+Hello
+this will not work yet
+EOF
+  # asciidoc -b docbook  /tmp/test.txt
+  # db2rtf /tmp/test.xml
+You'll see this error:
+jade:/usr/share/xml/docbook/xml-dtd-4.5/ent/isogrk4.ent:42:30:E: "1D6C2" is not a character number in the document character set
+
+I've been reading a few URLs:
+http://lists.oasis-open.org/archives/docbook-apps/200511/msg00119.html
+http://bugs.gentoo.org/238785
+
+The majority of the build process for Docbook and supporting tools
+is taken verbatim from Linux From Scratch:
+http://www.linuxfromscratch.org/blfs/view/svn/index.html
+I have in the past looked at Fedora and Debian spec & rules files
+but LFS has great documentation and makes maintaining this package
+a lot easier, so I'm very keen to keep to their build process
+(including file/directory paths) as much as possible.
+
+If anybody knows how to resolve this, please let me know!
+
+Fri May 29 18:48:41 BST 2009
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools-0.9.56, build 3.
+ * Remove orphaned *.pyc (Python compiled) files.
+   The addition of GNOME doc-tools causes some Python *.py
+   files to be recompiled, resulting in them appearing in this
+   package. These files belonged to the Python package and 
+   therefore caused an overlap.  
+ 
+Mon May 25 14:29:26 BST 2009
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools-0.9.56, build 2.
+ * Added missing asciidoc filters.
+   Thanks to 'one forall' for the report.
+   Now use asciidoc's 'make install' target to install
+   rather than hand crafted script.
+
+Tue May 12 18:34:38 BST 2009
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools-0.9.56, build 1.
+  * Upgraded to linuxdoc-tools 0.9.56
+  * Patched OpenSP to prevent segfaulting on the ARM platform:
+    https://bugzilla.redhat.com/show_bug.cgi?id=245104
+  * Added gnome-doc-utils-0.16.0, for gtkdoc.
+  * Upgraded to gtkdoc-1.11
+  * Upgraded to xmlto-0.0.22
+  * Upgraded to asciidoc-8.4.4
+
+Thu Feb 28 17:47:21 CST 2008 <pjv>
+  Upgraded these source files:
+  asciidoc-8.2.5.tar.gz
+  docbook-utils-0.6.14-13.fc9.src.rpm
+  docbook-xsl-1.73.2.tar.bz2
+  docbook-xsl-doc-1.73.2.tar.bz2
+  gtk-doc-1.9.tar.bz2
+  libsgmls-perl_1.03ii-32.diff.gz
+  linuxdoc-tools_0.9.21-0.11.tar.gz
+  sgml-common-0.6.3-23.fc9.src.rpm
+  xmlto-0.0.20.tar.bz2
+
+Sat May  5 13:38:46 BST 2007
+ Stuart Winter <mozes@slackware.com>
+ linuxdoc-tools-0.9.21, build 4
+  * Converted from docbook RPM source builds to direct source build, with
+    the build script code by: Jerome Pinot
+    based on the Linux From Scratch documentation.
+    Merged some of Jerome's code back into the original linuxdoc-tools.build
+    script.
+    This fixes many bugs with the previous package, with broken catalogs
+    and so on.
+  * Upgraded to gtk-doc v1.8
+  * Upgraded to DocBook SGML DTD v4.5
+  * Upgraded to DocBook DSSSL Stylesheets v1.79
+  * Upgraded to DocBook XML DTD v4.5
+  * Upgraded to DocBook XSL Stylesheets v1.72.0 & docs
+  * Added AsciiDoc v8.2.1
+  * Added xmlto v0.0.18
+  * Removed unused build script code cruft from linuxdoc-tools.build 
+  * Re-ordered the build script since OpenSP v1.5.2 requires xmlto,
+    and xmlto requires the docbook stuff to be installed.
+  * Removed buildDocBookCatalog script.  If you delete your system's SGML or XML
+    catalog scripts, thinking that this script can repopulate them, it won't.
+    If you're adding docbook data to your system, you need to read the docs that
+    come with the new data you're installing.
+  * Thanks to Red Hat for the loan of a laptop on which to test this build ;-)
+
+Sat Oct 01 2005
+  * Previous releases
diff --git a/source/ap/linuxdoc-tools/arm/build b/source/ap/linuxdoc-tools/arm/build
new file mode 100755
index 000000000..d59da3271
--- /dev/null
+++ b/source/ap/linuxdoc-tools/arm/build
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# armel/build
+# Check package dependencies, set metadata and launch
+# package build script.
+# by Stuart Winter <stuart@armedslack.org>
+#
+source /usr/share/slackdev/buildkit.sh
+
+# Package metadata:
+export PKGNAM=linuxdoc-tools
+export VERSION=${VERSION:-0.9.56}
+export PKGARCH=${PKGARCH:-arm}
+export BUILD=${BUILD:-1}
+export PKGSERIES=${PKGSERIES:-ap}
+export SLACKPACKAGE=$PKGNAM-$VERSION-$PKGARCH-$BUILD.tgz
+export PKGEXT=${PKGEXT:-tgz}
+
+# Ensure base ARM packages are installed first:
+slackbasedeps
+
+# Ensure $PKGNAM isn't already installed:
+slackfailpkgdeps $PKGNAM || removepkg $PKGNAM
+
+# Ensure specific build dependencies - libraries and development tools.
+# There are many more dependencies but these are the core ones I picked out
+# as I was building the software included within this package.
+#
+#slackcheckpkgdeps libxml2 || installpkg $PKGSTORE/l/libxml2-*.tgz
+# to unpack some SRPMs:
+#slackcheckpkgdeps rpm     || installpkg $PKGSTORE/ap/rpm-*.tgz
+# for OpenJade:
+#slackcheckpkgdeps tetex   || installpkg $PKGSTORE/t/tetex-[0-9]*.tgz
+# for AsciiDoc:
+#slackcheckpkgdeps python  || installpkg $PKGSTORE/d/python-[0-9]*.tgz
+# Ensure the packages are installed; exit if not.
+#slackcheckpkgdeps python,libxml2,rpm,tetex || exit 99
+
+# Stop daemons/processes which tend to modify the contents of the filesystem:
+altertrackprep
+
+# Launch the package build script:
+BUILDLOG=$( basename $SLACKPACKAGE .tgz ).build.log
+# ( ./$PKGNAM.SlackBuild ) >& /dev/stdout | tee $BUILDLOG
+( ./trackbuild.$PKGNAM ) >& /dev/stdout | tee $BUILDLOG
+
+# Compress the build log:
+bzip2 -9f $BUILDLOG
diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild b/source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild
new file mode 100755
index 000000000..7c2f20540
--- /dev/null
+++ b/source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild
@@ -0,0 +1 @@
+./trackbuild.linuxdoc-tools
diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build
new file mode 100755
index 000000000..8d28ea332
--- /dev/null
+++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build
@@ -0,0 +1,946 @@
+#!/bin/bash
+
+###############################################################################
+# Script:  linuxdoc-tools.build
+# Purpose: Build & install all components that form the linuxdoc-tools
+#          Slackware Package.
+# Credit:  written by Stuart Winter <mozes@slackware.com>
+#          with the docbook build code by Jerome Pinot <ngc891@gmail.com>
+#          and some script code taken from Debian, Red Hat/Fedora &
+#          Linux From Scratch documentation
+#          http://www.linuxfromscratch.org/blfs/view/svn/index.html
+#          http://cblfs.cross-lfs.org/index.php/Category:DocBook_SGML
+#          Thanks guys! :-)
+###############################################################################
+
+# Version of LDT (which is also the .t?z package version)
+LINUXDOCTOOLSVER=0.9.56
+
+# Bundled package versions:
+SGMLDTD3VER=3.1
+SGMLDTD4VER=4.5
+XMLDTDVER=4.5
+XSLSTYLESHEETSVER=1.75.1
+DSSSLSTYLESHEETSVER=1.79
+SGMLCOMMONVER=0.6.3
+OPENJADEVER=1.3.3-pre1
+OPENSPVER=1.5.2
+GNOMEDOCUTILSVER=0.17.2
+GTKDOCVER=1.11
+SGMLSPLVER=1.03ii
+XMLTOVER=0.0.22
+ASCIIDOCVER=8.4.5
+DOCBOOKUTILSVER=0.6.14
+
+# Determine the general CFLAGS for the known architectures:
+case $ARCH in
+  arm)     export SLKCFLAGS="-O2 -march=armv4t"
+           export LIBDIRSUFFIX=""
+           export HOSTTARGET="-gnueabi"
+           ;;
+  i486)    export SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+           export LIBDIRSUFFIX=""
+           export HOSTTARGET=""
+           ;;
+  s390)    export SLKCFLAGS="-O2"
+           export LIBDIRSUFFIX=""
+           export HOSTTARGET=""
+           ;;
+  x86_64)  export SLKCFLAGS="-O2 -fPIC"
+           export LIBDIRSUFFIX="64"
+           export HOSTTARGET=""
+           ;;
+esac
+
+# The build order is purposive.
+# The build order for the XML style sheets & docbook stuff comes from
+# the Linux from Scratch documentation; the other rest is because of
+# dependency build order.
+
+####################### Build AsciiDoc ##############################
+
+# Extract source:
+cd $TMP
+tar xvf $CWD/sources/asciidoc-$ASCIIDOCVER.tar.gz || exit 1
+cd asciidoc-$ASCIIDOCVER
+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:
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --docdir=/usr/doc/asciidoc-$ASCIIDOCVER \
+  --mandir=/usr/man || exit 1
+
+# Install:
+make install && make docs || exit 1
+find /etc/asciidoc -type f -print0 | xargs -0 chmod 644
+
+# Copy docs:
+mkdir -vpm755 /usr/doc/asciidoc-$ASCIIDOCVER
+cp -fav \
+  BUGS CHANGELOG COPY* README \
+  /usr/doc/asciidoc-$ASCIIDOCVER/
+
+####################### Build sgml-common ############################
+
+# Extract source.  We're using a source RPM since it contains a number of
+# patches that we need:
+cd $TMP
+rpm2tgz $CWD/sources/sgml-common-${SGMLCOMMONVER}*.src.rpm
+tar xvf sgml-common-*src.tgz 
+cd sgml-common-$SGMLCOMMONVER-* || exit 1
+# The real source archive is stored inside the source RPM, you see:
+tar xvf sgml-common-$SGMLCOMMONVER.tgz || exit 1
+cd sgml-common-$SGMLCOMMONVER
+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 {} \;
+
+# Apply patches (these are included in the source rpm):
+for i in \
+  sgml-common-0.6.3-docdir.patch \
+  sgml-common-automake.patch \
+  sgml-common-quotes.patch \
+  sgml-common-umask.patch ; do
+    patch --verbose -p1 < ../$i
+done || exit 1
+
+# Configure:
+#aclocal
+#automake --add-missing --copy
+autoreconf -vif
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --with-docdir=/usr/doc \
+  --sysconfdir=/etc \
+  || exit 1
+
+# Build & install:
+make -e 'mkdir_p=mkdir -p' install || exit 1
+
+# Create catalog:
+install-catalog --add /etc/sgml/sgml-ent.cat \
+  /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+install-catalog --add /etc/sgml/sgml-docbook.cat \
+  /etc/sgml/sgml-ent.cat
+
+# Copy docs:
+mkdir -vpm755 /usr/doc/sgml-common-$SGMLCOMMONVER
+cp -fav \
+  COPYING AUTHORS INSTALL NEWS README ChangeLog ../sgml-common-CHANGES \
+  /usr/doc/sgml-common-$SGMLCOMMONVER
+
+####################### Install docbooks ############################
+
+# Extract source:
+cd $TMP
+mkdir sgml-dtd
+cd sgml-dtd
+# Debian handily package all docbooks past and present in one archive
+# but they version number the archive with the latest version.
+tar xvf $CWD/sources/docbook_*orig*.tar.gz 
+cd docbook* || exit 1
+zcat $CWD/sources/docbook_*.diff.gz | patch -p1 || exit 1
+# Don't apply the patches because whilst I know that the problem we have
+# on Slackware does not exist on Debian, I want to keep the Slackware 
+# build in line with Linux From Scratch, since their documentation is
+# excellent.
+#for i in debian/patches/*.dpatch ; do patch --verbose -p1 < $i ; done
+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 {} \;
+
+
+###############
+## sgml-dtd3 ##
+###############
+
+( cd docbook-$SGMLDTD3VER
+
+ # Remove the ENT definitions from the catalog file:
+  sed -i -e '/ISO 8879/d' docbook.cat
+ # Replace the DTDDECL catalog entry, which is not supported by Linux SGML tools,
+ # with the SGMLDECL catalog entry
+  sed -i -e 's|DTDDECL "-//OASIS//DTD Docbook V3.1//EN"|SGMLDECL|g' docbook.cat
+
+  # Install:
+  mkdir -vpm755 /etc/sgml
+   mkdir -vpm755 /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD3VER
+   install -vpm644 docbook.cat /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD3VER/catalog
+   install -vpm644 *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD3VER/
+
+   # Update SGML catalog:
+   install-catalog --add /etc/sgml/sgml-docbook-dtd-$SGMLDTD3VER.cat \
+     /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD3VER/catalog 
+   install-catalog --add /etc/sgml/sgml-docbook-dtd-$SGMLDTD3VER.cat \
+     /etc/sgml/sgml-docbook.cat
+
+# Use only the most current 3.x version of DocBook SGML DTD:
+cat >> /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD3VER/catalog << "EOF"
+  -- Begin Single Major Version catalog changes --
+
+PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
+
+  -- End Single Major Version catalog changes --
+EOF
+
+  # Copy docs:
+  mkdir -vpm755 /usr/doc/sgml-dtd-$SGMLDTD3VER
+  cp -fav \
+    ChangeLog *.txt \
+    /usr/doc/sgml-dtd-$SGMLDTD3VER/  
+)
+
+###############
+## sgml-dtd4 ##
+###############
+# For reference:
+# http://cblfs.cross-lfs.org/index.php/DocBook_SGML_DTD-4.x
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/sgml-dtd.html
+
+
+( cd docbook-$SGMLDTD4VER
+
+  # Remove the ENT definitions from the catalog file:
+  sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat
+
+  # Install:
+  mkdir -vpm755 /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER
+  install -vpm644 docbook.cat /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER/catalog
+  cp -fav *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER
+  # Update SGML catalog:
+  install-catalog --add /etc/sgml/sgml-docbook-dtd-$SGMLDTD4VER.cat \
+    /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER/catalog 
+  install-catalog --add /etc/sgml/sgml-docbook-dtd-$SGMLDTD4VER.cat \
+    /etc/sgml/sgml-docbook.cat
+
+  # Use only the most current 4.x version of DocBook SGML DTD :
+  # When you upgrade sgml-dtd4, put the PREVIOUS version number in
+  # with the lines below.
+cat << EOF >> /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER/catalog
+  -- Begin Single Major Version catalog changes --
+EOF
+for i in 4.4 4.3 4.2 4.1 4.0; do
+cat << EOF >> /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER/catalog
+PUBLIC "-//OASIS//DTD DocBook V${i}//EN" "docbook.dtd"
+EOF
+done
+cat << EOF >> /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER/catalog
+
+  -- End Single Major Version catalog changes --
+EOF
+
+  # Copy docs:
+  mkdir -vpm755 /usr/doc/sgml-dtd4-$SGMLDTD4VER
+  cp -fav \
+    ChangeLog README \
+    /usr/doc/sgml-dtd4-$SGMLDTD4VER/
+
+)
+
+####################### Build OpenSP ############################
+
+# Extract source:
+cd $TMP
+rpm2tgz $CWD/sources/opensp-${OPENSPVER}*.src.rpm 
+tar xvf opensp*src.tgz 
+cd opensp-${OPENSPVER}* || exit 1
+tar xvf OpenSP-$OPENSPVER.tar.gz || exit 1
+cd OpenSP-$OPENSPVER
+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 {} \;
+
+sed -i 's:32,:253,:' lib/Syntax.cxx
+sed -i 's:LITLEN          240 :LITLEN          8092:' unicode/{gensyntax.pl,unicode.syn}
+
+# Stop OpenJade from segfaulting:
+patch --verbose -p1 < ../opensp-sigsegv.patch || exit 1
+
+# Configure without optimisation.  OpenSP & OpenJade
+# are sensitive to optimisations, resulting in segfaults,
+# particularly on the ARM platform.
+#
+# This is configured not to build the documentation.  If anybody really needs
+# it, let me know and I'll adjust the build script - it's just a PITA to
+# get working.
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --datadir=/usr/share \
+  --infodir=/usr/info \
+  --disable-dependency-tracking \
+  --disable-static \
+  --disable-doc-build \
+  --enable-http \
+  --enable-default-catalog=/etc/sgml/catalog \
+  --enable-default-search-path=/usr/share/sgml \
+  || exit 1
+
+# Build:
+make pkgdatadir=/usr/share/sgml/OpenSP-$OPENSPVER || exit 1
+
+# Install:
+make install DESTDIR=/ || exit 1
+
+# This allows OpenJade to link with OpenSP.
+( cd /usr/lib${LIBDIRSUFFIX} && ln -vsf libosp.so libsp.so )
+
+# Rename sx to sgml2xml & create symlinks:
+mv -f /usr/bin/osx /usr/bin/osgml2xml
+( cd /usr/bin ; ln -vfs osgml2xml osx )
+mv -f /usr/man/man1/osx.1 /usr/man/man1/osgml2xml.1
+( cd /usr/man/man1 ; ln -vfs osgml2xml.1 osx.1 )
+
+# Create symlinks to binaries:
+( cd /usr/bin
+  for file in nsgmls sgmlnorm spam spent sgml2xml ; do
+     rm -f $file
+     ln -vfs o$file $file
+  done
+)
+
+# Fix man pages:
+( cd /usr/man/man1
+  for file in nsgmls sgmlnorm spam spent sgml2xml ; do
+     rm -f ${file}.1*
+     ln -vfs o${file}.1 ${file}.1 
+  done
+)
+
+# Rename docs directory:
+mv -fv /usr/doc/OpenSP /usr/doc/OpenSP-$OPENSPVER
+
+####################### Build OpenJade ############################
+# Reference:
+#  http://cblfs.cross-lfs.org/index.php/OpenJade
+
+# Extract source:
+cd $TMP
+tar xvf $CWD/sources/openjade-${OPENJADEVER}.tar.gz
+cd openjade-${OPENJADEVER} || 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 {} \;
+
+# Apply patches:
+sed -i "s/iostream.h/iostream/g" style/MultiLineInlineNote.cxx
+
+# Configure without optimisation.
+# OpenSP & OpenJade are sensitive to optimisations and can result
+# in segfaults with anything other than O2 - particularly on the ARM
+# platform.
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --enable-splibdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-static \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-static \
+  --enable-http \
+  --enable-default-catalog=/etc/sgml/catalog \
+  --enable-default-search-path=/usr/share/sgml \
+  --datadir=/usr/share/sgml/openjade-$OPENJADEVER \
+  || exit 1
+
+# Build:
+make || exit 1
+
+# Install:
+mkdir -p /etc/sgml
+make install || exit 1
+make install-man || exit 1
+( cd /usr/bin && ln -vfs openjade jade )
+( cd /usr/man/man1 && ln -vfs openjade.1 jade.1 )
+ln -vsf libogrove.so /usr/lib${LIBDIRSUFFIX}/libgrove.so
+ln -vsf libospgrove.so /usr/lib${LIBDIRSUFFIX}/libspgrove.so
+ln -vsf libostyle.so /usr/lib${LIBDIRSUFFIX}/libstyle.so
+install -vpm644 dsssl/catalog /usr/share/sgml/openjade-$OPENJADEVER
+install -vpm644 dsssl/*.{dtd,dsl,sgm} /usr/share/sgml/openjade-$OPENJADEVER
+
+# Update SGML catalog:
+install-catalog --add /etc/sgml/openjade-$OPENJADEVER.cat \
+  /usr/share/sgml/openjade-$OPENJADEVER/catalog
+install-catalog --add /etc/sgml/sgml-docbook.cat \
+  /etc/sgml/openjade-$OPENJADEVER.cat
+
+# Update system configuration:
+echo "SYSTEM \"http://www.oasis-open.org/docbook/xml/${XMLDTDVER}/docbookx.dtd\" \
+    \"/usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/docbookx.dtd\"" >> \
+    /usr/share/sgml/openjade-${OPENJADEVER}/catalog
+
+# Copy docs:
+mkdir -vpm755 /usr/doc/openjade-$OPENJADEVER
+cp -fav \
+  COPYING NEWS README VERSION \
+  doc/* dsssl/README.jadetex pubtext jadedoc unicode \
+  /usr/doc/openjade-$OPENJADEVER
+
+# The original package has this file, but it has most of the world's
+# documentation too; we'll leave it in for the time being but I don't like it.
+#rm -f /usr/doc/openjade-$OPENJADEVER/doc/Makefile
+
+####################### Build dsssl-stylesheets ####################
+
+# Extract source:
+cd $TMP
+mkdir docbook-dsssl-$DSSSLSTYLESHEETSVER
+cd docbook-dsssl-$DSSSLSTYLESHEETSVER
+tar xvf $CWD/sources/docbook-dsssl-$DSSSLSTYLESHEETSVER.tar.bz2 || exit 1
+tar xvf $CWD/sources/docbook-dsssl-doc-$DSSSLSTYLESHEETSVER.tar.bz2 || exit 1
+cd docbook-dsssl-$DSSSLSTYLESHEETSVER
+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 {} \;
+
+# Install:
+install -pm755 bin/collateindex.pl /usr/bin
+install -pm644 bin/collateindex.pl.1 /usr/man/man1
+# Eeek!  Debian trim this down but we'll leave it for the moment:
+mkdir -vpm755 /usr/share/sgml/docbook/dsssl-stylesheets-$DSSSLSTYLESHEETSVER/common
+cp -fav * /usr/share/sgml/docbook/dsssl-stylesheets-$DSSSLSTYLESHEETSVER
+
+# Update catalog:
+install-catalog --add /etc/sgml/dsssl-docbook-stylesheets.cat \
+  /usr/share/sgml/docbook/dsssl-stylesheets-$DSSSLSTYLESHEETSVER/catalog
+install-catalog --add /etc/sgml/dsssl-docbook-stylesheets.cat \
+  /usr/share/sgml/docbook/dsssl-stylesheets-$DSSSLSTYLESHEETSVER/common/catalog
+install-catalog --add /etc/sgml/sgml-docbook.cat \
+  /etc/sgml/dsssl-docbook-stylesheets.cat
+
+# Copy docs:
+mkdir -vpm755 /usr/doc/dsssl-stylesheets-$DSSSLSTYLESHEETSVER
+cp -fav \
+  WhatsNew VERSION RELEASE-NOTES.txt README ChangeLog BUGS \
+  /usr/doc/dsssl-stylesheets-$DSSSLSTYLESHEETSVER
+cp -fav \
+  frames/README \
+  /usr/doc/dsssl-stylesheets-$DSSSLSTYLESHEETSVER/README.frames
+
+####################### Build docbook-utils ########################
+
+# docbook-utils requires some of the docbook docs to be installed
+# prior to being built.
+
+# Extract source:
+cd $TMP
+rpm2tgz $CWD/sources/docbook-utils-${DOCBOOKUTILSVER}*.src.rpm
+tar xvf docbook-utils-*src.tgz 
+cd docbook-utils-${DOCBOOKUTILSVER}* || exit 1
+tar xvf docbook-utils-$DOCBOOKUTILSVER.tar.gz || exit 1
+cd docbook-utils-$DOCBOOKUTILSVER
+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 {} \;
+
+# Apply patches:
+for i in \
+  docbook-utils-2ndspaces.patch \
+  docbook-utils-grepnocolors.patch \
+  docbook-utils-spaces.patch \
+  docbook-utils-w3mtxtconvert.patch ; do
+ patch --verbose -p1 < ../$i
+done || exit 1
+
+# Configure:
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  || exit 1
+
+# Build:
+make || exit 1
+
+# Install:
+make install htmldir=/usr/doc/docbook-utils-$DOCBOOKUTILSVER/html || exit 1
+
+# db2html is not just a symlink, as it has to create the output directory:
+rm -f /usr/bin/db2html
+install -vpm755 ../db2html /usr/bin
+install -vpm644 ../gdp-both.dsl /usr/share/sgml/docbook/utils-$DOCBOOKUTILSVER/docbook-utils.dsl
+
+# Make binary symlinks:
+( cd /usr/bin
+  for util in dvi html pdf ps rtf ; do
+     rm -f db2$util
+     ln -vfs docbook2$util db2$util
+  done
+)
+
+# Make man page symlinks:
+( cd /usr/man/man1
+  for util in dvi html pdf ps rtf ; do
+     rm -f db2$util.1*
+     ln -vfs jw.1 db2$util.1
+  done
+)
+
+# Copy docs:
+mkdir -vpm755 /usr/doc/docbook-utils-$DOCBOOKUTILSVER
+cp -fav \
+  AUTHORS NEWS README TODO \
+  /usr/doc/docbook-utils-$DOCBOOKUTILSVER
+
+############################
+## xml-dtd / docbook-xml  ##
+############################
+
+# Extract source:
+cd $TMP
+mkdir xml-dtd-$XMLDTDVER
+cd xml-dtd-$XMLDTDVER
+unzip $CWD/sources/docbook-xml-$XMLDTDVER.zip || 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 {} \;
+
+# Install 4.x catalog:
+mkdir -vpm755 /usr/share/xml/docbook/xml-dtd-$XMLDTDVER
+cp -fav docbook.cat *.dtd *.mod ent/ \
+  /usr/share/xml/docbook/xml-dtd-$XMLDTDVER
+
+# Use the Unicode-4 entities from sgml-common to fix errors such as 
+# "1D6C2" is not a character number in the document character set
+( cd /usr/share/xml/docbook/xml-dtd-$XMLDTDVER/ent
+  rm -fv isogrk4.ent
+  ln -vfs ../../../../sgml/xml-iso-entities-*.*/ISOgrk4.ent isogrk4.ent )
+
+# Create config files:
+mkdir -vpm755 /etc/xml
+
+# This code is taken directly from:
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/xml.html#DocBook
+#
+# Populate /etc/xml/docbook:
+#
+if [ ! -e /etc/xml/docbook ]; then
+    xmlcatalog --noout --create /etc/xml/docbook
+fi &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML V${XMLDTDVER}//EN" \
+    "http://www.oasis-open.org/docbook/xml/${XMLDTDVER}/docbookx.dtd" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML CALS Table Model V${XMLDTDVER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/calstblx.dtd" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/soextblx.dtd" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Information Pool V${XMLDTDVER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbpoolx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V${XMLDTDVER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbhierx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML HTML Tables V${XMLDTDVER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/htmltblx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Notations V${XMLDTDVER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbnotnx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Character Entities V${XMLDTDVER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbcentx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Additional General Entities V${XMLDTDVER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbgenent.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://www.oasis-open.org/docbook/xml/${XMLDTDVER}" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteURI" \
+    "http://www.oasis-open.org/docbook/xml/${XMLDTDVER}" \
+    "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}" \
+    /etc/xml/docbook
+
+#
+# Populate /etc/xml/catalog:
+#
+if [ ! -e /etc/xml/catalog ]; then
+    xmlcatalog --noout --create /etc/xml/catalog
+fi &&
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog &&
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook XML" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog
+
+# Rewrites for older docbooks.  This allows older docbooks to be referenced.
+# It means, however, that you __*shouldn't* have these older docbooks__
+# installed on your system;
+# so if you just keep the Slackware linuxdoc-tools package you'll be fine:
+#
+for DTDVERSION in 4.1.2 4.2 4.3 4.4
+do
+  xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \
+    /etc/xml/docbook
+  xmlcatalog --noout --add "rewriteSystem" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
+    "file:///usr/share/xml/docbook/xml-dtd-$XMLDTDVER" \
+    /etc/xml/docbook
+  xmlcatalog --noout --add "rewriteURI" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
+    "file:///usr/share/xml/docbook/xml-dtd-$XMLDTDVER" \
+    /etc/xml/docbook
+  xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog
+  xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
+    "file:///etc/xml/docbook" \
+    /etc/xml/catalog
+done
+
+# Copy docs:
+mkdir -pm755 /usr/doc/xml-dtd-$XMLDTDVER
+cp -favv \
+  ChangeLog README \
+  /usr/doc/xml-dtd-$XMLDTDVER
+
+###############################
+## docbook-xsl (stylesheets) ##
+###############################
+
+# Extract source:
+cd $TMP
+mkdir docbook-xsl-$XSLSTYLESHEETSVER
+cd docbook-xsl-$XSLSTYLESHEETSVER
+rpm2tgz $CWD/sources/docbook-style-xsl-${XSLSTYLESHEETSVER}*.src.rpm 
+tar xvf docbook-style-xsl*.tgz
+cd docbook-style-xsl-$XSLSTYLESHEETSVER* || exit 1
+tar xvf docbook-xsl-$XSLSTYLESHEETSVER.tar.bz2
+# This unpacks atop of the main tree:
+tar xvf docbook-xsl-doc-$XSLSTYLESHEETSVER.tar.bz2
+
+# Enter unpacked sources:
+cd docbook-xsl-$XSLSTYLESHEETSVER
+
+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 {} \;
+
+# Apply patches:
+for i in \
+  docbook-xsl-list-item-body.patch \
+  docbook-xsl-marginleft.patch \
+  docbook-xsl-newmethods.patch \
+  docbook-xsl-non-constant-expressions.patch \
+  docbook-xsl-pagesetup.patch ; do
+   patch --verbose -p1 < ../$i
+done || exit 1
+
+# Install:
+mkdir -vpm755 /usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER
+cp -fav \
+ VERSION common eclipse extensions fo highlighting html \
+ htmlhelp images javahelp lib manpages params profiling \
+ slides template tools website wordml xhtml             \
+ /usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER
+
+# Create config files:
+if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi
+if [ ! -f /etc/xml/catalog ]; then
+  xmlcatalog --noout --create /etc/xml/catalog
+fi
+
+# Configure system:
+xmlcatalog --noout --add "rewriteSystem" \
+  "http://docbook.sourceforge.net/release/xsl/$XSLSTYLESHEETSVER" \
+  "/usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \
+  /etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteURI" \
+  "http://docbook.sourceforge.net/release/xsl/$XSLSTYLESHEETSVER" \
+  "/usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \
+  /etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteSystem" \
+  "http://docbook.sourceforge.net/release/xsl/current" \
+  "/usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \
+  /etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteURI" \
+  "http://docbook.sourceforge.net/release/xsl/current" \
+  "/usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \
+  /etc/xml/catalog
+
+# Copy docs:
+mkdir -vpm755 /usr/doc/docbook-xsl-$XSLSTYLESHEETSVER
+cp -fav doc/* README* RELEASE-NOTES* NEWS* \
+         /usr/doc/docbook-xsl-$XSLSTYLESHEETSVER
+
+####################### Build xmlto ################################
+
+# Extract source:
+cd $TMP
+tar xvf $CWD/sources/xmlto-$XMLTOVER.tar.bz2 || exit 1
+cd xmlto-$XMLTOVER
+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:
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  || exit 1
+
+# Build:
+make || exit 1
+
+# Install:
+make install || exit 1
+
+# Copy docs:
+mkdir -vpm755 /usr/doc/xmlto-$XMLTOVER
+cp -fav \
+  AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README \
+  /usr/doc/xmlto-$XMLTOVER
+
+####################### Build SGMLSPL ##############################
+
+# Extract source:
+cd $TMP
+tar xvf $CWD/sources/libsgmls-perl_$SGMLSPLVER.orig.tar.gz || exit 1
+cd libsgmls-perl-$SGMLSPLVER.orig
+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/sources/libsgmls-perl_$SGMLSPLVER-*.diff.gz | patch -p1 || exit 1
+
+# Configure:
+perl Makefile.PL INSTALLDIRS=vendor || exit 1
+sed -i 's?/share/man?/man/?g' Makefile
+
+# Build:
+make OPTIMIZE="$SLKCFLAGS" || exit 1
+
+# Install:
+make install PREFIX=/usr
+sed 's?usr/share/doc/sgmls-doc/?usr/doc/sgmlspl-'"$SGMLSPLVER"'/?g' sgmlspl.1 > /usr/man/man1/sgmlspl.1
+
+# Copy docs:
+mkdir -vpm755 /usr/doc/sgmlspl-$SGMLSPLVER
+cp -fav \
+  BUGS COPYING README TODO \
+  /usr/doc/sgmlspl-$SGMLSPLVER
+cp -fav \
+  DOC/HTML/{SGMLSpm,sgmlspl} \
+  /usr/doc/sgmlspl-$SGMLSPLVER
+
+####################### Build linuxdoc-tools ########################
+
+# Extract source:
+cd $TMP
+#rpm2tgz $CWD/sources/linuxdoc-tools-${LINUXDOCTOOLSVER}*.src.rpm
+#tar xvf linuxdoc-tools-$LINUXDOCTOOLSVER*.tgz
+#cd linuxdoc-tools-$LINUXDOCTOOLSVER* || exit 1
+#tar xvf linuxdoc-tools_$LINUXDOCTOOLSVER.tar.gz
+tar xvf $CWD/sources/linuxdoc-tools_$LINUXDOCTOOLSVER*.tar.gz 
+cd linuxdoc-tools-$LINUXDOCTOOLSVER || 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 {} \;
+
+# Apply patches (these are included in the source rpm):
+#for i in \
+#  linuxdoc-tools-0.9.13-letter.patch \
+#  linuxdoc-tools-0.9.20-lib64.patch ; do
+#   patch --verbose -p1 < ../$i
+#done || exit 1
+# Add lib64 in Perl's path on a 64bit machine:
+patch --verbose -p1 < $CWD/sources/linuxdoc-tools.lib64.diff || exit 1
+
+# Find out what our Vendor perl directory is:
+eval $(perl '-V:installvendorlib')
+mkdir -p $PKG/$installvendorlib
+
+# Configure:
+./configure \
+  --prefix=/usr \
+  --with-perllibdir=$installvendorlib \
+  --mandir=/usr/man \
+  --with-installed-nsgmls \
+  --infodir=/usr/info \
+  || exit 1
+#  --with-installed-iso-entities \
+#  --with-texdir=/usr/share/texmf/tex/latex/ \
+
+# Adjust doc dir location:
+sed -i 's?share/doc/linuxdoc-tools?doc/linuxdoc-tools-'"$$LINUXDOCTOOLSVER"'?g' Makefile
+
+#( cd entity-map && autoconf && ./configure )
+
+# Build serial.  This does build in parallel but
+# I find linuxdoc-tools to be fragile between versions:
+make \
+   perl5libdir=$PKG/$installvendorlib \
+   OPTIMIZE="$SLKCFLAGS" \
+   PERL=/usr/bin/perl \
+   DESTDIR=/ \
+   LINUXDOCDOC=/usr/doc/linuxdoc-tools-$LINUXDOCTOOLSVER || exit 1
+
+# Install:
+make install \
+   PERL=/usr/bin/perl \
+   perl5libdir=$PKG/$installvendorlib \
+   DESTDIR=/ \
+   LINUXDOCDOC=/usr/doc/linuxdoc-tools-$LINUXDOCTOOLSVER || exit 1
+
+# Install shell scripts for sgml2{txt,latex,info}
+for i in txt latex info; do \
+    install -vpm755 debian/addition/sgml2$$i \
+    /usr/bin/sgml2$$i; \
+done
+
+# Install info page:
+cat debian/linuxdoc-tools.info-base doc/guide.info > /usr/info/linuxdoc-sgml.info
+
+# This package contains a number of programs. 
+# We maintain our own change log for this package.  Since the package name is
+# 'linuxdoc-tools', let's put our changelog into here:
+install -vpm644 $CWD/ChangeLog.txt /usr/doc/linuxdoc-tools-$LINUXDOCTOOLSVER/Slackware-ChangeLog.txt
+
+####################### Build gnome-doc-utils #######################
+
+# Extract source:
+cd $TMP
+tar xvf $CWD/sources/gnome-doc-utils-$GNOMEDOCUTILSVER.tar.bz2 
+cd gnome-doc-utils-*
+
+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 \
+  --disable-scrollkeeper \
+  --build=$ARCH-slackware-linux$HOSTTARGET || exit 1
+
+# No parallel build here because it doesn't work:
+make || exit 1
+
+# Install:
+make install DESTDIR=/ || exit 1
+
+# Copy docs:
+mkdir -p $PKG/usr/doc/gnome-doc-utils-$GNOMEDOCUTILSVER
+cp -fav \
+  AUTHORS ChangeLog COPYING* INSTALL NEWS README \
+  /usr/doc/gnome-doc-utils-$GNOMEDOCUTILSVER
+
+####################### Build gtk-doc ###############################
+
+# Extract source:
+cd $TMP
+tar xvf $CWD/sources/gtk-doc-$GTKDOCVER.tar.bz2 || exit 1
+cd gtk-doc-$GTKDOCVER
+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:
+./configure \
+  --prefix=/usr \
+  --enable-public-id \
+  --disable-scrollkeeper \
+  || exit 1
+
+# Build:
+make || exit 1
+
+# Install:
+make install || exit 1
+
+# Copy docs:
+mkdir -vpm755 /usr/doc/gtk-doc-$GTKDOCVER
+cp -fav \
+  AUTHORS COPYING INSTALL MAINTAINERS NEWS README TODO \
+  /usr/doc/gtk-doc-$GTKDOCVER
+
+#######################################################################
+
+# Install the package description:
+rm -rf /install
+mkdir -vpm755 /install
+install -vpm644 $CWD/slack-desc /install
diff --git a/source/ap/linuxdoc-tools/postbuildfixes.sh b/source/ap/linuxdoc-tools/postbuildfixes.sh
new file mode 100755
index 000000000..b9e305eec
--- /dev/null
+++ b/source/ap/linuxdoc-tools/postbuildfixes.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# Once altertrack has determined what the contents of the package
+# should be, it copies them into $SLACKTRACKFAKEROOT
+# From here we can make modifications to the package's contents
+# immediately prior to the invocation of makepkg: altertrack will
+# do nothing else with the contents of the package after the execution
+# of this script.
+
+# If you modify anything here, be careful *not* to include the full
+# path name - only use relative paths (ie rm usr/bin/foo *not* rm /usr/bin/foo).
+
+# Enter the package's contents:
+cd $SLACKTRACKFAKEROOT
+
+# OpenSP creates this symlink; we delete it.
+if [ -L usr/share/doc ]; then
+   rm -f usr/share/doc
+fi
+
+# Incase you had CUPS running:
+rm -rf etc/cups etc/printcap
+# crond:
+rm -rf var/spool/cron
+rmdir var/spool
+
+# perllocal.pod files don't belong in packages.
+# SGMLSPL creates this:
+find . -name perllocal.pod -print0 | xargs -0 rm -f
+
+# Some doc dirs have attracted setuid.
+# We don't need setuid for anything in this package:
+chmod -R a-s .
+
+# Ensure some permissions.  
+# I don't know why but these dirs are installed chmod 1755:
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/pk/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/pk/ljfour/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/pk/ljfour/jknappen/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/pk/ljfour/jknappen/ec/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/source/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/source/jknappen/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/source/jknappen/ec/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/tfm/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/tfm/jknappen/
+#drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/tfm/jknappen/ec/
+#find var/lib/texmf -type d -print0 | xargs -0 chmod 755
+# This directory needs these permissions to permit pleb accounts to make
+# fonts:
+#chmod 1777 var/lib/texmf
+# 
+# Never mind: I think this stuff is surplus to requirements:
+rm -rf var/lib/texmf
+# Now to prevent deletion of anything else that lives in the package's '/var'
+rmdir var/lib
+rmdir var
+
+# There's no reason to include huge redundant documentation:
+cd usr/doc
+find . -name "*.txt" | while read docfile ; do
+  basedocname=$(echo $docfile | rev | cut -f 2- -d . | rev)
+  rm -fv ${basedocname}.{html,pdf,xml}
+  rm -fv docbook-xsl*/reference.pdf.gz
+done
+
+# Now you should manually extract the .tgz 
+# - check through the install/doinst.sh script;
+# - check the contents, permissions and ownerships in the package archive.
diff --git a/source/ap/linuxdoc-tools/slack-desc b/source/ap/linuxdoc-tools/slack-desc
new file mode 100644
index 000000000..3b9eec9fb
--- /dev/null
+++ b/source/ap/linuxdoc-tools/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------------------------------------------------------|
+linuxdoc-tools: linuxdoc-tools (utilities for working with DocBook and SGML)
+linuxdoc-tools:
+linuxdoc-tools: SGML stands for Standard Generalized Markup Language.  This is a
+linuxdoc-tools: system which allows you to produce LaTeX, HTML, GNU info, LyX, RTF,
+linuxdoc-tools: and plain text (via groff) from a single source file in SGML.  It is
+linuxdoc-tools: often used for technical software documentation, such as the Linux
+linuxdoc-tools: HOWTO documents.  
+linuxdoc-tools:
+linuxdoc-tools: This package includes everything you need to use SGML -- all of the
+linuxdoc-tools: standard SGML tools; OpenJade; tools for working with DocBook
+linuxdoc-tools: documents (various DTDs); xmlto and AsciiDoc.
diff --git a/source/ap/linuxdoc-tools/sources/docbook_4.5-4.diff b/source/ap/linuxdoc-tools/sources/docbook_4.5-4.diff
new file mode 100644
index 000000000..1993d3f62
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/docbook_4.5-4.diff
@@ -0,0 +1,1589 @@
+--- docbook-4.5.orig/debian/patches/00list
++++ docbook-4.5/debian/patches/00list
+@@ -0,0 +1,4 @@
++01_remove_entity_sets_and_dcl_from_catalogs
++10_fix_101779_mention_artheader_to_articleinfo_change
++11_fix_dbpoolx_mod_header_comment_pubid
++12_fix_256119_and_turn_on_sgml_mode
+--- docbook-4.5.orig/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch
++++ docbook-4.5/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch
+@@ -0,0 +1,567 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 01_remove_entity_sets_and_dcl_from_catalogs.dpatch by
++##     Mark Eichin <eichin@kitten.gen.ma.us> and Adam Di Carlo <aph@debian.org>.
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: This patch:
++## DP: * removes all SGML declarations from the catalogs, for more info, see
++## DP:   debian/README.docbook.dcl
++## DP: * removes the ISO entity pointers since they are supplied by sgml-data
++## DP: * removes Public-IDs for DocBook XML
++## DP: * forces Public-ID rather than the System-ID in DTD declarations
++## DP:   (closes: <URL:http://bugs.debian.org/97330>)
++## DP:
++## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.4-1>
++## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-5>
++## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-2>
++## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion3.0-4>
++
++@DPATCH@
++diff -urNad docbook-4.5~/docbook-2.4.1/docbook.cat docbook-4.5/docbook-2.4.1/docbook.cat
++--- docbook-4.5~/docbook-2.4.1/docbook.cat	1996-04-16 08:53:16.000000000 +0200
+++++ docbook-4.5/docbook-2.4.1/docbook.cat	2007-03-09 16:39:46.000000000 +0100
++@@ -27,8 +27,13 @@
++   -- ...................................................................... --
++   -- SGML declaration associated with DocBook ............................. --
++ 
++-SGMLDECL "docbook.dcl"
++-DTDDECL "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dcl"
+++-- disabled, see README.docbook.dcl --
+++-- SGMLDECL "docbook.dcl" --
+++-- DTDDECL "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dcl" --
+++
+++  -- ...................................................................... --
+++  -- Prefer PUBID to SYSID ................................................ --
+++OVERRIDE YES
++ 
++   -- ...................................................................... --
++   -- DocBook driver file .................................................. --
++@@ -43,28 +48,5 @@
++ PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V2.4.1//EN" "dbhier.mod"
++ PUBLIC "-//Davenport//ELEMENTS DocBook Additional General Entities//EN" "dbgenent.mod"
++ 
++-  -- ...................................................................... --
++-  -- ISO entity sets ...................................................... --
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
++-
++   -- End of DocBook catalog data V2.4.1 ................................... --
++   -- ...................................................................... --
++diff -urNad docbook-4.5~/docbook-3.0/docbook.cat docbook-4.5/docbook-3.0/docbook.cat
++--- docbook-4.5~/docbook-3.0/docbook.cat	1996-12-10 16:35:22.000000000 +0100
+++++ docbook-4.5/docbook-3.0/docbook.cat	2007-03-09 16:44:17.000000000 +0100
++@@ -27,7 +27,12 @@
++   -- ...................................................................... --

++   -- SGML declaration associated with DocBook ............................. --

++ 

++-DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"

+++-- disabled, see README.docbook.dcl --

+++-- DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl" --

+++

+++  -- ...................................................................... --

+++  -- Prefer PUBID to SYSID ................................................ --

+++OVERRIDE YES

++ 

++   -- ...................................................................... --

++   -- DocBook driver file .................................................. --

++@@ -42,28 +47,5 @@
++ PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"

++ PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"

++ 

++-  -- ...................................................................... --

++-  -- ISO entity sets ...................................................... --

++-

++-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"

++-

++   -- End of catalog data for DocBook V3.0 ................................. --

++   -- ...................................................................... --

++diff -urNad docbook-4.5~/docbook-3.1/docbook.cat docbook-4.5/docbook-3.1/docbook.cat
++--- docbook-4.5~/docbook-3.1/docbook.cat	1999-02-02 06:53:32.000000000 +0100
+++++ docbook-4.5/docbook-3.1/docbook.cat	2007-03-09 16:44:12.000000000 +0100
++@@ -19,7 +19,12 @@
++   -- ...................................................................... --

++   -- SGML declaration associated with DocBook ............................. --

++ 

++-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"

+++-- disabled, see README.docbook.dcl --

+++-- DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl" --

+++

+++  -- ...................................................................... --

+++  -- Prefer PUBID to SYSID ................................................ --

+++OVERRIDE YES

++ 

++   -- ...................................................................... --

++   -- DocBook driver file .................................................. --

++@@ -36,28 +41,5 @@
++ PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"

++ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"

++ 

++-  -- ...................................................................... --

++-  -- ISO entity sets ...................................................... --

++-

++-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"

++-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"

++-

++   -- End of catalog data for DocBook V3.1 ................................. --

++   -- ...................................................................... --

++diff -urNad docbook-4.5~/docbook-4.0/docbook.cat docbook-4.5/docbook-4.0/docbook.cat
++--- docbook-4.5~/docbook-4.0/docbook.cat	2000-05-18 21:27:28.000000000 +0200
+++++ docbook-4.5/docbook-4.0/docbook.cat	2007-03-09 16:45:08.000000000 +0100
++@@ -19,7 +19,12 @@
++   -- ...................................................................... --
++   -- SGML declaration associated with DocBook ............................. --
++ 
++-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
+++-- disabled, see README.docbook.dcl --
+++-- DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl" --
+++
+++  -- ...................................................................... --
+++  -- Prefer PUBID to SYSID ................................................ --
+++OVERRIDE YES
++ 
++   -- ...................................................................... --
++   -- DocBook driver file .................................................. --
++@@ -36,28 +41,5 @@
++ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
++ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod"
++ 
++-  -- ...................................................................... --
++-  -- ISO entity sets ...................................................... --
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
++-
++   -- End of catalog data for DocBook V4.0 ................................. --
++   -- ...................................................................... --
++diff -urNad docbook-4.5~/docbook-4.1/docbook.cat docbook-4.5/docbook-4.1/docbook.cat
++--- docbook-4.5~/docbook-4.1/docbook.cat	2000-06-19 16:50:28.000000000 +0200
+++++ docbook-4.5/docbook-4.1/docbook.cat	2007-03-09 16:53:00.000000000 +0100
++@@ -19,7 +19,12 @@
++   -- ...................................................................... --
++   -- SGML declaration associated with DocBook ............................. --
++ 
++-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
+++-- disabled, see README.docbook.dcl --
+++-- DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" --
+++
+++  -- ...................................................................... --
+++  -- Prefer PUBID to SYSID ................................................ --
+++OVERRIDE YES
++ 
++   -- ...................................................................... --
++   -- DocBook driver file .................................................. --
++@@ -36,28 +41,5 @@
++ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
++ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
++ 
++-  -- ...................................................................... --
++-  -- ISO entity sets ...................................................... --
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
++-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
++-
++   -- End of catalog data for DocBook V4.1 ................................. --
++   -- ...................................................................... --
++diff -urNad docbook-4.5~/docbook-4.2/docbook.cat docbook-4.5/docbook-4.2/docbook.cat
++--- docbook-4.5~/docbook-4.2/docbook.cat	2002-07-17 18:14:28.000000000 +0200
+++++ docbook-4.5/docbook-4.2/docbook.cat	2007-03-09 16:42:30.000000000 +0100
++@@ -22,9 +22,6 @@
++ PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
++        "docbook.dtd"
++ 
++-PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
++-       "docbookx.dtd"
++-
++   -- ...................................................................... --
++   -- DocBook modules ...................................................... --
++ 
++@@ -49,65 +46,5 @@
++ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
++        "dbcentx.mod"
++ 
++-  -- ...................................................................... --
++-  -- ISO entity sets ...................................................... --
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
++-       "iso-dia.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
++-       "iso-num.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
++-       "iso-pub.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
++-       "iso-tech.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
++-       "iso-lat1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
++-       "iso-lat2.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
++-       "iso-grk1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
++-       "iso-grk2.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
++-       "iso-grk3.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
++-       "iso-grk4.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
++-       "iso-amsa.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
++-       "iso-amsb.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
++-       "iso-amsc.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
++-       "iso-amsn.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
++-       "iso-amso.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
++-       "iso-amsr.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
++-       "iso-box.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
++-       "iso-cyr1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
++-       "iso-cyr2.gml"
++-
++   -- End of catalog data for DocBook V4.2 ................................. --
++   -- ...................................................................... --
++diff -urNad docbook-4.5~/docbook-4.3/docbook.cat docbook-4.5/docbook-4.3/docbook.cat
++--- docbook-4.5~/docbook-4.3/docbook.cat	2004-03-31 13:44:16.000000000 +0200
+++++ docbook-4.5/docbook-4.3/docbook.cat	2007-03-09 16:53:47.000000000 +0100
++@@ -22,9 +22,6 @@
++ PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
++        "docbook.dtd"
++ 
++-PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
++-       "docbookx.dtd"
++-
++   -- ...................................................................... --
++   -- DocBook modules ...................................................... --
++ 
++@@ -49,65 +46,5 @@
++ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN"
++        "dbcentx.mod"
++ 
++-  -- ...................................................................... --
++-  -- ISO entity sets ...................................................... --
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
++-       "iso-dia.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
++-       "iso-num.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
++-       "iso-pub.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
++-       "iso-tech.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
++-       "iso-lat1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
++-       "iso-lat2.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
++-       "iso-grk1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
++-       "iso-grk2.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
++-       "iso-grk3.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
++-       "iso-grk4.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
++-       "iso-amsa.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
++-       "iso-amsb.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
++-       "iso-amsc.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
++-       "iso-amsn.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
++-       "iso-amso.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
++-       "iso-amsr.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
++-       "iso-box.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
++-       "iso-cyr1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
++-       "iso-cyr2.gml"
++-
++   -- End of catalog data for DocBook V4.3 ................................. --
++   -- ...................................................................... --
++diff -urNad docbook-4.5~/docbook-4.4/docbook.cat docbook-4.5/docbook-4.4/docbook.cat
++--- docbook-4.5~/docbook-4.4/docbook.cat	2005-01-27 14:59:49.000000000 +0100
+++++ docbook-4.5/docbook-4.4/docbook.cat	2007-03-09 16:54:12.000000000 +0100
++@@ -22,9 +22,6 @@
++ PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
++        "docbook.dtd"
++ 
++-PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
++-       "docbookx.dtd"
++-
++   -- ...................................................................... --
++   -- DocBook modules ...................................................... --
++ 
++@@ -52,65 +49,5 @@
++ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
++        "dbcentx.mod"
++ 
++-  -- ...................................................................... --
++-  -- ISO entity sets ...................................................... --
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
++-       "iso-dia.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
++-       "iso-num.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
++-       "iso-pub.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
++-       "iso-tech.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
++-       "iso-lat1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
++-       "iso-lat2.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
++-       "iso-grk1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
++-       "iso-grk2.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
++-       "iso-grk3.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
++-       "iso-grk4.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
++-       "iso-amsa.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
++-       "iso-amsb.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
++-       "iso-amsc.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
++-       "iso-amsn.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
++-       "iso-amso.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
++-       "iso-amsr.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
++-       "iso-box.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
++-       "iso-cyr1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
++-       "iso-cyr2.gml"
++-
++   -- End of catalog data for DocBook V4.4 ................................. --
++   -- ...................................................................... --
++diff -urNad docbook-4.5~/docbook-4.5/docbook.cat docbook-4.5/docbook-4.5/docbook.cat
++--- docbook-4.5~/docbook-4.5/docbook.cat	2006-10-03 15:27:50.000000000 +0200
+++++ docbook-4.5/docbook-4.5/docbook.cat	2007-03-09 16:54:41.000000000 +0100
++@@ -22,9 +22,6 @@
++ PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
++        "docbook.dtd"
++ 
++-PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
++-       "docbookx.dtd"
++-
++   -- ...................................................................... --
++   -- DocBook modules ...................................................... --
++ 
++@@ -52,65 +49,5 @@
++ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
++        "dbcentx.mod"
++ 
++-  -- ...................................................................... --
++-  -- ISO entity sets ...................................................... --
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
++-       "iso-dia.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
++-       "iso-num.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
++-       "iso-pub.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
++-       "iso-tech.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
++-       "iso-lat1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
++-       "iso-lat2.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
++-       "iso-grk1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
++-       "iso-grk2.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
++-       "iso-grk3.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
++-       "iso-grk4.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
++-       "iso-amsa.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
++-       "iso-amsb.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
++-       "iso-amsc.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
++-       "iso-amsn.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
++-       "iso-amso.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
++-       "iso-amsr.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
++-       "iso-box.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
++-       "iso-cyr1.gml"
++-
++-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
++-       "iso-cyr2.gml"
++-
++   -- End of catalog data for DocBook V4.5 ................................. --
++   -- ...................................................................... --
+--- docbook-4.5.orig/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
++++ docbook-4.5/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
+@@ -0,0 +1,60 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 11_fix_dbpoolx_mod_header_comment_pubid.dpatch by Adam Di Carlo <aph@debian.org>
++##     and Daniel Leidert (dale) <daniel.leidert@wgdd.de>.
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: The header in dbpoolx.mod references a wrong Public-ID. This patch
++## DP: simply fixes the header comment.
++## DP:
++## DP: Reported upstream:
++## DP: <URL:http://sourceforge.net/tracker/index.php?func=detail&aid=1679712&group_id=21935&atid=384107>
++
++@DPATCH@
++diff -urNad docbook-4.5~/docbook-4.2/dbpoolx.mod docbook-4.5/docbook-4.2/dbpoolx.mod
++--- docbook-4.5~/docbook-4.2/dbpoolx.mod	2002-07-17 18:14:25.000000000 +0200
+++++ docbook-4.5/docbook-4.2/dbpoolx.mod	2007-03-10 08:31:23.000000000 +0100
++@@ -50,7 +50,7 @@
++      declaration that uses the public identifier shown below:
++ 
++      <!ENTITY % dbpool PUBLIC
++-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN"
+++     "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN"
++      "dbpoolx.mod">
++      %dbpool;
++ 
++diff -urNad docbook-4.5~/docbook-4.3/dbpoolx.mod docbook-4.5/docbook-4.3/dbpoolx.mod
++--- docbook-4.5~/docbook-4.3/dbpoolx.mod	2004-03-31 13:43:24.000000000 +0200
+++++ docbook-4.5/docbook-4.3/dbpoolx.mod	2007-03-10 08:31:49.000000000 +0100
++@@ -50,7 +50,7 @@
++      declaration that uses the public identifier shown below:
++ 
++      <!ENTITY % dbpool PUBLIC
++-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN"
+++     "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN"
++      "dbpoolx.mod">
++      %dbpool;
++ 
++diff -urNad docbook-4.5~/docbook-4.4/dbpoolx.mod docbook-4.5/docbook-4.4/dbpoolx.mod
++--- docbook-4.5~/docbook-4.4/dbpoolx.mod	2005-01-27 14:59:45.000000000 +0100
+++++ docbook-4.5/docbook-4.4/dbpoolx.mod	2007-03-10 08:32:00.000000000 +0100
++@@ -50,7 +50,7 @@
++      declaration that uses the public identifier shown below:
++ 
++      <!ENTITY % dbpool PUBLIC
++-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN"
+++     "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN"
++      "dbpoolx.mod">
++      %dbpool;
++ 
++diff -urNad docbook-4.5~/docbook-4.5/dbpoolx.mod docbook-4.5/docbook-4.5/dbpoolx.mod
++--- docbook-4.5~/docbook-4.5/dbpoolx.mod	2006-10-03 15:27:50.000000000 +0200
+++++ docbook-4.5/docbook-4.5/dbpoolx.mod	2007-03-10 08:32:10.000000000 +0100
++@@ -50,7 +50,7 @@
++      declaration that uses the public identifier shown below:
++ 
++      <!ENTITY % dbpool PUBLIC
++-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN"
+++     "-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
++      "dbpoolx.mod">
++      %dbpool;
++ 
+--- docbook-4.5.orig/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
++++ docbook-4.5/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
+@@ -0,0 +1,117 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 12_fix_256119_and_turn_on_sgml_mode.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Fixes broken element declarations by adding the tag omission characters
++## DP: for SGML and enable SGML features
++## DP: (closes: <URL:http://bugs.debian.org/256119>).
++## DP:
++## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.4-1>
++
++@DPATCH@
++diff -urNad docbook-4.5~/docbook-4.3/dbpoolx.mod docbook-4.5/docbook-4.3/dbpoolx.mod
++--- docbook-4.5~/docbook-4.3/dbpoolx.mod	2007-03-10 09:01:12.000000000 +0100
+++++ docbook-4.5/docbook-4.3/dbpoolx.mod	2007-03-10 09:01:13.000000000 +0100
++@@ -633,6 +633,9 @@
++ 
++ <!-- xml:base: base URI -->
++ 
+++<![%sgml.features;[
+++<!ENTITY % xml-base.attrib "">
+++]]>
++ <!ENTITY % xml-base.attrib
++ 	"xml:base	CDATA		#IMPLIED">
++ 
++diff -urNad docbook-4.5~/docbook-4.3/docbookx.dtd docbook-4.5/docbook-4.3/docbookx.dtd
++--- docbook-4.5~/docbook-4.3/docbookx.dtd	2004-03-31 13:43:20.000000000 +0200
+++++ docbook-4.5/docbook-4.3/docbookx.dtd	2007-03-10 09:01:13.000000000 +0100
++@@ -59,7 +59,7 @@
++ <!-- ...................................................................... -->
++ <!-- Enable SGML features ................................................. -->
++ 
++-<!ENTITY % sgml.features "IGNORE">
+++<!ENTITY % sgml.features "INCLUDE">
++ <![%sgml.features;[
++ <!ENTITY % xml.features "IGNORE">
++ ]]>
++diff -urNad docbook-4.5~/docbook-4.3/htmltblx.mod docbook-4.5/docbook-4.3/htmltblx.mod
++--- docbook-4.5~/docbook-4.3/htmltblx.mod	2004-03-31 13:43:24.000000000 +0200
+++++ docbook-4.5/docbook-4.3/htmltblx.mod	2007-03-10 09:01:13.000000000 +0100
++@@ -63,6 +63,9 @@
++   >
++ 
++ <!-- Does not contain lang or dir because they are in %common.attribs -->
+++<![%sgml.features;[
+++<!ENTITY % i18n "">
+++]]>
++ <!ENTITY % i18n
++  "xml:lang    NMTOKEN        #IMPLIED"
++   >
++@@ -92,11 +95,11 @@
++   "valign     (top|middle|bottom|baseline) #IMPLIED"
++   >
++ 
++-<!ELEMENT colgroup (col)*>
++-<!ELEMENT col      EMPTY>
++-<!ELEMENT tr       (th|td)+>
++-<!ELEMENT th       (%para.char.mix; | %tabentry.mix;)*>
++-<!ELEMENT td       (%para.char.mix; | %tabentry.mix;)*>
+++<!ELEMENT colgroup %ho; (col)*>
+++<!ELEMENT col      %ho; EMPTY>
+++<!ELEMENT tr       %ho; (th|td)+>
+++<!ELEMENT th       %ho; (%para.char.mix; | %tabentry.mix;)*>
+++<!ELEMENT td       %ho; (%para.char.mix; | %tabentry.mix;)*>
++ 
++ <!ATTLIST colgroup
++   %attrs;
++@@ -206,7 +209,7 @@
++     summary     CDATA          #IMPLIED
++     width       CDATA        #IMPLIED
++     border      CDATA        #IMPLIED
++-    rules       (none | groups | rows | cols | all)      #IMPLIED
+++    rules       CDATA        #IMPLIED
++     cellspacing CDATA        #IMPLIED
++     cellpadding CDATA        #IMPLIED
++     align       (left|center|right)   #IMPLIED
++diff -urNad docbook-4.5~/docbook-4.4/docbookx.dtd docbook-4.5/docbook-4.4/docbookx.dtd
++--- docbook-4.5~/docbook-4.4/docbookx.dtd	2005-01-27 14:59:45.000000000 +0100
+++++ docbook-4.5/docbook-4.4/docbookx.dtd	2007-03-10 09:01:13.000000000 +0100
++@@ -61,7 +61,7 @@
++ <!-- ...................................................................... -->
++ <!-- Enable SGML features ................................................. -->
++ 
++-<!ENTITY % sgml.features "IGNORE">
+++<!ENTITY % sgml.features "INCLUDE">
++ <![%sgml.features;[
++ <!ENTITY % xml.features "IGNORE">
++ ]]>
++diff -urNad docbook-4.5~/docbook-4.4/htmltblx.mod docbook-4.5/docbook-4.4/htmltblx.mod
++--- docbook-4.5~/docbook-4.4/htmltblx.mod	2005-01-27 14:59:45.000000000 +0100
+++++ docbook-4.5/docbook-4.4/htmltblx.mod	2007-03-10 09:01:13.000000000 +0100
++@@ -63,6 +63,9 @@
++   >
++ 
++ <!-- Does not contain lang or dir because they are in %common.attribs -->
+++<![%sgml.features;[
+++<!ENTITY % i18n "">
+++]]>
++ <!ENTITY % i18n
++  "xml:lang    NMTOKEN        #IMPLIED"
++   >
++@@ -92,11 +95,11 @@
++   "valign     (top|middle|bottom|baseline) #IMPLIED"
++   >
++ 
++-<!ELEMENT colgroup (col)*>
++-<!ELEMENT col      EMPTY>
++-<!ELEMENT tr       (th|td)+>
++-<!ELEMENT th       (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
++-<!ELEMENT td       (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+++<!ELEMENT colgroup %ho; (col)*>
+++<!ELEMENT col      %ho; EMPTY>
+++<!ELEMENT tr       %ho; (th|td)+>
+++<!ELEMENT th       %ho; (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+++<!ELEMENT td       %ho; (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
++ 
++ <!ATTLIST colgroup
++   %attrs;
+--- docbook-4.5.orig/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
++++ docbook-4.5/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
+@@ -0,0 +1,33 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 10_fix_101779_mention_artheader_to_articleinfo_change.dpatch by
++##     Adam Di Carlo <aph@debian.org>.
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: The removal of ArtHeader in 4.0 is not documented in ChangeLog. This
++## DP: patch fixes it (closes: <URL:http://bugs.debian.org/bug=101779>).
++## DP:
++## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-5>
++
++@DPATCH@
++diff -urNad docbook-4.5~/ChangeLog.upstream docbook-4.5/ChangeLog.upstream
++--- docbook-4.5~/ChangeLog.upstream	2007-03-09 14:36:17.000000000 +0100
+++++ docbook-4.5/ChangeLog.upstream	2007-03-14 19:35:01.000000000 +0100
++@@ -475,6 +475,7 @@
++ - Added synopsis markup for modern programming languages (e.g, object
++   oriented languages like Java, C++, and IDL)
++ - Renamed DocInfo to PrefaceInfo, ChapterInfo, AppendixInfo, etc.
+++  (and ArtHeader to ArticleInfo)
++ 
++ Other:
++ 
++diff -urNad docbook-4.5~/docbook-4.1/40chg.txt docbook-4.5/docbook-4.1/40chg.txt
++--- docbook-4.5~/docbook-4.1/40chg.txt	2000-06-19 16:50:28.000000000 +0200
+++++ docbook-4.5/docbook-4.1/40chg.txt	2007-03-14 19:34:21.000000000 +0100
++@@ -29,6 +29,7 @@
++ - Added synopsis markup for modern programming languages (e.g, object
++   oriented languages like Java, C++, and IDL)
++ - Renamed DocInfo to PrefaceInfo, ChapterInfo, AppendixInfo, etc.
+++  (and ArtHeader to ArticleInfo)
++ - Comment was renamed Remark
++ - InterfaceDefinition was removed
++ 
+--- docbook-4.5.orig/debian/examples/docbk.sgml
++++ docbook-4.5/debian/examples/docbk.sgml
+@@ -0,0 +1,2 @@
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook//EN">
++<book></book>
+--- docbook-4.5.orig/debian/examples/docbk42.sgml
++++ docbook-4.5/debian/examples/docbk42.sgml
+@@ -0,0 +1,2 @@
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
++<book></book>
+--- docbook-4.5.orig/debian/examples/docbk43.sgml
++++ docbook-4.5/debian/examples/docbk43.sgml
+@@ -0,0 +1,2 @@
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.3//EN">
++<book></book>
+--- docbook-4.5.orig/debian/examples/docbk44.sgml
++++ docbook-4.5/debian/examples/docbk44.sgml
+@@ -0,0 +1,2 @@
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN">
++<book></book>
+--- docbook-4.5.orig/debian/examples/docbk45.sgml
++++ docbook-4.5/debian/examples/docbk45.sgml
+@@ -0,0 +1,2 @@
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN">
++<book></book>
+--- docbook-4.5.orig/debian/examples/Makefile
++++ docbook-4.5/debian/examples/Makefile
+@@ -0,0 +1,22 @@
++SRCS	:= $(wildcard *.sgml)
++NSGMLS	:= $(shell if command -v onsgmls 2>/dev/null; then	 \
++			:					;\
++		   elif command -v nsgmls 2>/dev/null; then	 \
++			:					;\
++		   else						 \
++			echo "false"				;\
++			echo "warning: no nsgmls found" >&2	;\
++		   fi)
++
++NSGMLSARGS=
++
++.PHONY: validate
++validate:	$(addsuffix .nsgmls,$(SRCS))
++
++%.nsgmls   : %
++	$(NSGMLS) -E1 -wall $(NSGMLSARGS) -gues $<
++
++.PHONY: clean
++clean:
++	rm -f *.html *~
++
+--- docbook-4.5.orig/debian/control
++++ docbook-4.5/debian/control
+@@ -0,0 +1,33 @@
++Source: docbook
++Section: text
++Priority: optional
++Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
++Uploaders: Adam Di Carlo <aph@debian.org>, Daniel Leidert (dale) <daniel.leidert@wgdd.de>
++Build-Depends: debhelper (>= 4.1.31), dpatch
++Standards-Version: 3.7.2
++Homepage: http://www.oasis-open.org/docbook/sgml/
++XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/
++XS-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook/
++
++Package: docbook
++Architecture: all
++Depends: sgml-data (>= 1.5.0), ${misc:Depends}
++Conflicts: docbook-xml (<= 4.4-4)
++Suggests: psgml, docbook-dsssl, docbook-xml, docbook-defguide
++Description: standard SGML representation system for technical documents
++ DocBook is an SGML document type definition (DTD) that is well-suited
++ to books, articles, or reference documentation about technical
++ matters, systems, or software (although it is by no means limited to
++ these applications).  It has emerged as an open and standard DTD in the
++ software industry, and is used as the documentation system of choice
++ for many free software projects.
++ .
++ This package contains the SGML DTD for DocBook, which describes
++ the formal structure for documents following this format.  If you
++ wish to author DocBook documents using XML rather than SGML, use the
++ 'docbook-xml' package.  You will need other packages in order to edit
++ (psgml), validate (opensp) or format (docbook-xsl, docbook-dsssl)
++ DocBook documents.
++ .
++ This package includes the 2.4.1, 3.0, 3.1, 4.0, 4.1, 4.2, 4.3, 4.4 and
++ 4.5 versions of the DocBook SGML DTD.
+--- docbook-4.5.orig/debian/compat
++++ docbook-4.5/debian/compat
+@@ -0,0 +1 @@
++4
+--- docbook-4.5.orig/debian/watch
++++ docbook-4.5/debian/watch
+@@ -0,0 +1,4 @@
++# See uscan(1) for format
++
++version=3
++http://www.oasis-open.org/docbook/sgml/4\.([\d]+)/docbook-([\d\.]+).zip
+--- docbook-4.5.orig/debian/docbook.examples
++++ docbook-4.5/debian/docbook.examples
+@@ -0,0 +1 @@
++debian/examples/*
+--- docbook-4.5.orig/debian/changelog
++++ docbook-4.5/debian/changelog
+@@ -0,0 +1,362 @@
++docbook (4.5-4) unstable; urgency=low
++
++  * debian/control: Homepage field transition.
++    (Suggests): Added docbook-defguide.
++  * debian/docbook.postinst: Removed. Contains only pre-etch legacy stuff.
++  * debian/README.Debian: Removed or replaced references to non-existing
++    packages.
++  * debian/watch: Added watch file.
++
++ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Wed, 26 Sep 2007 21:21:26 +0200
++
++docbook (4.5-3) unstable; urgency=medium
++
++  * debian/control (Maintainer, Uploaders): Set the Debian XML/SGML team as
++    maintainer.
++  * debian/docbook.examples: Fixed examples location: will re-add them back
++    to the package.
++  * debian/rules: Removed bashisms (closes: #422114). Thanks to Sebastian
++    Dröge for the report.
++
++ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Thu, 03 May 2007 19:46:21 +0200
++
++docbook (4.5-2) unstable; urgency=low
++
++  * Upload to unstable.
++
++  [ Daniel Leidert ]
++  * debian/rules (get-orig-source): Make the target compatible with the "Best
++    Packaging Practices" reference.
++
++ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Sat, 14 Apr 2007 19:49:00 +0200
++
++docbook (4.5-1) experimental; urgency=low
++
++  * New upstream release DocBook SGML 4.5 added (closes: #413166).
++
++  [ Daniel Leidert ]
++  * catalog: Made latest DocBook SGML 4.5 the default (closes: #413304).
++  * debian/control: Added XS-Vcs-Browser and XS-Vcs-Svn fields.
++    (Build-Depends-Indep): Fixed debhelper build dependency to be listed in
++    Build-Depends.
++    (Build-Depends): Added dpatch.
++    (Uploaders): Added the Debian XML/SGML group and myself (closes: #358522).
++    (Standards-Version): Bump to latest standards version 3.7.2.
++    (Description): Added newly added DocBook version.
++  * debian/copyright: Updated the packaging and copyright information.
++  * debian/rules: Added get-orig-source and dpatch targets. Cleaned the file a
++    lot. The installation of files was moved from the external
++    install_docbook.sh script to dh_install calls. The .links, .install and
++    .sgmlcatalogs debhelper files are created by debian/rules itself (atm I
++    don't remove them in the clean target).
++    (binary-indep): Fixed the dh_installdocs call to include Adams
++    README.docbook.dcl, that was not included in the package.
++    (debian/docbook.install, debian/docbook.links): Made the dbgenent.mod
++    files config-files.
++  * debian/patches/00list: Added. Moved all existing changes to dpatch patches
++    and enabled them here.
++  * debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch: Added.
++  * debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch:
++    Added.
++  * debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch: Added.
++  * debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch: Added.
++  * debian/examples/docbk*.sgml: Added two new examples for DocBook 4.5 and
++    added the missing newlines to the existing examples.
++  * debian/docbook.examples: Added.
++  * debian/postinst: Renamed to docbook.postinst.
++  * debian/README.debian: Renamed to README.Debian.
++  * debian/install_docbook.sh: Removed. See debian/rules changes.
++  * debian/TODO: Removed (implemented the only item).
++  * debian/watch: Removed (empty).
++
++ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Sat, 10 Mar 2007 09:32:33 +0100
++
++docbook (4.4-1) unstable; urgency=low
++
++  * acknowledge NMU; closes: #301786
++  * new upstream version; closes: #339774
++  * docbook4{3,4}/docbookx.dtd: turn on SGML mode
++  * docbook4{3,4}: sync with dbpoolx.mod and htmltblx.mod from
++    docbook-xml; closes: #256119
++  * conflict with docbook-xml prior to 4.4-5, otherwise the 4.3 and 4.4
++    DTDs don't work
++  * docbook4.3 catalog: don't provide "-//OASIS//DTD DocBook XML V4.3//EN"
++  * add really basic docbook 4.2, 4.3, and 4.4 books to test with
++
++ -- Adam Di Carlo <aph@debian.org>  Thu, 25 May 2006 19:09:05 -0400
++
++docbook (4.3-1.1) unstable; urgency=high
++
++  * Non-maintainer upload.
++  * High-urgency upload for sarge-targetted RC bugfix.
++  * Drop use of symlinks for finding dangling links, as we can do the
++    same using a find command; thanks to Joey Hess for the patch.
++    Closes: #301786.
++
++ -- Steve Langasek <vorlon@debian.org>  Wed,  6 Apr 2005 11:24:24 -0700
++
++docbook (4.3-1) unstable; urgency=low
++
++  * new upstream version; closes: #243666
++  * make the usual array of minor corrections in upstream catalogs
++  * minor package description changes
++  * postinst legacy remove is more conditional and more robust; hopefully,
++    closes: #242833
++  * really don't register "-//OASIS//DTD DocBook XML V4.2//EN" in
++    catalog.xml
++
++ -- Adam Di Carlo <aph@debian.org>  Tue, 15 Jun 2004 22:15:02 -0400
++
++docbook (4.2-3) unstable; urgency=low
++
++  * stop providing "-//OASIS//DTD DocBook XML V4.2//EN", that is in the
++    docbook-xml package
++  * policy compliance updated to 3.5.8, no changes needed
++  * debhelper 4 compat mode
++  * use new dh_installcatalog, it simplifies our maintainer scripts
++  * remove build-depends on M4, we don't need to process maintainer
++    scripts anymore
++  * remove suggests on sp or jade or docbook-xml, add suggests for
++    docbook-dsssl and docbook-doc
++  * improve the package synopsis and description, add the Homepage
++  * stop using sgml-catalog-check.pl from sgml-data during build, the
++    /usr/share/sgml symlinking is no longer needed (SGML Policy update
++    pending)
++
++ -- Adam Di Carlo <aph@debian.org>  Tue, 25 Feb 2003 02:18:52 -0500
++
++docbook (4.2-2) unstable; urgency=low
++
++  * SGML catalogs should be named 'catalog' according to policy; retain
++    the 'docbook.cat' as a symlink in case anyone is using that directly
++
++ -- Adam Di Carlo <aph@debian.org>  Mon, 20 Jan 2003 04:44:52 -0500
++
++docbook (4.2-1) unstable; urgency=low
++
++  * new upstream version, closes: #155105
++  * latest DocBook version bumped to 4.2
++
++ -- Adam Di Carlo <aph@debian.org>  Wed,  7 Aug 2002 01:12:49 -0400
++
++docbook (4.1.99really4.2.cr1-2) unstable; urgency=low
++
++  * oops, remove ISO entity sets from docbook 4.2cr1 catalog
++  * minor typo in generalized.cat fixed
++
++ -- Adam Di Carlo <aph@debian.org>  Sun, 31 Mar 2002 01:40:26 -0500
++
++docbook (4.1.99really4.2.cr1-1) unstable; urgency=low
++
++  * new upstream version, pre-release of docbook 4.2;
++    note that docbook 4.1 is still considered the latest version and
++    latest 4.x version until 4.2 is actually released
++  * policy checked up to 3.5.6, no changes required
++  * disable DTDDECL in generalized.cat, I think this just slipped through
++  * debian/rules: some housekeeping
++
++ -- Adam Di Carlo <aph@debian.org>  Sun, 31 Mar 2002 01:28:04 -0500
++
++docbook (4.1-6) unstable; urgency=low
++
++  * another cut at the package description, hopefully it satisfies the
++    user; closes: #112021
++  * debian/rules: installing *everything* as documentation was not my
++    intention in the last release, fix that
++  * require sgml-data 1.5.3 or better, which calls an element an element
++    when making the creepy symlinks; closes: #51043
++
++ -- Adam Di Carlo <aph@debian.org>  Tue,  2 Oct 2001 03:06:21 -0400
++
++docbook (4.1-5) unstable; urgency=low
++
++  * all docbook catalog files now have "OVERRIDE YES", which forces the
++    PUBID rather than the SYSID in DTD declarations; closes: #97330
++  * correct upstream 40chg.txt to notate the change from ArtHeader to
++    ArticleInfo; closes: #101779
++  * README.Debian rewritten; closes: #106379
++  * it's apparently not nice to call dh_installdocs more than once per
++    package, so stop doing that; closes#98440
++
++ -- Adam Di Carlo <aph@debian.org>  Tue,  2 Oct 2001 01:49:30 -0400
++
++docbook (4.1-4) unstable; urgency=low
++
++  * debian/rules: re-work fix for files in debian not preserving execute
++    bit
++    closes: #90627
++
++ -- Adam Di Carlo <aph@debian.org>  Sun,  8 Apr 2001 14:37:42 -0400
++
++docbook (4.1-3) unstable; urgency=low
++
++  * debian/control: build-depends-indep includes m4
++  * debian/rules: cope with my local CVS not preserving executable bit,
++    making the source unbuildable
++    closes: #90627
++
++ -- Adam Di Carlo <aph@debian.org>  Thu, 22 Mar 2001 02:23:56 -0500
++
++docbook (4.1-2) unstable; urgency=low
++
++  * disable docbook.dcl as DTDDECL, otherwise lots of otherwise valid SGML
++    files will break (when using DTDDECL comprehending processors like
++    OpenJade, anyhow).  For more info, see README.docbook.dcl.
++  * include docbook 4.0
++    closes: #68666
++
++ -- Adam Di Carlo <aph@debian.org>  Wed, 21 Mar 2001 03:37:38 -0500
++
++docbook (4.1-1) unstable; urgency=low
++
++  * new maintainer, with permission from Mark Eichin
++    closes: #19682,  #19683,  #36956,  #47375,  #50243,  #51032,  #68033
++    closes: #87325,  #88679
++  * debian/control: require new sgml-base and sgml-data; suggest
++    docbook-xml; fix a grammar error in the description
++  * transition to new SGML standard system, /usr/share/sgml, and delegated
++    catalogs
++    closes: #90034
++  * rework the maintainer scripts accordingly; use m4 to dynamically set
++    some variables; move the removal work from postrm to prerm; don't
++    bother scrubbing legacy junk in prerm, since postinst configure
++    already ran, what's the point?
++  * provide new catalog entries for just referring to DocBook, generalized
++    to mean the last recommended DocBook, or the latest DocBook v4, or the
++    latest DocBook v3.
++  * delegated catalogs have proper DTDDECLs
++    closes: #63046 (again)
++  * debian/rules: stop using debstd
++    closes: #90122
++  * already fixed in earlier versions
++    closes: #90125
++  * debian/control: add Build-Depends-Indep; update standards to 3.5.2
++  * debian/copyright: update maintainership info and add coverage of the
++    debian integration scripts
++
++ -- Adam Di Carlo <aph@debian.org>  Mon, 19 Mar 2001 01:56:38 -0500
++
++docbook (4.1-0.2) unstable; urgency=low
++
++  * non-maintainer upload
++  * sgml-data/sgml-catalog-check.pl location moved
++    closes: #88679
++  * debian/postrm: fix some of the legacy FPI removal logic
++    closes: #87325
++  * debian/postinst: analogous fix, and remove some scrubbing of the SGML
++    catalog which really seemed overreaching (such as fudging with
++    SGMLDECL, and stuff which really ought to be handled by
++    install-sgmlcatalog)
++
++ -- Adam Di Carlo <aph@debian.org>  Sat, 17 Mar 2001 16:54:59 -0500
++
++docbook (4.1-0.1) unstable; urgency=low
++
++  * NMU because Mark lacks time.
++  * New upstream release (Closes: #68033).
++  * Do not include 4.0 DTD because 4.1 has no user-level changes from
++    4.0.
++  * Install doc files into /usr/share/doc/ as per policy (Closes:
++    #50243, #51032).
++  * Uncommented DTDDECL entries from the catalog (Closes: #63046).
++  * Updated download location and copyright notice.
++  * Commented out obsolete line in debian/watch.
++
++ -- Yann Dirson <dirson@debian.org>  Tue,  1 Aug 2000 01:01:59 +0200
++
++docbook (3.1-2) unstable; urgency=low
++
++  * debian/control: fix Maintainer realname for consistency.
++
++ -- Mark W. Eichin <eichin@thok.org>  Wed,  3 Nov 1999 16:14:46 -0500
++
++docbook (3.1-1) unstable; urgency=low
++
++  * Thanks for all the work; closing the bugs for real and updating my
++    email addresses. closes: #19682, #19683, #36956, #47375.
++
++ -- Mark W. Eichin <eichin@thok.org>  Wed,  3 Nov 1999 00:43:12 -0500
++
++docbook (3.1-0.4) unstable; urgency=low
++
++  * NMU so it can be removed when install-sgmlcatalog isn't present.
++    (Closes: #47375). 
++
++ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sat, 30 Oct 1999 14:31:46 +0200
++
++docbook (3.1-0.3) unstable; urgency=low
++
++  * non-maintainer release, blessed by Mark Eichin
++  * at the suggestion of Norm Walsh, retain DTD and entity file name
++    (closes Bug#36956) -- he also suggests that we don't split entities
++    into a separate dir, which is a reasonable thought, but I leave it to
++    others to file a bug if they agree with Norm.
++
++ -- Adam Di Carlo <aph@debian.org>  Sat, 22 May 1999 16:43:06 -0400
++
++docbook (3.1-0.2) unstable; urgency=low
++
++  * non-maintainer release
++  * docbook.cat: fix problems with some system identifiers, bugs I
++    introduced
++  * use script from sgml-data to create nice SGML links (completes closing
++    of Bug#19682)
++
++ -- Adam Di Carlo <aph@debian.org>  Fri, 26 Mar 1999 04:25:09 -0500
++
++docbook (3.1-0.1) unstable; urgency=low
++
++  * non-maintainer release
++  * new upstream version (blessed by Mark Eichin)
++  * deliver docbook 2.4.1, 3.0, and 3.1 DTDs (closes Bug#19683)
++  * put DTDs, entities, and declarations in standard locations under
++    /usr/lib/sgml; make symlinks under there too in compliance with the
++    sgml-base subpolicy (closes Bug#19682)
++  * debian/control: bump standards version to 2.5.0, reconcile priority to
++    what it is in the archive, update description
++  * debian/rules: some modularization
++  * debian/copyright: updated
++  * README.debian: adding some pointer on other packages and the home page
++
++ -- Adam Di Carlo <aph@debian.org>  Fri, 26 Mar 1999 01:36:31 -0500
++
++docbook (3.0-5) unstable; urgency=low
++
++  * debian/rules: use install -m 0644 so text files don't get installed
++    gratuitously executable (lintian).
++
++ -- Mark Eichin <eichin@kitten.gen.ma.us>  Wed, 29 Apr 1998 05:39:56 -0400
++
++docbook (3.0-4) unstable; urgency=low
++
++  * docbook.cat: comment out DTDDECL to avoid warnings from jade.  Removed
++    ISO entity pointers, since they are now supplied by sgml-data.
++
++ -- Mark Eichin <eichin@kitten.gen.ma.us>  Tue,  7 Apr 1998 02:39:48 -0400
++
++docbook (3.0-3) unstable; urgency=low
++
++  * debian/postinst, debian/postrm: use sgml-base like jade does.
++  * debian/control: depend on sgml-base now.
++
++ -- Mark W. Eichin <eichin@kitten.gen.ma.us>  Tue,  4 Nov 1997 18:18:18 -0500
++
++docbook (3.0-2) unstable; urgency=low
++
++  * debian/{postinst, postrm}: change md5sum markers to make them easier
++    to find later (and consistent with jade); add cleanup of older form.
++
++ -- Mark W. Eichin <eichin@kitten.gen.ma.us>  Tue,  1 Jul 1997 01:08:31 -0400
++
++docbook (3.0-1) unstable; urgency=low
++
++  * Initial Release.
++  * docbook.cat: point to davenport subdir.
++  * rules: install everything, under binary-indep.
++  * debian/{postinst, postrm}: use md5sum markers to add/remove catalog
++    entries. Also nuke SGMLDECL line (by wrapping it in an sgml -- comment
++    --.)
++
++ -- Mark Eichin <eichin@kitten.gen.ma.us>  Mon, 30 Jun 1997 14:11:38 -0400
++
++
+--- docbook-4.5.orig/debian/copyright
++++ docbook-4.5/debian/copyright
+@@ -0,0 +1,39 @@
++This package was debianized by Mark Eichin <eichin@thok.org> on Mon,
++30 Jun 1997 14:11:38 -0400.  It is currently maintained by Adam Di
++Carlo <aph@debian.org> and the Debian XML/SGML group
++<debian-xml-sgml-devel@lists.alioth.debian.org>.  No changes were made
++to the upstream version of these materials, although the provided SGML
++Open catalogs were trimmed or enhanced to suit Debian's SGML
++infrastructure.  All Debian integration scripts and packages are under
++the GPL v2 or better, a copy of which can be found on Debian systems
++in '/usr/share/common-licenses/GPL'.
++
++Download:
++
++  The original upstream materials may be downloaded from
++  <URL:http://www.oasis-open.org/docbook/sgml/>. This process is
++  transparent via the `get-orig-source' target in debian/rules.
++
++Copyright:
++
++  Copyright 1992-2006 HaL Computer Systems, Inc.,
++  O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
++  Corporation, orman Walsh, un Microsystems, Inc.,  and the
++  Organization for the Advancement of Structured Information
++  Standards (OASIS).
++
++License and Warranty:
++
++  Permission to use, copy, modify and distribute the DocBook DTD and
++  its accompanying documentation for any purpose and without fee is
++  hereby granted in perpetuity, provided that the above copyright
++  notice and this paragraph appear in all copies.  The copyright
++  holders make no representation about the suitability of the DTD for
++  any purpose.  It is provided "as is" without expressed or implied
++  warranty.
++
++  If you modify the DocBook DTD in any way, except for declaring and
++  referencing additional sets of general entities and declaring
++  additional notations, label your DTD as a variant of DocBook.  See
++  the maintenance documentation for more information.
++
+--- docbook-4.5.orig/debian/rules
++++ docbook-4.5/debian/rules
+@@ -0,0 +1,121 @@
++#!/usr/bin/make -f
++# Made with the aid of debmake, by Christoph Lameter,
++# based on the sample debian/rules file for GNU hello by Ian Jackson.
++
++PACKAGE	:= docbook
++
++include /usr/share/dpatch/dpatch.make
++
++
++debian/docbook.install:
++	set -ex ; \
++	touch $@ ; \
++	for db in docbook-* ; do \
++		dbver=`echo $${db} | sed -e 's/docbook-//g'` ; \
++		for file in $${db}/*.dcl $${db}/*.dtd $${db}/*.mod ; do \
++			if [ $${file} != $${db}/dbgenent.mod ] ; then \
++				echo "$${file} usr/share/sgml/docbook/dtd/$${dbver}" >> $@ ; \
++			else \
++				echo "$${file} etc/sgml/docbook/$${dbver}" >> $@ ; \
++			fi ; \
++		done ; \
++	done
++
++debian/docbook.links:
++	set -ex ; \
++	touch $@ ; \
++	for db in docbook-* ; do \
++		dbver=`echo $${db} | sed -e 's/docbook-//g'` ; \
++		[ -f $${db}/dbgenent.mod ] && \
++		    echo -n "etc/sgml/docbook/$${dbver}/dbgenent.mod " >> $@ && \
++		        echo "usr/share/sgml/docbook/dtd/$${dbver}/dbgenent.mod" >> $@ ; \
++		[ -f $${db}/docbook.cat ] && \
++		    echo "usr/share/sgml/docbook/dtd/$${dbver}/catalog usr/share/sgml/docbook/dtd/$${dbver}/docbook.cat" >> $@ ; \
++	done
++
++debian/docbook.sgmlcatalogs:
++	set -ex ; \
++	touch $@ ; \
++	echo "catalog /usr/share/sgml/docbook/dtd/catalog" > $@ ; \
++	for db in docbook-* ; do \
++		dbver=`echo $${db} | sed -e 's/docbook-//g'` ; \
++		[ -f $${db}/docbook.cat ] && \
++		    echo "$${db}/docbook.cat /usr/share/sgml/docbook/dtd/$${dbver}/catalog" >> $@ ; \
++	done
++
++build: patch-stamp build-stamp
++
++build-stamp: debian/docbook.install debian/docbook.links debian/docbook.sgmlcatalogs
++	dh_testdir
++	touch build-stamp
++
++clean: unpatch
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp patch-stamp
++	rm -f debian/docbook.install \
++	      debian/docbook.links \
++	      debian/docbook.sgmlcatalogs
++	dh_clean
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++binary-indep: build
++	dh_testdir
++	dh_testroot
++	dh_installchangelogs ChangeLog.upstream
++	dh_install
++	dh_installdocs debian/README.docbook.dcl
++	dh_installexamples
++	dh_installcatalogs
++	dh_link
++	find $(CURDIR)/debian/$(PACKAGE) -type l -follow >/dev/null # exits 1 on broken links
++	dh_compress
++	dh_fixperms
++	dh_installdeb
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary-arch: build
++
++binary: binary-indep binary-arch
++
++.PHONY: build clean binary binary-arch binary-indep
++
++# This following code is used to create the .orig.tar.gz tarball.
++# Use it to prepare it for a new release.
++
++version=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*/\1/p')
++
++.PHONY: get-orig-source
++get-orig-source:
++	set -ex ; \
++	TMPDIR=`mktemp -d docbook-$(version).orig` ; \
++	touch "$$TMPDIR"/ChangeLog.upstream ; \
++	for db in 4.5 4.4 4.3 4.2 ; do \
++		mkdir -p "$$TMPDIR"/docbook-$${db} ; \
++		dbzip=docbook-$${db}.zip ; \
++		wget -P "$$TMPDIR" http://www.oasis-open.org/docbook/sgml/$${db}/"$$dbzip" ; \
++		unzip -d "$$TMPDIR"/docbook-$${db} "$$TMPDIR"/"$$dbzip" ; \
++		rm -f "$$TMPDIR"/"$$dbzip" ; \
++		[ -f "$$TMPDIR"/docbook-$${db}/ChangeLog ] && \
++		    cat "$$TMPDIR"/docbook-$${db}/ChangeLog >> "$$TMPDIR"/ChangeLog.upstream ; \
++	done; \
++	for db in 4.1 4.0 3.1 3.0 2.4.1 ; do \
++		mkdir -p "$$TMPDIR"/docbook-$${db} ; \
++		dbver=`echo $${db} | sed -e 's/\.//g'` ; \
++		dbzip=docbk"$$dbver".zip ; \
++		wget -P "$$TMPDIR" http://www.oasis-open.org/docbook/sgml/$${db}/"$$dbzip" ; \
++		unzip -d "$$TMPDIR"/docbook-$${db} "$$TMPDIR"/"$$dbzip" ; \
++		rm -f "$$TMPDIR"/"$$dbzip" ; \
++		cat "$$TMPDIR"/docbook-$${db}/"$$dbver"chg.txt >> "$$TMPDIR"/ChangeLog.upstream ; \
++	done ; \
++	find "$$TMPDIR" -type f ! -perm 644 -exec chmod 644 "{}" ";" ; \
++	GZIP=-9 tar -czf $(CURDIR)/docbook_${version}.orig.tar.gz "$$TMPDIR" ; \
++	rm -rf "$$TMPDIR"
++
+--- docbook-4.5.orig/debian/README.docbook.dcl
++++ docbook-4.5/debian/README.docbook.dcl
+@@ -0,0 +1,98 @@
++From: Adam Di Carlo <adam@onshore.com>
++Subject: DOCBOOK: objection to docbook.dcl
++To: docbook@lists.oasis-open.org
++Cc: docbook-tc@oasis-open.org
++Date: Wed, 21 Mar 2001 02:35:31 -0500
++
++
++Shipped with the DocBook DTDs from 2.4.1 and up is 'docbook.dcl', an
++SGML declaration for use with DocBook documents.  However, this
++declartion is unnecessarily restrictive, to the level where it is
++rather cumbersome to implement.
++
++My argument is that the DocBook declaration should diverge from the SP
++(and OpenSP) implied declarations only where the divergance expresses
++a real necessity to diverge.  This is based on the principle that
++software (including SGML parsers) should be tolerant of what they
++accept.  The unnecessarily broad divergance of the shipped Docbook
++declaration puts a burden on document engineers using DocBook.
++
++I am considering here only the DocBook SGML DTD, since I presume the
++Declaration is rather irrelevant for XML files, since all XML files
++have the same XML declaration applied to them.
++
++I consider here 'docbook.dcl' as shipped with DocBook 4.1.
++
++Major problems:
++
++ OMITTAG is turned off (why?)
++
++ NAMELEN is too short
++
++ Document Character set is too restrictive
++
++ SUBDOC is turned off (why?)
++
++
++Description:
++
++* OMITTAG is turned off
++
++'OMITTAG' is turned off in 'docbook.dcl', disallowing markup
++minimization of any sort.  This is on in the implied declaration of
++both Jade and OpenJade. This creates problems because documents using
++the default declaration for their parser will have a valid document,
++but if the user decides to be more fasidious and user the docbook SGML
++declaration, sudden their document will not be valid.
++
++The major problem is that trying to turn this on will make a large
++number of existing SGML DocBook instances invalid.
++
++
++* NAMELEN is too short
++
++The NAMELEN quantity set in docbook.dcl is set to 45, rather than the
++default SP NAMELEN of 99999999.
++
++A number of users have complained of problems due to this limitation
++(do a google search on 'docbook namelen' to see what I mean) in any
++cases (such as the SUSE Linux distribution) where the declaration is
++enforced.
++
++Quoting <URL:http://xml.coverpages.org/wlw14.html>:
++
++   Care should be used when changing these since creating a variant
++   syntax may make it difficult for some SGML systems to process
++   documents created with that syntax.  The best means of guaranteeing
++   portability between different SGML systems and applications is to
++   use the reference concrete syntax as much as possible.
++
++One wonders why we need to diverge from the reference concrete syntax
++here.
++
++
++* Document Character set it too restrictive
++
++As an example, to workaround limitations in the support of KOI-R SDATA
++entities in Jade and OpenJade, KOI-R users have to use unicode
++entities.  With the docbook.dcl file, these entities are disallowed,
++although they are perfectly valid with the implied SP declaration.
++Example of being disallowed:
++
++  jade:/usr/share/sgml/entities/sgml-iso-entities-8879.1986/ISOcyr1.ent:1:16:E: \
++  "1072" is not a character number in the document character set
++
++
++* SUBDOC is turned off
++
++Why is it necessary to disallow SUBDOC in DocBook SGML documents?
++Seems like some authors may wish to use this, even if its not fully
++supported by existing stylesheets.
++
++
++
++I hope I got my facts correct, and that this commentary is useful.
++
++-- 
++.....Adam Di Carlo....adam@onshore.com.....<URL:http://www.onshored.com/>
++
+--- docbook-4.5.orig/debian/README.Debian
++++ docbook-4.5/debian/README.Debian
+@@ -0,0 +1,35 @@
++                  DocBook DTDs for Debian GNU/Linux
++                  ---------------------------------
++
++DocBook is an SGML DTD for software documentation.  It is very
++thorough, and is used by many different organization to produce books,
++articles, references, and even manual pages.
++
++The home page for DocBook is <URL:http://www.oasis-open.org/docbook/>.
++
++A wonderful introduction and reference is available in the
++docbook-defguide package, which can also be read online at
++<URL:http://www.docbook.org/tdg/>.
++
++To format DocBook documents, you'll need a style-sheet package, either
++docbook-dsssl or docbook-xsl, depending on what styling language you
++would like to use.
++
++There are far too many other packages to describe here, both for
++authors, editors, stylers, or information architects.  A list of such
++packages may be perused, for instance, using 'apt-cache search
++docbook'.
++
++If you have a question about how to work with DocBook, there are many
++mailing lists available; see <URL:http://www.docbook.org/>.
++
++If you have suggestions or questions regarding debian-specific issues,
++please consult the debian-sgml@lists.debian.org mailing list,
++<URL:http://lists.debian.org/>.
++
++--
++.....Adam Di Carlo....adam@onshore.com.....<URL:http://www.onshored.com/>
++(previously, Mark Eichin <eichin@thok.org>, Mon, 30 Jun 1997 14:11:38 -0400)
++
++
++
+--- docbook-4.5.orig/catalog
++++ docbook-4.5/catalog
+@@ -0,0 +1,19 @@
++  -- ...................................................................... --
++  -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
++
++ -- latest DocBook --
++PUBLIC  "-//OASIS//DTD DocBook//EN" "4.5/docbook.dtd"
++ -- disabled, see README.docbook.dcl --
++-- DTDDECL "-//OASIS//DTD DocBook//EN" "4.5/docbook.dcl" --
++
++ -- latest DocBook v4--
++PUBLIC  "-//OASIS//DTD DocBook V4//EN" "4.5/docbook.dtd"
++ -- disabled, see README.docbook.dcl --
++-- DTDDECL "-//OASIS//DTD DocBook V4//EN" "4.5/docbook.dcl" --
++
++ -- latest DocBook v3--
++PUBLIC "-//OASIS//DTD DocBook V3//EN" "3.1/docbook.dtd"
++ -- disabled, see README.docbook.dcl --
++-- DTDDECL "-//OASIS//DTD DocBook V3//EN" "3.1/docbook.dcl" --
++
diff --git a/source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii-32.diff b/source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii-32.diff
new file mode 100644
index 000000000..917e834c0
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii-32.diff
@@ -0,0 +1,949 @@
+--- libsgmls-perl-1.03ii.orig/sgmlspl.pl
++++ libsgmls-perl-1.03ii/sgmlspl.pl
+@@ -238,7 +238,7 @@
+ package main;
+ 
+ $ARGV = shift;
+-unless ($ARGV eq '' || do $ARGV) {
++unless ($ARGV eq '' || do 'sgmlspl-specs/' . $ARGV || do $ARGV) {
+     if (!-e $ARGV) {
+ 	die "FATAL: $ARGV does not exist.\n";
+     } elsif (!-r $ARGV) {
+--- libsgmls-perl-1.03ii.orig/Refs.pm
++++ libsgmls-perl-1.03ii/Refs.pm
+@@ -2,11 +2,11 @@
+ 
+ use Carp;
+ 
+-$version = '$Id: Refs.pm,v 1.5 1995/12/03 21:28:36 david Exp $';
++$version = '$Id: Refs.pm,v 1.1 1999/10/26 19:30:45 ardo Exp $';
+ 
+ =head1 NAME
+ 
+-SGMLS::Refs
++SGMLS::Refs - Forward reference handling
+ 
+ =head1 SYNOPSIS
+ 
+--- libsgmls-perl-1.03ii.orig/Output.pm
++++ libsgmls-perl-1.03ii/Output.pm
+@@ -5,7 +5,7 @@
+ @ISA = Exporter;
+ @EXPORT = qw(output push_output pop_output);
+ 
+-$version = '$Id: Output.pm,v 1.6 1995/12/05 12:21:51 david Exp $';
++$version = '$Id: Output.pm,v 1.1 1999/10/26 19:30:45 ardo Exp $';
+ 
+ =head1 NAME
+ 
+--- libsgmls-perl-1.03ii.orig/sgmlspl.1
++++ libsgmls-perl-1.03ii/sgmlspl.1
+@@ -0,0 +1,47 @@
++.\" -*- nroff -*-
++.\" ----------------------------------------------------------------------
++.TH SGMLSPL 1 "October 26, 1999" "SGMLSPL" "SGMLSPL"
++.\"
++.\" ----------------------------------------------------------------------
++.SH "NAME"
++sgmlspl \- a simple post-processor for nsgmls
++.\"
++.\" ----------------------------------------------------------------------
++.SH "SYNOPSIS"
++.B sgmlspl
++.I "spec file"
++.\"
++.\" ----------------------------------------------------------------------
++.SH "DESCRIPTION"
++sgmlspl is a sample application to convert SGML documents to other
++formats by providing a specification file detailing exactly how to
++handle each element, external data entity, subdocument entity, CDATA
++string, record end, SDATA string, and processing instruction.
++
++To use sgmlspl, prepare a specification file containing regular perl5
++code. If the SGML document were named doc.sgml, the sgmlspl
++specification file were named, spec.pl, and the name of the new file
++were doc.latex, then use the following command in a Unix shell to
++convert the SGML document:
++
++nsgmls doc.sgml | sgmlspl spec.pl > doc.latex
++
++sgmlspl will pass any additional arguments on to the specification
++file, which can then process them in the regular perl5 fashion.
++.\"
++.\" ----------------------------------------------------------------------
++.SH "SEE ALSO"
++.TP
++.BR /usr/share/doc/sgmls-doc/sgmlspl/sgmlspl.html
++sgmlspl documentation in HTML format
++.TP
++.BR /usr/share/doc/sgmls-doc/SGMLSpm/sgmls.html
++SGMLS documentation in HTML format
++.TP
++.BR nsgmls (1)
++.\"
++.\" ----------------------------------------------------------------------
++.SH "AUTHOR"
++Ardo van Rangelrooij <ardo@debian.org>
++.\"
++.\" ----------------------------------------------------------------------
+--- libsgmls-perl-1.03ii.orig/Makefile.PL
++++ libsgmls-perl-1.03ii/Makefile.PL
+@@ -0,0 +1,17 @@
++use ExtUtils::MakeMaker;
++# See lib/ExtUtils/MakeMaker.pm for details of how to influence
++# the contents of the Makefile that is written.
++WriteMakefile(
++      'NAME'	=> 'SGMLS',
++      'VERSION'	=> '1.03ii',
++      'PM'	=> { 'SGMLS.pm' => '$(INST_LIBDIR)/SGMLS.pm',
++		     'Output.pm' => '$(INST_LIBDIR)/SGMLS/Output.pm',
++		     'Refs.pm' => '$(INST_LIBDIR)/SGMLS/Refs.pm',
++		     'skel.pl' => '$(INST_LIBDIR)/sgmlspl-specs/skel.pl',
++		 },
++      'MAN3PODS'=> { 'SGMLS.pm' => '$(INST_MAN3DIR)/SGMLS.3pm',
++		     'Output.pm' => '$(INST_MAN3DIR)/SGMLS::Output.3pm',
++		     'Refs.pm' => '$(INST_MAN3DIR)/SGMLS::Refs.3pm',
++		 },
++      'EXE_FILES' => [ 'sgmlspl', ],
++);
+--- libsgmls-perl-1.03ii.orig/Makefile
++++ libsgmls-perl-1.03ii/Makefile
+@@ -94,5 +94,5 @@
+ 	mv /tmp/${DIST} SGMLSpm
+ 
+ clean:
+-	cd DOC; make clean
++	#cd DOC; make clean
+ 	rm -f *~ core *.tar *.tar.gz
+--- libsgmls-perl-1.03ii.orig/SGMLS.pm
++++ libsgmls-perl-1.03ii/SGMLS.pm
+@@ -1,7 +1,7 @@
+ package SGMLS;
+ use Carp;
+ 
+-$version = '$Revision: 1.14 $';
++$version = '$Revision: 1.1 $';
+ 
+ =head1 NAME
+ 
+--- libsgmls-perl-1.03ii.orig/debian/libsgmls-perl.examples
++++ libsgmls-perl-1.03ii/debian/libsgmls-perl.examples
+@@ -0,0 +1 @@
++DOC/sample.pl
+--- libsgmls-perl-1.03ii.orig/debian/sgmls-doc.doc-base.SGMLSpm
++++ libsgmls-perl-1.03ii/debian/sgmls-doc.doc-base.SGMLSpm
+@@ -0,0 +1,9 @@
++Document: SGMLSpm
++Title: SGMLSpm
++Author: David Megginson
++Abstract: This manual describes the SGMLS Perl modules
++Section: Text
++
++Format: HTML
++Index: /usr/share/doc/sgmls-doc/SGMLSpm/index.html
++Files: /usr/share/doc/sgmls-doc/SGMLSpm/*.html
+--- libsgmls-perl-1.03ii.orig/debian/rules
++++ libsgmls-perl-1.03ii/debian/rules
+@@ -0,0 +1,76 @@
++#!/usr/bin/make -f
++## ----------------------------------------------------------------------
++## debian/rules : package script for libsgmls-perl
++## ----------------------------------------------------------------------
++
++## ----------------------------------------------------------------------
++## uncomment this to turn on verbose mode
++#export DH_VERBOSE=1
++
++## ----------------------------------------------------------------------
++TMP_DIR	:=	$(CURDIR)/debian/tmp
++
++## ----------------------------------------------------------------------
++CFLAGS	=	-Wall -g
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++		CFLAGS	+= -O0
++else
++		CFLAGS	+= -O2
++endif
++
++## ----------------------------------------------------------------------
++## targets
++
++clean:
++		dh_testdir
++		dh_testroot
++		[ ! -f Makefile ] || $(MAKE) clean
++		dh_clean build-stamp install-stamp
++
++build:		build-stamp
++build-stamp:
++		dh_testdir
++		perl Makefile.PL INSTALLDIRS=vendor
++		$(MAKE) OPTIMIZE="$(CFLAGS)"
++		$(MAKE) test
++		touch build-stamp
++
++install:	install-stamp
++install-stamp:	build
++		dh_testdir
++		dh_testroot
++		dh_clean -k
++		dh_installdirs
++		$(MAKE) install DESTDIR=$(TMP_DIR) PREFIX=/usr
++		touch install-stamp
++
++binary-indep:	build install
++		dh_testdir
++		dh_testroot
++		dh_install --sourcedir=$(TMP_DIR)
++		dh_installman
++		dh_installdocs
++		dh_installexamples
++		dh_installchangelogs ChangeLog
++		dh_link
++		dh_compress
++		dh_fixperms
++		dh_installdeb
++		dh_perl
++		dh_gencontrol
++		dh_md5sums
++		dh_builddeb
++
++binary-arch:
++
++binary:		binary-indep binary-arch
++
++.PHONY:		clean build install binary-indep binary-arch binary
++
++## ----------------------------------------------------------------------
++## Copyright 1994,1995 by Ian Jackson.
++## I hereby give you perpetual unlimited permission to copy,
++## modify and relicense this file, provided that you do not remove
++## my name from the file itself.  (I assert my moral right of
++## paternity under the Copyright, Designs and Patents Act 1988.)
++## ----------------------------------------------------------------------
+--- libsgmls-perl-1.03ii.orig/debian/control
++++ libsgmls-perl-1.03ii/debian/control
+@@ -0,0 +1,48 @@
++Source: libsgmls-perl
++Section: perl
++Priority: optional
++Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
++Uploaders: Ardo van Rangelrooij <ardo@debian.org>
++Vcs-Browser: http://alioth.debian.org/plugins/scmcvs/cvsweb.php/packages/libsgmls-perl/?cvsroot=debian-xml-sgml
++Vcs-Cvs: :pserver:anonymous@cvs.alioth.debian.org:/cvsroot/debian-xml-sgml/packages/libsgmls-perl
++Standards-Version: 3.7.3
++Build-Depends: debhelper (>= 5.0)
++Build-Depends-Indep: perl
++
++Package: libsgmls-perl
++Section: perl
++Priority: optional
++Architecture: all
++Conflicts: sgmlspm
++Depends: ${perl:Depends}
++Recommends: sp
++Replaces: sgmlspm
++Suggests: sgmlspl, sgmls-doc
++Description: Perl modules for processing SGML parser output
++ This is a set of Perl5 routines for processing the output from the
++ sgmls and nsgmls SGML parsers.  To make sensible use of this package
++ you will need to install a suitable SGML parser as well.
++
++Package: sgmlspl
++Section: text
++Priority: optional
++Architecture: all
++Conflicts: sgmlspm
++Depends: ${perl:Depends}, libsgmls-perl
++Replaces: sgmlspm
++Suggests: sgmls-doc
++Description: SGMLS-based example Perl script for processing SGML parser output
++ This is an example of a Perl script to post-process SGML parser output
++ using the SGMLS Perl modules.  To make sensible use of this package
++ you will need to install a suitable SGML parser as well.
++
++Package: sgmls-doc
++Section: doc
++Priority: optional
++Architecture: all
++Conflicts: sgmlspm
++Replaces: sgmlspm
++Suggests: libsgmls-perl, sgmlspl
++Description: HTML documentation of libsgmls-perl and sgmlspl
++ This package contains the documentation in HTML format of the
++ packages libsgmls-perl and sgmlspl.
+--- libsgmls-perl-1.03ii.orig/debian/sgmlspl.manpages
++++ libsgmls-perl-1.03ii/debian/sgmlspl.manpages
+@@ -0,0 +1 @@
++sgmlspl.1
+--- libsgmls-perl-1.03ii.orig/debian/changelog
++++ libsgmls-perl-1.03ii/debian/changelog
+@@ -0,0 +1,262 @@
++libsgmls-perl (1.03ii-32) unstable; urgency=low
++
++  * Refs.pm: fixed typo
++    (closes: Bug#414110)
++  * debian/compat: bumped version to 5
++  * debian/control:
++    * moved debhelper from 'Build-Depends-Indep' to 'Build-Depends'
++      (detected by lintian)
++    * changed build dependency on 'debhelper' to '(>= 5.0)'
++    * upgraded to Debian Policy 3.7.3 (no changes)
++    * added Vcs-Browser and Vcs-Cvs fields
++  * debian/watch: bumped version to 3
++  * debian/copyright: updated FSF address
++    (detected by lintian)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Fri, 04 Jan 2008 10:48:06 -0600
++
++libsgmls-perl (1.03ii-31) unstable; urgency=low
++
++  * Added 'debian/watch'
++  * debiam/rules: various small improvements
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Wed, 24 Nov 2004 12:23:21 -0600
++
++libsgmls-perl (1.03ii-30) unstable; urgency=low
++
++  * Makefile: commented out documentation clean
++    (closes: Bug#240645)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sun, 28 Mar 2004 10:29:33 -0600
++
++libsgmls-perl (1.03ii-29) unstable; urgency=low
++
++  * debian/control: changed maintainer's email address to the new Debian
++    XML/SGML Group's packages mailing list
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sun, 29 Feb 2004 10:48:45 -0600
++
++libsgmls-perl (1.03ii-28) unstable; urgency=low
++
++  * debian/control: changed 'Maintainer' to 'Debian XML/SGML Group
++    <debian-xml-sgml-devel@lists.alioth.debian.org>' and added current
++    maintainer as 'Uploader'
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sun, 22 Feb 2004 19:38:41 -0600
++
++libsgmls-perl (1.03ii-27) unstable; urgency=low
++
++  * debian/control: upgraded to Debian Policy 3.6.1 (no changes)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sat,  7 Feb 2004 22:31:22 -0600
++
++libsgmls-perl (1.03ii-26) unstable; urgency=low
++
++  * Fixed missing documentation
++    (closes: Bug#226085)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sun,  4 Jan 2004 10:56:51 -0600
++
++libsgmls-perl (1.03ii-25) unstable; urgency=low
++
++  * sgmlspl.1: fixed references to HTML documentation
++    (closes: Bug#202985)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sat, 26 Jul 2003 23:06:50 -0500
++
++libsgmls-perl (1.03ii-24) unstable; urgency=low
++
++  * debian/rules: moved debhelper compatibility level setting to
++    'debian/compat' per latest debhelper best practices
++  * debian/control: updated sections according to latest archive changes:
++    - 'libsgmls-perl' from 'text' to 'perl'
++  * debian/control: changed build dependency on 'debhelper' to '(>= 4.1)'
++  * debian/control: upgraded to Debian Policy 3.6.0 (no changes)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sat, 26 Jul 2003 22:15:48 -0500
++
++libsgmls-perl (1.03ii-23) unstable; urgency=low
++
++  * debian/sgmls-doc.links: fixed broken symlink
++    (closes: Bug#158923)
++  * debian/control: added dependency on perl for sgmlspl (warning from linda)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Thu, 19 Sep 2002 19:45:17 -0500
++
++libsgmls-perl (1.03ii-22) unstable; urgency=low
++
++  * debian/rules: added erroneously removed 'dh_testroot' to 'binary-indep'
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sun,  4 Aug 2002 16:33:00 -0500
++
++libsgmls-perl (1.03ii-21) unstable; urgency=low
++
++  * debian/rules: upgraded to debhelper v4
++  * debian/control: changed build dependency on debhelper accordingly
++  * debian/rules: migrated from 'dh_movefiles' to 'dh_install'
++  * debian/rules: split off 'install' target from 'binary-indep' target
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sun,  4 Aug 2002 09:41:59 -0500
++
++libsgmls-perl (1.03ii-20) unstable; urgency=low
++
++  * Removed explicit support of dhelp since doc-base now takes care of this
++  * debian/control: upgraded to Debian Policy 3.5.6
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sun,  4 Nov 2001 16:13:15 -0600
++
++libsgmls-perl (1.03ii-19) unstable; urgency=low
++
++  * debian/control: upgraded to Debian Policy 3.5.5
++  * debian/control: upgraded to Debian Perl Policy 1.20
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sat,  1 Sep 2001 22:03:51 -0500
++
++libsgmls-perl (1.03ii-18) unstable; urgency=low
++
++  * Makefile.PL: removed handling of manpage sgmlspl.1
++  * debian/control: added handling of manpage sgmlspl.1
++    (closes: Bug#94518)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Mon, 30 Apr 2001 21:26:08 -0500
++
++libsgmls-perl (1.03ii-17) unstable; urgency=low
++
++  * debian/control: updated debhelper dependency to remove dh_testversion
++  * debian/control: upgraded to Debian Policy 3.5.2
++  * debian/control: upgraded to Debian Perl Policy 1.17
++  * debian/rules: upgraded to Debian Perl Policy 1.17
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sat, 14 Apr 2001 20:49:19 -0500
++
++sgmlspm (1.03ii-16) unstable; urgency=low
++
++  * debian/control: upgraded to Debian Policy 3.2.1
++  * debian/rules: upgraded to debhelper v3
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Mon, 15 Jan 2001 19:35:32 -0600
++
++sgmlspm (1.03ii-15) unstable; urgency=low
++
++  * debian/control: updated short descriptions
++  * debian/control: added missing Build-Depends
++  * debian/rules: added missing `$(MAKE) test`
++  * debian/rules: added missing build-stamp stuff
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sun, 11 Jun 2000 19:40:09 +0200
++
++sgmlspm (1.03ii-14) frozen unstable; urgency=high
++
++  * sgmlspl.pl: updated to reflect change in spec files location
++    (closes: #58443) (thanks Yann!!!)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sun, 20 Feb 2000 09:35:08 +0100
++
++sgmlspm (1.03ii-13) unstable; urgency=high
++
++  * sgmlspl.pl: updated to reflect change in spec files location
++    (closes: #58443) (thanks Yann!!!)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Sat, 19 Feb 2000 19:38:22 +0100
++
++sgmlspm (1.03ii-12) unstable; urgency=low
++
++  * Moved HTML documentation to separate package sgmls-doc
++    (closes: #52856) (thanks Andreas!)
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Thu, 30 Dec 1999 11:42:02 +0100
++
++sgmlspm (1.03ii-11) unstable; urgency=low
++
++  * Removed test-SGMLS.pl from examples
++  * Moved skel.pl from libsgmls-perl to sgmlspl and into a new direcotry
++    /usr/lib/perl5/sgmlspl-specs
++    (closes: #52169) (thanks Yann!)
++  * Upgraded to Debian Policy 3.1.1
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Mon, 13 Dec 1999 21:54:48 +0100
++
++sgmlspm (1.03ii-10) unstable; urgency=low
++
++  * Split binary package into libsgmls-perl and sgmlspl.  The former only
++    contains the SGMLS Perl modules, documentation and examples.  The
++    latter only contains the (example) Perl script `sgmlspl' and its
++    documentation
++  * Turned libsgmls-perl into a 'real' Perl package with Makefile.PL and all
++    (closes: #39684)
++  * Added doc-base support
++    (closes: #31181)
++  * Added manual page for sgmlspl
++    (closes: #17909)
++  * Upgraded to Debian Policy 3.0.1
++  * Upgraded to Debian Perl Policy 1.1
++  * Made lintian-free
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Tue, 26 Oct 1999 19:58:37 +0200
++
++sgmlspm (1.03ii-9) unstable; urgency=low
++
++  * Complies with Perl packaging standard 1.0
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Tue, 13 Jul 1999 19:19:39 -0500
++
++sgmlspm (1.03ii-8) unstable; urgency=low
++
++  * debian/control: fixed typo in description
++    (closes: Bug#27441)
++  * Maintainer's email address changed
++
++ -- Ardo van Rangelrooij <ardo@debian.org>  Mon,  5 Oct 1998 19:14:22 +0200
++
++sgmlspm (1.03ii-7) frozen unstable; urgency=low
++
++  * debian/rules: corrected upstream ChangeLog installation (lintian bug)
++  * debian/copyright: updated postal address of the FSF (lintian bug)
++
++ -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl>  Sun, 26 Apr 1998 17:03:11 +0200
++
++sgmlspm (1.03ii-6) frozen unstable; urgency=low
++
++  * debian/rules: added sgmlspl man page as undocumented man page
++  * debian/rules: changed to use debhelper
++  * debian/rules: removed handling of index.html links
++  * Makefile: added handling of index.html links
++  * debian/control: updated to debian standard 2.4.0.0
++  * debian/rules: removed installation of DocBook examples
++    (closes: Bug#19689)
++
++ -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl>  Mon,  6 Apr 1998 19:37:59 +0200
++
++sgmlspm (1.03ii-5) unstable; urgency=low
++
++  * Fixed permissions bug
++    (closes: Bug#17490)
++
++ -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl>  Wed, 18 Feb 1998 21:30:57 +0100
++
++sgmlspm (1.03ii-4) unstable; urgency=low
++
++  * New maintainer. 
++
++ -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl>  Wed, 14 Jan 1998 21:29:45 +0100
++
++sgmlspm (1.03ii-3) frozen unstable; urgency=low
++
++  * Updated Standards-Version to 2.1.3.0.
++  * New maintainer.
++
++ -- Christian Schwarz <schwarz@debian.org>  Thu, 17 Apr 1997 15:53:51 +0200
++
++sgmlspm (1.03ii-2) unstable; urgency=low
++
++  * Split binary target into binary-indep and binary-arch.
++  * Updated Standards-Version.
++  * Released into unstable.
++
++ -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Fri, 23 Aug 1996 12:11:40 +0100
++
++sgmlspm (1.03ii-1) experimental; urgency=LOW
++
++  * Initial Debian release.
++
++ -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Sat, 10 Aug 1996 01:47:30 +0100
+--- libsgmls-perl-1.03ii.orig/debian/sgmls-doc.docs
++++ libsgmls-perl-1.03ii/debian/sgmls-doc.docs
+@@ -0,0 +1,2 @@
++DOC/HTML/SGMLSpm
++DOC/HTML/sgmlspl
+--- libsgmls-perl-1.03ii.orig/debian/libsgmls-perl.install
++++ libsgmls-perl-1.03ii/debian/libsgmls-perl.install
+@@ -0,0 +1,2 @@
++usr/share/perl5/SGMLS*
++usr/share/man/man3
+--- libsgmls-perl-1.03ii.orig/debian/sgmls-doc.doc-base.sgmlspl
++++ libsgmls-perl-1.03ii/debian/sgmls-doc.doc-base.sgmlspl
+@@ -0,0 +1,9 @@
++Document: sgmlspl
++Title: sgmlspl
++Author: David Megginson
++Abstract: This manual describes the (example) sgmlspl Perl script
++Section: Text
++
++Format: HTML
++Index: /usr/share/doc/sgmls-doc/sgmlspl/index.html
++Files: /usr/share/doc/sgmls-doc/sgmlspl/*.html
+--- libsgmls-perl-1.03ii.orig/debian/copyright
++++ libsgmls-perl-1.03ii/debian/copyright
+@@ -0,0 +1,28 @@
++This is Debian GNU/Linux's prepackaged version of David Megginson's
++sgmlspm-1.03ii Perl modules for processing sgmls and nsgmls output.
++
++This package was put together by me, Ian Jackson
++<ijackson@gnu.ai.mit.edu>, from the sources on src.doc.ic.ac.uk in
++/packages/perl/CPAN/modules/by-module/SGMLS/SGMLSpm-1.03ii.tar.gz.
++The changes were very minimal - merely adding support for the Debian
++package maintenance scheme, by adding various debian/* files.
++
++Program Copyright (C)1994,1995 David Megginson.
++Modifications for Debian Copyright (C)1996 Ian Jackson.
++Modifications for Debian Copyright (C) 1998,1999 Ardo van Rangelrooij
++
++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 with
++your Debian GNU/Linux system, in /usr/share/common-licenses/GPL-2, or
++with the Debian GNU/Linux hello source package as the file COPYING.
++If not, write to the Free Software Foundation, Inc., 51 Franklin
++Street, Fifth Floor, Boston, MA 02110-1301 USA.
+--- libsgmls-perl-1.03ii.orig/debian/compat
++++ libsgmls-perl-1.03ii/debian/compat
+@@ -0,0 +1 @@
++5
+--- libsgmls-perl-1.03ii.orig/debian/sgmls-doc.links
++++ libsgmls-perl-1.03ii/debian/sgmls-doc.links
+@@ -0,0 +1,2 @@
++usr/share/doc/sgmls-doc/SGMLSpm/sgmlspm.html usr/share/doc/sgmls-doc/SGMLSpm/index.html
++usr/share/doc/sgmls-doc/sgmlspl/sgmlspl.html usr/share/doc/sgmls-doc/sgmlspl/index.html
+--- libsgmls-perl-1.03ii.orig/debian/watch
++++ libsgmls-perl-1.03ii/debian/watch
+@@ -0,0 +1,2 @@
++version=3
++http://www.cpan.org/modules/by-module/SGMLS/SGMLSpm-([\d.]+[\w]+).tar.gz
+--- libsgmls-perl-1.03ii.orig/debian/sgmlspl.install
++++ libsgmls-perl-1.03ii/debian/sgmlspl.install
+@@ -0,0 +1,2 @@
++usr/bin
++/usr/share/perl5/sgmlspl-specs
+--- libsgmls-perl-1.03ii.orig/debian/libsgmls-perl.docs
++++ libsgmls-perl-1.03ii/debian/libsgmls-perl.docs
+@@ -0,0 +1,2 @@
++BUGS
++TODO
+--- libsgmls-perl-1.03ii.orig/sgmlspl
++++ libsgmls-perl-1.03ii/sgmlspl
+@@ -0,0 +1,326 @@
++#!/usr/bin/perl
++########################################################################
++# sgmlspl: a simple SGML postprocesser for the SGMLS and NSGMLS
++#          parsers (requires SGMLS.pm library).
++#
++# Copyright (c) 1995 by David Megginson <dmeggins@aix1.uottawa.ca>
++#
++# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
++#
++# $Log: sgmlspl,v $
++# Revision 1.2  2008-01-03 23:49:25  ardo
++# applied patch for 414110 & upgraded policy
++#
++# Revision 1.1  2004/02/23 01:23:07  ardo
++# Added debian changes for version 1.03ii-27.
++#
++# Revision 1.1  2001/04/15 14:42:01  ardo
++# *** empty log message ***
++#
++# Revision 1.8  1995/12/03  21:46:31  david
++# Eliminated all use of the SGMLS_Event::key method.
++#
++# Revision 1.7  1995/11/15  20:22:24  david
++# Changed "use Output" to "use SGMLS::Output".  Qualified the STDIN
++# filehandle for the SGMLS object with the main:: package name.
++#
++# Revision 1.6  1995/08/12  16:15:14  david
++# Revised version for 1.01 distribution.
++#
++# Revision 1.5  1995/04/27  11:52:25  david
++# Changed 'print' to 'main::output' for re handler; empty string
++# translates into an empty sub {} rather than a sub printing an empty
++# string; instead of evaluating every argument as a perl script, take
++# only the first as a perl script and the rest as its arguments; allow
++# empty scripts or scripts which do not end with '1;'; pass the event
++# itself as the second argument to each handler, after the event data.
++#
++# Revision 1.4  1995/04/23  14:44:58  david
++# Use the Output package.  Fixed the $version variable.
++#
++# Revision 1.3  1995/04/22  21:02:49  david
++# Added some missing 'last SWITCH;' statements in the sgmls function.
++#
++# Revision 1.2  1995/04/22  20:58:48  david
++# Added $SGMLS_PL::version variable and changed SDATA notation from
++# [SDATA] to |SDATA|.
++#
++# Revision 1.1  1995/04/22  14:40:50  david
++# Initial revision
++#
++########################################################################
++
++use SGMLS::Output;
++
++package SGMLS_PL;
++use SGMLS;
++
++$version = '$Id: sgmlspl,v 1.2 2008-01-03 23:49:25 ardo Exp $';
++
++#
++# Set up handler defaults.
++#
++$start_document_handler = sub {};
++$end_document_handler = sub {};
++$start_element_handlers = { '' => sub {} };
++$end_element_handlers = { '' => sub {} };
++$cdata_handler = sub { main::output($_[0]); };
++$sdata_handlers = { '' => sub { main::output($_[0]);} };
++$re_handler = sub { main::output("\n"); };
++$pi_handler = sub { '' => sub {} };
++$entity_handlers = { '' => sub {} };
++$start_subdoc_handlers = { '' => sub {} };
++$end_subdoc_handlers = { '' => sub {} };
++$conforming_handler = sub {};
++
++#
++# Main access point: declare handlers for different SGML events.
++#
++# Usage: sgml(event, handler);
++#
++# The event may be one of the following strings, or a special pattern.
++# The generic events are as follow:
++#
++#   'start'                 The beginning of the document.
++#   'end'                   The end of the document.
++#   'start_element'         The beginning of an element.
++#   'end_element'           The end of an element.
++#   'cdata'                 Regular character data.
++#   'sdata'                 Special system-specific data.
++#   're'                    A record-end.
++#   'pi'                    A processing instruction.
++#   'entity'                An external-entity reference.
++#   'start_subdoc'          The beginning of a subdocument entity.
++#   'end_subdoc'            The end of a subdocument entity.
++#   'conforming'            The document is conforming.
++#
++# In addition to these generic events, it is possible to handlers
++# for certain specific, named events, as follow:
++#
++#   '<GI>'                  The beginning of element GI.
++#   '</GI>'                 The end of element GI.
++#   '[SDATA]'               The system-specific data SDATA.
++#   '&ENAME;'               A reference to the external entity ENAME.
++#   '{ENAME}'               The beginning of the subdocument-entity ENAME.
++#   '{/ENAME}'              The end of the subdocument-entity ENAME.
++#
++#
++# The handler may be a string, which will simply be printed when the
++# event occurs (this is usually useful only for the specific, named
++# events), or a reference to an anonymous subroutine, which will
++# receive two arguments: the event data and the event itself.  For 
++# example,
++#
++#   sgml('<FOO>', "\n\\begin{foo}\n");
++#
++# and
++#
++#   sgml('<FOO>', sub { output("\n\\begin{foo}\n"); });
++#
++# will have identical results.
++#
++sub main::sgml {
++    my ($spec,$handler) = (@_);
++    if (ref($handler) ne 'CODE') {
++	$handler =~ s/\\/\\\\/g;
++	$handler =~ s/'/\\'/g;
++	if ($handler eq '') {
++	    $handler = sub {};
++	} else {
++	    $handler = eval "sub { main::output('$handler'); };";
++	}
++    }
++  SWITCH: {
++				# start-document handler
++      $spec eq 'start' && do {
++	  $start_document_handler = $handler;
++	  last SWITCH;
++      };
++				# end-document handler
++      $spec eq 'end' && do {
++	  $end_document_handler = $handler;
++	  last SWITCH;
++      };
++				# start-element handler
++      $spec =~ /^<([^\/].*|)>$/ && do {
++	  $start_element_handlers->{$1} = $handler;
++	  last SWITCH;
++      };
++				# generic start-element handler
++      $spec eq 'start_element' && do {
++	  $start_element_handlers->{''} = $handler;
++	  last SWITCH;
++      };
++				# end-element handler
++      $spec =~ /^<\/(.*)>$/ && do {
++	  $end_element_handlers->{$1} = $handler;
++	  last SWITCH;
++      };
++				# generic end-element handler
++      $spec =~ 'end_element' && do {
++	  $end_element_handlers->{''} = $handler;
++	  last SWITCH;
++      };
++				# cdata handler
++      $spec eq 'cdata' && do {
++	  $cdata_handler = $handler;
++	  last SWITCH;
++      };
++				# sdata handler
++      $spec =~ /^\|(.*)\|$/ && do {
++	  $sdata_handlers->{$1} = $handler;
++	  last SWITCH;
++      };
++				# generic sdata handler
++      $spec eq 'sdata' && do {
++	  $sdata_handlers->{''} = $handler;
++	  last SWITCH;
++      };
++				# record-end handler
++      $spec eq 're' && do {
++	  $re_handler = $handler;
++	  last SWITCH;
++      };
++				# processing-instruction handler
++      $spec eq 'pi' && do {
++	  $pi_handler = $handler;
++	  last SWITCH;
++      };
++				# entity-reference handler
++      $spec =~ /^\&(.*);$/ && do {
++	  $entity_handlers->{$1} = $handler;
++	  last SWITCH;
++      };
++				# generic entity-reference handler
++      $spec eq 'entity' && do {
++	  $entity_handlers->{''} = $handler;
++	  last SWITCH;
++      };
++				# start-subdoc handler
++      $spec =~ /^\{([^\/].*|)\}$/ && do {
++	  $start_subdoc_handlers->{$1} = $handler;
++	  last SWITCH;
++      };
++				# generic start-subdoc handler
++      $spec eq 'start_subdoc' && do {
++	  $start_subdoc_handlers->{''} = $handler;
++	  last SWITCH;
++      };
++				# end-subdoc handler
++      $spec =~ /^\{\/(.*)\}$/ && do {
++	  $end_subdoc_handlers->{$1} = $handler;
++	  last SWITCH;
++      };
++				# generic end-subdoc handler
++      $spec eq 'end_subdoc' && do {
++	  $end_subdoc_handlers->{''} = $handler;
++	  last SWITCH;
++      };
++				# conforming handler
++      $spec eq 'conforming' && do {
++	  $conforming_handler = $handler;
++	  last SWITCH;
++      };
++
++      die "Bad SGML handler pattern: $spec\n";
++  }
++}
++
++
++#
++# The first argument on the command line is a perl module which will be
++# read here and evaluated in the 'main' package -- everything else will
++# be an argument to it.
++#
++package main;
++
++$ARGV = shift;
++unless ($ARGV eq '' || do 'sgmlspl-specs/' . $ARGV || do $ARGV) {
++    if (!-e $ARGV) {
++	die "FATAL: $ARGV does not exist.\n";
++    } elsif (!-r $ARGV) {
++	die "FATAL: $ARGV exists but is read-protected.\n";
++    } elsif ($@) {
++	die "FATAL: $@\n";
++    }
++}
++
++
++#
++# Do the actual work, using the SGMLS package.
++#
++package SGMLS_PL;
++
++$parse = new SGMLS(main::STDIN);	# a new parse object
++
++&{$start_document_handler}();	# run the start handler.
++
++				# run the appropriate handler for each
++				# event
++while ($event = $parse->next_event) {
++    my $type = $event->type;
++  SWITCH: {
++      $type eq 'start_element' && do {
++	  &{($start_element_handlers->{$event->data->name}||
++		$start_element_handlers->{''} || sub {})}($event->data,$event);
++	  last SWITCH;
++      };
++      $type eq 'end_element' && do {
++	  &{($end_element_handlers->{$event->data->name}||
++		$end_element_handlers->{''} || sub {})}($event->data,$event);
++	  last SWITCH;
++      };
++      $type eq 'cdata' && do {
++	  &{$cdata_handler}($event->data,$event);
++	  last SWITCH;
++      };
++      $type eq 'sdata' && do {
++	  &{($sdata_handlers->{$event->data}||
++	     $sdata_handlers->{''} || sub {})}($event->data,$event);
++	  last SWITCH;
++      };
++      $type eq 're' && do {
++	  &{$re_handler}($event->data,$event);
++	  last SWITCH;
++      };
++      $type eq 'pi' && do {
++	  &{$pi_handler}($event->data,$event);
++	  last SWITCH;
++      };
++      $type eq 'entity' && do {
++	  &{($entity_handlers->{$event->data->name}||
++	     $entity_handlers->{''} || sub {})}($event->data,$event);
++	  last SWITCH;
++      };
++      $type eq 'start_subdoc' && do {
++	  &{($start_subdoc_handlers->{$event->data->name}||
++	     $start_subdoc_handlers->{''} || sub {})}($event->data,$event);
++	  last SWITCH;
++      };
++      $type eq 'end_subdoc' && do {
++	  &{($end_subdoc_handlers->{$event->data->name}||
++	     $end_subdoc_handlers->{''} || sub {})}($event->data,$event);
++	  last SWITCH;
++      };
++      $type eq 'conforming' && do {
++	  &{$conforming_handler}($event->data,$event);
++	  last SWITCH;
++      };
++
++      die "Unknown SGML event type: $type\n";
++  }
++}
++				
++&{$end_document_handler}();	# run the end handler
diff --git a/source/ap/linuxdoc-tools/sources/linuxdoc-tools.lib64.diff b/source/ap/linuxdoc-tools/sources/linuxdoc-tools.lib64.diff
new file mode 100644
index 000000000..4741f2e2c
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/linuxdoc-tools.lib64.diff
@@ -0,0 +1,10 @@
+--- linuxdoc-tools-0.9.20/bin/linuxdoc.in.orig	2002-09-10 14:31:56.000000000 -0400
++++ linuxdoc-tools-0.9.20/bin/linuxdoc.in	2002-09-10 14:32:32.000000000 -0400
+@@ -23,6 +23,7 @@
+ 
+ use lib "@DATADIR@";
+ use lib "@prefix@/perl5";
++use lib "@prefix@/lib64/perl5";
+ use lib "@prefix@/lib/perl5";
+ use lib "@prefix@/share/perl5";
+
diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download
new file mode 100755
index 000000000..479033e0d
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/source.download
@@ -0,0 +1,67 @@
+# Incase you're wondering why we're using source RPMs, this is because
+# they contain patches required to either fix build or runtime problems,
+# and it's easier to maintain this hunk of a package when the patches &
+# sources are self contained.
+
+# linuxdoc-tools:
+# This provides things such as sgml2txt.
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/linuxdoc-tools-0.9.65-1.fc12.src.rpm
+
+# OpenSP:
+# http://openjade.sourceforge.net/download.html
+# wget -c http://kent.dl.sourceforge.net/sourceforge/openjade/OpenSP-1.5.2.tar.gz
+# 
+wget -c http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/opensp-1.5.2-11.fc11.src.rpm
+
+# OpenJade:
+# http://openjade.sourceforge.net/
+wget -c http://downloads.sourceforge.net/openjade/openjade-1.3.3-pre1.tar.gz
+
+# sgmltools-common.
+# It's broken and needs patching so we'll use Fedora's.
+#wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/sgml-common-0.6.3-29.fc12.src.rpm
+
+# DocBook docs:
+# http://www.oasis-open.org/docbook/sgml/
+#
+#wget -c http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
+#wget -c http://www.docbook.org/sgml/4.5/docbook-4.5.zip
+# We use Debian's source instead because they patch the docbooks which make them work!
+wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz
+wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5-4.diff.gz
+
+# http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html
+#
+wget -c ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/docbook-dsssl-1.79.tar.bz2
+wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1.79.tar.bz2
+# Why don't they put the patches into the distributed source...???
+#wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
+wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-utils-0.6.14-17.fc12.src.rpm
+
+#
+wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
+# https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608
+#wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-style-xsl-1.75.1-1.fc12.src.rpm
+wget -c http://downloads.sourceforge.net/docbook/docbook-xsl-1.71.1.tar.bz2
+wget -c http://downloads.sourceforge.net/docbook/docbook-xsl-doc-1.71.1.tar.bz2
+
+# gnome-doc-utils, needed to build gtk-doc:
+wget -c http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.17/gnome-doc-utils-0.17.2.tar.bz2
+
+# gtk-doc:
+wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2
+
+# sgmlspl
+# http://www.cs.indiana.edu/~asengupt/sgml/SGMLSpm/DOC/HTML/sgmlspl/sgmlspl.html
+# There's nothing in the FTP download site at this time, so I'll take it from Debian.
+wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz
+wget -c http://ftp.de.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-32.diff.gz
+
+# xmlto
+# https://fedorahosted.org/releases/x/m/xmlto
+wget -c --no-check-certificate http://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.22.tar.bz2
+
+# AsciiDoc
+# http://www.methods.co.nz/asciidoc/
+wget -c http://downloads.sourceforge.net/sourceforge/asciidoc/asciidoc-8.4.5.tar.gz
diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
new file mode 100755
index 000000000..6eddaf4e2
--- /dev/null
+++ b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+#####################################################################
+# trackbuild.liunxdoc-tools
+# by Stuart Winter <mozes@slackware.com>
+# Preform a few pre-build requirements then launch the build script
+# through slacktrack
+# 31-Jul-2009
+#####################################################################
+
+# Known build requirements:
+#  a/unzip for the docbook stuff
+#  l/libxml2 for /usr/bin/xmlcatalogue
+#  a/rpm2tgz to unpack some SRPMs
+#  d/python for AsciiDoc
+#  l/libxslt
+#  t/tetex (not required for a bootstrap build, but will be required
+#           later for a full build of this linuxdoc-tools package).
+
+# Package info:
+PKGNAM=linuxdoc-tools
+
+# Automatically determine architecture for build & packaging:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)    export ARCH=$( uname -m ) ;; 
+  esac
+fi
+
+BUILD=${BUILD:-5}
+PKGVERSION=0.9.56 # use the version of linuxdoc-tools as the package version.
+PKGEXT=${PKGEXT:-txz}
+
+export CWD=$PWD
+export PKGSTORE=/tmp
+export TMP=/tmp/build-$PKGNAM/
+rm -rf $TMP
+
+####################### Clean up before build #####################
+
+# It's best to clear this stuff up prior to the build.
+# All of these directories (apart from /usr/share/xml/libglade) are
+# created by this build script:
+removepkg linuxdoc-tools
+rm -rf /etc/{xml,sgml}
+rm -rf /usr/share/doc/linuxdoc-tools
+rm -rf /usr/share/sgml
+rm -rf /usr/share/xml/{docbook,xml-iso-entities*} # can't wipe the entire dir because of libglade
+rm -rf ~/.texmf-var/ # created by docbook-utils
+
+####################################################################
+
+######## WARNING ###################################################
+# This will touch nearly every file on your expendable development
+# box.  You wouldn't try this on a production system, right?
+######## WARNING ###################################################
+
+# This the faster option, but not the safest.  On a full Slackware
+# installation, you'll find new files in this directory which have
+# been 'touch'ed.  The --touch-filesystem-first will not do this,
+# but is slower.  However, if you really want extra speed, copy
+# this entire package source directory to a temporary location
+# and run it from there.
+# TFS="--touch-filesystem-faster"
+
+TFS="--touch-filesystem-first"
+
+# Launch the build script:
+slacktrack $TFS \
+   --notidy \
+   --showdeps \
+   -T $TMP \
+   -l $CWD/build.$ARCH.log \
+   -R $CWD/postbuildfixes.sh \
+   -b $PKGSTORE \
+   -YQOcp $PKGNAM-$PKGVERSION-$ARCH-$BUILD.$PKGEXT ./linuxdoc-tools.build
diff --git a/source/ap/lm_sensors/lm_sensors.SlackBuild b/source/ap/lm_sensors/lm_sensors.SlackBuild
new file mode 100755
index 000000000..72ad373de
--- /dev/null
+++ b/source/ap/lm_sensors/lm_sensors.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# Copyright 2006, 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.
+
+
+PKGNAM=lm_sensors
+VERSION=${VERSION:-3.1.1}
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION || 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:
+zcat $CWD/lm_sensors.makefile.diff.gz | patch -p1 --verbose || exit 1
+
+make user LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1
+make user_install LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1
+
+# Nope.
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+# Nope.
+rm -rf $PKG/usr/include/linux
+
+# Do the .new thing with the config file:
+mv $PKG/etc/sensors3.conf $PKG/etc/sensors3.conf.new
+
+# 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
+
+# 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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  CHANGES CONTRIBUTORS COPYING* INSTALL README* doc \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+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...
+}
+config etc/sensors3.conf.new
+EOF
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/lm_sensors/lm_sensors.makefile.diff b/source/ap/lm_sensors/lm_sensors.makefile.diff
new file mode 100644
index 000000000..8216a8d1e
--- /dev/null
+++ b/source/ap/lm_sensors/lm_sensors.makefile.diff
@@ -0,0 +1,15 @@
+--- ./Makefile.orig	2008-03-26 08:37:12.000000000 -0500
++++ ./Makefile	2008-10-25 20:05:44.000000000 -0500
+@@ -39,10 +39,10 @@
+ 
+ # If you want to install at some other place then at from which you will run
+ # everything, set DESTDIR to the extra prefix.
+-DESTDIR :=
++DESTDIR := /tmp/package-lm_sensors
+ 
+ # This is the prefix that will be used for almost all directories below.
+-PREFIX := /usr/local
++PREFIX := /usr
+ 
+ # Your C compiler
+ CC := gcc
diff --git a/source/ap/lm_sensors/slack-desc b/source/ap/lm_sensors/slack-desc
new file mode 100644
index 000000000..2f32f80d7
--- /dev/null
+++ b/source/ap/lm_sensors/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------------------------------------------------------|
+lm_sensors: lm_sensors (hardware monitoring package)
+lm_sensors:
+lm_sensors: lm_sensors provides tools for monitoring the temperatures, voltages,
+lm_sensors: and fans of Linux systems with hardware monitoring devices.  Included
+lm_sensors: are text-based tools for sensor reporting, and a library for sensors
+lm_sensors: access called libsensors.  It also contains tools for sensor hardware
+lm_sensors: identification and I2C bus probing.
+lm_sensors:
+lm_sensors: IMPORTANT NOTE:  If you have a Thinkpad, please read the warnings in
+lm_sensors: the README.thinkpad file.  lm_sensors has been known to cause damage
+lm_sensors: to some Thinkpads.
diff --git a/source/ap/lsof/lsof.SlackBuild b/source/ap/lsof/lsof.SlackBuild
new file mode 100755
index 000000000..afcef1678
--- /dev/null
+++ b/source/ap/lsof/lsof.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=4.78
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-lsof
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf lsof_$VERSION
+tar xjvf $CWD/lsof_$VERSION.tar.bz2
+cd lsof_$VERSION
+tar xvf lsof_${VERSION}_src.tar
+cd lsof_${VERSION}_src
+
+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 {} \;
+
+echo n | ./Configure linux
+make
+strip lsof
+mkdir -p $PKG/usr/bin
+cat lsof > $PKG/usr/bin/lsof
+# No, NOT suid.
+chmod 755 $PKG/usr/bin/lsof
+mkdir -p $PKG/usr/man/man8
+cat lsof.8 | gzip -9c > $PKG/usr/man/man8/lsof.8.gz
+mkdir -p $PKG/usr/doc/lsof-$VERSION
+cp -a 00* $PKG/usr/doc/lsof-$VERSION
+chmod 644 $PKG/usr/doc/lsof-$VERSION/*
+( 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
+)
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/lsof-$VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/lsof-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/ap/lsof/slack-desc b/source/ap/lsof/slack-desc
new file mode 100644
index 000000000..2d8882a77
--- /dev/null
+++ b/source/ap/lsof/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------------------------------------------------------|
+lsof: lsof (list open files)
+lsof:
+lsof: Lsof is a Unix-specific tool.  Its name stands for "LiSt Open Files",
+lsof: and it does just that.  It lists information about files that are open
+lsof: by the processes running on the system.
+lsof:
+lsof: Victor A. Abell of Purdue University is the developer of lsof.
+lsof:
+lsof:
+lsof:
+lsof:
diff --git a/source/ap/lsscsi/lsscsi.SlackBuild b/source/ap/lsscsi/lsscsi.SlackBuild
new file mode 100755
index 000000000..102e3da39
--- /dev/null
+++ b/source/ap/lsscsi/lsscsi.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=lsscsi
+VERSION=${VERSION:-0.22}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+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"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION || 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 \
+  --sysconfdir=/etc \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mv $PKG/usr/share/man $PKG/usr
+rmdir $PKG/usr/share
+
+# 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
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+#zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+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/ap/lsscsi/lsscsi.url b/source/ap/lsscsi/lsscsi.url
new file mode 100644
index 000000000..e87f176c1
--- /dev/null
+++ b/source/ap/lsscsi/lsscsi.url
@@ -0,0 +1 @@
+http://sg.danny.cz/scsi/lsscsi.html
diff --git a/source/ap/lsscsi/slack-desc b/source/ap/lsscsi/slack-desc
new file mode 100644
index 000000000..afc4f638e
--- /dev/null
+++ b/source/ap/lsscsi/slack-desc
@@ -0,0 +1,20 @@
+# 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------------------------------------------------------|
+lsscsi: lsscsi (list SCSI devices or hosts, and their attributes)
+lsscsi:
+lsscsi: Uses information in sysfs to list scsi devices (or hosts) currently
+lsscsi: attached to the system.  Options can be used to control the amount
+lsscsi: and form of information provided for each device.
+lsscsi:
+lsscsi: lsscsi was written by Doug Gilbert.
+lsscsi:
+lsscsi:
+lsscsi:
+lsscsi:
+
diff --git a/source/ap/madplay/madplay-0.15.2b.tar.gz.sign b/source/ap/madplay/madplay-0.15.2b.tar.gz.sign
new file mode 100644
index 000000000..d8c15332c
--- /dev/null
+++ b/source/ap/madplay/madplay-0.15.2b.tar.gz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: PGP 8.0.3
+
+iQA/AwUAQDp66/bzO6Ks1lsyEQLXKQCgnwZnv72//lWsJH+UY3D3xwfUImwAoPnD
+P15yJQ90MlTFmgFneRs8Kscq
+=Iwpu
+-----END PGP SIGNATURE-----
diff --git a/source/ap/madplay/madplay.SlackBuild b/source/ap/madplay/madplay.SlackBuild
new file mode 100755
index 000000000..fb322c834
--- /dev/null
+++ b/source/ap/madplay/madplay.SlackBuild
@@ -0,0 +1,79 @@
+#!/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=0.15.2b
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-madplay
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf madplay-$VERSION
+tar xvf $CWD/madplay-$VERSION.tar.gz || exit 1
+cd madplay-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --with-alsa \
+  --disable-debugging \
+  --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
+
+gzip -9 $PKG/usr/man/man1/*
+
+mkdir -p $PKG/usr/doc/madplay-$VERSION
+cp -a \
+  CHANGES COPYING COPYRIGHT CREDITS README TODO VERSION \
+  $PKG/usr/doc/madplay-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/madplay-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/madplay/slack-desc b/source/ap/madplay/slack-desc
new file mode 100644
index 000000000..ff1dcb292
--- /dev/null
+++ b/source/ap/madplay/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------------------------------------------------------|
+madplay: madplay (MPEG audio decoder and player)
+madplay:
+madplay: madplay is a command-line MPEG audio decoder and player based on the
+madplay: MAD library (libmad).  For details about MAD, see the libmad package
+madplay: distributed separately.
+madplay:
+madplay: madplay was written by Robert Leslie.
+madplay:
+madplay:
+madplay:
+madplay:
diff --git a/source/ap/man-pages/doinst.sh b/source/ap/man-pages/doinst.sh
new file mode 100644
index 000000000..f42fcb482
--- /dev/null
+++ b/source/ap/man-pages/doinst.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ ! -e usr/man/whatis ]; then
+  mv usr/man/whatis.sample usr/man/whatis
+elif [ "$(md5sum usr/man/whatis)" = "$(md5sum usr/man/whatis.sample)" ]; then
+  # toss the redundant copy
+  rm usr/man/whatis.sample
+fi
diff --git a/source/ap/man-pages/man-pages.SlackBuild b/source/ap/man-pages/man-pages.SlackBuild
new file mode 100755
index 000000000..26b7bb57a
--- /dev/null
+++ b/source/ap/man-pages/man-pages.SlackBuild
@@ -0,0 +1,100 @@
+#!/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.22}
+ARCH=noarch
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-man-pages
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf man-pages-$VERSION
+tar xvf $CWD/man-pages-$VERSION.tar.bz2
+tar xf $CWD/man-pages-posix-2003-a.tar.bz2
+chown -R root:root man-pages-$VERSION man-pages-posix-2003-a
+find man-pages-$VERSION \
+ \( -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 {} \;
+find man-pages-posix-2003-a \
+ \( -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 {} \;
+
+mkdir -p $PKG/usr/man
+cp -a man-pages-$VERSION/* $PKG/usr/man
+
+# The pthread manpages are the only POSIX ones that anyone
+# has requested saving.  If I missed anything important, let me know.
+mv man-pages-posix-2003-a/man0p/pthread.h.0p $PKG/usr/man/man3/pthread.h.3p
+mv man-pages-posix-2003-a/man3p/pthread_* $PKG/usr/man/man3
+cp man-pages-posix-2003-a/POSIX-COPYRIGHT $PKG/usr/man
+# Are these other POSIX manpages of any real usefulness here?
+# Granted there may be some historical interest, and it's nice
+# to have them in the source package for that reason, but it
+# seems to me that installing them on the system by default 
+# isn't likely to help most people and may lead to confusion.
+
+# Also probably not needed in the package
+rm -rf $PKG/usr/man/scripts
+rm -f $PKG/usr/man/Makefile
+rm -f $PKG/usr/man/Changes.old
+
+# Compress the pages:
+gzip -9 $PKG/usr/man/man*/*.*
+
+# If a man page exists in some other package, assume that's the
+# newer, better version:
+( cd $PKG
+  for file in usr/man/man*/*.gz ; do
+    if grep -l $file /var/log/packages/* | grep -v var/log/packages/man-pages ; then
+      rm -f --verbose $file
+    fi
+  done
+)
+
+# Some of the posix pages don't display correctly without this
+( cd $PKG/usr/man ; ln -s man3 man3p )
+
+# This package has always provided the initial whatis sample
+# file, so we'll continue to have that here, too:
+cp -a $CWD/whatis.sample.xz $PKG/usr/man
+( cd $PKG/usr/man
+  chown root:root whatis.sample.xz
+  chmod 644 whatis.sample.xz
+  xz -d whatis.sample.xz || exit 1
+) || exit 1
+
+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/man-pages-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/man-pages/slack-desc b/source/ap/man-pages/slack-desc
new file mode 100644
index 000000000..102e3a5bc
--- /dev/null
+++ b/source/ap/man-pages/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------------------------------------------------------|
+man-pages: man-pages (system documentation)
+man-pages:
+man-pages: Man pages are online documentation for Linux.  This package includes
+man-pages: many section 1, 2, 3, 4, 5, 7, and 8 man pages for Linux.
+man-pages:
+man-pages: The man-pages distribution is maintained by Michael Kerrisk with
+man-pages: the help of more writers, editors, and other contributors than we
+man-pages: can name here.
+man-pages:
+man-pages: For more information, see http://www.kernel.org/doc/man-pages/
+man-pages:
diff --git a/source/ap/man-pages/whatis.sample b/source/ap/man-pages/whatis.sample
new file mode 100644
index 000000000..ce3fa4bde
--- /dev/null
+++ b/source/ap/man-pages/whatis.sample
@@ -0,0 +1,12806 @@
+.ldaprc []           (5)  - ldap configuration file
+.netrc []            (5)  - user configuration for ftp
+/autofs []           (8)  - Control Script for automounter
+/etc/auto.master []  (5)  - Master Map for automounter
+/etc/bluetooth/hcid.conf [] (5)  - Configuration file for the hcid Bluetooth HCI daemon
+/etc/hosts.equiv []  (5)  - list of hosts and users that are granted trusted r command access to your system
+/etc/login.defs []   (5)  - shadow password suite configuration
+/etc/nscd.conf []    (5)  - name service cache daemon configuration file
+/etc/yp.conf []      (5)  - NIS binding configuration file
+/proc/slabinfo []    (5)  - Kernel slab allocator statistics
+/sbin/ldconfig []    (8)  - configure dynamic linker run-time bindings
+/usr/sbin/nscd []    (8)  - name service cache daemon
+/var/yp/nicknames [] (5)  - nickname translation table for NIS maps
+411toppm []          (1)  - convert Sony Mavica .411 image to PPM
+: []                 (1)  - bash built-in commands, see bash(1)
+AF_INET6 []          (7)  - Linux IPv6 protocol implementation
+AF_LOCAL []          (7)  - Sockets for local interprocess communication
+AF_PACKET []         (7)  - packet interface on device level
+AF_UNIX []           (7)  - Sockets for local interprocess communication
+AF_X25 []            (7)  - ITU-T X.25 / ISO-8208 protocol interface
+AS []                (1)  - the portable GNU assembler
+ASN1_OBJECT_free, [] (3)  - object allocation functions
+ASN1_OBJECT_new []   (3)  - object allocation functions
+ASN1_STRING_cmp []   (3)  - ASN1_STRING utility functions
+ASN1_STRING_data []  (3)  - ASN1_STRING utility functions
+ASN1_STRING_dup []   (3)  - ASN1_STRING utility functions
+ASN1_STRING_free []  (3)  - ASN1_STRING allocation functions
+ASN1_STRING_length [] (3)  - ASN1_STRING utility functions
+ASN1_STRING_length_set [] (3)  - ASN1_STRING utility functions
+ASN1_STRING_new []   (3)  - ASN1_STRING allocation functions
+ASN1_STRING_print_ex [] (3)  - ASN1_STRING output routines
+ASN1_STRING_print_ex_fp [] (3)  - ASN1_STRING output routines
+ASN1_STRING_set []   (3)  - ASN1_STRING utility functions
+ASN1_STRING_type []  (3)  - ASN1_STRING utility functions
+ASN1_STRING_type_new [] (3)  - ASN1_STRING allocation functions
+ASN1_generate_nconf [] (3)  - ASN1 generation functions
+ASN1_generate_v3 []  (3)  - ASN1 generation functions
+AllPlanes []         (3)  - Display macros and functions
+AnyDBM_File []       (3)  - provide framework for multiple DBMs
+AppleVolumes.default [] (5)  - Configuration file used by afpd(8) to determine the shares made available through Appletalk
+Archive::Extract []  (3)  - A generic archive extracting mechanism
+Archive::Tar []      (3)  - module for manipulations of tar archives
+Archive::Tar::File [] (3)  - a subclass for in-memory extracted file from Archive::Tar
+Attribute::Handlers [] (3)  - Simpler definition of attribute handlers
+Audacious []         (1)  - an audio player for X
+AutoLoader []        (3)  - load subroutines only on demand
+AutoSplit []         (3)  - split a package for autoloading
+B []                 (3)  - The Perl Compiler
+B::Concise []        (3)  - Walk Perl syntax tree, printing concise info about ops
+B::Debug []          (3)  - Walk Perl syntax tree, printing debug info about ops
+B::Deparse []        (3)  - Perl compiler backend to produce perl code
+B::Lint []           (3)  - Perl lint
+B::Showlex []        (3)  - Show lexical variables used in functions or files
+B::Terse []          (3)  - Walk Perl syntax tree, printing terse info about ops
+B::Xref []           (3)  - Generates cross reference reports for Perl programs
+BF_cbc_encrypt []    (3)  - Blowfish encryption
+BF_cfb64_encrypt []  (3)  - Blowfish encryption
+BF_decrypt []        (3)  - Blowfish encryption
+BF_ecb_encrypt []    (3)  - Blowfish encryption
+BF_encrypt []        (3)  - Blowfish encryption
+BF_ofb64_encrypt []  (3)  - Blowfish encryption
+BF_options []        (3)  - Blowfish encryption
+BF_set_key []        (3)  - Blowfish encryption
+BIO_append_filename [] (3)  - FILE bio
+BIO_callback_ctrl [] (3)  - BIO control operations
+BIO_ctrl []          (3)  - BIO control operations
+BIO_ctrl_get_read_request [] (3)  - BIO pair BIO
+BIO_ctrl_get_write_guarantee [] (3)  - BIO pair BIO
+BIO_ctrl_pending []  (3)  - BIO control operations
+BIO_ctrl_reset_read_request [] (3)  - BIO pair BIO
+BIO_ctrl_wpending [] (3)  - BIO control operations
+BIO_debug_callback [] (3)  - BIO callback functions
+BIO_destroy_bio_pair [] (3)  - BIO pair BIO
+BIO_do_accept []     (3)  - accept BIO
+BIO_do_connect []    (3)  - connect BIO
+BIO_eof []           (3)  - BIO control operations
+BIO_f_base64 []      (3)  - base64 BIO filter
+BIO_f_buffer []      (3)  - buffering BIO
+BIO_f_cipher []      (3)  - cipher BIO filter
+BIO_f_md []          (3)  - message digest BIO filter
+BIO_f_null []        (3)  - null filter
+BIO_f_ssl []         (3)  - SSL BIO
+BIO_find_type []     (3)  - BIO chain traversal
+BIO_flush []         (3)  - BIO control operations
+BIO_free []          (3)  - BIO allocation and freeing functions
+BIO_free_all []      (3)  - BIO allocation and freeing functions
+BIO_get_accept_port [] (3)  - accept BIO
+BIO_get_bind_mode [] (3)  - accept BIO
+BIO_get_callback []  (3)  - BIO callback functions
+BIO_get_callback_arg [] (3)  - BIO callback functions
+BIO_get_cipher_ctx [] (3)  - cipher BIO filter
+BIO_get_cipher_status [] (3)  - cipher BIO filter
+BIO_get_close []     (3)  - BIO control operations
+BIO_get_conn_hostname [] (3)  - connect BIO
+BIO_get_conn_int_port [] (3)  - connect BIO
+BIO_get_conn_ip []   (3)  - connect BIO
+BIO_get_conn_port [] (3)  - connect BIO
+BIO_get_fd []        (3)  - file descriptor BIO
+BIO_get_fp []        (3)  - FILE bio
+BIO_get_info_callback [] (3)  - BIO control operations
+BIO_get_md []        (3)  - message digest BIO filter
+BIO_get_md_ctx []    (3)  - message digest BIO filter
+BIO_get_mem_data []  (3)  - memory BIO
+BIO_get_mem_ptr []   (3)  - memory BIO
+BIO_get_num_renegotiates [] (3)  - SSL BIO
+BIO_get_read_request [] (3)  - BIO pair BIO
+BIO_get_retry_BIO [] (3)  - BIO retry functions
+BIO_get_retry_reason [] (3)  - BIO retry functions
+BIO_get_ssl []       (3)  - SSL BIO
+BIO_get_write_buf_size [] (3)  - BIO pair BIO
+BIO_get_write_guarantee [] (3)  - BIO pair BIO
+BIO_gets []          (3)  - BIO I/O functions
+BIO_int_ctrl []      (3)  - BIO control operations
+BIO_make_bio_pair [] (3)  - BIO pair BIO
+BIO_new []           (3)  - BIO allocation and freeing functions
+BIO_new_bio_pair []  (3)  - BIO pair BIO
+BIO_new_buffer_ssl_connect [] (3)  - SSL BIO
+BIO_new_fd []        (3)  - file descriptor BIO
+BIO_new_file []      (3)  - FILE bio
+BIO_new_fp []        (3)  - FILE bio
+BIO_new_mem_buf []   (3)  - memory BIO
+BIO_new_socket []    (3)  - socket BIO
+BIO_new_ssl []       (3)  - SSL BIO
+BIO_new_ssl_connect [] (3)  - SSL BIO
+BIO_next []          (3)  - BIO chain traversal
+BIO_pending []       (3)  - BIO control operations
+BIO_pop []           (3)  - add and remove BIOs from a chain
+BIO_ptr_ctrl []      (3)  - BIO control operations
+BIO_push []          (3)  - add and remove BIOs from a chain
+BIO_puts []          (3)  - BIO I/O functions
+BIO_read []          (3)  - BIO I/O functions
+BIO_read_filename [] (3)  - FILE bio
+BIO_reset []         (3)  - BIO control operations
+BIO_retry_type []    (3)  - BIO retry functions
+BIO_rw_filename []   (3)  - FILE bio
+BIO_s_accept []      (3)  - accept BIO
+BIO_s_bio []         (3)  - BIO pair BIO
+BIO_s_connect []     (3)  - connect BIO
+BIO_s_fd []          (3)  - file descriptor BIO
+BIO_s_file []        (3)  - FILE bio
+BIO_s_mem []         (3)  - memory BIO
+BIO_s_null []        (3)  - null data sink
+BIO_s_socket []      (3)  - socket BIO
+BIO_seek []          (3)  - BIO control operations
+BIO_set []           (3)  - BIO allocation and freeing functions
+BIO_set_accept_bios [] (3)  - accept BIO
+BIO_set_accept_port [] (3)  - accept BIO
+BIO_set_bind_mode [] (3)  - accept BIO
+BIO_set_callback []  (3)  - BIO callback functions
+BIO_set_callback_arg [] (3)  - BIO callback functions
+BIO_set_cipher []    (3)  - cipher BIO filter
+BIO_set_close []     (3)  - BIO control operations
+BIO_set_conn_hostname [] (3)  - connect BIO
+BIO_set_conn_int_port [] (3)  - connect BIO
+BIO_set_conn_ip []   (3)  - connect BIO
+BIO_set_conn_port [] (3)  - connect BIO
+BIO_set_fd []        (3)  - file descriptor BIO
+BIO_set_fp []        (3)  - FILE bio
+BIO_set_info_callback [] (3)  - BIO control operations
+BIO_set_md []        (3)  - message digest BIO filter
+BIO_set_mem_buf []   (3)  - memory BIO
+BIO_set_mem_eof_return [] (3)  - memory BIO
+BIO_set_nbio []      (3)  - connect BIO
+BIO_set_nbio_accept [] (3)  - accept BIO
+BIO_set_ssl []       (3)  - SSL BIO
+BIO_set_ssl_mode []  (3)  - SSL BIO
+BIO_set_ssl_renegotiate_bytes [] (3)  - SSL BIO
+BIO_set_ssl_renegotiate_timeout [] (3)  - SSL BIO
+BIO_set_write_buf_size [] (3)  - BIO pair BIO
+BIO_should_io_special [] (3)  - BIO retry functions
+BIO_should_read []   (3)  - BIO retry functions
+BIO_should_retry []  (3)  - BIO retry functions
+BIO_should_write []  (3)  - BIO retry functions
+BIO_shutdown_wr []   (3)  - BIO pair BIO
+BIO_ssl_copy_session_id [] (3)  - SSL BIO
+BIO_ssl_shutdown []  (3)  - SSL BIO
+BIO_tell []          (3)  - BIO control operations
+BIO_vfree []         (3)  - BIO allocation and freeing functions
+BIO_wpending []      (3)  - BIO control operations
+BIO_write []         (3)  - BIO I/O functions
+BIO_write_filename [] (3)  - FILE bio
+BN_BLINDING_convert [] (3)  - blinding related BIGNUM functions
+BN_BLINDING_convert_ex [] (3)  - blinding related BIGNUM functions
+BN_BLINDING_create_param [] (3)  - blinding related BIGNUM functions
+BN_BLINDING_free []  (3)  - blinding related BIGNUM functions
+BN_BLINDING_get_flags [] (3)  - blinding related BIGNUM functions
+BN_BLINDING_get_thread_id [] (3)  - blinding related BIGNUM functions
+BN_BLINDING_invert [] (3)  - blinding related BIGNUM functions
+BN_BLINDING_invert_ex [] (3)  - blinding related BIGNUM functions
+BN_BLINDING_new []   (3)  - blinding related BIGNUM functions
+BN_BLINDING_set_flags [] (3)  - blinding related BIGNUM functions
+BN_BLINDING_set_thread_id [] (3)  - blinding related BIGNUM functions
+BN_BLINDING_update [] (3)  - blinding related BIGNUM functions
+BN_CTX_end []        (3)  - use temporary BIGNUM variables
+BN_CTX_free []       (3)  - allocate and free BN_CTX structures
+BN_CTX_get []        (3)  - use temporary BIGNUM variables
+BN_CTX_init []       (3)  - allocate and free BN_CTX structures
+BN_CTX_new []        (3)  - allocate and free BN_CTX structures
+BN_CTX_start []      (3)  - use temporary BIGNUM variables
+BN_MONT_CTX_copy []  (3)  - Montgomery multiplication
+BN_MONT_CTX_free []  (3)  - Montgomery multiplication
+BN_MONT_CTX_init []  (3)  - Montgomery multiplication
+BN_MONT_CTX_new []   (3)  - Montgomery multiplication
+BN_MONT_CTX_set []   (3)  - Montgomery multiplication
+BN_RECP_CTX_free []  (3)  - modular multiplication using reciprocal
+BN_RECP_CTX_init []  (3)  - modular multiplication using reciprocal
+BN_RECP_CTX_new []   (3)  - modular multiplication using reciprocal
+BN_RECP_CTX_set []   (3)  - modular multiplication using reciprocal
+BN_add []            (3)  - arithmetic operations on BIGNUMs
+BN_add_word []       (3)  - arithmetic functions on BIGNUMs with integers
+BN_bin2bn []         (3)  - format conversions
+BN_bn2bin []         (3)  - format conversions
+BN_bn2dec []         (3)  - format conversions
+BN_bn2hex []         (3)  - format conversions
+BN_bn2mpi []         (3)  - format conversions
+BN_clear []          (3)  - allocate and free BIGNUMs
+BN_clear_bit []      (3)  - bit operations on BIGNUMs
+BN_clear_free []     (3)  - allocate and free BIGNUMs
+BN_cmp []            (3)  - BIGNUM comparison and test functions
+BN_copy []           (3)  - copy BIGNUMs
+BN_dec2bn []         (3)  - format conversions
+BN_div []            (3)  - arithmetic operations on BIGNUMs
+BN_div_recp []       (3)  - modular multiplication using reciprocal
+BN_div_word []       (3)  - arithmetic functions on BIGNUMs with integers
+BN_dup []            (3)  - copy BIGNUMs
+BN_exp []            (3)  - arithmetic operations on BIGNUMs
+BN_free []           (3)  - allocate and free BIGNUMs
+BN_from_montgomery [] (3)  - Montgomery multiplication
+BN_gcd []            (3)  - arithmetic operations on BIGNUMs
+BN_generate_prime [] (3)  - generate primes and test for primality
+BN_get_word []       (3)  - BIGNUM assignment operations
+BN_hex2bn []         (3)  - format conversions
+BN_init []           (3)  - allocate and free BIGNUMs
+BN_is_bit_set []     (3)  - bit operations on BIGNUMs
+BN_is_odd []         (3)  - BIGNUM comparison and test functions
+BN_is_one []         (3)  - BIGNUM comparison and test functions
+BN_is_prime []       (3)  - generate primes and test for primality
+BN_is_prime_fasttest [] (3)  - generate primes and test for primality
+BN_is_word []        (3)  - BIGNUM comparison and test functions
+BN_is_zero []        (3)  - BIGNUM comparison and test functions
+BN_lshift []         (3)  - bit operations on BIGNUMs
+BN_lshift1 []        (3)  - bit operations on BIGNUMs
+BN_mask_bits []      (3)  - bit operations on BIGNUMs
+BN_mod []            (3)  - arithmetic operations on BIGNUMs
+BN_mod_add []        (3)  - arithmetic operations on BIGNUMs
+BN_mod_exp []        (3)  - arithmetic operations on BIGNUMs
+BN_mod_inverse []    (3)  - compute inverse modulo n
+BN_mod_mul []        (3)  - arithmetic operations on BIGNUMs
+BN_mod_mul_montgomery [] (3)  - Montgomery multiplication
+BN_mod_mul_reciprocal [] (3)  - modular multiplication using reciprocal
+BN_mod_sqr []        (3)  - arithmetic operations on BIGNUMs
+BN_mod_sub []        (3)  - arithmetic operations on BIGNUMs
+BN_mod_word []       (3)  - arithmetic functions on BIGNUMs with integers
+BN_mpi2bn []         (3)  - format conversions
+BN_mul []            (3)  - arithmetic operations on BIGNUMs
+BN_mul_word []       (3)  - arithmetic functions on BIGNUMs with integers
+BN_new []            (3)  - allocate and free BIGNUMs
+BN_nnmod []          (3)  - arithmetic operations on BIGNUMs
+BN_num_bits []       (3)  - get BIGNUM size
+BN_num_bits_word []  (3)  - get BIGNUM size
+BN_num_bytes []      (3)  - get BIGNUM size
+BN_one []            (3)  - BIGNUM assignment operations
+BN_print []          (3)  - format conversions
+BN_print_fp []       (3)  - format conversions
+BN_pseudo_rand []    (3)  - generate pseudo-random number
+BN_rand []           (3)  - generate pseudo-random number
+BN_rshift []         (3)  - bit operations on BIGNUMs
+BN_rshift1 []        (3)  - bit operations on BIGNUMs
+BN_set_bit []        (3)  - bit operations on BIGNUMs
+BN_set_word []       (3)  - BIGNUM assignment operations
+BN_sqr []            (3)  - arithmetic operations on BIGNUMs
+BN_sub []            (3)  - arithmetic operations on BIGNUMs
+BN_sub_word []       (3)  - arithmetic functions on BIGNUMs with integers
+BN_swap []           (3)  - exchange BIGNUMs
+BN_to_montgomery []  (3)  - Montgomery multiplication
+BN_ucmp []           (3)  - BIGNUM comparison and test functions
+BN_value_one []      (3)  - BIGNUM assignment operations
+BN_zero []           (3)  - BIGNUM assignment operations
+BUF_MEM_free []      (3)  - simple character arrays structure
+BUF_MEM_grow []      (3)  - simple character arrays structure
+BUF_MEM_new []       (3)  - simple character arrays structure
+BUF_strdup []        (3)  - simple character arrays structure
+Benchmark []         (3)  - benchmark running times of Perl code
+BerElement []        (3)  - LBER types and allocation functions
+BerValue []          (3)  - LBER types and allocation functions
+BerVarray []         (3)  - LBER types and allocation functions
+BitmapBitOrder []    (3)  - image format functions and macros
+BitmapPad []         (3)  - image format functions and macros
+BitmapUnit []        (3)  - image format functions and macros
+BlackPixel []        (3)  - Display macros and functions
+BlackPixelOfScreen [] (3)  - screen information functions and macros
+Bundle::DBD::mysql [] (3)  - A bundle to install Perl drivers for MySQL
+Bundle::DBI []       (3)  - A bundle to install DBI and required modules
+C operator []        (7)  - C operator precedence and order of evaluation
+CA.pl []             (1)  - friendlier interface for OpenSSL certificate programs
+CACA_BLACK []        (3)  - 1); caca_free_display(dp);
+CACA_EVENT_KEY_PRESS [] (3)  - 1); caca_free_display(dp);
+CACA_WHITE); caca_put_str(cv [] (3)  - 1); caca_free_display(dp);
+CBQ []               (8)  - Class Based Queueing
+CGI []               (3)  - Simple Common Gateway Interface Class
+CGI::Apache []       (3)  - Backward compatibility module for CGI.pm
+CGI::Carp []         (3)  - CGI routines for writing to the HTTPD (or other) error log
+CGI::Cookie []       (3)  - Interface to Netscape Cookies
+CGI::Fast []         (3)  - CGI Interface for Fast CGI
+CGI::Pretty []       (3)  - module to produce nicely formatted HTML code
+CGI::Push []         (3)  - Simple Interface to Server Push
+CGI::Switch []       (3)  - Backward compatibility module for defunct CGI::Switch
+CGI::Util []         (3)  - Internal utilities used by CGI module
+CIRCLEQ_ENTRY []     (3)  - implementations of lists, tail queues, and circular queues
+CIRCLEQ_HEAD []      (3)  - implementations of lists, tail queues, and circular queues
+CIRCLEQ_INIT []      (3)  - implementations of lists, tail queues, and circular queues
+CIRCLEQ_INSERT_AFTER [] (3)  - implementations of lists, tail queues, and circular queues
+CIRCLEQ_INSERT_BEFORE [] (3)  - implementations of lists, tail queues, and circular queues
+CIRCLEQ_INSERT_HEAD [] (3)  - implementations of lists, tail queues, and circular queues
+CIRCLEQ_INSERT_TAIL [] (3)  - implementations of lists, tail queues, and circular queues
+CIRCLEQ_REMOVE []    (3)  - implementations of lists, tail queues, and circular queues
+CMSG_ALIGN []        (3)  - Access ancillary data
+CMSG_FIRSTHDR []     (3)  - Access ancillary data
+CMSG_NXTHDR []       (3)  - Access ancillary data
+CMSG_SPACE []        (3)  - Access ancillary data
+COLOR_PAIR []        (3)  - curses color manipulation routines
+CONF_modules_finish [] (3)  - OpenSSL configuration cleanup functions
+CONF_modules_free [] (3)  - OpenSSL configuration cleanup functions
+CONF_modules_load [] (3)  - OpenSSL configuration functions
+CONF_modules_load_file [] (3)  - OpenSSL configuration functions
+CONF_modules_unload [] (3)  - OpenSSL configuration cleanup functions
+CORE []              (3)  - Pseudo-namespace for Perl's core routines
+CPAN []              (3)  - query, download and build perl modules from CPAN sites
+CPAN::API::HOWTO []  (3)  - a recipe book for programming with CPAN.pm
+CPAN::FirstTime []   (3)  - Utility for CPAN::Config file Initialization
+CPAN::Kwalify []     (3)  - Interface between CPAN.pm and Kwalify.pm
+CPAN::Nox []         (3)  - Wrapper around CPAN.pm without using any XS module
+CPAN::Version []     (3)  - utility functions to compare CPAN versions
+CPANPLUS []          (3)  - API & CLI access to the CPAN mirrors
+CPANPLUS::Dist::Base [] (3)  - Base class for custom distribution classes
+CPANPLUS::Dist::Sample [] (3)  - - Sample code to create your own Dist::* plugin
+CPANPLUS::Shell::Classic [] (3)  - CPAN.pm emulation for CPANPLUS
+CPANPLUS::Shell::Default::Plugins::HOWTO [] (3)  - - documentation on how to write your own plugins
+CPU_ALLOC []         (3)  - macros for manipulating CPU sets
+CPU_ALLOC_SIZE []    (3)  - macros for manipulating CPU sets
+CPU_AND []           (3)  - macros for manipulating CPU sets
+CPU_AND_S []         (3)  - macros for manipulating CPU sets
+CPU_CLR []           (3)  - macros for manipulating CPU sets
+CPU_CLR_S []         (3)  - macros for manipulating CPU sets
+CPU_COUNT []         (3)  - macros for manipulating CPU sets
+CPU_COUNT_S []       (3)  - macros for manipulating CPU sets
+CPU_EQUAL []         (3)  - macros for manipulating CPU sets
+CPU_EQUAL_S []       (3)  - macros for manipulating CPU sets
+CPU_FREE []          (3)  - macros for manipulating CPU sets
+CPU_ISSET []         (3)  - macros for manipulating CPU sets
+CPU_ISSET_S []       (3)  - macros for manipulating CPU sets
+CPU_OR []            (3)  - macros for manipulating CPU sets
+CPU_OR_S []          (3)  - macros for manipulating CPU sets
+CPU_SET []           (3)  - macros for manipulating CPU sets
+CPU_SET_S []         (3)  - macros for manipulating CPU sets
+CPU_XOR []           (3)  - macros for manipulating CPU sets
+CPU_XOR_S []         (3)  - macros for manipulating CPU sets
+CPU_ZERO []          (3)  - macros for manipulating CPU sets
+CPU_ZERO_S []        (3)  - macros for manipulating CPU sets
+CRYPTO_destroy_dynlockid [] (3)  - OpenSSL thread support
+CRYPTO_get_ex_data [] (3)  - internal application specific data functions
+CRYPTO_get_new_dynlockid [] (3)  - OpenSSL thread support
+CRYPTO_lock []       (3)  - OpenSSL thread support
+CRYPTO_num_locks []  (3)  - OpenSSL thread support
+CRYPTO_set_dynlock_create_callback [] (3)  - OpenSSL thread support
+CRYPTO_set_dynlock_destroy_callback [] (3)  - OpenSSL thread support
+CRYPTO_set_dynlock_lock_callback [] (3)  - OpenSSL thread support
+CRYPTO_set_ex_data [] (3)  - internal application specific data functions
+CRYPTO_set_id_callback [] (3)  - OpenSSL thread support
+CRYPTO_set_locking_callback [] (3)  - OpenSSL thread support
+Carp::Heavy []       (3)  - heavy machinery, no user serviceable parts inside
+CellsOfScreen []     (3)  - screen information functions and macros
+Cervisia []          (1)  - Graphical CVS frontend
+Class::ISA []        (3)  - - report the search path for a class's ISA tree
+Class::Struct []     (3)  - declare struct-like datatypes as Perl classes
+ClientWhitePointOfCCC [] (3)  - Color Conversion Context macros
+Compress::Raw::Zlib [] (3)  - Low-Level Interface to zlib compression library
+Compress::Zlib []    (3)  - Interface to zlib compression library
+Config []            (3)  - access Perl configuration information
+Config::Extensions [] (3)  - hash lookup of which core extensions were built
+ConnectionNumber []  (3)  - Display macros and functions
+Cwd []               (3)  - get pathname of current working directory
+DBD::DBM []          (3)  - a DBI driver for DBM & MLDBM files
+DBD::File []         (3)  - Base class for writing DBI drivers
+DBD::Gofer []        (3)  - A stateless-proxy driver for communicating with a remote DBI
+DBD::Gofer::Policy::Base [] (3)  - Base class for DBD::Gofer policies
+DBD::Gofer::Policy::classic [] (3)  - The 'classic' policy for DBD::Gofer
+DBD::Gofer::Policy::pedantic [] (3)  - The 'pedantic' policy for DBD::Gofer
+DBD::Gofer::Policy::rush [] (3)  - The 'rush' policy for DBD::Gofer
+DBD::Gofer::Transport::Base [] (3)  - base class for DBD::Gofer client transports
+DBD::Gofer::Transport::null [] (3)  - DBD::Gofer client transport for testing
+DBD::Gofer::Transport::pipeone [] (3)  - DBD::Gofer client transport for testing
+DBD::Gofer::Transport::stream [] (3)  - DBD::Gofer transport for stdio streaming
+DBD::Proxy []        (3)  - A proxy driver for the DBI
+DBD::Sponge []       (3)  - Create a DBI statement handle from Perl data
+DBD::mysql []        (3)  - MySQL driver for the Perl5 Database Interface (DBI)
+DBE []               (3)  - Double Buffer Extension
+DBI::Const::GetInfo::ANSI [] (3)  - ISO/IEC SQL/CLI Constants for GetInfo
+DBI::Const::GetInfo::ODBC [] (3)  - ODBC Constants for GetInfo
+DBI::Const::GetInfoReturn [] (3)  - Data and functions for describing GetInfo results
+DBI::Const::GetInfoType [] (3)  - Data describing GetInfo type codes
+DBI::DBD []          (3)  - Perl DBI Database Driver Writer's Guide
+DBI::DBD::Metadata [] (3)  - Generate the code and data for some DBI metadata methods
+DBI::FAQ []          (3)  - - The Frequently Asked Questions for the Perl5 Database Interface
+DBI::Gofer::Execute [] (3)  - Executes Gofer requests and returns Gofer responses
+DBI::Gofer::Request [] (3)  - Encapsulate a request from DBD::Gofer to DBI::Gofer::Execute
+DBI::Gofer::Response [] (3)  - Encapsulate a response from DBI::Gofer::Execute to DBD::Gofer
+DBI::Gofer::Serializer::Base [] (3)  - base class for Gofer serialization
+DBI::Gofer::Serializer::DataDumper [] (3)  - Gofer serialization using DataDumper
+DBI::Gofer::Serializer::Storable [] (3)  - Gofer serialization using Storable
+DBI::Gofer::Transport::Base [] (3)  - Base class for Gofer transports
+DBI::Gofer::Transport::pipeone [] (3)  - DBD::Gofer server-side transport for pipeone
+DBI::Gofer::Transport::stream [] (3)  - DBD::Gofer server-side transport for stream
+DBI::Profile []      (3)  - Performance profiling and benchmarking for the DBI
+DBI::ProfileData []  (3)  - manipulate DBI::ProfileDumper data dumps
+DBI::ProfileDumper [] (3)  - profile DBI usage and output data to a file
+DBI::ProfileDumper::Apache [] (3)  - capture DBI profiling data from Apache/mod_perl
+DBI::ProfileSubs []  (3)  - Subroutines for dynamic profile Path
+DBI::ProxyServer []  (3)  - a server for the DBD::Proxy driver
+DBI::PurePerl []     (3)  - - a DBI emulation using pure perl (no C/XS compilation required)
+DBI::Roadmap []      (3)  - Planned Enhancements for the DBI
+DBI::SQL::Nano []    (3)  - a very tiny SQL engine
+DBI::Util::CacheMemory [] (3)  - a very fast but very minimal subset of Cache::Memory
+DBI::W32ODBC []      (3)  - An experimental DBI emulation layer for Win32::ODBC
+DBM_Filter []        (3)  - - Filter DBM keys/values
+DBM_Filter::compress [] (3)  - filter for DBM_Filter
+DBM_Filter::encode [] (3)  - filter for DBM_Filter
+DBM_Filter::int32 [] (3)  - filter for DBM_Filter
+DBM_Filter::null []  (3)  - filter for DBM_Filter
+DBM_Filter::utf8 []  (3)  - filter for DBM_Filter
+DB_File []           (3)  - Perl5 access to Berkeley DB version 1.x
+DB_File []           (3)  - various DBM implementations
+DES_FAILED []        (3)  - fast DES encryption
+DES_cbc_cksum []     (3)  - DES encryption
+DES_cfb64_encrypt [] (3)  - DES encryption
+DES_cfb_encrypt []   (3)  - DES encryption
+DES_crypt []         (3)  - DES encryption
+DES_ecb2_encrypt []  (3)  - DES encryption
+DES_ecb3_encrypt []  (3)  - DES encryption
+DES_ecb_encrypt []   (3)  - DES encryption
+DES_ede2_cbc_encrypt [] (3)  - DES encryption
+DES_ede2_cfb64_encrypt [] (3)  - DES encryption
+DES_ede2_ofb64_encrypt [] (3)  - DES encryption
+DES_ede3_cbc_encrypt [] (3)  - DES encryption
+DES_ede3_cbcm_encrypt [] (3)  - DES encryption
+DES_ede3_cfb64_encrypt [] (3)  - DES encryption
+DES_ede3_ofb64_encrypt [] (3)  - DES encryption
+DES_enc_read []      (3)  - DES encryption
+DES_enc_write []     (3)  - DES encryption
+DES_fcrypt []        (3)  - DES encryption
+DES_is_weak_key []   (3)  - DES encryption
+DES_key_sched []     (3)  - DES encryption
+DES_ncbc_encrypt []  (3)  - DES encryption
+DES_ofb64_encrypt [] (3)  - DES encryption
+DES_ofb_encrypt []   (3)  - DES encryption
+DES_pcbc_encrypt []  (3)  - DES encryption
+DES_quad_cksum []    (3)  - DES encryption
+DES_random_key []    (3)  - DES encryption
+DES_set_key []       (3)  - DES encryption
+DES_set_key_checked [] (3)  - DES encryption
+DES_set_key_unchecked [] (3)  - DES encryption
+DES_set_odd_parity [] (3)  - DES encryption
+DES_string_to_2keys [] (3)  - DES encryption
+DES_string_to_key [] (3)  - DES encryption
+DES_xcbc_encrypt []  (3)  - DES encryption
+DH_OpenSSL []        (3)  - select DH method
+DH_check []          (3)  - generate and check Diffie-Hellman parameters
+DH_compute_key []    (3)  - perform Diffie-Hellman key exchange
+DH_free []           (3)  - allocate and free DH objects
+DH_generate_key []   (3)  - perform Diffie-Hellman key exchange
+DH_generate_parameters [] (3)  - generate and check Diffie-Hellman parameters
+DH_get_default_method [] (3)  - select DH method
+DH_get_ex_data []    (3)  - add application specific data to DH structures
+DH_get_ex_new_index [] (3)  - add application specific data to DH structures
+DH_new []            (3)  - allocate and free DH objects
+DH_new_method []     (3)  - select DH method
+DH_set_default_method [] (3)  - select DH method
+DH_set_ex_data []    (3)  - add application specific data to DH structures
+DH_set_method []     (3)  - select DH method
+DH_size []           (3)  - get Diffie-Hellman prime size
+DHparams_print []    (3)  - print cryptographic parameters
+DHparams_print_fp [] (3)  - print cryptographic parameters
+DMX []               (3)  - X Window System DMX (Distributed Multihead X) extension
+DMXAddBackendInput [] (3)  - attach a new input
+DMXAddConsoleInput [] (3)  - attach a new input
+DMXAddInput []       (3)  - attach a new input
+DMXAddScreen []      (3)  - attach a new back-end screen
+DMXChangeDesktopAttributes [] (3)  - change global bounding box
+DMXChangeScreensAttributes [] (3)  - change back-end screen attributes
+DMXForceWindowCreation [] (3)  - force immediate back-end window creation
+DMXGetDesktopAttributes [] (3)  - determine global bounding box
+DMXGetInputAttributes [] (3)  - determine input device attributes
+DMXGetInputCount []  (3)  - determine number of input devices
+DMXGetScreenAttributes [] (3)  - determine back-end screen attributes
+DMXGetScreenCount [] (3)  - determine number of back-end screens
+DMXGetWindowAttributes [] (3)  - determine back-end window attributes
+DMXQueryExtension [] (3)  - determine if DMX is available
+DMXQueryVersion []   (3)  - determine DMX extension version
+DMXRemoveInput []    (3)  - detach an input
+DMXRemoveScreen []   (3)  - detach a back-end screen
+DMXSync []           (3)  - flush protocol requests between Xdmx and back-end X servers
+DPMSCapable []       (3)  - returns the DPMS capability of the X server
+DPMSDisable []       (3)  - disables DPMS on the specified display
+DPMSEnable []        (3)  - enables DPMS on the specified display
+DPMSForceLevel []    (3)  - forces a DPMS capable display into the specified power level
+DPMSGetTimeouts []   (3)  - retrieves the timeout values used by the X server for DPMS timings
+DPMSGetVersion []    (3)  - returns the version of the DPMS extension implemented by the X server
+DPMSInfo []          (3)  - returns information about the current DPMS state
+DPMSQueryExtension [] (3)  - queries the X server to determine the availability of the DPMS Extension
+DPMSSetTimeouts []   (3)  - permits applications to set the timeout values used by the X server for DPMS timings
+DSA_OpenSSL []       (3)  - select DSA method
+DSA_SIG_free []      (3)  - allocate and free DSA signature objects
+DSA_SIG_new []       (3)  - allocate and free DSA signature objects
+DSA_do_sign []       (3)  - raw DSA signature operations
+DSA_do_verify []     (3)  - raw DSA signature operations
+DSA_dup_DH []        (3)  - create a DH structure out of DSA structure
+DSA_free []          (3)  - allocate and free DSA objects
+DSA_generate_key []  (3)  - generate DSA key pair
+DSA_generate_parameters [] (3)  - generate DSA parameters
+DSA_get_default_method [] (3)  - select DSA method
+DSA_get_ex_data []   (3)  - add application specific data to DSA structures
+DSA_get_ex_new_index [] (3)  - add application specific data to DSA structures
+DSA_new []           (3)  - allocate and free DSA objects
+DSA_new_method []    (3)  - select DSA method
+DSA_print []         (3)  - print cryptographic parameters
+DSA_print_fp []      (3)  - print cryptographic parameters
+DSA_set_default_method [] (3)  - select DSA method
+DSA_set_ex_data []   (3)  - add application specific data to DSA structures
+DSA_set_method []    (3)  - select DSA method
+DSA_sign []          (3)  - DSA signatures
+DSA_sign_setup []    (3)  - DSA signatures
+DSA_size []          (3)  - get DSA signature size
+DSA_verify []        (3)  - DSA signatures
+DSAparams_print []   (3)  - print cryptographic parameters
+DSAparams_print_fp [] (3)  - print cryptographic parameters
+Data::Dumper []      (3)  - stringified perl data structures, suitable for both printing and eval
+DefaultColormap []   (3)  - Display macros and functions
+DefaultColormapOfScreen [] (3)  - screen information functions and macros
+DefaultDepth []      (3)  - Display macros and functions
+DefaultDepthOfScreen [] (3)  - screen information functions and macros
+DefaultGC []         (3)  - Display macros and functions
+DefaultGCOfScreen [] (3)  - screen information functions and macros
+DefaultRootWindow [] (3)  - Display macros and functions
+DefaultScreen []     (3)  - Display macros and functions
+DefaultScreenOfDisplay [] (3)  - Display macros and functions
+DefaultVisual []     (3)  - Display macros and functions
+DefaultVisualOfScreen [] (3)  - screen information functions and macros
+Devel::DProf []      (3)  - a Perl code profiler
+Devel::InnerPackage [] (3)  - find all the inner packages of a package
+Devel::PPPort []     (3)  - Perl/Pollution/Portability
+Devel::Peek []       (3)  - A data debugging tool for the XS programmer
+Devel::SelfStubber [] (3)  - generate stubs for a SelfLoading module
+Digest []            (3)  - Modules that calculate message digests
+Digest::MD5 []       (3)  - Perl interface to the MD5 Algorithm
+Digest::SHA []       (3)  - Perl extension for SHA-1/224/256/384/512
+Digest::base []      (3)  - Digest base class
+Digest::file []      (3)  - Calculate digests of files
+DirHandle []         (3)  - supply object methods for directory handles
+Dislocate []         (1)  - disconnect and reconnect processes
+DisplayCells []      (3)  - Display macros and functions
+DisplayHeight []     (3)  - image format functions and macros
+DisplayHeightMM []   (3)  - image format functions and macros
+DisplayOfCCC []      (3)  - Color Conversion Context macros
+DisplayOfScreen []   (3)  - screen information functions and macros
+DisplayPlanes []     (3)  - Display macros and functions
+DisplayString []     (3)  - Display macros and functions
+DisplayWidth []      (3)  - image format functions and macros
+DisplayWidthMM []    (3)  - image format functions and macros
+DjVu []              (1)  - DjVu and DjVuLibre
+DoesBackingStore []  (3)  - screen information functions and macros
+DoesSaveUnders []    (3)  - screen information functions and macros
+Dumpvalue []         (3)  - provides screen dump of Perl data
+DynaLoader []        (3)  - Dynamically load C libraries into Perl code
+ERR_GET_FUNC []      (3)  - get library, function and reason code
+ERR_GET_LIB []       (3)  - get library, function and reason code
+ERR_GET_REASON []    (3)  - get library, function and reason code
+ERR_PACK []          (3)  - load arbitrary error strings
+ERR_add_error_data [] (3)  - record an error
+ERR_clear_error []   (3)  - clear the error queue
+ERR_error_string []  (3)  - obtain human-readable error message
+ERR_error_string_n [] (3)  - obtain human-readable error message
+ERR_free_strings []  (3)  - load and free error strings
+ERR_func_error_string [] (3)  - obtain human-readable error message
+ERR_get_error []     (3)  - obtain error code and data
+ERR_get_error_line [] (3)  - obtain error code and data
+ERR_get_error_line_data [] (3)  - obtain error code and data
+ERR_get_next_error_library [] (3)  - load arbitrary error strings
+ERR_lib_error_string [] (3)  - obtain human-readable error message
+ERR_load_UI_strings [] (3)  - New User Interface
+ERR_load_crypto_strings [] (3)  - load and free error strings
+ERR_load_strings []  (3)  - load arbitrary error strings
+ERR_peek_error []    (3)  - obtain error code and data
+ERR_peek_error_line [] (3)  - obtain error code and data
+ERR_peek_error_line_data [] (3)  - obtain error code and data
+ERR_peek_last_error [] (3)  - obtain error code and data
+ERR_peek_last_error_line [] (3)  - obtain error code and data
+ERR_peek_last_error_line_data [] (3)  - obtain error code and data
+ERR_pop_to_mark []   (3)  - set marks and pop errors until mark
+ERR_print_errors []  (3)  - print error messages
+ERR_print_errors_fp [] (3)  - print error messages
+ERR_put_error []     (3)  - record an error
+ERR_reason_error_string [] (3)  - obtain human-readable error message
+ERR_remove_state []  (3)  - free a thread's error queue
+ERR_set_mark []      (3)  - set marks and pop errors until mark
+EVP_BytesToKey []    (3)  - password based encryption routine
+EVP_CIPHER_CTX_block_size [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_cipher [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_cleanup [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_ctrl [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_flags [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_get_app_data [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_init [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_iv_length [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_key_length [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_mode [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_nid [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_set_app_data [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_set_key_length [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_set_padding [] (3)  - EVP cipher routines
+EVP_CIPHER_CTX_type [] (3)  - EVP cipher routines
+EVP_CIPHER_asn1_to_param [] (3)  - EVP cipher routines
+EVP_CIPHER_block_size [] (3)  - EVP cipher routines
+EVP_CIPHER_flags []  (3)  - EVP cipher routines
+EVP_CIPHER_iv_length [] (3)  - EVP cipher routines
+EVP_CIPHER_key_length [] (3)  - EVP cipher routines
+EVP_CIPHER_mode []   (3)  - EVP cipher routines
+EVP_CIPHER_nid []    (3)  - EVP cipher routines
+EVP_CIPHER_param_to_asn1 [] (3)  - EVP cipher routines
+EVP_CIPHER_type []   (3)  - EVP cipher routines
+EVP_CipherFinal []   (3)  - EVP cipher routines
+EVP_CipherFinal_ex [] (3)  - EVP cipher routines
+EVP_CipherInit []    (3)  - EVP cipher routines
+EVP_CipherInit_ex [] (3)  - EVP cipher routines
+EVP_CipherUpdate []  (3)  - EVP cipher routines
+EVP_DecryptFinal []  (3)  - EVP cipher routines
+EVP_DecryptFinal_ex [] (3)  - EVP cipher routines
+EVP_DecryptInit []   (3)  - EVP cipher routines
+EVP_DecryptInit_ex [] (3)  - EVP cipher routines
+EVP_DecryptUpdate [] (3)  - EVP cipher routines
+EVP_DigestFinal_ex [] (3)  - EVP digest routines
+EVP_DigestInit_ex [] (3)  - EVP digest routines
+EVP_DigestUpdate []  (3)  - EVP digest routines
+EVP_EncryptFinal []  (3)  - EVP cipher routines
+EVP_EncryptFinal_ex [] (3)  - EVP cipher routines
+EVP_EncryptInit []   (3)  - EVP cipher routines
+EVP_EncryptInit_ex [] (3)  - EVP cipher routines
+EVP_EncryptUpdate [] (3)  - EVP cipher routines
+EVP_MAX_MD_SIZE []   (3)  - EVP digest routines
+EVP_MD_CTX_block_size [] (3)  - EVP digest routines
+EVP_MD_CTX_cleanup [] (3)  - EVP digest routines
+EVP_MD_CTX_copy []   (3)  - EVP digest routines
+EVP_MD_CTX_copy_ex [] (3)  - EVP digest routines
+EVP_MD_CTX_create [] (3)  - EVP digest routines
+EVP_MD_CTX_destroy [] (3)  - EVP digest routines
+EVP_MD_CTX_init []   (3)  - EVP digest routines
+EVP_MD_CTX_md []     (3)  - EVP digest routines
+EVP_MD_CTX_size []   (3)  - EVP digest routines
+EVP_MD_CTX_type []   (3)  - EVP digest routines
+EVP_MD_block_size [] (3)  - EVP digest routines
+EVP_MD_pkey_type []  (3)  - EVP digest routines
+EVP_MD_size []       (3)  - EVP digest routines
+EVP_MD_type []       (3)  - EVP digest routines
+EVP_OpenFinal []     (3)  - EVP envelope decryption
+EVP_OpenInit []      (3)  - EVP envelope decryption
+EVP_OpenUpdate []    (3)  - EVP envelope decryption
+EVP_PKEY_assign_DH [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_assign_DSA [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_assign_EC_KEY [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_assign_RSA [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_free []     (3)  - private key allocation functions
+EVP_PKEY_get1_DH []  (3)  - EVP_PKEY assignment functions
+EVP_PKEY_get1_DSA [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_get1_EC_KEY [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_get1_RSA [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_new []      (3)  - private key allocation functions
+EVP_PKEY_set1_DH []  (3)  - EVP_PKEY assignment functions
+EVP_PKEY_set1_DSA [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_set1_EC_KEY [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_set1_RSA [] (3)  - EVP_PKEY assignment functions
+EVP_PKEY_type []     (3)  - EVP_PKEY assignment functions
+EVP_SealFinal []     (3)  - EVP envelope encryption
+EVP_SealInit []      (3)  - EVP envelope encryption
+EVP_SealUpdate []    (3)  - EVP envelope encryption
+EVP_SignFinal []     (3)  - EVP signing functions
+EVP_SignInit []      (3)  - EVP signing functions
+EVP_SignUpdate []    (3)  - EVP signing functions
+EVP_VerifyFinal []   (3)  - EVP signature verification functions
+EVP_VerifyInit []    (3)  - EVP signature verification functions
+EVP_VerifyUpdate []  (3)  - EVP signature verification functions
+EVP_dss []           (3)  - EVP digest routines
+EVP_dss1 []          (3)  - EVP digest routines
+EVP_get_cipherbyname [] (3)  - EVP cipher routines
+EVP_get_cipherbynid [] (3)  - EVP cipher routines
+EVP_get_cipherbyobj [] (3)  - EVP cipher routines
+EVP_get_digestbyname [] (3)  - EVP digest routines
+EVP_get_digestbynid [] (3)  - EVP digest routines
+EVP_get_digestbyobj [] (3)  - EVP digest routines
+EVP_md2 []           (3)  - EVP digest routines
+EVP_md5 []           (3)  - EVP digest routines
+EVP_md_null []       (3)  - EVP digest routines
+EVP_mdc2 []          (3)  - EVP digest routines
+EVP_ripemd160 []     (3)  - EVP digest routines
+EVP_sha []           (3)  - EVP digest routines
+EVP_sha1 []          (3)  - EVP digest routines
+Enchant []           (1)  - a spellchecker
+Encode []            (3)  - character encodings
+Encode::Alias []     (3)  - alias definitions to encodings
+Encode::Byte []      (3)  - Single Byte Encodings
+Encode::CJKConstants.pm [] (3)  - - Internally used by Encode::??::ISO_2022_*
+Encode::CN []        (3)  - China-based Chinese Encodings
+Encode::CN::HZ []    (3)  - - internally used by Encode::CN
+Encode::Config []    (3)  - - internally used by Encode
+Encode::EBCDIC []    (3)  - EBCDIC Encodings
+Encode::Encoder []   (3)  - - Object Oriented Encoder
+Encode::Encoding []  (3)  - Encode Implementation Base Class
+Encode::GSM0338 []   (3)  - - ESTI GSM 03.38 Encoding
+Encode::Guess []     (3)  - - Guesses encoding from data
+Encode::JP []        (3)  - Japanese Encodings
+Encode::JP::H2Z []   (3)  - - internally used by Encode::JP::2022_JP*
+Encode::JP::JIS7 []  (3)  - - internally used by Encode::JP
+Encode::KR []        (3)  - Korean Encodings
+Encode::KR::2022_KR [] (3)  - - internally used by Encode::KR
+Encode::MIME::Header [] (3)  - - MIME 'B' and 'Q' header encoding
+Encode::MIME::NAME [] (3)  - - internally used by Encode
+Encode::PerlIO []    (3)  - - a detailed document on Encode and PerlIO
+Encode::Supported [] (3)  - - Encodings supported by Encode
+Encode::Symbol []    (3)  - Symbol Encodings
+Encode::TW []        (3)  - Taiwan-based Chinese Encodings
+Encode::Unicode []   (3)  - - Various Unicode Transformation Formats
+Encode::Unicode::UTF7 [] (3)  - - UTF-7 encoding
+English []           (3)  - use nice English (or awk) names for ugly punctuation variables
+Env []               (3)  - perl module that imports environment variables as scalars or arrays
+Errno []             (3)  - System errno constants
+Error []             (3)  - Error/exception handling in an OO-ish way
+EventMaskOfScreen [] (3)  - screen information functions and macros
+Exporter []          (3)  - Implements default import method for modules
+Exporter::Heavy []   (3)  - Exporter guts
+ExtUtils::CBuilder [] (3)  - Compile and link C code for Perl modules
+ExtUtils::CBuilder::Platform::Windows [] (3)  - Builder class for Windows platforms
+ExtUtils::Command [] (3)  - utilities to replace common UNIX commands in Makefiles etc
+ExtUtils::Command::MM [] (3)  - Commands for the MM's to use in Makefiles
+ExtUtils::Constant [] (3)  - generate XS code to import C header constants
+ExtUtils::Constant::Base [] (3)  - base class for ExtUtils::Constant objects
+ExtUtils::Constant::Utils [] (3)  - helper functions for ExtUtils::Constant
+ExtUtils::Embed []   (3)  - Utilities for embedding Perl in C/C++ applications
+ExtUtils::Install [] (3)  - install files from here to there
+ExtUtils::Installed [] (3)  - Inventory management of installed modules
+ExtUtils::Liblist [] (3)  - determine libraries to use and how to use them
+ExtUtils::MM []      (3)  - OS adjusted ExtUtils::MakeMaker subclass
+ExtUtils::MM_AIX []  (3)  - AIX specific subclass of ExtUtils::MM_Unix
+ExtUtils::MM_Any []  (3)  - Platform-agnostic MM methods
+ExtUtils::MM_BeOS [] (3)  - methods to override UN*X behaviour in ExtUtils::MakeMaker
+ExtUtils::MM_Cygwin [] (3)  - methods to override UN*X behaviour in ExtUtils::MakeMaker
+ExtUtils::MM_DOS []  (3)  - DOS specific subclass of ExtUtils::MM_Unix
+ExtUtils::MM_MacOS [] (3)  - once produced Makefiles for MacOS Classic
+ExtUtils::MM_NW5 []  (3)  - methods to override UN*X behaviour in ExtUtils::MakeMaker
+ExtUtils::MM_OS2 []  (3)  - methods to override UN*X behaviour in ExtUtils::MakeMaker
+ExtUtils::MM_QNX []  (3)  - QNX specific subclass of ExtUtils::MM_Unix
+ExtUtils::MM_UWIN [] (3)  - U/WIN specific subclass of ExtUtils::MM_Unix
+ExtUtils::MM_Unix [] (3)  - methods used by ExtUtils::MakeMaker
+ExtUtils::MM_VMS []  (3)  - methods to override UN*X behaviour in ExtUtils::MakeMaker
+ExtUtils::MM_VOS []  (3)  - VOS specific subclass of ExtUtils::MM_Unix
+ExtUtils::MM_Win32 [] (3)  - methods to override UN*X behaviour in ExtUtils::MakeMaker
+ExtUtils::MM_Win95 [] (3)  - method to customize MakeMaker for Win9X
+ExtUtils::MY []      (3)  - ExtUtils::MakeMaker subclass for customization
+ExtUtils::MakeMaker [] (3)  - Create a module Makefile
+ExtUtils::MakeMaker::Config [] (3)  - Wrapper around Config.pm
+ExtUtils::MakeMaker::FAQ [] (3)  - Frequently Asked Questions About MakeMaker
+ExtUtils::MakeMaker::Tutorial [] (3)  - Writing a module with MakeMaker
+ExtUtils::MakeMaker::bytes [] (3)  - Version-agnostic bytes.pm
+ExtUtils::MakeMaker::vmsish [] (3)  - Platform-agnostic vmsish.pm
+ExtUtils::Manifest [] (3)  - utilities to write and check a MANIFEST file
+ExtUtils::Miniperl [] (3)  - write the C code for perlmain.c
+ExtUtils::Mkbootstrap [] (3)  - make a bootstrap file for use by DynaLoader
+ExtUtils::Mksymlists [] (3)  - write linker options files for dynamic extension
+ExtUtils::Packlist [] (3)  - manage .packlist files
+ExtUtils::ParseXS [] (3)  - converts Perl XS code into C code
+ExtUtils::testlib [] (3)  - add blib/* directories to @INC
+FD_CLR []            (2)  - synchronous I/O multiplexing
+FD_ISSET []          (2)  - synchronous I/O multiplexing
+FD_SET []            (2)  - synchronous I/O multiplexing
+FD_ZERO []           (2)  - synchronous I/O multiplexing
+Fatal []             (3)  - replace functions with equivalents which succeed or die
+FcAtomicCreate []    (3)  - create an FcAtomic object
+FcAtomicDeleteNew [] (3)  - delete new file
+FcAtomicDestroy []   (3)  - destroy an FcAtomic object
+FcAtomicLock []      (3)  - lock a file
+FcAtomicNewFile []   (3)  - return new temporary file name
+FcAtomicOrigFile []  (3)  - return original file name
+FcAtomicReplaceOrig [] (3)  - replace original with new
+FcAtomicUnlock []    (3)  - unlock a file
+FcBlanksAdd []       (3)  - Add a character to an FcBlanks
+FcBlanksCreate []    (3)  - Create an FcBlanks
+FcBlanksDestroy []   (3)  - Destroy and FcBlanks
+FcBlanksIsMember []  (3)  - Query membership in an FcBlanks
+FcCacheCopySet []    (3)  - Returns a copy of the fontset from cache
+FcCacheDir []        (3)  - Return directory of cache
+FcCacheNumFont []    (3)  - Returns the number of fonts in cache
+FcCacheNumSubdir []  (3)  - Return the number of subdirectories in cache
+FcCacheSubdir []     (3)  - Return the i'th subdirectory
+FcCharSetAddChar []  (3)  - Add a character to a charset
+FcCharSetCopy []     (3)  - Copy a charset
+FcCharSetCount []    (3)  - Count entries in a charset
+FcCharSetCoverage [] (3)  - DEPRECATED return coverage for a Unicode page
+FcCharSetCreate []   (3)  - Create an empty character set
+FcCharSetDestroy []  (3)  - Destroy a character set
+FcCharSetEqual []    (3)  - Compare two charsets
+FcCharSetFirstPage [] (3)  - Start enumerating charset contents
+FcCharSetHasChar []  (3)  - Check a charset for a char
+FcCharSetIntersect [] (3)  - Intersect charsets
+FcCharSetIntersectCount [] (3)  - Intersect and count charsets
+FcCharSetIsSubset [] (3)  - Test for charset inclusion
+FcCharSetNew []      (3)  - DEPRECATED alias for FcCharSetCreate
+FcCharSetNextPage [] (3)  - Continue enumerating charset contents
+FcCharSetSubtract [] (3)  - Subtract charsets
+FcCharSetSubtractCount [] (3)  - Subtract and count charsets
+FcCharSetUnion []    (3)  - Add charsets
+FcConfigAppFontAddDir [] (3)  - Add fonts from directory to font database
+FcConfigAppFontAddFile [] (3)  - Add font file to font database
+FcConfigAppFontClear [] (3)  - Remove all app fonts from font database
+FcConfigBuildFonts [] (3)  - Build font database
+FcConfigCreate []    (3)  - Create a configuration
+FcConfigDestroy []   (3)  - Destroy a configuration
+FcConfigEnableHome [] (3)  - controls use of the home directory
+FcConfigFilename []  (3)  - Find a config file
+FcConfigGetBlanks [] (3)  - Get config blanks
+FcConfigGetCache []  (3)  - DEPRECATED used to return per-user cache filename
+FcConfigGetCacheDirs [] (3)  - return the list of directories searched for cache files
+FcConfigGetConfigDirs [] (3)  - Get config directories
+FcConfigGetConfigFiles [] (3)  - Get config files
+FcConfigGetCurrent [] (3)  - Return current configuration
+FcConfigGetFontDirs [] (3)  - Get font directories
+FcConfigGetFonts []  (3)  - Get config font set
+FcConfigGetRescanInterval [] (3)  - Get config rescan interval
+FcConfigHome []      (3)  - return the current home directory
+FcConfigParseAndLoad [] (3)  - load a configuration file
+FcConfigSetCurrent [] (3)  - Set configuration as default
+FcConfigSetRescanInterval [] (3)  - Set config rescan interval
+FcConfigSubstitute [] (3)  - Execute substitutions
+FcConfigSubstituteWithPat [] (3)  - Execute substitutions
+FcConfigUptoDate []  (3)  - Check timestamps on config files
+FcDefaultSubstitute [] (3)  - Perform default substitutions in a pattern
+FcDirCacheLoad []    (3)  - load a directory cache
+FcDirCacheLoadFile [] (3)  - load a cache file
+FcDirCacheRead []    (3)  - read or construct a directory cache
+FcDirCacheUnlink []  (3)  - Remove all caches related to dir
+FcDirCacheUnload []  (3)  - unload a cache file
+FcDirCacheValid []   (3)  - check directory cache
+FcDirSave []         (3)  - DEPRECATED: formerly used to save a directory cache
+FcDirScan []         (3)  - DEPRECATED: formerly used to scan a font directory
+FcFileIsDir []       (3)  - check whether a file is a directory
+FcFileScan []        (3)  - scan a font file
+FcFini []            (3)  - finalize fonconfig library
+FcFontList []        (3)  - List fonts
+FcFontMatch []       (3)  - Return best font
+FcFontRenderPrepare [] (3)  - Prepare pattern for loading font file
+FcFontSetAdd []      (3)  - Add to a font set
+FcFontSetCreate []   (3)  - Create a font set
+FcFontSetDestroy []  (3)  - Destroy a font set
+FcFontSetList []     (3)  - List fonts from a set of font sets
+FcFontSetMatch []    (3)  - Return the best font from a set of font sets
+FcFontSetPrint []    (3)  - Print a set of patterns to stdout
+FcFontSetSort []     (3)  - Add to a font set
+FcFontSetSortDestroy [] (3)  - DEPRECATED destroy a font set
+FcFontSort []        (3)  - Return list of matching fonts
+FcFreeTypeCharIndex [] (3)  - map Unicode to glyph id
+FcFreeTypeCharSet [] (3)  - compute unicode coverage
+FcFreeTypeCharSetAndSpacing [] (3)  - compute unicode coverage and spacing type
+FcFreeTypeQuery []   (3)  - compute pattern from font file (and index)
+FcFreeTypeQueryFace [] (3)  - compute pattern from FT_Face
+FcGetLangs []        (3)  - Get list of languages
+FcGetVersion []      (3)  - library version number
+FcInit []            (3)  - initialize fontconfig library
+FcInitBringUptoDate [] (3)  - reload configuration files if needed
+FcInitLoadConfig []  (3)  - load configuration
+FcInitLoadConfigAndFonts [] (3)  - load configuration and font data
+FcInitReinitialize [] (3)  - re-initialize library
+FcIsLower []         (3)  - check for lower case ASCII character
+FcIsUpper []         (3)  - check for upper case ASCII character
+FcLangGetCharSet []  (3)  - Get character map for a language
+FcLangSetAdd []      (3)  - add a language to a langset
+FcLangSetCompare []  (3)  - compare language sets
+FcLangSetContains [] (3)  - check langset subset relation
+FcLangSetCopy []     (3)  - copy a langset object
+FcLangSetCreate []   (3)  - create a langset object
+FcLangSetDestroy []  (3)  - destroy a langset object
+FcLangSetEqual []    (3)  - test for matching langsets
+FcLangSetHasLang []  (3)  - test langset for language support
+FcLangSetHash []     (3)  - return a hash value for a langset
+FcMatrixCopy []      (3)  - Copy a matrix
+FcMatrixEqual []     (3)  - Compare two matrices
+FcMatrixInit []      (3)  - initialize an FcMatrix structure
+FcMatrixMultiply []  (3)  - Multiply matrices
+FcMatrixRotate []    (3)  - Rotate a matrix
+FcMatrixScale []     (3)  - Scale a matrix
+FcMatrixShear []     (3)  - Shear a matrix
+FcNameConstant []    (3)  - Get the value for a symbolic constant
+FcNameGetConstant [] (3)  - Lookup symbolic constant
+FcNameGetObjectType [] (3)  - Lookup an object type
+FcNameParse []       (3)  - Parse a pattern string
+FcNameRegisterConstants [] (3)  - Register symbolic constants
+FcNameRegisterObjectTypes [] (3)  - Register object types
+FcNameUnparse []     (3)  - Convert a pattern back into a string that can be parsed
+FcNameUnregisterConstants [] (3)  - Unregister symbolic constants
+FcNameUnregisterObjectTypes [] (3)  - Unregister object types
+FcObjectSetAdd []    (3)  - Add to an object set
+FcObjectSetBuild []  (3)  - Build object set from args
+FcObjectSetCreate [] (3)  - Create an object set
+FcObjectSetDestroy [] (3)  - Destroy an object set
+FcObjectSetVaBuild [] (3)  - Build object set from args
+FcObjectSetVapBuild [] (3)  - Build object set from args
+FcPatternAdd []      (3)  - Add a value to a pattern
+FcPatternAddBool []  (3)  - Add a typed value to a pattern
+FcPatternAddCharSet [] (3)  - Add a typed value to a pattern
+FcPatternAddDouble [] (3)  - Add a typed value to a pattern
+FcPatternAddFTFace [] (3)  - Add a typed value to a pattern
+FcPatternAddInteger [] (3)  - Add a typed value to a pattern
+FcPatternAddLangSet [] (3)  - Add a typed value to a pattern
+FcPatternAddMatrix [] (3)  - Add a typed value to a pattern
+FcPatternAddString [] (3)  - Add a typed value to a pattern
+FcPatternAddWeak []  (3)  - Add a value to a pattern with weak binding
+FcPatternBuild []    (3)  - Create patterns from arguments
+FcPatternCreate []   (3)  - Create a pattern
+FcPatternDel []      (3)  - Delete a property from a pattern
+FcPatternDestroy []  (3)  - Destroy a pattern
+FcPatternDuplicate [] (3)  - Copy a pattern
+FcPatternEqual []    (3)  - Compare patterns
+FcPatternEqualSubset [] (3)  - Compare portions of patterns
+FcPatternGet []      (3)  - Return a value from a pattern
+FcPatternGetBool []  (3)  - Return a typed value from a pattern
+FcPatternGetCharSet [] (3)  - Return a typed value from a pattern
+FcPatternGetDouble [] (3)  - Return a typed value from a pattern
+FcPatternGetFTFace [] (3)  - Return a typed value from a pattern
+FcPatternGetInteger [] (3)  - Return a typed value from a pattern
+FcPatternGetLangSet [] (3)  - Return a typed value from a pattern
+FcPatternGetMatrix [] (3)  - Return a typed value from a pattern
+FcPatternGetString [] (3)  - Return a typed value from a pattern
+FcPatternHash []     (3)  - Compute a pattern hash value
+FcPatternPrint []    (3)  - Print a pattern for debugging
+FcPatternReference [] (3)  - Increment pattern reference count
+FcPatternRemove []   (3)  - Remove one object of the specified type from the pattern
+FcPatternVaBuild []  (3)  - Create patterns from arguments
+FcPatternVapBuild [] (3)  - Create patterns from arguments
+FcStrBasename []     (3)  - last component of filename
+FcStrCmp []          (3)  - compare UTF-8 strings
+FcStrCmpIgnoreCase [] (3)  - compare UTF-8 strings ignoring case
+FcStrCopy []         (3)  - duplicate a string
+FcStrCopyFilename [] (3)  - create a complete path from a filename
+FcStrDirname []      (3)  - directory part of filename
+FcStrDowncase []     (3)  - create a lower case translation of a string
+FcStrFree []         (3)  - free a string
+FcStrListCreate []   (3)  - create a string iterator
+FcStrListDone []     (3)  - destroy a string iterator
+FcStrListNext []     (3)  - get next string in iteration
+FcStrPlus []         (3)  - concatenate two strings
+FcStrSetAdd []       (3)  - add to a string set
+FcStrSetAddFilename [] (3)  - add a filename to a string set
+FcStrSetCreate []    (3)  - create a string set
+FcStrSetDel []       (3)  - delete from a string set
+FcStrSetDestroy []   (3)  - destroy a string set
+FcStrSetEqual []     (3)  - check sets for equality
+FcStrSetMember []    (3)  - check set for membership
+FcStrStr []          (3)  - locate UTF-8 substring
+FcStrStrIgnoreCase [] (3)  - locate UTF-8 substring ignoring ASCII case
+FcToLower []         (3)  - convert upper case ASCII to lower case
+FcUcs4ToUtf8 []      (3)  - convert UCS4 to UTF-8
+FcUtf16Len []        (3)  - count UTF-16 encoded chars
+FcUtf16ToUcs4 []     (3)  - convert UTF-16 to UCS4
+FcUtf8Len []         (3)  - count UTF-8 encoded chars
+FcUtf8ToUcs4 []      (3)  - convert UTF-8 to UCS4
+FcValueDestroy []    (3)  - Free a value
+FcValueEqual []      (3)  - Test two values for equality
+FcValuePrint []      (3)  - Print a value to stdout
+FcValueSave []       (3)  - Copy a value
+Fcntl []             (3)  - load the C Fcntl.h defines
+File::Basename []    (3)  - Parse file paths into directory, filename and suffix
+File::CheckTree []   (3)  - run many filetest checks on a tree
+File::Compare []     (3)  - Compare files or filehandles
+File::Copy []        (3)  - Copy files or filehandles
+File::DosGlob []     (3)  - DOS like globbing and then some
+File::Fetch []       (3)  - A generic file fetching mechanism
+File::Find []        (3)  - Traverse a directory tree
+File::Glob []        (3)  - Perl extension for BSD glob routine
+File::GlobMapper []  (3)  - Extend File Glob to Allow Input and Output Files
+File::Path []        (3)  - Create or remove directory trees
+File::Spec []        (3)  - portably perform operations on file names
+File::Spec::Cygwin [] (3)  - methods for Cygwin file specs
+File::Spec::Epoc []  (3)  - methods for Epoc file specs
+File::Spec::Functions [] (3)  - portably perform operations on file names
+File::Spec::Mac []   (3)  - File::Spec for Mac OS (Classic)
+File::Spec::OS2 []   (3)  - methods for OS/2 file specs
+File::Spec::Unix []  (3)  - File::Spec for Unix, base for other File::Spec modules
+File::Spec::VMS []   (3)  - methods for VMS file specs
+File::Spec::Win32 [] (3)  - methods for Win32 file specs
+File::Temp []        (3)  - return name and handle of a temporary file safely
+File::stat []        (3)  - by-name interface to Perl's built-in stat() functions
+FileCache []         (3)  - keep more files open than the system permits
+FileHandle []        (3)  - supply object methods for filehandles
+Filter::Simple []    (3)  - Simplified source filtering
+Filter::Util::Call [] (3)  - Perl Source Filter Utility Module
+Finch []             (1)  - A Pimpin' Penguin console frontend to libpurple. Instant Messaging client
+FindBin []           (3)  - Locate directory of original perl script
+FvwmAnimate []       (1)  - the Fvwm Animate module
+FvwmAuto []          (1)  - the FVWM auto-raise module
+FvwmBacker []        (1)  - the FVWM background changer module
+FvwmBanner []        (1)  - the FVWM Banner
+FvwmButtons []       (1)  - the FVWM buttonbox module
+FvwmCommand []       (1)  - FVWM command external interface
+FvwmConsole []       (1)  - an FVWM command input interface
+FvwmConsoleC.pl []   (1)  - Command editor for FVWM command input interface
+FvwmCpp []           (1)  - the FVWM Cpp pre-processor
+FvwmDebug []         (1)  - the FVWM module debugger
+FvwmDragWell []      (1)  - A XDND drag well
+FvwmEvent []         (1)  - the FVWM Event module
+FvwmForm []          (1)  - input form module for Fvwm
+FvwmGtk []           (1)  - the Fvwm GTK module
+FvwmIconBox []       (1)  - the FVWM icon box module
+FvwmIconMan []       (1)  - an Fvwm Icon Manager
+FvwmIdent []         (1)  - the FVWM identify-window module
+FvwmM4 []            (1)  - the FVWM M4 pre-processor
+FvwmPager []         (1)  - the FVWM Pager module
+FvwmRearrange []     (1)  - rearrange FVWM windows
+FvwmSave []          (1)  - the FVWM desktop-layout saving module
+FvwmSaveDesk []      (1)  - another FVWM desktop-layout saving module
+FvwmScript []        (1)  - module to build graphic user interface
+FvwmScroll []        (1)  - the FVWM scroll-bar module
+FvwmTaskBar []       (1)  - the FVWM taskbar module
+FvwmTheme []         (1)  - an FVWM module for managing the appearance of FVWM and its modules
+FvwmWharf []         (1)  - the AfterStep application dock module ported to Fvwm
+FvwmWinList []       (1)  - the FVWM window list module
+GDBM []              (3)  - The GNU database manager. Includes dbm and ndbm compatability. (Version .)
+GDBM_File []         (3)  - Perl5 access to the gdbm library
+GDBM_File []         (3)  - various DBM implementations
+GNU Parted []        (8)  - a partition manipulation program
+GQview []            (1)  - GTK based multiformat image viewer
+Getopt::Long []      (3)  - Extended processing of command line options
+Git []               (3)  - Perl interface to the Git version control system
+GnuPG []             (7)  - The GNU Privacy Guard suite of programs
+HMAC []              (3)  - HMAC message authentication code
+HMAC_Final []        (3)  - HMAC message authentication code
+HMAC_Init []         (3)  - HMAC message authentication code
+HMAC_Update []       (3)  - HMAC message authentication code
+HMAC_cleanup []      (3)  - HMAC message authentication code
+HTB []               (8)  - Hierarchy Token Bucket
+HUGE_VAL []          (3)  - floating-point constants
+HUGE_VALF []         (3)  - floating-point constants
+HUGE_VALL []         (3)  - floating-point constants
+Hash::Util []        (3)  - A selection of general-utility hash subroutines
+Hash::Util::FieldHash [] (3)  - Support for Inside-Out Classes
+HeightMMOfScreen []  (3)  - screen information functions and macros
+HeightOfScreen []    (3)  - screen information functions and macros
+I18N::Collate []     (3)  - compare 8-bit scalar data according to the current locale
+I18N::LangTags []    (3)  - functions for dealing with RFC3066-style language tags
+I18N::LangTags::Detect [] (3)  - detect the user's language preferences
+I18N::LangTags::List [] (3)  - - tags and names for human languages
+I18N::Langinfo []    (3)  - query locale information
+IMAPd []             (8)  - Internet Message Access Protocol server
+INFINITY []          (3)  - floating-point constants
+INSTALL []           (3)  - How to install and configure DBD::mysql
+IO []                (3)  - load various IO modules
+IO::Compress::Base [] (3)  - Base Class for IO::Compress modules
+IO::Compress::Deflate [] (3)  - Write RFC 1950 files/buffers
+IO::Compress::Gzip [] (3)  - Write RFC 1952 files/buffers
+IO::Compress::RawDeflate [] (3)  - Write RFC 1951 files/buffers
+IO::Compress::Zip [] (3)  - Write zip files/buffers
+IO::Dir []           (3)  - supply object methods for directory handles
+IO::File []          (3)  - supply object methods for filehandles
+IO::Handle []        (3)  - supply object methods for I/O handles
+IO::Pipe []          (3)  - supply object methods for pipes
+IO::Poll []          (3)  - Object interface to system poll call
+IO::Seekable []      (3)  - supply seek based methods for I/O objects
+IO::Select []        (3)  - OO interface to the select system call
+IO::Socket []        (3)  - Object interface to socket communications
+IO::Socket::INET []  (3)  - Object interface for AF_INET domain sockets
+IO::Socket::UNIX []  (3)  - Object interface for AF_UNIX domain sockets
+IO::Uncompress::AnyInflate [] (3)  - Uncompress zlib-based (zip, gzip) file/buffer
+IO::Uncompress::AnyUncompress [] (3)  - Uncompress gzip, zip, bzip2 or lzop file/buffer
+IO::Uncompress::Base [] (3)  - Base Class for IO::Uncompress modules
+IO::Uncompress::Gunzip [] (3)  - Read RFC 1952 files/buffers
+IO::Uncompress::Inflate [] (3)  - Read RFC 1950 files/buffers
+IO::Uncompress::RawInflate [] (3)  - Read RFC 1951 files/buffers
+IO::Uncompress::Unzip [] (3)  - Read zip files/buffers
+IO::Zlib []          (3)  - IO:: style interface to Compress::Zlib
+IPC::Cmd []          (3)  - finding and running system commands made easy
+IPC::Msg []          (3)  - SysV Msg IPC object class
+IPC::Open2 []        (3)  - open a process for both reading and writing
+IPC::Open3 []        (3)  - open a process for reading, writing, and error handling
+IPC::Semaphore []    (3)  - SysV Semaphore IPC object class
+IPC::SysV []         (3)  - SysV IPC constants
+IPOPd []             (8)  - Post Office Protocol server
+IPPROTO_ICMP []      (7)  - Linux IPv4 ICMP kernel module
+Image::Magick []     (3)  - Perl extension for calling ImageMagick's libMagick methods
+ImageByteOrder []    (3)  - image format functions and macros
+ImageMagick []       (1)  - is a free software suite for the creation, modification and display of bitmap images
+Irssi []             (1)  - a modular IRC client for UNIX
+IsCursorKey []       (3)  - keysym classification macros
+IsFunctionKey []     (3)  - keysym classification macros
+IsKeypadKey []       (3)  - keysym classification macros
+IsMiscFunctionKey [] (3)  - keysym classification macros
+IsModifierKey []     (3)  - keysym classification macros
+IsPFKey []           (3)  - keysym classification macros
+IsPrivateKeypadKey [] (3)  - keysym classification macros
+Jed []               (1)  - programmers editor
+Juggler3D []         (6)  - a 3D juggling simulation
+Kaleidescope []      (6)  - rotating line segments
+LHa []               (1)  - LZH un-archiver
+LIST_ENTRY []        (3)  - implementations of lists, tail queues, and circular queues
+LIST_HEAD []         (3)  - implementations of lists, tail queues, and circular queues
+LIST_INIT []         (3)  - implementations of lists, tail queues, and circular queues
+LIST_INSERT_AFTER [] (3)  - implementations of lists, tail queues, and circular queues
+LIST_INSERT_HEAD []  (3)  - implementations of lists, tail queues, and circular queues
+LIST_REMOVE []       (3)  - implementations of lists, tail queues, and circular queues
+LastKnownRequestProcessed [] (3)  - Display macros and functions
+List::Util []        (3)  - A selection of general-utility list subroutines
+Locale::Constants [] (3)  - constants for Locale codes
+Locale::Country []   (3)  - ISO codes for country identification (ISO 3166)
+Locale::Currency []  (3)  - ISO three letter codes for currency identification (ISO 4217)
+Locale::Language []  (3)  - ISO two letter codes for language identification (ISO 639)
+Locale::Maketext []  (3)  - framework for localization
+Locale::Maketext::Simple [] (3)  - Simple interface to Locale::Maketext::Lexicon
+Locale::Maketext::TPJ13 [] (3)  - - article about software localization
+Locale::Script []    (3)  - ISO codes for script identification (ISO 15924)
+Log::Message []      (3)  - A generic message storing mechanism;
+Log::Message::Config [] (3)  - Configuration options for Log::Message
+Log::Message::Handlers [] (3)  - Message handlers for Log::Message
+Log::Message::Item [] (3)  - Message objects for Log::Message
+M17NObjectHead []    (3)  - The first member of a managed object
+MAKEDEV []           (8)  - create devices
+MB_CUR_MAX []        (3)  - maximum length of a multibyte character in the current locale
+MB_LEN_MAX []        (3)  - maximum multibyte length of a character across all locales
+MD2 []               (3)  - MD2, MD4, and MD5 hash functions
+MD2_Final []         (3)  - MD2, MD4, and MD5 hash functions
+MD2_Init []          (3)  - MD2, MD4, and MD5 hash functions
+MD2_Update []        (3)  - MD2, MD4, and MD5 hash functions
+MD4 []               (3)  - MD2, MD4, and MD5 hash functions
+MD4_Final []         (3)  - MD2, MD4, and MD5 hash functions
+MD4_Init []          (3)  - MD2, MD4, and MD5 hash functions
+MD4_Update []        (3)  - MD2, MD4, and MD5 hash functions
+MD5 []               (3)  - MD2, MD4, and MD5 hash functions
+MD5_Final []         (3)  - MD2, MD4, and MD5 hash functions
+MD5_Init []          (3)  - MD2, MD4, and MD5 hash functions
+MD5_Update []        (3)  - MD2, MD4, and MD5 hash functions
+MDC2 []              (3)  - MDC2 hash function
+MDC2_Final []        (3)  - MDC2 hash function
+MDC2_Init []         (3)  - MDC2 hash function
+MDC2_Update []       (3)  - MDC2 hash function
+MDrawMetric []       (3)  - Type of metric for glyphs and texts
+MIME []              (1)  - Multipurpose Internet Mail Extensions
+MIME::Base64 []      (3)  - Encoding and decoding of base64 strings
+MIME::QuotedPrint [] (3)  - Encoding and decoding of quoted-printable strings
+MMDF []              (5)  - Multi-channel Memorandum Distribution Facility mailbox format
+Magick []            (1)  - config - get information about the installed version of ImageMagick
+Magick++ []          (1)  - config - get information about the installed version of Magick++
+MagickCore []        (1)  - config - get information about the installed version of ImageMagick
+MagickWand []        (1)  - config - get information about the installed version of the Magick Wand
+Math::BigFloat []    (3)  - Arbitrary size floating point math package
+Math::BigInt []      (3)  - Arbitrary size integer/float math package
+Math::BigInt::Calc [] (3)  - Pure Perl module to support Math::BigInt
+Math::BigInt::CalcEmu [] (3)  - Emulate low-level math with BigInt code
+Math::BigInt::FastCalc [] (3)  - Math::BigInt::Calc with some XS for more speed
+Math::BigRat []      (3)  - Arbitrary big rational numbers
+Math::Complex []     (3)  - complex numbers and associated mathematical functions
+Math::Trig []        (3)  - trigonometric functions
+MaxCmapsOfScreen []  (3)  - screen information functions and macros
+Memoize []           (3)  - Make functions faster by trading space for time
+Memoize::AnyDBM_File [] (3)  - glue to provide EXISTS for AnyDBM_File for Storable use
+Memoize::Expire []   (3)  - Plug-in module for automatic expiration of memoized values
+Memoize::ExpireFile [] (3)  - test for Memoize expiration semantics
+Memoize::ExpireTest [] (3)  - test for Memoize expiration semantics
+Memoize::NDBM_File [] (3)  - glue to provide EXISTS for NDBM_File for Storable use
+Memoize::SDBM_File [] (3)  - glue to provide EXISTS for SDBM_File for Storable use
+Memoize::Storable [] (3)  - store Memoized data in Storable database
+MinCmapsOfScreen []  (3)  - screen information functions and macros
+Module::Build []     (3)  - Build and install Perl modules
+Module::Build::API [] (3)  - API Reference for Module Authors
+Module::Build::Authoring [] (3)  - Authoring Module::Build modules
+Module::Build::Base [] (3)  - Default methods for Module::Build
+Module::Build::Compat [] (3)  - Compatibility with ExtUtils::MakeMaker
+Module::Build::ConfigData [] (3)  - Configuration for Module::Build
+Module::Build::Cookbook [] (3)  - Examples of Module::Build Usage
+Module::Build::PPMMaker [] (3)  - Perl Package Manager file creation
+Module::Build::Platform::Amiga [] (3)  - Builder class for Amiga platforms
+Module::Build::Platform::Default [] (3)  - Stub class for unknown platforms
+Module::Build::Platform::EBCDIC [] (3)  - Builder class for EBCDIC platforms
+Module::Build::Platform::MPEiX [] (3)  - Builder class for MPEiX platforms
+Module::Build::Platform::MacOS [] (3)  - Builder class for MacOS platforms
+Module::Build::Platform::RiscOS [] (3)  - Builder class for RiscOS platforms
+Module::Build::Platform::Unix [] (3)  - Builder class for Unix platforms
+Module::Build::Platform::VMS [] (3)  - Builder class for VMS platforms
+Module::Build::Platform::VOS [] (3)  - Builder class for VOS platforms
+Module::Build::Platform::Windows [] (3)  - Builder class for Windows platforms
+Module::Build::Platform::aix [] (3)  - Builder class for AIX platform
+Module::Build::Platform::cygwin [] (3)  - Builder class for Cygwin platform
+Module::Build::Platform::darwin [] (3)  - Builder class for Mac OS X platform
+Module::Build::Platform::os2 [] (3)  - Builder class for OS/2 platform
+Module::Build::YAML [] (3)  - Provides just enough YAML support so that Module::Build works even if YAML.pm is not installed
+Module::CoreList []  (3)  - what modules shipped with versions of perl
+Module::Load []      (3)  - runtime require of both modules and files
+Module::Load::Conditional [] (3)  - Looking up module information / loading at runtime
+Module::Loaded []    (3)  - mark modules as loaded or unloaded
+Module::Pluggable [] (3)  - automatically give your module the ability to have plugins
+Module::Pluggable::Object [] (3)  - automatically give your module the ability to have plugins
+ModuleInfo []        (3)  - Gather package and POD information from a perl module files
+NAN []               (3)  - floating-point constants
+NDBM_File []         (3)  - various DBM implementations
+NETLINK_ROUTE []     (7)  - Linux IPv4 routing socket
+NEXT.pm []           (3)  - Provide a pseudo-class NEXT (et al) that allows method redispatch
+Net []               (3)  - SNMP Agent handler and extensibility API - The basic theory goes something like this: In the past, with the original mib module api (which derived from the original CMU SNMP code) the underlying mib modules were passed very little information (only the truly most basic information about a request)
+Net::Cmd []          (3)  - Network Command class (as used by FTP, SMTP etc)
+Net::Config []       (3)  - Local configuration data for libnet
+Net::Domain []       (3)  - Attempt to evaluate the current host's internet name and domain
+Net::FTP []          (3)  - FTP Client class
+Net::NNTP []         (3)  - NNTP Client class
+Net::Netrc []        (3)  - OO interface to users netrc file
+Net::POP3 []         (3)  - Post Office Protocol 3 Client class (RFC1939)
+Net::Ping []         (3)  - check a remote host for reachability
+Net::SMTP []         (3)  - Simple Mail Transfer Protocol Client
+Net::Time []         (3)  - time and daytime network client interface
+Net::hostent []      (3)  - by-name interface to Perl's built-in gethost*() functions
+Net::netent []       (3)  - by-name interface to Perl's built-in getnet*() functions
+Net::protoent []     (3)  - by-name interface to Perl's built-in getproto*() functions
+Net::servent []      (3)  - by-name interface to Perl's built-in getserv*() functions
+NetSNMP::ASN []      (3)  - Perl extension for SNMP ASN.1 types
+NetSNMP::OID []      (3)  - Perl extension for manipulating OIDs
+NetSNMP::TrapReceiver [] (3)  - Embedded perl trap handling for Net-SNMP's snmptrapd
+NetSNMP::agent []    (3)  - Perl extension for the net-snmp agent
+NetSNMP::agent::default_store [] (3)  - Perl extension for Net-SNMP agent default storage
+NetSNMP::agent::netsnmp_request_infoPtr [] (3)  - Perl extension for request information
+NetSNMP::default_store [] (3)  - Perl extension for Net-SNMP generic storage of global data
+Netwatch []          (1)  - Ethernet Internet Protocol Monitor
+NextRequest []       (3)  - Display macros and functions
+O []                 (3)  - Generic interface to Perl Compiler backends
+OBJ_cleanup []       (3)  - ASN1 object utility functions
+OBJ_cmp []           (3)  - ASN1 object utility functions
+OBJ_create []        (3)  - ASN1 object utility functions
+OBJ_dup []           (3)  - ASN1 object utility functions
+OBJ_ln2nid []        (3)  - ASN1 object utility functions
+OBJ_nid2ln []        (3)  - ASN1 object utility functions
+OBJ_nid2obj []       (3)  - ASN1 object utility functions
+OBJ_nid2sn []        (3)  - ASN1 object utility functions
+OBJ_obj2nid []       (3)  - ASN1 object utility functions
+OBJ_obj2txt []       (3)  - ASN1 object utility functions
+OBJ_sn2nid []        (3)  - ASN1 object utility functions
+OBJ_txt2nid []       (3)  - ASN1 object utility functions
+OBJ_txt2obj []       (3)  - ASN1 object utility functions
+ODBM_File []         (3)  - various DBM implementations
+OMAPI []             (3)  - Object Management Application Programming Interface
+OPENSSL_Applink []   (3)  - glue between OpenSSL BIO and Win32 compiler run-time
+OPENSSL_VERSION_NUMBER [] (3)  - get OpenSSL version number
+OPENSSL_config []    (3)  - simple OpenSSL configuration functions
+OPENSSL_ia32cap []   (3)  - finding the IA-32 processor capabilities
+OPENSSL_load_builtin_modules [] (3)  - add standard configuration modules
+OPENSSL_no_config [] (3)  - simple OpenSSL configuration functions
+OSSP mm []           (3)  - Shared Memory Allocation
+Opcode []            (3)  - Disable named opcodes when compiling perl code
+OpenSSL_add_all_algorithms [] (3)  - add algorithms to internal table
+OpenSSL_add_all_ciphers [] (3)  - add algorithms to internal table
+OpenSSL_add_all_digests [] (3)  - add algorithms to internal table
+OpenSSL_add_ssl_algorithms [] (3)  - initialize SSL library by registering algorithms
+PAIR_NUMBER []       (3)  - curses character and window attribute control routines
+PCRE []              (3)  - Perl-compatible regular expressions
+PEM []               (3)  - PEM routines
+PKCS12_create []     (3)  - create a PKCS#12 structure
+PKCS12_parse []      (3)  - parse a PKCS#12 structure
+PKCS7_decrypt []     (3)  - decrypt content from a PKCS#7 envelopedData structure
+PKCS7_encrypt []     (3)  - create a PKCS#7 envelopedData structure
+PKCS7_sign []        (3)  - create a PKCS#7 signedData structure
+PKCS7_verify []      (3)  - verify a PKCS#7 signedData structure
+POSIX []             (3)  - Perl interface to IEEE Std 1003.1
+PRIO []              (8)  - Priority qdisc
+Package::Constants [] (3)  - List all constants declared in a package
+Params::Check []     (3)  - A generic input parsing/checking mechanism
+PerlIO []            (3)  - On demand loader for PerlIO layers and root of PerlIO::* name space
+PerlIO::encoding []  (3)  - encoding layer
+PerlIO::scalar []    (3)  - in-memory IO, scalar IO
+PerlIO::via []       (3)  - Helper class for PerlIO layers implemented in perl
+PerlIO::via::QuotedPrint [] (3)  - PerlIO layer for quoted-printable strings
+Pidgin []            (3)  - Perl extension for the Pidgin instant messenger
+PlanesOfScreen []    (3)  - screen information functions and macros
+Pnews []             (1)  - a program for posting news articles
+Pod::Checker []      (3)  - check pod documents for syntax errors
+Pod::Escapes []      (3)  - - for resolving Pod E<...> sequences
+Pod::Find []         (3)  - find POD documents in directory trees
+Pod::Html []         (3)  - module to convert pod files to HTML
+Pod::InputObjects [] (3)  - objects representing POD input paragraphs, commands, etc
+Pod::LaTeX []        (3)  - Convert Pod data to formatted Latex
+Pod::Man []          (3)  - Convert POD data to formatted *roff input
+Pod::ParseLink []    (3)  - Parse an L<> formatting code in POD text
+Pod::ParseUtils []   (3)  - helpers for POD parsing and conversion
+Pod::Parser []       (3)  - base class for creating POD filters and translators
+Pod::Perldoc::ToChecker [] (3)  - let Perldoc check Pod for errors
+Pod::Perldoc::ToMan [] (3)  - let Perldoc render Pod as man pages
+Pod::Perldoc::ToNroff [] (3)  - let Perldoc convert Pod to nroff
+Pod::Perldoc::ToPod [] (3)  - let Perldoc render Pod as ... Pod!
+Pod::Perldoc::ToRtf [] (3)  - let Perldoc render Pod as RTF
+Pod::Perldoc::ToText [] (3)  - let Perldoc render Pod as plaintext
+Pod::Perldoc::ToTk [] (3)  - let Perldoc use Tk::Pod to render Pod
+Pod::Perldoc::ToXml [] (3)  - let Perldoc render Pod as XML
+Pod::PlainText []    (3)  - Convert POD data to formatted ASCII text
+Pod::Plainer []      (3)  - Perl extension for converting Pod to old style Pod
+Pod::Select []       (3)  - extract selected sections of POD from input
+Pod::Simple []       (3)  - framework for parsing Pod
+Pod::Simple::Checker [] (3)  - - check the Pod syntax of a document
+Pod::Simple::Debug [] (3)  - - put Pod::Simple into trace/debug mode
+Pod::Simple::DumpAsText [] (3)  - - dump Pod-parsing events as text
+Pod::Simple::DumpAsXML [] (3)  - - turn Pod into XML
+Pod::Simple::HTML [] (3)  - convert Pod to HTML
+Pod::Simple::HTMLBatch [] (3)  - convert several Pod files to several HTML files
+Pod::Simple::LinkSection [] (3)  - - represent section attributes of L codes
+Pod::Simple::Methody [] (3)  - - turn Pod::Simple events into method calls
+Pod::Simple::PullParser [] (3)  - - a pull-parser interface to parsing Pod
+Pod::Simple::PullParserEndToken [] (3)  - - end-tokens from Pod::Simple::PullParser
+Pod::Simple::PullParserStartToken [] (3)  - - start-tokens from Pod::Simple::PullParser
+Pod::Simple::PullParserTextToken [] (3)  - - text-tokens from Pod::Simple::PullParser
+Pod::Simple::PullParserToken [] (3)  - - tokens from Pod::Simple::PullParser
+Pod::Simple::RTF []  (3)  - - format Pod as RTF
+Pod::Simple::Search [] (3)  - find POD documents in directory trees
+Pod::Simple::SimpleTree [] (3)  - - parse Pod into a simple parse tree
+Pod::Simple::Subclassing [] (3)  - - write a formatter as a Pod::Simple subclass
+Pod::Simple::Text [] (3)  - - format Pod as plaintext
+Pod::Simple::TextContent [] (3)  - - get the text content of Pod
+Pod::Simple::XMLOutStream [] (3)  - - turn Pod into XML
+Pod::Text []         (3)  - Convert POD data to formatted ASCII text
+Pod::Text::Color []  (3)  - Convert POD data to formatted color ASCII text
+Pod::Text::Overstrike [] (3)  - Convert POD data to formatted overstrike text
+Pod::Text::Termcap [] (3)  - Convert POD data to ASCII text with format escapes
+Pod::Usage []        (3)  - print a usage message from embedded pod documentation
+ProtocolRevision []  (3)  - Display macros and functions
+ProtocolVersion []   (3)  - Display macros and functions
+Purple []            (3)  - Perl extension to the libpurple instant messenger library
+Q []                 (3)  - 1)) && ! e.quit?) p e d.refresh end
+QLength []           (3)  - Display macros and functions
+RAND_SSLeay []       (3)  - select RAND method
+RAND_add []          (3)  - add entropy to the PRNG
+RAND_bytes []        (3)  - generate random data
+RAND_cleanup []      (3)  - erase the PRNG state
+RAND_egd []          (3)  - query entropy gathering daemon
+RAND_event []        (3)  - add entropy to the PRNG
+RAND_file_name []    (3)  - PRNG seed file
+RAND_get_rand_method [] (3)  - select RAND method
+RAND_load_file []    (3)  - PRNG seed file
+RAND_pseudo_bytes [] (3)  - generate random data
+RAND_screen []       (3)  - add entropy to the PRNG
+RAND_seed []         (3)  - add entropy to the PRNG
+RAND_set_rand_method [] (3)  - select RAND method
+RAND_status []       (3)  - add entropy to the PRNG
+RAND_write_file []   (3)  - PRNG seed file
+RC4 []               (3)  - RC4 encryption
+RC4_set_key []       (3)  - RC4 encryption
+README.BS2000 []     (1)  - building and installing Perl for BS2000
+README.aix []        (1)  - Perl version 5 on IBM Unix (AIX) systems
+README.apollo []     (1)  - Perl version 5 on Apollo DomainOS
+README.beos []       (1)  - Perl version 5.8+ on BeOS
+README.cygwin []     (1)  - Perl for Cygwin
+README.epoc []       (1)  - Perl for EPOC
+README.freebsd []    (1)  - Perl version 5 on FreeBSD systems
+README.hpux []       (1)  - Perl version 5 on Hewlett-Packard Unix (HP-UX) systems
+README.hurd []       (1)  - Perl version 5 on Hurd
+README.irix []       (1)  - Perl version 5 on Irix systems
+README.linux []      (1)  - Perl version 5 on Linux systems
+README.machten []    (1)  - Perl version 5 on Power MachTen systems
+README.macos []      (1)  - Perl under Mac OS (Classic)
+README.macosx []     (1)  - Perl under Mac OS X
+README.mint []       (1)  - Perl version 5 on Atari MiNT
+README.mpeix []      (1)  - Perl/iX for HP e3000 MPE
+README.openbsd []    (1)  - Perl version 5 on OpenBSD systems
+README.os390 []      (1)  - building and installing Perl for OS/390 and z/OS
+README.os400 []      (1)  - Perl version 5 on OS/400
+README.qnx []        (1)  - Perl version 5 on QNX
+README.riscos []     (1)  - Perl version 5 for RISC OS
+README.solaris []    (1)  - Perl version 5 on Solaris systems
+README.symbian []    (1)  - Perl version 5 on Symbian OS
+README.tru64 []      (1)  - Perl version 5 on Tru64 (formerly known as Digital UNIX formerly known as DEC OSF/1) systems
+README.vmesa []      (1)  - building and installing Perl for VM/ESA
+README.vos []        (1)  - Perl for Stratus VOS
+RIPEMD160 []         (3)  - RIPEMD - 160 hash function
+RIPEMD160_Final []   (3)  - RIPEMD - 160 hash function
+RIPEMD160_Init []    (3)  - RIPEMD - 160 hash function
+RIPEMD160_Update []  (3)  - RIPEMD - 160 hash function
+RSA_PKCS1_SSLeay []  (3)  - select RSA method
+RSA_blinding_off []  (3)  - protect the RSA operation from timing attacks
+RSA_blinding_on []   (3)  - protect the RSA operation from timing attacks
+RSA_check_key []     (3)  - validate private RSA keys
+RSA_flags []         (3)  - select RSA method
+RSA_free []          (3)  - allocate and free RSA objects
+RSA_generate_key []  (3)  - generate RSA key pair
+RSA_get_default_method [] (3)  - select RSA method
+RSA_get_ex_data []   (3)  - add application specific data to RSA structures
+RSA_get_ex_new_index [] (3)  - add application specific data to RSA structures
+RSA_get_method []    (3)  - select RSA method
+RSA_new []           (3)  - allocate and free RSA objects
+RSA_new_method []    (3)  - select RSA method
+RSA_null_method []   (3)  - select RSA method
+RSA_padding_add_PKCS1_OAEP [] (3)  - asymmetric encryption padding
+RSA_padding_add_PKCS1_type_1 [] (3)  - asymmetric encryption padding
+RSA_padding_add_PKCS1_type_2 [] (3)  - asymmetric encryption padding
+RSA_padding_add_SSLv23 [] (3)  - asymmetric encryption padding
+RSA_padding_add_none [] (3)  - asymmetric encryption padding
+RSA_padding_check_PKCS1_OAEP [] (3)  - asymmetric encryption padding
+RSA_padding_check_PKCS1_type_1 [] (3)  - asymmetric encryption padding
+RSA_padding_check_PKCS1_type_2 [] (3)  - asymmetric encryption padding
+RSA_padding_check_SSLv23 [] (3)  - asymmetric encryption padding
+RSA_padding_check_none [] (3)  - asymmetric encryption padding
+RSA_print []         (3)  - print cryptographic parameters
+RSA_print_fp []      (3)  - print cryptographic parameters
+RSA_private_decrypt [] (3)  - RSA public key cryptography
+RSA_private_encrypt [] (3)  - low level signature operations
+RSA_public_decrypt [] (3)  - low level signature operations
+RSA_public_encrypt [] (3)  - RSA public key cryptography
+RSA_set_default_method [] (3)  - select RSA method
+RSA_set_ex_data []   (3)  - add application specific data to RSA structures
+RSA_set_method []    (3)  - select RSA method
+RSA_sign []          (3)  - RSA signatures
+RSA_sign_ASN1_OCTET_STRING [] (3)  - RSA signatures
+RSA_size []          (3)  - get RSA modulus size
+RSA_verify []        (3)  - RSA signatures
+RSA_verify_ASN1_OCTET_STRING [] (3)  - RSA signatures
+Rnmail []            (1)  - a program for replying via mail
+RootWindow []        (3)  - Display macros and functions
+RootWindowOfScreen [] (3)  - screen information functions and macros
+SASL []              (3)  - SASL authentication library
+SDBM_File []         (3)  - Tied access to sdbm files
+SDBM_File []         (3)  - various DBM implementations
+SDLKey               (3)  - SDL Keysym Definitions
+SDLKey []            (3)  - SDL Keysym Definitions
+SDL_ActiveEvent      (3)  - Application visibility event structure
+SDL_ActiveEvent []   (3)  - Application visibility event structure
+SDL_AddTimer         (3)  - Add a timer which will call a callback after the specified number of milliseconds has elapsed
+SDL_AddTimer []      (3)  - Add a timer which will call a callback after the specified number of milliseconds has elapsed
+SDL_AudioCVT         (3)  - Audio Conversion Structure
+SDL_AudioCVT []      (3)  - Audio Conversion Structure
+SDL_AudioSpec        (3)  - Audio Specification Structure
+SDL_AudioSpec []     (3)  - Audio Specification Structure
+SDL_BlitSurface      (3)  - This performs a fast blit from the source surface to the destination surface
+SDL_BlitSurface []   (3)  - This performs a fast blit from the source surface to the destination surface
+SDL_BuildAudioCVT    (3)  - Initializes a SDL_AudioCVT structure for conversion
+SDL_BuildAudioCVT [] (3)  - Initializes a SDL_AudioCVT structure for conversion
+SDL_CD               (3)  - CDROM Drive Information
+SDL_CD []            (3)  - CDROM Drive Information
+SDL_CDClose          (3)  - Closes a SDL_CD handle
+SDL_CDClose []       (3)  - Closes a SDL_CD handle
+SDL_CDEject          (3)  - Ejects a CDROM
+SDL_CDEject []       (3)  - Ejects a CDROM
+SDL_CDName           (3)  - Returns a human-readable, system-dependent identifier for the CD-ROM
+SDL_CDName []        (3)  - Returns a human-readable, system-dependent identifier for the CD-ROM
+SDL_CDNumDrives      (3)  - Returns the number of CD-ROM drives on the system
+SDL_CDNumDrives []   (3)  - Returns the number of CD-ROM drives on the system
+SDL_CDOpen           (3)  - Opens a CD-ROM drive for access
+SDL_CDOpen []        (3)  - Opens a CD-ROM drive for access
+SDL_CDPause          (3)  - Pauses a CDROM
+SDL_CDPause []       (3)  - Pauses a CDROM
+SDL_CDPlay           (3)  - Play a CD
+SDL_CDPlay []        (3)  - Play a CD
+SDL_CDPlayTracks     (3)  - Play the given CD track(s)
+SDL_CDPlayTracks []  (3)  - Play the given CD track(s)
+SDL_CDResume         (3)  - Resumes a CDROM
+SDL_CDResume []      (3)  - Resumes a CDROM
+SDL_CDStatus         (3)  - Returns the current status of the given drive
+SDL_CDStatus []      (3)  - Returns the current status of the given drive
+SDL_CDStop           (3)  - Stops a CDROM
+SDL_CDStop []        (3)  - Stops a CDROM
+SDL_CDtrack          (3)  - CD Track Information Structure
+SDL_CDtrack []       (3)  - CD Track Information Structure
+SDL_CloseAudio       (3)  - Shuts down audio processing and closes the audio device
+SDL_CloseAudio []    (3)  - Shuts down audio processing and closes the audio device
+SDL_Color            (3)  - Format independent color description
+SDL_Color []         (3)  - Format independent color description
+SDL_CondBroadcast    (3)  - Restart all threads waiting on a condition variable
+SDL_CondBroadcast [] (3)  - Restart all threads waiting on a condition variable
+SDL_CondSignal       (3)  - Restart a thread wait on a condition variable
+SDL_CondSignal []    (3)  - Restart a thread wait on a condition variable
+SDL_CondWait         (3)  - Wait on a condition variable
+SDL_CondWait []      (3)  - Wait on a condition variable
+SDL_CondWaitTimeout  (3)  - Wait on a condition variable, with timeout
+SDL_CondWaitTimeout [] (3)  - Wait on a condition variable, with timeout
+SDL_ConvertAudio     (3)  - Convert audio data to a desired audio format
+SDL_ConvertAudio []  (3)  - Convert audio data to a desired audio format
+SDL_ConvertSurface   (3)  - Converts a surface to the same format as another surface
+SDL_ConvertSurface [] (3)  - Converts a surface to the same format as another surface
+SDL_CreateCond       (3)  - Create a condition variable
+SDL_CreateCond []    (3)  - Create a condition variable
+SDL_CreateCursor     (3)  - Creates a new mouse cursor
+SDL_CreateCursor []  (3)  - Creates a new mouse cursor
+SDL_CreateMutex      (3)  - Create a mutex
+SDL_CreateMutex []   (3)  - Create a mutex
+SDL_CreateRGBSurface (3)  - Create an empty SDL_Surface
+SDL_CreateRGBSurface [] (3)  - Create an empty SDL_Surface
+SDL_CreateRGBSurfaceFrom (3)  - Create an SDL_Surface from pixel data
+SDL_CreateRGBSurfaceFrom [] (3)  - Create an SDL_Surface from pixel data
+SDL_CreateSemaphore  (3)  - Creates a new semaphore and assigns an initial value to it
+SDL_CreateSemaphore [] (3)  - Creates a new semaphore and assigns an initial value to it
+SDL_CreateThread     (3)  - Creates a new thread of execution that shares its parent's properties
+SDL_CreateThread []  (3)  - Creates a new thread of execution that shares its parent's properties
+SDL_CreateYUVOverlay (3)  - Create a YUV video overlay
+SDL_CreateYUVOverlay [] (3)  - Create a YUV video overlay
+SDL_Delay            (3)  - Wait a specified number of milliseconds before returning
+SDL_Delay []         (3)  - Wait a specified number of milliseconds before returning
+SDL_DestroyCond      (3)  - Destroy a condition variable
+SDL_DestroyCond []   (3)  - Destroy a condition variable
+SDL_DestroyMutex     (3)  - Destroy a mutex
+SDL_DestroyMutex []  (3)  - Destroy a mutex
+SDL_DestroySemaphore (3)  - Destroys a semaphore that was created by SDL_CreateSemaphore
+SDL_DestroySemaphore [] (3)  - Destroys a semaphore that was created by SDL_CreateSemaphore
+SDL_DisplayFormat    (3)  - Convert a surface to the display format
+SDL_DisplayFormat [] (3)  - Convert a surface to the display format
+SDL_DisplayFormatAlpha (3)  - Convert a surface to the display format
+SDL_DisplayFormatAlpha [] (3)  - Convert a surface to the display format
+SDL_DisplayYUVOverlay (3)  - Blit the overlay to the display
+SDL_DisplayYUVOverlay [] (3)  - Blit the overlay to the display
+SDL_EnableKeyRepeat  (3)  - Set keyboard repeat rate
+SDL_EnableKeyRepeat [] (3)  - Set keyboard repeat rate
+SDL_EnableUNICODE    (3)  - Enable UNICODE translation
+SDL_EnableUNICODE [] (3)  - Enable UNICODE translation
+SDL_Event            (3)  - General event structure
+SDL_Event []         (3)  - General event structure
+SDL_EventState       (3)  - This function allows you to set the state of processing certain events
+SDL_EventState []    (3)  - This function allows you to set the state of processing certain events
+SDL_ExposeEvent      (3)  - Quit requested event
+SDL_ExposeEvent []   (3)  - Quit requested event
+SDL_FillRect         (3)  - This function performs a fast fill of the given rectangle with some color
+SDL_FillRect []      (3)  - This function performs a fast fill of the given rectangle with some color
+SDL_Flip             (3)  - Swaps screen buffers
+SDL_Flip []          (3)  - Swaps screen buffers
+SDL_FreeCursor       (3)  - Frees a cursor created with SDL_CreateCursor
+SDL_FreeCursor []    (3)  - Frees a cursor created with SDL_CreateCursor
+SDL_FreeSurface      (3)  - Frees (deletes) a SDL_Surface
+SDL_FreeSurface []   (3)  - Frees (deletes) a SDL_Surface
+SDL_FreeWAV          (3)  - Frees previously opened WAV data
+SDL_FreeWAV []       (3)  - Frees previously opened WAV data
+SDL_FreeYUVOverlay   (3)  - Free a YUV video overlay
+SDL_FreeYUVOverlay [] (3)  - Free a YUV video overlay
+SDL_FunctionName [SDL_RWFromFile] (3)  - Short description of function
+SDL_FunctionName []  (3)  - Short description of function
+SDL_GL_GetAttribute  (3)  - Get the value of a special SDL/OpenGL attribute
+SDL_GL_GetAttribute [] (3)  - Get the value of a special SDL/OpenGL attribute
+SDL_GL_GetProcAddress (3)  - Get the address of a GL function
+SDL_GL_GetProcAddress [] (3)  - Get the address of a GL function
+SDL_GL_LoadLibrary   (3)  - Specify an OpenGL library
+SDL_GL_LoadLibrary [] (3)  - Specify an OpenGL library
+SDL_GL_SetAttribute  (3)  - Set a special SDL/OpenGL attribute
+SDL_GL_SetAttribute [] (3)  - Set a special SDL/OpenGL attribute
+SDL_GL_SwapBuffers   (3)  - Swap OpenGL framebuffers/Update Display
+SDL_GL_SwapBuffers [] (3)  - Swap OpenGL framebuffers/Update Display
+SDL_GLattr           (3)  - SDL GL Attributes
+SDL_GLattr []        (3)  - SDL GL Attributes
+SDL_GetAppState      (3)  - Get the state of the application
+SDL_GetAppState []   (3)  - Get the state of the application
+SDL_GetAudioStatus   (3)  - Get the current audio state
+SDL_GetAudioStatus [] (3)  - Get the current audio state
+SDL_GetClipRect      (3)  - Gets the clipping rectangle for a surface
+SDL_GetClipRect []   (3)  - Gets the clipping rectangle for a surface
+SDL_GetCursor        (3)  - Get the currently active mouse cursor
+SDL_GetCursor []     (3)  - Get the currently active mouse cursor
+SDL_GetError         (3)  - Get SDL error string
+SDL_GetError []      (3)  - Get SDL error string
+SDL_GetEventFilter   (3)  - Retrieves a pointer to he event filter
+SDL_GetEventFilter [] (3)  - Retrieves a pointer to he event filter
+SDL_GetGamma         (3)  - Gets the gamma of the display
+SDL_GetGamma []      (3)  - Gets the gamma of the display
+SDL_GetGammaRamp     (3)  - Gets the color gamma lookup tables for the display
+SDL_GetGammaRamp []  (3)  - Gets the color gamma lookup tables for the display
+SDL_GetKeyName       (3)  - Get the name of an SDL virtual keysym
+SDL_GetKeyName []    (3)  - Get the name of an SDL virtual keysym
+SDL_GetKeyState      (3)  - Get a snapshot of the current keyboard state
+SDL_GetKeyState []   (3)  - Get a snapshot of the current keyboard state
+SDL_GetModState      (3)  - Get the state of modifier keys
+SDL_GetModState []   (3)  - Get the state of modifier keys
+SDL_GetMouseState    (3)  - Retrieve the current state of the mouse
+SDL_GetMouseState [] (3)  - Retrieve the current state of the mouse
+SDL_GetRGB           (3)  - Get RGB values from a pixel in the specified pixel format
+SDL_GetRGB []        (3)  - Get RGB values from a pixel in the specified pixel format
+SDL_GetRGBA          (3)  - Get RGBA values from a pixel in the specified pixel format
+SDL_GetRGBA []       (3)  - Get RGBA values from a pixel in the specified pixel format
+SDL_GetRelativeMouseState (3)  - Retrieve the current state of the mouse
+SDL_GetRelativeMouseState [] (3)  - Retrieve the current state of the mouse
+SDL_GetThreadID      (3)  - Get the SDL thread ID of a SDL_Thread
+SDL_GetThreadID []   (3)  - Get the SDL thread ID of a SDL_Thread
+SDL_GetTicks         (3)  - Get the number of milliseconds since the SDL library initialization
+SDL_GetTicks []      (3)  - Get the number of milliseconds since the SDL library initialization
+SDL_GetVideoInfo     (3)  - returns a pointer to information about the video hardware
+SDL_GetVideoInfo []  (3)  - returns a pointer to information about the video hardware
+SDL_GetVideoSurface  (3)  - returns a pointer to the current display surface
+SDL_GetVideoSurface [] (3)  - returns a pointer to the current display surface
+SDL_Init             (3)  - Initializes SDL
+SDL_Init []          (3)  - Initializes SDL
+SDL_InitSubSystem    (3)  - Initialize subsystems
+SDL_InitSubSystem [] (3)  - Initialize subsystems
+SDL_JoyAxisEvent     (3)  - Joystick axis motion event structure
+SDL_JoyAxisEvent []  (3)  - Joystick axis motion event structure
+SDL_JoyBallEvent     (3)  - Joystick trackball motion event structure
+SDL_JoyBallEvent []  (3)  - Joystick trackball motion event structure
+SDL_JoyButtonEvent   (3)  - Joystick button event structure
+SDL_JoyButtonEvent [] (3)  - Joystick button event structure
+SDL_JoyHatEvent      (3)  - Joystick hat position change event structure
+SDL_JoyHatEvent []   (3)  - Joystick hat position change event structure
+SDL_JoystickClose    (3)  - Closes a previously opened joystick
+SDL_JoystickClose [] (3)  - Closes a previously opened joystick
+SDL_JoystickEventState (3)  - Enable/disable joystick event polling
+SDL_JoystickEventState [] (3)  - Enable/disable joystick event polling
+SDL_JoystickGetAxis  (3)  - Get the current state of an axis
+SDL_JoystickGetAxis [] (3)  - Get the current state of an axis
+SDL_JoystickGetBall  (3)  - Get relative trackball motion
+SDL_JoystickGetBall [] (3)  - Get relative trackball motion
+SDL_JoystickGetButton (3)  - Get the current state of a given button on a given joystick
+SDL_JoystickGetButton [] (3)  - Get the current state of a given button on a given joystick
+SDL_JoystickGetHat   (3)  - Get the current state of a joystick hat
+SDL_JoystickGetHat [] (3)  - Get the current state of a joystick hat
+SDL_JoystickIndex    (3)  - Get the index of an SDL_Joystick
+SDL_JoystickIndex [] (3)  - Get the index of an SDL_Joystick
+SDL_JoystickName     (3)  - Get joystick name
+SDL_JoystickName []  (3)  - Get joystick name
+SDL_JoystickNumAxes  (3)  - Get the number of joystick axes
+SDL_JoystickNumAxes [] (3)  - Get the number of joystick axes
+SDL_JoystickNumBalls (3)  - Get the number of joystick trackballs
+SDL_JoystickNumBalls [] (3)  - Get the number of joystick trackballs
+SDL_JoystickNumButtons (3)  - Get the number of joysitck buttons
+SDL_JoystickNumButtons [] (3)  - Get the number of joysitck buttons
+SDL_JoystickNumHats  (3)  - Get the number of joystick hats
+SDL_JoystickNumHats [] (3)  - Get the number of joystick hats
+SDL_JoystickOpen     (3)  - Opens a joystick for use
+SDL_JoystickOpen []  (3)  - Opens a joystick for use
+SDL_JoystickOpened   (3)  - Determine if a joystick has been opened
+SDL_JoystickOpened [] (3)  - Determine if a joystick has been opened
+SDL_JoystickUpdate   (3)  - Updates the state of all joysticks
+SDL_JoystickUpdate [] (3)  - Updates the state of all joysticks
+SDL_KeyboardEvent    (3)  - Keyboard event structure
+SDL_KeyboardEvent [] (3)  - Keyboard event structure
+SDL_KillThread       (3)  - Gracelessly terminates the thread
+SDL_KillThread []    (3)  - Gracelessly terminates the thread
+SDL_ListModes        (3)  - Returns a pointer to an array of available screen dimensions for the given format and video flags
+SDL_ListModes []     (3)  - Returns a pointer to an array of available screen dimensions for the given format and video flags
+SDL_LoadBMP          (3)  - Load a Windows BMP file into an SDL_Surface
+SDL_LoadBMP []       (3)  - Load a Windows BMP file into an SDL_Surface
+SDL_LoadWAV          (3)  - Load a WAVE file
+SDL_LoadWAV []       (3)  - Load a WAVE file
+SDL_LockAudio        (3)  - Lock out the callback function
+SDL_LockAudio []     (3)  - Lock out the callback function
+SDL_LockSurface      (3)  - Lock a surface for directly access
+SDL_LockSurface []   (3)  - Lock a surface for directly access
+SDL_LockYUVOverlay   (3)  - Lock an overlay
+SDL_LockYUVOverlay [] (3)  - Lock an overlay
+SDL_MapRGB           (3)  - Map a RGB color value to a pixel format
+SDL_MapRGB []        (3)  - Map a RGB color value to a pixel format
+SDL_MapRGBA          (3)  - Map a RGBA color value to a pixel format
+SDL_MapRGBA []       (3)  - Map a RGBA color value to a pixel format
+SDL_MixAudio         (3)  - Mix audio data
+SDL_MixAudio []      (3)  - Mix audio data
+SDL_MouseButtonEvent (3)  - Mouse button event structure
+SDL_MouseButtonEvent [] (3)  - Mouse button event structure
+SDL_MouseMotionEvent (3)  - Mouse motion event structure
+SDL_MouseMotionEvent [] (3)  - Mouse motion event structure
+SDL_NumJoysticks     (3)  - Count available joysticks
+SDL_NumJoysticks []  (3)  - Count available joysticks
+SDL_OpenAudio        (3)  - Opens the audio device with the desired parameters
+SDL_OpenAudio []     (3)  - Opens the audio device with the desired parameters
+SDL_Overlay          (3)  - YUV video overlay
+SDL_Overlay []       (3)  - YUV video overlay
+SDL_Palette          (3)  - Color palette for 8-bit pixel formats
+SDL_Palette []       (3)  - Color palette for 8-bit pixel formats
+SDL_PauseAudio       (3)  - Pauses and unpauses the audio callback processing
+SDL_PauseAudio []    (3)  - Pauses and unpauses the audio callback processing
+SDL_PeepEvents       (3)  - Checks the event queue for messages and optionally returns them
+SDL_PeepEvents []    (3)  - Checks the event queue for messages and optionally returns them
+SDL_PixelFormat      (3)  - Stores surface format information
+SDL_PixelFormat []   (3)  - Stores surface format information
+SDL_PollEvent        (3)  - Polls for currently pending events
+SDL_PollEvent []     (3)  - Polls for currently pending events
+SDL_PumpEvents       (3)  - Pumps the event loop, gathering events from the input devices
+SDL_PumpEvents []    (3)  - Pumps the event loop, gathering events from the input devices
+SDL_PushEvent        (3)  - Pushes an event onto the event queue
+SDL_PushEvent []     (3)  - Pushes an event onto the event queue
+SDL_Quit             (3)  - Shut down SDL
+SDL_Quit []          (3)  - Shut down SDL
+SDL_QuitEvent        (3)  - Quit requested event
+SDL_QuitEvent []     (3)  - Quit requested event
+SDL_QuitSubSystem    (3)  - Shut down a subsystem
+SDL_QuitSubSystem [] (3)  - Shut down a subsystem
+SDL_Rect             (3)  - Defines a rectangular area
+SDL_Rect []          (3)  - Defines a rectangular area
+SDL_RemoveTimer      (3)  - Remove a timer which was added with SDL_AddTimer
+SDL_RemoveTimer []   (3)  - Remove a timer which was added with SDL_AddTimer
+SDL_ResizeEvent      (3)  - Window resize event structure
+SDL_ResizeEvent []   (3)  - Window resize event structure
+SDL_SaveBMP          (3)  - Save an SDL_Surface as a Windows BMP file
+SDL_SaveBMP []       (3)  - Save an SDL_Surface as a Windows BMP file
+SDL_SemPost          (3)  - Unlock a semaphore
+SDL_SemPost []       (3)  - Unlock a semaphore
+SDL_SemTryWait       (3)  - Attempt to lock a semaphore but don't suspend the thread
+SDL_SemTryWait []    (3)  - Attempt to lock a semaphore but don't suspend the thread
+SDL_SemValue         (3)  - Return the current value of a semaphore
+SDL_SemValue []      (3)  - Return the current value of a semaphore
+SDL_SemWait          (3)  - Lock a semaphore and suspend the thread if the semaphore value is zero
+SDL_SemWait []       (3)  - Lock a semaphore and suspend the thread if the semaphore value is zero
+SDL_SemWaitTimeout   (3)  - Lock a semaphore, but only wait up to a specified maximum time
+SDL_SemWaitTimeout [] (3)  - Lock a semaphore, but only wait up to a specified maximum time
+SDL_SetAlpha         (3)  - Adjust the alpha properties of a surface
+SDL_SetAlpha []      (3)  - Adjust the alpha properties of a surface
+SDL_SetClipRect      (3)  - Sets the clipping rectangle for a surface
+SDL_SetClipRect []   (3)  - Sets the clipping rectangle for a surface
+SDL_SetColorKey      (3)  - Sets the color key (transparent pixel) in a blittable surface and RLE acceleration
+SDL_SetColorKey []   (3)  - Sets the color key (transparent pixel) in a blittable surface and RLE acceleration
+SDL_SetColors        (3)  - Sets a portion of the colormap for the given 8-bit surface
+SDL_SetColors []     (3)  - Sets a portion of the colormap for the given 8-bit surface
+SDL_SetCursor        (3)  - Set the currently active mouse cursor
+SDL_SetCursor []     (3)  - Set the currently active mouse cursor
+SDL_SetEventFilter   (3)  - Sets up a filter to process all events before they are posted to the event queue
+SDL_SetEventFilter [] (3)  - Sets up a filter to process all events before they are posted to the event queue
+SDL_SetGamma         (3)  - Sets the color gamma function for the display
+SDL_SetGamma []      (3)  - Sets the color gamma function for the display
+SDL_SetGammaRamp     (3)  - Sets the color gamma lookup tables for the display
+SDL_SetGammaRamp []  (3)  - Sets the color gamma lookup tables for the display
+SDL_SetModState      (3)  - Set the current key modifier state
+SDL_SetModState []   (3)  - Set the current key modifier state
+SDL_SetPalette       (3)  - Sets the colors in the palette of an 8-bit surface
+SDL_SetPalette []    (3)  - Sets the colors in the palette of an 8-bit surface
+SDL_SetTimer         (3)  - Set a callback to run after the specified number of milliseconds has elapsed
+SDL_SetTimer []      (3)  - Set a callback to run after the specified number of milliseconds has elapsed
+SDL_SetVideoMode     (3)  - Set up a video mode with the specified width, height and bits-per-pixel
+SDL_SetVideoMode []  (3)  - Set up a video mode with the specified width, height and bits-per-pixel
+SDL_ShowCursor       (3)  - Toggle whether or not the cursor is shown on the screen
+SDL_ShowCursor []    (3)  - Toggle whether or not the cursor is shown on the screen
+SDL_Surface          (3)  - Graphical Surface Structure
+SDL_Surface []       (3)  - Graphical Surface Structure
+SDL_SysWMEvent       (3)  - Platform-dependent window manager event
+SDL_SysWMEvent []    (3)  - Platform-dependent window manager event
+SDL_ThreadID         (3)  - Get the 32-bit thread identifier for the current thread
+SDL_ThreadID []      (3)  - Get the 32-bit thread identifier for the current thread
+SDL_UnlockAudio      (3)  - Unlock the callback function
+SDL_UnlockAudio []   (3)  - Unlock the callback function
+SDL_UnlockSurface    (3)  - Unlocks a previously locked surface
+SDL_UnlockSurface [] (3)  - Unlocks a previously locked surface
+SDL_UnlockYUVOverlay (3)  - Unlock an overlay
+SDL_UnlockYUVOverlay [] (3)  - Unlock an overlay
+SDL_UpdateRect       (3)  - Makes sure the given area is updated on the given screen
+SDL_UpdateRect []    (3)  - Makes sure the given area is updated on the given screen
+SDL_UpdateRects      (3)  - Makes sure the given list of rectangles is updated on the given screen
+SDL_UpdateRects []   (3)  - Makes sure the given list of rectangles is updated on the given screen
+SDL_UserEvent        (3)  - A user-defined event type
+SDL_UserEvent []     (3)  - A user-defined event type
+SDL_VideoDriverName  (3)  - Obtain the name of the video driver
+SDL_VideoDriverName [] (3)  - Obtain the name of the video driver
+SDL_VideoInfo        (3)  - Video Target information
+SDL_VideoInfo []     (3)  - Video Target information
+SDL_VideoModeOK      (3)  - Check to see if a particular video mode is supported
+SDL_VideoModeOK []   (3)  - Check to see if a particular video mode is supported
+SDL_WM_GetCaption    (3)  - Gets the window title and icon name
+SDL_WM_GetCaption [] (3)  - Gets the window title and icon name
+SDL_WM_GrabInput     (3)  - Grabs mouse and keyboard input
+SDL_WM_GrabInput []  (3)  - Grabs mouse and keyboard input
+SDL_WM_IconifyWindow (3)  - Iconify/Minimise the window
+SDL_WM_IconifyWindow [] (3)  - Iconify/Minimise the window
+SDL_WM_SetCaption    (3)  - Sets the window tile and icon name
+SDL_WM_SetCaption [] (3)  - Sets the window tile and icon name
+SDL_WM_SetIcon       (3)  - Sets the icon for the display window
+SDL_WM_SetIcon []    (3)  - Sets the icon for the display window
+SDL_WM_ToggleFullScreen (3)  - Toggles fullscreen mode
+SDL_WM_ToggleFullScreen [] (3)  - Toggles fullscreen mode
+SDL_WaitEvent        (3)  - Waits indefinitely for the next available event
+SDL_WaitEvent []     (3)  - Waits indefinitely for the next available event
+SDL_WaitThread       (3)  - Wait for a thread to finish
+SDL_WaitThread []    (3)  - Wait for a thread to finish
+SDL_WarpMouse        (3)  - Set the position of the mouse cursor
+SDL_WarpMouse []     (3)  - Set the position of the mouse cursor
+SDL_WasInit          (3)  - Check which subsystems are initialized
+SDL_WasInit []       (3)  - Check which subsystems are initialized
+SDL_keysym           (3)  - Keysym structure
+SDL_keysym []        (3)  - Keysym structure
+SDL_mutexP           (3)  - Lock a mutex
+SDL_mutexP []        (3)  - Lock a mutex
+SDL_mutexV           (3)  - Unlock a mutex
+SDL_mutexV []        (3)  - Unlock a mutex
+SGMLS []             (3)  - class for postprocessing the output from the sgmls and nsgmls parsers
+SGMLS::Output []     (3)  - Stack-based Output Procedures
+SGMLS::Refs []       (3)  - Forward reference handling
+SHA1 []              (3)  - Secure Hash Algorithm
+SHA1_Final []        (3)  - Secure Hash Algorithm
+SHA1_Init []         (3)  - Secure Hash Algorithm
+SHA1_Update []       (3)  - Secure Hash Algorithm
+SMIME_read_PKCS7 []  (3)  - parse S/MIME message
+SMIME_write_PKCS7 [] (3)  - convert PKCS#7 structure to S/MIME format
+SNMP []              (3)  - The Perl5 'SNMP' Extension Module for the Net-SNMP SNMP package
+SOCK_RAW []          (7)  - Linux IPv4 raw sockets
+SSL []               (3)  - OpenSSL SSL/TLS library
+SSL_CIPHER_description [] (3)  - get SSL_CIPHER properties
+SSL_CIPHER_get_bits [] (3)  - get SSL_CIPHER properties
+SSL_CIPHER_get_name [] (3)  - get SSL_CIPHER properties
+SSL_CIPHER_get_version [] (3)  - get SSL_CIPHER properties
+SSL_COMP_add_compression_method [] (3)  - handle SSL/TLS integrated compression methods
+SSL_CTX_add_client_CA [] (3)  - set list of CAs sent to the client when requesting a client certificate
+SSL_CTX_add_extra_chain_cert [] (3)  - add certificate to chain
+SSL_CTX_add_session [] (3)  - manipulate session cache
+SSL_CTX_callback_ctrl [] (3)  - internal handling functions for SSL_CTX and SSL objects
+SSL_CTX_check_private_key [] (3)  - load certificate and key data
+SSL_CTX_ctrl []      (3)  - internal handling functions for SSL_CTX and SSL objects
+SSL_CTX_flush_sessions [] (3)  - remove expired sessions
+SSL_CTX_free []      (3)  - free an allocated SSL_CTX object
+SSL_CTX_get_cert_store [] (3)  - manipulate X509 certificate verification storage
+SSL_CTX_get_client_CA_list [] (3)  - get list of client CAs
+SSL_CTX_get_client_cert_cb [] (3)  - handle client certificate callback function
+SSL_CTX_get_ex_data [] (3)  - internal application specific data functions
+SSL_CTX_get_ex_new_index [] (3)  - internal application specific data functions
+SSL_CTX_get_info_callback [] (3)  - handle information callback for SSL connections
+SSL_CTX_get_max_cert_list [] (3)  - manipulate allowed for the peer's certificate chain
+SSL_CTX_get_mode []  (3)  - manipulate SSL engine mode
+SSL_CTX_get_options [] (3)  - manipulate SSL engine options
+SSL_CTX_get_quiet_shutdown [] (3)  - manipulate shutdown behaviour
+SSL_CTX_get_session_cache_mode [] (3)  - enable/disable session caching
+SSL_CTX_get_timeout [] (3)  - manipulate timeout values for session caching
+SSL_CTX_get_verify_callback [] (3)  - get currently set verification parameters
+SSL_CTX_get_verify_depth [] (3)  - get currently set verification parameters
+SSL_CTX_get_verify_mode [] (3)  - get currently set verification parameters
+SSL_CTX_load_verify_locations [] (3)  - set default locations for trusted CA certificates
+SSL_CTX_need_tmp_rsa [] (3)  - handle RSA keys for ephemeral key exchange
+SSL_CTX_new []       (3)  - create a new SSL_CTX object as framework for TLS/SSL enabled functions
+SSL_CTX_remove_session [] (3)  - manipulate session cache
+SSL_CTX_sess_accept [] (3)  - obtain session cache statistics
+SSL_CTX_sess_accept_good [] (3)  - obtain session cache statistics
+SSL_CTX_sess_accept_renegotiate [] (3)  - obtain session cache statistics
+SSL_CTX_sess_cache_full [] (3)  - obtain session cache statistics
+SSL_CTX_sess_cb_hits [] (3)  - obtain session cache statistics
+SSL_CTX_sess_connect [] (3)  - obtain session cache statistics
+SSL_CTX_sess_connect_good [] (3)  - obtain session cache statistics
+SSL_CTX_sess_connect_renegotiate [] (3)  - obtain session cache statistics
+SSL_CTX_sess_get_cache_size [] (3)  - manipulate session cache size
+SSL_CTX_sess_get_get_cb [] (3)  - provide callback functions for server side external session caching
+SSL_CTX_sess_get_new_cb [] (3)  - provide callback functions for server side external session caching
+SSL_CTX_sess_get_remove_cb [] (3)  - provide callback functions for server side external session caching
+SSL_CTX_sess_hits [] (3)  - obtain session cache statistics
+SSL_CTX_sess_misses [] (3)  - obtain session cache statistics
+SSL_CTX_sess_number [] (3)  - obtain session cache statistics
+SSL_CTX_sess_set_cache_size [] (3)  - manipulate session cache size
+SSL_CTX_sess_set_get_cb [] (3)  - provide callback functions for server side external session caching
+SSL_CTX_sess_set_new_cb [] (3)  - provide callback functions for server side external session caching
+SSL_CTX_sess_set_remove_cb [] (3)  - provide callback functions for server side external session caching
+SSL_CTX_sess_timeouts [] (3)  - obtain session cache statistics
+SSL_CTX_sessions []  (3)  - access internal session cache
+SSL_CTX_set_cert_store [] (3)  - manipulate X509 certificate verification storage
+SSL_CTX_set_cert_verify_callback [] (3)  - set peer certificate verification procedure
+SSL_CTX_set_cipher_list [] (3)  - choose list of available SSL_CIPHERs
+SSL_CTX_set_client_CA_list [] (3)  - set list of CAs sent to the client when requesting a client certificate
+SSL_CTX_set_client_cert_cb [] (3)  - handle client certificate callback function
+SSL_CTX_set_default_passwd_cb [] (3)  - set passwd callback for encrypted PEM file handling
+SSL_CTX_set_default_passwd_cb_userdata [] (3)  - set passwd callback for encrypted PEM file handling
+SSL_CTX_set_ex_data [] (3)  - internal application specific data functions
+SSL_CTX_set_generate_session_id [] (3)  - manipulate generation of SSL session IDs (server only)
+SSL_CTX_set_info_callback [] (3)  - handle information callback for SSL connections
+SSL_CTX_set_max_cert_list [] (3)  - manipulate allowed for the peer's certificate chain
+SSL_CTX_set_mode []  (3)  - manipulate SSL engine mode
+SSL_CTX_set_msg_callback [] (3)  - install callback for observing protocol messages
+SSL_CTX_set_msg_callback_arg [] (3)  - install callback for observing protocol messages
+SSL_CTX_set_options [] (3)  - manipulate SSL engine options
+SSL_CTX_set_quiet_shutdown [] (3)  - manipulate shutdown behaviour
+SSL_CTX_set_session_cache_mode [] (3)  - enable/disable session caching
+SSL_CTX_set_session_id_context [] (3)  - set context within which session can be reused (server side only)
+SSL_CTX_set_ssl_version [] (3)  - choose a new TLS/SSL method
+SSL_CTX_set_timeout [] (3)  - manipulate timeout values for session caching
+SSL_CTX_set_tmp_dh [] (3)  - handle DH keys for ephemeral key exchange
+SSL_CTX_set_tmp_dh_callback [] (3)  - handle DH keys for ephemeral key exchange
+SSL_CTX_set_tmp_rsa [] (3)  - handle RSA keys for ephemeral key exchange
+SSL_CTX_set_tmp_rsa_callback [] (3)  - handle RSA keys for ephemeral key exchange
+SSL_CTX_set_verify [] (3)  - set peer certificate verification parameters
+SSL_CTX_set_verify_depth [] (3)  - set peer certificate verification parameters
+SSL_CTX_use_PrivateKey [] (3)  - load certificate and key data
+SSL_CTX_use_PrivateKey_ASN1 [] (3)  - load certificate and key data
+SSL_CTX_use_PrivateKey_file [] (3)  - load certificate and key data
+SSL_CTX_use_RSAPrivateKey [] (3)  - load certificate and key data
+SSL_CTX_use_RSAPrivateKey_ASN1 [] (3)  - load certificate and key data
+SSL_CTX_use_RSAPrivateKey_file [] (3)  - load certificate and key data
+SSL_CTX_use_certificate [] (3)  - load certificate and key data
+SSL_CTX_use_certificate_ASN1 [] (3)  - load certificate and key data
+SSL_CTX_use_certificate_chain_file [] (3)  - load certificate and key data
+SSL_CTX_use_certificate_file [] (3)  - load certificate and key data
+SSL_SESSION_free []  (3)  - free an allocated SSL_SESSION structure
+SSL_SESSION_get_ex_data [] (3)  - internal application specific data functions
+SSL_SESSION_get_ex_new_index [] (3)  - internal application specific data functions
+SSL_SESSION_get_time [] (3)  - retrieve and manipulate session time and timeout settings
+SSL_SESSION_get_timeout [] (3)  - retrieve and manipulate session time and timeout settings
+SSL_SESSION_set_ex_data [] (3)  - internal application specific data functions
+SSL_SESSION_set_time [] (3)  - retrieve and manipulate session time and timeout settings
+SSL_SESSION_set_timeout [] (3)  - retrieve and manipulate session time and timeout settings
+SSL_accept []        (3)  - wait for a TLS/SSL client to initiate a TLS/SSL handshake
+SSL_add_client_CA [] (3)  - set list of CAs sent to the client when requesting a client certificate
+SSL_add_session []   (3)  - manipulate session cache
+SSL_alert_desc_string [] (3)  - get textual description of alert information
+SSL_alert_desc_string_long [] (3)  - get textual description of alert information
+SSL_alert_type_string [] (3)  - get textual description of alert information
+SSL_alert_type_string_long [] (3)  - get textual description of alert information
+SSL_callback_ctrl [] (3)  - internal handling functions for SSL_CTX and SSL objects
+SSL_check_private_key [] (3)  - load certificate and key data
+SSL_clear []         (3)  - reset SSL object to allow another connection
+SSL_connect []       (3)  - initiate the TLS/SSL handshake with an TLS/SSL server
+SSL_ctrl []          (3)  - internal handling functions for SSL_CTX and SSL objects
+SSL_do_handshake []  (3)  - perform a TLS/SSL handshake
+SSL_flush_sessions [] (3)  - remove expired sessions
+SSL_free []          (3)  - free an allocated SSL structure
+SSL_get_SSL_CTX []   (3)  - get the SSL_CTX from which an SSL is created
+SSL_get_accept_state [] (3)  - prepare SSL object to work in client or server mode
+SSL_get_cipher []    (3)  - get SSL_CIPHER of a connection
+SSL_get_cipher_bits [] (3)  - get SSL_CIPHER of a connection
+SSL_get_cipher_list [] (3)  - get list of available SSL_CIPHERs
+SSL_get_cipher_name [] (3)  - get SSL_CIPHER of a connection
+SSL_get_cipher_version [] (3)  - get SSL_CIPHER of a connection
+SSL_get_ciphers []   (3)  - get list of available SSL_CIPHERs
+SSL_get_client_CA_list [] (3)  - get list of client CAs
+SSL_get_current_cipher [] (3)  - get SSL_CIPHER of a connection
+SSL_get_default_timeout [] (3)  - get default session timeout value
+SSL_get_error []     (3)  - obtain result code for TLS/SSL I/O operation
+SSL_get_ex_data []   (3)  - internal application specific data functions
+SSL_get_ex_data_X509_STORE_CTX_idx [] (3)  - get ex_data index to access SSL structure from X509_STORE_CTX
+SSL_get_ex_new_index [] (3)  - internal application specific data functions
+SSL_get_fd []        (3)  - get file descriptor linked to an SSL object
+SSL_get_info_callback [] (3)  - handle information callback for SSL connections
+SSL_get_max_cert_list, [] (3)  - manipulate allowed for the peer's certificate chain
+SSL_get_mode []      (3)  - manipulate SSL engine mode
+SSL_get_msg_callback_arg [] (3)  - install callback for observing protocol messages
+SSL_get_options []   (3)  - manipulate SSL engine options
+SSL_get_peer_cert_chain [] (3)  - get the X509 certificate chain of the peer
+SSL_get_peer_certificate [] (3)  - get the X509 certificate of the peer
+SSL_get_quiet_shutdown [] (3)  - manipulate shutdown behaviour
+SSL_get_rbio []      (3)  - get BIO linked to an SSL object
+SSL_get_session []   (3)  - retrieve TLS/SSL session data
+SSL_get_shutdown []  (3)  - manipulate shutdown state of an SSL connection
+SSL_get_ssl_method [] (3)  - choose a new TLS/SSL method
+SSL_get_verify_callback [] (3)  - get currently set verification parameters
+SSL_get_verify_depth [] (3)  - get currently set verification parameters
+SSL_get_verify_mode [] (3)  - get currently set verification parameters
+SSL_get_verify_result [] (3)  - get result of peer certificate verification
+SSL_get_version []   (3)  - get the protocol version of a connection
+SSL_has_matching_session_id [] (3)  - manipulate generation of SSL session IDs (server only)
+SSL_library_init []  (3)  - initialize SSL library by registering algorithms
+SSL_load_client_CA_file [] (3)  - load certificate names from file
+SSL_load_error_strings [] (3)  - load and free error strings
+SSL_need_tmp_rsa []  (3)  - handle RSA keys for ephemeral key exchange
+SSL_new []           (3)  - create a new SSL structure for a connection
+SSL_pending []       (3)  - obtain number of readable bytes buffered in an SSL object
+SSL_read []          (3)  - read bytes from a TLS/SSL connection
+SSL_remove_session [] (3)  - manipulate session cache
+SSL_rstate_string [] (3)  - get textual description of state of an SSL object during read operation
+SSL_rstate_string_long [] (3)  - get textual description of state of an SSL object during read operation
+SSL_session_reused [] (3)  - query whether a reused session was negotiated during handshake
+SSL_set_bio []       (3)  - connect the SSL object with a BIO
+SSL_set_cipher_list [] (3)  - choose list of available SSL_CIPHERs
+SSL_set_client_CA_list [] (3)  - set list of CAs sent to the client when requesting a client certificate
+SSL_set_connect_state [] (3)  - prepare SSL object to work in client or server mode
+SSL_set_ex_data []   (3)  - internal application specific data functions
+SSL_set_fd []        (3)  - connect the SSL object with a file descriptor
+SSL_set_generate_session_id [] (3)  - manipulate generation of SSL session IDs (server only)
+SSL_set_info_callback [] (3)  - handle information callback for SSL connections
+SSL_set_max_cert_list [] (3)  - manipulate allowed for the peer's certificate chain
+SSL_set_mode []      (3)  - manipulate SSL engine mode
+SSL_set_msg_callback [] (3)  - install callback for observing protocol messages
+SSL_set_options []   (3)  - manipulate SSL engine options
+SSL_set_quiet_shutdown [] (3)  - manipulate shutdown behaviour
+SSL_set_session []   (3)  - set a TLS/SSL session to be used during TLS/SSL connect
+SSL_set_session_id_context [] (3)  - set context within which session can be reused (server side only)
+SSL_set_shutdown []  (3)  - manipulate shutdown state of an SSL connection
+SSL_set_ssl_method [] (3)  - choose a new TLS/SSL method
+SSL_set_tmp_dh []    (3)  - handle DH keys for ephemeral key exchange
+SSL_set_tmp_dh_callback [] (3)  - handle DH keys for ephemeral key exchange
+SSL_set_tmp_rsa []   (3)  - handle RSA keys for ephemeral key exchange
+SSL_set_tmp_rsa_callback [] (3)  - handle RSA keys for ephemeral key exchange
+SSL_set_verify []    (3)  - set peer certificate verification parameters
+SSL_set_verify_depth [] (3)  - set peer certificate verification parameters
+SSL_set_verify_result [] (3)  - override result of peer certificate verification
+SSL_shutdown []      (3)  - shut down a TLS/SSL connection
+SSL_state_string []  (3)  - get textual description of state of an SSL object
+SSL_state_string_long [] (3)  - get textual description of state of an SSL object
+SSL_use_PrivateKey [] (3)  - load certificate and key data
+SSL_use_PrivateKey_ASN1 [] (3)  - load certificate and key data
+SSL_use_PrivateKey_file [] (3)  - load certificate and key data
+SSL_use_RSAPrivateKey [] (3)  - load certificate and key data
+SSL_use_RSAPrivateKey_ASN1 [] (3)  - load certificate and key data
+SSL_use_RSAPrivateKey_file [] (3)  - load certificate and key data
+SSL_use_certificate [] (3)  - load certificate and key data
+SSL_use_certificate_ASN1 [] (3)  - load certificate and key data
+SSL_use_certificate_file [] (3)  - load certificate and key data
+SSL_want []          (3)  - obtain state information TLS/SSL I/O operation
+SSL_want_nothing []  (3)  - obtain state information TLS/SSL I/O operation
+SSL_want_read []     (3)  - obtain state information TLS/SSL I/O operation
+SSL_want_write []    (3)  - obtain state information TLS/SSL I/O operation
+SSL_want_x509_lookup [] (3)  - obtain state information TLS/SSL I/O operation
+SSL_write []         (3)  - write bytes to a TLS/SSL connection
+SSLeay []            (3)  - get OpenSSL version number
+SSLeay_add_ssl_algorithms [] (3)  - initialize SSL library by registering algorithms
+SSLeay_version []    (3)  - get OpenSSL version number
+Safe Base []         (n)  - A mechanism for creating and manipulating safe interpreters
+Safe []              (3)  - Compile and execute code in restricted compartments
+Scalar::Util []      (3)  - A selection of general-utility scalar subroutines
+ScreenCount []       (3)  - Display macros and functions
+ScreenNumberOfCCC [] (3)  - Color Conversion Context macros
+ScreenOfDisplay []   (3)  - Display macros and functions
+ScreenWhitePointOfCCC [] (3)  - Color Conversion Context macros
+Search::Dict []      (3)  - search for key in dictionary file
+SelectSaver []       (3)  - save and restore selected file handle
+SelfLoader []        (3)  - load functions only on demand
+ServerVendor []      (3)  - Display macros and functions
+Seyon []             (1)  - X11 Telecommunications Package
+SoX []               (1)  - Sound eXchange, the Swiss Army knife of audio manipulation
+SoX []               (7)  - Sound eXchange, the Swiss Army knife of audio manipulation
+SoXI []              (1)  - Sound eXchange Information, display sound file metadata
+Socket []            (3)  - load the C socket.h defines and structure manipulators
+Storable []          (3)  - persistence for Perl data structures
+Switch []            (3)  - A switch statement for Perl
+Symbol []            (3)  - manipulate Perl symbols and their names
+Sys::Hostname []     (3)  - Try every conceivable way to get hostname
+Sys::Syslog []       (3)  - Perl interface to the UNIX syslog(3) calls
+TAILQ_ENTRY []       (3)  - implementations of lists, tail queues, and circular queues
+TAILQ_HEAD []        (3)  - implementations of lists, tail queues, and circular queues
+TAILQ_INIT []        (3)  - implementations of lists, tail queues, and circular queues
+TAILQ_INSERT_AFTER [] (3)  - implementations of lists, tail queues, and circular queues
+TAILQ_INSERT_HEAD [] (3)  - implementations of lists, tail queues, and circular queues
+TAILQ_INSERT_TAIL [] (3)  - implementations of lists, tail queues, and circular queues
+TAILQ_REMOVE []      (3)  - implementations of lists, tail queues, and circular queues
+TASKS []             (3)  - Want to help? These things need doing..
+TCL_MEM_DEBUG []     (3)  - Compile-time flag to enable Tcl memory debugging
+TIFFCIELabToRGBInit [] (3)  - color conversion routines
+TIFFCIELabToXYZ []   (3)  - color conversion routines
+TIFFCheckTile []     (3)  - tile-related utility routines
+TIFFCheckpointDirectory [] (3)  - write the current directory in an open TIFF file
+TIFFClientOpen []    (3)  - open a TIFF file for reading or writing
+TIFFClose []         (3)  - close a previously opened TIFF file
+TIFFComputeStrip []  (3)  - strip-related utility routines
+TIFFComputeTile []   (3)  - tile-related utility routines
+TIFFCurrentDirectory [] (3)  - query routines
+TIFFCurrentRow []    (3)  - query routines
+TIFFCurrentStrip []  (3)  - query routines
+TIFFCurrentTile []   (3)  - query routines
+TIFFDataWidth []     (3)  - Get the size of TIFF data types
+TIFFDefaultStripSize [] (3)  - strip-related utility routines
+TIFFDefaultTileSize [] (3)  - tile-related utility routines
+TIFFError []         (3)  - library error handling interface
+TIFFFdOpen []        (3)  - open a TIFF file for reading or writing
+TIFFFileName []      (3)  - query routines
+TIFFFileno []        (3)  - query routines
+TIFFFindCODEC []     (3)  - codec-related utility routines
+TIFFFlush []         (3)  - flush pending writes to an open TIFF file
+TIFFFlushData []     (3)  - flush pending writes to an open TIFF file
+TIFFGetBitRevTable [] (3)  - byte- and bit-swapping routines
+TIFFGetField []      (3)  - get the value(s) of a tag in an open TIFF file
+TIFFGetMode []       (3)  - query routines
+TIFFGetVersion []    (3)  - query routines
+TIFFIsByteSwapped [] (3)  - query routines
+TIFFIsCODECConfigured [] (3)  - codec-related utility routines
+TIFFIsMSB2LSB []     (3)  - query routines
+TIFFIsTiled []       (3)  - query routines
+TIFFIsUpSampled []   (3)  - query routines
+TIFFLastDirectory [] (3)  - query routines
+TIFFNumberOfStrips [] (3)  - strip-related utility routines
+TIFFNumberOfTiles [] (3)  - tile-related utility routines
+TIFFOpen []          (3)  - open a TIFF file for reading or writing
+TIFFPrintDirectory [] (3)  - print a description of a TIFF directory
+TIFFRGBAImageBegin [] (3)  - read and decode an image into a raster
+TIFFRGBAImageEnd []  (3)  - read and decode an image into a raster
+TIFFRGBAImageGet []  (3)  - read and decode an image into a raster
+TIFFRGBAImageOK []   (3)  - read and decode an image into a raster
+TIFFRasterScanlineSize, [] (3)  - return the size of various items associated with an open TIFF file
+TIFFRawStripSize []  (3)  - strip-related utility routines
+TIFFReadBufferSetup [] (3)  - I/O buffering control routines
+TIFFReadDirectory [] (3)  - get the contents of the next directory in an open TIFF file
+TIFFReadEncodedStrip [] (3)  - read and decode a strip of data from an open TIFF file
+TIFFReadEncodedTile [] (3)  - read and decode a tile of data from an open TIFF file
+TIFFReadRGBAImage [] (3)  - read and decode an image into a fixed - format raster
+TIFFReadRGBAImageOriented [] (3)  - read and decode an image into a fixed - format raster
+TIFFReadRGBAStrip [] (3)  - read and decode an image strip into a fixed-format raster
+TIFFReadRGBATile []  (3)  - read and decode an image tile into a fixed-format raster
+TIFFReadRawStrip []  (3)  - return the undecoded contents of a strip of data from an open TIFF file
+TIFFReadRawTile []   (3)  - return an undecoded tile of data from an open TIFF file
+TIFFReadScanline []  (3)  - read and decode a scanline of data from an open TIFF file
+TIFFReadTile []      (3)  - read and decode a tile of data from an open TIFF file
+TIFFRegisterCODEC [] (3)  - codec-related utility routines
+TIFFReverseBits []   (3)  - byte- and bit-swapping routines
+TIFFRewriteDirectory [] (3)  - write the current directory in an open TIFF file
+TIFFScanlineSize []  (3)  - return the size of various items associated with an open TIFF file
+TIFFSetDirectory []  (3)  - set the current directory for an open TIFF file
+TIFFSetErrorHandler [] (3)  - library error handling interface
+TIFFSetField []      (3)  - set the value(s) of a tag in a TIFF file open for writing
+TIFFSetSubDirectory [] (3)  - set the current directory for an open TIFF file
+TIFFSetWarningHandler [] (3)  - library warning interface
+TIFFStripSize []     (3)  - strip-related utility routines
+TIFFSwabArrayOfLong [] (3)  - byte- and bit-swapping routines
+TIFFSwabArrayOfShort [] (3)  - byte- and bit-swapping routines
+TIFFSwabLong []      (3)  - byte- and bit-swapping routines
+TIFFSwabShort []     (3)  - byte- and bit-swapping routines
+TIFFTileRowSize []   (3)  - tile-related utility routines
+TIFFTileSize []      (3)  - tile-related utility routines
+TIFFUnRegisterCODEC [] (3)  - codec-related utility routines
+TIFFVGetField []     (3)  - get the value(s) of a tag in an open TIFF file
+TIFFVSetField []     (3)  - set the value(s) of a tag in a TIFF file open for writing
+TIFFVStripSize []    (3)  - strip-related utility routines
+TIFFVTileSize []     (3)  - tile-related utility routines
+TIFFWarning []       (3)  - library warning interface
+TIFFWriteBufferSetup [] (3)  - I/O buffering control routines
+TIFFWriteDirectory [] (3)  - write the current directory in an open TIFF file
+TIFFWriteRawStrip [] (3)  - write a strip of raw data to an open TIFF file
+TIFFWriteRawTile []  (3)  - write a tile of raw data to an open TIFF file
+TIFFWriteScanline [] (3)  - write a scanline to an open TIFF file
+TIFFWriteTile []     (3)  - encode and write a tile of data to an open TIFF file
+TIFFWritedEncodedStrip [] (3)  - compress and write a strip of data to an open TIFF file
+TIFFWritedEncodedTile [] (3)  - compress and write a tile of data to an open TIFF file
+TIFFXYZToRGB []      (3)  - color conversion routines
+TIFFYCbCrToRGBInit [] (3)  - color conversion routines
+TIFFYCbCrtoRGB []    (3)  - color conversion routines
+Tcl []               (n)  - Tool Command Language
+TclX []              (n)  - Extended Tcl: Extended command set for Tcl
+Tcl_Access []        (3)  - check file permissions and other attributes
+Tcl_AddErrorInfo []  (3)  - retrieve or record information about errors and other return options
+Tcl_AddObjErrorInfo [] (3)  - retrieve or record information about errors and other return options
+Tcl_AlertNotifier [] (3)  - the event queue and notifier interfaces
+Tcl_Alloc []         (3)  - allocate or free heap memory
+Tcl_AllocStatBuf []  (3)  - procedures to interact with any filesystem
+Tcl_AllowExceptions [] (3)  - allow all exceptions in next script evaluation
+Tcl_AppInit []       (3)  - perform application-specific initialization
+Tcl_AppendAllObjTypes [] (3)  - manipulate Tcl object types
+Tcl_AppendElement [] (3)  - manipulate Tcl result
+Tcl_AppendExportList [] (3)  - manipulate namespaces
+Tcl_AppendFormatToObj [] (3)  - manipulate Tcl objects as strings
+Tcl_AppendLimitedToObj [] (3)  - manipulate Tcl objects as strings
+Tcl_AppendObjToErrorInfo [] (3)  - retrieve or record information about errors and other return options
+Tcl_AppendObjToObj [] (3)  - manipulate Tcl objects as strings
+Tcl_AppendPrintfToObj [] (3)  - manipulate Tcl objects as strings
+Tcl_AppendResult []  (3)  - manipulate Tcl result
+Tcl_AppendResultVA [] (3)  - manipulate Tcl result
+Tcl_AppendStringsToObj [] (3)  - manipulate Tcl objects as strings
+Tcl_AppendStringsToObjVA [] (3)  - manipulate Tcl objects as strings
+Tcl_AppendToObj []   (3)  - manipulate Tcl objects as strings
+Tcl_AppendUnicodeToObj [] (3)  - manipulate Tcl objects as strings
+Tcl_AsyncCreate []   (3)  - handle asynchronous events
+Tcl_AsyncDelete []   (3)  - handle asynchronous events
+Tcl_AsyncInvoke []   (3)  - handle asynchronous events
+Tcl_AsyncMark []     (3)  - handle asynchronous events
+Tcl_AsyncReady []    (3)  - handle asynchronous events
+Tcl_AttemptAlloc []  (3)  - allocate or free heap memory
+Tcl_AttemptRealloc [] (3)  - allocate or free heap memory
+Tcl_AttemptSetObjLength [] (3)  - manipulate Tcl objects as strings
+Tcl_BackgroundError [] (3)  - report Tcl error that occurred in background processing
+Tcl_Backslash []     (3)  - parse a backslash sequence
+Tcl_BadChannelOption [] (3)  - procedures for creating and manipulating channels
+Tcl_CallWhenDeleted [] (3)  - Arrange for callback when interpreter is deleted
+Tcl_CancelIdleCall [] (3)  - invoke a procedure when there are no pending events
+Tcl_ChannelBlockModeProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelBuffered [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelClose2Proc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelCloseProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelFlushProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelGetHandleProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelGetOptionProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelHandlerProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelInputProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelName []   (3)  - procedures for creating and manipulating channels
+Tcl_ChannelOutputProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelSeekProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelSetOptionProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelThreadActionProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelTruncateProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelVersion [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelWatchProc [] (3)  - procedures for creating and manipulating channels
+Tcl_ChannelWideSeekProc [] (3)  - procedures for creating and manipulating channels
+Tcl_Chdir []         (3)  - manipulate the current working directory
+Tcl_ClearChannelHandlers [] (3)  - procedures for creating and manipulating channels
+Tcl_Close []         (3)  - buffered I/O facilities using channels
+Tcl_CommandComplete [] (3)  - Check for unmatched braces in a Tcl command
+Tcl_CommandTraceInfo [] (3)  - monitor renames and deletes of a command
+Tcl_Concat []        (3)  - concatenate a collection of strings
+Tcl_ConcatObj []     (3)  - manipulate Tcl objects as strings
+Tcl_ConditionFinalize [] (3)  - Tcl thread support
+Tcl_ConditionNotify [] (3)  - Tcl thread support
+Tcl_ConditionWait [] (3)  - Tcl thread support
+Tcl_ConvertCountedElement [] (3)  - manipulate Tcl lists
+Tcl_ConvertElement [] (3)  - manipulate Tcl lists
+Tcl_ConvertToType [] (3)  - manipulate Tcl object types
+Tcl_CreateAlias []   (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_CreateAliasObj [] (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_CreateChannel [] (3)  - procedures for creating and manipulating channels
+Tcl_CreateChannelHandler [] (3)  - call a procedure when a channel becomes readable or writable
+Tcl_CreateCloseHandler [] (3)  - arrange for callbacks when channels are closed
+Tcl_CreateCommand [] (3)  - implement new commands in C
+Tcl_CreateEncoding [] (3)  - procedures for creating and using encodings
+Tcl_CreateEnsemble [] (3)  - manipulate ensemble commands
+Tcl_CreateEventSource [] (3)  - the event queue and notifier interfaces
+Tcl_CreateExitHandler [] (3)  - end the application or thread (and invoke exit handlers)
+Tcl_CreateFileHandler [] (3)  - associate procedure callbacks with files or devices (Unix only)
+Tcl_CreateHashEntry [] (3)  - procedures to manage hash tables
+Tcl_CreateInterp []  (3)  - create and delete Tcl command interpreters
+Tcl_CreateMathFunc [] (3)  - Define, query and enumerate math functions for expressions
+Tcl_CreateNamespace [] (3)  - manipulate namespaces
+Tcl_CreateObjCommand [] (3)  - implement new commands in C
+Tcl_CreateObjTrace [] (3)  - arrange for command execution to be traced
+Tcl_CreateSlave []   (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_CreateThread []  (3)  - Tcl thread support
+Tcl_CreateThreadExitHandler [] (3)  - end the application or thread (and invoke exit handlers)
+Tcl_CreateTimerHandler [] (3)  - call a procedure at a given time
+Tcl_CreateTrace []   (3)  - arrange for command execution to be traced
+Tcl_CutChannel []    (3)  - procedures for creating and manipulating channels
+Tcl_DStringAppend [] (3)  - manipulate dynamic strings
+Tcl_DStringAppendElement [] (3)  - manipulate dynamic strings
+Tcl_DStringEndSublist [] (3)  - manipulate dynamic strings
+Tcl_DStringFree []   (3)  - manipulate dynamic strings
+Tcl_DStringGetResult [] (3)  - manipulate dynamic strings
+Tcl_DStringInit []   (3)  - manipulate dynamic strings
+Tcl_DStringLength [] (3)  - manipulate dynamic strings
+Tcl_DStringResult [] (3)  - manipulate dynamic strings
+Tcl_DStringSetLength [] (3)  - manipulate dynamic strings
+Tcl_DStringStartSublist [] (3)  - manipulate dynamic strings
+Tcl_DStringTrunc []  (3)  - manipulate dynamic strings
+Tcl_DStringValue []  (3)  - manipulate dynamic strings
+Tcl_DecrRefCount []  (3)  - manipulate Tcl objects
+Tcl_DeleteAssocData [] (3)  - manage associations of string keys and user specified data with Tcl interpreters
+Tcl_DeleteChannelHandler [] (3)  - call a procedure when a channel becomes readable or writable
+Tcl_DeleteCloseHandler [] (3)  - arrange for callbacks when channels are closed
+Tcl_DeleteCommand [] (3)  - implement new commands in C
+Tcl_DeleteCommandFromToken [] (3)  - implement new commands in C
+Tcl_DeleteEventSource [] (3)  - the event queue and notifier interfaces
+Tcl_DeleteEvents []  (3)  - the event queue and notifier interfaces
+Tcl_DeleteExitHandler [] (3)  - end the application or thread (and invoke exit handlers)
+Tcl_DeleteFileHandler [] (3)  - associate procedure callbacks with files or devices (Unix only)
+Tcl_DeleteHashEntry [] (3)  - procedures to manage hash tables
+Tcl_DeleteHashTable [] (3)  - procedures to manage hash tables
+Tcl_DeleteInterp []  (3)  - create and delete Tcl command interpreters
+Tcl_DeleteNamespace [] (3)  - manipulate namespaces
+Tcl_DeleteThreadExitHandler [] (3)  - end the application or thread (and invoke exit handlers)
+Tcl_DeleteTimerHandler [] (3)  - call a procedure at a given time
+Tcl_DeleteTrace []   (3)  - arrange for command execution to be traced
+Tcl_DetachChannel [] (3)  - buffered I/O facilities using channels
+Tcl_DetachPids []    (3)  - manage child processes in background
+Tcl_DictObjDone []   (3)  - manipulate Tcl objects as dictionaries
+Tcl_DictObjFirst []  (3)  - manipulate Tcl objects as dictionaries
+Tcl_DictObjGet []    (3)  - manipulate Tcl objects as dictionaries
+Tcl_DictObjNext []   (3)  - manipulate Tcl objects as dictionaries
+Tcl_DictObjPut []    (3)  - manipulate Tcl objects as dictionaries
+Tcl_DictObjPutKeyList [] (3)  - manipulate Tcl objects as dictionaries
+Tcl_DictObjRemove [] (3)  - manipulate Tcl objects as dictionaries
+Tcl_DictObjRemoveKeyList [] (3)  - manipulate Tcl objects as dictionaries
+Tcl_DictObjSize []   (3)  - manipulate Tcl objects as dictionaries
+Tcl_DiscardInterpState [] (3)  - save and restore an interpreter's state
+Tcl_DiscardResult [] (3)  - save and restore an interpreter's state
+Tcl_DoOneEvent []    (3)  - wait for events and invoke event handlers
+Tcl_DoWhenIdle []    (3)  - invoke a procedure when there are no pending events
+Tcl_DontCallWhenDeleted [] (3)  - Arrange for callback when interpreter is deleted
+Tcl_DumpActiveMemory [] (3)  - Validated memory allocation interface
+Tcl_DuplicateObj []  (3)  - manipulate Tcl objects
+Tcl_Eof []           (3)  - buffered I/O facilities using channels
+Tcl_ErrnoId []       (3)  - manipulate errno to store and retrieve error codes
+Tcl_ErrnoMsg []      (3)  - manipulate errno to store and retrieve error codes
+Tcl_Eval []          (3)  - execute Tcl scripts
+Tcl_EvalEx []        (3)  - execute Tcl scripts
+Tcl_EvalFile []      (3)  - execute Tcl scripts
+Tcl_EvalObjEx []     (3)  - execute Tcl scripts
+Tcl_EvalObjv []      (3)  - execute Tcl scripts
+Tcl_EvalTokens []    (3)  - parse Tcl scripts and expressions
+Tcl_EvalTokensStandard [] (3)  - parse Tcl scripts and expressions
+Tcl_EventuallyFree [] (3)  - avoid freeing storage while it is being used
+Tcl_Exit []          (3)  - end the application or thread (and invoke exit handlers)
+Tcl_ExitThread []    (3)  - end the application or thread (and invoke exit handlers)
+Tcl_Export []        (3)  - manipulate namespaces
+Tcl_ExposeCommand [] (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_ExprBoolean []   (3)  - evaluate an expression
+Tcl_ExprBooleanObj [] (3)  - evaluate an expression
+Tcl_ExprDouble []    (3)  - evaluate an expression
+Tcl_ExprDoubleObj [] (3)  - evaluate an expression
+Tcl_ExprLong []      (3)  - evaluate an expression
+Tcl_ExprLongObj []   (3)  - evaluate an expression
+Tcl_ExprObj []       (3)  - evaluate an expression
+Tcl_ExprString []    (3)  - evaluate an expression
+Tcl_ExternalToUtf [] (3)  - procedures for creating and using encodings
+Tcl_ExternalToUtfDString [] (3)  - procedures for creating and using encodings
+Tcl_FSAccess []      (3)  - procedures to interact with any filesystem
+Tcl_FSChdir []       (3)  - procedures to interact with any filesystem
+Tcl_FSConvertToPathType [] (3)  - procedures to interact with any filesystem
+Tcl_FSCopyDirectory [] (3)  - procedures to interact with any filesystem
+Tcl_FSCopyFile []    (3)  - procedures to interact with any filesystem
+Tcl_FSCreateDirectory [] (3)  - procedures to interact with any filesystem
+Tcl_FSData []        (3)  - procedures to interact with any filesystem
+Tcl_FSDeleteFile []  (3)  - procedures to interact with any filesystem
+Tcl_FSEqualPaths []  (3)  - procedures to interact with any filesystem
+Tcl_FSEvalFile []    (3)  - procedures to interact with any filesystem
+Tcl_FSEvalFileEx []  (3)  - procedures to interact with any filesystem
+Tcl_FSFileAttrStrings [] (3)  - procedures to interact with any filesystem
+Tcl_FSFileAttrsGet [] (3)  - procedures to interact with any filesystem
+Tcl_FSFileAttrsSet [] (3)  - procedures to interact with any filesystem
+Tcl_FSFileSystemInfo [] (3)  - procedures to interact with any filesystem
+Tcl_FSGetCwd []      (3)  - procedures to interact with any filesystem
+Tcl_FSGetFileSystemForPath [] (3)  - procedures to interact with any filesystem
+Tcl_FSGetInternalRep [] (3)  - procedures to interact with any filesystem
+Tcl_FSGetNativePath [] (3)  - procedures to interact with any filesystem
+Tcl_FSGetNormalizedPath [] (3)  - procedures to interact with any filesystem
+Tcl_FSGetPathType [] (3)  - procedures to interact with any filesystem
+Tcl_FSGetTranslatedPath [] (3)  - procedures to interact with any filesystem
+Tcl_FSGetTranslatedStringPath [] (3)  - procedures to interact with any filesystem
+Tcl_FSJoinPath []    (3)  - procedures to interact with any filesystem
+Tcl_FSJoinToPath []  (3)  - procedures to interact with any filesystem
+Tcl_FSLink []        (3)  - procedures to interact with any filesystem
+Tcl_FSListVolumes [] (3)  - procedures to interact with any filesystem
+Tcl_FSLoadFile []    (3)  - procedures to interact with any filesystem
+Tcl_FSLstat []       (3)  - procedures to interact with any filesystem
+Tcl_FSMatchInDirectory [] (3)  - procedures to interact with any filesystem
+Tcl_FSMountsChanged [] (3)  - procedures to interact with any filesystem
+Tcl_FSNewNativePath [] (3)  - procedures to interact with any filesystem
+Tcl_FSOpenFileChannel [] (3)  - procedures to interact with any filesystem
+Tcl_FSPathSeparator [] (3)  - procedures to interact with any filesystem
+Tcl_FSRegister []    (3)  - procedures to interact with any filesystem
+Tcl_FSRemoveDirectory [] (3)  - procedures to interact with any filesystem
+Tcl_FSRenameFile []  (3)  - procedures to interact with any filesystem
+Tcl_FSSplitPath []   (3)  - procedures to interact with any filesystem
+Tcl_FSStat []        (3)  - procedures to interact with any filesystem
+Tcl_FSUnregister []  (3)  - procedures to interact with any filesystem
+Tcl_FSUtime []       (3)  - procedures to interact with any filesystem
+Tcl_Finalize []      (3)  - end the application or thread (and invoke exit handlers)
+Tcl_FinalizeNotifier [] (3)  - the event queue and notifier interfaces
+Tcl_FinalizeThread [] (3)  - end the application or thread (and invoke exit handlers)
+Tcl_FindCommand []   (3)  - manipulate namespaces
+Tcl_FindEnsemble []  (3)  - manipulate ensemble commands
+Tcl_FindExecutable [] (3)  - identify or return the name of the binary file containing the application
+Tcl_FindHashEntry [] (3)  - procedures to manage hash tables
+Tcl_FindNamespace [] (3)  - manipulate namespaces
+Tcl_FirstHashEntry [] (3)  - procedures to manage hash tables
+Tcl_Flush []         (3)  - buffered I/O facilities using channels
+Tcl_ForgetImport []  (3)  - manipulate namespaces
+Tcl_Format []        (3)  - manipulate Tcl objects as strings
+Tcl_Free []          (3)  - allocate or free heap memory
+Tcl_FreeEncoding []  (3)  - procedures for creating and using encodings
+Tcl_FreeParse []     (3)  - parse Tcl scripts and expressions
+Tcl_FreeResult []    (3)  - manipulate Tcl result
+Tcl_GetAlias []      (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_GetAliasObj []   (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_GetAssocData []  (3)  - manage associations of string keys and user specified data with Tcl interpreters
+Tcl_GetBignumFromObj [] (3)  - manipulate Tcl objects as integer values
+Tcl_GetBoolean []    (3)  - convert from string to integer, double, or boolean
+Tcl_GetBooleanFromObj [] (3)  - store/retrieve boolean value in a Tcl_Obj
+Tcl_GetByteArrayFromObj [] (3)  - manipulate Tcl objects as a arrays of bytes
+Tcl_GetChannel []    (3)  - buffered I/O facilities using channels
+Tcl_GetChannelBufferSize [] (3)  - procedures for creating and manipulating channels
+Tcl_GetChannelError [] (3)  - functions to create/intercept Tcl errors by channel drivers
+Tcl_GetChannelErrorInterp [] (3)  - functions to create/intercept Tcl errors by channel drivers
+Tcl_GetChannelHandle [] (3)  - procedures for creating and manipulating channels
+Tcl_GetChannelInstanceData [] (3)  - procedures for creating and manipulating channels
+Tcl_GetChannelMode [] (3)  - procedures for creating and manipulating channels
+Tcl_GetChannelName [] (3)  - procedures for creating and manipulating channels
+Tcl_GetChannelNames [] (3)  - buffered I/O facilities using channels
+Tcl_GetChannelNamesEx [] (3)  - buffered I/O facilities using channels
+Tcl_GetChannelOption [] (3)  - buffered I/O facilities using channels
+Tcl_GetChannelThread [] (3)  - procedures for creating and manipulating channels
+Tcl_GetChannelType [] (3)  - procedures for creating and manipulating channels
+Tcl_GetCharLength [] (3)  - manipulate Tcl objects as strings
+Tcl_GetCommandFromObj [] (3)  - implement new commands in C
+Tcl_GetCommandFullName [] (3)  - implement new commands in C
+Tcl_GetCommandInfo [] (3)  - implement new commands in C
+Tcl_GetCommandInfoFromToken [] (3)  - implement new commands in C
+Tcl_GetCommandName [] (3)  - implement new commands in C
+Tcl_GetCurrentNamespace [] (3)  - manipulate namespaces
+Tcl_GetCurrentThread [] (3)  - the event queue and notifier interfaces
+Tcl_GetCwd []        (3)  - manipulate the current working directory
+Tcl_GetDefaultEncodingDir [] (3)  - procedures for creating and using encodings
+Tcl_GetDouble []     (3)  - convert from string to integer, double, or boolean
+Tcl_GetDoubleFromObj [] (3)  - manipulate Tcl objects as floating-point values
+Tcl_GetEncoding []   (3)  - procedures for creating and using encodings
+Tcl_GetEncodingFromObj [] (3)  - procedures for creating and using encodings
+Tcl_GetEncodingName [] (3)  - procedures for creating and using encodings
+Tcl_GetEncodingNameFromEnvironment [] (3)  - procedures for creating and using encodings
+Tcl_GetEncodingNames [] (3)  - procedures for creating and using encodings
+Tcl_GetEncodingSearchPath [] (3)  - procedures for creating and using encodings
+Tcl_GetEnsembleFlags [] (3)  - manipulate ensemble commands
+Tcl_GetEnsembleMappingDict [] (3)  - manipulate ensemble commands
+Tcl_GetEnsembleNamespace [] (3)  - manipulate ensemble commands
+Tcl_GetEnsembleSubcommandList [] (3)  - manipulate ensemble commands
+Tcl_GetEnsembleUnknownHandler [] (3)  - manipulate ensemble commands
+Tcl_GetErrno []      (3)  - manipulate errno to store and retrieve error codes
+Tcl_GetGlobalNamespace [] (3)  - manipulate namespaces
+Tcl_GetHashKey []    (3)  - procedures to manage hash tables
+Tcl_GetHashValue []  (3)  - procedures to manage hash tables
+Tcl_GetHostName []   (3)  - get the name of the local host
+Tcl_GetIndexFromObj [] (3)  - lookup string in table of keywords
+Tcl_GetIndexFromObjStruct [] (3)  - lookup string in table of keywords
+Tcl_GetInt []        (3)  - convert from string to integer, double, or boolean
+Tcl_GetIntFromObj [] (3)  - manipulate Tcl objects as integer values
+Tcl_GetInterpPath [] (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_GetLongFromObj [] (3)  - manipulate Tcl objects as integer values
+Tcl_GetMaster []     (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_GetMathFuncInfo [] (3)  - Define, query and enumerate math functions for expressions
+Tcl_GetNameOfExecutable [] (3)  - identify or return the name of the binary file containing the application
+Tcl_GetNamespaceUnknownHandler [] (3)  - manipulate namespaces
+Tcl_GetObjResult []  (3)  - manipulate Tcl result
+Tcl_GetObjType []    (3)  - manipulate Tcl object types
+Tcl_GetOpenFile []   (3)  - Return a FILE* for a channel registered in the given interpreter (Unix only)
+Tcl_GetPathType []   (3)  - manipulate platform-dependent file paths
+Tcl_GetRange []      (3)  - manipulate Tcl objects as strings
+Tcl_GetRegExpFromObj [] (3)  - Pattern matching with regular expressions
+Tcl_GetReturnOptions [] (3)  - retrieve or record information about errors and other return options
+Tcl_GetServiceMode [] (3)  - the event queue and notifier interfaces
+Tcl_GetSlave []      (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_GetStackedChannel [] (3)  - manipulate stacked I/O channels
+Tcl_GetStdChannel [] (3)  - procedures for retrieving and replacing the standard channels
+Tcl_GetString []     (3)  - manipulate Tcl objects as strings
+Tcl_GetStringFromObj [] (3)  - manipulate Tcl objects as strings
+Tcl_GetStringResult [] (3)  - manipulate Tcl result
+Tcl_GetThreadData [] (3)  - Tcl thread support
+Tcl_GetTime []       (3)  - get date and time
+Tcl_GetTopChannel [] (3)  - manipulate stacked I/O channels
+Tcl_GetUniChar []    (3)  - manipulate Tcl objects as strings
+Tcl_GetUnicode []    (3)  - manipulate Tcl objects as strings
+Tcl_GetUnicodeFromObj [] (3)  - manipulate Tcl objects as strings
+Tcl_GetVar []        (3)  - manipulate Tcl variables
+Tcl_GetVar2 []       (3)  - manipulate Tcl variables
+Tcl_GetVar2Ex []     (3)  - manipulate Tcl variables
+Tcl_GetVersion []    (3)  - get the version of the library at runtime
+Tcl_GetWideIntFromObj [] (3)  - manipulate Tcl objects as integer values
+Tcl_Gets []          (3)  - buffered I/O facilities using channels
+Tcl_GetsObj []       (3)  - buffered I/O facilities using channels
+Tcl_GlobalEval []    (3)  - execute Tcl scripts
+Tcl_GlobalEvalObj [] (3)  - execute Tcl scripts
+Tcl_HashStats []     (3)  - procedures to manage hash tables
+Tcl_HideCommand []   (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_Import []        (3)  - manipulate namespaces
+Tcl_IncrRefCount []  (3)  - manipulate Tcl objects
+Tcl_Init []          (3)  - find and source initialization script
+Tcl_InitCustomHashTable [] (3)  - procedures to manage hash tables
+Tcl_InitHashTable [] (3)  - procedures to manage hash tables
+Tcl_InitMemory []    (3)  - Validated memory allocation interface
+Tcl_InitNotifier []  (3)  - the event queue and notifier interfaces
+Tcl_InitObjHashTable [] (3)  - procedures to manage hash tables
+Tcl_InitStubs []     (3)  - initialize the Tcl stubs mechanism
+Tcl_InputBlocked []  (3)  - buffered I/O facilities using channels
+Tcl_InputBuffered [] (3)  - buffered I/O facilities using channels
+Tcl_Interp []        (3)  - client-visible fields of interpreter structures
+Tcl_InterpDeleted [] (3)  - create and delete Tcl command interpreters
+Tcl_InvalidateStringRep [] (3)  - manipulate Tcl objects
+Tcl_IsChannelExisting [] (3)  - procedures for creating and manipulating channels
+Tcl_IsChannelRegistered [] (3)  - procedures for creating and manipulating channels
+Tcl_IsChannelShared [] (3)  - procedures for creating and manipulating channels
+Tcl_IsEnsemble []    (3)  - manipulate ensemble commands
+Tcl_IsSafe []        (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_IsShared []      (3)  - manipulate Tcl objects
+Tcl_IsStandardChannel [] (3)  - buffered I/O facilities using channels
+Tcl_JoinPath []      (3)  - manipulate platform-dependent file paths
+Tcl_JoinThread []    (3)  - Tcl thread support
+Tcl_LimitAddHandler [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitCheck []    (3)  - manage and check resource limits on interpreters
+Tcl_LimitExceeded [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitGetCommands [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitGetGranularity [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitGetTime []  (3)  - manage and check resource limits on interpreters
+Tcl_LimitReady []    (3)  - manage and check resource limits on interpreters
+Tcl_LimitRemoveHandler [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitSetCommands [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitSetGranularity [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitSetTime []  (3)  - manage and check resource limits on interpreters
+Tcl_LimitTypeEnabled [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitTypeExceeded [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitTypeReset [] (3)  - manage and check resource limits on interpreters
+Tcl_LimitTypeSet []  (3)  - manage and check resource limits on interpreters
+Tcl_LinkVar []       (3)  - link Tcl variable to C variable
+Tcl_ListMathFuncs [] (3)  - Define, query and enumerate math functions for expressions
+Tcl_ListObjAppendElement [] (3)  - manipulate Tcl objects as lists
+Tcl_ListObjAppendList [] (3)  - manipulate Tcl objects as lists
+Tcl_ListObjGetElements [] (3)  - manipulate Tcl objects as lists
+Tcl_ListObjIndex []  (3)  - manipulate Tcl objects as lists
+Tcl_ListObjLength [] (3)  - manipulate Tcl objects as lists
+Tcl_ListObjReplace [] (3)  - manipulate Tcl objects as lists
+Tcl_LogCommandInfo [] (3)  - retrieve or record information about errors and other return options
+Tcl_Main []          (3)  - main program and event loop definition for Tcl-based applications
+Tcl_MakeFileChannel [] (3)  - buffered I/O facilities using channels
+Tcl_MakeSafe []      (3)  - manage multiple Tcl interpreters, aliases and hidden commands
+Tcl_MakeTcpClientChannel [] (3)  - procedures to open channels using TCP sockets
+Tcl_Merge []         (3)  - manipulate Tcl lists
+Tcl_MutexFinalize [] (3)  - Tcl thread support
+Tcl_MutexLock []     (3)  - Tcl thread support
+Tcl_MutexUnlock []   (3)  - Tcl thread support
+Tcl_NewBignumObj []  (3)  - manipulate Tcl objects as integer values
+Tcl_NewBooleanObj [] (3)  - store/retrieve boolean value in a Tcl_Obj
+Tcl_NewByteArrayObj [] (3)  - manipulate Tcl objects as a arrays of bytes
+Tcl_NewDictObj []    (3)  - manipulate Tcl objects as dictionaries
+Tcl_NewDoubleObj []  (3)  - manipulate Tcl objects as floating-point values
+Tcl_NewIntObj []     (3)  - manipulate Tcl objects as integer values
+Tcl_NewListObj []    (3)  - manipulate Tcl objects as lists
+Tcl_NewLongObj []    (3)  - manipulate Tcl objects as integer values
+Tcl_NewObj []        (3)  - manipulate Tcl objects
+Tcl_NewStringObj []  (3)  - manipulate Tcl objects as strings
+Tcl_NewUnicodeObj [] (3)  - manipulate Tcl objects as strings
+Tcl_NewWideIntObj [] (3)  - manipulate Tcl objects as integer values
+Tcl_NextHashEntry [] (3)  - procedures to manage hash tables
+Tcl_NotifyChannel [] (3)  - procedures for creating and manipulating channels
+Tcl_NumUtfChars []   (3)  - routines for manipulating UTF-8 strings
+Tcl_ObjGetVar2 []    (3)  - manipulate Tcl variables
+Tcl_ObjPrintf []     (3)  - manipulate Tcl objects as strings
+Tcl_ObjSetVar2 []    (3)  - manipulate Tcl variables
+Tcl_OpenCommandChannel [] (3)  - buffered I/O facilities using channels
+Tcl_OpenFileChannel [] (3)  - buffered I/O facilities using channels
+Tcl_OpenTcpClient [] (3)  - procedures to open channels using TCP sockets
+Tcl_OpenTcpServer [] (3)  - procedures to open channels using TCP sockets
+Tcl_OutputBuffered [] (3)  - buffered I/O facilities using channels
+Tcl_Panic []         (3)  - report fatal error and abort
+Tcl_PanicVA []       (3)  - report fatal error and abort
+Tcl_ParseBraces []   (3)  - parse Tcl scripts and expressions
+Tcl_ParseCommand []  (3)  - parse Tcl scripts and expressions
+Tcl_ParseExpr []     (3)  - parse Tcl scripts and expressions
+Tcl_ParseQuotedString [] (3)  - parse Tcl scripts and expressions
+Tcl_ParseVar []      (3)  - parse Tcl scripts and expressions
+Tcl_ParseVarName []  (3)  - parse Tcl scripts and expressions
+Tcl_PkgPresent []    (3)  - package version control
+Tcl_PkgPresentEx []  (3)  - package version control
+Tcl_PkgProvide []    (3)  - package version control
+Tcl_PkgProvideEx []  (3)  - package version control
+Tcl_PkgRequire []    (3)  - package version control
+Tcl_PkgRequireEx []  (3)  - package version control
+Tcl_PkgRequireProc [] (3)  - package version control
+Tcl_PosixError []    (3)  - retrieve or record information about errors and other return options
+Tcl_Preserve []      (3)  - avoid freeing storage while it is being used
+Tcl_PrintDouble []   (3)  - Convert floating value to string
+Tcl_PutEnv []        (3)  - procedures to manipulate the environment
+Tcl_QueryTimeProc [] (3)  - get date and time
+Tcl_QueueEvent []    (3)  - the event queue and notifier interfaces
+Tcl_Read []          (3)  - buffered I/O facilities using channels
+Tcl_ReadChars []     (3)  - buffered I/O facilities using channels
+Tcl_ReadRaw []       (3)  - buffered I/O facilities using channels
+Tcl_Realloc []       (3)  - allocate or free heap memory
+Tcl_ReapDetachedProcs [] (3)  - manage child processes in background
+Tcl_RecordAndEval [] (3)  - save command on history list before evaluating
+Tcl_RecordAndEvalObj [] (3)  - save command on history list before evaluating
+Tcl_RegExpCompile [] (3)  - Pattern matching with regular expressions
+Tcl_RegExpExec []    (3)  - Pattern matching with regular expressions
+Tcl_RegExpExecObj [] (3)  - Pattern matching with regular expressions
+Tcl_RegExpGetInfo [] (3)  - Pattern matching with regular expressions
+Tcl_RegExpMatch []   (3)  - Pattern matching with regular expressions
+Tcl_RegExpMatchObj [] (3)  - Pattern matching with regular expressions
+Tcl_RegExpRange []   (3)  - Pattern matching with regular expressions
+Tcl_RegisterChannel [] (3)  - buffered I/O facilities using channels
+Tcl_RegisterConfig [] (3)  - procedures to register embedded configuration information
+Tcl_RegisterObjType [] (3)  - manipulate Tcl object types
+Tcl_Release []       (3)  - avoid freeing storage while it is being used
+Tcl_ResetResult []   (3)  - manipulate Tcl result
+Tcl_RestoreInterpState [] (3)  - save and restore an interpreter's state
+Tcl_RestoreResult [] (3)  - save and restore an interpreter's state
+Tcl_SaveInterpState [] (3)  - save and restore an interpreter's state
+Tcl_SaveResult []    (3)  - save and restore an interpreter's state
+Tcl_ScanCountedElement [] (3)  - manipulate Tcl lists
+Tcl_ScanElement []   (3)  - manipulate Tcl lists
+Tcl_Seek []          (3)  - buffered I/O facilities using channels
+Tcl_ServiceAll []    (3)  - the event queue and notifier interfaces
+Tcl_ServiceEvent []  (3)  - the event queue and notifier interfaces
+Tcl_SetAssocData []  (3)  - manage associations of string keys and user specified data with Tcl interpreters
+Tcl_SetBignumObj []  (3)  - manipulate Tcl objects as integer values
+Tcl_SetBooleanObj [] (3)  - store/retrieve boolean value in a Tcl_Obj
+Tcl_SetByteArrayLength [] (3)  - manipulate Tcl objects as a arrays of bytes
+Tcl_SetByteArrayObj [] (3)  - manipulate Tcl objects as a arrays of bytes
+Tcl_SetChannelBufferSize [] (3)  - procedures for creating and manipulating channels
+Tcl_SetChannelError [] (3)  - functions to create/intercept Tcl errors by channel drivers
+Tcl_SetChannelErrorInterp [] (3)  - functions to create/intercept Tcl errors by channel drivers
+Tcl_SetChannelOption [] (3)  - buffered I/O facilities using channels
+Tcl_SetCommandInfo [] (3)  - implement new commands in C
+Tcl_SetCommandInfoFromToken [] (3)  - implement new commands in C
+Tcl_SetDefaultEncodingDir [] (3)  - procedures for creating and using encodings
+Tcl_SetDoubleObj []  (3)  - manipulate Tcl objects as floating-point values
+Tcl_SetEncodingSearchPath [] (3)  - procedures for creating and using encodings
+Tcl_SetEnsembleFlags [] (3)  - manipulate ensemble commands
+Tcl_SetEnsembleMappingDict [] (3)  - manipulate ensemble commands
+Tcl_SetEnsembleSubcommandList [] (3)  - manipulate ensemble commands
+Tcl_SetEnsembleUnknownHandler [] (3)  - manipulate ensemble commands
+Tcl_SetErrno []      (3)  - manipulate errno to store and retrieve error codes
+Tcl_SetErrorCode []  (3)  - retrieve or record information about errors and other return options
+Tcl_SetErrorCodeVA [] (3)  - retrieve or record information about errors and other return options
+Tcl_SetExitProc []   (3)  - end the application or thread (and invoke exit handlers)
+Tcl_SetHashValue []  (3)  - procedures to manage hash tables
+Tcl_SetIntObj []     (3)  - manipulate Tcl objects as integer values
+Tcl_SetListObj []    (3)  - manipulate Tcl objects as lists
+Tcl_SetLongObj []    (3)  - manipulate Tcl objects as integer values
+Tcl_SetMainLoop []   (3)  - main program and event loop definition for Tcl-based applications
+Tcl_SetMaxBlockTime [] (3)  - the event queue and notifier interfaces
+Tcl_SetNamespaceUnknownHandler [] (3)  - manipulate namespaces
+Tcl_SetObjErrorCode [] (3)  - retrieve or record information about errors and other return options
+Tcl_SetObjLength []  (3)  - manipulate Tcl objects as strings
+Tcl_SetObjResult []  (3)  - manipulate Tcl result
+Tcl_SetPanicProc []  (3)  - report fatal error and abort
+Tcl_SetRecursionLimit [] (3)  - set maximum allowable nesting depth in interpreter
+Tcl_SetResult []     (3)  - manipulate Tcl result
+Tcl_SetReturnOptions [] (3)  - retrieve or record information about errors and other return options
+Tcl_SetServiceMode [] (3)  - the event queue and notifier interfaces
+Tcl_SetStdChannel [] (3)  - procedures for retrieving and replacing the standard channels
+Tcl_SetStringObj []  (3)  - manipulate Tcl objects as strings
+Tcl_SetSystemEncoding [] (3)  - procedures for creating and using encodings
+Tcl_SetTimeProc []   (3)  - get date and time
+Tcl_SetTimer []      (3)  - the event queue and notifier interfaces
+Tcl_SetUnicodeObj [] (3)  - manipulate Tcl objects as strings
+Tcl_SetVar []        (3)  - manipulate Tcl variables
+Tcl_SetVar2 []       (3)  - manipulate Tcl variables
+Tcl_SetVar2Ex []     (3)  - manipulate Tcl variables
+Tcl_SetWideIntObj [] (3)  - manipulate Tcl objects as integer values
+Tcl_SignalId []      (3)  - Convert signal codes
+Tcl_SignalMsg []     (3)  - Convert signal codes
+Tcl_Sleep []         (3)  - delay execution for a given number of milliseconds
+Tcl_SourceRCFile []  (3)  - source the Tcl rc file
+Tcl_SpliceChannel [] (3)  - procedures for creating and manipulating channels
+Tcl_SplitList []     (3)  - manipulate Tcl lists
+Tcl_SplitPath []     (3)  - manipulate platform-dependent file paths
+Tcl_StackChannel []  (3)  - manipulate stacked I/O channels
+Tcl_StandardChannels [] (3)  - How the Tcl library deals with the standard channels
+Tcl_Stat []          (3)  - check file permissions and other attributes
+Tcl_StaticPackage [] (3)  - make a statically linked package available via the 'load' command
+Tcl_StringCaseMatch [] (3)  - test whether a string matches a pattern
+Tcl_StringMatch []   (3)  - test whether a string matches a pattern
+Tcl_SubstObj []      (3)  - perform substitutions on Tcl objects
+Tcl_TakeBignumFromObj [] (3)  - manipulate Tcl objects as integer values
+Tcl_Tell []          (3)  - buffered I/O facilities using channels
+Tcl_ThreadAlert []   (3)  - the event queue and notifier interfaces
+Tcl_ThreadQueueEvent [] (3)  - the event queue and notifier interfaces
+Tcl_TraceCommand []  (3)  - monitor renames and deletes of a command
+Tcl_TraceVar []      (3)  - monitor accesses to a variable
+Tcl_TraceVar2 []     (3)  - monitor accesses to a variable
+Tcl_TranslateFileName [] (3)  - convert file name to native form and replace tilde with home directory
+Tcl_TruncateChannel [] (3)  - buffered I/O facilities using channels
+Tcl_Ungets []        (3)  - buffered I/O facilities using channels
+Tcl_UniChar []       (3)  - routines for manipulating UTF-8 strings
+Tcl_UniCharAtIndex [] (3)  - routines for manipulating UTF-8 strings
+Tcl_UniCharCaseMatch [] (3)  - routines for manipulating UTF-8 strings
+Tcl_UniCharIsAlnum [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsAlpha [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsControl [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsDigit [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsGraph [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsLower [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsPrint [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsPunct [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsSpace [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsUpper [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsWordChar [] (3)  - routines for classification of Tcl_UniChar characters
+Tcl_UniCharLen []    (3)  - routines for manipulating UTF-8 strings
+Tcl_UniCharNcasecmp [] (3)  - routines for manipulating UTF-8 strings
+Tcl_UniCharNcmp []   (3)  - routines for manipulating UTF-8 strings
+Tcl_UniCharToLower [] (3)  - routines for manipulating the case of Unicode characters and UTF-8 strings
+Tcl_UniCharToTitle [] (3)  - routines for manipulating the case of Unicode characters and UTF-8 strings
+Tcl_UniCharToUpper [] (3)  - routines for manipulating the case of Unicode characters and UTF-8 strings
+Tcl_UniCharToUtf []  (3)  - routines for manipulating UTF-8 strings
+Tcl_UniCharToUtfDString [] (3)  - routines for manipulating UTF-8 strings
+Tcl_UnlinkVar []     (3)  - link Tcl variable to C variable
+Tcl_UnregisterChannel [] (3)  - buffered I/O facilities using channels
+Tcl_UnsetVar []      (3)  - manipulate Tcl variables
+Tcl_UnsetVar2 []     (3)  - manipulate Tcl variables
+Tcl_UnstackChannel [] (3)  - manipulate stacked I/O channels
+Tcl_UntraceCommand [] (3)  - monitor renames and deletes of a command
+Tcl_UntraceVar []    (3)  - monitor accesses to a variable
+Tcl_UntraceVar2 []   (3)  - monitor accesses to a variable
+Tcl_UpVar []         (3)  - link one variable to another
+Tcl_UpVar2 []        (3)  - link one variable to another
+Tcl_UpdateLinkedVar [] (3)  - link Tcl variable to C variable
+Tcl_UtfAtIndex []    (3)  - routines for manipulating UTF-8 strings
+Tcl_UtfBackslash []  (3)  - routines for manipulating UTF-8 strings
+Tcl_UtfCharComplete [] (3)  - routines for manipulating UTF-8 strings
+Tcl_UtfFindFirst []  (3)  - routines for manipulating UTF-8 strings
+Tcl_UtfFindLast []   (3)  - routines for manipulating UTF-8 strings
+Tcl_UtfNext []       (3)  - routines for manipulating UTF-8 strings
+Tcl_UtfPrev []       (3)  - routines for manipulating UTF-8 strings
+Tcl_UtfToExternal [] (3)  - procedures for creating and using encodings
+Tcl_UtfToExternalDString [] (3)  - procedures for creating and using encodings
+Tcl_UtfToLower []    (3)  - routines for manipulating the case of Unicode characters and UTF-8 strings
+Tcl_UtfToTitle []    (3)  - routines for manipulating the case of Unicode characters and UTF-8 strings
+Tcl_UtfToUniChar []  (3)  - routines for manipulating UTF-8 strings
+Tcl_UtfToUniCharDString [] (3)  - routines for manipulating UTF-8 strings
+Tcl_UtfToUpper []    (3)  - routines for manipulating the case of Unicode characters and UTF-8 strings
+Tcl_ValidateAllMemory [] (3)  - Validated memory allocation interface
+Tcl_VarEval []       (3)  - execute Tcl scripts
+Tcl_VarEvalVA []     (3)  - execute Tcl scripts
+Tcl_VarTraceInfo []  (3)  - monitor accesses to a variable
+Tcl_VarTraceInfo2 [] (3)  - monitor accesses to a variable
+Tcl_WaitForEvent []  (3)  - the event queue and notifier interfaces
+Tcl_WaitPid []       (3)  - manage child processes in background
+Tcl_WinTCharToUtf [] (3)  - procedures for creating and using encodings
+Tcl_WinUtfToTChar [] (3)  - procedures for creating and using encodings
+Tcl_Write []         (3)  - buffered I/O facilities using channels
+Tcl_WriteChars []    (3)  - buffered I/O facilities using channels
+Tcl_WriteObj []      (3)  - buffered I/O facilities using channels
+Tcl_WriteRaw []      (3)  - buffered I/O facilities using channels
+Tcl_WrongNumArgs []  (3)  - generate standard error message for wrong number of arguments
+Term::ANSIColor []   (3)  - Color screen output using ANSI escape sequences
+Term::Cap []         (3)  - Perl termcap interface
+Term::Complete []    (3)  - Perl word completion module
+Term::ReadLine []    (3)  - Perl interface to various readline packages. If no real package is found, substitutes stubs instead of basic functions
+Term::UI []          (3)  - Term::ReadLine UI made easy
+Terminal             (1)  - A Terminal emulator for X
+Terminal []          (1)  - A Terminal emulator for X
+Test []              (3)  - provides a simple framework for writing test scripts
+Test::Builder []     (3)  - Backend for building test libraries
+Test::Builder::Module [] (3)  - Base class for test modules
+Test::Builder::Tester [] (3)  - test testsuites that have been built with Test::Builder
+Test::Builder::Tester::Color [] (3)  - turn on colour in Test::Builder::Tester
+Test::Harness []     (3)  - Run Perl standard test scripts with statistics
+Test::Harness::Assert [] (3)  - simple assert
+Test::Harness::Iterator [] (3)  - Internal Test::Harness Iterator
+Test::Harness::Point [] (3)  - object for tracking a single test point
+Test::Harness::Results [] (3)  - object for tracking results from a single test file
+Test::Harness::Straps [] (3)  - detailed analysis of test results
+Test::Harness::TAP [] (3)  - Documentation for the TAP format
+Test::Harness::Util [] (3)  - Utility functions for Test::Harness::*
+Test::More []        (3)  - yet another framework for writing test scripts
+Test::Simple []      (3)  - Basic utilities for writing tests
+Test::Tutorial []    (3)  - A tutorial about writing really basic tests
+Text::Balanced []    (3)  - Extract delimited text sequences from strings
+Text::ParseWords []  (3)  - parse text into an array of tokens or array of arrays
+Text::Soundex []     (3)  - Implementation of the soundex algorithm
+Text::Tabs []        (3)  - - expand and unexpand tabs per the unix expand(1) and unexpand(1)
+Text::Wrap []        (3)  - line wrapping to form simple paragraphs
+The Net []           (3)  - SNMP agent - The snmp agent responds to SNMP queries from management stations
+The Net []           (3)  - SNMP library -
+Thread []            (3)  - Manipulate threads in Perl (for old code only)
+Thread::Queue []     (3)  - thread-safe queues
+Thread::Semaphore [] (3)  - thread-safe semaphores
+Thunar               (1)  - File Manager for the Xfce Desktop Environment
+Thunar []            (1)  - File Manager for the Xfce Desktop Environment
+Tie::Array []        (3)  - base class for tied arrays
+Tie::ExtraHash []    (3)  - base class definitions for tied hashes
+Tie::File []         (3)  - Access the lines of a disk file via a Perl array
+Tie::Handle []       (3)  - base class definitions for tied handles
+Tie::Hash []         (3)  - base class definitions for tied hashes
+Tie::Hash::NamedCapture [] (3)  - Named regexp capture buffers
+Tie::Memoize []      (3)  - add data to hash when needed
+Tie::RefHash []      (3)  - use references as hash keys
+Tie::Scalar []       (3)  - base class definitions for tied scalars
+Tie::StdHash []      (3)  - base class definitions for tied hashes
+Tie::StdScalar []    (3)  - base class definitions for tied scalars
+Tie::SubstrHash []   (3)  - Fixed-table-size, fixed-key-length hashing
+Tim Bunce []         (3)  - 12th November 2004
+Time::HiRes []       (3)  - High resolution alarm, sleep, gettimeofday, interval timers
+Time::Local []       (3)  - efficiently compute time from local and GMT time
+Time::Piece []       (3)  - Object Oriented time objects
+Time::Seconds []     (3)  - a simple API to convert seconds to other date values
+Time::gmtime []      (3)  - by-name interface to Perl's built-in gmtime() function
+Time::localtime []   (3)  - by-name interface to Perl's built-in localtime() function
+Time::tm []          (3)  - internal object used by Time::gmtime and Time::localtime
+TixIntro []          (n)  - Introduction to the Tix library
+Tk_3DBorderColor []  (3)  - draw borders with three-dimensional appearance
+Tk_3DBorderGC []     (3)  - draw borders with three-dimensional appearance
+Tk_3DHorizontalBevel [] (3)  - draw borders with three-dimensional appearance
+Tk_3DVerticalBevel [] (3)  - draw borders with three-dimensional appearance
+Tk_AddOption []      (3)  - Add an option to the option database
+Tk_Alloc3DBorderFromObj [] (3)  - draw borders with three-dimensional appearance
+Tk_AllocBitmapFromObj [] (3)  - maintain database of single-plane pixmaps
+Tk_AllocColorFromObj [] (3)  - maintain database of colors
+Tk_AllocCursorFromObj [] (3)  - maintain database of cursors
+Tk_AllocFontFromObj [] (3)  - maintain database of fonts
+Tk_AttachHWND []     (3)  - manage interactions between the Windows handle and an X window
+Tk_Attributes []     (3)  - retrieve information from Tk's local data structure
+Tk_BindEvent []      (3)  - invoke scripts in response to X events
+Tk_CanvasDrawableCoords [] (3)  - utility procedures for canvas type managers
+Tk_CanvasEventuallyRedraw [] (3)  - utility procedures for canvas type managers
+Tk_CanvasGetCoord [] (3)  - utility procedures for canvas type managers
+Tk_CanvasPsBitmap [] (3)  - utility procedures for generating Postscript for canvases
+Tk_CanvasPsColor []  (3)  - utility procedures for generating Postscript for canvases
+Tk_CanvasPsFont []   (3)  - utility procedures for generating Postscript for canvases
+Tk_CanvasPsPath []   (3)  - utility procedures for generating Postscript for canvases
+Tk_CanvasPsStipple [] (3)  - utility procedures for generating Postscript for canvases
+Tk_CanvasPsY []      (3)  - utility procedures for generating Postscript for canvases
+Tk_CanvasSetStippleOrigin [] (3)  - utility procedures for canvas type managers
+Tk_CanvasTagsOption [] (3)  - utility procedures for canvas type managers
+Tk_CanvasTextInfo [] (3)  - additional information for managing text items in canvases
+Tk_CanvasTkwin []    (3)  - utility procedures for canvas type managers
+Tk_CanvasWindowCoords [] (3)  - utility procedures for canvas type managers
+Tk_ChangeWindowAttributes [] (3)  - change window configuration or attributes
+Tk_Changes []        (3)  - retrieve information from Tk's local data structure
+Tk_CharBbox []       (3)  - routines to measure and display single-font, multi-line, justified text
+Tk_Class []          (3)  - set or retrieve a window's class
+Tk_ClearSelection [] (3)  - Deselect a selection
+Tk_ClipboardAppend [] (3)  - Manage the clipboard
+Tk_ClipboardClear [] (3)  - Manage the clipboard
+Tk_CollapseMotionEvents [] (3)  - Add a window event to the Tcl event queue
+Tk_Colormap []       (3)  - retrieve information from Tk's local data structure
+Tk_ComputeTextLayout [] (3)  - routines to measure and display single-font, multi-line, justified text
+Tk_ConfigureInfo []  (3)  - process configuration options for widgets
+Tk_ConfigureValue [] (3)  - process configuration options for widgets
+Tk_ConfigureWidget [] (3)  - process configuration options for widgets
+Tk_ConfigureWindow [] (3)  - change window configuration or attributes
+Tk_CoordsToWindow [] (3)  - Find window containing a point
+Tk_CreateBinding []  (3)  - invoke scripts in response to X events
+Tk_CreateBindingTable [] (3)  - invoke scripts in response to X events
+Tk_CreateClientMessageHandler [] (3)  - associate procedure callback with ClientMessage type X events
+Tk_CreateErrorHandler [] (3)  - handle X protocol errors
+Tk_CreateEventHandler [] (3)  - associate procedure callback with an X event
+Tk_CreateGenericHandler [] (3)  - associate procedure callback with all X events
+Tk_CreateImageType [] (3)  - define new kind of image
+Tk_CreateItemType [] (3)  - define new kind of canvas item
+Tk_CreateOptionTable [] (3)  - process configuration options
+Tk_CreatePhotoImageFormat [] (3)  - define new file format for photo images
+Tk_CreateSelHandler [] (3)  - arrange to handle requests for a selection
+Tk_CreateWindow []   (3)  - create or delete window
+Tk_CreateWindowFromPath [] (3)  - create or delete window
+Tk_DefineBitmap []   (3)  - maintain database of single-plane pixmaps
+Tk_DefineCursor []   (3)  - change window configuration or attributes
+Tk_DeleteAllBindings [] (3)  - invoke scripts in response to X events
+Tk_DeleteBinding []  (3)  - invoke scripts in response to X events
+Tk_DeleteBindingTable [] (3)  - invoke scripts in response to X events
+Tk_DeleteClientMessageHandler [] (3)  - associate procedure callback with ClientMessage type X events
+Tk_DeleteErrorHandler [] (3)  - handle X protocol errors
+Tk_DeleteEventHandler [] (3)  - associate procedure callback with an X event
+Tk_DeleteGenericHandler [] (3)  - associate procedure callback with all X events
+Tk_DeleteImage []    (3)  - Destroy an image
+Tk_DeleteOptionTable [] (3)  - process configuration options
+Tk_DeleteSelHandler [] (3)  - arrange to handle requests for a selection
+Tk_Depth []          (3)  - retrieve information from Tk's local data structure
+Tk_DestroyWindow []  (3)  - create or delete window
+Tk_Display []        (3)  - retrieve information from Tk's local data structure
+Tk_DisplayName []    (3)  - retrieve information from Tk's local data structure
+Tk_DistanceToTextLayout [] (3)  - routines to measure and display single-font, multi-line, justified text
+Tk_Draw3DPolygon []  (3)  - draw borders with three-dimensional appearance
+Tk_Draw3DRectangle [] (3)  - draw borders with three-dimensional appearance
+Tk_DrawChars []      (3)  - routines to measure and display simple single-line strings
+Tk_DrawFocusHighlight [] (3)  - draw the traversal highlight ring for a widget
+Tk_DrawTextLayout [] (3)  - routines to measure and display single-font, multi-line, justified text
+Tk_Fill3DPolygon []  (3)  - draw borders with three-dimensional appearance
+Tk_Fill3DRectangle [] (3)  - draw borders with three-dimensional appearance
+Tk_FindPhoto []      (3)  - manipulate the image data stored in a photo image
+Tk_FontId []         (3)  - accessor functions for fonts
+Tk_Free3DBorder []   (3)  - draw borders with three-dimensional appearance
+Tk_Free3DBorderFromObj [] (3)  - draw borders with three-dimensional appearance
+Tk_FreeBitmap []     (3)  - maintain database of single-plane pixmaps
+Tk_FreeBitmapFromObj [] (3)  - maintain database of single-plane pixmaps
+Tk_FreeColor []      (3)  - maintain database of colors
+Tk_FreeColorFromObj [] (3)  - maintain database of colors
+Tk_FreeColormap []   (3)  - allocate and free colormaps
+Tk_FreeConfigOptions [] (3)  - process configuration options
+Tk_FreeCursor []     (3)  - maintain database of cursors
+Tk_FreeCursorFromObj [] (3)  - maintain database of cursors
+Tk_FreeFont []       (3)  - maintain database of fonts
+Tk_FreeFontFromObj [] (3)  - maintain database of fonts
+Tk_FreeGC []         (3)  - maintain database of read-only graphics contexts
+Tk_FreeImage []      (3)  - use an image in a widget
+Tk_FreeOptions []    (3)  - process configuration options for widgets
+Tk_FreePixmap []     (3)  - allocate and free pixmaps
+Tk_FreeSavedOptions [] (3)  - process configuration options
+Tk_FreeTextLayout [] (3)  - routines to measure and display single-font, multi-line, justified text
+Tk_FreeXId []        (3)  - make X resource identifier available for reuse
+Tk_GeometryRequest [] (3)  - specify desired geometry or internal border for a window
+Tk_Get3DBorder []    (3)  - draw borders with three-dimensional appearance
+Tk_Get3DBorderFromObj [] (3)  - draw borders with three-dimensional appearance
+Tk_GetAllBindings [] (3)  - invoke scripts in response to X events
+Tk_GetAnchor []      (3)  - translate between strings and anchor positions
+Tk_GetAnchorFromObj [] (3)  - translate between strings and anchor positions
+Tk_GetAtomName []    (3)  - manage cache of X atoms
+Tk_GetBinding []     (3)  - invoke scripts in response to X events
+Tk_GetBitmap []      (3)  - maintain database of single-plane pixmaps
+Tk_GetBitmapFromObj [] (3)  - maintain database of single-plane pixmaps
+Tk_GetCapStyle []    (3)  - translate between strings and cap styles
+Tk_GetColor []       (3)  - maintain database of colors
+Tk_GetColorByValue [] (3)  - maintain database of colors
+Tk_GetColorFromObj [] (3)  - maintain database of colors
+Tk_GetColormap []    (3)  - allocate and free colormaps
+Tk_GetCursor []      (3)  - maintain database of cursors
+Tk_GetCursorFromData [] (3)  - maintain database of cursors
+Tk_GetCursorFromObj [] (3)  - maintain database of cursors
+Tk_GetDash []        (3)  - convert from string to valid dash structure
+Tk_GetFont []        (3)  - maintain database of fonts
+Tk_GetFontFromObj [] (3)  - maintain database of fonts
+Tk_GetFontMetrics [] (3)  - accessor functions for fonts
+Tk_GetGC []          (3)  - maintain database of read-only graphics contexts
+Tk_GetHINSTANCE []   (3)  - retrieve the global application instance handle
+Tk_GetHWND []        (3)  - manage interactions between the Windows handle and an X window
+Tk_GetImage []       (3)  - use an image in a widget
+Tk_GetImageMasterData [] (3)  - define new kind of image
+Tk_GetItemTypes []   (3)  - define new kind of canvas item
+Tk_GetJoinStyle []   (3)  - translate between strings and join styles
+Tk_GetJustify []     (3)  - translate between strings and justification styles
+Tk_GetJustifyFromObj [] (3)  - translate between strings and justification styles
+Tk_GetMMFromObj []   (3)  - translate between strings and screen units
+Tk_GetNumMainWindows [] (3)  - functions for querying main window information
+Tk_GetOption []      (3)  - retrieve an option from the option database
+Tk_GetOptionInfo []  (3)  - process configuration options
+Tk_GetOptionValue [] (3)  - process configuration options
+Tk_GetPixels []      (3)  - translate between strings and screen units
+Tk_GetPixelsFromObj [] (3)  - translate between strings and screen units
+Tk_GetPixmap []      (3)  - allocate and free pixmaps
+Tk_GetRelief []      (3)  - translate between strings and relief values
+Tk_GetReliefFromObj [] (3)  - translate between strings and relief values
+Tk_GetRootCoords []  (3)  - Compute root-window coordinates of window
+Tk_GetScreenMM []    (3)  - translate between strings and screen units
+Tk_GetScrollInfo []  (3)  - parse arguments for scrolling commands
+Tk_GetScrollInfoObj [] (3)  - parse arguments for scrolling commands
+Tk_GetSelection []   (3)  - retrieve the contents of a selection
+Tk_GetUid []         (3)  - convert from string to unique identifier
+Tk_GetUserInactiveTime [] (3)  - discover user inactivity time
+Tk_GetVRootGeometry [] (3)  - Get location and size of virtual root for window
+Tk_GetVisual []      (3)  - translate from string to visual
+Tk_Grab []           (3)  - manipulate grab state in an application
+Tk_HWNDToWindow []   (3)  - Find Tk's window information for a Windows window
+Tk_HandleEvent []    (3)  - invoke event handlers for window system events
+Tk_Height []         (3)  - retrieve information from Tk's local data structure
+Tk_IdToWindow []     (3)  - Find Tk's window information for an X window
+Tk_ImageChanged []   (3)  - notify widgets that image needs to be redrawn
+Tk_Init []           (3)  - add Tk to an interpreter and make a new Tk application
+Tk_InitConsoleChannels [] (3)  - Install the console channels as standard channels
+Tk_InitImageArgs []  (3)  - define new kind of image
+Tk_InitOptions []    (3)  - process configuration options
+Tk_InitStubs []      (3)  - initialize the Tk stubs mechanism
+Tk_InternAtom []     (3)  - manage cache of X atoms
+Tk_InternalBorderBottom [] (3)  - retrieve information from Tk's local data structure
+Tk_InternalBorderLeft [] (3)  - retrieve information from Tk's local data structure
+Tk_InternalBorderRight [] (3)  - retrieve information from Tk's local data structure
+Tk_InternalBorderTop [] (3)  - retrieve information from Tk's local data structure
+Tk_Interp []         (3)  - retrieve information from Tk's local data structure
+Tk_IntersectTextLayout [] (3)  - routines to measure and display single-font, multi-line, justified text
+Tk_IsContainer []    (3)  - retrieve information from Tk's local data structure
+Tk_IsEmbedded []     (3)  - retrieve information from Tk's local data structure
+Tk_IsMapped []       (3)  - retrieve information from Tk's local data structure
+Tk_IsTopLevel []     (3)  - retrieve information from Tk's local data structure
+Tk_Main []           (3)  - main program for Tk-based applications
+Tk_MainLoop []       (3)  - loop for events until all windows are deleted
+Tk_MainWindow []     (3)  - functions for querying main window information
+Tk_MaintainGeometry [] (3)  - maintain geometry of one window relative to another
+Tk_MakeWindowExist [] (3)  - create or delete window
+Tk_ManageGeometry [] (3)  - arrange to handle geometry requests for a window
+Tk_MapWindow []      (3)  - map or unmap a window
+Tk_MeasureChars []   (3)  - routines to measure and display simple single-line strings
+Tk_MinReqHeight []   (3)  - retrieve information from Tk's local data structure
+Tk_MinReqWidth []    (3)  - retrieve information from Tk's local data structure
+Tk_MoveResizeWindow [] (3)  - change window configuration or attributes
+Tk_MoveToplevelWindow [] (3)  - Adjust the position of a top-level window
+Tk_MoveWindow []     (3)  - change window configuration or attributes
+Tk_Name []           (3)  - convert between names and window tokens
+Tk_NameOf3DBorder [] (3)  - draw borders with three-dimensional appearance
+Tk_NameOfAnchor []   (3)  - translate between strings and anchor positions
+Tk_NameOfBitmap []   (3)  - maintain database of single-plane pixmaps
+Tk_NameOfCapStyle [] (3)  - translate between strings and cap styles
+Tk_NameOfColor []    (3)  - maintain database of colors
+Tk_NameOfCursor []   (3)  - maintain database of cursors
+Tk_NameOfFont []     (3)  - maintain database of fonts
+Tk_NameOfImage []    (3)  - Return name of image
+Tk_NameOfJoinStyle [] (3)  - translate between strings and join styles
+Tk_NameOfJustify []  (3)  - translate between strings and justification styles
+Tk_NameOfRelief []   (3)  - translate between strings and relief values
+Tk_NameToWindow []   (3)  - convert between names and window tokens
+Tk_Offset []         (3)  - process configuration options
+Tk_OwnSelection []   (3)  - make a window the owner of the primary selection
+Tk_Parent []         (3)  - retrieve information from Tk's local data structure
+Tk_ParseArgv []      (3)  - process command-line options
+Tk_PathName []       (3)  - convert between names and window tokens
+Tk_PhotoBlank []     (3)  - manipulate the image data stored in a photo image
+Tk_PhotoExpand []    (3)  - manipulate the image data stored in a photo image
+Tk_PhotoGetImage []  (3)  - manipulate the image data stored in a photo image
+Tk_PhotoGetSize []   (3)  - manipulate the image data stored in a photo image
+Tk_PhotoPutBlock []  (3)  - manipulate the image data stored in a photo image
+Tk_PhotoPutZoomedBlock [] (3)  - manipulate the image data stored in a photo image
+Tk_PhotoSetSize []   (3)  - manipulate the image data stored in a photo image
+Tk_PointToChar []    (3)  - routines to measure and display single-font, multi-line, justified text
+Tk_PostscriptFontName [] (3)  - accessor functions for fonts
+Tk_PreserveColormap [] (3)  - allocate and free colormaps
+Tk_QueueWindowEvent [] (3)  - Add a window event to the Tcl event queue
+Tk_RedrawImage []    (3)  - use an image in a widget
+Tk_ReqHeight []      (3)  - retrieve information from Tk's local data structure
+Tk_ReqWidth []       (3)  - retrieve information from Tk's local data structure
+Tk_ResetUserInactiveTime [] (3)  - discover user inactivity time
+Tk_ResizeWindow []   (3)  - change window configuration or attributes
+Tk_RestackWindow []  (3)  - Change a window's position in the stacking order
+Tk_RestoreSavedOptions [] (3)  - process configuration options
+Tk_RestrictEvents [] (3)  - filter and selectively delay X events
+Tk_SafeInit []       (3)  - add Tk to an interpreter and make a new Tk application
+Tk_Screen []         (3)  - retrieve information from Tk's local data structure
+Tk_ScreenNumber []   (3)  - retrieve information from Tk's local data structure
+Tk_SetAppName []     (3)  - Set the name of an application for 'send' commands
+Tk_SetBackgroundFromBorder [] (3)  - draw borders with three-dimensional appearance
+Tk_SetCaretPos []    (3)  - set the display caret location
+Tk_SetClass []       (3)  - set or retrieve a window's class
+Tk_SetClassProcs []  (3)  - register widget specific procedures
+Tk_SetGrid []        (3)  - control the grid for interactive resizing
+Tk_SetInternalBorder [] (3)  - specify desired geometry or internal border for a window
+Tk_SetInternalBorderEx [] (3)  - specify desired geometry or internal border for a window
+Tk_SetMinimumRequestSize [] (3)  - specify desired geometry or internal border for a window
+Tk_SetOptions []     (3)  - process configuration options
+Tk_SetWindowBackground [] (3)  - change window configuration or attributes
+Tk_SetWindowBackgroundPixmap [] (3)  - change window configuration or attributes
+Tk_SetWindowBorder [] (3)  - change window configuration or attributes
+Tk_SetWindowBorderPixmap [] (3)  - change window configuration or attributes
+Tk_SetWindowBorderWidth [] (3)  - change window configuration or attributes
+Tk_SetWindowColormap [] (3)  - change window configuration or attributes
+Tk_SetWindowVisual [] (3)  - change visual characteristics of window
+Tk_SizeOfBitmap []   (3)  - maintain database of single-plane pixmaps
+Tk_SizeOfImage []    (3)  - use an image in a widget
+Tk_StrictMotif []    (3)  - Return value of tk_strictMotif variable
+Tk_TextLayoutToPostscript [] (3)  - routines to measure and display single-font, multi-line, justified text
+Tk_TextWidth []      (3)  - routines to measure and display simple single-line strings
+Tk_Uid []            (3)  - convert from string to unique identifier
+Tk_UndefineCursor [] (3)  - change window configuration or attributes
+Tk_UnderlineChars [] (3)  - routines to measure and display simple single-line strings
+Tk_UnderlineTextLayout [] (3)  - routines to measure and display single-font, multi-line, justified text
+Tk_Ungrab []         (3)  - manipulate grab state in an application
+Tk_UnmaintainGeometry [] (3)  - maintain geometry of one window relative to another
+Tk_UnmapWindow []    (3)  - map or unmap a window
+Tk_UnsetGrid []      (3)  - control the grid for interactive resizing
+Tk_Visual []         (3)  - retrieve information from Tk's local data structure
+Tk_Width []          (3)  - retrieve information from Tk's local data structure
+Tk_WindowId []       (3)  - retrieve information from Tk's local data structure
+Tk_X []              (3)  - retrieve information from Tk's local data structure
+Tk_Y []              (3)  - retrieve information from Tk's local data structure
+Ttk_AddPadding []    (3)  - Tk themed geometry utilities
+Ttk_BoxContains []   (3)  - Tk themed geometry utilities
+Ttk_CreateTheme []   (3)  - create and use Tk themes
+Ttk_ExpandBox []     (3)  - Tk themed geometry utilities
+Ttk_GetBorderFromObj [] (3)  - Tk themed geometry utilities
+Ttk_GetCurrentTheme [] (3)  - create and use Tk themes
+Ttk_GetDefaultTheme [] (3)  - create and use Tk themes
+Ttk_GetPaddingFromObj [] (3)  - Tk themed geometry utilities
+Ttk_GetStickyFromObj [] (3)  - Tk themed geometry utilities
+Ttk_GetTheme []      (3)  - create and use Tk themes
+Ttk_MakeBox []       (3)  - Tk themed geometry utilities
+Ttk_MakePadding []   (3)  - Tk themed geometry utilities
+Ttk_PackBox []       (3)  - Tk themed geometry utilities
+Ttk_PadBox []        (3)  - Tk themed geometry utilities
+Ttk_PlaceBox []      (3)  - Tk themed geometry utilities
+Ttk_RelievePadding [] (3)  - Tk themed geometry utilities
+Ttk_StickBox []      (3)  - Tk themed geometry utilities
+Ttk_UniformPadding [] (3)  - Tk themed geometry utilities
+UI_OpenSSL []        (3)  - New User Interface
+UI_add_error_string [] (3)  - New User Interface
+UI_add_info_string [] (3)  - New User Interface
+UI_add_input_boolean [] (3)  - New User Interface
+UI_add_input_string [] (3)  - New User Interface
+UI_add_user_data []  (3)  - New User Interface
+UI_add_verify_string [] (3)  - New User Interface
+UI_construct_prompt [] (3)  - New User Interface
+UI_ctrl []           (3)  - New User Interface
+UI_dup_error_string [] (3)  - New User Interface
+UI_dup_info_string [] (3)  - New User Interface
+UI_dup_input_boolean [] (3)  - New User Interface
+UI_dup_input_string [] (3)  - New User Interface
+UI_dup_verify_string [] (3)  - New User Interface
+UI_free []           (3)  - New User Interface
+UI_get0_result []    (3)  - New User Interface
+UI_get0_user_data [] (3)  - New User Interface
+UI_get_default_method [] (3)  - New User Interface
+UI_get_method []     (3)  - New User Interface
+UI_new []            (3)  - New User Interface
+UI_new_method []     (3)  - New User Interface
+UI_process []        (3)  - New User Interface
+UI_set_default_method [] (3)  - New User Interface
+UI_set_method []     (3)  - New User Interface
+UNIVERSAL []         (3)  - base class for ALL classes (blessed references)
+URI []               (3)  - Uniform Resource Identifiers (absolute and relative)
+URI::Escape []       (3)  - Escape and unescape unsafe characters
+URI::Heuristic []    (3)  - Expand URI using heuristics
+URI::QueryParam []   (3)  - Additional query methods for URIs
+URI::Split []        (3)  - Parse and compose URI strings
+URI::URL []          (3)  - Uniform Resource Locators
+URI::WithBase []     (3)  - URIs which remember their base
+URI::data []         (3)  - URI that contains immediate data
+URI::file []         (3)  - URI that maps to local file names
+URI::ldap []         (3)  - LDAP Uniform Resource Locators
+UTF []               (7)  - 8 - an ASCII compatible multi-byte Unicode encoding
+Unicode []           (7)  - the Universal Character Set
+Unicode::Collate []  (3)  - Unicode Collation Algorithm
+Unicode::Normalize [] (3)  - Unicode Normalization Forms
+Unicode::UCD []      (3)  - Unicode character database
+Unix/Linux path resolution [] (7)  - find the file referred to by a filename
+User::grent []       (3)  - by-name interface to Perl's built-in getgr*() functions
+User::pwent []       (3)  - by-name interface to Perl's built-in getpw*() functions
+VendorRelease []     (3)  - Display macros and functions
+VisualOfCCC []       (3)  - Color Conversion Context macros
+WMXMMS []            (1)  - a dockable XMMS control applet
+Wand []              (1)  - config - get information about the installed version of the Magick Wand
+Wget []              (1)  - The non-interactive network downloader
+WhitePixel []        (3)  - Display macros and functions
+WhitePixelOfScreen [] (3)  - screen information functions and macros
+WidthMMOfScreen []   (3)  - screen information functions and macros
+WidthOfScreen []     (3)  - screen information functions and macros
+Win32::DBIODBC []    (3)  - Win32::ODBC emulation layer for the DBI
+X []                 (7)  - a portable, network-transparent window system
+X.Org []             (7)  - X.Org Group information
+X509_NAME_ENTRY_create_by_NID [] (3)  - X509_NAME_ENTRY utility functions
+X509_NAME_ENTRY_create_by_OBJ [] (3)  - X509_NAME_ENTRY utility functions
+X509_NAME_ENTRY_create_by_txt [] (3)  - X509_NAME_ENTRY utility functions
+X509_NAME_ENTRY_get_data [] (3)  - X509_NAME_ENTRY utility functions
+X509_NAME_ENTRY_get_object [] (3)  - X509_NAME_ENTRY utility functions
+X509_NAME_ENTRY_set_data [] (3)  - X509_NAME_ENTRY utility functions
+X509_NAME_ENTRY_set_object [] (3)  - X509_NAME_ENTRY utility functions
+X509_NAME_add_entry [] (3)  - X509_NAME modification functions
+X509_NAME_add_entry_by_NID [] (3)  - X509_NAME modification functions
+X509_NAME_add_entry_by_OBJ [] (3)  - X509_NAME modification functions
+X509_NAME_add_entry_by_txt [] (3)  - X509_NAME modification functions
+X509_NAME_delete_entry [] (3)  - X509_NAME modification functions
+X509_NAME_entry_count [] (3)  - X509_NAME lookup and enumeration functions
+X509_NAME_get_entry [] (3)  - X509_NAME lookup and enumeration functions
+X509_NAME_get_index_by_NID [] (3)  - X509_NAME lookup and enumeration functions
+X509_NAME_get_index_by_OBJ [] (3)  - X509_NAME lookup and enumeration functions
+X509_NAME_get_text_by_NID [] (3)  - X509_NAME lookup and enumeration functions
+X509_NAME_get_text_by_OBJ [] (3)  - X509_NAME lookup and enumeration functions
+X509_NAME_oneline [] (3)  - X509_NAME printing routines
+X509_NAME_print []   (3)  - X509_NAME printing routines
+X509_NAME_print_ex [] (3)  - X509_NAME printing routines
+X509_NAME_print_ex_fp [] (3)  - X509_NAME printing routines
+X509_free []         (3)  - X509 certificate ASN1 allocation functions
+X509_new []          (3)  - X509 certificate ASN1 allocation functions
+XActivateScreenSaver [] (3)  - manipulate the screen saver
+XAddConnectionWatch [] (3)  - handle Xlib internal connections
+XAddHost []          (3)  - control host access and host control structure
+XAddHosts []         (3)  - control host access and host control structure
+XAddPixel []         (3)  - image utilities
+XAddToSaveSet []     (3)  - change a client's save set
+XAllocClassHint []   (3)  - allocate class hints structure and set or read a window's WM_CLASS property
+XAllocColor []       (3)  - allocate and free colors
+XAllocColorCells []  (3)  - allocate and free colors
+XAllocColorPlanes [] (3)  - allocate and free colors
+XAllocIconSize []    (3)  - allocate icon size structure and set or read a window's WM_ICON_SIZES property
+XAllocNamedColor []  (3)  - allocate and free colors
+XAllocSizeHints []   (3)  - allocate size hints structure and set or read a window's WM_NORMAL_HINTS property
+XAllocStandardColormap [] (3)  - allocate, set, or read a standard colormap structure
+XAllocWMHints []     (3)  - allocate window manager hints structure and set or read a window's WM_HINTS property
+XAllowDeviceEvents [] (3)  - release queued events
+XAllowEvents []      (3)  - release queued events
+XAnyEvent []         (3)  - generic X event structures
+XArc []              (3)  - draw arcs and arc structure
+XAutoRepeatOff []    (3)  - manipulate keyboard settings and keyboard control structure
+XAutoRepeatOn []     (3)  - manipulate keyboard settings and keyboard control structure
+XBaseFontNameListOfFontSet [] (3)  - obtain fontset information
+XBell []             (3)  - manipulate keyboard settings and keyboard control structure
+XButtonEvent []      (3)  - KeyPress, KeyRelease, ButtonPress, ButtonRelease, and MotionNotify event structures
+XCURSOR []           (3)  - Cursor management library
+XChangeActivePointerGrab [] (3)  - grab the pointer
+XChangeDeviceControl [] (3)  - query and change input device controls
+XChangeDeviceDontPropagateList [] (3)  - query or change the dont-propagate-list for extension devices
+XChangeDeviceKeyMapping [] (3)  - query or change device key mappings
+XChangeDeviceProperty [] (3)  - Get, change or delete a device's property
+XChangeFeedbackControl [] (3)  - query and change input device feedbacks
+XChangeGC []         (3)  - create or free graphics contexts and graphics context structure
+XChangeKeyboardControl [] (3)  - manipulate keyboard settings and keyboard control structure
+XChangeKeyboardDevice [] (3)  - change which device is used as the X keyboard
+XChangeKeyboardMapping [] (3)  - manipulate keyboard encoding and keyboard encoding structure
+XChangePointerControl [] (3)  - control pointer
+XChangePointerDevice [] (3)  - change which device is the X pointer
+XChangeProperty []   (3)  - obtain and change window properties
+XChangeSaveSet []    (3)  - change a client's save set
+XChangeWindowAttributes [] (3)  - change window attributes
+XChar2b []           (3)  - load or unload fonts and font metric structures
+XCharStruct []       (3)  - load or unload fonts and font metric structures
+XCheckIfEvent []     (3)  - check the event queue with a predicate procedure
+XCheckMaskEvent []   (3)  - select events by type
+XCheckTypedEvent []  (3)  - select events by type
+XCheckTypedWindowEvent [] (3)  - select events by type
+XCheckWindowEvent [] (3)  - select events by type
+XCirculateEvent []   (3)  - CirculateNotify event structure
+XCirculateRequestEvent [] (3)  - CirculateRequest event structure
+XCirculateSubwindows [] (3)  - change window stacking order
+XCirculateSubwindowsDown [] (3)  - change window stacking order
+XCirculateSubwindowsUp [] (3)  - change window stacking order
+XClassHint []        (3)  - allocate class hints structure and set or read a window's WM_CLASS property
+XClearArea []        (3)  - clear area or window
+XClearWindow []      (3)  - clear area or window
+XClientMessageEvent [] (3)  - ClientMessage event structure
+XClipBox []          (3)  - generate regions
+XCloseDevice []      (3)  - open or close an extension input device
+XCloseDisplay []     (3)  - connect or disconnect to X server
+XCloseIM []          (3)  - open, close, and obtain input method information
+XCloseOM []          (3)  - open output methods
+XColor []            (3)  - create, copy, or destroy colormaps and color structure
+XColormapEvent []    (3)  - ColormapNotify event structure
+XConfigureEvent []   (3)  - ConfigureNotify event structure
+XConfigureRequestEvent [] (3)  - ConfigureRequest event structure
+XConfigureWindow []  (3)  - configure windows and window changes structure
+XConsortium []       (7)  - X Consortium information
+XContextDependentDrawing [] (3)  - obtain fontset information
+XContextualDrawing [] (3)  - obtain fontset information
+XConvertCase []      (3)  - convert keysyms
+XConvertSelection [] (3)  - manipulate window selection
+XCopyArea []         (3)  - copy areas
+XCopyColormapAndFree [] (3)  - create, copy, or destroy colormaps and color structure
+XCopyGC []           (3)  - create or free graphics contexts and graphics context structure
+XCopyPlane []        (3)  - copy areas
+XCreateBitmapFromData [] (3)  - manipulate bitmaps
+XCreateColormap []   (3)  - create, copy, or destroy colormaps and color structure
+XCreateFontCursor [] (3)  - create cursors
+XCreateFontSet []    (3)  - create and free an international text drawing font set
+XCreateGC []         (3)  - create or free graphics contexts and graphics context structure
+XCreateGlyphCursor [] (3)  - create cursors
+XCreateIC []         (3)  - create, destroy, and obtain the input method of an input context
+XCreateImage []      (3)  - image utilities
+XCreateOC []         (3)  - create output contexts
+XCreatePixmap []     (3)  - create or destroy pixmaps
+XCreatePixmapCursor [] (3)  - create cursors
+XCreatePixmapFromBitmapData [] (3)  - manipulate bitmaps
+XCreateRegion []     (3)  - create or destroy regions
+XCreateSimpleWindow [] (3)  - create windows and window attributes structure
+XCreateWindow []     (3)  - create windows and window attributes structure
+XCreateWindowEvent [] (3)  - CreateNotify event structure
+XCrossingEvent []    (3)  - EnterNotify and LeaveNotify event structure
+XDGA []              (3)  - Client library for the XFree86-DGA extension
+XDefaultString []    (3)  - convert text lists and text property structures
+XDefineCursor []     (3)  - define cursors
+XDeleteContext []    (3)  - associative look-up routines
+XDeleteDeviceProperty [] (3)  - Get, change or delete a device's property
+XDeleteModifiermapEntry [] (3)  - manipulate keyboard encoding and keyboard encoding structure
+XDeleteProperty []   (3)  - obtain and change window properties
+XDestroyIC []        (3)  - create, destroy, and obtain the input method of an input context
+XDestroyImage []     (3)  - image utilities
+XDestroyOC []        (3)  - create output contexts
+XDestroyRegion []    (3)  - create or destroy regions
+XDestroySubwindows [] (3)  - destroy windows
+XDestroyWindow []    (3)  - destroy windows
+XDestroyWindowEvent [] (3)  - DestroyNotify event structure
+XDeviceBell []       (3)  - ring a bell on a device supported through the input extension
+XDeviceTimeCoord []  (3)  - get device motion history
+XDirectionalDependentDrawing [] (3)  - obtain fontset information
+XDisableAccessControl [] (3)  - control host access and host control structure
+XDisplayKeycodes []  (3)  - manipulate keyboard encoding and keyboard encoding structure
+XDisplayMotionBufferSize [] (3)  - send events and pointer motion history structure
+XDisplayName []      (3)  - default error handlers
+XDisplayOfIM []      (3)  - open, close, and obtain input method information
+XDisplayOfOM []      (3)  - open output methods
+XDrawArc []          (3)  - draw arcs and arc structure
+XDrawArcs []         (3)  - draw arcs and arc structure
+XDrawImageString []  (3)  - draw image text
+XDrawImageString16 [] (3)  - draw image text
+XDrawLine []         (3)  - draw lines, polygons, and line structure
+XDrawLines []        (3)  - draw lines, polygons, and line structure
+XDrawPoint []        (3)  - draw points and points structure
+XDrawPoints []       (3)  - draw points and points structure
+XDrawRectangle []    (3)  - draw rectangles and rectangles structure
+XDrawRectangles []   (3)  - draw rectangles and rectangles structure
+XDrawSegments []     (3)  - draw lines, polygons, and line structure
+XDrawString []       (3)  - draw text characters
+XDrawString16 []     (3)  - draw text characters
+XDrawText []         (3)  - draw polytext text and text drawing structures
+XDrawText16 []       (3)  - draw polytext text and text drawing structures
+XEmptyRegion []      (3)  - determine if regions are empty or equal
+XEnableAccessControl [] (3)  - control host access and host control structure
+XEqualRegion []      (3)  - determine if regions are empty or equal
+XErrorEvent []       (3)  - X error event structure
+XEvent []            (3)  - generic X event structures
+XEventsQueued []     (3)  - handle output buffer or event queue
+XExposeEvent []      (3)  - Expose event structure
+XExtendedMaxRequestSize [] (3)  - Display macros and functions
+XExtentsOfFontSet [] (3)  - obtain the maximum extents structure for a font set
+XF86MiscGetKbdSettings [] (3)  - Extension library for the XFree86-Misc X extension
+XF86MiscGetMouseSettings [] (3)  - Extension library for the XFree86-Misc X extension
+XF86MiscQueryExtension [] (3)  - Extension library for the XFree86-Misc X extension
+XF86MiscQueryVersion [] (3)  - Extension library for the XFree86-Misc X extension
+XF86MiscSetKbdSettings [] (3)  - Extension library for the XFree86-Misc X extension
+XF86MiscSetMouseSettings [] (3)  - Extension library for the XFree86-Misc X extension
+XF86VidModeDeleteModeLine [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeGetAllModeLines [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeGetDotClocks [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeGetGamma [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeGetGammaRamp [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeGetGammaRampSize [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeGetModeLine [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeGetMonitor [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeGetPermissions [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeGetViewPort [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeLockModeSwitch [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeModModeLine [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeQueryExtension [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeQueryVersion [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeSetClientVersion [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeSetGamma [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeSetGammaRamp [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeSetViewPort [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeSwitchMode [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeSwitchToMode [] (3)  - Extension library for the XFree86-VidMode X extension
+XF86VidModeValidateModeLine [] (3)  - Extension library for the XFree86-VidMode X extension
+XFetchBuffer []      (3)  - manipulate cut and paste buffers
+XFetchBytes []       (3)  - manipulate cut and paste buffers
+XFetchName []        (3)  - set or read a window's WM_NAME property
+XFillArc []          (3)  - fill rectangles, polygons, or arcs
+XFillArcs []         (3)  - fill rectangles, polygons, or arcs
+XFillPolygon []      (3)  - fill rectangles, polygons, or arcs
+XFillRectangle []    (3)  - fill rectangles, polygons, or arcs
+XFillRectangles []   (3)  - fill rectangles, polygons, or arcs
+XFilterEvent []      (3)  - filter X events for an input method
+XFindContext []      (3)  - associative look-up routines
+XFixes []            (3)  - Augmented versions of core protocol requests
+XFlush []            (3)  - handle output buffer or event queue
+XFocusChangeEvent [] (3)  - FocusIn and FocusOut event structure
+XFontProp []         (3)  - load or unload fonts and font metric structures
+XFontSetExtents []   (3)  - XFontSetExtents structure
+XFontStruct []       (3)  - load or unload fonts and font metric structures
+XFontsOfFontSet []   (3)  - obtain fontset information
+XForceScreenSaver [] (3)  - manipulate the screen saver
+XFree []             (3)  - free client data
+XFreeColormap []     (3)  - create, copy, or destroy colormaps and color structure
+XFreeColors []       (3)  - allocate and free colors
+XFreeCursor []       (3)  - manipulate cursors
+XFreeDeviceList []   (3)  - list available input devices
+XFreeExtensionList [] (3)  - list available extensions
+XFreeFont []         (3)  - load or unload fonts and font metric structures
+XFreeFontInfo []     (3)  - obtain or free font names and information
+XFreeFontNames []    (3)  - obtain or free font names and information
+XFreeFontPath []     (3)  - set, get, or free the font search path
+XFreeFontSet []      (3)  - create and free an international text drawing font set
+XFreeGC []           (3)  - create or free graphics contexts and graphics context structure
+XFreeModifierMap XModifierKeymap [] (3)  - manipulate keyboard encoding and keyboard encoding structure
+XFreePixmap []       (3)  - create or destroy pixmaps
+XFreeStringList []   (3)  - convert string lists and text property structure
+XGCValues []         (3)  - create or free graphics contexts and graphics context structure
+XGContextFromGC []   (3)  - create or free graphics contexts and graphics context structure
+XGetAtomName []      (3)  - create or return atom names
+XGetAtomNames []     (3)  - create or return atom names
+XGetClassHint []     (3)  - allocate class hints structure and set or read a window's WM_CLASS property
+XGetCommand []       (3)  - set or read a window's WM_COMMAND property
+XGetDeviceButtonMapping [] (3)  - query or change device button mappings
+XGetDeviceControl [] (3)  - query and change input device controls
+XGetDeviceDontPropagateList [] (3)  - query or change the dont-propagate-list for extension devices
+XGetDeviceFocus []   (3)  - control extension input device focus
+XGetDeviceKeyMapping [] (3)  - query or change device key mappings
+XGetDeviceModifierMapping [] (3)  - query or change device modifier mappings
+XGetDeviceMotionEvents [] (3)  - get device motion history
+XGetDeviceProperty [] (3)  - Get, change or delete a device's property
+XGetErrorDatabaseText [] (3)  - default error handlers
+XGetErrorText []     (3)  - default error handlers
+XGetExtensionVersion [] (3)  - query the version of the input extension
+XGetFeedbackControl [] (3)  - query and change input device feedbacks
+XGetFontPath []      (3)  - set, get, or free the font search path
+XGetFontProperty []  (3)  - load or unload fonts and font metric structures
+XGetGCValues []      (3)  - create or free graphics contexts and graphics context structure
+XGetGeometry []      (3)  - get current window attribute or geometry and current window attributes structure
+XGetICValues []      (3)  - set and obtain XIC values
+XGetIMValues []      (3)  - open, close, and obtain input method information
+XGetIconName []      (3)  - set or read a window's WM_ICON_NAME property
+XGetIconSizes []     (3)  - allocate icon size structure and set or read a window's WM_ICON_SIZES property
+XGetImage []         (3)  - transfer images
+XGetInputFocus []    (3)  - control input focus
+XGetKeyboardControl [] (3)  - manipulate keyboard settings and keyboard control structure
+XGetKeyboardMapping [] (3)  - manipulate keyboard encoding and keyboard encoding structure
+XGetModifierMapping [] (3)  - manipulate keyboard encoding and keyboard encoding structure
+XGetMotionEvents []  (3)  - send events and pointer motion history structure
+XGetOCValues []      (3)  - create output contexts
+XGetOMValues []      (3)  - open output methods
+XGetPixel []         (3)  - image utilities
+XGetPointerControl [] (3)  - control pointer
+XGetPointerMapping [] (3)  - manipulate pointer settings
+XGetRGBColormaps []  (3)  - allocate, set, or read a standard colormap structure
+XGetScreenSaver []   (3)  - manipulate the screen saver
+XGetSelectedExtensionEvents [] (3)  - select extension events, get the list of currently selected extension events
+XGetSelectionOwner [] (3)  - manipulate window selection
+XGetSubImage []      (3)  - transfer images
+XGetTextProperty []  (3)  - set and read text properties
+XGetTransientForHint [] (3)  - set or read a window's WM_TRANSIENT_FOR property
+XGetVisualInfo []    (3)  - obtain visual information and visual structure
+XGetWMClientMachine [] (3)  - set or read a window's WM_CLIENT_MACHINE property
+XGetWMColormapWindows [] (3)  - set or read a window's WM_COLORMAP_WINDOWS property
+XGetWMHints []       (3)  - allocate window manager hints structure and set or read a window's WM_HINTS property
+XGetWMIconName []    (3)  - set or read a window's WM_ICON_NAME property
+XGetWMName []        (3)  - set or read a window's WM_NAME property
+XGetWMNormalHints [] (3)  - allocate size hints structure and set or read a window's WM_NORMAL_HINTS property
+XGetWMProtocols []   (3)  - set or read a window's WM_PROTOCOLS property
+XGetWMSizeHints []   (3)  - allocate size hints structure and set or read a window's WM_NORMAL_HINTS property
+XGetWindowAttributes [] (3)  - get current window attribute or geometry and current window attributes structure
+XGetWindowProperty [] (3)  - obtain and change window properties
+XGetXCBConnection [] (3)  - get the XCB connection for an Xlib Display
+XGrabButton []       (3)  - grab pointer buttons
+XGrabDevice []       (3)  - grab/release the specified extension device
+XGrabDeviceButton [] (3)  - grab/ungrab extension input device buttons
+XGrabDeviceKey []    (3)  - grab/ungrab extension input device Keys
+XGrabKey []          (3)  - grab keyboard keys
+XGrabKeyboard []     (3)  - grab the keyboard
+XGrabPointer []      (3)  - grab the pointer
+XGrabServer []       (3)  - grab the server
+XGraphicsExposeEvent [] (3)  - GraphicsExpose and NoExpose event structures
+XGravityEvent []     (3)  - GravityNotify event structure
+XHostAddress []      (3)  - control host access and host control structure
+XIMOfIC []           (3)  - create, destroy, and obtain the input method of an input context
+XIconSize []         (3)  - allocate icon size structure and set or read a window's WM_ICON_SIZES property
+XIconifyWindow []    (3)  - manipulate top-level windows
+XIfEvent []          (3)  - check the event queue with a predicate procedure
+XInitImage []        (3)  - image utilities
+XInitThreads []      (3)  - multi-threading support
+XInsertModifiermapEntry [] (3)  - manipulate keyboard encoding and keyboard encoding structure
+XInstallColormap []  (3)  - control colormaps
+XInternAtom []       (3)  - create or return atom names
+XInternAtoms []      (3)  - create or return atom names
+XInternalConnectionNumbers [] (3)  - handle Xlib internal connections
+XIntersectRegion []  (3)  - region arithmetic
+XKeyEvent []         (3)  - KeyPress, KeyRelease, ButtonPress, ButtonRelease, and MotionNotify event structures
+XKeyboardControl []  (3)  - manipulate keyboard settings and keyboard control structure
+XKeycodeToKeysym []  (3)  - convert keysyms
+XKeymapEvent []      (3)  - KeymapNotify event structure
+XKeysymToKeycode []  (3)  - convert keysyms
+XKeysymToString []   (3)  - convert keysyms
+XKillClient []       (3)  - control clients
+XListDepths []       (3)  - Display macros and functions
+XListDeviceProperties [] (3)  - List a device's properties
+XListExtensions []   (3)  - list available extensions
+XListFonts []        (3)  - obtain or free font names and information
+XListFontsWithInfo [] (3)  - obtain or free font names and information
+XListHosts []        (3)  - control host access and host control structure
+XListInputDevices [] (3)  - list available input devices
+XListInstalledColormaps [] (3)  - control colormaps
+XListPixmapFormats [] (3)  - image format functions and macros
+XListProperties []   (3)  - obtain and change window properties
+XLoadFont []         (3)  - load or unload fonts and font metric structures
+XLoadQueryFont []    (3)  - load or unload fonts and font metric structures
+XLocaleOfFontSet []  (3)  - obtain fontset information
+XLocaleOfIM []       (3)  - open, close, and obtain input method information
+XLocaleOfOM []       (3)  - open output methods
+XLockDisplay []      (3)  - multi-threading support
+XLookupColor []      (3)  - obtain color values
+XLookupKeysym []     (3)  - handle keyboard input events in Latin-1
+XLookupString []     (3)  - handle keyboard input events in Latin-1
+XLowerWindow []      (3)  - change window stacking order
+XML::Parser []       (3)  - A perl module for parsing XML documents
+XML::Parser::Expat [] (3)  - Lowlevel access to James Clark's expat XML parser
+XML::Parser::Style::Debug [] (3)  - Debug style for XML::Parser
+XML::Parser::Style::Stream [] (3)  - Stream style for XML::Parser
+XML::Simple []       (3)  - Easy API to maintain XML (esp config files)
+XMMS []              (1)  - an audio player for X
+XMapEvent []         (3)  - MapNotify and MappingNotify event structures
+XMapRaised []        (3)  - map windows
+XMapRequestEvent []  (3)  - MapRequest event structure
+XMapSubwindows []    (3)  - map windows
+XMapWindow []        (3)  - map windows
+XMappingEvent []     (3)  - MapNotify and MappingNotify event structures
+XMaskEvent []        (3)  - select events by type
+XMatchVisualInfo []  (3)  - obtain visual information and visual structure
+XMaxRequestSize []   (3)  - Display macros and functions
+XMotionEvent []      (3)  - KeyPress, KeyRelease, ButtonPress, ButtonRelease, and MotionNotify event structures
+XMoveResizeWindow [] (3)  - configure windows and window changes structure
+XMoveWindow []       (3)  - configure windows and window changes structure
+XNewModifiermap []   (3)  - manipulate keyboard encoding and keyboard encoding structure
+XNextEvent []        (3)  - select events by type
+XNoExposeEvent []    (3)  - GraphicsExpose and NoExpose event structures
+XNoOp []             (3)  - No Operation
+XOMOfOC []           (3)  - create output contexts
+XOffsetRegion []     (3)  - region arithmetic
+XOpenDevice []       (3)  - open or close an extension input device
+XOpenDisplay []      (3)  - connect or disconnect to X server
+XOpenIM []           (3)  - open, close, and obtain input method information
+XOpenOM []           (3)  - open output methods
+XOrgFoundation []    (7)  - X.Org Foundation information
+XParseColor []       (3)  - obtain color values
+XParseGeometry []    (3)  - parse window geometry
+XPeekEvent []        (3)  - select events by type
+XPeekIfEvent []      (3)  - check the event queue with a predicate procedure
+XPending []          (3)  - handle output buffer or event queue
+XPixmapFormatValues [] (3)  - image format functions and macros
+XPoint []            (3)  - draw points and points structure
+XPointInRegion []    (3)  - determine if regions are empty or equal
+XPolygonRegion []    (3)  - generate regions
+XProcessInternalConnection [] (3)  - handle Xlib internal connections
+XProjectTeam []      (7)  - X.Org Group information
+XPropertyEvent []    (3)  - PropertyNotify event structure
+XPutBackEvent []     (3)  - put events back on the queue
+XPutImage []         (3)  - transfer images
+XPutPixel []         (3)  - image utilities
+XQueryBestCursor []  (3)  - manipulate cursors
+XQueryBestSize []    (3)  - determine efficient sizes
+XQueryBestStipple [] (3)  - determine efficient sizes
+XQueryBestTile []    (3)  - determine efficient sizes
+XQueryColor []       (3)  - obtain color values
+XQueryColors []      (3)  - obtain color values
+XQueryDeviceState [] (3)  - query the state of an extension input device
+XQueryExtension []   (3)  - list available extensions
+XQueryFont []        (3)  - load or unload fonts and font metric structures
+XQueryKeymap []      (3)  - manipulate keyboard settings and keyboard control structure
+XQueryPointer []     (3)  - get pointer coordinates
+XQueryTextExtents [] (3)  - compute or query text extents
+XQueryTextExtents16 [] (3)  - compute or query text extents
+XQueryTree []        (3)  - query window tree information
+XRaiseWindow []      (3)  - change window stacking order
+XReadBitmapFile []   (3)  - manipulate bitmaps
+XReadBitmapFileData [] (3)  - manipulate bitmaps
+XRebindKeysym []     (3)  - handle keyboard input events in Latin-1
+XRecolorCursor []    (3)  - manipulate cursors
+XReconfigureWMWindow [] (3)  - manipulate top-level windows
+XRectInRegion []     (3)  - determine if regions are empty or equal
+XRectangle []        (3)  - draw rectangles and rectangles structure
+XRefreshKeyboardMapping [] (3)  - handle keyboard input events in Latin-1
+XRegisterIMInstantiateCallback [] (3)  - open, close, and obtain input method information
+XRemoveConnectionWatch [] (3)  - handle Xlib internal connections
+XRemoveFromSaveSet [] (3)  - change a client's save set
+XRemoveHost []       (3)  - control host access and host control structure
+XRemoveHosts []      (3)  - control host access and host control structure
+XReparentEvent []    (3)  - ReparentNotify event structure
+XReparentWindow []   (3)  - reparent windows
+XRes []              (3)  - X-Resource extension client library
+XResetScreenSaver [] (3)  - manipulate the screen saver
+XResizeRequestEvent [] (3)  - ResizeRequest event structure
+XResizeWindow []     (3)  - configure windows and window changes structure
+XResourceManagerString [] (3)  - obtain server resource properties
+XRestackWindows []   (3)  - change window stacking order
+XRotateBuffers []    (3)  - manipulate cut and paste buffers
+XRotateWindowProperties [] (3)  - obtain and change window properties
+XS::APItest []       (3)  - Test the perl C API
+XS::Typemap []       (3)  - module to test the XS typemaps distributed with perl
+XSLoader []          (3)  - Dynamically load C libraries into Perl code
+XSaveContext []      (3)  - associative look-up routines
+XScreenNumberOfScreen [] (3)  - screen information functions and macros
+XScreenResourceString [] (3)  - obtain server resource properties
+XScreenSaver []      (3)  - X11 Screen Saver extension client library
+XSegment []          (3)  - draw lines, polygons, and line structure
+XSelectExtensionEvent [] (3)  - select extension events, get the list of currently selected extension events
+XSelectInput []      (3)  - select input events
+XSelectionClearEvent [] (3)  - SelectionClear event structure
+XSelectionEvent []   (3)  - SelectionNotify event structure
+XSelectionRequestEvent [] (3)  - SelectionRequest event structure
+XSendEvent []        (3)  - send events and pointer motion history structure
+XSendExtensionEvent [] (3)  - send input extension events to a client
+XServerInterpretedAddress [] (3)  - control host access and host control structure
+XSetAccessControl [] (3)  - control host access and host control structure
+XSetAfterFunction [] (3)  - enable or disable synchronization
+XSetArcMode []       (3)  - GC convenience routines
+XSetBackground []    (3)  - GC convenience routines
+XSetClassHint []     (3)  - allocate class hints structure and set or read a window's WM_CLASS property
+XSetClipMask []      (3)  - GC convenience routines
+XSetClipOrigin []    (3)  - GC convenience routines
+XSetClipRectangles [] (3)  - GC convenience routines
+XSetCloseDownMode [] (3)  - control clients
+XSetCommand []       (3)  - set or read a window's WM_COMMAND property
+XSetDashes []        (3)  - GC convenience routines
+XSetDeviceButtonMapping [] (3)  - query or change device button mappings
+XSetDeviceFocus []   (3)  - control extension input device focus
+XSetDeviceMode []    (3)  - change the mode of a device
+XSetDeviceModifierMapping [] (3)  - query or change device modifier mappings
+XSetDeviceValuators [] (3)  - initialize the valuators on an extension input device
+XSetErrorHandler []  (3)  - default error handlers
+XSetEventQueueOwner [] (3)  - set event queue owner on a shared Xlib/XCB connection
+XSetFillRule []      (3)  - GC convenience routines
+XSetFillStyle []     (3)  - GC convenience routines
+XSetFont []          (3)  - GC convenience routines
+XSetFontPath []      (3)  - set, get, or free the font search path
+XSetForeground []    (3)  - GC convenience routines
+XSetFunction []      (3)  - GC convenience routines
+XSetGraphicsExposure [] (3)  - GC convenience routines
+XSetICFocus []       (3)  - set and unset input context focus
+XSetICValues []      (3)  - set and obtain XIC values
+XSetIMValues []      (3)  - open, close, and obtain input method information
+XSetIOErrorHandler [] (3)  - default error handlers
+XSetIconName []      (3)  - set or read a window's WM_ICON_NAME property
+XSetIconSizes []     (3)  - allocate icon size structure and set or read a window's WM_ICON_SIZES property
+XSetInputFocus []    (3)  - control input focus
+XSetLineAttributes [] (3)  - GC convenience routines
+XSetLocaleModifiers [] (3)  - determine locale support and configure locale modifiers
+XSetModifierMapping [] (3)  - manipulate keyboard encoding and keyboard encoding structure
+XSetOCValues []      (3)  - create output contexts
+XSetOMValues []      (3)  - open output methods
+XSetPlaneMask []     (3)  - GC convenience routines
+XSetPointerMapping [] (3)  - manipulate pointer settings
+XSetRGBColormaps []  (3)  - allocate, set, or read a standard colormap structure
+XSetRegion []        (3)  - create or destroy regions
+XSetScreenSaver []   (3)  - manipulate the screen saver
+XSetSelectionOwner [] (3)  - manipulate window selection
+XSetState []         (3)  - GC convenience routines
+XSetStipple []       (3)  - GC convenience routines
+XSetSubwindowMode [] (3)  - GC convenience routines
+XSetTSOrigin []      (3)  - GC convenience routines
+XSetTextProperty []  (3)  - set and read text properties
+XSetTile []          (3)  - GC convenience routines
+XSetTransientForHint [] (3)  - set or read a window's WM_TRANSIENT_FOR property
+XSetWMClientMachine [] (3)  - set or read a window's WM_CLIENT_MACHINE property
+XSetWMColormapWindows [] (3)  - set or read a window's WM_COLORMAP_WINDOWS property
+XSetWMHints []       (3)  - allocate window manager hints structure and set or read a window's WM_HINTS property
+XSetWMIconName []    (3)  - set or read a window's WM_ICON_NAME property
+XSetWMName []        (3)  - set or read a window's WM_NAME property
+XSetWMNormalHints [] (3)  - allocate size hints structure and set or read a window's WM_NORMAL_HINTS property
+XSetWMProperties []  (3)  - set standard window properties
+XSetWMProtocols []   (3)  - set or read a window's WM_PROTOCOLS property
+XSetWMSizeHints []   (3)  - allocate size hints structure and set or read a window's WM_NORMAL_HINTS property
+XSetWindowAttributes [] (3)  - create windows and window attributes structure
+XSetWindowBackground [] (3)  - change window attributes
+XSetWindowBackgroundPixmap [] (3)  - change window attributes
+XSetWindowBorder []  (3)  - change window attributes
+XSetWindowBorderPixmap [] (3)  - change window attributes
+XSetWindowBorderWidth [] (3)  - configure windows and window changes structure
+XSetWindowColormap [] (3)  - change window attributes
+XShapeCombineMask [] (3)  - X nonrectangular shape functions
+XShapeCombineRectangles [] (3)  - X nonrectangular shape functions
+XShapeCombineRegion [] (3)  - X nonrectangular shape functions
+XShapeCombineShape [] (3)  - X nonrectangular shape functions
+XShapeGetRectangles [] (3)  - X nonrectangular shape functions
+XShapeInputSelected [] (3)  - X nonrectangular shape functions
+XShapeOffsetShape [] (3)  - X nonrectangular shape functions
+XShapeQueryExtension [] (3)  - X nonrectangular shape functions
+XShapeQueryExtents [] (3)  - X nonrectangular shape functions
+XShapeQueryVersion [] (3)  - X nonrectangular shape functions
+XShapeSelectInput [] (3)  - X nonrectangular shape functions
+XShmAttach []        (3)  - X Shared Memory extension functions
+XShmCreatePixmap []  (3)  - X Shared Memory extension functions
+XShmDetach XShmCreateImage [] (3)  - X Shared Memory extension functions
+XShmGetEventBase []  (3)  - X Shared Memory extension functions
+XShmGetImage []      (3)  - X Shared Memory extension functions
+XShmPixmapFormat []  (3)  - X Shared Memory extension functions
+XShmPutImage []      (3)  - X Shared Memory extension functions
+XShmQueryExtension [] (3)  - X Shared Memory extension functions
+XShmQueryVersion []  (3)  - X Shared Memory extension functions
+XShrinkRegion []     (3)  - region arithmetic
+XSizeHints []        (3)  - allocate size hints structure and set or read a window's WM_NORMAL_HINTS property
+XStandardColormap [] (3)  - allocate, set, or read a standard colormap structure
+XStandards []        (7)  - X Window System Standards and Specifications
+XStoreBuffer []      (3)  - manipulate cut and paste buffers
+XStoreBytes []       (3)  - manipulate cut and paste buffers
+XStoreColor []       (3)  - set colors
+XStoreColors []      (3)  - set colors
+XStoreName []        (3)  - set or read a window's WM_NAME property
+XStoreNamedColor []  (3)  - set colors
+XStringListToTextProperty [] (3)  - convert string lists and text property structure
+XStringToKeysym []   (3)  - convert keysyms
+XSubImage []         (3)  - image utilities
+XSubtractRegion []   (3)  - region arithmetic
+XSupportsLocale []   (3)  - determine locale support and configure locale modifiers
+XSync []             (3)  - handle output buffer or event queue
+XSynchronize []      (3)  - enable or disable synchronization
+XTestCompareCurrentCursorWithWindow [] (3)  - XTest extension functions
+XTestCompareCursorWithWindow [] (3)  - XTest extension functions
+XTestDiscard []      (3)  - XTest extension functions
+XTestFakeButtonEvent [] (3)  - XTest extension functions
+XTestFakeKeyEvent [] (3)  - XTest extension functions
+XTestFakeMotionEvent [] (3)  - XTest extension functions
+XTestFakeRelativeMotionEvent [] (3)  - XTest extension functions
+XTestGrabControl []  (3)  - XTest extension functions
+XTestQueryExtension [] (3)  - XTest extension functions
+XTestSetGContextOfGC [] (3)  - XTest extension functions
+XTestSetVisualIDOfVisual [] (3)  - XTest extension functions
+XTextExtents []      (3)  - compute or query text extents
+XTextExtents16 []    (3)  - compute or query text extents
+XTextItem []         (3)  - draw polytext text and text drawing structures
+XTextItem16 []       (3)  - draw polytext text and text drawing structures
+XTextProperty []     (3)  - convert string lists and text property structure
+XTextPropertyToStringList [] (3)  - convert string lists and text property structure
+XTextWidth []        (3)  - compute text width
+XTextWidth16 []      (3)  - compute text width
+XTimeCoord []        (3)  - send events and pointer motion history structure
+XTranslateCoordinates [] (3)  - translate window coordinates
+XUndefineCursor []   (3)  - define cursors
+XUngrabButton []     (3)  - grab pointer buttons
+XUngrabDevice []     (3)  - grab/release the specified extension device
+XUngrabDeviceButton [] (3)  - grab/ungrab extension input device buttons
+XUngrabDeviceKey []  (3)  - grab/ungrab extension input device Keys
+XUngrabKey []        (3)  - grab keyboard keys
+XUngrabKeyboard []   (3)  - grab the keyboard
+XUngrabPointer []    (3)  - grab the pointer
+XUngrabServer []     (3)  - grab the server
+XUninstallColormap [] (3)  - control colormaps
+XUnionRectWithRegion [] (3)  - region arithmetic
+XUnionRegion []      (3)  - region arithmetic
+XUniqueContext []    (3)  - associative look-up routines
+XUnloadFont []       (3)  - load or unload fonts and font metric structures
+XUnlockDisplay []    (3)  - multi-threading support
+XUnmapEvent []       (3)  - UnmapNotify event structure
+XUnmapSubwindows []  (3)  - unmap windows
+XUnmapWindow []      (3)  - unmap windows
+XUnregisterIMInstantiateCallback [] (3)  - open, close, and obtain input method information
+XUnsetICFocus []     (3)  - set and unset input context focus
+XVaCreateNestedList [] (3)  - allocate a nested variable argument list
+XVisibilityEvent []  (3)  - VisibilityNotify event structure
+XVisualIDFromVisual [] (3)  - obtain visual information and visual structure
+XVisualInfo []       (3)  - obtain visual information and visual structure
+XWMGeometry []       (3)  - parse window geometry
+XWMHints []          (3)  - allocate window manager hints structure and set or read a window's WM_HINTS property
+XWarpPointer []      (3)  - move pointer
+XWindowAttributes [] (3)  - get current window attribute or geometry and current window attributes structure
+XWindowChanges []    (3)  - configure windows and window changes structure
+XWindowEvent []      (3)  - select events by type
+XWithdrawWindow []   (3)  - manipulate top-level windows
+XWriteBitmapFile []  (3)  - manipulate bitmaps
+XXorRegion []        (3)  - region arithmetic
+Xau library: XauFileName [] (3)  - X authority database routines
+XauDisposeAuth []    (3)  - X authority database routines
+XauGetAuthByAddr []  (3)  - X authority database routines
+XauGetBestAuthByAddr [] (3)  - X authority database routines
+XauLockAuth []       (3)  - X authority database routines
+XauReadAuth []       (3)  - X authority database routines
+XauUnlockAuth []     (3)  - X authority database routines
+XauWriteAuth []      (3)  - X authority database routines
+Xaw []               (3)  - X Athena Widgets
+XcmsAllocColor []    (3)  - allocate colors
+XcmsAllocNamedColor [] (3)  - allocate colors
+XcmsCCCOfColormap [] (3)  - query and modify CCC of a colormap
+XcmsCIELab []        (3)  - Xcms color structure
+XcmsCIELabQueryMaxC [] (3)  - obtain the CIE L*a*b* coordinates
+XcmsCIELabQueryMaxL [] (3)  - obtain the CIE L*a*b* coordinates
+XcmsCIELabQueryMaxLC [] (3)  - obtain the CIE L*a*b* coordinates
+XcmsCIELabQueryMinL [] (3)  - obtain the CIE L*a*b* coordinates
+XcmsCIELuv []        (3)  - Xcms color structure
+XcmsCIELuvQueryMaxC [] (3)  - obtain the CIE L*u*v* coordinates
+XcmsCIELuvQueryMaxL [] (3)  - obtain the CIE L*u*v* coordinates
+XcmsCIELuvQueryMaxLC [] (3)  - obtain the CIE L*u*v* coordinates
+XcmsCIELuvQueryMinL [] (3)  - obtain the CIE L*u*v* coordinates
+XcmsCIEXYZ []        (3)  - Xcms color structure
+XcmsCIEuvY []        (3)  - Xcms color structure
+XcmsCIExyY []        (3)  - Xcms color structure
+XcmsColor []         (3)  - Xcms color structure
+XcmsConvertColors [] (3)  - convert CCC color specifications
+XcmsCreateCCC []     (3)  - creating and destroying CCCs
+XcmsDefaultCCC []    (3)  - obtain the default CCC for a screen
+XcmsFreeCCC []       (3)  - creating and destroying CCCs
+XcmsLookupColor []   (3)  - obtain color values
+XcmsPad []           (3)  - Xcms color structure
+XcmsQueryBlack []    (3)  - obtain black, blue, green, red, and white CCC color specifications
+XcmsQueryBlue []     (3)  - obtain black, blue, green, red, and white CCC color specifications
+XcmsQueryColor []    (3)  - obtain color values
+XcmsQueryColors []   (3)  - obtain color values
+XcmsQueryGreen []    (3)  - obtain black, blue, green, red, and white CCC color specifications
+XcmsQueryRed []      (3)  - obtain black, blue, green, red, and white CCC color specifications
+XcmsQueryWhite []    (3)  - obtain black, blue, green, red, and white CCC color specifications
+XcmsRGB []           (3)  - Xcms color structure
+XcmsRGBi []          (3)  - Xcms color structure
+XcmsSetCCCOfColormap [] (3)  - query and modify CCC of a colormap
+XcmsSetWhiteAdjustProc [] (3)  - modifying CCC attributes
+XcmsSetWhitePoint [] (3)  - modifying CCC attributes
+XcmsStoreColor []    (3)  - set colors
+XcmsStoreColors []   (3)  - set colors
+XcmsTekHVC []        (3)  - Xcms color structure
+XcmsTekHVCQueryMaxC [] (3)  - obtain the TekHVC coordinates
+XcmsTekHVCQueryMaxV [] (3)  - obtain the TekHVC coordinates
+XcmsTekHVCQueryMaxVC [] (3)  - obtain the TekHVC coordinates
+XcmsTekHVCQueryMaxVSamples [] (3)  - obtain the TekHVC coordinates
+XcmsTekHVCQueryMinV [] (3)  - obtain the TekHVC coordinates
+Xcomposite []        (3)  - X Composite Extension library
+XcupGetReservedColormapEntries [] (3)  - list colormap entries reserved by the system
+XcupQueryVersion []  (3)  - Returns TOG-CUP protocol version supported by the X server
+XcupStoreColors []   (3)  - initialize shareable colormap entries at specific locations
+XdbeAllocateBackBufferName [] (3)  - allocates a DBE buffer
+XdbeBeginIdiom []    (3)  - marks the beginning of a DBE idiom sequence
+XdbeDeallocateBackBufferName [] (3)  - frees a DBE buffer
+XdbeEndIdiom []      (3)  - marks the end of a DBE idiom sequence
+XdbeFreeVisualInfo [] (3)  - frees information returned by XdbeGetVisualInfo()
+XdbeGetBackBufferAttributes [] (3)  - returns attributes of a DBE buffer
+XdbeGetVisualInfo [] (3)  - Get dbe Visual Informations
+XdbeQueryExtension [] (3)  - returns the version of DBE supported by the server
+XdbeSwapBuffers []   (3)  - swaps front and back DBE buffers
+Xephyr []            (1)  - X server outputting to a window on a pre-existing X display
+XeviGetVisualInfo [] (3)  - X Extended Visual Information functions
+XeviQueryExtension [] (3)  - X Extended Visual Information functions
+XeviQueryVersion []  (3)  - X Extended Visual Information functions
+Xevie []             (3)  - X Event Interception Extension (XEvIE)
+Xfontcache []        (3)  - X-TrueType font cache extension client library
+Xft []               (3)  - X FreeType interface library
+Xinerama []          (3)  - API for Xinerama extension to X11 Protocol
+XkbActionCtrls []    (3)  - Returns the ctrls fields of act converted to an unsigned int
+XkbAddDeviceLedInfo [] (3)  - Initialize an XkbDeviceLedInfoRec structure
+XkbAddGeomColor []   (3)  - Add one color name to an existing keyboard geometry description
+XkbAddGeomDoodad []  (3)  - Add one doodad to a section of a keyboard geometry or to the top - level geometry
+XkbAddGeomKey []     (3)  - Add one key at the end of an existing row of keys
+XkbAddGeomKeyAlias [] (3)  - Add one key alias to an existing keyboard geometry description
+XkbAddGeomOutline [] (3)  - Add one outline to an existing shape
+XkbAddGeomOverlay [] (3)  - Add one overlay to a section
+XkbAddGeomOverlayKey [] (3)  - Add a key to an existing overlay row
+XkbAddGeomOverlayRow [] (3)  - Add a row to an existing overlay
+XkbAddGeomProperty [] (3)  - Add one property to an existing keyboard geometry description
+XkbAddGeomRow []     (3)  - Add a row to a section
+XkbAddGeomSection [] (3)  - Add one section to an existing keyboard geometry
+XkbAddGeomShape []   (3)  - Add a shape to a keyboard geometry
+XkbAddSymInterpret [] (3)  - Add a symbol interpretation to the list of symbol interpretations in an XkbCompatRec
+XkbAllocClientMap [] (3)  - Allocate and initialize an empty client map description record
+XkbAllocCompatMap [] (3)  - Allocate a new compatibility map if you do not already have one available
+XkbAllocControls []  (3)  - Allocates an XkbControlsRec structure in the XkbDescRec
+XkbAllocDeviceInfo [] (3)  - Obtain an XkbDeviceInfoRec structure
+XkbAllocDeviceLedInfo [] (3)  - Obtain an XkbDeviceLedInfoRec structure
+XkbAllocGeomColors [] (3)  - Allocate geometry colors
+XkbAllocGeomDoodads [] (3)  - Allocate doodads that are global to a keyboard geometry
+XkbAllocGeomKeyAliases [] (3)  - Allocate geometry key aliases
+XkbAllocGeomKeys []  (3)  - Allocate space for an arbitrary number of keys to a row
+XkbAllocGeomOutlines [] (3)  - Allocate space for an arbitrary number of outlines to a shape
+XkbAllocGeomOverlayKeys [] (3)  - Allocate keys in an overlay row
+XkbAllocGeomOverlayRows [] (3)  - Allocate rows in a overlay
+XkbAllocGeomOverlays [] (3)  - Allocate overlays in a section
+XkbAllocGeomPoints [] (3)  - Allocate points in an outline
+XkbAllocGeomProps [] (3)  - Allocate geometry properties
+XkbAllocGeomRows []  (3)  - Allocate rows in a section
+XkbAllocGeomSectionDoodads [] (3)  - Allocate doodads that are specific to a section
+XkbAllocGeomSections [] (3)  - Allocate geometry sections
+XkbAllocGeomShapes [] (3)  - Allocate space for an arbitrary number of geometry shapes
+XkbAllocGeometry []  (3)  - Allocate an entire geometry
+XkbAllocIndicatorMaps [] (3)  - Allocates, directly, the indicators member of the keyboard description record
+XkbAllocKeyboard []  (3)  - Creates a keyboard description from scratch
+XkbAllocNames []     (3)  - Allocate symbolic names structures
+XkbAllocServerMap [] (3)  - Allocate and initialize an empty server map description record
+XkbApplyCompatMapToKey [] (3)  - Apply the new compatibility mapping to an individual key to get its semantics updated
+XkbBell []           (3)  - Rings the bell on the default keyboard
+XkbBellEvent []      (3)  - Provides a function that initiates a bell event for the keyboard without ringing the bell
+XkbChangeControls [] (3)  - Provides a flexible method for updating the controls in a server to match those in the changed keyboard description
+XkbChangeDeviceInfo [] (3)  - Update the server's description of a device with the changes noted in an XkbDeviceChangesRec
+XkbChangeEnabledControls [] (3)  - Manipulates the EnabledControls control
+XkbChangeIndicators [] (3)  - Changes indicator maps or state without passing the entire keyboard description
+XkbChangeMap []      (3)  - Update only partial components of a keyboard description, modify the appropriate fields in the server and map components of a local copy of the keyboard description
+XkbChangeNames []    (3)  - _summary-line_
+XkbChangeTypesOfKey [] (3)  - Change the number of groups and the types bound to a key
+XkbChangeTypesOfKey [] (3)  - Obtain the behaviors (the behaviors array) for a subset of the keys in a keyboard description from the server
+XkbComputeRowBounds [] (3)  - Update the bounding box of a row
+XkbComputeSectionBounds [] (3)  - Update the bounding box of a section
+XkbComputeShapeBounds [] (3)  - Updates the bounding box of a shape
+XkbComputeShapeTop [] (3)  - Determines the bounding box of the top surface of a shape
+XkbCopyKeyType []    (3)  - Copy one XkbKeyTypeRec structures
+XkbCopyKeyTypes []   (3)  - Copy more than one XkbKeyTypeRec structure
+XkbDeviceBell []     (3)  - Rings the bell on an X input extension device or the default keyboard
+XkbDeviceBellEvent [] (3)  - Creates a bell event for an X input extension device or for the keyboard, without ringing the corresponding bell
+XkbFindOverlayForKey [] (3)  - Find the alternate name by using the primary name for a key that is part of an overlay
+XkbForceBell []      (3)  - Overrides user preference settings for audible bells to ring the bell on the default keyboard
+XkbForceDeviceBell [] (3)  - Rings the bell on any keyboard, overriding user preference settings for audible bells
+XkbFreeClientMap []  (3)  - Free memory used by the client map member of an XkbDescRec structure
+XkbFreeCompatMap []  (3)  - Free an entire compatibility map or selected portions of one
+XkbFreeComponentList [] (3)  - Free the structure returned by XkbListComponents
+XkbFreeControls []   (3)  - Frees memory used by the ctrls member of an XkbDescRec structure
+XkbFreeDeviceInfo [] (3)  - Free an XkbDeviceInfoRec structure
+XkbFreeGeomColors [] (3)  - Free geometry colors
+XkbFreeGeomDoodads [] (3)  - Free geometry doodads
+XkbFreeGeomKeyAliases [] (3)  - Free geometry key aliases
+XkbFreeGeomKeys []   (3)  - Free geometry keys
+XkbFreeGeomOutlines [] (3)  - Free geometry outlines
+XkbFreeGeomOverlayKeys [] (3)  - Free keys in an overlay row
+XkbFreeGeomOverlayRows [] (3)  - Free rows in an overlay
+XkbFreeGeomOverlays [] (3)  - Free rows in a section
+XkbFreeGeomPoints [] (3)  - Free points in a outline
+XkbFreeGeomProperties [] (3)  - Free geometry properties
+XkbFreeGeomRows []   (3)  - Free rows in a section
+XkbFreeGeomSections [] (3)  - Free geometry sections
+XkbFreeGeomShapes [] (3)  - Free geometry shapes
+XkbFreeGeometry []   (3)  - Free an entire geometry
+XkbFreeIndicatorMaps [] (3)  - Frees memory used by the indicators member of an XkbDescRec structure
+XkbFreeKeyboard []   (3)  - Destroys either an entire XkbDescRec or just some of its members
+XkbFreeNames []      (3)  - Free symbolic names structures
+XkbFreeServerMap []  (3)  - Free memory used by the server member of an XkbDescRec structure
+XkbGetAccessXTimeout [] (3)  - Queries the current AccessXTimeout options for a keyboard device
+XkbGetAutoRepeatRate [] (3)  - Gets the current attributes of the RepeatKeys control for a keyboard device
+XkbGetAutoResetControls [] (3)  - Gets the current values of the auto-reset controls
+XkbGetBounceKeysDelay [] (3)  - Queries the current BounceKeys delay for a keyboard device
+XkbGetCompatMap []   (3)  - Fetch any combination of the current compatibility map components from the server
+XkbGetControls []    (3)  - Finds the current state of Xkb server controls
+XkbGetControlsChanges [] (3)  - Updates a local copy of a keyboard description with the changes previously noted by one or more calls to XkbNoteControlsChanges
+XkbGetDetectableAutorepeat [] (3)  - Determines whether or not the server supports DetectableAutorepeat
+XkbGetDeviceButtonActions [] (3)  - Query the button actions associated with an X Input Extension device
+XkbGetDeviceInfo []  (3)  - Determine whether the X server allows Xkb access to particular capabilities of input devices other than the core X keyboard, or to determine the status of indicator maps, indicator names or button actions on a non - KeyClass extension device
+XkbGetDeviceInfoChanges [] (3)  - Query the changes that have occurred in the button actions or indicator names and indicator maps associated with an input extension device
+XkbGetDeviceLedInfo [] (3)  - Query the indicator names, maps, and state associated with an LED feedback of an input extension device
+XkbGetGeometry []    (3)  - Loads a keyboard geometry if you already have the keyboard description
+XkbGetIndicatorChanges [] (3)  - Updates a local copy of the keyboard description with the actual values of one or more calls to XkbNoteIndicatorChanges
+XkbGetIndicatorMap [] (3)  - Gets the map for one or more indicators, using a mask to specify the indicators
+XkbGetIndicatorState [] (3)  - Obtains the current state of the keyboard indicators
+XkbGetKeyActions []  (3)  - Update the actions (the key_acts array) for a subset of the keys in a keyboard description
+XkbGetKeyExplicitComponents [] (3)  - Obtain the explicit components (the explicit array) for a subset of the keys in a keyboard description
+XkbGetKeyModifierMap [] (3)  - Update the modifier map for one or more of the keys in a keyboard description
+XkbGetKeySyms []     (3)  - Obtain the symbols for a subset of the keys in a keyboard description
+XkbGetKeyTypes []    (3)  - Obtain the list of available key types in the server's keyboard mapping
+XkbGetKeyVirtualModMap [] (3)  - Obtain the virtual modifier map (the vmodmap array) for a subset of the keys in a keyboard description
+XkbGetKeyboard []    (3)  - Retrieves one or more components of a keyboard device description
+XkbGetKeyboardByName [] (3)  - Build a new keyboard description from a set of named components, and to optionally have the server use the resulting description to replace an active one
+XkbGetMap []         (3)  - Allocate an XkbDescRec structure and populate it with the server's keyboard client map and server map
+XkbGetNameChanges [] (3)  - Update the local copy of the keyboard description with the actual values of the results of one or more calls to XkbNoteNameChanges
+XkbGetNamedGeometry [] (3)  - Loads a keyboard geometry description from this database by name
+XkbGetNamedIndicator [] (3)  - Look up the indicator map and other information for an indicator by name
+XkbGetNames []       (3)  - Obtain symbolic names from the server
+XkbGetSlowKeysDelay [] (3)  - Gets the SlowKeys acceptance delay for a keyboard device
+XkbGetState []       (3)  - Obtains the keyboard state
+XkbGetStickyKeysOptions [] (3)  - Queries the current StickyKeys attributes for a keyboard device
+XkbGetUpdatedMap []  (3)  - Update the client or server map information in an existing keyboard description
+XkbGetVirtualMods [] (3)  - Obtain a subset of the virtual modifier bindings (the vmods array) in a keyboard description
+XkbGetXlibControls [] (3)  - Determines the current state of the Library Controls
+XkbIgnoreExtension [] (3)  - Prevents core X library keyboard functions from using the X Keyboard Extension
+XkbInitCanonicalKeyTypes [] (3)  - Set the definitions of the canonical key types in a client map to their default values
+XkbKeyAction []      (3)  - Returns the key action
+XkbKeyActionEntry [] (3)  - Returns the key action corresponding to group grp and shift level lvl from the two - dimensional table of key actions associated with the key corresponding to keycode
+XkbKeyActionsPtr []  (3)  - Returns a pointer to the two-dimensional array of key actions associated with the key corresponding to keycode
+XkbKeyGroupInfo []   (3)  - Returns the number of groups of symbols bound to the key corresponding to keycode
+XkbKeyGroupWidth []  (3)  - Computes the width of the type associated with the group grp for the key corresponding to keycode
+XkbKeyGroupsWidth [] (3)  - Computes the maximum width associated with the key corresponding to keycode
+XkbKeyHasActions []  (3)  - Determines if the key corresponding to keycode has any actions associated with it
+XkbKeyNumActions []  (3)  - Computes the number of actions associated with the key corresponding to keycode
+XkbKeyNumGroups []   (3)  - Returns the number of groups of symbols bound to the key corresponding to keycode
+XkbKeyNumSyms []     (3)  - Returns the total number of keysyms for the key corresponding to keycode
+XkbKeySymEntry []    (3)  - Returns the keysym corresponding to shift level shift and group grp from the two - dimensional array of keysyms for the key corresponding to keycode
+XkbKeySymsOffset []  (3)  - Returns the offset of the two-dimensional array of keysyms for the key corresponding to keycode
+XkbKeySymsPtr []     (3)  - Returns the pointer to the two-dimensional array of keysyms for the key corresponding to keycode
+XkbKeyType []        (3)  - Obtain the index of a key type or the pointer to a key type
+XkbKeyTypeIndex []   (3)  - Obtain the index of a key type or the pointer to a key type
+XkbKeyTypesForCoreSymbols [] (3)  - Determine the Xkb key types appropriate for the symbols bound to a key in a core keyboard mapping
+XkbKeycodeToKeysym [] (3)  - Finds the keysym bound to a particular key at a specified group and shift level
+XkbKeysymToModifiers [] (3)  - Finds the set of modifiers bound to a particular keysym on the core keyboard
+XkbLatchGroup []     (3)  - Latches the keysym group
+XkbLatchModifiers [] (3)  - Latches and unlatches any of the eight real keyboard modifiers
+XkbLibraryVersion [] (3)  - Determines the compatibility of a library at runtime
+XkbListComponents [] (3)  - List of components for one or more component types
+XkbLockGroup []      (3)  - Locks the keysym group
+XkbLockModifiers []  (3)  - Locks and unlocks any of the eight real keyboard modifiers
+XkbLookupKeyBinding [] (3)  - Find the string bound to a key by XRebindKeySym
+XkbLookupKeySym []   (3)  - Find the symbol associated with a key for a particular state
+XkbModActionVMods [] (3)  - Returns the vmods1 and vmods2 fields of act converted to the vmods format of an Xkb modifier description
+XkbNoteControlsChanges [] (3)  - Notes the changes in a changes structure when a client receives an XkbControlsNotify event
+XkbNoteDeviceChanges [] (3)  - Note device changes reported in an XkbExtensionDeviceNotify event
+XkbNoteIndicatorChanges [] (3)  - Notes the changes in a changes structure
+XkbNoteNameChanges [] (3)  - Note the changed names in a changes structure
+XkbOpenDisplay []    (3)  - Checks for a compatible version of the Xkb extension in both the library and the server, and initializes the extension for use
+XkbOutOfRangeGroupInfo [] (3)  - Returns only the out-of-range processing information from the group_info field of an XkbSymMapRec structure
+XkbOutOfRangeGroupNumber [] (3)  - Returns the out-of-range group number, represented as a group index, from the group_info field of an XkbSymMapRec structure
+XkbPtrActionX []     (3)  - Returns the high_XXX and low_XXX fields of act converted to a signed int
+XkbPtrActionY []     (3)  - Returns the high_YYY and low_YYY fields of act converted to a signed int
+XkbQueryExtension [] (3)  - Determines the compatibility of a library at runtime
+XkbRefreshKeyboardMapping [] (3)  - Update the keyboard description that is internal to the X library
+XkbResizeDeviceButtonActions [] (3)  - Allocate additional space for button actions in an XkbDeviceInfoRec structure
+XkbResizeKeyActions [] (3)  - Change the number of actions bound to a key
+XkbResizeKeySyms []  (3)  - Change the number of symbols bound to a key
+XkbResizeKeyType []  (3)  - Change the number of levels in a key type
+XkbSAActionSetCtrls [] (3)  - Sets the ctrls0 through I. ctrls3 fields of act from ctrls
+XkbSAGroup []        (3)  - Returns the group_XXX field of act converted to a signed int
+XkbSAPtrDfltValue [] (3)  - Returns the valueXXX field of act converted to a signed int
+XkbSARedirectSetVMods [] (3)  - Sets the vmods0 and vmods1 of act from v
+XkbSARedirectSetVModsMask [] (3)  - Sets the vmods_mask0 and vmods_mask1 fields of act from vm
+XkbSARedirectVMods [] (3)  - Returns the vmods0 and vmods1 fields of act converted to an unsigned int
+XkbSARedirectVModsMask [] (3)  - Returns the vmods_mask0 and vmods_mask1 fields of act converted to an unsigned int
+XkbSAScreen []       (3)  - Returns the screenXXX field of act converted to a signed int
+XkbSASetGroup []     (3)  - Sets the group_XXX field of act from the group index grp
+XkbSASetPtrDfltValue [] (3)  - Sets the valueXXX field of act from val
+XkbSASetScreen []    (3)  - Sets the screenXXX field of act from s
+XkbSelectEventDetails [] (3)  - Selects or deselects for a specific Xkb event and optionally places conditions on when events of that type are reported to your client
+XkbSelectEvents []   (3)  - Selects and / or deselects for delivery of one or more Xkb events and has them delivered under all conditions
+XkbSetAccessXTimeout [] (3)  - Configures the AccessXTimeout options for a keyboard device
+XkbSetAutoRepeatRate [] (3)  - Sets the attributes of the RepeatKeys control for a keyboard device
+XkbSetAutoResetControls [] (3)  - Changes the current values of the AutoReset control attributes
+XkbSetBounceKeysDelay [] (3)  - Sets the BounceKeys delay for a keyboard device
+XkbSetCompatMap []   (3)  - Modify the server's compatibility map
+XkbSetControls []    (3)  - Copies changes to the X server based on a modified ctrls structure in a local copy of the keyboard description
+XkbSetDebuggingFlags [] (3)  - Change the values of any of the debug controls
+XkbSetDetectableAutorepeat [] (3)  - Sets DetectableAutorepeat
+XkbSetDeviceButtonActions [] (3)  - Change only the button actions for an input extension device
+XkbSetDeviceInfo []  (3)  - Modify some or all of the characteristics of an X Input Extension device
+XkbSetIgnoreLockMods [] (3)  - Sets the modifiers that, if locked, are not to be reported in matching events to passive grabs
+XkbSetIndicatorMap [] (3)  - Downloads the changes to the server based on modifications to a local copy of the keyboard description which will update the maps for one or more indicators
+XkbSetMap []         (3)  - Send a complete new set of values for entire components to the server
+XkbSetModActionVMods [] (3)  - Sets the vmods1 and vmods2 fields of act using the vmods format of an Xkb modifier description
+XkbSetNamedIndicator [] (3)  - Names an indicator if it is not already named; toggles the state of the indicator; sets the indicator to a specified state and sets the indicator map for the indicator
+XkbSetNames []       (3)  - Change the symbolic names in the server
+XkbSetPtrActionX []  (3)  - Sets the high_XXX and low_XXX fields of act from the signed integer value x
+XkbSetPtrActionY []  (3)  - Sets the high_YYY and low_YYY fields of act from the signed integer value y
+XkbSetServerInternalMods [] (3)  - Sets the modifiers that are consumed by the server before events are delivered to the client
+XkbSetXlibControls [] (3)  - Changes the state of the Library Controls
+XkbTranslateKeyCode [] (3)  - Translate a keycode to a key symbol and modifiers
+XkbTranslateKeySym [] (3)  - Find the string and symbol associated with a keysym for a given keyboard state
+XkbUpdateMapFromCore [] (3)  - Update a local Xkb keyboard map to reflect the mapping expressed by a core format mapping
+XkbVirtualModsToReal [] (3)  - Determines the mapping of virtual modifiers to core X protocol modifiers
+XmNotebook []        (3)  - a widget that allows a user to manipulate underlying widgets like pages of a book
+Xmark []             (1)  - summarize x11perf results
+XmbDrawImageString [] (3)  - draw image text using a single font set
+XmbDrawString []     (3)  - draw text using a single font set
+XmbDrawText []       (3)  - draw text using multiple font sets
+XmbLookupString []   (3)  - obtain composed input from an input method
+XmbResetIC []        (3)  - reset the state of an input context
+XmbSetWMProperties [] (3)  - set standard window properties
+XmbTextEscapement [] (3)  - obtain the escapement of text
+XmbTextExtents []    (3)  - compute text extents
+XmbTextListToTextProperty [] (3)  - convert text lists and text property structures
+XmbTextPerCharExtents [] (3)  - obtain per-character information for a text string
+XmbTextPropertyToTextList [] (3)  - convert text lists and text property structures
+XmbufChangeBufferAttributes [] (3)  - X multibuffering functions
+XmbufChangeWindowAttributes [] (3)  - X multibuffering functions
+XmbufCreateBuffers [] (3)  - X multibuffering functions
+XmbufCreateStereoWindow [] (3)  - X multibuffering functions
+XmbufDestroyBuffers [] (3)  - X multibuffering functions
+XmbufDisplayBuffers [] (3)  - X multibuffering functions
+XmbufGetBufferAttributes [] (3)  - X multibuffering functions
+XmbufGetScreenInfo [] (3)  - X multibuffering functions
+XmbufGetVersion []   (3)  - X multibuffering functions
+XmbufGetWindowAttributes [] (3)  - X multibuffering functions
+XmbufQueryExtension [] (3)  - X multibuffering functions
+Xnest []             (1)  - a nested X server
+Xorg []              (1)  - X11R7 X server
+XpCancelDoc []       (3)  - Cancels a print document
+XpCancelJob []       (3)  - Cancels a single print job
+XpCancelPage []      (3)  - Cancels a print page
+XpCreateContext []   (3)  - Creates and initializes a new print context
+XpDestroyContext []  (3)  - Gets the current print context-id for a display connection
+XpEndDoc []          (3)  - Indicates the ending of a print document
+XpEndJob []          (3)  - Indicates the ending of a single print job
+XpEndPage []         (3)  - Indicates the end of a print page
+XpFreePrinterList [] (3)  - Frees a list of printer records
+XpGetAttributes []   (3)  - Gets an attribute pool from the specified print context
+XpGetContext []      (3)  - Gets the current print context-id for a display connection
+XpGetDocumentData [] (3)  - Creates and initializes a new print context
+XpGetImageResolution [] (3)  - Gets the current image resolution for a print context
+XpGetLocaleHinter [] (3)  - Gets a pointer to and description of the current locale hinter function
+XpGetOneAttribute [] (3)  - Gets a single print attribute from the specified print context
+XpGetPageDimensions [] (3)  - Gets the page dimensions for the current printer settings
+XpGetPdmStartParams [] (3)  - Builds up parameters in accordance with the PDM Selection Protocol as a standard convenience function
+XpGetPrinterList []  (3)  - Retrieves a list of all printers supported on an X Print Server
+XpGetScreenOfContext [] (3)  - Obtains a pointer to the screen associated with the specified print context
+XpInputSelected []   (3)  - Queries which X Print events the client has selected to receive from the specific print context
+XpQueryExtension []  (3)  - Queries an X Server to determine if it supports the X Print Service Extension, and if it does, what the offsets are for associated events and errors
+XpQueryScreens []    (3)  - Queries an X Server to determine which screens, of all the screens on the server, support the X Print Service Extension
+XpQueryVersion []    (3)  - Queries an X Server to determine if it supports the X Print Service Extension, and if it does, which version of the X Print Service Extension
+XpRehashPrinterList [] (3)  - Recomputes the list of available printers
+XpSelectInput []     (3)  - Specifies which X Print events, from the specified print context, the client is interested in
+XpSetAttributes []   (3)  - Sets or updates an attribute pool in the specified print context
+XpSetContext []      (3)  - Sets or unsets a print context with the specified display connection to the X Print Server
+XpSetImageResolution [] (3)  - Sets the resolution for subsequent PutImage requests
+XpSetLocaleHinter [] (3)  - Sets a locale hinter function and description of it
+XpStartDoc []        (3)  - Indicates the beginning of a print document
+XpStartJob []        (3)  - Indicates the beginning of a single print job
+XpStartPage []       (3)  - Indicates the beginning of a print page
+Xrandr []            (3)  - X Resize, Rotate and Reflection extension
+XrmCombineDatabase [] (3)  - merge resource databases
+XrmCombineFileDatabase [] (3)  - merge resource databases
+XrmDestroyDatabase [] (3)  - retrieve and store resource databases
+XrmEnumerateDatabase [] (3)  - enumerate resource database entries
+XrmGetDatabase []    (3)  - retrieve and store resource databases
+XrmGetFileDatabase [] (3)  - retrieve and store resource databases
+XrmGetResource []    (3)  - retrieve database resources and search lists
+XrmGetStringDatabase [] (3)  - retrieve and store resource databases
+XrmInitialize []     (3)  - initialize the Resource Manager, Resource Manager structures, and parse the command line
+XrmLocaleOfDatabase [] (3)  - retrieve and store resource databases
+XrmMergeDatabases [] (3)  - merge resource databases
+XrmOptionDescRec []  (3)  - initialize the Resource Manager, Resource Manager structures, and parse the command line
+XrmOptionKind []     (3)  - initialize the Resource Manager, Resource Manager structures, and parse the command line
+XrmParseCommand []   (3)  - initialize the Resource Manager, Resource Manager structures, and parse the command line
+XrmPermStringToQuark [] (3)  - manipulate resource quarks
+XrmPutFileDatabase [] (3)  - retrieve and store resource databases
+XrmPutLineResource [] (3)  - store database resources
+XrmPutResource []    (3)  - store database resources
+XrmPutStringResource [] (3)  - store database resources
+XrmQGetResource []   (3)  - retrieve database resources and search lists
+XrmQGetSearchList [] (3)  - retrieve database resources and search lists
+XrmQGetSearchResource [] (3)  - retrieve database resources and search lists
+XrmQPutResource []   (3)  - store database resources
+XrmQPutStringResource [] (3)  - store database resources
+XrmQuarkToString []  (3)  - manipulate resource quarks
+XrmSetDatabase []    (3)  - retrieve and store resource databases
+XrmStringToBindingQuarkList [] (3)  - manipulate resource quarks
+XrmStringToQuark []  (3)  - manipulate resource quarks
+XrmStringToQuarkList [] (3)  - manipulate resource quarks
+XrmUniqueQuark []    (3)  - manipulate resource quarks
+XrmValue []          (3)  - initialize the Resource Manager, Resource Manager structures, and parse the command line
+Xsecurity []         (7)  - X display access control
+Xserver []           (1)  - X Window System display server
+XtAddActions []      (3)  - register an action table
+XtAddCallback []     (3)  - add and remove callback procedures
+XtAddCallbacks []    (3)  - add and remove callback procedures
+XtAddConverter []    (3)  - register resource converter
+XtAddEventHandler [] (3)  - add and remove event handlers
+XtAddExposureToRegion [] (3)  - merge exposure events into a region
+XtAddGrab []         (3)  - redirect user input to a modal widget
+XtAddInput []        (3)  - register input, timeout, and workprocs
+XtAddRawEventHandler [] (3)  - add and remove event handlers
+XtAddTimeOut []      (3)  - register input, timeout, and workprocs
+XtAddWorkProc []     (3)  - register input, timeout, and workprocs
+XtAllocateGC []      (3)  - obtain a sharable GC with modifiable fields
+XtAppAddActionHook [] (3)  - register an action hook procedure
+XtAppAddActions []   (3)  - register an action table
+XtAppAddBlockHook [] (3)  - register a block hook procedure
+XtAppAddConverter [] (3)  - register resource converter
+XtAppAddInput []     (3)  - register and remove an input source
+XtAppAddSignal []    (3)  - register and remove a signal source
+XtAppAddTimeOut []   (3)  - register and remove timeouts
+XtAppAddWorkProc []  (3)  - Add and remove background processing procedures
+XtAppCreateShell []  (3)  - create top-level widget instance
+XtAppError []        (3)  - low-level error handlers
+XtAppErrorMsg []     (3)  - high-level error handlers
+XtAppGetErrorDatabase [] (3)  - obtain error database
+XtAppGetErrorDatabaseText [] (3)  - obtain error database
+XtAppGetExitFlag []  (3)  - thread support functions
+XtAppGetSelectionTimeout [] (3)  - set and obtain selection timeout values
+XtAppInitialize []   (3)  - initialize, open, or close a display
+XtAppLock []         (3)  - lock and unlock application context
+XtAppMainLoop []     (3)  - query and process events and input
+XtAppNextEvent []    (3)  - query and process events and input
+XtAppPeekEvent []    (3)  - query and process events and input
+XtAppPending []      (3)  - query and process events and input
+XtAppProcessEvent [] (3)  - query and process events and input
+XtAppReleaseCacheRefs [] (3)  - decrement reference counts for resources
+XtAppSetErrorHandler [] (3)  - low-level error handlers
+XtAppSetErrorMsgHandler [] (3)  - high-level error handlers
+XtAppSetExitFlag []  (3)  - thread support functions
+XtAppSetFallbackResources [] (3)  - set fallback resources
+XtAppSetSelectionTimeout [] (3)  - set and obtain selection timeout values
+XtAppSetTypeConverter [] (3)  - register resource converter
+XtAppSetWarningHandler [] (3)  - low-level error handlers
+XtAppSetWarningMsgHandler [] (3)  - high-level error handlers
+XtAppUnlock []       (3)  - lock and unlock application context
+XtAppWarning []      (3)  - low-level error handlers
+XtAppWarningMsg []   (3)  - high-level error handlers
+XtAugmentTranslations [] (3)  - manage translation tables
+XtBuildEventMask []  (3)  - retrieve a widget's event mask
+XtCallAcceptFocus [] (3)  - calla widget's accept_focus procedure
+XtCallActionProc []  (3)  - invoke an action procedure directly
+XtCallCallbackList [] (3)  - process callbacks
+XtCallCallbacks []   (3)  - process callbacks
+XtCallConverter []   (3)  - invoke resource converters
+XtCallbackExclusive [] (3)  - map a pop-up
+XtCallbackNone []    (3)  - map a pop-up
+XtCallbackNonexclusive [] (3)  - map a pop-up
+XtCallbackPopdown [] (3)  - unmap a pop-up
+XtCalloc []          (3)  - memory management functions
+XtCancelSelectionRequest [] (3)  - bundle multiple selection conversion requests into a single request using MULTIPLE target
+XtChangeManagedSet [] (3)  - manage and unmanage children
+XtCheckSubclass []   (3)  - obtain and verify a widget's class
+XtClass []           (3)  - obtain and verify a widget's class
+XtCloseDisplay []    (3)  - initialize, open, or close a display
+XtConfigureWidget [] (3)  - move and resize widgets
+XtConvert []         (3)  - invoke resource converters
+XtConvertAndStore [] (3)  - invoke resource converters
+XtConvertCase []     (3)  - convert KeySym to KeyCodes
+XtCreateApplicationContext [] (3)  - create, destroy, and obtain an application context
+XtCreateApplicationShell [] (3)  - create top-level widget instance
+XtCreateManagedWidget [] (3)  - create and destroy widgets
+XtCreatePopupShell [] (3)  - create a popup shell
+XtCreateSelectionRequest [] (3)  - bundle multiple selection conversion requests into a single request using MULTIPLE target
+XtCreateWidget []    (3)  - create and destroy widgets
+XtCreateWindow []    (3)  - window creation convenience function
+XtDatabase []        (3)  - initialize, open, or close a display
+XtDestroyApplicationContext [] (3)  - create, destroy, and obtain an application context
+XtDestroyWidget []   (3)  - create and destroy widgets
+XtDirectConvert []   (3)  - invoke resource converters
+XtDisownSelection [] (3)  - set selection owner
+XtDispatchEvent []   (3)  - query and process events and input
+XtDispatchEventToWidget [] (3)  - extension event handling
+XtDisplay []         (3)  - obtain window information about a widget
+XtDisplayInitialize [] (3)  - initialize, open, or close a display
+XtDisplayOfObject [] (3)  - obtain window information about a widget
+XtDisplayStringConversionWarning [] (3)  - issue a conversion warning message
+XtDisplayToApplicationContext [] (3)  - obtain an application context
+XtError []           (3)  - low-level error handlers
+XtErrorMsg []        (3)  - high-level error handlers
+XtFindFile []        (3)  - search for a file using substitutions in the path list
+XtFree []            (3)  - memory management functions
+XtGetActionKeysym [] (3)  - obtain corresponding keysym
+XtGetActionList []   (3)  - obtain class action list
+XtGetApplicationNameAndClass [] (3)  - retrieve application name and class
+XtGetApplicationResources [] (3)  - obtain application resources
+XtGetClassExtension [] (3)  - locate a class extension record
+XtGetConstraintResourceList [] (3)  - obtain resource list
+XtGetDisplays []     (3)  - retrieve a list of displays associated with an application context
+XtGetErrorDatabase [] (3)  - obtain error database
+XtGetErrorDatabaseText [] (3)  - obtain error database
+XtGetGC []           (3)  - obtain and destroy a sharable GC
+XtGetKeyboardFocusWidget [] (3)  - extension event handling
+XtGetKeysymTable []  (3)  - query keysyms and keycodes
+XtGetMultiClickTime [] (3)  - set and get multi-click times
+XtGetResourceList [] (3)  - obtain resource list
+XtGetSelectionParameters [] (3)  - retrieve target parameters for a selection request with a single target
+XtGetSelectionRequest [] (3)  - retrieve the event that triggered the XtConvertSelectionProc
+XtGetSelectionTimeout [] (3)  - set and obtain selection timeout values
+XtGetSelectionValue [] (3)  - obtain selection values
+XtGetSelectionValueIncremental [] (3)  - obtain selection values
+XtGetSelectionValues [] (3)  - obtain selection values
+XtGetSelectionValuesIncremental [] (3)  - obtain selection values
+XtGetSubresources [] (3)  - obtain subresources
+XtGetSubvalues []    (3)  - obtain and set widget resources
+XtGetValues []       (3)  - obtain and set widget resources
+XtGrabButton []      (3)  - manage grabs
+XtGrabKey []         (3)  - manage grabs
+XtGrabKeyboard []    (3)  - manage grabs
+XtGrabPointer []     (3)  - manage grabs
+XtHasCallbacks []    (3)  - process callbacks
+XtHooksOfDisplay []  (3)  - external agent access points
+XtInitialize []      (3)  - initialize
+XtInitializeWidgetClass [] (3)  - initialize a widget class
+XtInsertEventHandler [] (3)  - add and remove event handlers
+XtInsertEventTypeHandler [] (3)  - extension event handling
+XtInsertRawEventHandler [] (3)  - add and remove event handlers
+XtInstallAccelerators [] (3)  - managing accelerator tables
+XtInstallAllAccelerators [] (3)  - managing accelerator tables
+XtIsApplicationShell [] (3)  - obtain and verify a widget's class
+XtIsComposite []     (3)  - obtain and verify a widget's class
+XtIsConstraint []    (3)  - obtain and verify a widget's class
+XtIsManaged []       (3)  - manage and unmanage children
+XtIsObject []        (3)  - obtain and verify a widget's class
+XtIsOverrideShell [] (3)  - obtain and verify a widget's class
+XtIsRealized []      (3)  - realize and unrealize widgets
+XtIsRectObj []       (3)  - obtain and verify a widget's class
+XtIsSensitive []     (3)  - set and check a widget's sensitivity state
+XtIsSessionShell []  (3)  - obtain and verify a widget's class
+XtIsShell []         (3)  - obtain and verify a widget's class
+XtIsSubclass []      (3)  - obtain and verify a widget's class
+XtIsTopLevelShell [] (3)  - obtain and verify a widget's class
+XtIsTransientShell [] (3)  - obtain and verify a widget's class
+XtIsVendorShell []   (3)  - obtain and verify a widget's class
+XtIsWMShell []       (3)  - obtain and verify a widget's class
+XtIsWidget []        (3)  - obtain and verify a widget's class
+XtKeysymToKeycodeList [] (3)  - query keysyms and keycodes
+XtLastEventProcessed [] (3)  - last event, last timestamp processed
+XtLastTimestampProcessed [] (3)  - last event, last timestamp processed
+XtMainLoop []        (3)  - query and process events and input
+XtMakeGeometryRequest [] (3)  - make geometry manager request
+XtMakeResizeRequest [] (3)  - make geometry manager request
+XtMalloc []          (3)  - memory management functions
+XtManageChild []     (3)  - manage and unmanage children
+XtManageChildren []  (3)  - manage and unmanage children
+XtMapWidget []       (3)  - map and unmap widgets
+XtMergeArgLists []   (3)  - set and merge ArgLists
+XtMoveWidget []      (3)  - move and resize widgets
+XtName []            (3)  - obtain widget's name
+XtNameToWidget []    (3)  - translating strings to widgets or widgets to windows
+XtNew []             (3)  - memory management functions
+XtNewString []       (3)  - memory management functions
+XtNextEvent []       (3)  - query and process events and input
+XtNoticeSignal []    (3)  - register and remove a signal source
+XtNumber []          (3)  - determine the byte offset or number of array elements
+XtOffset []          (3)  - determine the byte offset or number of array elements
+XtOffsetOf []        (3)  - determine the byte offset or number of array elements
+XtOpenApplication [] (3)  - initialize, open, or close a display
+XtOpenDisplay []     (3)  - initialize, open, or close a display
+XtOverrideTranslations [] (3)  - manage translation tables
+XtOwnSelection []    (3)  - set selection owner
+XtOwnSelectionIncremental [] (3)  - set selection owner
+XtParent []          (3)  - obtain widget's parent widget id
+XtParseAcceleratorTable [] (3)  - managing accelerator tables
+XtParseTranslationTable [] (3)  - manage translation tables
+XtPeekEvent []       (3)  - query and process events and input
+XtPending []         (3)  - query and process events and input
+XtPopdown []         (3)  - unmap a pop-up
+XtPopup []           (3)  - map a pop-up
+XtPopupSpringLoaded [] (3)  - map a pop-up
+XtProcessEvent []    (3)  - query and process events and input
+XtProcessLock []     (3)  - lock and unlock process
+XtProcessUnlock []   (3)  - lock and unlock process
+XtQueryGeometry []   (3)  - query the preferred geometry of a child widget
+XtRealizeWidget []   (3)  - realize and unrealize widgets
+XtRealloc []         (3)  - memory management functions
+XtRegisterCaseConverter [] (3)  - convert KeySym to KeyCodes
+XtRegisterDrawable [] (3)  - register a drawable with the Intrinsics event dispatcher
+XtRegisterExtensionSelector [] (3)  - extension event handling
+XtRegisterGrabAction [] (3)  - register button and key grabs
+XtReleaseGC []       (3)  - obtain and destroy a sharable GC
+XtReleasePropertyAtom [] (3)  - maintain a cache of property atoms
+XtRemoveActionHook [] (3)  - register an action hook procedure
+XtRemoveAllCallbacks [] (3)  - add and remove callback procedures
+XtRemoveBlockHook [] (3)  - register a block hook procedure
+XtRemoveCallback []  (3)  - add and remove callback procedures
+XtRemoveCallbacks [] (3)  - add and remove callback procedures
+XtRemoveEventHandler [] (3)  - add and remove event handlers
+XtRemoveEventTypeHandler [] (3)  - extension event handling
+XtRemoveGrab []      (3)  - redirect user input to a modal widget
+XtRemoveInput []     (3)  - register and remove an input source
+XtRemoveRawEventHandler [] (3)  - add and remove event handlers
+XtRemoveSignal []    (3)  - register and remove a signal source
+XtRemoveTimeOut []   (3)  - register and remove timeouts
+XtRemoveWorkProc []  (3)  - Add and remove background processing procedures
+XtReservePropertyAtom [] (3)  - maintain a cache of property atoms
+XtResizeWidget []    (3)  - move and resize widgets
+XtResolvePathname [] (3)  - search for a file using standard substitution
+XtScreen []          (3)  - obtain window information about a widget
+XtScreenDatabase []  (3)  - initialize, open, or close a display
+XtScreenOfObject []  (3)  - obtain window information about a widget
+XtSendSelectionRequest [] (3)  - bundle multiple selection conversion requests into a single request using MULTIPLE target
+XtSessionGetToken [] (3)  - token management for checkpointing
+XtSessionReturnToken [] (3)  - token management for checkpointing
+XtSetArg []          (3)  - set and merge ArgLists
+XtSetErrorHandler [] (3)  - low-level error handlers
+XtSetErrorMsgHandler [] (3)  - high-level error handlers
+XtSetEventDispatcher [] (3)  - extension event handling
+XtSetKeyTranslator [] (3)  - convert KeySym to KeyCodes
+XtSetKeyboardFocus [] (3)  - focus events on a child widget
+XtSetLanguageProc [] (3)  - set the language procedure
+XtSetMappedWhenManaged [] (3)  - map and unmap widgets
+XtSetMultiClickTime [] (3)  - set and get multi-click times
+XtSetSelectionParameters [] (3)  - specify target parameters for a selection request with a single target
+XtSetSelectionTimeout [] (3)  - set and obtain selection timeout values
+XtSetSensitive []    (3)  - set and check a widget's sensitivity state
+XtSetSubvalues []    (3)  - obtain and set widget resources
+XtSetTypeConverter [] (3)  - register resource converter
+XtSetValues []       (3)  - obtain and set widget resources
+XtSetWMColormapWindows [] (3)  - Set the value of the WM_COLORMAP_WINDOWS property
+XtSetWarningHandler [] (3)  - low-level error handlers
+XtSetWarningMsgHandler [] (3)  - high-level error handlers
+XtStringConversionWarning [] (3)  - issue a conversion warning message
+XtSuperclass []      (3)  - obtain and verify a widget's class
+XtToolkitInitialize [] (3)  - create, destroy, and obtain an application context
+XtToolkitThreadInitialize [] (3)  - initialize the toolkit for multiple threads
+XtTranslateCoords [] (3)  - translate widget coordinates
+XtTranslateKeycode [] (3)  - convert KeySym to KeyCodes
+XtUngrabButton []    (3)  - manage grabs
+XtUngrabKey []       (3)  - manage grabs
+XtUngrabKeyboard []  (3)  - manage grabs
+XtUngrabPointer []   (3)  - manage grabs
+XtUninstallTranslations [] (3)  - manage translation tables
+XtUnmanageChild []   (3)  - manage and unmanage children
+XtUnmanageChildren [] (3)  - manage and unmanage children
+XtUnmapWidget []     (3)  - map and unmap widgets
+XtUnrealizeWidget [] (3)  - realize and unrealize widgets
+XtVaAppCreateShell [] (3)  - create top-level widget instance
+XtVaAppInitialize [] (3)  - initialize, open, or close a display
+XtVaCreateArgsList [] (3)  - dynamically allocate a varargs list
+XtVaCreateManagedWidget [] (3)  - create and destroy widgets
+XtVaCreatePopupShell [] (3)  - create a popup shell
+XtVaCreateWidget []  (3)  - create and destroy widgets
+XtVaGetApplicationResources [] (3)  - obtain application resources
+XtVaGetSubresources [] (3)  - obtain subresources
+XtVaGetSubvalues []  (3)  - obtain and set widget resources
+XtVaGetValues []     (3)  - obtain and set widget resources
+XtVaOpenApplication [] (3)  - initialize, open, or close a display
+XtVaSetSubvalues []  (3)  - obtain and set widget resources
+XtVaSetValues []     (3)  - obtain and set widget resources
+XtWarning []         (3)  - low-level error handlers
+XtWarningMsg []      (3)  - high-level error handlers
+XtWidgetToApplicationContext [] (3)  - create, destroy, and obtain an application context
+XtWindow []          (3)  - obtain window information about a widget
+XtWindowOfObject []  (3)  - obtain window information about a widget
+XtWindowToWidget []  (3)  - translating strings to widgets or widgets to windows
+Xutf8DrawImageString [] (3)  - draw image text using a single font set
+Xutf8DrawString []   (3)  - draw text using a single font set
+Xutf8DrawText []     (3)  - draw text using multiple font sets
+Xutf8LookupString [] (3)  - obtain composed input from an input method
+Xutf8ResetIC []      (3)  - reset the state of an input context
+Xutf8SetWMProperties [] (3)  - set standard window properties
+Xutf8TextEscapement [] (3)  - obtain the escapement of text
+Xutf8TextExtents []  (3)  - compute text extents
+Xutf8TextListToTextProperty [] (3)  - convert text lists and text property structures
+Xutf8TextPerCharExtents [] (3)  - obtain per-character information for a text string
+Xutf8TextPropertyToTextList [] (3)  - convert text lists and text property structures
+Xv []                (3)  - X Window System video extension
+XvFreeAdaptorInfo [] (3)  - free adaptor information
+XvFreeEncodingInfo [] (3)  - free encoding information
+XvGetPortAttribute [] (3)  - return current port attribute value
+XvGetStill []        (3)  - capture a single frame of video from a drawable
+XvGetVideo []        (3)  - capture video from a drawable
+XvGrabPort []        (3)  - lock port for exclusive use by client
+XvPortNotify []      (3)  - event generated when port attributes change
+XvPutStill []        (3)  - write a single frame of video to a drawable
+XvPutVideo []        (3)  - write video into a drawable
+XvQueryAdaptors []   (3)  - return adaptor information for a screen
+XvQueryBestSize []   (3)  - determine the optimum drawable region size
+XvQueryEncodings []  (3)  - return list of encodings for an adaptor
+XvQueryExtension []  (3)  - return version and release of extension
+XvSelectPortNotify [] (3)  - enable or disable XvPortNotify(3) events
+XvSelectVideoNotify [] (3)  - enable or disable VideoNotify events
+XvSetPortAttribute [] (3)  - sets an attribute of a video port
+XvStopVideo []       (3)  - stop active video
+XvUngrabPort []      (3)  - release port grabbed for video operation
+XvVideoNotify []     (3)  - event generated for video processing
+Xvfb []              (1)  - virtual framebuffer X server for X Version 11
+XwcDrawImageString [] (3)  - draw image text using a single font set
+XwcDrawString []     (3)  - draw text using a single font set
+XwcDrawText []       (3)  - draw text using multiple font sets
+XwcFreeStringList [] (3)  - convert text lists and text property structures
+XwcLookupString []   (3)  - obtain composed input from an input method
+XwcResetIC []        (3)  - reset the state of an input context
+XwcTextEscapement [] (3)  - obtain the escapement of text
+XwcTextExtents []    (3)  - compute text extents
+XwcTextListToTextProperty [] (3)  - convert text lists and text property structures
+XwcTextPerCharExtents [] (3)  - obtain per-character information for a text string
+XwcTextPropertyToTextList [] (3)  - convert text lists and text property structures
+[ []                 (1)  - bash built-in commands, see bash(1)
+[0 []                (3)  - 1)) && ! e.quit?) p e d.refresh end
+[5 []                (3)  - 1)) && ! e.quit?) p e d.refresh end
+_Exit []             (2)  - terminate the calling process
+_TIFFfree []         (3)  - memory management-related functions for use with TIFF files
+_TIFFmalloc []       (3)  - memory management-related functions for use with TIFF files
+_TIFFmemcmp, []      (3)  - memory management-related functions for use with TIFF files
+_TIFFmemcpy []       (3)  - memory management-related functions for use with TIFF files
+_TIFFmemset []       (3)  - memory management-related functions for use with TIFF files
+_TIFFrealloc []      (3)  - memory management-related functions for use with TIFF files
+__after_morecore_hook [] (3)  - malloc debugging variables
+__flbf []            (3)  - interfaces to stdio FILE structure
+__fpending []        (3)  - interfaces to stdio FILE structure
+__fpurge []          (3)  - interfaces to stdio FILE structure
+__freadable []       (3)  - interfaces to stdio FILE structure
+__freading []        (3)  - interfaces to stdio FILE structure
+__free_hook []       (3)  - malloc debugging variables
+__fsetlocking []     (3)  - interfaces to stdio FILE structure
+__fwritable []       (3)  - interfaces to stdio FILE structure
+__fwriting []        (3)  - interfaces to stdio FILE structure
+__malloc_initialize_hook [] (3)  - malloc debugging variables
+__memalign_hook []   (3)  - malloc debugging variables
+__realloc_hook []    (3)  - malloc debugging variables
+_clone2 []           (2)  - create a child process
+_exit []             (2)  - terminate the calling process
+_fbufsize []         (3)  - interfaces to stdio FILE structure
+_flushlbf []         (3)  - interfaces to stdio FILE structure
+_fpurge []           (3)  - purge a stream
+_llseek []           (2)  - reposition read/write file offset
+_malloc_hook []      (3)  - malloc debugging variables
+_nc_freeall _nc_free_and_exit [] (3)  - curses memory-leak checking
+_nc_tracebits []     (3)  - curses debugging routines
+_setfpucw []         (3)  - set FPU control word on i386 architecture (obsolete)
+_syscall []          (2)  - invoking a system call without library support (OBSOLETE)
+_traceattr []        (3)  - curses debugging routines
+_traceattr2 []       (3)  - curses debugging routines
+_tracechar []        (3)  - curses debugging routines
+_tracechtype []      (3)  - curses debugging routines
+_tracechtype2 []     (3)  - curses debugging routines
+_tracedump []        (3)  - curses debugging routines
+_tracef []           (3)  - curses debugging routines
+_tracemouse []       (3)  - curses debugging routines
+a2p []               (1)  - Awk to Perl translator
+a2ps []              (1)  - format files for printing on a PostScript printer
+a2x []               (1)  - convert Asciidoc text file to PDF, XHTML, HTML Help, manpage or plain text
+a64l []              (3)  - convert between long and base-64
+aa_attrs []          (3)  - returns pointer to the text output buffer used by AA-lib
+aa_autoinit []       (3)  - easy to use AA-lib initialization function
+aa_autoinitkbd []    (3)  - easy to use AA-lib keyboard initialization function
+aa_autoinitmouse []  (3)  - easy to use AA-lib mouse initialization function
+aa_close []          (3)  - close the AA-lib context
+aa_createedit []     (3)  - Simple interactive line editor provided as helper function
+aa_currentfont []    (3)  - returns specification of the fonts used by AA-lib rendering routines
+aa_defparams []      (3)  - default hardware paramters requested by AA-lib programs
+aa_defrenderparams [] (3)  - default rendering parameters
+aa_displayrecommended [] (3)  - List of recommended drivers
+aa_dithernames []    (3)  - Names of dithering methods supported by AA-lib
+aa_drivers []        (3)  - NULL-terminated array of output drivers available in AA-lib
+aa_edit []           (3)  - Simple interactive line editor
+aa_editkey []        (3)  - Notify the line editor about keypress
+aa_fastrender []     (3)  - simple and fast AA-lib rendering function
+aa_fonts []          (3)  - Null-terminated array of available fonts
+aa_formats []        (3)  - NULL terminated array of save formats supported by AA-lib
+aa_getevent []       (3)  - keyboard functions
+aa_getkey []         (3)  - return next keypress event from queue
+aa_getmouse []       (3)  - Get mouse position as specified by last mouse event read by aa_getevent
+aa_gotoxy []         (3)  - move the hardware cursor (if any) to specified position
+aa_help []           (3)  - AA-lib help string for the default command line parser
+aa_hidecursor []     (3)  - hide the hardware cursor
+aa_hidemouse []      (3)  - hide the mouse cursor
+aa_image []          (3)  - returns pointer to the framebuffer emulated by AA-lib
+aa_imgheight []      (3)  - returns height of the emulated image in pixels
+aa_imgwidth []       (3)  - returns width of the emulated image in pixels
+aa_init []           (3)  - open the output display for AA-lib
+aa_initkbd []        (3)  - initialize the AA-lib keyboard driver
+aa_initmouse []      (3)  - initialize the AA-lib mouse driver
+aa_kbddrivers []     (3)  - NULL-terminated array of keyboard drivers available in AA_lib
+aa_kbdrecommended [] (3)  - List of recommended drivers
+aa_mmheight []       (3)  - returns height of the output screen in millimeters
+aa_mmwidth []        (3)  - returns width of the output screen in millimeters
+aa_mousedrivers []   (3)  - NULL terminated array of mouse drivers supported by AA-lib
+aa_mouserecommended [] (3)  - List of recommended drivers
+aa_parseoptions []   (3)  - parse the standard command line options used by AA-lib
+aa_printf []         (3)  - print text to AA-lib output buffers
+aa_putpixel []       (3)  - put pixel to emulated framebuffer
+aa_puts []           (3)  - output string to AA-lib output buffers
+aa_recommendhi []    (3)  - insert the given driver on beggining of the list of recommended drivers
+aa_recommendhidisplay [] (3)  - insert the given driver on beggining of the list of recommended display drivers
+aa_recommendhikbd [] (3)  - insert the given driver on beggining of the list of recommended keyboard drivers
+aa_recommendhimouse [] (3)  - insert the given driver on beggining of the list of recommended mouse drivers
+aa_recommendlow []   (3)  - Add the given driver to the end of list of recommended drivers
+aa_recommendlowdisplay [] (3)  - Add the given driver to the end of list of display recommended drivers
+aa_recommendlowkbd [] (3)  - Add the given driver to the end of list of keyboard recommended drivers
+aa_recommendlowmouse [] (3)  - Add the given driver to the end of list of mouse recommended drivers
+aa_registerfont []   (3)  - add new font specification to aa_fonts array
+aa_render []         (3)  - convert image buffer to ASCII-art
+aa_resize []         (3)  - resize functions
+aa_resizehandler []  (3)  - Set user handler to be called on resize event
+aa_scrheight []      (3)  - returns height of the output screen in characters
+aa_scrwidth []       (3)  - returns width of the output screen in characters
+aa_setfont []        (3)  - set font specification to be used by rendering functions
+aa_setsupported []   (3)  - alter the supported field of hardware_params structure used by AA-lib
+aa_showcursor []     (3)  - show the hardware cursor
+aa_showmouse []      (3)  - show the mouse cursor
+aa_text []           (3)  - returns pointer to the text output buffer used by AA-lib
+aa_uninitkbd []      (3)  - uninitialize the keyboard driver
+aa_uninitmouse []    (3)  - uninitialize the mouse driver
+aafire []            (1)  - aalib example programs
+aainfo []            (1)  - aalib example programs
+aasavefont []        (1)  - aalib example programs
+aatest []            (1)  - aalib example programs
+aaxine []            (1)  - an ASCII art video player
+ab []                (8)  - Apache HTTP server benchmarking tool
+abbrev []            (3)  - create an abbreviation table from a list
+abort []             (3)  - cause abnormal process termination
+abs []               (3)  - compute the absolute value of an integer
+abstractile []       (6)  - draw abstract mosaic patterns of interlocking tiles
+abxtest []           (1)  - double-blind ABX comparison testing script
+ac []                (1)  - print statistics about users' connect time
+accel []             (6)  - tests the new style svgalib accelerator interface
+accept []            (2)  - accept a connection on a socket
+accept/reject []     (8)  - accept/reject jobs sent to a destination
+access []            (2)  - check real user's permissions for a file
+acct []              (2)  - switch process accounting on or off
+acct []              (5)  - process accounting file
+accton []            (8)  - turns process accounting on or off
+acecad []            (4)  - Acecad Flair input driver
+achfile []           (1)  - change type and/or creator of Apple Macintosh files (netatalk format)
+acl []               (5)  - Access Control Lists
+acl_add_perm []      (3)  - add a permission to an ACL permission set
+acl_calc_mask []     (3)  - calculate the file group class mask
+acl_check []         (3)  - check an ACL for validity
+acl_clear_perms []   (3)  - clear all permissions from an ACL permission set
+acl_cmp []           (3)  - compare two ACLs
+acl_copy_entry []    (3)  - copy an ACL entry
+acl_copy_ext []      (3)  - copy an ACL from internal to external representation
+acl_copy_int []      (3)  - copy an ACL from external to internal representation
+acl_create_entry []  (3)  - create a new ACL entry
+acl_delete_def_file [] (3)  - delete a default ACL by filename
+acl_delete_entry []  (3)  - delete an ACL entry
+acl_delete_perm []   (3)  - delete a permission from an ACL permission set
+acl_dup []           (3)  - duplicate an ACL
+acl_entries []       (3)  - return the number of entries in an ACL
+acl_equiv_mode []    (3)  - check for an equivalent ACL
+acl_error []         (3)  - convert an ACL error code to a text message
+acl_extended_fd []   (3)  - test for information in the ACL by file descriptor
+acl_extended_file [] (3)  - test for information in ACLs by file name
+acl_free []          (3)  - release memory allocated to an ACL data object
+acl_from_mode []     (3)  - create an ACL from file permission bits
+acl_from_text []     (3)  - create an ACL from text
+acl_get_entry []     (3)  - get an ACL entry
+acl_get_fd []        (3)  - get an ACL by file descriptor
+acl_get_file []      (3)  - get an ACL by filename
+acl_get_perm []      (3)  - test for a permission in an ACL permission set
+acl_get_permset []   (3)  - retrieve the permission set from an ACL entry
+acl_get_qualifier [] (3)  - retrieve the qualifier from an ACL entry
+acl_get_tag_type []  (3)  - get the tag type of an ACL entry
+acl_init []          (3)  - initialize ACL working storage
+acl_set_fd []        (3)  - set an ACL by file descriptor
+acl_set_file []      (3)  - set an ACL by filename
+acl_set_permset []   (3)  - set the permission set in an ACL entry
+acl_set_qualifier [] (3)  - set the qualifier of an ACL entry
+acl_set_tag_type []  (3)  - set the tag type of an ACL entry
+acl_size []          (3)  - get the size of the external representation of an ACL
+acl_to_any_text []   (3)  - convert an ACL to text
+acl_to_text []       (3)  - convert an ACL to text
+acl_valid []         (3)  - validate an ACL
+acleandir []         (1)  - clean up a directory containing netatalk Apple Macintosh files
+aconnect []          (1)  - ALSA sequencer connection manager
+acos []              (3)  - arc cosine function
+acosf []             (3)  - arc cosine function
+acosh []             (3)  - inverse hyperbolic cosine function
+acoshf []            (3)  - inverse hyperbolic cosine function
+acoshl []            (3)  - inverse hyperbolic cosine function
+acosl []             (3)  - arc cosine function
+acpi_listen []       (8)  - ACPI event listener
+acpid []             (8)  - Advanced Configuration and Power Interface event daemon
+add_mibdir []        (3)  - mib_api functions
+add_module_replacement [] (3)  - mib_api functions
+add_wch []           (3)  - add a complex character and rendition to a curses window, then advance the cursor
+add_wchnstr []       (3)  - add an array of complex characters (and attributes) to a curses window
+add_wchstr []        (3)  - add an array of complex characters (and attributes) to a curses window
+addch []             (3)  - add a character (with attributes) to a curses window, then advance the cursor
+addchnstr []         (3)  - add a string of characters (and attributes) to a curses window
+addchstr []          (3)  - add a string of characters (and attributes) to a curses window
+adddebug []          (1)  - Modifies Makefile(s) to add debug info
+addftinfo []         (1)  - add information to troff font files for use with groff
+addgnupghome []      (8)  - Create .gnupg home directories
+addmntent []         (3)  - get file system descriptor file entry
+addnstr []           (3)  - add a string of characters to a curses window and advance cursor
+addnwstr []          (3)  - add a string of wide characters to a curses window and advance cursor
+addr2line []         (1)  - convert addresses into file names and line numbers
+addseverity []       (3)  - introduce new severity classes
+addstr []            (3)  - add a string of characters to a curses window and advance cursor
+addwstr []           (3)  - add a string of wide characters to a curses window and advance cursor
+adjtime []           (3)  - correct the time to synchronize the system clock
+adjtimex []          (2)  - tune kernel clock
+adjtimex []          (8)  - display or set the kernel time variables
+adventure []         (6)  - an exploration game
+aecho []             (1)  - send AppleTalk Echo Protocol packets to network hosts
+afile []             (1)  - display type and creator of Apple Macintosh files (netatalk format)
+afmtodit []          (1)  - create font files for use with groff -Tps
+afpd []              (8)  - AppleTalk Filing Protocol daemon
+afpd.conf []         (5)  - Configuration file used by afpd(8) to determine the setup of its file sharing services
+afppasswd []         (1)  - netatalk password maintenance utility
+afs_syscall []       (2)  - unimplemented system calls
+after []             (n)  - Execute a command after a time delay
+agetty []            (8)  - alternative Linux getty
+aio_cancel []        (3)  - cancel an outstanding asynchronous I/O request
+aio_error []         (3)  - get error status of asynchronous I/O operation
+aio_fsync []         (3)  - asynchronous file synchronization
+aio_read []          (3)  - asynchronous read
+aio_return []        (3)  - get return status of asynchronous I/O operation
+aio_suspend []       (3)  - wait for asynchronous I/O operation or timeout
+aio_write []         (3)  - asynchronous write
+aiptek []            (4)  - Aiptek USB Digital Tablet Input Driver for Linux
+alarm []             (2)  - set an alarm clock for delivery of a signal
+alias []             (1)  - bash built-in commands, see bash(1)
+aliases []           (5)  - aliases file for sendmail
+alloc_hugepages []   (2)  - allocate or free huge pages
+alloca []            (3)  - allocate memory that is automatically freed
+alphasort []         (3)  - scan a directory for matching entries
+alpine []            (1)  - an Alternatively Licensed Program for Internet News and Email
+alsaconf []          (8)  - configuration tool for the Advanced Linux Sound Architecture
+alsactl []           (1)  - advanced controls for ALSA soundcard driver
+alsactl init []      (7)  - alsa control management - initialization
+alsamixer []         (1)  - soundcard mixer for ALSA soundcard driver, with ncurses interface
+amidi []             (1)  - read from and write to ALSA RawMIDI ports
+amixer []            (1)  - command-line mixer for ALSA soundcard driver
+amor []              (6)  - A KDE creature for your desktop
+amp []               (1)  - decompress and play MPEG audio files
+and Esc become exit keys moduleCaca class Event::Key def quit? end end end while((e= d.get_event(Caca::Event, [] (3)  - 1)) && ! e.quit?) p e d.refresh end
+anemone []           (6)  - wiggling tentacles
+anemotaxis []        (6)  - directional search on a plane
+animate []           (1)  - animates an image or image sequence on any X server
+answer []            (1)  - phone message transcription system
+antinspect []        (6)  - ant model inspection screenhack
+antmaze []           (6)  - ant maze walker
+antspotlight []      (6)  - ant spotlight screenhack
+any2djvu []          (1)  - Convert .ps/.ps.gz/.pdf to .djvu
+anytopnm []          (1)  - convert an arbitrary type of image file to PBM, PGM, or PPM
+aoss []              (1)  - Wrapper script to facilitate use of the ALSA OSS compatibility library
+apachectl []         (8)  - Apache HTTP Server Control Interface
+aplay []             (1)  - command-line sound recorder and player for ALSA soundcard driver
+aplaymidi []         (1)  - play Standard MIDI Files
+apm []               (1)  - interface with the APM subsystem
+apm []               (4)  - Alliance ProMotion video driver
+apmd []              (8)  - Advanced Power Management (APM) daemon
+apmsleep []          (1)  - go into suspend or standby mode and wake-up later
+apollonian []        (6)  - Descartes Circle Theorem
+append []            (n)  - Append to variable
+apple2 []            (6)  - Apple ][ display emulator
+apple_cp []          (1)  - Do an apple copy, copying file metadata and the resource fork as well
+apple_mv []          (1)  - Do an apple move, moving metadata and the resource fork as well
+apple_rm []          (1)  - Do an apple remove, remove metadata and resource fork as well
+apply []             (n)  - Apply an anonymous function
+applygnupgdefaults [] (8)  - Run gpgconf --apply-defaults for all users
+appres []            (1)  - list X application resource database
+apropos []           (1)  - search the whatis database for strings
+apxs []              (8)  - APache eXtenSion tool
+ar []                (1)  - create, modify, and extract from archives
+arch []              (1)  - print machine architecture
+arch_prctl []        (2)  - set architecture-specific thread state
+archive_clear_error [] (3)  - libarchive utility functions
+archive_compression [] (3)  - libarchive utility functions
+archive_compression_name [] (3)  - libarchive utility functions
+archive_copy_error [] (3)  - libarchive utility functions
+archive_entry_acl_add_entry [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_acl_add_entry_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_acl_clear [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_acl_count [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_acl_next [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_acl_next_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_acl_reset [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_acl_text_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_atime [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_atime_nsec [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_clear [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_clone [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_fflags_text [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_fflags_text_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_gname [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_gname_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_hardlink [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_hardlink_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_link [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_link_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_pathname_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_sourcepath [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_stat [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_symlink [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_symlink_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_uname [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_copy_uname_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_dev [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_devmajor [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_devminor [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_fflags [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_fflags_text [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_filetype [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_free [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_gid [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_gname [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_hardlink [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_ino [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_mode [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_mtime [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_mtime_nsec [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_new [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_nlink [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_pathname [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_pathname_w [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_rdev [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_rdevmajor [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_rdevminor [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_atime [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_ctime [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_dev [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_devmajor [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_devminor [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_fflags [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_filetype [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_gid [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_gname [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_hardlink [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_link [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_mode [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_mtime [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_pathname [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_rdevmajor [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_rdevminor [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_size [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_symlink [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_uid [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_set_uname [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_size [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_sourcepath [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_stat [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_symlink [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_uid [] (3)  - functions for manipulating archive entry descriptions
+archive_entry_uname [] (3)  - functions for manipulating archive entry descriptions
+archive_errno []     (3)  - libarchive utility functions
+archive_error_string [] (3)  - libarchive utility functions
+archive_format []    (3)  - libarchive utility functions
+archive_format_name [] (3)  - libarchive utility functions
+archive_read_close [] (3)  - functions for reading streaming archives
+archive_read_data [] (3)  - functions for reading streaming archives
+archive_read_data_block [] (3)  - functions for reading streaming archives
+archive_read_data_into_buffer [] (3)  - functions for reading streaming archives
+archive_read_data_into_fd [] (3)  - functions for reading streaming archives
+archive_read_data_skip [] (3)  - functions for reading streaming archives
+archive_read_extract [] (3)  - functions for reading streaming archives
+archive_read_extract2 [] (3)  - functions for reading streaming archives
+archive_read_extract_set_progress_callback [] (3)  - functions for reading streaming archives
+archive_read_finish [] (3)  - functions for reading streaming archives
+archive_read_new []  (3)  - functions for reading streaming archives
+archive_read_next_header [] (3)  - functions for reading streaming archives
+archive_read_open [] (3)  - functions for reading streaming archives
+archive_read_open2 [] (3)  - functions for reading streaming archives
+archive_read_open_FILE [] (3)  - functions for reading streaming archives
+archive_read_open_fd [] (3)  - functions for reading streaming archives
+archive_read_open_filename [] (3)  - functions for reading streaming archives
+archive_read_open_memory [] (3)  - functions for reading streaming archives
+archive_read_support_compression_all [] (3)  - functions for reading streaming archives
+archive_read_support_compression_bzip2 [] (3)  - functions for reading streaming archives
+archive_read_support_compression_compress [] (3)  - functions for reading streaming archives
+archive_read_support_compression_gzip [] (3)  - functions for reading streaming archives
+archive_read_support_compression_none [] (3)  - functions for reading streaming archives
+archive_read_support_compression_program [] (3)  - functions for reading streaming archives
+archive_read_support_format_all [] (3)  - functions for reading streaming archives
+archive_read_support_format_cpio [] (3)  - functions for reading streaming archives
+archive_read_support_format_empty [] (3)  - functions for reading streaming archives
+archive_read_support_format_iso9660 [] (3)  - functions for reading streaming archives
+archive_read_support_format_tar [] (3)  - functions for reading streaming archives
+archive_read_support_format_zip [] (3)  - functions for reading streaming archives
+archive_set_error [] (3)  - libarchive utility functions
+archive_write_close [] (3)  - functions for creating archives
+archive_write_close [] (3)  - functions for creating objects on disk
+archive_write_data [] (3)  - functions for creating archives
+archive_write_data [] (3)  - functions for creating objects on disk
+archive_write_disk_new [] (3)  - functions for creating objects on disk
+archive_write_disk_set_group_lookup [] (3)  - functions for creating objects on disk
+archive_write_disk_set_options [] (3)  - functions for creating objects on disk
+archive_write_disk_set_skip_file [] (3)  - functions for creating objects on disk
+archive_write_disk_set_standard_lookup [] (3)  - functions for creating objects on disk
+archive_write_disk_set_user_lookup [] (3)  - functions for creating objects on disk
+archive_write_finish [] (3)  - functions for creating archives
+archive_write_finish [] (3)  - functions for creating objects on disk
+archive_write_finish_entry [] (3)  - functions for creating archives
+archive_write_finish_entry [] (3)  - functions for creating objects on disk
+archive_write_get_bytes_per_block [] (3)  - functions for creating archives
+archive_write_header [] (3)  - functions for creating archives
+archive_write_header [] (3)  - functions for creating objects on disk
+archive_write_new [] (3)  - functions for creating archives
+archive_write_open [] (3)  - functions for creating archives
+archive_write_open_FILE [] (3)  - functions for creating archives
+archive_write_open_fd [] (3)  - functions for creating archives
+archive_write_open_filename [] (3)  - functions for creating archives
+archive_write_open_memory [] (3)  - functions for creating archives
+archive_write_set_bytes_in_last_block [] (3)  - functions for creating archives
+archive_write_set_bytes_per_block [] (3)  - functions for creating archives
+archive_write_set_compression_bzip2 [] (3)  - functions for creating archives
+archive_write_set_compression_compress [] (3)  - functions for creating archives
+archive_write_set_compression_gzip [] (3)  - functions for creating archives
+archive_write_set_compression_none [] (3)  - functions for creating archives
+archive_write_set_compression_program [] (3)  - functions for creating archives
+archive_write_set_format_cpio [] (3)  - functions for creating archives
+archive_write_set_format_pax [] (3)  - functions for creating archives
+archive_write_set_format_pax_restricted [] (3)  - functions for creating archives
+archive_write_set_format_shar [] (3)  - functions for creating archives
+archive_write_set_format_shar_binary [] (3)  - functions for creating archives
+archive_write_set_format_ustar [] (3)  - functions for creating archives
+arecord []           (1)  - command-line sound recorder and player for ALSA soundcard driver
+arecordmidi []       (1)  - record Standard MIDI Files
+argz_add []          (3)  - functions to handle an argz list
+argz_add_sep []      (3)  - functions to handle an argz list
+argz_append []       (3)  - functions to handle an argz list
+argz_count []        (3)  - functions to handle an argz list
+argz_create []       (3)  - functions to handle an argz list
+argz_create_sep []   (3)  - functions to handle an argz list
+argz_delete []       (3)  - functions to handle an argz list
+argz_extract []      (3)  - functions to handle an argz list
+argz_insert []       (3)  - functions to handle an argz list
+argz_next []         (3)  - functions to handle an argz list
+argz_replace []      (3)  - functions to handle an argz list
+argz_stringify []    (3)  - functions to handle an argz list
+arithmetic []        (6)  - quiz on simple arithmetic
+ark []               (1)  - A KDE archiving tool
+armscii []           (7)  - 8 - Armenian Character Set encoded in octal, decimal, and hexadecimal
+arp []               (7)  - Linux ARP kernel module
+arp []               (8)  - manipulate the system ARP cache
+arpd []              (8)  - userspace arp daemon
+arping []            (8)  - send ARP REQUEST to a neighbour host
+array []             (n)  - Manipulate array variables
+as86 []              (1)  - Assembler for 8086..80386 processors
+ascii []             (1)  - xfr - upload/download files using the ASCII protocol
+ascii []             (7)  - the ASCII character set encoded in octal, decimal, and hexadecimal
+asciidoc []          (1)  - converts an AsciiDoc text file to HTML or DocBook
+asciitopgm []        (1)  - convert ASCII graphics into a portable graymap
+asctime []           (3)  - transform date and time to broken-down time or ASCII
+asctime_r []         (3)  - transform date and time to broken-down time or ASCII
+aseqdump []          (1)  - show the events received at an ALSA sequencer port
+aseqnet []           (1)  - ALSA sequencer connectors over network
+asin []              (3)  - arc sine function
+asinf []             (3)  - arc sine function
+asinh []             (3)  - inverse hyperbolic sine function
+asinhf []            (3)  - inverse hyperbolic sine function
+asinhl []            (3)  - inverse hyperbolic sine function
+asinl []             (3)  - arc sine function
+asip []              (1)  - status.pl - Queries AFP servers for their capabilities
+asn1parse []         (1)  - ASN.1 parsing tool
+aspell []            (1)  - import - import old personal dictionaries into GNU Aspell
+aspell []            (1)  - interactive spell checker
+asprintf []          (3)  - print to allocated string
+assert []            (3)  - abort the program if assertion is false
+assert_perror []     (3)  - test errnum and abort
+assume_default_colors [] (3)  - use terminal's default colors
+at []                (1)  - queue, examine or delete jobs for later execution
+at.allow []          (5)  - determine who can submit jobs via at or batch
+at.deny []           (5)  - determine who can submit jobs via at or batch
+ata_id []            (8)  - udev callout to read product/serial number from ATA drives
+atalk []             (4)  - AppleTalk protocol family
+atalk_aton []        (3)  - AppleTalk address parsing
+atalkd []            (8)  - AppleTalk RTMP, NBP, ZIP, and AEP manager
+atalkd.conf []       (5)  - Configuration file used by atalkd(8) to determine the interfaces used by the master Netatalk daemon
+atan []              (3)  - arc tangent function
+atan2 []             (3)  - arc tangent function of two variables
+atan2f []            (3)  - arc tangent function of two variables
+atan2l []            (3)  - arc tangent function of two variables
+atanf []             (3)  - arc tangent function
+atanh []             (3)  - inverse hyperbolic tangent function
+atanhf []            (3)  - inverse hyperbolic tangent function
+atanhl []            (3)  - inverse hyperbolic tangent function
+atanl []             (3)  - arc tangent function
+atc []               (6)  - air traffic controller game
+atd []               (8)  - run jobs queued for later execution
+atexit []            (3)  - register a function to be called at normal process termination
+atktopbm []          (1)  - convert Andrew Toolkit raster object to portable bitmap
+atlantis []          (6)  - draw swimming sharks, whales, and dolphins
+atobm []             (1)  - bitmap editor and converter utilities for the X Window System
+atof []              (3)  - convert a string to a double
+atoi []              (3)  - convert a string to an integer
+atol []              (3)  - convert a string to an integer
+atoll []             (3)  - convert a string to an integer
+atoq []              (3)  - convert a string to an integer
+atq []               (1)  - queue, examine or delete jobs for later execution
+atrm []              (1)  - queue, examine or delete jobs for later execution
+atrun []             (8)  - run jobs queued for later execution
+attemptckalloc []    (3)  - allocate or free heap memory
+attemptckrealloc []  (3)  - allocate or free heap memory
+attr []              (1)  - extended attributes on XFS filesystem objects
+attr []              (5)  - Extended attributes
+attr_get []          (3)  - curses character and window attribute control routines
+attr_get []          (3)  - get the value of a user attribute of a filesystem object
+attr_getf []         (3)  - get the value of a user attribute of a filesystem object
+attr_list []         (3)  - list the names of the user attributes of a filesystem object
+attr_list_by_handle [] (3)  - file handle operations
+attr_listf []        (3)  - list the names of the user attributes of a filesystem object
+attr_multi []        (3)  - manipulate multiple user attributes on a filesystem object at once
+attr_multi_by_handle [] (3)  - file handle operations
+attr_multif []       (3)  - manipulate multiple user attributes on a filesystem object at once
+attr_off []          (3)  - curses character and window attribute control routines
+attr_on []           (3)  - curses character and window attribute control routines
+attr_remove []       (3)  - remove a user attribute of a filesystem object
+attr_removef []      (3)  - remove a user attribute of a filesystem object
+attr_set []          (3)  - curses character and window attribute control routines
+attr_set []          (3)  - set the value of a user attribute of a filesystem object
+attr_setf []         (3)  - set the value of a user attribute of a filesystem object
+attraction []        (6)  - interactions of opposing forces
+attributes []        (3)  - get/set subroutine or variable attributes
+attroff []           (3)  - curses character and window attribute control routines
+attron []            (3)  - curses character and window attribute control routines
+attrs []             (3)  - set/get attributes of a subroutine (deprecated)
+attrset []           (3)  - curses character and window attribute control routines
+atunnel []           (6)  - hypnotic GL tunnel journey
+audiocompose []      (1)  - Compose an audio fragment for inclusion in a mail message
+audiosend []         (1)  - Send an audio email message
+audtool []           (1)  - a small tool to modify behavior of a running audacious instance
+aumix []             (1)  - adjust audio mixer
+auto_execok []       (n)  - standard library of Tcl procedures
+auto_import []       (n)  - standard library of Tcl procedures
+auto_load []         (n)  - standard library of Tcl procedures
+auto_mkindex []      (n)  - standard library of Tcl procedures
+auto_mkindex_old []  (n)  - standard library of Tcl procedures
+auto_qualify []      (n)  - standard library of Tcl procedures
+auto_reset []        (n)  - standard library of Tcl procedures
+autoconf []          (1)  - Generate configuration scripts
+autoexpect []        (1)  - generate an Expect script from watching a session
+autofs []            (5)  - Format of the automounter maps
+autoheader []        (1)  - Create a template header for configure
+autom4te []          (1)  - Generate files and scripts thanks to M4
+automount []         (8)  - configure mount points for autofs
+autopoint []         (1)  - copies standard gettext infrastructure
+autoreconf []        (1)  - Update generated configuration files
+autoscan []          (1)  - Generate a preliminary configure.in
+autoupdate []        (1)  - Update a configure.in to a newer Autoconf
+autouse []           (3)  - postpone load of modules until a function is used
+avcall []            (3)  - build a C argument list incrementally and call a C function on it
+baby_steps []        (3)  - Calls your handler in baby_steps for set processing
+backend []           (7)  - cups backend transmission interfaces
+backend []           (7)  - spec - interface between jw and its backends
+backgammon []        (6)  - the game of backgammon
+backtrace []         (3)  - support for application self - debugging
+backtrace_symbols [] (3)  - support for application self - debugging
+backtrace_symbols_fd [] (3)  - support for application self - debugging
+badblocks []         (8)  - search a device for bad blocks
+banner []            (6)  - print large banner on printer
+barcode []           (6)  - draws a random sequence of barcodes for the products you enjoy
+base []              (3)  - Establish an ISA relationship with base classes at compile time
+base64 []            (1)  - base64 encode/decode data and print to standard output
+basename []          (1)  - strip directory and suffix from filenames
+basename []          (3)  - parse pathname components
+bash []              (1)  - GNU Bourne-Again SHell
+bash []              (1)  - bash built-in commands, see bash(1)
+batch []             (1)  - queue, examine or delete jobs for later execution
+battlestar []        (6)  - a tropical adventure game
+baudrate []          (3)  - curses environment query routines
+bbkeys []            (1)  - a general XWindow keygrabber
+bbkeys.bb []         (5)  - bbkeys style configuration file
+bbkeysrc []          (5)  - bbkeys keymap configuration file
+bc []                (1)  - An arbitrary precision calculator language
+bcc []               (1)  - Bruce's C compiler
+bccmd []             (8)  - Utility for the CSR BCCMD interface
+bcd []               (6)  - reformat input as punch cards, paper tape or morse code
+bcmp []              (3)  - byte string operations
+bcmp []              (3)  - compare byte sequences
+bcopy []             (3)  - byte string operations
+bcopy []             (3)  - copy byte sequence
+bdflush []           (2)  - start, flush, or tune buffer-dirty-flush daemon
+bdftopcf []          (1)  - convert X font from Bitmap Distribution Format to Portable Compiled Format
+bdftruncate []       (1)  - generate truncated BDF font from ISO 10646-1-encoded BDF font
+be16toh []           (3)  - convert values between host and big - /little-endian byte order
+be32toh []           (3)  - convert values between host and big - /little-endian byte order
+be64toh []           (3)  - convert values between host and big - /little-endian byte order
+beep []              (3)  - curses bell and screen flash routines
+beforelight []       (1)  - screen saver
+bell []              (n)  - Ring a display's bell
+ber_alloc_t []       (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_bvarray_add []   (3)  - LBER types and allocation functions
+ber_bvarray_free []  (3)  - LBER types and allocation functions
+ber_bvdup []         (3)  - LBER types and allocation functions
+ber_bvecadd []       (3)  - LBER types and allocation functions
+ber_bvecfree []      (3)  - LBER types and allocation functions
+ber_bvfree []        (3)  - LBER types and allocation functions
+ber_bvstr []         (3)  - LBER types and allocation functions
+ber_bvstrdup []      (3)  - LBER types and allocation functions
+ber_dupbv []         (3)  - LBER types and allocation functions
+ber_first_element [] (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_flush []         (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_free []          (3)  - LBER types and allocation functions
+ber_get_bitstring [] (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_get_boolean []   (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_get_enum []      (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_get_int []       (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_get_next []      (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_get_null []      (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_get_stringa []   (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_get_stringal []  (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_get_stringb []   (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_get_stringbv []  (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_int_t []         (3)  - LBER types and allocation functions
+ber_len_t []         (3)  - LBER types and allocation functions
+ber_memalloc []      (3)  - LBER memory allocators
+ber_memcalloc []     (3)  - LBER memory allocators
+ber_memfree []       (3)  - LBER memory allocators
+ber_memrealloc []    (3)  - LBER memory allocators
+ber_memvfree []      (3)  - LBER memory allocators
+ber_next_element []  (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_peek_tag []      (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_printf []        (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_put_bitstring [] (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_put_boolean []   (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_put_enum []      (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_put_int []       (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_put_null []      (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_put_ostring []   (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_put_seq []       (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_put_set []       (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_put_string []    (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_scanf []         (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_skip_tag []      (3)  - LBER simplified Basic Encoding Rules library routines for decoding
+ber_slen_t []        (3)  - LBER types and allocation functions
+ber_start_seq []     (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_start_set []     (3)  - LBER simplified Basic Encoding Rules library routines for encoding
+ber_str2bv []        (3)  - LBER types and allocation functions
+ber_tag_t []         (3)  - LBER types and allocation functions
+ber_uint_t []        (3)  - LBER types and allocation functions
+bg []                (1)  - bash built-in commands, see bash(1)
+bg_test []           (6)  - test the background mode of svgalib
+bgerror []           (n)  - Command invoked to process background errors
+bggen []             (1)  - generates colored backgrounds on X11 displays
+biff []              (1)  - be notified if mail arrives and who it is from
+bigint []            (3)  - Transparent BigInteger support for Perl
+bignum []            (3)  - Transparent BigNumber support for Perl
+bigrat []            (3)  - Transparent BigNumber/BigRational support for Perl
+binary []            (n)  - Insert and extract fields from binary strings
+bind []              (1)  - bash built-in commands, see bash(1)
+bind []              (2)  - bind a name to a socket
+bind []              (n)  - Arrange for X events to invoke Tcl scripts
+bind_textdomain_codeset [] (3)  - set encoding of message translations
+bindresvport []      (3)  - bind a socket to a privileged IP port
+bindtags []          (n)  - Determine which bindings apply to a window, and order of evaluation
+bindtextdomain []    (3)  - set directory containing message catalogs
+bio []               (3)  - I/O abstraction
+bioradtopgm []       (1)  - convert a Biorad confocal file into a portable graymap
+biosdecode []        (8)  - BIOS information decoder
+bison []             (1)  - GNU Project parser generator (yacc replacement)
+bitmap []            (1)  - bitmap editor and converter utilities for the X Window System
+bitmap []            (n)  - Images that display two colors
+bkgd []              (3)  - curses window background manipulation routines
+bkgdset []           (3)  - curses window background manipulation routines
+bkgrnd []            (3)  - curses window complex background manipulation routines
+bkgrndset []         (3)  - curses window complex background manipulation routines
+blackbox []          (1)  - a window manager for X11
+blaster []           (6)  - simulation of space combat
+blib []              (3)  - Use MakeMaker's uninstalled version of a package
+blitspin []          (6)  - rotate a bitmap in an interesting way
+blkid []             (8)  - command-line utility to locate/print block device attributes
+blockdev []          (8)  - call block device ioctls from the command line
+blocktube []         (6)  - draws a swirling, falling tunnel of reflective slabs
+blowfish []          (3)  - Blowfish encryption
+bmp2tiff []          (1)  - create a TIFF file from a Microsoft Windows Device Independent Bitmap image file
+bmptopnm []          (1)  - convert a BMP file into a PBM, PGM, or PNM image
+bmtoa []             (1)  - bitmap editor and converter utilities for the X Window System
+bn []                (3)  - multiprecision integer arithmetics
+bn_add_words []      (3)  - BIGNUM library internal functions
+bn_check_top []      (3)  - BIGNUM library internal functions
+bn_cmp_words []      (3)  - BIGNUM library internal functions
+bn_div_words []      (3)  - BIGNUM library internal functions
+bn_dump []           (3)  - BIGNUM library internal functions
+bn_expand []         (3)  - BIGNUM library internal functions
+bn_expand2 []        (3)  - BIGNUM library internal functions
+bn_fix_top []        (3)  - BIGNUM library internal functions
+bn_mul_add_words []  (3)  - BIGNUM library internal functions
+bn_mul_comba4 []     (3)  - BIGNUM library internal functions
+bn_mul_comba8 []     (3)  - BIGNUM library internal functions
+bn_mul_high []       (3)  - BIGNUM library internal functions
+bn_mul_low_normal [] (3)  - BIGNUM library internal functions
+bn_mul_low_recursive [] (3)  - BIGNUM library internal functions
+bn_mul_normal []     (3)  - BIGNUM library internal functions
+bn_mul_part_recursive [] (3)  - BIGNUM library internal functions
+bn_mul_recursive []  (3)  - BIGNUM library internal functions
+bn_mul_words []      (3)  - BIGNUM library internal functions
+bn_print []          (3)  - BIGNUM library internal functions
+bn_set_high []       (3)  - BIGNUM library internal functions
+bn_set_low []        (3)  - BIGNUM library internal functions
+bn_set_max []        (3)  - BIGNUM library internal functions
+bn_sqr_comba4 []     (3)  - BIGNUM library internal functions
+bn_sqr_comba8 []     (3)  - BIGNUM library internal functions
+bn_sqr_normal []     (3)  - BIGNUM library internal functions
+bn_sqr_recursive []  (3)  - BIGNUM library internal functions
+bn_sqr_words []      (3)  - BIGNUM library internal functions
+bn_sub_words []      (3)  - BIGNUM library internal functions
+bn_wexpand []        (3)  - BIGNUM library internal functions
+boing []             (6)  - draws a bouncing ball like the ancient Amiga demo
+boot []              (7)  - scripts - General description of boot sequence
+bootlogd []          (8)  - record boot messages
+bootparam []         (7)  - Introduction to boot time parameters of the Linux kernel
+bootparamd []        (8)  - boot parameter server
+bootpd []            (8)  - Internet Boot Protocol server/gateway
+bootpef []           (8)  - BOOTP Extension File compiler
+bootpgw []           (8)  - Internet Boot Protocol server/gateway
+bootptab []          (5)  - Internet Bootstrap Protocol server database
+bootptest []         (8)  - send BOOTP queries and print responses
+border []            (3)  - create curses borders, horizontal and vertical lines
+border_set []        (3)  - create curses borders or lines using complex characters and renditions
+bouboule []          (6)  - draws spinning 3D blobs
+bouncingcow []       (6)  - a happy cow on a trampoline in 3D. Moo
+box []               (3)  - create curses borders, horizontal and vertical lines
+box_set []           (3)  - create curses borders or lines using complex characters and renditions
+boxed []             (6)  - draws a box full of 3D bouncing balls that explode
+boxfit []            (6)  - fills space with a gradient of growing boxes or circles
+bpe []               (1)  - examine and patch binary files
+braid []             (6)  - draws random color-cycling braids around a circle
+brctl []             (8)  - ethernet bridge administration
+break []             (1)  - bash built-in commands, see bash(1)
+break []             (2)  - unimplemented system calls
+break []             (n)  - Abort looping command
+brk []               (2)  - change data segment size
+brushtopbm []        (1)  - convert a doodle brush file into a portable bitmap
+bsd_signal []        (3)  - signal handling with BSD semantics
+bsearch []           (3)  - binary search of a sorted array
+bsetbg []            (1)  - utility to manipulate the appearance of the X11 desktop's root window
+bsetroot []          (1)  - blackbox utility to change root window appearance
+bsod []              (6)  - Blue Screen of Death emulator
+btcflash []          (1)  - Firmware flash utility for BTC DRW1008 DVD+/-RW recorder
+btowc []             (3)  - convert single byte to wide character
+btree []             (3)  - btree database access method
+bubble3d []          (6)  - 3d rising bubbles
+buildhash []         (1)  - Interactive spelling checking
+builtin []           (1)  - bash built-in commands, see bash(1)
+bulk_to_next []      (3)  - Convert GETBULK requests into GETNEXT requests for the handler
+bumps []             (6)  - move distorting spotlight around desktop
+bunzip2 []           (1)  - a block-sorting file compressor, v1.0.4
+button []            (n)  - Create and manipulate button widgets
+bytes []             (3)  - Perl pragma to force byte semantics rather than character semantics
+bzcat []             (1)  - decompresses files to stdout
+bzcmp []             (1)  - compare bzip2 compressed files
+bzdiff []            (1)  - compare bzip2 compressed files
+bzegrep []           (1)  - search possibly bzip2 compressed files for a regular expression
+bzero []             (3)  - byte string operations
+bzero []             (3)  - write zero-valued bytes
+bzfgrep []           (1)  - search possibly bzip2 compressed files for a regular expression
+bzgrep []            (1)  - search possibly bzip2 compressed files for a regular expression
+bzip2 []             (1)  - a block-sorting file compressor, v1.0.4
+bzip2recover []      (1)  - recovers data from damaged bzip2 files
+bzless []            (1)  - file perusal filter for crt viewing of bzip2 compressed text
+bzmore []            (1)  - file perusal filter for crt viewing of bzip2 compressed text
+bzz []               (1)  - DjVu general purpose compression utility
+c++filt []           (1)  - Demangle C++ and Java symbols
+c2ph []              (1)  - Dump C structures as generated from cc -g -S stabs
+c44 []               (1)  - DjVuPhoto encode
+ca []                (1)  - sample minimal CA application
+cabs []              (3)  - absolute value of a complex number
+cabsf []             (3)  - absolute value of a complex number
+cabsl []             (3)  - absolute value of a complex number
+caca []              (1)  - config - script to get information about the installed version of libcaca
+caca.h []            (3)  - The libcaca public header
+caca_event []        (3)  - Handling of user events
+cacademo []          (1)  - libcaca's demonstration applications
+cacafire []          (1)  - libcaca's demonstration applications
+cacaplay []          (1)  - play libcaca files
+cacaserver []        (1)  - telnet server for libcaca
+cacaview []          (1)  - ASCII image browser
+cache_handler []     (3)  - Maintains a cache of data for use by lower level handlers
+cacheflush []        (2)  - flush contents of instruction and/or data cache
+cacos []             (3)  - complex arc cosine
+cacosf []            (3)  - complex arc cosine
+cacosh []            (3)  - complex arc hyperbolic cosine
+cacoshf []           (3)  - complex arc hyperbolic cosine
+cacoshl []           (3)  - complex arc hyperbolic cosine
+cacosl []            (3)  - complex arc cosine
+caesar []            (6)  - decrypt caesar cyphers
+cage []              (6)  - Escher's impossible cage, for xscreensaver
+cal []               (1)  - displays a calendar
+callback []          (3)  - closures with variable arguments as first-class C functions
+calloc []            (3)  - Allocate and free dynamic memory
+cameratopam []       (1)  - see http://netpbm.sourceforge.net/doc/cameratopam.html
+can_change_color []  (3)  - curses color manipulation routines
+cancel []            (1)  - cancel jobs
+canfield []          (6)  - the solitaire card game canfield
+canonicalize_file_name [] (3)  - return the canonicalized filename
+canvas []            (n)  - Create and manipulate canvas widgets
+cap_clear []         (3)  - capability data object manipulation
+cap_clear_flag []    (3)  - capability data object manipulation
+cap_compare []       (3)  - capability data object manipulation
+cap_copy_ext []      (3)  - capability data object manipulation
+cap_copy_ext []      (3)  - capability state external representation translation
+cap_copy_int []      (3)  - capability data object manipulation
+cap_copy_int []      (3)  - capability state external representation translation
+cap_dup []           (3)  - capability data object manipulation
+cap_dup []           (3)  - capability data object storage management
+cap_free []          (3)  - capability data object manipulation
+cap_free []          (3)  - capability data object storage management
+cap_from_name []     (3)  - capability data object manipulation
+cap_from_name []     (3)  - capability state textual representation translation
+cap_from_text []     (3)  - capability data object manipulation
+cap_from_text []     (3)  - capability state textual representation translation
+cap_get_fd []        (3)  - capability data object manipulation
+cap_get_fd []        (3)  - capability manipulation on files
+cap_get_file []      (3)  - capability data object manipulation
+cap_get_file []      (3)  - capability manipulation on files
+cap_get_flag []      (3)  - capability data object manipulation
+cap_get_pid []       (3)  - capability data object manipulation
+cap_get_proc []      (3)  - capability data object manipulation
+cap_get_proc []      (3)  - capability manipulation on processes
+cap_init []          (3)  - capability data object storage management
+cap_set_fd []        (3)  - capability data object manipulation
+cap_set_fd []        (3)  - capability manipulation on files
+cap_set_file []      (3)  - capability data object manipulation
+cap_set_file []      (3)  - capability manipulation on files
+cap_set_flag []      (3)  - capability data object manipulation
+cap_set_proc []      (3)  - capability data object manipulation
+cap_set_proc []      (3)  - capability manipulation on processes
+cap_size []          (3)  - capability data object manipulation
+cap_size []          (3)  - capability state external representation translation
+cap_to_name []       (3)  - capability data object manipulation
+cap_to_name []       (3)  - capability state textual representation translation
+cap_to_text []       (3)  - capability data object manipulation
+cap_to_text []       (3)  - capability state textual representation translation
+capabilities []      (7)  - overview of Linux capabilities
+capget []            (2)  - set/get capabilities of thread(s)
+capgetp []           (3)  - capability manipulation on processes
+capset []            (2)  - set/get capabilities of thread(s)
+captoinfo []         (1)  - convert a termcap description into a terminfo description
+card []              (1)  - print reference card of program options
+carg []              (3)  - calculate the argument
+cargf []             (3)  - calculate the argument
+cargl []             (3)  - calculate the argument
+carousel []          (6)  - displays multiple images rotating in a circular formation
+carp []              (3)  - warn of errors (from perspective of caller)
+case []              (n)  - Evaluate one of several scripts, depending on a given value
+casin []             (3)  - complex arc sine
+casinf []            (3)  - complex arc sine
+casinh []            (3)  - complex arc sine hyperbolic
+casinhf []           (3)  - complex arc sine hyperbolic
+casinhl []           (3)  - complex arc sine hyperbolic
+casinl []            (3)  - complex arc sine
+cat []               (1)  - concatenate files and print on the standard output
+catan []             (3)  - complex arc tangents
+catanf []            (3)  - complex arc tangents
+catanh []            (3)  - complex arc tangents hyperbolic
+catanhf []           (3)  - complex arc tangents hyperbolic
+catanhl []           (3)  - complex arc tangents hyperbolic
+catanl []            (3)  - complex arc tangents
+catch []             (n)  - Evaluate script and trap exceptional returns
+catclose []          (3)  - open/close a message catalog
+catgets []           (3)  - get message from a message catalog
+catopen []           (3)  - open/close a message catalog
+cbc_crypt []         (3)  - fast DES encryption
+cbreak []            (3)  - curses input options
+cbrt []              (3)  - cube root function
+cbrtf []             (3)  - cube root function
+cbrtl []             (3)  - cube root function
+ccache []            (1)  - a fast compiler cache
+ccache []            (1)  - swig - a fast compiler cache
+ccmake []            (1)  - Curses Interface for CMake
+ccmakedep []         (1)  - create dependencies in makefiles using a C compiler
+ccos []              (3)  - complex cosine function
+ccosf []             (3)  - complex cosine function
+ccosh []             (3)  - complex hyperbolic cosine
+ccoshf []            (3)  - complex hyperbolic cosine
+ccoshl []            (3)  - complex hyperbolic cosine
+ccosl []             (3)  - complex cosine function
+ccurve []            (6)  - self-similar linear fractals
+cd []                (1)  - bash built-in commands, see bash(1)
+cd []                (1)  - paranoia 9.8 (Paranoia release III via libcdio) - an audio CD reading utility which includes extra data verification features
+cd []                (n)  - Change working directory
+cdda2wav []          (1)  - a sampling utility that dumps CD audio data into wav sound files
+cdparanoia 10.2 (Paranoia release III) [] (1)  - an audio CD reading utility which includes extra data verification features
+cdrdao []            (1)  - writes audio CD-Rs in disc-at-once mode
+cdrecord []          (1)  - record audio or data Compact Disks or Digital Versatile Disks from a master
+cdrom_id []          (8)  - udev callout to determine the capabilities of optical drives and media
+ceil []              (3)  - ceiling function: smallest integral value not less than argument
+ceilf []             (3)  - ceiling function: smallest integral value not less than argument
+ceill []             (3)  - ceiling function: smallest integral value not less than argument
+celtic []            (6)  - draws celtic cross-stich patterns
+cerf []              (3)  - complex error function
+cerfc []             (3)  - complex error function
+cerfcf []            (3)  - complex error function
+cerfcl []            (3)  - complex error function
+cerff []             (3)  - complex error function
+cerfl []             (3)  - complex error function
+certtool []          (1)  - Manipulate certificates and keys
+cexp []              (3)  - complex exponential function
+cexp2 []             (3)  - base-2 exponent of a complex number
+cexp2f []            (3)  - base-2 exponent of a complex number
+cexp2l []            (3)  - base-2 exponent of a complex number
+cexpf []             (3)  - complex exponential function
+cexpl []             (3)  - complex exponential function
+cfdisk []            (8)  - Curses based disk partition table manipulator for Linux
+cfgetispeed []       (3)  - get and set terminal attributes, line control, get and set baud rate
+cfgetospeed []       (3)  - get and set terminal attributes, line control, get and set baud rate
+cfmakeraw []         (3)  - get and set terminal attributes, line control, get and set baud rate
+cfree []             (3)  - free allocated memory
+cfscores []          (6)  - the solitaire card game canfield
+cfsetispeed []       (3)  - get and set terminal attributes, line control, get and set baud rate
+cfsetospeed []       (3)  - get and set terminal attributes, line control, get and set baud rate
+cfsetspeed []        (3)  - get and set terminal attributes, line control, get and set baud rate
+chacl []             (1)  - change the access control list of a file or directory
+chage []             (1)  - change user password expiry information
+chan []              (n)  - Read, write and manipulate channels
+charmap []           (5)  - character symbols to define character encodings
+charnames []         (3)  - define character names for eN{named} string literal escapes
+charsets []          (7)  - programmer's view of character sets and internationalization
+chat []              (8)  - Automated conversational script with a modem
+chattr []            (1)  - change file attributes on a Linux second extended file system
+chcon []             (1)  - change file security context
+chdir []             (2)  - change working directory
+cheatmake []         (1)  - fool make into not rebuilding certain files
+checkXML []          (1)  - An XML lint tool for KDE DocBook XML documents
+checkalias []        (1)  - check to see if an alias is defined
+checkbutton []       (n)  - Create and manipulate checkbutton widgets
+chem []              (1)  - groff preprocessor for producing chemical structure diagrams
+chfn []              (1)  - change real user name and information
+chgat []             (3)  - curses character and window attribute control routines
+chgrp []             (1)  - change group ownership
+chips []             (4)  - Chips and Technologies video driver
+chkdupexe []         (1)  - find duplicate executables
+chmod []             (1)  - change file mode bits
+chmod []             (2)  - change permissions of a file
+chown []             (1)  - change file owner and group
+chown []             (2)  - change ownership of a file
+chpasswd []          (8)  - update password file in batch
+chprop []            (1)  - program to do something FIXME
+chroot []            (1)  - run command or interactive shell with special root directory
+chroot []            (2)  - change root directory
+chrt []              (1)  - manipulate real-time attributes of a process
+chsh []              (1)  - change login shell
+chvt []              (1)  - change foreground virtual terminal
+ci []                (1)  - check in RCS revisions
+cimag []             (3)  - get imaginary part of a complex number
+cimagf []            (3)  - get imaginary part of a complex number
+cimagl []            (3)  - get imaginary part of a complex number
+ciphers []           (1)  - SSL cipher display and cipher list tool
+ciptool []           (1)  - Bluetooth Common ISDN Access Profile (CIP)
+circuit []           (6)  - animates a number of 3D electronic components
+cirrus []            (4)  - Cirrus Logic video driver
+citron []            (4)  - Citron Infrared Touch Driver (CiTouch)
+cjb2 []              (1)  - Simple DjVuBitonal encoder
+cjpeg []             (1)  - compress an image file to a JPEG file
+ckalloc []           (3)  - allocate or free heap memory
+ckfree []            (3)  - allocate or free heap memory
+ckrealloc []         (3)  - allocate or free heap memory
+cksum []             (1)  - checksum and count the bytes in a file
+classes.conf []      (5)  - class configuration file for cups
+cleanlinks []        (1)  - remove dangling symbolic links and empty directories
+clear []             (1)  - clear the terminal screen
+clear []             (3)  - clear all or part of a curses window
+clearenv []          (3)  - clear the environment
+clearerr []          (3)  - check and reset stream status
+clearok []           (3)  - curses output options
+client.conf []       (5)  - client configuration file for cups
+clipboard []         (n)  - Manipulate Tk clipboard
+clisp []             (1)  - ANSI Common Lisp compiler, interpreter and debugger
+clock []             (3)  - Determine processor time
+clock []             (n)  - Obtain and manipulate dates and times
+clock_getcpuclockid [] (3)  - obtain ID of a process CPU-time clock
+clock_getres []      (2)  - clock and time functions
+clock_gettime []     (2)  - clock and time functions
+clock_nanosleep []   (2)  - high-resolution sleep with specifiable clock
+clock_settime []     (2)  - clock and time functions
+clockdiff []         (8)  - measure clock difference between hosts
+clog []              (3)  - natural logarithm of a complex number
+clog10 []            (3)  - base-10 logarithm of a complex number
+clog10f []           (3)  - base-10 logarithm of a complex number
+clog10l []           (3)  - base-10 logarithm of a complex number
+clog2 []             (3)  - base-2 logarithm of a complex number
+clog2f []            (3)  - base-2 logarithm of a complex number
+clog2l []            (3)  - base-2 logarithm of a complex number
+clogf []             (3)  - natural logarithm of a complex number
+clogl []             (3)  - natural logarithm of a complex number
+clone []             (2)  - create a child process
+close []             (2)  - close a file descriptor
+close []             (n)  - Close an open channel
+closedir []          (3)  - close a directory
+closelog []          (3)  - send messages to the system logger
+cloudlife []         (6)  - a cellular automaton based on Conway's Life
+clrtobot []          (3)  - clear all or part of a curses window
+clrtoeol []          (3)  - clear all or part of a curses window
+cluck []             (3)  - warn of errors with stack backtrace (not exported by default)
+cmake []             (1)  - Cross-Platform Makefile Generator
+cmp []               (1)  - compare two files byte by byte
+cmuwmtopbm []        (1)  - convert a CMU window manager bitmap into a portable bitmap
+cnid_dbd []          (8)  - implement access to CNID databases through a dedicated daemon process
+cnid_index []        (1)  - check and repair Netatalk CNID database indexes
+cnid_metad []        (8)  - start cnid_dbd daemons on request
+co []                (1)  - check out RCS revisions
+col []               (1)  - filter reverse line feeds from input
+colcrt []            (1)  - filter nroff output for CRT previewing
+collateindex.pl []   (1)  - generate DocBook index files
+color_content []     (3)  - curses color manipulation routines
+color_set []         (3)  - curses character and window attribute control routines
+colors []            (n)  - symbolic color names recognized by Tk
+colrm []             (1)  - remove columns from a file
+column []            (1)  - columnate lists
+com_err []           (3)  - common error display routine
+comm []              (1)  - compare two sorted files line by line
+command []           (1)  - bash built-in commands, see bash(1)
+comp_err []          (1)  - compile MySQL error message file
+compare []           (1)  - mathematically and visually annotate the difference between an image and its reconstruction
+compass []           (6)  - draws a spinning compass
+compgen []           (1)  - bash built-in commands, see bash(1)
+compile_et []        (1)  - error table compiler
+complete []          (1)  - bash built-in commands, see bash(1)
+complex []           (7)  - basics of complex mathematics
+composite []         (1)  - overlaps one image over another
+compound []          (n)  - multi-line compound image type
+compress []          (1)  - compress and expand data (version 4.1)
+compress []          (1)  - dummy - manual page for compress-dummy - sharutils 4.6.3
+comsat []            (8)  - biff server
+concat []            (n)  - Join lists together
+confess []           (3)  - die of errors with stack backtrace
+config []            (5)  - OpenSSL CONF library configuration files
+config.guess []      (1)  - guess the build system triplet
+config.sub []        (1)  - validate and canonicalize a configuration triplet
+config_data []       (1)  - Query or change configuration of Perl modules
+config_perror []     (3)  - read_config functions
+config_pwarn []      (3)  - read_config functions
+confstr []           (3)  - get configuration dependent string variables
+conj []              (3)  - calculate the complex conjugate
+conjf []             (3)  - calculate the complex conjugate
+conjl []             (3)  - calculate the complex conjugate
+conjure []           (1)  - interprets and executes scripts written in the Magick Scripting Language (MSL)
+connect []           (2)  - initiate a connection on a socket
+console []           (4)  - console terminal and virtual consoles
+console []           (n)  - Control the console on systems without a real console
+console ioctl []     (4)  - ioctl's for console terminal and virtual consoles
+console_codes []     (4)  - Linux console escape and control sequences
+consoletype []       (1)  - print type of the console connected to standard input
+constant []          (3)  - Perl pragma to declare constants
+continue []          (1)  - bash built-in commands, see bash(1)
+continue []          (n)  - Skip to the next iteration of a loop
+convert []           (1)  - convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more
+convertquota []      (8)  - convert quota from old file format to new one
+convfont []          (1)  - convert font files for svgalib
+copysign []          (3)  - copy sign of a number
+copysignf []         (3)  - copy sign of a number
+copysignl []         (3)  - copy sign of a number
+copywin []           (3)  - overlay and manipulate overlapped curses windows
+coral []             (6)  - simulates coral growth, albeit somewhat slowly
+core []              (5)  - core dump file
+corelist []          (1)  - a commandline frontend to Module::CoreList
+cos []               (3)  - cosine function
+cosf []              (3)  - cosine function
+cosh []              (3)  - hyperbolic cosine function
+coshf []             (3)  - hyperbolic cosine function
+coshl []             (3)  - hyperbolic cosine function
+cosl []              (3)  - cosine function
+countmail []         (6)  - be obnoxious about how much mail you have
+cp []                (1)  - copy files and directories
+cp1251 []            (7)  - the CP 1251 character set encoded in octal, decimal, and hexadecimal
+cpack []             (1)  - Packaging driver provided by CMake
+cpaldjvu []          (1)  - DjVuDocument encoder for low-color images
+cpan []              (1)  - easily interact with CPAN from the command line
+cpan2dist []         (1)  - The CPANPLUS distribution creator
+cpanp []             (1)  - The CPANPLUS launcher
+cpio []              (1)  - copy files to and from archives
+cpio []              (5)  - format of cpio archive files
+cpow []              (3)  - complex power function
+cpowf []             (3)  - complex power function
+cpowl []             (3)  - complex power function
+cpp []               (1)  - The C Preprocessor
+cproj []             (3)  - project into Riemann Sphere
+cprojf []            (3)  - project into Riemann Sphere
+cprojl []            (3)  - project into Riemann Sphere
+cpuset []            (7)  - confine processes to processor and memory node subsets
+crackberg []         (6)  - Lose your way wandering some height fields, and enjoy candy
+crda []              (8)  - send to the kernel a wireless regulatory domain for a given ISO / IEC 3166 alpha2
+creal []             (3)  - get real part of a complex number
+crealf []            (3)  - get real part of a complex number
+creall []            (3)  - get real part of a complex number
+creat []             (2)  - open and possibly create a file or device
+create_cvsignore []  (1)  - Create preliminary .cvsignore in the current directory
+create_floppy_devices [] (8)  - udev callout to create all possible floppy devices based on the CMOS type
+create_makefile []   (1)  - Creates Makefile.in and Makefile from a Makefile.am
+create_makefiles []  (1)  - Recreates all Makefiles beneath a directory
+create_module []     (2)  - create a loadable module entry
+credentials []       (7)  - process identifiers
+cribbage []          (6)  - the card game cribbage
+crl []               (1)  - CRL utility
+crl2pkcs7 []         (1)  - Create a PKCS#7 structure from a CRL and certificates
+croak []             (3)  - die of errors (from perspective of caller)
+crond []             (8)  - cron daemon (Dillon's Cron)
+crontab []           (1)  - manipulate per-user crontabs (Dillon's Cron)
+crypt []             (3)  - password and data encryption
+crypt_r []           (3)  - password and data encryption
+cryptdir []          (1)  - encrypt/decrypt all files in a directory
+crypto []            (3)  - OpenSSL cryptographic library
+cryptsetup []        (8)  - setup cryptographic volumes for dm-crypt (including LUKS extension)
+crystal []           (6)  - kaleidescope
+cscope []            (1)  - interactively examine a C program
+csepdjvu []          (1)  - DjVu encoder for separated data files
+csin []              (3)  - complex sine function
+csinf []             (3)  - complex sine function
+csinh []             (3)  - complex hyperbolic sine
+csinhf []            (3)  - complex hyperbolic sine
+csinhl []            (3)  - complex hyperbolic sine
+csinl []             (3)  - complex sine function
+csplit []            (1)  - split a file into sections determined by context lines
+csqrt []             (3)  - complex square root
+csqrtf []            (3)  - complex square root
+csqrtl []            (3)  - complex square root
+ctags []             (1)  - Generate tag files for source code
+ctags []             (1)  - Generates tags and (optionally) refs files
+ctags []             (1)  - generate tag file for Emacs, vi
+ctan []              (3)  - complex tangent function
+ctanf []             (3)  - complex tangent function
+ctanh []             (3)  - complex hyperbolic tangent
+ctanhf []            (3)  - complex hyperbolic tangent
+ctanhl []            (3)  - complex hyperbolic tangent
+ctanl []             (3)  - complex tangent function
+ctermid []           (3)  - get controlling terminal name
+ctest []             (1)  - Testing driver provided by CMake
+ctime []             (3)  - transform date and time to broken-down time or ASCII
+ctime_r []           (3)  - transform date and time to broken-down time or ASCII
+ctrlaltdel []        (8)  - set the function of the Ctrl-Alt-Del combination
+cu []                (1)  - Call up another system
+cube21 []            (6)  - animates the Cube 21 puzzle
+cubenetic []         (6)  - cubist 3D undulating blob
+cubestorm []         (6)  - a series of 3D boxes that fill space
+cubicgrid []         (6)  - rotating 3D lattice seen from inside
+cue2toc []           (1)  - convert CUE to TOC format
+cups []              (1)  - config - get cups api, compiler, directory, and link information
+cups []              (8)  - calibrate - ESP CUPS Printer Calibration Tool
+cups []              (8)  - deviced - cups device daemon
+cups []              (8)  - driverd - cups driver daemon
+cups []              (8)  - genppd - generate Gutenprint PPD files for use with CUPS
+cups []              (8)  - genppdupdate - update CUPS+Gutenprint PPD files
+cups []              (8)  - lpd - receive print jobs and report printer status to lpd clients
+cups []              (8)  - polld - cups printer polling daemon
+cupsaddsmb []        (8)  - export printers to samba for windows clients
+cupsctl []           (8)  - configure cupsd.conf options
+cupsd []             (8)  - common unix printing system daemon
+cupsd.conf []        (5)  - server configuration file for cups
+cupsdisable []       (8)  - stop/start printers and classes
+cupsenable []        (8)  - stop/start printers and classes
+cupsfilter []        (8)  - convert a file to another format using cups filters
+cupsprofile []       (1)  - cups simple profiling tool
+cupstestdsc []       (1)  - test conformance of postscript files
+cupstestppd []       (1)  - test conformance of ppd files
+curl []              (1)  - config - Get information about a libcurl installation
+curl []              (1)  - transfer a URL
+curl_easy_cleanup [] (3)  - End a libcurl easy session
+curl_easy_duphandle [] (3)  - Clone a libcurl session handle
+curl_easy_escape []  (3)  - URL encodes the given string
+curl_easy_getinfo [] (3)  - extract information from a curl handle
+curl_easy_init []    (3)  - Start a libcurl easy session
+curl_easy_pause []   (3)  - pause and unpause a connection
+curl_easy_perform [] (3)  - Perform a file transfer
+curl_easy_recv []    (3)  - receives raw data on an easy connection
+curl_easy_reset []   (3)  - reset all options of a libcurl session handle
+curl_easy_send []    (3)  - sends raw data over an easy connection
+curl_easy_setopt []  (3)  - set options for a curl easy handle
+curl_easy_strerror [] (3)  - return string describing error code
+curl_easy_unescape [] (3)  - URL decodes the given string
+curl_escape []       (3)  - URL encodes the given string
+curl_formadd []      (3)  - add a section to a multipart/formdata HTTP POST
+curl_formfree []     (3)  - free a previously build multipart/formdata HTTP POST chain
+curl_formget []      (3)  - serialize a previously built multipart/formdata HTTP POST chain
+curl_free []         (3)  - reclaim memory that has been obtained through a libcurl call
+curl_getdate []      (3)  - Convert a date string to number of seconds since January 1, 1970
+curl_getenv []       (3)  - return value for environment name
+curl_global_cleanup [] (3)  - global libcurl cleanup
+curl_global_init []  (3)  - Global libcurl initialisation
+curl_global_init_mem [] (3)  - Global libcurl initialisation with memory callbacks
+curl_maprintf []     (3)  - formatted output conversion
+curl_mfprintf []     (3)  - formatted output conversion
+curl_mprintf []      (3)  - formatted output conversion
+curl_msnprintf []    (3)  - formatted output conversion
+curl_msprintf curl_mvaprintf [] (3)  - formatted output conversion
+curl_multi_add_handle [] (3)  - add an easy handle to a multi session
+curl_multi_assign [] (3)  - set data to association with an internal socket
+curl_multi_cleanup [] (3)  - close down a multi session
+curl_multi_fdset []  (3)  - extracts file descriptor information from a multi handle
+curl_multi_info_read [] (3)  - read multi stack informationals
+curl_multi_init []   (3)  - create a multi handle
+curl_multi_perform [] (3)  - reads/writes available data from each easy handle
+curl_multi_remove_handle [] (3)  - remove an easy handle from a multi session
+curl_multi_setopt [] (3)  - set options for a curl multi handle
+curl_multi_socket [] (3)  - reads/writes available data
+curl_multi_strerror [] (3)  - return string describing error code
+curl_multi_timeout [] (3)  - how long to wait for action before proceeding
+curl_mvfprintf []    (3)  - formatted output conversion
+curl_mvprintf []     (3)  - formatted output conversion
+curl_mvsnprintf []   (3)  - formatted output conversion
+curl_mvsprintf []    (3)  - formatted output conversion
+curl_share_cleanup [] (3)  - Clean up a shared object
+curl_share_init []   (3)  - Create a shared object
+curl_share_setopt [] (3)  - Set options for a shared object
+curl_share_strerror [] (3)  - return string describing error code
+curl_slist_append [] (3)  - add a string to an slist
+curl_slist_free_all [] (3)  - free an entire curl_slist list
+curl_strequal []     (3)  - case insensitive string comparisons
+curl_strnequal []    (3)  - case insensitive string comparisons
+curl_unescape []     (3)  - URL decodes the given string
+curl_version []      (3)  - returns the libcurl version string
+curl_version_info [] (3)  - returns run-time libcurl version info
+currentcontext []    (3)  - get the current graphics contents
+curs_set []          (3)  - low-level curses routines
+curses_version []    (3)  - miscellaneous curses extensions
+cursors []           (n)  - mouse cursors available in Tk
+cuserid []           (3)  - get username
+cut []               (1)  - remove sections from each line of files
+cvs []               (1)  - Concurrent Versions System
+cvs []               (5)  - Concurrent Versions System support files
+cvsbug []            (8)  - send problem report (PR) about CVS to a central support site
+cvscheck []          (1)  - Offline status report for files in a checked-out CVS module
+cvslastchange []     (1)  - Display the last change committed to CVS for a file
+cvslastlog []        (1)  - Prints the log entry for the last commit for a file
+cvsrevertlast []     (1)  - Revert files in CVS by one version
+cvt []               (1)  - calculate VESA CVT mode lines
+cwaves []            (6)  - languid sinusoidal colors
+cxpm []              (1)  - Check an XPM (X PixMap) file - XPM 1, 2, or 3
+cxxmetric []         (1)  - Simple source metrics for C and C++
+cynosure []          (6)  - gentle overlapping squares screen saver
+cytune []            (8)  - Tune driver parameters for Cyclades-Z multiport serial card
+d2i_509_CRL_fp []    (3)  - PKCS#10 certificate request functions
+d2i_ASN1_OBJECT []   (3)  - ASN1 OBJECT IDENTIFIER functions
+d2i_DHparams []      (3)  - PKCS#3 DH parameter functions
+d2i_DSAPrivateKey [] (3)  - DSA key encoding and parsing functions
+d2i_DSAPublicKey []  (3)  - DSA key encoding and parsing functions
+d2i_DSA_PUBKEY []    (3)  - DSA key encoding and parsing functions
+d2i_DSA_SIG []       (3)  - DSA key encoding and parsing functions
+d2i_Netscape_RSA []  (3)  - RSA public and private key encoding functions
+d2i_PKCS8PrivateKey_bio [] (3)  - PKCS#8 format private key functions
+d2i_PKCS8PrivateKey_fp [] (3)  - PKCS#8 format private key functions
+d2i_RSAPrivateKey [] (3)  - RSA public and private key encoding functions
+d2i_RSAPublicKey []  (3)  - RSA public and private key encoding functions
+d2i_RSA_PUBKEY []    (3)  - RSA public and private key encoding functions
+d2i_SSL_SESSION []   (3)  - convert SSL_SESSION object from/to ASN1 representation
+d2i_X509 []          (3)  - X509 encode and decode functions
+d2i_X509_ALGOR []    (3)  - AlgorithmIdentifier functions
+d2i_X509_CRL []      (3)  - PKCS#10 certificate request functions
+d2i_X509_CRL_bio []  (3)  - PKCS#10 certificate request functions
+d2i_X509_NAME []     (3)  - X509_NAME encoding functions
+d2i_X509_REQ []      (3)  - PKCS#10 certificate request functions
+d2i_X509_REQ_bio []  (3)  - PKCS#10 certificate request functions
+d2i_X509_REQ_fp []   (3)  - PKCS#10 certificate request functions
+d2i_X509_SIG []      (3)  - DigestInfo functions
+d2i_X509_bio []      (3)  - X509 encode and decode functions
+d2i_X509_fp []       (3)  - X509 encode and decode functions
+daemon []            (3)  - run in the background
+dangerball []        (6)  - a 3D ball that periodically extrudes spikes. Ouch!
+date []              (1)  - print or set the system date and time
+daylight []          (3)  - initialize time conversion information
+dbilogstrip []       (1)  - filter to normalize DBI trace logs for diff'ing
+dbiprof []           (1)  - command-line client for DBI::ProfileData
+dbiproxy []          (1)  - A proxy server for the DBD::Proxy driver
+dbmmanage []         (1)  - Manage user authentication files in DBM format
+dbopen []            (3)  - database access methods
+dbus []              (1)  - cleanup-sockets - clean up leftover sockets in a directory
+dbus []              (1)  - daemon - Message bus daemon
+dbus []              (1)  - launch - Utility to start a message bus from a shell script
+dbus []              (1)  - monitor - debug probe to print message bus messages
+dbus []              (1)  - send - Send a message to a message bus
+dbus []              (1)  - uuidgen - Utility to generate UUIDs
+dc []                (1)  - an arbitrary precision calculator
+dcgettext []         (3)  - translate message
+dcngettext []        (3)  - translate message and choose plural form
+dd []                (1)  - convert and copy a file
+ddate []             (1)  - converts Gregorian dates to Discordian dates
+ddbugtopbm []        (1)  - see http://netpbm.sourceforge.net/doc/ddbugtopbm.html
+dde []               (n)  - Execute a Dynamic Data Exchange command
+ddjvu []             (1)  - Command line DjVu decoder
+ddp []               (7)  - Linux AppleTalk protocol implementation
+deallocvt []         (1)  - deallocate unused virtual consoles
+debug []             (3)  - Print out debugging information about the handler chain being called
+debugfs []           (8)  - ext2/ext3 file system debugger
+debugreiserfs []     (8)  - The debugging tool for the ReiserFS filesystem
+decayscreen []       (6)  - make a screen meltdown
+declare []           (1)  - bash built-in commands, see bash(1)
+deco []              (6)  - draw tacky 70s basement wall panelling
+def_prog_mode []     (3)  - low-level curses routines
+def_shell_mode []    (3)  - low-level curses routines
+default_store []     (3)  - generic storage of global data
+define_key []        (3)  - define a keycode
+del_curterm []       (3)  - curses interfaces to terminfo database
+delay_output []      (3)  - miscellaneous curses utility routines
+delch []             (3)  - delete character under the cursor in a curses window
+delete_module []     (2)  - delete a loadable module entry
+deleteln []          (3)  - delete and insert lines in a curses window
+delscreen []         (3)  - curses screen initialization and manipulation routines
+deluxe []            (6)  - pulsing sequence of stars, circles, and lines
+delwin []            (3)  - create curses windows
+demangle []          (1)  - Undo C++ name mangling for symbols
+demon []             (6)  - cellular automaton
+depmod []            (8)  - program to generate modules.dep and map files
+depmod.conf []       (5)  - Configuration file/directory for depmod
+depmod.d []          (5)  - Configuration file/directory for depmod
+derwin []            (3)  - create curses windows
+des_crypt []         (3)  - fast DES encryption
+des_modes []         (7)  - the variants of DES and other crypto algorithms of OpenSSL
+des_read_2passwords [] (3)  - Compatibility user interface functions
+des_read_password [] (3)  - Compatibility user interface functions
+des_read_pw []       (3)  - Compatibility user interface functions
+des_read_pw_string [] (3)  - Compatibility user interface functions
+des_setparity []     (3)  - fast DES encryption
+destroy []           (n)  - Destroy one or more windows
+devdump []           (8)  - Utility programs for dumping and verifying iso9660 images
+df []                (1)  - report file system disk space usage
+dfutool []           (1)  - Device Firmware Upgrade utility
+dga []               (1)  - test program for the XFree86-DGA extension
+dgettext []          (3)  - translate message
+dgst []              (1)  - message digests
+dh []                (3)  - Diffie-Hellman key agreement
+dhclient []          (8)  - Dynamic Host Configuration Protocol Client
+dhclient []          (8)  - script - DHCP client network configuration script
+dhclient.conf []     (5)  - DHCP client configuration file
+dhclient.leases []   (5)  - DHCP client lease database
+dhcp []              (5)  - eval - ISC DHCP conditional evaluation
+dhcp []              (5)  - options - Dynamic Host Configuration Protocol options
+dhcpcd []            (8)  - an RFC 2131 compliant DHCP client
+dhcpctl_initialize [] (3)  - dhcpctl library initialization
+dhcpd []             (8)  - Dynamic Host Configuration Protocol Server
+dhcpd.conf []        (5)  - dhcpd configuration file
+dhcpd.leases []      (5)  - DHCP client lease database
+dhcrelay []          (8)  - Dynamic Host Configuration Protocol Relay Agent
+dhparam []           (1)  - DH parameter manipulation and generation
+diagnostics []       (1)  - produce verbose warning diagnostics
+diagnostics []       (3)  - produce verbose warning diagnostics
+dialog []            (1)  - display dialog boxes from shell scripts
+dict []              (n)  - Manipulate dictionaries
+diff []              (1)  - compare files line by line
+diff3 []             (1)  - compare three files line by line
+diffpp []            (1)  - pretty-print diff outputs with GNU enscript
+diffstat []          (1)  - make histogram from diff-output
+difftime []          (3)  - calculate time difference
+dig []               (1)  - DNS lookup utility
+dir []               (1)  - list directory contents
+dir_colors []        (5)  - configuration file for dircolors(1)
+dircolors []         (1)  - color setup for ls
+dirfd []             (3)  - get directory stream file descriptor
+dirmngr []           (1)  - CRL and OCSP daemon
+dirmngr []           (1)  - client - CRL and OCSP daemon
+dirname []           (1)  - strip non-directory suffix from file name
+dirname []           (3)  - parse pathname components
+dirs []              (1)  - bash built-in commands, see bash(1)
+discrete []          (6)  - discrete map iterative function fractal systems
+diskd []             (1)  - disk daemon; wait for disk to be inserted
+diskseek []          (1)  - disk seek daemon; simulates Messy Dos' drive cleaning effect
+diskseekd []         (1)  - disk seek daemon; simulates Messy Dos' drive cleaning effect
+disown []            (1)  - bash built-in commands, see bash(1)
+display []           (1)  - displays an image or image sequence on any X server
+distcc []            (1)  - distributed C/C++/ObjC compiler
+distccd []           (1)  - distributed C/C++ compiler server
+distccmon []         (1)  - text - Displays current compilation jobs in text form
+distort []           (6)  - distort the content of the screen in interesting ways
+ditroff []           (7)  - classical device independent roff
+div []               (3)  - compute quotient and remainder of an integer division
+djpeg []             (1)  - decompress a JPEG file to an image file
+djvm []              (1)  - Manipulate bundled multi-page DjVu documents
+djvmcvt []           (1)  - Convert multi-page DjVu documents
+djvudigital []       (1)  - creates DjVu files from PS or PDF files
+djvudump []          (1)  - Display internal structure of DjVu files
+djvuextract []       (1)  - Extract chunks from DjVu image files
+djvumake []          (1)  - Assemble DjVu image files
+djvups []            (1)  - Convert DjVu documents to PostScript
+djvused []           (1)  - Multi-purpose DjVu document editor
+djvuserve []         (1)  - Generate indirect DjVu documents on the fly
+djvutoxml []         (1)  - DjVuLibre XML Tools
+djvutxt []           (1)  - Extract the hidden text from DjVu documents
+djvuxmlparser []     (1)  - DjVuLibre XML Tools
+dl_iterate_phdr []   (3)  - walk through list of shared objects
+dladdr []            (3)  - programming interface to dynamic linking loader
+dlclose []           (3)  - programming interface to dynamic linking loader
+dlerror []           (3)  - programming interface to dynamic linking loader
+dlopen []            (3)  - programming interface to dynamic linking loader
+dlsym []             (3)  - programming interface to dynamic linking loader
+dlvsym []            (3)  - programming interface to dynamic linking loader
+dmapi []             (3)  - DMAPI library
+dmesg []             (1)  - print or control the kernel ring buffer
+dmidecode []         (8)  - DMI table decoder
+dmsetup []           (8)  - low level logical volume management
+dn_comp []           (3)  - resolver routines
+dn_expand []         (3)  - resolver routines
+dngettext []         (3)  - translate message and choose plural form
+dnsdomainname []     (1)  - show the system's DNS domain name
+dnsmasq []           (8)  - A lightweight DHCP and caching DNS server
+dnssec []            (8)  - keygen - DNSSEC key generation tool
+dnssec []            (8)  - signzone - DNSSEC zone signing tool
+docbook2dvi []       (1)  - (Jade Wrapper) converts SGML files to other formats
+docbook2html []      (1)  - (Jade Wrapper) converts SGML files to other formats
+docbook2man []       (1)  - (Jade Wrapper) converts SGML files to other formats
+docbook2man []       (1)  - spec.pl - convert DocBook RefEntries to man pages
+docbook2pdf []       (1)  - (Jade Wrapper) converts SGML files to other formats
+docbook2ps []        (1)  - (Jade Wrapper) converts SGML files to other formats
+docbook2rtf []       (1)  - (Jade Wrapper) converts SGML files to other formats
+docbook2tex []       (1)  - (Jade Wrapper) converts SGML files to other formats
+docbook2texi []      (1)  - (Jade Wrapper) converts SGML files to other formats
+docbook2texi []      (1)  - spec.pl - convert DocBook Booksto Texinfo documents
+docbook2txt []       (1)  - (Jade Wrapper) converts SGML files to other formats
+does nothing otherwise). .IP (bu 2 Set the current canvas colours to black background and white foreground. .IP (bu 2 Write the string 'This is a message' using the current colors onto the canvas. .IP (bu 2 Refresh the display. .IP (bu 2 Wait for an event of type 'CACA_EVENT_KEY_PRESS'. .IP (bu 2 Free the display (release memory). Since it was created together with the display [] (3)  - like system using the following comman (requiring pkg-config and gcc):
+domainname []        (1)  - show or set the system's NIS/YP domain name
+domainname []        (8)  - set or display name of current domain
+dosfsck []           (8)  - check and repair MS-DOS file systems
+doupdate []          (3)  - refresh curses windows and lines
+doxygen []           (1)  - documentation system for various programming languages
+doxytag []           (1)  - generates a tag file and/or a search index for a set of HTML files
+doxywizard []        (1)  - a tool to configure and run doxygen on your source files
+dpasswd []           (8)  - change dialup password
+dprintf []           (3)  - print to a file descriptor
+dprofpp []           (1)  - display perl profile data
+drand48 []           (3)  - generate uniformly distributed pseudo-random numbers
+drand48_r []         (3)  - generate uniformly distributed pseudo-random numbers reentrantly
+drem []              (3)  - floating - point remainder function
+dremf []             (3)  - floating - point remainder function
+dreml []             (3)  - floating - point remainder function
+drift []             (6)  - draws drifting recursive fractal cosmic flames
+dsa []               (1)  - DSA key processing
+dsa []               (3)  - Digital Signature Algorithm
+dsaparam []          (1)  - DSA parameter manipulation and generation
+dsp56k []            (4)  - DSP56001 interface device
+du []                (1)  - estimate file space usage
+dump []              (8)  - acct - print an acct file in human-readable format
+dump []              (8)  - utmp - print an utmp file in human-readable format
+dumpe2fs []          (8)  - dump ext2/ext3 filesystem information
+dumpiso []           (1)  - dump IEEE 1394 isochronous channel packets
+dumpkeys []          (1)  - dump keyboard translation tables
+dumpreg []           (1)  - dump the state of the card as the svgalib chipset driver sees it
+dund []              (1)  - BlueZ Bluetooth dial-up networking daemon
+dup []               (2)  - duplicate a file descriptor
+dup2 []              (2)  - duplicate a file descriptor
+dup3 []              (2)  - duplicate a file descriptor
+dupwin []            (3)  - create curses windows
+dvipdf []            (1)  - Convert TeX DVI file to PDF using ghostscript and dvips
+dysize []            (3)  - get number of days for a given year
+e2fsck []            (8)  - check a Linux ext2/ext3 file system
+e2fsck.conf []       (5)  - Configuration file for e2fsck
+e2image []           (8)  - Save critical ext2/ext3 filesystem metadata to a file
+e2label []           (8)  - Change the label on an ext2/ext3 filesystem
+e2undo []            (8)  - Replay an undo log for an ext2/ext3/ext4 filesystem
+eaccess []           (3)  - check effective user's permissions for a file
+eboard []            (1)  - addtheme - a program to easily install new eboard board and sound themes
+eboard []            (1)  - config - program to get information about the installed eboard
+eboard []            (6)  - a graphical chess board
+ec []                (1)  - EC key processing
+ecb_crypt []         (3)  - fast DES encryption
+ecdsa []             (3)  - Elliptic Curve Digital Signature Algorithm
+echo []              (1)  - bash built-in commands, see bash(1)
+echo []              (1)  - display a line of text
+echo []              (3)  - curses input options
+echo_wchar []        (3)  - add a complex character and rendition to a curses window, then advance the cursor
+echochar []          (3)  - add a character (with attributes) to a curses window, then advance the cursor
+ecparam []           (1)  - EC parameter manipulation and generation
+ecvt []              (3)  - convert a floating-point number to a string
+ecvt_r []            (3)  - convert a floating-point number to a string
+ed []                (1)  - text editor
+edata []             (3)  - end of program segments
+edd_id []            (8)  - udev callout to identify BIOS disk drives via EDD
+editmap []           (8)  - query and edit single records in database maps for sendmail
+editres []           (1)  - a dynamic resource editor for X Toolkit applications
+edquota []           (8)  - edit user quotas
+egrep []             (1)  - print lines matching a pattern
+eject []             (1)  - eject removable media
+electricsheep []     (1)  - a distributed screen-saver (version 2.7b11)
+electricsheep []     (1)  - preferences - GUI to edit defaults for electricsheep
+elf []               (5)  - format of Executable and Linking Format (ELF) files
+elksemu []           (1)  - Embedded Linux Kernel Subset emulator
+elm []               (1)  - an interactive mail system
+elmalias []          (1)  - expand and display Elm address aliases
+elographics []       (4)  - Elographics input driver
+elvfmt []            (1)  - adjust line-length for paragraphs of text
+elvis []             (1)  - a clone of the ex/vi text editor
+emacs []             (1)  - GNU project Emacs
+emacsclient []       (1)  - tells a running Emacs to visit a file
+enable []            (1)  - bash built-in commands, see bash(1)
+enc []               (1)  - symmetric cipher routines
+enc2xs []            (1)  - - Perl Encode Module Generator
+encapsulate []       (1)  - multiplex several channels over a single socket with sampling of remote process exit status, and provide conversation termination without closing the socket
+encode_keychange []  (1)  - produce the KeyChange string for SNMPv3
+encoding []          (3)  - allows you to write your script in non-ascii or non-utf8
+encoding []          (n)  - Manipulate encodings
+encoding::warnings [] (3)  - Warn on implicit encoding conversions
+encrypt []           (3)  - encrypt 64-bit messages
+encrypt_r []         (3)  - encrypt 64-bit messages
+end []               (3)  - end of program segments
+endaliasent []       (3)  - read an alias entry
+endfsent []          (3)  - handle fstab entries
+endgame []           (6)  - endgame chess screensaver
+endgrent []          (3)  - get group file entry
+endhostent []        (3)  - get network host entry
+endmntent []         (3)  - get file system descriptor file entry
+endnetent []         (3)  - get network entry
+endnetgrent []       (3)  - handle network group entries
+endprotoent []       (3)  - get protocol entry
+endpwent []          (3)  - get password file entry
+endrpcent []         (3)  - get RPC entry
+endservent []        (3)  - get service entry
+endspent []          (3)  - get shadow password file entry
+endttyent []         (3)  - get ttys file entry
+endusershell []      (3)  - get permitted user shells
+endutent []          (3)  - access utmp file entries
+endwin []            (3)  - curses screen initialization and manipulation routines
+engine []            (3)  - ENGINE cryptographic module support
+engine []            (6)  - draws a 3D four-stroke engine
+english []           (4)  - flag format for English okspell dictionaries
+enscript []          (1)  - convert text files to PostScript, HTML, RTF, ANSI, and overstrikes
+entry []             (n)  - Create and manipulate entry widgets
+env []               (1)  - run a program in a modified environment
+environ []           (7)  - user environment
+envsubst []          (1)  - substitutes environment variables in shell format strings
+envz_add []          (3)  - environment string support
+envz_entry []        (3)  - environment string support
+envz_get []          (3)  - environment string support
+envz_merge []        (3)  - environment string support
+envz_remove []       (3)  - environment string support
+envz_strip []        (3)  - environment string support
+eof []               (n)  - Check for end of file condition on channel
+epic []              (1)  - Internet Relay Chat client for UNIX like systems
+epicycle []          (6)  - draws a point moving around a circle which moves around a cicle which..
+epoll []             (7)  - I/O event notification facility
+epoll_create []      (2)  - open an epoll file descriptor
+epoll_create1 []     (2)  - open an epoll file descriptor
+epoll_ctl []         (2)  - control interface for an epoll descriptor
+epoll_pwait []       (2)  - wait for an I/O event on an epoll file descriptor
+epoll_wait []        (2)  - wait for an I/O event on an epoll file descriptor
+eps2eps []           (1)  - Ghostscript PostScript distiller
+epsffit []           (1)  - fit encapsulated PostScript file (EPSF) into constrained size
+eqn []               (1)  - format equations for troff or MathML
+eqn2graph []         (1)  - convert an EQN equation into a cropped image
+erand48 []           (3)  - generate uniformly distributed pseudo-random numbers
+erand48_r []         (3)  - generate uniformly distributed pseudo-random numbers reentrantly
+erase []             (3)  - clear all or part of a curses window
+erasechar []         (3)  - curses environment query routines
+erasewchar []        (3)  - curses environment query routines
+erf []               (3)  - error function
+erfc []              (3)  - complementary error function
+erfcf []             (3)  - complementary error function
+erfcl []             (3)  - complementary error function
+erff []              (3)  - error function
+erfl, []             (3)  - error function
+err []               (3)  - error codes
+err []               (3)  - formatted error messages
+errno []             (3)  - number of last error
+error []             (3)  - glibc error reporting functions
+error []             (n)  - Generate an error
+error_at_line []     (3)  - glibc error reporting functions
+error_message_count [] (3)  - glibc error reporting functions
+error_on_per_line [] (3)  - glibc error reporting functions
+error_print_progname [] (3)  - glibc error reporting functions
+errstr []            (1)  - lookup error codes
+errx []              (3)  - formatted error messages
+escp2topbm []        (1)  - see http://netpbm.sourceforge.net/doc/escp2topbm.html
+escputil []          (1)  - maintain Epson Stylus inkjet printers
+esd []               (1)  - The Enlightened Sound Daemon
+esd []               (1)  - config - The Enlightened Sound Daemon
+esdcat []            (1)  - play a sound file from stdin
+esdctl []            (1)  - The Enlightened Sound Daemon
+esddsp []            (1)  - attempt to reroute audio device to esd
+esdfilt []           (1)  - The Enlightened Sound Daemon
+esdloop []           (1)  - The Enlightened Sound Daemon
+esdmon []            (1)  - The Enlightened Sound Daemon
+esdrec []            (1)  - record a sound file
+esdsample []         (1)  - play a sample
+etags []             (1)  - generate tag file for Emacs, vi
+etext []             (3)  - end of program segments
+ether_aton []        (3)  - Ethernet address manipulation routines
+ether_aton_r []      (3)  - Ethernet address manipulation routines
+ether_hostton []     (3)  - Ethernet address manipulation routines
+ether_line []        (3)  - Ethernet address manipulation routines
+ether_ntoa []        (3)  - Ethernet address manipulation routines
+ether_ntoa_r []      (3)  - Ethernet address manipulation routines
+ether_ntohost []     (3)  - Ethernet address manipulation routines
+ethers []            (5)  - Ethernet address to IP number database
+ethtool []           (8)  - Display or change ethernet card settings
+euidaccess []        (3)  - check effective user's permissions for a file
+euler2d []           (6)  - two dimensional incompressible inviscid fluid flow
+eval []              (1)  - bash built-in commands, see bash(1)
+eval []              (n)  - Evaluate a Tcl script
+evdev []             (4)  - Generic Linux input driver
+event []             (n)  - Miscellaneous event facilities: define virtual events and generate events
+eventfd []           (2)  - create a file descriptor for event notification
+eventlogadm []       (8)  - push records into the Samba event log store
+eventtest []         (6)  - test the waitevent function of svgalib
+evim []              (1)  - easy Vim, edit a file with Vim and setup for modeless editing
+evp []               (3)  - high-level cryptographic functions
+exa []               (4)  - new 2D acceleration architecture for X.Org
+example_scalar_int: instantiates a few example scalars. [] (3)  - This example merely creates some scalar registrations that allows some simple variables to be accessed via SNMP. More..
+exec []              (1)  - bash built-in commands, see bash(1)
+exec []              (n)  - Invoke subprocesses
+execl []             (3)  - execute a file
+execle []            (3)  - execute a file
+execlp []            (3)  - execute a file
+execv []             (3)  - execute a file
+execve []            (2)  - execute program
+execvp []            (3)  - execute a file
+exit []              (1)  - bash built-in commands, see bash(1)
+exit []              (3)  - cause normal process termination
+exit []              (n)  - End the application
+exit_group []        (2)  - exit all threads in a process
+exiv2 []             (1)  - Image metadata manipulation tool
+exo []               (1)  - csource - C code generation utility for arbitrary data
+exo []               (1)  - open - Open URLs and launch preferred applications
+exo-csource          (1)  - C code generation utility for arbitrary data
+exo-open             (1)  - Open URLs and launch preferred applications
+exp []               (3)  - base-e exponential function
+exp10 []             (3)  - base-10 exponential function
+exp10f []            (3)  - base-10 exponential function
+exp10l []            (3)  - base-10 exponential function
+exp2 []              (3)  - base-2 exponential function
+exp2f []             (3)  - base-2 exponential function
+exp2l []             (3)  - base-2 exponential function
+expand []            (1)  - convert tabs to spaces
+expect []            (1)  - programmed dialogue with interactive programs, Version 5
+expectk []           (1)  - Expect with Tk support
+expf []              (3)  - base-e exponential function
+expl []              (3)  - base-e exponential function
+explodepkg []        (8)  - Extract the contents of a tar+compression package (such as a Slackware software package) in the current directory
+expm1 []             (3)  - exponential minus 1
+expm1f []            (3)  - exponential minus 1
+expm1l []            (3)  - exponential minus 1
+export []            (1)  - bash built-in commands, see bash(1)
+exportfs []          (8)  - maintain list of NFS exported file systems
+exports []           (5)  - NFS file systems being exported (for Kernel based NFS)
+expr []              (1)  - evaluate expressions
+expr []              (n)  - Evaluate an expression
+extcompose []        (1)  - Compose a reference to external data for inclusion in a mail message
+extend_dmalloc []    (1)  - Analyze return-addresses from dmalloc logfiles
+extractrc []         (1)  - Extract message strings from UI and GUI-RC files
+extractres []        (1)  - filter to extract resources from a PostScript document
+extrusion []         (6)  - various rotating extruded shapes
+eyuvtoppm []         (1)  - convert a Berkeley YUV file to a portable pixmap (ppm) file
+fabs []              (3)  - absolute value of floating-point number
+fabsf []             (3)  - absolute value of floating-point number
+fabsl []             (3)  - absolute value of floating-point number
+faccessat []         (2)  - check user's permissions of a file relative to a directory file descriptor
+factor []            (1)  - factor numbers
+factor []            (6)  - factor a number, generate primes
+fadeplot []          (6)  - draws a waving ribbon following a sinusoidal path
+faillog []           (5)  - Login failure logging file
+faillog []           (8)  - examine faillog and set login failure limits
+fallocate []         (2)  - manipulate file space
+false []             (1)  - do nothing, unsuccessfully
+fancontrol []        (8)  - automated software based fan speed regulation
+fastmail []          (1)  - quick batch mail interface to a single address
+faucet []            (1)  - a fixture for a BSD network pipe
+fax2ps []            (1)  - convert a TIFF facsimile to compressed (tm
+fax2tiff []          (1)  - create a TIFF Class F fax file from raw fax data
+fb.modes []          (5)  - frame buffer modes file
+fbdevhw []           (4)  - os-specific submodule for framebuffer device access
+fblocked []          (n)  - Test whether the last input operation exhausted all available input
+fbrun []             (1)  - display run dialog window
+fbset []             (8)  - show and modify frame buffer device settings
+fbsetbg []           (1)  - set a background/wallpaper
+fbsetroot []         (1)  - a simple background utility used by the Fluxbox window manager, originally written for and by the original Blackbox window manager team
+fc []                (1)  - bash built-in commands, see bash(1)
+fc []                (1)  - cache - build font information cache files
+fc []                (1)  - cat - read font information cache files
+fc []                (1)  - list - list available fonts
+fc []                (1)  - match - match available fonts
+fchdir []            (2)  - change working directory
+fchmod []            (2)  - change permissions of a file
+fchmodat []          (2)  - change permissions of a file relative to a directory file descriptor
+fchown []            (2)  - change ownership of a file
+fchownat []          (2)  - change ownership of a file relative to a directory file descriptor
+fclose []            (3)  - close a stream
+fcloseall []         (3)  - close all open streams
+fcntl []             (2)  - manipulate file descriptor
+fconfigure []        (n)  - Set and get options on a channel
+fcopy []             (n)  - Copy data from one channel to another
+fcvt []              (3)  - convert a floating-point number to a string
+fcvt_r []            (3)  - convert a floating-point number to a string
+fd []                (4)  - floppy disk device
+fd_to_handle []      (3)  - file handle operations
+fdatasync []         (2)  - synchronize a file's in-core state with storage device
+fdformat []          (8)  - Low-level formats a floppy disk
+fdim []              (3)  - positive difference
+fdimf []             (3)  - positive difference
+fdiml []             (3)  - positive difference
+fdisk []             (8)  - Partition table manipulator for Linux
+fdmount []           (1)  - Floppy disk mount utility
+fdopen []            (3)  - stream open functions
+fdopendir []         (3)  - open a directory
+fdrawcmd []          (1)  - send raw commands to the floppy disk controller
+feature []           (3)  - Perl pragma to enable new syntactic features
+feature_test_macros [] (7)  - feature test macros
+feclearexcept []     (3)  - floating-point rounding and exception handling
+fedisableexcept []   (3)  - floating-point rounding and exception handling
+feenableexcept []    (3)  - floating-point rounding and exception handling
+fegetenv []          (3)  - floating-point rounding and exception handling
+fegetexcept []       (3)  - floating-point rounding and exception handling
+fegetexceptflag []   (3)  - floating-point rounding and exception handling
+fegetround []        (3)  - floating-point rounding and exception handling
+feholdexcept []      (3)  - floating-point rounding and exception handling
+feof []              (3)  - check and reset stream status
+feraiseexcept []     (3)  - floating-point rounding and exception handling
+ferror []            (3)  - check and reset stream status
+fesetenv []          (3)  - floating-point rounding and exception handling
+fesetexceptflag []   (3)  - floating-point rounding and exception handling
+fesetround []        (3)  - floating-point rounding and exception handling
+fetchmail []         (1)  - fetch mail from a POP, IMAP, ETRN, or ODMR-capable server
+fetestexcept []      (3)  - floating-point rounding and exception handling
+feupdateenv []       (3)  - floating-point rounding and exception handling
+fexecve []           (3)  - execute program specified via file descriptor
+fflush []            (3)  - flush a stream
+ffs []               (3)  - find first bit set in a word
+ffsl []              (3)  - find first bit set in a word
+ffsll []             (3)  - find first bit set in a word
+fg []                (1)  - bash built-in commands, see bash(1)
+fgconsole []         (1)  - print the number of the active VT
+fgetc []             (3)  - input of characters and strings
+fgetgrent []         (3)  - get group file entry
+fgetgrent_r []       (3)  - get group file entry reentrantly
+fgetpos []           (3)  - reposition a stream
+fgetpwent []         (3)  - get password file entry
+fgetpwent_r []       (3)  - get passwd file entry reentrantly
+fgets []             (3)  - input of characters and strings
+fgetspent []         (3)  - get shadow password file entry
+fgetspent_r []       (3)  - get shadow password file entry
+fgetwc []            (3)  - read a wide character from a FILE stream
+fgetws []            (3)  - read a wide-character string from a FILE stream
+fgetxattr []         (2)  - retrieve an extended attribute value
+fgrep []             (1)  - print lines matching a pattern
+fiasco_c_options_delete [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_new [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_basisfile [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_chroma_quality [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_comment [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_frame_pattern fiasco_c_options_set_title [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_optimizations [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_prediction [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_progress_meter [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_quantization [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_smoothing [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_tiling [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_c_options_set_video_param [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_coder []      (3)  - compress image files to a FIASCO file
+fiasco_d_options_delete [] (3)  - define additional options of FIASCO decoder
+fiasco_d_options_new [] (3)  - define additional options of FIASCO decoder
+fiasco_d_options_set_magnification [] (3)  - define additional options of FIASCO decoder
+fiasco_d_options_set_smoothing fiasco_d_options_set_4_2_0_format [] (3)  - define additional options of FIASCO decoder
+fiasco_decoder_delete [] (3)  - decompress a FIASCO file
+fiasco_decoder_get_comment fiasco_decoder_is_color [] (3)  - decompress a FIASCO file
+fiasco_decoder_get_frame [] (3)  - decompress a FIASCO file
+fiasco_decoder_get_height fiasco_decoder_get_title [] (3)  - decompress a FIASCO file
+fiasco_decoder_get_length [] (3)  - decompress a FIASCO file
+fiasco_decoder_get_rate [] (3)  - decompress a FIASCO file
+fiasco_decoder_get_width [] (3)  - decompress a FIASCO file
+fiasco_decoder_new [] (3)  - decompress a FIASCO file
+fiasco_decoder_write_frame [] (3)  - decompress a FIASCO file
+fiasco_get_error_message [] (3)  - return string describing last error catched in FIASCO library
+fiasco_get_verbosity [] (3)  - get or set verbosity of FIASCO library
+fiasco_image_delete [] (3)  - handle FIASCO image objects
+fiasco_image_get_height [] (3)  - handle FIASCO image objects
+fiasco_image_get_width [] (3)  - handle FIASCO image objects
+fiasco_image_is_color [] (3)  - handle FIASCO image objects
+fiasco_image_new []  (3)  - handle FIASCO image objects
+fiasco_options_delete [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_new [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_4_2_0_format [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_basisfile [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_chroma_quality [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_frame_pattern [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_magnification [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_optimizations [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_prediction [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_progress_meter [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_quantization [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_smoothing [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_tiling [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_options_set_video_param [] (3)  - define additional options of FIASCO coder and decoder
+fiasco_renderer_delete [] (3)  - convert a FIASCO image object to an X11 XImage
+fiasco_renderer_new [] (3)  - convert a FIASCO image object to an X11 XImage
+fiasco_set_verbosity [] (3)  - get or set verbosity of FIASCO library
+fiascotopnm []       (1)  - Convert compressed FIASCO image to PGM, or PPM
+fiberlamp []         (6)  - Fiber Optic Lamp
+fields []            (3)  - compile-time class fields
+fifo []              (7)  - first-in first-out special file, named pipe
+fig2dev []           (1)  - translates Fig code to various graphics languages
+fig2ps2tex []        (1)  - generate a TeX file for including a PostScript file
+file []              (1)  - determine file type
+file []              (n)  - Manipulate file names and attributes
+fileevent []         (n)  - Execute a script when a channel becomes readable or writable
+filefrag []          (8)  - report on file fragmentation
+filename []          (n)  - File name conventions supported by Tcl commands
+fileno []            (3)  - check and reset stream status
+filesystems []       (5)  - Linux file-system types: minix, ext, ext2, ext3, Reiserfs, XFS, JFS, xia, msdos, umsdos, vfat, proc, nfs, iso9660, hpfs, sysv, smb, ncpfs
+filetest []          (3)  - Perl pragma to control the filetest permission operators
+filter []            (3)  - miscellaneous curses utility routines
+filter []            (7)  - cups file conversion filter interface
+find []              (1)  - search for files in a directory hierarchy
+find2perl []         (1)  - translate find command lines to Perl code
+findaffix []         (1)  - Interactive spelling checking
+findfs []            (8)  - Find a filesystem by label or UUID
+findsmb []           (1)  - list info about machines that respond to SMB name queries on a subnet
+finger []            (1)  - user information lookup program
+fingerd []           (8)  - remote user information server
+finite []            (3)  - BSD floating - point classification functions
+finitef []           (3)  - BSD floating - point classification functions
+finitel []           (3)  - BSD floating - point classification functions
+fireworkx []         (6)  - pyrotechnics simulation eye-candy
+fish []              (6)  - play Go Fish
+fitstopnm []         (1)  - convert a FITS file into a portable anymap
+fix132x43 []         (1)  - fix problems with certain (132 column) graphics modes dump the state of the card as the svgalib chipset driver sees it
+fixdlsrps []         (1)  - filter to fix DviLaser/PS documents to work with PSUtils
+fixfmps []           (1)  - filter to fix Framemaker documents so PSUtils work
+fixincludes []       (1)  - Reduce the number of #includes in KDE source files
+fixmacps []          (1)  - filter to fix Macintosh documents with saner version of md
+fixproc []           (1)  - Fixes a process by performing the specified action
+fixps []             (1)  - sanitize PostScript files
+fixpsditps []        (1)  - filter to fix Transcript psdit documents so PSUtils work
+fixpspps []          (1)  - filter to fix PSPrint PostScript so PSUtils work
+fixscribeps []       (1)  - filter to fix Scribe documents so PSUtils work
+fixtpps []           (1)  - filter to fix Tpscript documents to work with PSUtils
+fixwfwps []          (1)  - filter to fix Word for Windows documents so PSUtils work
+fixwpps []           (1)  - filter to fix WP documents so PSUtils work
+fixwwps []           (1)  - filter to fix Windows Write documents so PSUtils work
+fiz []               (1)  - analyze damaged zoo archive for data recovery
+flac []              (1)  - Free Lossless Audio Codec
+flam3 []             (1)  - animate flam3 - render flam3 - genome flam3 - convert - render and animate FLAM3s and manipulate their genomes
+flame []             (6)  - draw weird cosmic fractals
+flash []             (3)  - curses bell and screen flash routines
+flea []              (1)  - Report a bug (or rather a flea) in mutt
+flex []              (1)  - the fast lexical analyser generator
+flipflop []          (6)  - draws a grid of 3D squares that change positions
+flipscreen3d []      (6)  - rotates an image of the screen through 3 dimensions
+fliptext []          (6)  - draws pages of text whose lines transparently flip around
+flistxattr []        (2)  - list extended attribute names
+flock []             (1)  - Manage locks from shell scripts
+flock []             (2)  - apply or remove an advisory lock on an open file
+flockfile []         (3)  - lock FILE for stdio
+floor []             (3)  - largest integral value not greater than argument
+floorf []            (3)  - largest integral value not greater than argument
+floorl []            (3)  - largest integral value not greater than argument
+floppycontrol []     (1)  - floppy driver configuration utility
+floppyd []           (1)  - floppy daemon for remote access to floppy drive floppyd_installtest - tests whether floppyd is installed and running
+floppyd_installtest [] (1)  - tests whether floppyd is installed and running
+floppymeter []       (1)  - measure raw capacity and exact rotation speed of floppy drive
+flow []              (6)  - strange attractors
+fluidballs []        (6)  - the physics of bouncing balls
+flush []             (n)  - Flush buffered output for a channel
+flushinp []          (3)  - miscellaneous curses utility routines
+fluxbox []           (1)  - A lightweight window manager for the X Windowing System
+fluxbox []           (1)  - remote - command line access to key commands for fluxbox(1)
+fluxbox []           (5)  - keys - keyboard shortcuts configuration for fluxbox(1)
+fluxstyle []         (1)  - A comprehensive look at styles/themes for fluxbox(1)
+flyingtoasters []    (6)  - 3d space-age jet-powered flying toasters (and toast)
+fma []               (3)  - floating-point multiply and add
+fmaf []              (3)  - floating-point multiply and add
+fmal []              (3)  - floating-point multiply and add
+fmax []              (3)  - determine maximum of two floating-point numbers
+fmaxf []             (3)  - determine maximum of two floating-point numbers
+fmaxl []             (3)  - determine maximum of two floating-point numbers
+fmemopen []          (3)  - open memory as stream
+fmin []              (3)  - determine minimum of two floating-point numbers
+fminf []             (3)  - determine minimum of two floating-point numbers
+fminl []             (3)  - determine minimum of two floating-point numbers
+fmod []              (3)  - floating-point remainder function
+fmodf []             (3)  - floating-point remainder function
+fmodl []             (3)  - floating-point remainder function
+fmt []               (1)  - simple optimal text formatter
+fmtmsg []            (3)  - print formatted error messages
+fnmatch []           (3)  - match filename or pathname
+focus []             (n)  - Manage the input focus
+fold []              (1)  - wrap each input line to fit in specified width
+font []              (n)  - Create and inspect fonts
+font2c []            (1)  - Write PostScript Type 0 or Type 1 font as C code
+fontglide []         (6)  - characters float onto the screen to form words
+fonts.conf []        (5)  - Font configuration files
+fonttosfnt []        (1)  - Wrap a bitmap font in a sfnt (TrueType) wrapper
+foomatic []          (1)  - rip - Universal print filter/RIP wrapper
+fopen []             (3)  - stream open functions
+fopencookie []       (3)  - opening a custom stream
+for []               (n)  - 'For' loop
+foreach []           (n)  - Iterate over all elements in one or more lists
+fork []              (2)  - create a child process
+forkpty []           (3)  - tty utility functions
+forktest []          (6)  - tests the vga_safety_fork() function
+form []              (3)  - curses extension for programming forms
+form_cursor []       (3)  - position a form window cursor
+form_data []         (3)  - test for off-screen data in given forms
+form_driver []       (3)  - command-processing loop of the form system
+form_field []        (3)  - make and break connections between fields and forms
+form_field_attributes [] (3)  - color and attribute control for form fields
+form_field_buffer [] (3)  - field buffer control
+form_field_info []   (3)  - retrieve field characteristics
+form_field_just []   (3)  - retrieve field characteristics
+form_field_new []    (3)  - create and destroy form fields
+form_field_opts []   (3)  - set and get field options
+form_field_userptr [] (3)  - associate application data with a form field
+form_field_validation [] (3)  - data type validation for fields
+form_fieldtype []    (3)  - define validation-field types
+form_hook []         (3)  - set hooks for automatic invocation by applications
+form_new []          (3)  - create and destroy forms
+form_new_page []     (3)  - form pagination functions
+form_opts []         (3)  - set and get form options
+form_page []         (3)  - set and get form page number
+form_post []         (3)  - write or erase forms from associated subwindows
+form_requestname []  (3)  - handle printable form request names
+form_userptr []      (3)  - associate application data with a form item
+form_win []          (3)  - make and break form window and subwindow associations
+formail []           (1)  - mail (re)formatter
+format []            (n)  - Format a string in the style of sprintf
+fortune []           (6)  - print a random, hopefully interesting, adage
+fpathconf []         (3)  - get configuration values for files
+fpclassify []        (3)  - floating-point classification macros
+fpit []              (4)  - Fujitsu Stylistic input driver
+fprint_description [] (3)  - mib_api functions
+fprint_objid []      (3)  - mib_api functions
+fprint_value []      (3)  - mib_api functions
+fprint_variable []   (3)  - mib_api functions
+fprintf []           (3)  - formatted output conversion
+fpurge []            (3)  - purge a stream
+fputc []             (3)  - output of characters and strings
+fputs []             (3)  - output of characters and strings
+fputwc []            (3)  - write a wide character to a FILE stream
+fputws []            (3)  - write a wide-character string to a FILE stream
+frame []             (n)  - Create and manipulate frame widgets
+fread []             (3)  - binary stream input/output
+free []              (1)  - Display amount of free and used memory in the system
+free []              (3)  - Allocate and free dynamic memory
+free_handle []       (3)  - file handle operations
+free_hugepages []    (2)  - allocate or free huge pages
+freeaddrinfo []      (3)  - network address and service translation
+freehostent []       (3)  - get network hostnames and addresses
+freeifaddrs []       (3)  - get interface addresses
+fremovexattr []      (2)  - remove an extended attribute
+freopen []           (3)  - stream open functions
+frexp []             (3)  - convert floating-point number to fractional and integral components
+frexpf []            (3)  - convert floating-point number to fractional and integral components
+frexpl []            (3)  - convert floating-point number to fractional and integral components
+frm []               (1)  - list from and subject of selected messages in mailbox or folder
+fromdos []           (1)  - convert DOS text file format to UNIX
+frontend []          (7)  - spec - interface between jw and its frontends
+fscanf []            (3)  - input format conversion
+fsck []              (8)  - check and repair a Linux file system
+fsck.minix []        (8)  - a file system consistency checker for Linux
+fsck.xfs []          (8)  - do nothing, successfully
+fseek []             (3)  - reposition a stream
+fseeko []            (3)  - seek to or report file position
+fsetpos []           (3)  - reposition a stream
+fsetxattr []         (2)  - set an extended attribute value
+fsf []               (7)  - funding - Funding Free Software
+fslsfonts []         (1)  - list fonts served by X font server
+fssetdm_by_handle [] (3)  - file handle operations
+fstab []             (5)  - static information about the filesystems
+fstab []             (8)  - decode - run a command with fstab-encoded arguments
+fstat []             (2)  - get file status
+fstatat []           (2)  - get file status relative to a directory file descriptor
+fstatfs []           (2)  - get file system statistics
+fstatvfs []          (2)  - get file system statistics
+fstobdf []           (1)  - generate BDF font from X font server
+fstopgm []           (1)  - convert a Usenix FaceSaver(tm) file into a portable graymap
+fsync []             (2)  - synchronize a file's in-core state with storage device
+ftell []             (3)  - reposition a stream
+ftello []            (3)  - seek to or report file position
+ftime []             (2)  - unimplemented system calls
+ftime []             (3)  - return date and time
+ftok []              (3)  - convert a pathname and a project identifier to a System V IPC key
+ftp []               (1)  - Internet file transfer program
+ftpcount []          (1)  - show current number of connections for each proftpd server configuration
+ftpdctl []           (8)  - ProFTPD control program
+ftpshut []           (8)  - shut down all proftpd servers at a given time
+ftptop []            (1)  - display running status on proftpd server connections
+ftpusers []          (5)  - list of users that may not log in via the FTP daemon
+ftpwho []            (1)  - show current process information for each FTP session
+ftruncate []         (2)  - truncate a file to a specified length
+ftrylockfile []      (3)  - lock FILE for stdio
+fts []               (3)  - traverse a file hierarchy
+fts_children []      (3)  - traverse a file hierarchy
+fts_close []         (3)  - traverse a file hierarchy
+fts_open []          (3)  - traverse a file hierarchy
+fts_read []          (3)  - traverse a file hierarchy
+fts_set []           (3)  - traverse a file hierarchy
+ftw []               (3)  - file tree walk
+full []              (4)  - always full device
+fun []               (6)  - draw pixels accumulating in clusters
+funlockfile []       (3)  - lock FILE for stdio
+funzip []            (1)  - filter for extracting from a ZIP archive in a pipe
+fuser []             (1)  - identify processes using files or sockets
+futex []             (2)  - Fast Userspace Locking system call
+futex []             (7)  - Fast Userspace Locking
+futimens []          (2)  - change file timestamps with nanosecond precision
+futimes []           (3)  - change file timestamps
+futimesat []         (2)  - change timestamps of a file relative to a directory file descriptor
+fuzzyflakes []       (6)  - falling snowflakes/flower shapes
+fvwm []              (1)  - config - query an existing FVWM installation
+fvwm []              (1)  - menu-desktop - builds Gnome and KDE menus and style commands for FVWM
+fvwm []              (1)  - menu-directory - builds a directory browsing menu for FVWM
+fvwm []              (1)  - menu-headlines - builds headlines menu definition for FVWM
+fvwm []              (1)  - menu-xlock - builds xlock menu definition for FVWM
+fvwm2 []             (1)  - F(?) Virtual Window Manager (version 2) for X11
+fvwm24_convert []    (1)  - convert FVWM 2.2.x configuration file to FVWM 2.4 syntax
+fvwmbug []           (1)  - report a bug in FVWM
+fvwmrc_convert []    (1)  - convert FVWM 1.xx configuration file to FVWM 2.xx style
+fwide []             (3)  - set and determine the orientation of a FILE stream
+fwprintf []          (3)  - formatted wide - character output conversion
+fwrite []            (3)  - binary stream input/output
+g3topbm []           (1)  - convert a Group 3 fax file into a portable bitmap
+gai_strerror []      (3)  - network address and service translation
+galaxy []            (6)  - draws spinning galaxies
+gamma []             (3)  - (logarithm of the) gamma function
+gamma4scanimage []   (1)  - create a gamma table for scanimage
+gammaf []            (3)  - (logarithm of the) gamma function
+gammal []            (3)  - (logarithm of the) gamma function
+gappletviewer []     (1)  - Load and runs an applet
+gawk []              (1)  - pattern scanning and processing language
+gc []                (1)  - analyze - Analyze Garbage Collector (GC) memory dumps
+gcc []               (1)  - GNU project C and C++ compiler
+gcc `pkg []          (3)  - config --libs --cflags caca` example.c -o example
+gccmakedep []        (1)  - create dependencies in makefiles using 'gcc -M'
+gcj []               (1)  - Ahead-of-time compiler for the Java language
+gcj []               (1)  - dbtool - Manipulate class file mapping databases for libgcj
+gcjh []              (1)  - - generate header files from Java class files
+gcov []              (1)  - coverage testing tool
+gcvt []              (3)  - convert a floating-point number to a string
+gdb []               (1)  - The GNU Debugger
+gdbserver []         (1)  - Remote Server for the GNU Debugger
+gdiffmk []           (1)  - mark differences between groff/nroff/troff files
+gdk []               (1)  - pixbuf-csource - C code generation utility for GdkPixbuf images
+gdk []               (1)  - pixbuf-query-loaders - GdkPixbuf loader registration utility
+gdk-pixbuf-csource   (1)  - C code generation utility for GdkPixbuf images
+gdk-pixbuf-query-loaders (1)  - GdkPixbuf loader registration utility
+gears []             (6)  - draw interlocking gears, for xscreensaver
+gemtopnm []          (1)  - convert a GEM .img file into a portable anymap
+gendiff []           (1)  - utility to aid in error-free diff file generation
+gendsa []            (1)  - generate a DSA private key from a set of parameters
+genpowerd []         (8)  - UPS monitor daemon
+genrsa []            (1)  - generate an RSA private key
+gentest []           (8)  - tests communication with UPS
+get_current_dir_name [] (3)  - Get current working directory
+get_kernel_syms []   (2)  - retrieve exported kernel and module symbols
+get_mempolicy []     (2)  - Retrieve NUMA memory policy for a process
+get_module_node []   (3)  - mib_api functions
+get_thread_area []   (2)  - Get a Thread Local Storage (TLS) area
+get_wch []           (3)  - get (or push back) a wide character from curses terminal keyboard
+get_wstr []          (3)  - get an array of wide characters from a curses terminal keyboard
+getaddrinfo []       (3)  - network address and service translation
+getafm []            (1)  - create an AFM file for a PostScript font
+getaliasbyname []    (3)  - read an alias entry
+getaliasbyname_r []  (3)  - read an alias entry
+getaliasent []       (3)  - read an alias entry
+getaliasent_r []     (3)  - read an alias entry
+getbegx []           (3)  - get curses cursor and window coordinates
+getbegy []           (3)  - get curses cursor and window coordinates
+getbegyx []          (3)  - get curses cursor and window coordinates
+getbkgd []           (3)  - curses window background manipulation routines
+getbkgrnd []         (3)  - curses window complex background manipulation routines
+getc []              (3)  - input of characters and strings
+getc_unlocked []     (3)  - non-locking stdio functions
+getcap []            (8)  - examine file capabilities
+getcchar []          (3)  - Get a wide character string and rendition from a cchar_t or set a cchar_t from a wide-character string
+getch []             (3)  - get (or push back) characters from curses terminal keyboard
+getchar []           (3)  - input of characters and strings
+getchar_unlocked []  (3)  - non-locking stdio functions
+getcontext []        (2)  - get or set the user context
+getcpu []            (2)  - determine CPU and NUMA node on which the calling thread is running
+getcurx []           (3)  - get curses cursor and window coordinates
+getcury []           (3)  - get curses cursor and window coordinates
+getcwd []            (3)  - Get current working directory
+getdate []           (3)  - convert a date-plus-time string to broken-down time
+getdate_r []         (3)  - convert a date-plus-time string to broken-down time
+getdelim []          (3)  - delimited string input
+getdents []          (2)  - get directory entries
+getdirentries []     (3)  - get directory entries in a file system-independent format
+getdomainname []     (2)  - get/set domain name
+getdtablesize []     (2)  - get descriptor table size
+getegid []           (2)  - get group identity
+getenv []            (3)  - get an environment variable
+geteuid []           (2)  - get user identity
+getfacl []           (1)  - get file access control lists
+getfattr []          (1)  - get extended attributes of filesystem objects
+getfdprm []          (1)  - print the current format information
+getfilename []       (1)  - Ask the user to name a file in a given format
+getfsent []          (3)  - handle fstab entries
+getfsfile []         (3)  - handle fstab entries
+getfsspec []         (3)  - handle fstab entries
+getgid []            (2)  - get group identity
+getgrent []          (3)  - get group file entry
+getgrent_r []        (3)  - get group file entry reentrantly
+getgrgid []          (3)  - get group file entry
+getgrgid_r []        (3)  - get group file entry
+getgrnam []          (3)  - get group file entry
+getgrnam_r []        (3)  - get group file entry
+getgrouplist []      (3)  - get list of groups to which a user belongs
+getgroups []         (2)  - get/set list of supplementary group IDs
+gethostbyaddr []     (3)  - get network host entry
+gethostbyaddr_r []   (3)  - get network host entry
+gethostbyname []     (3)  - get network host entry
+gethostbyname2 []    (3)  - get network host entry
+gethostbyname2_r []  (3)  - get network host entry
+gethostbyname_r []   (3)  - get network host entry
+gethostent []        (3)  - get network host entry
+gethostent_r []      (3)  - get network host entry
+gethostid []         (3)  - get or set the unique identifier of the current host
+gethostname []       (2)  - get/set hostname
+geticonset []        (1)  - gets the current Window Maker iconset
+getifaddrs []        (3)  - get interface addresses
+getipnodebyaddr []   (3)  - get network hostnames and addresses
+getipnodebyname []   (3)  - get network hostnames and addresses
+getitimer []         (2)  - get or set value of an interval timer
+getkeycodes []       (8)  - print kernel scancode-to-keycode mapping table
+getline []           (3)  - delimited string input
+getloadavg []        (3)  - get system load averages
+getlogin []          (3)  - get username
+getlogin_r []        (3)  - get username
+getmail []           (1)  - retrieve messages from one or more POP3, IMAP4, or SDPS mailboxes and deliver to a maildir, mboxrd-format mbox file, or external MDA
+getmail_fetch []     (1)  - retrieve messages from one or more POP3 or POP3-over-SSL mailboxes and deliver to a maildir, mboxrd-format mbox file, or external MDA
+getmail_maildir []   (1)  - read a message from stdin and deliver to a named maildir
+getmail_mbox []      (1)  - read a message from stdin and deliver to a named mboxrd-format mbox file with fcntl-style locking
+getmaxx []           (3)  - get curses cursor and window coordinates
+getmaxy []           (3)  - get curses cursor and window coordinates
+getmaxyx []          (3)  - get curses cursor and window coordinates
+getmntent []         (3)  - get file system descriptor file entry
+getmntent_r []       (3)  - get file system descriptor file entry
+getmouse []          (3)  - mouse interface through curses
+getn_wstr []         (3)  - get an array of wide characters from a curses terminal keyboard
+getnameinfo []       (3)  - address-to-name translation in protocol-independent manner
+getnetbyaddr []      (3)  - get network entry
+getnetbyname []      (3)  - get network entry
+getnetbyname_r []    (3)  - get network entry (reentrant)
+getnetbynumber_r []  (3)  - get network entry (reentrant)
+getnetent []         (3)  - get network entry
+getnetent_r []       (3)  - get network entry (reentrant)
+getnetgrent []       (3)  - handle network group entries
+getnetgrent_r []     (3)  - handle network group entries
+getnstr []           (3)  - accept character strings from curses terminal keyboard
+getopt []            (1)  - parse command options (enhanced)
+getopt []            (3)  - Parse command-line options
+getopt []            (3)  - Process single-character switches with switch clustering
+getopt_long []       (3)  - Parse command-line options
+getopt_long_only []  (3)  - Parse command-line options
+getopts []           (1)  - bash built-in commands, see bash(1)
+getopts []           (3)  - Process single-character switches with switch clustering
+getpagesize []       (2)  - get memory page size
+getparentpaths_by_handle [] (3)  - file handle operations
+getparents_by_handle [] (3)  - file handle operations
+getparx []           (3)  - get curses cursor and window coordinates
+getpary []           (3)  - get curses cursor and window coordinates
+getparyx []          (3)  - get curses cursor and window coordinates
+getpass []           (3)  - get a password
+getpeername []       (1)  - get information about this or that end of the socket's connection
+getpeername []       (2)  - get name of connected peer socket
+getpgid []           (2)  - set/get process group
+getpgrp []           (2)  - set/get process group
+getpid []            (2)  - get process identification
+getpmsg []           (2)  - unimplemented system calls
+getppid []           (2)  - get process identification
+getpriority []       (2)  - get/set program scheduling priority
+getprotobyname []    (3)  - get protocol entry
+getprotobyname_r []  (3)  - get protocol entry (reentrant)
+getprotobynumber []  (3)  - get protocol entry
+getprotobynumber_r [] (3)  - get protocol entry (reentrant)
+getprotoent []       (3)  - get protocol entry
+getprotoent_r []     (3)  - get protocol entry (reentrant)
+getpt []             (3)  - open the pseudo-terminal master (PTM)
+getpw []             (3)  - Re-construct password line entry
+getpwent []          (3)  - get password file entry
+getpwent_r []        (3)  - get passwd file entry reentrantly
+getpwnam []          (3)  - get password file entry
+getpwnam_r []        (3)  - get password file entry
+getpwuid []          (3)  - get password file entry
+getpwuid_r []        (3)  - get password file entry
+getresgid []         (2)  - get real, effective and saved user/group IDs
+getresuid []         (2)  - get real, effective and saved user/group IDs
+getrlimit []         (2)  - get/set resource limits
+getrpcbyname []      (3)  - get RPC entry
+getrpcbyname_r []    (3)  - get RPC entry (reentrant)
+getrpcbynumber []    (3)  - get RPC entry
+getrpcbynumber_r []  (3)  - get RPC entry (reentrant)
+getrpcent []         (3)  - get RPC entry
+getrpcent_r []       (3)  - get RPC entry (reentrant)
+getrpcport []        (3)  - get RPC port number
+getrusage []         (2)  - get resource usage
+gets []              (3)  - input of characters and strings
+gets []              (n)  - Read a line from a channel
+getservbyname []     (3)  - get service entry
+getservbyname_r []   (3)  - get service entry (reentrant)
+getservbyport []     (3)  - get service entry
+getservbyport_r []   (3)  - get service entry (reentrant)
+getservent []        (3)  - get service entry
+getservent_r []      (3)  - get service entry (reentrant)
+getsid []            (2)  - get session ID
+getsockname []       (2)  - get socket name
+getsockopt []        (2)  - get and set options on sockets
+getspent []          (3)  - get shadow password file entry
+getspent_r []        (3)  - get shadow password file entry
+getspnam []          (3)  - get shadow password file entry
+getspnam_r []        (3)  - get shadow password file entry
+getstr []            (3)  - accept character strings from curses terminal keyboard
+getstyle []          (1)  - dumps the current Window Maker style related configuration or creates a theme pack
+getsubopt []         (3)  - parse suboption arguments from a string
+getsyx []            (3)  - low-level curses routines
+gettext []           (1)  - translate message
+gettext []           (3)  - translate message
+gettextize []        (1)  - install or upgrade gettext infrastructure
+gettid []            (2)  - get thread identification
+gettimeofday []      (2)  - get / set time
+getttyent []         (3)  - get ttys file entry
+getttynam []         (3)  - get ttys file entry
+getty []             (1)  - sets terminal mode, speed, and conditions port
+gettydefs []         (5)  - speed and tty settings used by getty
+getuid []            (2)  - get user identity
+getumask []          (3)  - get file creation mask
+getusershell []      (3)  - get permitted user shells
+getutent []          (3)  - access utmp file entries
+getutid []           (3)  - access utmp file entries
+getutline []         (3)  - access utmp file entries
+getutmp []           (3)  - copy utmp structure to utmpx, and vice versa
+getutmpx []          (3)  - copy utmp structure to utmpx, and vice versa
+getw []              (3)  - input and output of words (ints)
+getwc []             (3)  - read a wide character from a FILE stream
+getwchar []          (3)  - read a wide character from standard input
+getwd []             (3)  - Get current working directory
+getwin []            (3)  - miscellaneous curses utility routines
+getxattr []          (2)  - retrieve an extended attribute value
+getyx []             (3)  - get curses cursor and window coordinates
+getzones []          (1)  - list AppleTalk zone names
+gfdl []              (7)  - GNU Free Documentation License
+gflux []             (6)  - rippling surface graphics hack
+gfortran []          (1)  - GNU Fortran compiler
+gftp []              (1)  - file transfer client for *NIX based machines
+gibi []              (7)  - decimal and binary prefixes
+gif2tiff []          (1)  - create a TIFF file from a GIF87 format image file
+giftopnm []          (1)  - convert a GIF file into a portable anymap
+giga []              (7)  - decimal and binary prefixes
+gij []               (1)  - GNU interpreter for Java bytecode
+gimp []              (1)  - an image manipulation and paint program
+gimp []              (1)  - remote - tells a running GIMP to open a (local or remote) image file
+gimprc []            (5)  - gimp configuration file
+gimptool []          (1)  - 2.0 - script to perform various GIMPy functions
+git []               (1)  - add - Add file contents to the index
+git []               (1)  - am - Apply a series of patches from a mailbox
+git []               (1)  - annotate - Annotate file lines with commit information
+git []               (1)  - apply - Apply a patch on a git index file and a working tree
+git []               (1)  - archimport - Import an Arch repository into git
+git []               (1)  - archive - Create an archive of files from a named tree
+git []               (1)  - bisect - Find by binary search the change that introduced a bug
+git []               (1)  - blame - Show what revision and author last modified each line of a file
+git []               (1)  - branch - List, create, or delete branches
+git []               (1)  - bundle - Move objects and refs by archive
+git []               (1)  - cat-file - Provide content or type and size information for repository objects
+git []               (1)  - check-attr - Display gitattributes information
+git []               (1)  - check-ref-format - Ensures that a reference name is well formed
+git []               (1)  - checkout - Checkout a branch or paths to the working tree
+git []               (1)  - checkout-index - Copy files from the index to the working tree
+git []               (1)  - cherry - Find commits not merged upstream
+git []               (1)  - cherry-pick - Apply the change introduced by an existing commit
+git []               (1)  - citool - Graphical alternative to git-commit
+git []               (1)  - clean - Remove untracked files from the working tree
+git []               (1)  - clone - Clone a repository into a new directory
+git []               (1)  - commit - Record changes to the repository
+git []               (1)  - commit-tree - Create a new commit object
+git []               (1)  - config - Get and set repository or global options
+git []               (1)  - count-objects - Count unpacked number of objects and their disk consumption
+git []               (1)  - cvsexportcommit - Export a single commit to a CVS checkout
+git []               (1)  - cvsimport - Salvage your data out of another SCM people love to hate
+git []               (1)  - cvsserver - A CVS server emulator for git
+git []               (1)  - daemon - A really simple server for git repositories
+git []               (1)  - describe - Show the most recent tag that is reachable from a commit
+git []               (1)  - diff - Show changes between commits, commit and working tree, etc
+git []               (1)  - diff-files - Compares files in the working tree and the index
+git []               (1)  - diff-index - Compares content and mode of blobs between the index and repository
+git []               (1)  - diff-tree - Compares the content and mode of blobs found via two tree objects
+git []               (1)  - fast-export - Git data exporter
+git []               (1)  - fast-import - Backend for fast Git data importers
+git []               (1)  - fetch - Download objects and refs from another repository
+git []               (1)  - fetch-pack - Receive missing objects from another repository
+git []               (1)  - filter-branch - Rewrite branches
+git []               (1)  - fmt-merge-msg - Produce a merge commit message
+git []               (1)  - for-each-ref - Output information on each ref
+git []               (1)  - format-patch - Prepare patches for e-mail submission
+git []               (1)  - fsck - Verifies the connectivity and validity of the objects in the database
+git []               (1)  - fsck-objects - Verifies the connectivity and validity of the objects in the database
+git []               (1)  - gc - Cleanup unnecessary files and optimize the local repository
+git []               (1)  - get-tar-commit-id - Extract commit ID from an archive created using git-archive
+git []               (1)  - grep - Print lines matching a pattern
+git []               (1)  - gui - A portable graphical interface to Git
+git []               (1)  - hash-object - Compute object ID and optionally creates a blob from a file
+git []               (1)  - help - display help information about git
+git []               (1)  - http-fetch - Download from a remote git repository via HTTP
+git []               (1)  - http-push - Push objects over HTTP/DAV to another repository
+git []               (1)  - imap-send - Send a collection of patches from stdin to an IMAP folder
+git []               (1)  - index-pack - Build pack index file for an existing packed archive
+git []               (1)  - init - Create an empty git repository or reinitialize an existing one
+git []               (1)  - init-db - Creates an empty git repository
+git []               (1)  - instaweb - Instantly browse your working repository in gitweb
+git []               (1)  - log - Show commit logs
+git []               (1)  - lost-found - Recover lost refs that luckily have not yet been pruned
+git []               (1)  - ls-files - Show information about files in the index and the working tree
+git []               (1)  - ls-remote - List references in a remote repository
+git []               (1)  - ls-tree - List the contents of a tree object
+git []               (1)  - mailinfo - Extracts patch and authorship from a single e-mail message
+git []               (1)  - mailsplit - Simple UNIX mbox splitter program
+git []               (1)  - merge - Join two or more development histories together
+git []               (1)  - merge-base - Find as good common ancestors as possible for a merge
+git []               (1)  - merge-file - Run a three-way file merge
+git []               (1)  - merge-index - Run a merge for files needing merging
+git []               (1)  - merge-one-file - The standard helper program to use with git-merge-index
+git []               (1)  - merge-tree - Show three-way merge without touching index
+git []               (1)  - mergetool - Run merge conflict resolution tools to resolve merge conflicts
+git []               (1)  - mktag - Creates a tag object
+git []               (1)  - mktree - Build a tree-object from ls-tree formatted text
+git []               (1)  - mv - Move or rename a file, a directory, or a symlink
+git []               (1)  - name-rev - Find symbolic names for given revs
+git []               (1)  - pack-objects - Create a packed archive of objects
+git []               (1)  - pack-redundant - Find redundant pack files
+git []               (1)  - pack-refs - Pack heads and tags for efficient repository access
+git []               (1)  - parse-remote - Routines to help parsing remote repository access parameters
+git []               (1)  - patch-id - Compute unique ID for a patch
+git []               (1)  - peek-remote - List the references in a remote repository
+git []               (1)  - prune - Prune all unreachable objects from the object database
+git []               (1)  - prune-packed - Remove extra objects that are already in pack files
+git []               (1)  - pull - Fetch from and merge with another repository or a local branch
+git []               (1)  - push - Update remote refs along with associated objects
+git []               (1)  - quiltimport - Applies a quilt patchset onto the current branch
+git []               (1)  - read-tree - Reads tree information into the index
+git []               (1)  - rebase - Forward-port local commits to the updated upstream head
+git []               (1)  - receive-pack - Receive what is pushed into the repository
+git []               (1)  - reflog - Manage reflog information
+git []               (1)  - relink - Hardlink common objects in local repositories
+git []               (1)  - remote - manage set of tracked repositories
+git []               (1)  - repack - Pack unpacked objects in a repository
+git []               (1)  - repo-config - Get and set repository or global options
+git []               (1)  - request-pull - Generates a summary of pending changes
+git []               (1)  - rerere - Reuse recorded resolution of conflicted merges
+git []               (1)  - reset - Reset current HEAD to the specified state
+git []               (1)  - rev-list - Lists commit objects in reverse chronological order
+git []               (1)  - rev-parse - Pick out and massage parameters
+git []               (1)  - revert - Revert an existing commit
+git []               (1)  - rm - Remove files from the working tree and from the index
+git []               (1)  - send-email - Send a collection of patches as emails
+git []               (1)  - send-pack - Push objects over git protocol to another repository
+git []               (1)  - sh-setup - Common git shell script setup code
+git []               (1)  - shell - Restricted login shell for GIT-only SSH access
+git []               (1)  - shortlog - Summarize 'git-log' output
+git []               (1)  - show - Show various types of objects
+git []               (1)  - show-branch - Show branches and their commits
+git []               (1)  - show-index - Show packed archive index
+git []               (1)  - show-ref - List references in a local repository
+git []               (1)  - stage - Add file contents to the staging area
+git []               (1)  - stash - Stash the changes in a dirty working directory away
+git []               (1)  - status - Show the working tree status
+git []               (1)  - stripspace - Filter out empty lines
+git []               (1)  - submodule - Initialize, update or inspect submodules
+git []               (1)  - svn - Bidirectional operation between a single Subversion branch and git
+git []               (1)  - symbolic-ref - Read and modify symbolic refs
+git []               (1)  - tag - Create, list, delete or verify a tag object signed with GPG
+git []               (1)  - tar-tree - Create a tar archive of the files in the named tree object
+git []               (1)  - the stupid content tracker
+git []               (1)  - unpack-file - Creates a temporary file with a blob's contents
+git []               (1)  - unpack-objects - Unpack objects from a packed archive
+git []               (1)  - update-index - Register file contents in the working tree to the index
+git []               (1)  - update-ref - Update the object name stored in a ref safely
+git []               (1)  - update-server-info - Update auxiliary info file to help dumb servers
+git []               (1)  - upload-archive - Send archive back to git-archive
+git []               (1)  - upload-pack - Send objects packed back to git-fetch-pack
+git []               (1)  - var - Show a git logical variable
+git []               (1)  - verify-pack - Validate packed git archive files
+git []               (1)  - verify-tag - Check the GPG signature of tags
+git []               (1)  - web--browse - git helper script to launch a web browser
+git []               (1)  - whatchanged - Show logs with difference each commit introduces
+git []               (1)  - write-tree - Create a tree object from the current index
+gitattributes []     (5)  - defining attributes per path
+gitcli []            (7)  - git command line interface and conventions
+gitcore []           (7)  - tutorial - A git core tutorial for developers
+gitcvs []            (7)  - migration - git for CVS users
+gitdiffcore []       (7)  - Tweaking diff output (June 2005)
+gitglossary []       (7)  - A GIT Glossary
+githooks []          (5)  - Hooks used by git
+gitignore []         (5)  - Specifies intentionally untracked files to ignore
+gitk []              (1)  - The git repository browser
+gitmodules []        (5)  - defining submodule properties
+gitrepository []     (5)  - layout - Git Repository Layout
+gittutorial []       (7)  - 2 - A tutorial introduction to git: part two
+gittutorial []       (7)  - A tutorial introduction to git (for version 1.5.1 or newer)
+gitworkflows []      (7)  - An overview of recommended workflows with git
+gjar []              (1)  - - Archive tool for Java archives
+gjarsigner []        (1)  - Java ARchive (JAR) file signing and verification tool
+gjavah []            (1)  - - generate header files from Java class files
+gkeytool []          (1)  - Manage private keys and public certificates
+gkrellm []           (1)  - The GNU Krell Monitors
+gkrellmd []          (1)  - The GNU Krell Monitors Server
+gl_allocatecontext [] (3)  - allocate a graphics context
+gl_bcircle []        (3)  - draw a filled or unfilled Bresenham circle
+gl_circle []         (3)  - draw a circle
+gl_clearscreen []    (3)  - clear the screen
+gl_colorfont []      (3)  - change the color of a font
+gl_compileboxmask [] (3)  - compress a masked bitmap
+gl_compiledboxmasksize [] (3)  - compute the size of a compiled masked box
+gl_copybox []        (3)  - copy a rectangular screen area
+gl_copyboxfromcontext [] (3)  - copy rectangular area from another context
+gl_copyboxtocontext [] (3)  - copy a rectangular area to another context
+gl_copyscreen []     (3)  - copy the screen contents of contexts
+gl_disableclipping [] (3)  - disables clipping
+gl_enableclipping [] (3)  - enables clipping
+gl_enablepageflipping [] (3)  - enables automatic page flipping
+gl_expandfont []     (3)  - expand a packed pixel font
+gl_fillbox []        (3)  - fill a rectangular area
+gl_fillcircle []     (3)  - draw a filled circle
+gl_font8x8 []        (3)  - a packed 8x8 pixel font
+gl_freecontext []    (3)  - free a virtual screen
+gl_getbox []         (3)  - copy a rectangular pixmap from the screen to a buffer
+gl_getcontext []     (3)  - get the current graphics contents
+gl_getpalette []     (3)  - read the color palette
+gl_getpalettecolor [] (3)  - read the color palette
+gl_getpalettecolors [] (3)  - read the color palette
+gl_getpixel []       (3)  - return the color of a pixel
+gl_getpixelrgb []    (3)  - store color components of a pixel
+gl_hline []          (3)  - draw a horizontal line
+gl_line []           (3)  - draw a line
+gl_printf []         (3)  - write formatted output in graphic mode
+gl_putbox []         (3)  - copy a pixmap to a rectangular area
+gl_putboxmask []     (3)  - copy a masked pixmap to a rectangular area
+gl_putboxmaskcompiled [] (3)  - copy a compiled masked pixmap to a rectangular area
+gl_putboxpart []     (3)  - copy a partial pixmap to a rectangular area
+gl_rgbcolor []       (3)  - return pixel value corresponding to an rgb color
+gl_scalebox []       (3)  - scale a pixmap
+gl_setclippingwindow [] (3)  - set the clipping window
+gl_setcontext []     (3)  - set a previously saved context
+gl_setcontextheight [] (3)  - set the dimension of a context
+gl_setcontextvga []  (3)  - set the context to the physical screen
+gl_setcontextvgavirtual [] (3)  - set the context to a virtual mode
+gl_setcontextvirtual [] (3)  - define a virtual context
+gl_setcontextwidth [] (3)  - set the dimension of a context
+gl_setdisplaystart [] (3)  - set the start of the screen are displayed
+gl_setfont []        (3)  - set the text font to be used
+gl_setfontcolors []  (3)  - set the font colors
+gl_setpalette []     (3)  - set the color palette
+gl_setpalettecolor [] (3)  - set the color palette
+gl_setpalettecolors [] (3)  - set the color palette
+gl_setpixel []       (3)  - draw a pixel
+gl_setpixelrgb []    (3)  - draw a pixel
+gl_setrgbpalette []  (3)  - set a 256-color RGB palette
+gl_setscreenoffset [] (3)  - set a memory offset for copyscreen
+gl_setwritemode []   (3)  - set the font writemode flags
+gl_striangle []      (3)  - draw a solid colored triangle
+gl_swtriangle []     (3)  - draw a solid pixmap mapped on a triangle
+gl_triangle []       (3)  - draw a triangle with interpolated colors
+gl_trigetcolorlookup [] (3)  - manages a color lookup table for shadowing
+gl_trisetcolorlookup [] (3)  - manages a color lookup table for shadowing
+gl_trisetdrawpoint [] (3)  - set a triangle drawing function
+gl_write []          (3)  - write a text string
+gl_writen []         (3)  - write a text string
+gl_wtriangle []      (3)  - draw a shadowed pixmap mapped on a triangle
+glblur []            (6)  - 3D radial blur texture fields
+glcells []           (6)  - growing cells graphics hack
+gleidescope []       (6)  - a tiled OpenGL kaleidescope
+glhanoi []           (6)  - OpenGL Towers of Hanoi
+glib []              (1)  - config - script to get information about the installed version of GLib
+glib []              (1)  - genmarshal - C code marshaller generation utility for GLib closures
+glib []              (1)  - gettextize - gettext internationalization utility
+glib []              (1)  - mkenums - C language enum description generation utility
+glint []             (4)  - GLINT/Permedia video driver
+glknots []           (6)  - generates some twisting 3d knot patterns
+glmatrix []          (6)  - simulates the title sequence effect of the movie
+glob []              (3)  - find pathnames matching a pattern, free memory from glob()
+glob []              (7)  - Globbing pathnames
+glob []              (n)  - Return names of files that match patterns
+global []            (n)  - Access global variables
+globaltime           (1)  - International multiclock timeconverter for the Xfce Desktop Environment. It is part of Orage
+globaltime []        (1)  - International multiclock timeconverter for the Xfce Desktop Environment. It is part of Orage
+globfree []          (3)  - find pathnames matching a pattern, free memory from glob()
+glplanet []          (6)  - rotating 3d texture-mapped planet
+glschool []          (6)  - a 3D schooling simulation
+glslideshow []       (6)  - slideshow of images using smooth zooming and fades
+glsnake []           (6)  - OpenGL enhanced Rubik's Snake cyclewaster
+gltext []            (6)  - draws text spinning around in 3D
+gmtime []            (3)  - transform date and time to broken-down time or ASCII
+gmtime_r []          (3)  - transform date and time to broken-down time or ASCII
+gnative2ascii []     (1)  - - An encoding converter
+gnu_get_libc_release [] (3)  - get glibc version and release
+gnu_get_libc_version [] (3)  - get glibc version and release
+gnuplot []           (1)  - an interactive plotting program
+gnutls []            (1)  - cli - GNU TLS test client
+gnutls []            (1)  - cli-debug - GNU TLS test client, with verbose output
+gnutls []            (1)  - serv - GNU TLS test server
+gnutls_alert_get []  (3)  - Returns the last alert number received
+gnutls_alert_get_name [] (3)  - Returns a string describing the alert number given
+gnutls_alert_send [] (3)  - send an alert message to the peer
+gnutls_alert_send_appropriate [] (3)  - send alert to peer depending on error code
+gnutls_anon_allocate_client_credentials [] (3)  - Used to allocate a credentials structure
+gnutls_anon_allocate_server_credentials [] (3)  - Used to allocate an gnutls_anon_server_credentials_t structure
+gnutls_anon_free_client_credentials [] (3)  - Used to free an allocated gnutls_anon_client_credentials_t structure
+gnutls_anon_free_server_credentials [] (3)  - Used to free an allocated gnutls_anon_server_credentials_t structure
+gnutls_anon_set_params_function [] (3)  - set the DH or RSA parameters callback
+gnutls_anon_set_server_dh_params [] (3)  - set the DH parameters for a server to use
+gnutls_anon_set_server_params_function [] (3)  - set the DH parameters callback
+gnutls_auth_client_get_type [] (3)  - Returns the type of credentials for the client authentication schema
+gnutls_auth_get_type [] (3)  - Returns the type of credentials for the current authentication schema
+gnutls_auth_server_get_type [] (3)  - Returns the type of credentials for the server authentication schema
+gnutls_bye []        (3)  - terminate the current TLS/SSL connection
+gnutls_certificate_activation_time_peers [] (3)  - return the peer's certificate activation time
+gnutls_certificate_allocate_credentials [] (3)  - Used to allocate a gnutls_certificate_credentials_t structure
+gnutls_certificate_client_get_request_status [] (3)  - return the certificate request status
+gnutls_certificate_client_set_retrieve_function [] (3)  - Used to set a callback to retrieve the certificate
+gnutls_certificate_expiration_time_peers [] (3)  - return the peer's certificate expiration time
+gnutls_certificate_free_ca_names [] (3)  - Used to free all the CA names from a gnutls_certificate_credentials_t structure
+gnutls_certificate_free_cas [] (3)  - Used to free all the CAs from a gnutls_certificate_credentials_t structure
+gnutls_certificate_free_credentials [] (3)  - Used to free an allocated gnutls_certificate_credentials_t structure
+gnutls_certificate_free_crls [] (3)  - Used to free all the CRLs from a gnutls_certificate_credentials_t structure
+gnutls_certificate_free_keys [] (3)  - Used to free all the keys from a gnutls_certificate_credentials_t structure
+gnutls_certificate_get_openpgp_keyring [] (3)  - Used to export the keyring from a gnutls_certificate_credentials_t structure
+gnutls_certificate_get_ours [] (3)  - return the raw certificate sent in the last handshake
+gnutls_certificate_get_peers [] (3)  - return the peer's raw certificate
+gnutls_certificate_get_x509_cas [] (3)  - Used to export all the CAs from a gnutls_certificate_credentials_t structure
+gnutls_certificate_get_x509_crls [] (3)  - Used to export all the CRLs from a gnutls_certificate_credentials_t structure
+gnutls_certificate_send_x509_rdn_sequence [] (3)  - order gnutls to send or not the x.509 rdn sequence
+gnutls_certificate_server_set_request [] (3)  - Used to set whether to request a client certificate
+gnutls_certificate_server_set_retrieve_function [] (3)  - Used to set a callback to retrieve the certificate
+gnutls_certificate_set_dh_params [] (3)  - set the DH parameters for a server to use
+gnutls_certificate_set_openpgp_key [] (3)  - Used to set keys in a gnutls_certificate_credentials_t structure
+gnutls_certificate_set_openpgp_key_file [] (3)  - Used to set OpenPGP keys
+gnutls_certificate_set_openpgp_key_file2 [] (3)  - Used to set OpenPGP keys
+gnutls_certificate_set_openpgp_key_mem [] (3)  - Used to set OpenPGP keys
+gnutls_certificate_set_openpgp_key_mem2 [] (3)  - Used to set OpenPGP keys
+gnutls_certificate_set_openpgp_keyring_file [] (3)  - Sets a keyring file for OpenPGP
+gnutls_certificate_set_openpgp_keyring_mem [] (3)  - Add keyring data for OpenPGP
+gnutls_certificate_set_params_function [] (3)  - set the DH or RSA parameters callback
+gnutls_certificate_set_rsa_export_params [] (3)  - set the RSA parameters for a server to use
+gnutls_certificate_set_verify_flags [] (3)  - set the flags to be used at certificate verification
+gnutls_certificate_set_verify_limits [] (3)  - set the upper limits to be used at certificate verification
+gnutls_certificate_set_x509_crl [] (3)  - Used to add CRLs in a gnutls_certificate_credentials_t structure
+gnutls_certificate_set_x509_crl_file [] (3)  - Used to add CRLs in a gnutls_certificate_credentials_t structure
+gnutls_certificate_set_x509_crl_mem [] (3)  - Used to add CRLs in a gnutls_certificate_credentials_t structure
+gnutls_certificate_set_x509_key [] (3)  - Used to set keys in a gnutls_certificate_credentials_t structure
+gnutls_certificate_set_x509_key_file [] (3)  - Used to set keys in a gnutls_certificate_credentials_t structure
+gnutls_certificate_set_x509_key_mem [] (3)  - Used to set keys in a gnutls_certificate_credentials_t structure
+gnutls_certificate_set_x509_simple_pkcs12_file [] (3)  - API function
+gnutls_certificate_set_x509_trust [] (3)  - Used to add trusted CAs in a gnutls_certificate_credentials_t structure
+gnutls_certificate_set_x509_trust_file [] (3)  - Used to add trusted CAs in a gnutls_certificate_credentials_t structure
+gnutls_certificate_set_x509_trust_mem [] (3)  - Used to add trusted CAs in a gnutls_certificate_credentials_t structure
+gnutls_certificate_type_get [] (3)  - Returns the currently used certificate type
+gnutls_certificate_type_get_id [] (3)  - Returns the gnutls id of the specified in string type
+gnutls_certificate_type_get_name [] (3)  - Returns a string with the name of the specified certificate type
+gnutls_certificate_type_list [] (3)  - Get a list of supported certificate types
+gnutls_certificate_type_set_priority [] (3)  - Sets the priority on the certificate types supported by gnutls
+gnutls_certificate_verify_peers [] (3)  - return the peer's certificate verification status
+gnutls_certificate_verify_peers2 [] (3)  - return the peer's certificate verification status
+gnutls_check_version [] (3)  - check the library's version
+gnutls_cipher_get [] (3)  - Returns the currently used cipher
+gnutls_cipher_get_id [] (3)  - Returns the gnutls id of the specified in string algorithm
+gnutls_cipher_get_key_size [] (3)  - Returns the length of the cipher's key size
+gnutls_cipher_get_name [] (3)  - Returns a string with the name of the specified cipher algorithm
+gnutls_cipher_list [] (3)  - Get a list of supported ciphers
+gnutls_cipher_set_priority [] (3)  - Sets the priority on the ciphers supported by gnutls
+gnutls_cipher_suite_get_name [] (3)  - Returns a string with the name of the specified cipher suite
+gnutls_cipher_suite_info [] (3)  - API function
+gnutls_compression_get [] (3)  - Returns the currently used compression algorithm
+gnutls_compression_get_id [] (3)  - Returns the gnutls id of the specified in string algorithm
+gnutls_compression_get_name [] (3)  - Returns a string with the name of the specified compression algorithm
+gnutls_compression_list [] (3)  - Get a list of supported compression methods
+gnutls_compression_set_priority [] (3)  - Sets the priority on the compression algorithms supported by gnutls
+gnutls_credentials_clear [] (3)  - Clears all the credentials previously set
+gnutls_credentials_set [] (3)  - Sets the needed credentials for the specified authentication algorithm
+gnutls_crypto_bigint_register2 [] (3)  - register a bigint interface
+gnutls_crypto_cipher_register2 [] (3)  - register a cipher interface
+gnutls_crypto_digest_register2 [] (3)  - register a digest interface
+gnutls_crypto_mac_register2 [] (3)  - register a mac interface
+gnutls_crypto_pk_register2 [] (3)  - register a public key interface
+gnutls_crypto_rnd_register2 [] (3)  - register a random generator
+gnutls_crypto_single_cipher_register2 [] (3)  - register a cipher algorithm
+gnutls_crypto_single_digest_register2 [] (3)  - register a digest algorithm
+gnutls_crypto_single_mac_register2 [] (3)  - register a MAC algorithm
+gnutls_db_check_entry [] (3)  - check if the given db entry has expired
+gnutls_db_get_ptr [] (3)  - Returns the pointer which is sent to db functions
+gnutls_db_remove_session [] (3)  - remove the current session data from the database
+gnutls_db_set_cache_expiration [] (3)  - Set the expiration time for resumed sessions
+gnutls_db_set_ptr [] (3)  - Set a pointer to be sent to db functions
+gnutls_db_set_remove_function [] (3)  - Set the function that will be used to remove data
+gnutls_db_set_retrieve_function [] (3)  - Set the function that will be used to get data
+gnutls_db_set_store_function [] (3)  - Set the function that will be used to put data
+gnutls_deinit []     (3)  - clear all buffers associated with a session
+gnutls_dh_get_group [] (3)  - return the group of the DH authentication
+gnutls_dh_get_peers_public_bits [] (3)  - return the bits used in DH authentication
+gnutls_dh_get_prime_bits [] (3)  - return the bits used in DH authentication
+gnutls_dh_get_pubkey [] (3)  - return the peer's public key used in DH authentication
+gnutls_dh_get_secret_bits [] (3)  - return the bits used in DH authentication
+gnutls_dh_params_cpy [] (3)  - copy a DH parameters structure
+gnutls_dh_params_deinit [] (3)  - deinitialize the DH parameters
+gnutls_dh_params_export_pkcs3 [] (3)  - export DH params to a pkcs3 structure
+gnutls_dh_params_export_raw [] (3)  - export the raw DH parameters
+gnutls_dh_params_generate2 [] (3)  - generate new DH parameters
+gnutls_dh_params_import_pkcs3 [] (3)  - import DH params from a pkcs3 structure
+gnutls_dh_params_import_raw [] (3)  - import DH parameters
+gnutls_dh_params_init [] (3)  - initialize the DH parameters
+gnutls_dh_set_prime_bits [] (3)  - Used to set the bits for a DH ciphersuite
+gnutls_error_is_fatal [] (3)  - Returns non-zero in case of a fatal error
+gnutls_error_to_alert [] (3)  - return an alert code based on the given error code
+gnutls_ext_register [] (3)  - Register a handler for a TLS extension
+gnutls_extra_check_version [] (3)  - This function checks the library's version
+gnutls_fingerprint [] (3)  - calculate the fingerprint of the given data
+gnutls_free []       (3)  - Returns a free() like function
+gnutls_global_deinit [] (3)  - deinitialize the global data
+gnutls_global_init [] (3)  - initialize the global data to defaults
+gnutls_global_init_extra [] (3)  - initializes the global state of gnutls-extra
+gnutls_global_set_log_function [] (3)  - set the logging function
+gnutls_global_set_log_level [] (3)  - set the logging level
+gnutls_global_set_mem_functions [] (3)  - set the memory allocation functions
+gnutls_handshake []  (3)  - This is the main function in the handshake protocol
+gnutls_handshake_get_last_in [] (3)  - Returns the last handshake message received
+gnutls_handshake_get_last_out [] (3)  - Returns the last handshake message sent
+gnutls_handshake_set_max_packet_length [] (3)  - set the maximum size of the handshake
+gnutls_handshake_set_post_client_hello_function [] (3)  - set callback to be called after the client hello is received
+gnutls_handshake_set_private_extensions [] (3)  - Used to enable the private cipher suites
+gnutls_hex2bin []    (3)  - convert hex string into binary buffer
+gnutls_hex_decode [] (3)  - decode hex encoded data
+gnutls_hex_encode [] (3)  - convert raw data to hex encoded
+gnutls_ia_allocate_client_credentials [] (3)  - Used to allocate an gnutls_ia_server_credentials_t structure
+gnutls_ia_allocate_server_credentials [] (3)  - Used to allocate an gnutls_ia_server_credentials_t structure
+gnutls_ia_enable []  (3)  - Indicate willingness for TLS/IA application phases
+gnutls_ia_endphase_send [] (3)  - API function
+gnutls_ia_extract_inner_secret [] (3)  - API function
+gnutls_ia_free_client_credentials [] (3)  - Used to free an allocated #gnutls_ia_client_credentials_t structure
+gnutls_ia_free_server_credentials [] (3)  - Used to free an allocated #gnutls_ia_server_credentials_t structure
+gnutls_ia_generate_challenge [] (3)  - API function
+gnutls_ia_get_client_avp_ptr [] (3)  - Returns the pointer which is sent to TLS/IA callback
+gnutls_ia_get_server_avp_ptr [] (3)  - Returns the pointer which is sent to TLS/IA callback
+gnutls_ia_handshake [] (3)  - API function
+gnutls_ia_handshake_p [] (3)  - API function
+gnutls_ia_permute_inner_secret [] (3)  - API function
+gnutls_ia_recv []    (3)  - read data from the TLS/IA protocol
+gnutls_ia_send []    (3)  - API function
+gnutls_ia_set_client_avp_function [] (3)  - Used to set a AVP callback
+gnutls_ia_set_client_avp_ptr [] (3)  - Sets a pointer to be sent to TLS/IA callback
+gnutls_ia_set_server_avp_function [] (3)  - Used to set a AVP callback
+gnutls_ia_set_server_avp_ptr [] (3)  - Sets a pointer to be sent to TLS/IA callback
+gnutls_ia_verify_endphase [] (3)  - API function
+gnutls_init []       (3)  - initialize the session to null (null encryption etc...)
+gnutls_kx_get []     (3)  - Returns the key exchange algorithm
+gnutls_kx_get_id []  (3)  - Returns the gnutls id of the specified in string algorithm
+gnutls_kx_get_name [] (3)  - Returns a string with the name of the specified key exchange algorithm
+gnutls_kx_list []    (3)  - Get a list of supported key exchange methods
+gnutls_kx_set_priority [] (3)  - Sets the priority on the key exchange algorithms supported by gnutls
+gnutls_mac_get []    (3)  - Returns the currently used mac algorithm
+gnutls_mac_get_id [] (3)  - Returns the gnutls id of the specified in string algorithm
+gnutls_mac_get_key_size [] (3)  - Returns the length of the MAC's key size
+gnutls_mac_get_name [] (3)  - Returns a string with the name of the specified mac algorithm
+gnutls_mac_list []   (3)  - Get a list of supported MAC algorithms
+gnutls_mac_set_priority [] (3)  - Sets the priority on the mac algorithms supported by gnutls
+gnutls_malloc []     (3)  - Allocates and returns data
+gnutls_openpgp_crt_check_hostname [] (3)  - compare hostname with the key's hostname
+gnutls_openpgp_crt_deinit [] (3)  - deinitialize memory used by a #gnutls_openpgp_crt_t structure
+gnutls_openpgp_crt_export [] (3)  - export a RAW or BASE64 encoded key
+gnutls_openpgp_crt_get_auth_subkey [] (3)  - Gets the keyID of an authentication subkey
+gnutls_openpgp_crt_get_creation_time [] (3)  - Extract the timestamp
+gnutls_openpgp_crt_get_expiration_time [] (3)  - Extract the expire date
+gnutls_openpgp_crt_get_fingerprint [] (3)  - Gets the fingerprint
+gnutls_openpgp_crt_get_key_id [] (3)  - Gets the keyID
+gnutls_openpgp_crt_get_key_usage [] (3)  - This function returns the key's usage
+gnutls_openpgp_crt_get_name [] (3)  - Extracts the userID
+gnutls_openpgp_crt_get_pk_algorithm [] (3)  - return the key's PublicKey algorithm
+gnutls_openpgp_crt_get_pk_dsa_raw [] (3)  - export the DSA public key
+gnutls_openpgp_crt_get_pk_rsa_raw [] (3)  - export the RSA public key
+gnutls_openpgp_crt_get_preferred_key_id [] (3)  - Gets the preferred keyID
+gnutls_openpgp_crt_get_revoked_status [] (3)  - Gets the revoked status of the key
+gnutls_openpgp_crt_get_subkey_count [] (3)  - return the number of subkeys
+gnutls_openpgp_crt_get_subkey_creation_time [] (3)  - Extract the timestamp
+gnutls_openpgp_crt_get_subkey_expiration_time [] (3)  - Extract the expire date
+gnutls_openpgp_crt_get_subkey_fingerprint [] (3)  - Gets the fingerprint of a subkey
+gnutls_openpgp_crt_get_subkey_id [] (3)  - Gets the keyID
+gnutls_openpgp_crt_get_subkey_idx [] (3)  - Returns the subkey's index
+gnutls_openpgp_crt_get_subkey_pk_algorithm [] (3)  - return the subkey's PublicKey algorithm
+gnutls_openpgp_crt_get_subkey_pk_dsa_raw [] (3)  - export the DSA public key
+gnutls_openpgp_crt_get_subkey_pk_rsa_raw [] (3)  - export the RSA public key
+gnutls_openpgp_crt_get_subkey_revoked_status [] (3)  - Gets the revoked status of the key
+gnutls_openpgp_crt_get_subkey_usage [] (3)  - returns the key's usage
+gnutls_openpgp_crt_get_version [] (3)  - Extracts the version of the key
+gnutls_openpgp_crt_import [] (3)  - import a RAW or BASE64 encoded key
+gnutls_openpgp_crt_init [] (3)  - initialize a #gnutls_openpgp_crt_t structure
+gnutls_openpgp_crt_print [] (3)  - Pretty print OpenPGP certificates
+gnutls_openpgp_crt_set_preferred_key_id [] (3)  - Sets the prefered keyID
+gnutls_openpgp_crt_verify_ring [] (3)  - Verify all signatures in the key
+gnutls_openpgp_crt_verify_self [] (3)  - Verify the self signature on the key
+gnutls_openpgp_keyring_check_id [] (3)  - Check if a key id exists in the keyring
+gnutls_openpgp_keyring_deinit [] (3)  - deinitializes memory used by a #gnutls_openpgp_keyring_t structure
+gnutls_openpgp_keyring_get_crt [] (3)  - export an openpgp certificate from a keyring
+gnutls_openpgp_keyring_get_crt_count [] (3)  - return the number of certificates
+gnutls_openpgp_keyring_import [] (3)  - Import a raw- or Base64-encoded keyring
+gnutls_openpgp_keyring_init [] (3)  - initializes a #gnutls_openpgp_keyring_t structure
+gnutls_openpgp_privkey_deinit [] (3)  - deinitializes memory used by a #gnutls_openpgp_privkey_t structure
+gnutls_openpgp_privkey_export [] (3)  - export a RAW or BASE64 encoded key
+gnutls_openpgp_privkey_export_dsa_raw [] (3)  - This function will export the DSA private key
+gnutls_openpgp_privkey_export_rsa_raw [] (3)  - This function will export the RSA private key
+gnutls_openpgp_privkey_export_subkey_dsa_raw [] (3)  - export the DSA private key
+gnutls_openpgp_privkey_export_subkey_rsa_raw [] (3)  - export the RSA private key
+gnutls_openpgp_privkey_get_fingerprint [] (3)  - Gets the fingerprint
+gnutls_openpgp_privkey_get_key_id [] (3)  - Gets the keyID
+gnutls_openpgp_privkey_get_pk_algorithm [] (3)  - return the key's PublicKey algorithm
+gnutls_openpgp_privkey_get_preferred_key_id [] (3)  - Gets the preferred keyID
+gnutls_openpgp_privkey_get_revoked_status [] (3)  - Get the revoked status of the key
+gnutls_openpgp_privkey_get_subkey_count [] (3)  - return the number of subkeys
+gnutls_openpgp_privkey_get_subkey_creation_time [] (3)  - Extract the timestamp
+gnutls_openpgp_privkey_get_subkey_expiration_time [] (3)  - Extract the expire date
+gnutls_openpgp_privkey_get_subkey_fingerprint [] (3)  - Gets the fingerprint of a subkey
+gnutls_openpgp_privkey_get_subkey_id [] (3)  - Gets the keyID
+gnutls_openpgp_privkey_get_subkey_idx [] (3)  - Returns the subkey's index
+gnutls_openpgp_privkey_get_subkey_pk_algorithm [] (3)  - return the subkey's PublicKey algorithm
+gnutls_openpgp_privkey_get_subkey_revoked_status [] (3)  - Get the revoked status of the key
+gnutls_openpgp_privkey_import [] (3)  - import a RAW or BASE64 encoded key
+gnutls_openpgp_privkey_init [] (3)  - initializes a #gnutls_openpgp_privkey_t structure
+gnutls_openpgp_privkey_set_preferred_key_id [] (3)  - Set the prefered keyID
+gnutls_openpgp_privkey_sign_hash [] (3)  - sign the given data using the private key params
+gnutls_openpgp_send_cert [] (3)  - order gnutls to send the openpgp fingerprint instead of the key
+gnutls_openpgp_set_recv_key_function [] (3)  - Used to set a key retrieval callback for PGP keys
+gnutls_oprfi_enable_client [] (3)  - API function
+gnutls_oprfi_enable_server [] (3)  - API function
+gnutls_pem_base64_decode [] (3)  - decode base64 encoded data
+gnutls_pem_base64_decode_alloc [] (3)  - decode base64 encoded data
+gnutls_pem_base64_encode [] (3)  - convert raw data to Base64 encoded
+gnutls_pem_base64_encode_alloc [] (3)  - convert raw data to Base64 encoded
+gnutls_perror []     (3)  - prints a string to stderr with a description of an error
+gnutls_pk_algorithm_get_name [] (3)  - Get string with name of public key algorithm
+gnutls_pk_get_id []  (3)  - Get #gnutls_pk_algorithm_t from a string
+gnutls_pk_get_name [] (3)  - Get name string with #gnutls_pk_algorithm_t algorithm
+gnutls_pk_list []    (3)  - Get a list of supported public key algorithms
+gnutls_pkcs12_bag_decrypt [] (3)  - This function will decrypt an encrypted bag
+gnutls_pkcs12_bag_deinit [] (3)  - This function deinitializes memory used by a gnutls_pkcs12_t structure
+gnutls_pkcs12_bag_encrypt [] (3)  - This function will encrypt a bag
+gnutls_pkcs12_bag_get_count [] (3)  - This function returns the bag's elements count
+gnutls_pkcs12_bag_get_data [] (3)  - This function returns the bag's data
+gnutls_pkcs12_bag_get_friendly_name [] (3)  - This function returns the friendly name of the bag element
+gnutls_pkcs12_bag_get_key_id [] (3)  - This function gets the key ID from the bag element
+gnutls_pkcs12_bag_get_type [] (3)  - This function returns the bag's type
+gnutls_pkcs12_bag_init [] (3)  - This function initializes a gnutls_pkcs12_bag_t structure
+gnutls_pkcs12_bag_set_crl [] (3)  - insert the CRL into the bag
+gnutls_pkcs12_bag_set_crt [] (3)  - This function inserts a certificate into the bag
+gnutls_pkcs12_bag_set_data [] (3)  - This function inserts data into the bag
+gnutls_pkcs12_bag_set_friendly_name [] (3)  - This function sets a friendly name into the bag element
+gnutls_pkcs12_bag_set_key_id [] (3)  - This function sets a key ID into the bag element
+gnutls_pkcs12_deinit [] (3)  - This function deinitializes memory used by a gnutls_pkcs12_t structure
+gnutls_pkcs12_export [] (3)  - This function will export the pkcs12 structure
+gnutls_pkcs12_generate_mac [] (3)  - This function generates the MAC of the PKCS12 structure
+gnutls_pkcs12_get_bag [] (3)  - This function returns a Bag from a PKCS12 structure
+gnutls_pkcs12_import [] (3)  - This function will import a DER or PEM encoded PKCS12 structure
+gnutls_pkcs12_init [] (3)  - This function initializes a gnutls_pkcs12_t structure
+gnutls_pkcs12_set_bag [] (3)  - This function inserts a Bag into a PKCS12 structure
+gnutls_pkcs12_verify_mac [] (3)  - This function verifies the MAC of the PKCS12 structure
+gnutls_pkcs7_deinit [] (3)  - deinitializes a #gnutls_pkcs7_t structure
+gnutls_pkcs7_delete_crl [] (3)  - deletes a CRL from a PKCS7 crl set
+gnutls_pkcs7_delete_crt [] (3)  - deletes a certificate from a PKCS7 certificate set
+gnutls_pkcs7_export [] (3)  - export the pkcs7 structure
+gnutls_pkcs7_get_crl_count [] (3)  - returns the number of CRLs in a PKCS7 crl set
+gnutls_pkcs7_get_crl_raw [] (3)  - This function returns a crl in a PKCS7 crl set
+gnutls_pkcs7_get_crt_count [] (3)  - return the number of certificates in a PKCS7 certificate set
+gnutls_pkcs7_get_crt_raw [] (3)  - get a certificate from a PKCS7 certificate set
+gnutls_pkcs7_import [] (3)  - import a DER or PEM encoded PKCS7
+gnutls_pkcs7_init [] (3)  - initialize a #gnutls_pkcs7_t structure
+gnutls_pkcs7_set_crl [] (3)  - add a parsed crl in a PKCS7 crl set
+gnutls_pkcs7_set_crl_raw [] (3)  - add a crl in a PKCS7 crl set
+gnutls_pkcs7_set_crt [] (3)  - add a parsed certificate in a PKCS7 certificate set
+gnutls_pkcs7_set_crt_raw [] (3)  - add a certificate in a PKCS7 certificate set
+gnutls_prf []        (3)  - derive pseudo-random data using the TLS PRF
+gnutls_prf_raw []    (3)  - access the TLS PRF directly
+gnutls_priority_deinit [] (3)  - Deinitialize the priorities cache for the cipher suites supported by gnutls
+gnutls_priority_init [] (3)  - Sets priorities for the cipher suites supported by gnutls
+gnutls_priority_set [] (3)  - Sets priorities for the cipher suites supported by gnutls
+gnutls_priority_set_direct [] (3)  - Sets priorities for the cipher suites supported by gnutls
+gnutls_protocol_get_id [] (3)  - Returns the gnutls id of the specified in string protocol
+gnutls_protocol_get_name [] (3)  - Returns a string with the name of the specified SSL/TLS version
+gnutls_protocol_get_version [] (3)  - Returns the version of the currently used protocol
+gnutls_protocol_list [] (3)  - Get a list of supported protocols
+gnutls_protocol_set_priority [] (3)  - Sets the priority on the protocol versions supported by gnutls
+gnutls_psk_allocate_client_credentials [] (3)  - Used to allocate an gnutls_psk_server_credentials_t structure
+gnutls_psk_allocate_server_credentials [] (3)  - Used to allocate an gnutls_psk_server_credentials_t structure
+gnutls_psk_client_get_hint [] (3)  - return the PSK identity hint of the peer
+gnutls_psk_free_client_credentials [] (3)  - Used to free an allocated gnutls_psk_client_credentials_t structure
+gnutls_psk_free_server_credentials [] (3)  - Used to free an allocated gnutls_psk_server_credentials_t structure
+gnutls_psk_netconf_derive_key [] (3)  - derive PSK Netconf key from password
+gnutls_psk_server_get_username [] (3)  - return the username of the peer
+gnutls_psk_set_client_credentials [] (3)  - Used to set the username/password, in a gnutls_psk_client_credentials_t structure
+gnutls_psk_set_client_credentials_function [] (3)  - Used to set a callback to retrieve the username and key
+gnutls_psk_set_params_function [] (3)  - set the DH or RSA parameters callback
+gnutls_psk_set_server_credentials_file [] (3)  - Used to set the password files, in a gnutls_psk_server_credentials_t structure
+gnutls_psk_set_server_credentials_function [] (3)  - Used to set a callback to retrieve the user's PSK credentials
+gnutls_psk_set_server_credentials_hint [] (3)  - Set a identity hint, in a %gnutls_psk_server_credentials_t structure
+gnutls_psk_set_server_dh_params [] (3)  - set the DH parameters for a server to use
+gnutls_psk_set_server_params_function [] (3)  - set the DH parameters callback
+gnutls_record_check_pending [] (3)  - checks if there are any data to receive in gnutls buffers
+gnutls_record_disable_padding [] (3)  - Used to disabled padding in TLS 1.0 and above
+gnutls_record_get_direction [] (3)  - return the direction of the last interrupted function call
+gnutls_record_get_max_size [] (3)  - returns the maximum record size
+gnutls_record_recv [] (3)  - reads data from the TLS record protocol
+gnutls_record_send [] (3)  - sends to the peer the specified data
+gnutls_record_set_max_size [] (3)  - sets the maximum record size
+gnutls_register_md5_handler [] (3)  - API function
+gnutls_rehandshake [] (3)  - renegotiate security parameters
+gnutls_rsa_export_get_modulus_bits [] (3)  - return the bits used in RSA-export key exchange
+gnutls_rsa_export_get_pubkey [] (3)  - return the peer's public key used in RSA-EXPORT authentication
+gnutls_rsa_params_cpy [] (3)  - copy an RSA parameters structure
+gnutls_rsa_params_deinit [] (3)  - deinitialize the RSA parameters
+gnutls_rsa_params_export_pkcs1 [] (3)  - export RSA params to a pkcs1 structure
+gnutls_rsa_params_export_raw [] (3)  - export the RSA parameters
+gnutls_rsa_params_generate2 [] (3)  - generate temporary RSA parameters
+gnutls_rsa_params_import_pkcs1 [] (3)  - import RSA params from a pkcs1 structure
+gnutls_rsa_params_import_raw [] (3)  - set the RSA parameters
+gnutls_rsa_params_init [] (3)  - initialize the temporary RSA parameters
+gnutls_server_name_get [] (3)  - Used to get the server name indicator send by a client
+gnutls_server_name_set [] (3)  - Used to set a name indicator to be sent as an extension
+gnutls_session_enable_compatibility_mode [] (3)  - disable certain features in TLS in order to honour compatibility
+gnutls_session_get_client_random [] (3)  - get the session's client random value
+gnutls_session_get_data [] (3)  - Returns all session parameters
+gnutls_session_get_data2 [] (3)  - Returns all session parameters
+gnutls_session_get_id [] (3)  - Returns session id
+gnutls_session_get_master_secret [] (3)  - get the session's master secret value
+gnutls_session_get_ptr [] (3)  - Get the user pointer from the session structure
+gnutls_session_get_server_random [] (3)  - get the session's server random value
+gnutls_session_is_resumed [] (3)  - check whether this session is a resumed one
+gnutls_session_set_data [] (3)  - Sets all session parameters
+gnutls_session_set_finished_function [] (3)  - API function
+gnutls_session_set_ptr [] (3)  - Used to set the user pointer to the session structure
+gnutls_set_default_export_priority [] (3)  - Sets some default priority on the cipher suites supported by gnutls
+gnutls_set_default_priority [] (3)  - Sets some default priority on the cipher suites supported by gnutls
+gnutls_sign_algorithm_get_name [] (3)  - Returns a string with the name of the specified sign algorithm
+gnutls_sign_callback_get [] (3)  - API function
+gnutls_sign_callback_set [] (3)  - API function
+gnutls_sign_get_id [] (3)  - Returns the gnutls id of the specified in signature algorithm
+gnutls_sign_get_name [] (3)  - Get name string for a #gnutls_sign_algorithm_t
+gnutls_sign_list []  (3)  - Get a list of supported public key signature algorithms
+gnutls_srp_allocate_client_credentials [] (3)  - Used to allocate an gnutls_srp_server_credentials_t structure
+gnutls_srp_allocate_server_credentials [] (3)  - Used to allocate an gnutls_srp_server_credentials_t structure
+gnutls_srp_base64_decode [] (3)  - decode SRP-base64 encoded data
+gnutls_srp_base64_decode_alloc [] (3)  - decode SRP-base64 encoded data
+gnutls_srp_base64_encode [] (3)  - Encode raw data using SRP-Base64
+gnutls_srp_base64_encode_alloc [] (3)  - encode raw data using SRP-Base64
+gnutls_srp_free_client_credentials [] (3)  - Used to free an allocated gnutls_srp_client_credentials_t structure
+gnutls_srp_free_server_credentials [] (3)  - Used to free an allocated gnutls_srp_server_credentials_t structure
+gnutls_srp_server_get_username [] (3)  - return the username of the peer
+gnutls_srp_set_client_credentials [] (3)  - Used to set the username/password, in a gnutls_srp_client_credentials_t structure
+gnutls_srp_set_client_credentials_function [] (3)  - Used to set a callback to retrieve the username and password
+gnutls_srp_set_prime_bits [] (3)  - set the minimum bits for a SRP ciphersuite
+gnutls_srp_set_server_credentials_file [] (3)  - Used to set the password files, in a gnutls_srp_server_credentials_t structure
+gnutls_srp_set_server_credentials_function [] (3)  - Used to set a callback to retrieve the user's SRP credentials
+gnutls_srp_verifier [] (3)  - Used to calculate an SRP verifier
+gnutls_strerror []   (3)  - Returns a string with a description of an error
+gnutls_strerror_name [] (3)  - API function
+gnutls_transport_get_ptr [] (3)  - Used to return the first argument of the transport functions
+gnutls_transport_get_ptr2 [] (3)  - Used to return the first argument of the transport functions
+gnutls_transport_set_errno [] (3)  - API function
+gnutls_transport_set_global_errno [] (3)  - API function
+gnutls_transport_set_lowat [] (3)  - Used to set the lowat value in order for select to check for pending data
+gnutls_transport_set_ptr [] (3)  - Used to set first argument of the transport functions
+gnutls_transport_set_ptr2 [] (3)  - Used to set first argument of the transport functions
+gnutls_transport_set_pull_function [] (3)  - set a read like function
+gnutls_transport_set_push_function [] (3)  - set the function to send data
+gnutls_x509_crl_check_issuer [] (3)  - This function checks if the CRL given has the given issuer
+gnutls_x509_crl_deinit [] (3)  - deinitializes a #gnutls_x509_crl_t structure
+gnutls_x509_crl_export [] (3)  - export the CRL
+gnutls_x509_crl_get_crt_count [] (3)  - get number of revoked certificates in a CRL
+gnutls_x509_crl_get_crt_serial [] (3)  - get the serial number of a revoked certificate
+gnutls_x509_crl_get_dn_oid [] (3)  - returns the Certificate request issuer's distinguished name OIDs
+gnutls_x509_crl_get_issuer_dn [] (3)  - returns the CRL's issuer distinguished name
+gnutls_x509_crl_get_issuer_dn_by_oid [] (3)  - return the CRL's issuer distinguished name
+gnutls_x509_crl_get_next_update [] (3)  - return the CRL's nextUpdate time
+gnutls_x509_crl_get_signature [] (3)  - Returns the CRL's signature
+gnutls_x509_crl_get_signature_algorithm [] (3)  - returns the CRL's signature algorithm
+gnutls_x509_crl_get_this_update [] (3)  - return the CRL's thisUpdate time
+gnutls_x509_crl_get_version [] (3)  - returns the CRL's version number
+gnutls_x509_crl_import [] (3)  - import a DER or PEM encoded CRL
+gnutls_x509_crl_init [] (3)  - initializes a #gnutls_x509_crl_t structure
+gnutls_x509_crl_print [] (3)  - Pretty print X.509 certificate revocation list
+gnutls_x509_crl_set_crt [] (3)  - This function will set a revoked certificate's serial number
+gnutls_x509_crl_set_crt_serial [] (3)  - This function will set a revoked certificate's serial number
+gnutls_x509_crl_set_next_update [] (3)  - This function will set the CRL next update time
+gnutls_x509_crl_set_this_update [] (3)  - This function will set the CRL's issuing time
+gnutls_x509_crl_set_version [] (3)  - This function will set the CRL version
+gnutls_x509_crl_sign [] (3)  - This function will sign a CRL with a key
+gnutls_x509_crl_sign2 [] (3)  - This function will sign a CRL with a key
+gnutls_x509_crl_verify [] (3)  - This function verifies the given crl against a given trusted one
+gnutls_x509_crq_deinit [] (3)  - This function deinitializes memory used by a gnutls_x509_crq_t structure
+gnutls_x509_crq_export [] (3)  - Export the generated certificate request
+gnutls_x509_crq_get_attribute_by_oid [] (3)  - This function will get an attribute of the request
+gnutls_x509_crq_get_challenge_password [] (3)  - This function will get the challenge password
+gnutls_x509_crq_get_dn [] (3)  - This function returns the Certificate request subject's distinguished name
+gnutls_x509_crq_get_dn_by_oid [] (3)  - This function returns the Certificate request subject's distinguished name
+gnutls_x509_crq_get_dn_oid [] (3)  - This function returns the Certificate request subject's distinguished name OIDs
+gnutls_x509_crq_get_pk_algorithm [] (3)  - This function returns the certificate request's PublicKey algorithm
+gnutls_x509_crq_get_version [] (3)  - This function returns the Certificate request's version number
+gnutls_x509_crq_import [] (3)  - This function will import a DER or PEM encoded Certificate request
+gnutls_x509_crq_init [] (3)  - This function initializes a gnutls_x509_crq_t structure
+gnutls_x509_crq_set_attribute_by_oid [] (3)  - This function will set an attribute in the request
+gnutls_x509_crq_set_challenge_password [] (3)  - This function will set a challenge password
+gnutls_x509_crq_set_dn_by_oid [] (3)  - This function will set the Certificate request subject's distinguished name
+gnutls_x509_crq_set_key [] (3)  - This function will associate the Certificate request with a key
+gnutls_x509_crq_set_key_rsa_raw [] (3)  - associate Certificate request with a key
+gnutls_x509_crq_set_version [] (3)  - This function will set the Certificate request version
+gnutls_x509_crq_sign [] (3)  - This function will sign a Certificate request with a key
+gnutls_x509_crq_sign2 [] (3)  - Sign a Certificate request with a key
+gnutls_x509_crt_check_hostname [] (3)  - compares the hostname with certificate's hostname
+gnutls_x509_crt_check_issuer [] (3)  - This function checks if the certificate given has the given issuer
+gnutls_x509_crt_check_revocation [] (3)  - This function checks if the given certificate is revoked
+gnutls_x509_crt_cpy_crl_dist_points [] (3)  - Copy the CRL dist points
+gnutls_x509_crt_deinit [] (3)  - This function deinitializes memory used by a gnutls_x509_crt_t structure
+gnutls_x509_crt_export [] (3)  - This function will export the certificate
+gnutls_x509_crt_get_activation_time [] (3)  - returns the Certificate's activation time
+gnutls_x509_crt_get_authority_key_id [] (3)  - This function returns the certificate authority's identifier
+gnutls_x509_crt_get_basic_constraints [] (3)  - This function returns the certificate basic constraints
+gnutls_x509_crt_get_ca_status [] (3)  - This function returns the certificate CA status
+gnutls_x509_crt_get_crl_dist_points [] (3)  - This function returns the CRL distribution points
+gnutls_x509_crt_get_dn [] (3)  - This function returns the Certificate's distinguished name
+gnutls_x509_crt_get_dn_by_oid [] (3)  - This function returns the Certificate's distinguished name
+gnutls_x509_crt_get_dn_oid [] (3)  - This function returns the Certificate's subject distinguished name OIDs
+gnutls_x509_crt_get_expiration_time [] (3)  - returns the Certificate's expiration time
+gnutls_x509_crt_get_extension_by_oid [] (3)  - This function returns the specified extension
+gnutls_x509_crt_get_extension_data [] (3)  - Get the specified extension data
+gnutls_x509_crt_get_extension_info [] (3)  - Get extension id and criticality
+gnutls_x509_crt_get_extension_oid [] (3)  - This function returns the specified extension OID
+gnutls_x509_crt_get_fingerprint [] (3)  - This function returns the Certificate's fingerprint
+gnutls_x509_crt_get_issuer [] (3)  - API function
+gnutls_x509_crt_get_issuer_dn [] (3)  - This function returns the Certificate's issuer distinguished name
+gnutls_x509_crt_get_issuer_dn_by_oid [] (3)  - This function returns the Certificate's issuer distinguished name
+gnutls_x509_crt_get_issuer_dn_oid [] (3)  - This function returns the Certificate's issuer distinguished name OIDs
+gnutls_x509_crt_get_key_id [] (3)  - Return unique ID of public key's parameters
+gnutls_x509_crt_get_key_purpose_oid [] (3)  - This function returns the Certificate's key purpose OIDs
+gnutls_x509_crt_get_key_usage [] (3)  - return the certificate's key usage
+gnutls_x509_crt_get_pk_algorithm [] (3)  - return the certificate's PublicKey algorithm
+gnutls_x509_crt_get_pk_dsa_raw [] (3)  - This function will export the DSA public key
+gnutls_x509_crt_get_pk_rsa_raw [] (3)  - This function will export the RSA public key
+gnutls_x509_crt_get_proxy [] (3)  - This function returns the proxy certificate info
+gnutls_x509_crt_get_raw_dn [] (3)  - This function returns the subject's DN DER encoded
+gnutls_x509_crt_get_raw_issuer_dn [] (3)  - This function returns the issuer's DN DER encoded
+gnutls_x509_crt_get_serial [] (3)  - This function returns the certificate's serial number
+gnutls_x509_crt_get_signature [] (3)  - Returns the Certificate's signature
+gnutls_x509_crt_get_signature_algorithm [] (3)  - This function returns the Certificate's signature algorithm
+gnutls_x509_crt_get_subject [] (3)  - API function
+gnutls_x509_crt_get_subject_alt_name [] (3)  - Get certificate's alternative name, if any
+gnutls_x509_crt_get_subject_alt_name2 [] (3)  - Get certificate's alternative name, if any
+gnutls_x509_crt_get_subject_alt_othername_oid [] (3)  - Get SAN otherName OID
+gnutls_x509_crt_get_subject_key_id [] (3)  - This function returns the certificate's key identifier
+gnutls_x509_crt_get_version [] (3)  - return the Certificate's version number
+gnutls_x509_crt_import [] (3)  - This function will import a DER or PEM encoded Certificate
+gnutls_x509_crt_init [] (3)  - This function initializes a gnutls_x509_crt_t structure
+gnutls_x509_crt_list_import [] (3)  - This function will import a PEM encoded certificate list
+gnutls_x509_crt_list_verify [] (3)  - This function verifies the given certificate list
+gnutls_x509_crt_print [] (3)  - Pretty print X.509 certificates
+gnutls_x509_crt_set_activation_time [] (3)  - Set the Certificate's activation time
+gnutls_x509_crt_set_authority_key_id [] (3)  - Set the certificate authority's key id
+gnutls_x509_crt_set_basic_constraints [] (3)  - Set the basicConstraints extension
+gnutls_x509_crt_set_ca_status [] (3)  - Set the basicConstraints extension
+gnutls_x509_crt_set_crl_dist_points [] (3)  - Set the CRL dist points
+gnutls_x509_crt_set_crl_dist_points2 [] (3)  - Set the CRL dist points
+gnutls_x509_crt_set_crq [] (3)  - Associate the Certificate with a request
+gnutls_x509_crt_set_dn_by_oid [] (3)  - Set the Certificate request subject's distinguished name
+gnutls_x509_crt_set_expiration_time [] (3)  - Set the Certificate's expiration time
+gnutls_x509_crt_set_extension_by_oid [] (3)  - Set an arbitrary extension
+gnutls_x509_crt_set_issuer_dn_by_oid [] (3)  - Set the Certificate request issuer's distinguished name
+gnutls_x509_crt_set_key [] (3)  - This function will associate the Certificate with a key
+gnutls_x509_crt_set_key_purpose_oid [] (3)  - Sets the Certificate's key purpose OIDs
+gnutls_x509_crt_set_key_usage [] (3)  - Set the keyUsage extension
+gnutls_x509_crt_set_proxy [] (3)  - Set the proxyCertInfo extension
+gnutls_x509_crt_set_proxy_dn [] (3)  - Set Proxy Certificate subject's distinguished name
+gnutls_x509_crt_set_serial [] (3)  - Set the certificate's serial number
+gnutls_x509_crt_set_subject_alt_name [] (3)  - Set the subject Alternative Name
+gnutls_x509_crt_set_subject_alternative_name [] (3)  - Set the subject Alternative Name
+gnutls_x509_crt_set_subject_key_id [] (3)  - Set the certificate's subject key id
+gnutls_x509_crt_set_version [] (3)  - Set the Certificate request version
+gnutls_x509_crt_sign [] (3)  - Sign a certificate with a key
+gnutls_x509_crt_sign2 [] (3)  - Sign a certificate with a key
+gnutls_x509_crt_verify [] (3)  - This function verifies the given certificate against a given trusted one
+gnutls_x509_crt_verify_data [] (3)  - This function will verify the given signed data
+gnutls_x509_dn_deinit [] (3)  - API function
+gnutls_x509_dn_export [] (3)  - This function will export the DN
+gnutls_x509_dn_get_rdn_ava [] (3)  - API function
+gnutls_x509_dn_import [] (3)  - API function
+gnutls_x509_dn_init [] (3)  - API function
+gnutls_x509_dn_oid_known [] (3)  - return true if the given OID is known
+gnutls_x509_privkey_cpy [] (3)  - copy a private key
+gnutls_x509_privkey_deinit [] (3)  - deinitializes a #gnutls_x509_privkey_t structure
+gnutls_x509_privkey_export [] (3)  - export the private key
+gnutls_x509_privkey_export_dsa_raw [] (3)  - export the DSA private key
+gnutls_x509_privkey_export_pkcs8 [] (3)  - This function will export the private key to PKCS8 format
+gnutls_x509_privkey_export_rsa_raw [] (3)  - export the RSA private key
+gnutls_x509_privkey_fix [] (3)  - recalculate some parameters of the key
+gnutls_x509_privkey_generate [] (3)  - generate a private key
+gnutls_x509_privkey_get_key_id [] (3)  - Return unique ID of the key's parameters
+gnutls_x509_privkey_get_pk_algorithm [] (3)  - returns the key's PublicKey algorithm
+gnutls_x509_privkey_import [] (3)  - import a DER or PEM encoded key
+gnutls_x509_privkey_import_dsa_raw [] (3)  - import a raw DSA key
+gnutls_x509_privkey_import_pkcs8 [] (3)  - This function will import a DER or PEM PKCS8 encoded key
+gnutls_x509_privkey_import_rsa_raw [] (3)  - import a raw RSA key
+gnutls_x509_privkey_init [] (3)  - initialize a #gnutls_privkey_t structure
+gnutls_x509_privkey_sign_data [] (3)  - sign data using the private key
+gnutls_x509_privkey_sign_hash [] (3)  - sign hash using the private key
+gnutls_x509_privkey_verify_data [] (3)  - Verify the signed data using private key
+gnutls_x509_rdn_get [] (3)  - parse an RDN sequence and returns a string
+gnutls_x509_rdn_get_by_oid [] (3)  - parse an RDN sequence and returns a string
+gnutls_x509_rdn_get_oid [] (3)  - parse an RDN sequence and returns an OID
+gobject []           (1)  - query - display a tree of types
+gomoku []            (6)  - game of 5 in a row
+goop []              (6)  - squishy transparent oil and bubble screenhack
+gorbd []             (1)  - - An object request broker daemon
+gouldtoppm []        (1)  - convert Gould scanner file into a portable pixmap
+gpasswd []           (1)  - administer the /etc/group file
+gperf []             (1)  - generate a perfect hash function from a key set
+gpg []               (1)  - OpenPGP encryption and signing tool
+gpg []               (1)  - agent - Secret key management for GnuPG
+gpg []               (1)  - connect-agent - Communicate with a running agent
+gpg []               (1)  - preset-passphrase - Put a passphrase into gpg-agent's cache
+gpg []               (1)  - zip - Encrypt or sign files into an archive
+gpg []               (1)  - ÉÎÓÔÒÕÍÅÎÔ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ É ÃÉÆÒÏ×ÏÊ ÐÏÄÐÉÓÉ
+gpg2 []              (1)  - OpenPGP encryption and signing tool
+gpgconf []           (1)  - Modify .gnupg home directories
+gpgparsemail []      (1)  - Parse a mail message into an annotated format
+gpgsm []             (1)  - CMS encryption and signing tool
+gpgsm []             (1)  - gencert.sh - Generate an X.509 certificate request
+gpgv []              (1)  - Verify OpenPGP signatures
+gpgv2 []             (1)  - Verify OpenPGP signatures
+gphoto2 []           (1)  - command-line gphoto2 client
+gpl []               (7)  - GNU General Public License
+gpm []               (1)  - root - a default handler for gpm, used to draw menus on the root window
+gpm []               (8)  - a cut and paste utility and mouse server for virtual consoles
+gprof []             (1)  - display call graph profile data
+grab []              (n)  - Confine pointer and keyboard events to a window sub-tree
+grantpt []           (3)  - grant access to the slave pseudo-terminal
+grap2graph []        (1)  - convert a grap diagram into a cropped bitmap image
+grav []              (6)  - draws a simple orbital simulation
+grep []              (1)  - print lines matching a pattern
+greynetic []         (6)  - draw random stippled/color rectangles
+grid []              (n)  - Geometry manager that arranges widgets in a grid
+grmic []             (1)  - Generate stubs for Remote Method Invocation
+grmid []             (1)  - - RMI activation system daemon
+grmiregistry []      (1)  - - Remote object registry
+grn []               (1)  - groff preprocessor for gremlin files
+grodvi []            (1)  - convert groff output to TeX dvi format
+groff []             (1)  - front-end for the groff document formatting system
+groff []             (7)  - a short reference for the GNU roff language
+groff_char []        (7)  - groff glyph names
+groff_diff []        (7)  - differences between GNU troff and classical troff
+groff_font []        (5)  - format of groff device and font description files
+groff_hdtbl []       (7)  - groff `hdtbl' macros for generation of tables
+groff_man []         (7)  - groff `man' macros to support generation of man pages
+groff_mdoc []        (7)  - reference for groff's mdoc implementation
+groff_me []          (7)  - troff macros for formatting papers
+groff_mm []          (7)  - groff mm macros
+groff_mom []         (7)  - groff `mom' macros
+groff_ms []          (7)  - groff ms macros
+groff_out []         (5)  - groff intermediate output format
+groff_tmac []        (5)  - macro files in the roff typesetting system
+groff_trace []       (7)  - groff macro package trace.tmac
+groff_www []         (7)  - groff macros for authoring web pages
+groffer []           (1)  - display groff files and man~pages on X and tty
+grog []              (1)  - guess options for groff command
+grohtml []           (1)  - html driver for groff
+grolbp []            (1)  - groff driver for Canon CAPSL printers (LBP-4 and LBP-8 series laser printers)
+grolj4 []            (1)  - groff driver for HP Laserjet 4 family
+grops []             (1)  - PostScript driver for groff
+grotty []            (1)  - groff driver for typewriter-like devices
+group []             (5)  - user group file
+groupadd []          (8)  - Create a new group
+groupdel []          (8)  - Delete a group
+groupmod []          (8)  - Modify a group
+groups []            (1)  - display current group names
+growisofs []         (1)  - combined mkisofs frontend/DVD recording program
+grpck []             (8)  - verify integrity of group files
+grpconv []           (8)  - convert to and from shadow passwords and groups
+grpunconv []         (8)  - convert to and from shadow passwords and groups
+gs []                (1)  - Ghostscript (PostScript and PDF language interpreter and previewer)
+gsbj []              (1)  - Format and print text for BubbleJet printer using ghostscript
+gsdj []              (1)  - Format and print text for DeskJet printer using ghostscript
+gsdj500 []           (1)  - Format and print text for DeskJet 500 BubbleJet using ghostscript
+gserialver []        (1)  - version command
+gsf []               (1)  - archiving utility using the G Structured File library
+gsf []               (1)  - vba-dump - extract Visual Basic for Applications macros
+gsignal []           (3)  - software signal facility
+gslj []              (1)  - Format and print text for LaserJet printer using ghostscript
+gslp []              (1)  - Format and print text using ghostscript
+gsnd []              (1)  - Run ghostscript (PostScript and PDF engine) without display
+gst []               (1)  - feedback - generate debug info for GStreamer bug reports
+gst []               (1)  - inspect - print info about a GStreamer plugin or element
+gst []               (1)  - launch - build and run a GStreamer pipeline
+gst []               (1)  - typefind - print MIME type of file
+gst []               (1)  - visualise - Run a GStreamer pipeline to display an audio visualisation
+gst []               (1)  - xmlinspect - print info about a GStreamer plugin or element
+gst []               (1)  - xmllaunch - build and run a GStreamer pipeline from an XML serialization
+gtester []           (1)  - report - test report formatting utility
+gtester []           (1)  - test running utility
+gtf []               (1)  - calculate VESA GTF mode lines
+gtk []               (1)  - builder-convert - Glade file conversion utility
+gtk []               (1)  - config - script to get information about the installed version of GTK+
+gtk []               (1)  - query-immodules-2.0 - Input method module registration utility
+gtk []               (1)  - update-icon-cache - Icon theme caching utility
+gtk-builder-convert  (1)  - Glade file conversion utility
+gtk-query-immodules-2.0 [gtk-query-immodules-2] (1)  - Input method module registration utility
+gtk-update-icon-cache (1)  - Icon theme caching utility
+gtnameserv []        (1)  - Naming service
+gtty []              (2)  - unimplemented system calls
+guile []             (1)  - a Scheme interpreter
+gunzip []            (1)  - compress or expand files
+gv []                (1)  - Postscript and PDF viewer
+gv []                (1)  - update-userconfig - update ~/.gv config file
+gxditview []         (1)  - display groff intermediate output files
+gxine []             (1)  - a GTK/GNOME frontend to the xine video player
+gxine_client []      (1)  - the gxine video player command line client
+gzexe []             (1)  - compress executable files in place
+gzip []              (1)  - compress or expand files
+h2ph []              (1)  - convert .h C header files to .ph Perl header files
+h2xs []              (1)  - convert .h C header files to Perl extensions
+h_errno []           (3)  - get network host entry
+hal []               (1)  - disable-polling - disable polling on drives with removable media
+hal []               (1)  - find-by-capability - find device objects by capability matching
+hal []               (1)  - find-by-property - find device objects by property matching
+hal []               (1)  - get-property - get a property from a device object
+hal []               (1)  - is-caller-locked-out - determine if a caller is locked out
+hal []               (1)  - lock - lock an interface
+hal []               (1)  - set-property - set a property on a device object
+hald []              (8)  - HAL daemon
+halfdelay []         (3)  - curses input options
+halftone []          (6)  - simple halftone pattern of moving mass points
+halo []              (6)  - draw circular patterns
+halt []              (8)  - stop the system
+handle_to_fshandle [] (3)  - file handle operations
+hangman []           (6)  - Computer version of the game hangman
+has_colors []        (3)  - curses color manipulation routines
+has_ic []            (3)  - curses environment query routines
+has_il []            (3)  - curses environment query routines
+has_key []           (3)  - get (or push back) characters from curses terminal keyboard
+hash []              (1)  - bash built-in commands, see bash(1)
+hash []              (3)  - hash database access method
+hasmntopt []         (3)  - get file system descriptor file entry
+hattrib []           (1)  - change HFS file or directory attributes
+hcd []               (1)  - change working HFS directory
+hciattach []         (8)  - attach serial devices via UART HCI to BlueZ stack
+hciconfig []         (8)  - configure Bluetooth devices
+hcid []              (8)  - Bluetooth Host Controller Interface Daemon
+hcidump []           (8)  - Parse HCI data
+hcitool []           (1)  - configure Bluetooth connections
+hcopy []             (1)  - copy files from or to an HFS volume
+hcreate []           (3)  - hash table management
+hcreate_r []         (3)  - hash table management
+hd []                (4)  - MFM/IDE hard disk devices
+hdel []              (1)  - delete both forks of an HFS file
+hdestroy []          (3)  - hash table management
+hdestroy_r []        (3)  - hash table management
+hdifftopam []        (1)  - see http://netpbm.sourceforge.net/doc/hdifftopam.html
+hdir []              (1)  - display an HFS directory in long format
+hdparm []            (8)  - get/set SATA/IDE device parameters
+head []              (1)  - output the first part of files
+helix []             (6)  - draw helical string-art patterns
+help []              (1)  - bash built-in commands, see bash(1)
+herror []            (3)  - get network host entry
+hexdump []           (1)  - ascii, decimal, hexadecimal, octal dump
+hformat []           (1)  - create a new HFS filesystem and make it current
+hfs []               (1)  - shell for manipulating HFS volumes
+hfssh []             (1)  - Tcl interpreter with HFS extensions
+hfsutils []          (1)  - tools for reading and writing Macintosh HFS volumes
+hg []                (1)  - Mercurial source code management system
+hgignore []          (5)  - syntax for Mercurial ignore files
+hgrc []              (5)  - configuration files for Mercurial
+hid2hci []           (8)  - Bluetooth HID to HCI mode switching utility
+hidd []              (1)  - Bluetooth HID daemon
+hier []              (7)  - Description of the file system hierarchy
+hipstopgm []         (1)  - convert a HIPS file into a portable graymap
+history []           (1)  - bash built-in commands, see bash(1)
+history []           (3)  - GNU History Library
+history []           (n)  - Manipulate the history list
+hline []             (3)  - create curses borders, horizontal and vertical lines
+hline_set []         (3)  - create curses borders or lines using complex characters and renditions
+hls []               (1)  - list files in an HFS directory
+hmkdir []            (1)  - create a new HFS directory
+hmount []            (1)  - introduce a new HFS volume and make it current
+hopalong []          (6)  - draw real plane fractals
+hose []              (1)  - the client end of a BSD network pipe
+host []              (1)  - DNS lookup utility
+host.conf []         (5)  - resolver configuration file
+hostid []            (1)  - print the numeric identifier for the current host
+hostname []          (1)  - show or set the system's host name
+hostname []          (7)  - hostname resolution description
+hosts []             (5)  - The static table lookup for hostnames
+hosts_access []      (3)  - access control library
+hosts_access []      (5)  - format of host access control files
+hosts_ctl []         (3)  - access control library
+hosts_options []     (5)  - host access control language extensions
+hpcdtoppm []         (1)  - convert a Photo-CD file into a portable bitmap file
+hpftodit []          (1)  - create font description files for use with groff -Tlj4
+hpwd []              (1)  - print the full path to the current HFS working directory
+hqx2bin []           (1)  - Macintosh file format transformer
+hrename []           (1)  - rename or move an HFS file or directory
+hrmdir []            (1)  - remove an empty HFS directory
+hsearch []           (3)  - hash table management
+hsearch_r []         (3)  - hash table management
+hstrerror []         (3)  - get network host entry
+htcacheclean []      (8)  - Clean up the disk cache
+htdbm []             (1)  - Manipulate DBM password databases
+htdig []             (1)  - pdfparser - parse a PDF document (wrapper script for htdig)
+htdig []             (1)  - retrieve HTML documents for ht://Dig search engine
+htdigconfig []       (8)  - script to create fuzzy databases for ht://Dig
+htdigest []          (1)  - manage user files for digest authentication
+htdump []            (1)  - write out an ASCII-text version of the document database
+htfuzzy []           (1)  - fuzzy command-line search utility for the ht://Dig search engine
+htload []            (1)  - reads in an ASCII-text version of the document database
+htmerge []           (1)  - create document index and word database for the ht://Dig search engine
+htnotify []          (1)  - sends email notifications about out-dated web pages discovered by htmerge
+htobe16 []           (3)  - convert values between host and big - /little-endian byte order
+htobe32 []           (3)  - convert values between host and big - /little-endian byte order
+htobe64 []           (3)  - convert values between host and big - /little-endian byte order
+htole16 []           (3)  - convert values between host and big - /little-endian byte order
+htole32 []           (3)  - convert values between host and big - /little-endian byte order
+htole64 []           (3)  - convert values between host and big - /little-endian byte order
+htonl []             (3)  - convert values between host and network byte order
+htons []             (3)  - convert values between host and network byte order
+htpasswd []          (1)  - Manage user files for basic authentication
+htpurge []           (1)  - remove unused odocuments from the database (general maintenance script)
+htsearch []          (1)  - create document index and word database for the ht://Dig search engine
+htstat []            (1)  - returns statistics on the document and word databases, much like the -s option to htdig or htmerge
+http []              (n)  - Client-side implementation of the HTTP/1.1 protocol
+httpd []             (8)  - Apache Hypertext Transfer Protocol Server
+humount []           (1)  - remove an HFS volume from the list of known volumes
+hunt []              (6)  - a multi - player multi-terminal game
+huntd []             (6)  - hunt daemon, back - end for hunt game
+hvol []              (1)  - display or change the current HFS volume
+hwclock []           (8)  - query and set the hardware clock (RTC)
+hyperball []         (6)  - 2d projection of a 4d object
+hypercube []         (6)  - 2d projection of a 4d object
+hypertorus []        (6)  - Draws a hypertorus that rotates in 4d
+hypnowheel []        (6)  - draws overlapping, translucent spiral patterns
+hypot []             (3)  - Euclidean distance function
+hypotf []            (3)  - Euclidean distance function
+hypotl []            (3)  - Euclidean distance function
+i128 []              (4)  - Number 9 I128 Xorg video driver
+i2d_ASN1_OBJECT []   (3)  - ASN1 OBJECT IDENTIFIER functions
+i2d_DHparams []      (3)  - PKCS#3 DH parameter functions
+i2d_DSAPrivateKey [] (3)  - DSA key encoding and parsing functions
+i2d_DSAPublicKey []  (3)  - DSA key encoding and parsing functions
+i2d_DSA_PUBKEY []    (3)  - DSA key encoding and parsing functions
+i2d_DSA_SIG []       (3)  - DSA key encoding and parsing functions
+i2d_Netscape_RSA []  (3)  - RSA public and private key encoding functions
+i2d_PKCS8PrivateKey_bio [] (3)  - PKCS#8 format private key functions
+i2d_PKCS8PrivateKey_fp [] (3)  - PKCS#8 format private key functions
+i2d_PKCS8PrivateKey_nid_bio [] (3)  - PKCS#8 format private key functions
+i2d_PKCS8PrivateKey_nid_fp [] (3)  - PKCS#8 format private key functions
+i2d_RSAPrivateKey [] (3)  - RSA public and private key encoding functions
+i2d_RSAPublicKey []  (3)  - RSA public and private key encoding functions
+i2d_RSA_PUBKEY []    (3)  - RSA public and private key encoding functions
+i2d_SSL_SESSION []   (3)  - convert SSL_SESSION object from/to ASN1 representation
+i2d_X509 []          (3)  - X509 encode and decode functions
+i2d_X509_ALGOR []    (3)  - AlgorithmIdentifier functions
+i2d_X509_CRL []      (3)  - PKCS#10 certificate request functions
+i2d_X509_CRL_bio []  (3)  - PKCS#10 certificate request functions
+i2d_X509_CRL_fp []   (3)  - PKCS#10 certificate request functions
+i2d_X509_NAME []     (3)  - X509_NAME encoding functions
+i2d_X509_REQ []      (3)  - PKCS#10 certificate request functions
+i2d_X509_REQ_bio []  (3)  - PKCS#10 certificate request functions
+i2d_X509_REQ_fp []   (3)  - PKCS#10 certificate request functions
+i2d_X509_SIG []      (3)  - DigestInfo functions
+i2d_X509_bio []      (3)  - X509 encode and decode functions
+i2d_X509_fp []       (3)  - X509 encode and decode functions
+i740 []              (4)  - Intel i740 video driver
+ibm_hosts []         (5)  - host database for x3270 and c3270
+icc2ps []            (1)  - little cms PostScript converter
+icclink []           (1)  - little cms device link generator
+iceauth []           (1)  - ICE authority file utility
+icmp []              (7)  - Linux IPv4 ICMP kernel module
+icmpinfo []          (1)  - interpret ICMP messages
+ico []               (1)  - animate an icosahedron or other polyhedron
+icombine []          (1)  - Interactive spelling checking
+icontopbm []         (1)  - convert a Sun icon into a portable bitmap
+iconv []             (3)  - perform character set conversion
+iconv_close []       (3)  - deallocate descriptor for character set conversion
+iconv_open []        (3)  - allocate descriptor for character set conversion
+id []                (1)  - print real and effective user and group IDs
+idcok []             (3)  - curses output options
+ident []             (1)  - identify RCS keyword strings in files
+identd []            (8)  - TCP/IP IDENT protocol server
+identify []          (1)  - describes the format and characteristics of one or more image files
+idle []              (2)  - make process 0 idle
+idlok []             (3)  - curses output options
+idmap_ad []          (8)  - Samba's idmap_ad Backend for Winbind
+idmap_ldap []        (8)  - Samba's idmap_ldap Backend for Winbind
+idmap_nss []         (8)  - Samba's idmap_nss Backend for Winbind
+idmap_rid []         (8)  - Samba's idmap_rid Backend for Winbind
+idmap_tdb []         (8)  - Samba's idmap_tdb Backend for Winbind
+idn []               (1)  - Internationalized Domain Names command line tool
+idna_strerror []     (3)  - return string describing idna error code
+idna_to_ascii_4i []  (3)  - convert Unicode domain name label to text
+idna_to_ascii_4z []  (3)  - convert Unicode domain name label to text
+idna_to_ascii_8z []  (3)  - convert Unicode domain name label to text
+idna_to_ascii_lz []  (3)  - convert Unicode domain name label to text
+idna_to_unicode_44i [] (3)  - convert domain name label to Unicode
+idna_to_unicode_4z4z [] (3)  - convert domain name label to Unicode
+idna_to_unicode_8z4z [] (3)  - convert domain name label to Unicode
+idna_to_unicode_8z8z [] (3)  - convert domain name label to Unicode
+idna_to_unicode_8zlz [] (3)  - convert domain name label to Unicode
+idna_to_unicode_lzlz [] (3)  - convert domain name label to Unicode
+iecset []            (1)  - Set or dump IEC958 status bits
+ieee1284_byte_read [] (3)  - data transfer functions
+ieee1284_claim []    (3)  - claim access to the port
+ieee1284_clear_irq [] (3)  - interrupt notification
+ieee1284_close []    (3)  - close an open port
+ieee1284_compat_write [] (3)  - data transfer functions
+ieee1284_data_dir [] (3)  - control the data lines
+ieee1284_do_nack_handshake [] (3)  - manipulate control lines
+ieee1284_ecp_fwd_to_rev [] (3)  - ECP direction switching
+ieee1284_ecp_read_addr [] (3)  - data transfer functions
+ieee1284_ecp_read_data [] (3)  - data transfer functions
+ieee1284_ecp_rev_to_fwd [] (3)  - ECP direction switching
+ieee1284_ecp_write_addr [] (3)  - data transfer functions
+ieee1284_ecp_write_data [] (3)  - data transfer functions
+ieee1284_epp_read_addr [] (3)  - data transfer functions
+ieee1284_epp_read_data [] (3)  - data transfer functions
+ieee1284_epp_write_addr [] (3)  - data transfer functions
+ieee1284_epp_write_data [] (3)  - data transfer functions
+ieee1284_find_ports [] (3)  - find ports on the system
+ieee1284_free_ports [] (3)  - safely deallocate a port list
+ieee1284_frob_control [] (3)  - manipulate control lines
+ieee1284_get_deviceid [] (3)  - retrieve an IEEE 1284 Device ID
+ieee1284_get_irq_fd [] (3)  - interrupt notification
+ieee1284_negotiate [] (3)  - IEEE 1284 negotiation
+ieee1284_nibble_read [] (3)  - data transfer functions
+ieee1284_open []     (3)  - open a port
+ieee1284_read_control [] (3)  - manipulate control lines
+ieee1284_read_data [] (3)  - control the data lines
+ieee1284_read_status [] (3)  - analyse status lines
+ieee1284_ref []      (3)  - modify a port's reference count
+ieee1284_release []  (3)  - release a port
+ieee1284_set_timeout [] (3)  - modify inactivity timeout
+ieee1284_terminate [] (3)  - IEEE 1284 negotiation
+ieee1284_unref []    (3)  - modify a port's reference count
+ieee1284_wait_data [] (3)  - control the data lines
+ieee1284_wait_status [] (3)  - analyse status lines
+ieee1284_write_control [] (3)  - manipulate control lines
+ieee1284_write_data [] (3)  - control the data lines
+ietf2datebook []     (1)  - Converts IETF agenda format to install-datebook format
+if []                (3)  - use a Perl module if a condition holds
+if []                (n)  - Execute scripts conditionally
+ifconfig []          (8)  - configure a network interface
+ifnames []           (1)  - Extract CPP conditionals from a set of files
+ifrename []          (8)  - rename network interfaces based on various static criteria
+ifs []               (6)  - draws spinning, colliding iterated-function-system images
+iftab []             (5)  - static information about the network interfaces
+igawk []             (1)  - gawk with include files
+ijoin []             (1)  - Interactive spelling checking
+ijs []               (1)  - config - script to get information about the installed version of ijs
+ijsgutenprint []     (1)  - Ghostscript driver for Gutenprint
+ilbmtoppm []         (1)  - convert an ILBM file into a portable pixmap
+ilogb []             (3)  - get integer exponent of a floating-point value
+ilogbf []            (3)  - get integer exponent of a floating-point value
+ilogbl []            (3)  - get integer exponent of a floating-point value
+image []             (n)  - Create and manipulate images
+images... It is unavoidable. Here the size of the canvas is set by the display. .IP (bu 2 Set the display's window name (only available in windowed displays [] (3)  - like system using the following comman (requiring pkg-config and gcc):
+imake []             (1)  - C preprocessor interface to the make utility
+imaxabs []           (3)  - compute the absolute value of an integer
+imaxdiv []           (3)  - compute quotient and remainder of an integer division
+img2txt []           (1)  - convert images to various text-based coloured files
+imgcmp []            (1)  - Image comparison utility
+imginfo []           (1)  - Image information utility
+imgtoppm []          (1)  - convert an Img-whatnot file into a portable pixmap
+imlib []             (1)  - config - Display Imlib and GDK-Imlib Library Configuration
+imlib_config []      (1)  - Imlib Configuration Editor
+immedok []           (3)  - curses output options
+import []            (1)  - saves any visible window on an X server and outputs it as an image file. You can capture a single window, the entire screen, or any rectangular portion of the screen
+imsmap []            (6)  - generate fractal maps
+in.identd []         (8)  - TCP/IP IDENT protocol server
+in_wch []            (3)  - extract a complex character and rendition from a window
+in_wchnstr []        (3)  - get an array of complex characters and renditions from a curses window
+in_wchstr []         (3)  - get an array of complex characters and renditions from a curses window
+inb []               (2)  - port I/O
+inb_p []             (2)  - port I/O
+inch []              (3)  - get a character and attributes from a curses window
+inchnstr []          (3)  - get a string of characters (and attributes) from a curses window
+inchstr []           (3)  - get a string of characters (and attributes) from a curses window
+includeres []        (1)  - filter to include resources in a PostScript document
+incr []              (n)  - Increment the value of a variable
+indent []            (1)  - changes the appearance of a C program by inserting or deleting whitespace
+index []             (3)  - locate character in string
+index []             (3)  - string operations
+indxbib []           (1)  - make inverted index for bibliographic databases
+inet_addr []         (3)  - Internet address manipulation routines
+inet_aton []         (3)  - Internet address manipulation routines
+inet_aton []         (3)  - load the C socket.h defines and structure manipulators
+inet_lnaof []        (3)  - Internet address manipulation routines
+inet_makeaddr []     (3)  - Internet address manipulation routines
+inet_netof []        (3)  - Internet address manipulation routines
+inet_network []      (3)  - Internet address manipulation routines
+inet_ntoa []         (3)  - Internet address manipulation routines
+inet_ntoa []         (3)  - load the C socket.h defines and structure manipulators
+inet_ntop []         (3)  - convert IPv4 and IPv6 addresses from binary to text form
+inet_pton []         (3)  - convert IPv4 and IPv6 addresses from text to binary form
+inetd []             (8)  - internet super - server
+infnan []            (3)  - deal with infinite or not-a-number (NaN) result
+info []              (1)  - read Info documents
+info []              (5)  - readable online documentation
+info []              (n)  - Return information about the state of the Tcl interpreter
+infocmp []           (1)  - compare or print out terminfo descriptions
+infokey []           (1)  - compile customizations for Info
+infotocap []         (1)  - convert a terminfo description into a termcap description
+infotopam []         (1)  - see http://netpbm.sourceforge.net/doc/infotopam.html
+init []              (8)  - process control initialization
+init_color []        (3)  - curses color manipulation routines
+init_mib []          (3)  - mib_api functions
+init_mib_internals [] (3)  - mib_api functions
+init_module []       (2)  - initialize a loadable module entry
+init_pair []         (3)  - curses color manipulation routines
+initgroups []        (3)  - initialize the supplementary group access list
+initlog []           (1)  - log messages and events to the system logger
+initrd []            (4)  - boot loader initialized RAM disk
+initscr []           (3)  - curses screen initialization and manipulation routines
+initscript []        (5)  - script that executes inittab commands
+initstate []         (3)  - random number generator
+initstate_r []       (3)  - reentrant random number generator
+inittab []           (5)  - format of the inittab file used by the sysv-compatible init process
+inl []               (2)  - port I/O
+inl_p []             (2)  - port I/O
+innetgr []           (3)  - handle network group entries
+innochecksum []      (1)  - offline InnoDB file checksum utility
+innstr []            (3)  - get a string of characters from a curses window
+innwstr []           (3)  - get a string of wchar_t characters from a curses window
+inotify []           (7)  - monitoring file system events
+inotify_add_watch [] (2)  - add a watch to an initialized inotify instance
+inotify_init []      (2)  - initialize an inotify instance
+inotify_init1 []     (2)  - initialize an inotify instance
+inotify_rm_watch []  (2)  - remove an existing watch from an inotify instance
+inotifywait []       (1)  - wait for changes to files using inotify
+inotifywatch []      (1)  - gather filesystem access statistics using inotify
+ins_nwstr []         (3)  - insert a wide-character string into a curses window
+ins_wch []           (3)  - insert a complex character and rendition into a window
+ins_wstr []          (3)  - insert a wide-character string into a curses window
+insb []              (2)  - port I/O
+insch []             (3)  - insert a character before cursor in a curses window
+insdelln []          (3)  - delete and insert lines in a curses window
+insertln []          (3)  - delete and insert lines in a curses window
+insl []              (2)  - port I/O
+insmod []            (8)  - simple program to insert a module into the Linux Kernel
+insnstr []           (3)  - insert string before cursor in a curses window
+insque []            (3)  - insert/remove an item from a queue
+insstr []            (3)  - insert string before cursor in a curses window
+install []           (1)  - copy files and set attributes
+install []           (1)  - info - update info/dir entries
+install []           (8)  - catalog - Manage a SGML or XML centralized catalog
+installpkg []        (8)  - install Slackware packages
+instance []          (3)  - Process individual MIB instances easily
+instmodsh []         (1)  - A shell to examine installed modules
+instr []             (3)  - get a string of characters from a curses window
+insw []              (2)  - port I/O
+integer []           (3)  - Perl pragma to use integer arithmetic instead of floating point
+intel []             (4)  - Intel integrated graphics chipsets
+intel_gpu_dump []    (1)  - Print out debugging information on the state of the Intel GPU
+intel_gpu_top []     (1)  - Display a top-like summary of Intel GPU usage
+intel_stepping []    (1)  - Display the stepping information for an Intel GPU
+intel_upload_blit_large [] (1)  - microbenchmark of Intel GPU performance
+intel_upload_blit_large_gtt [] (1)  - microbenchmark of Intel GPU performance
+intel_upload_blit_large_map [] (1)  - microbenchmark of Intel GPU performance
+intel_upload_blit_small [] (1)  - microbenchmark of Intel GPU performance
+interaggregate []    (6)  - Visualize the momentary and aggregate intersections between slowly moving circles
+interference []      (6)  - decaying sinusoidal waves
+intermomentary []    (6)  - Visualize the momentary and aggregate intersections between slowly moving circles
+interp []            (n)  - Create and manipulate Tcl interpreters
+intltool []          (8)  - extract - generate header files which can be read by gettext
+intltool []          (8)  - merge - merge translated strings into various types of file
+intltool []          (8)  - prepare - Prepare software to make use of intltool
+intltool []          (8)  - update - updates PO template file and merge translations with it
+intltoolize []       (8)  - copy intltool related files to software package
+intrflush []         (3)  - curses input options
+intro []             (1)  - Introduction to user commands
+intro []             (2)  - Introduction to system calls
+intro []             (3)  - Introduction to library functions
+intro []             (4)  - Introduction to special files
+intro []             (5)  - Introduction to file formats
+intro []             (6)  - Introduction to games
+intro []             (7)  - Introduction to overview, conventions, and miscellany section
+intro []             (8)  - Introduction to administration and privileged commands
+inw []               (2)  - port I/O
+inw_p []             (2)  - port I/O
+inwstr []            (3)  - get a string of wchar_t characters from a curses window
+io_cancel []         (2)  - cancel an outstanding asynchronous I/O operation
+io_destroy []        (2)  - destroy an asynchronous I/O context
+io_getevents []      (2)  - read asynchronous I/O events from the completion queue
+io_setup []          (2)  - create an asynchronous I/O context
+io_submit []         (2)  - submit asynchronous I/O blocks for processing
+ioctl []             (2)  - control device
+ioctl_list []        (2)  - list of ioctl calls in Linux/i386 kernel
+ionice []            (1)  - get/set program io scheduling class and priority
+ioperm []            (2)  - set port input/output permissions
+iopl []              (2)  - change I/O privilege level
+ioprio_get []        (2)  - get/set I/O scheduling class and priority
+ioprio_set []        (2)  - get/set I/O scheduling class and priority
+iostat []            (1)  - Report Central Processing Unit (CPU) statistics and input/output statistics for devices and partitions
+ip []                (7)  - Linux IPv4 protocol implementation
+ip []                (8)  - show / manipulate routing, devices, policy routing and tunnels
+ip6tables []         (8)  - IPv6 packet filter administration
+ip6tables []         (8)  - restore - Restore IPv6 Tables
+ip6tables []         (8)  - save - Save IPv6 Tables
+ipc []               (2)  - System V IPC system calls
+ipcrm []             (1)  - remove a message queue, semaphore set or shared memory id
+ipcs []              (1)  - provide information on ipc facilities
+ipmask []            (8)  - determine network and broadcast addresses given a decimal netmask and IP address
+ipq_create_handle [] (3)  - create and destroy libipq handles
+ipq_destroy_handle [] (3)  - create and destroy libipq handles
+ipq_errstr []        (3)  - libipq error handling routines
+ipq_get_packet []    (3)  - query queue messages
+ipq_getmsgerr []     (3)  - query queue messages
+ipq_message_type []  (3)  - query queue messages
+ipq_perror []        (3)  - libipq error handling routines
+ipq_read []          (3)  - read queue messages from ip_queue and read into supplied buffer
+ipq_set_mode []      (3)  - set the ip_queue queuing mode
+ipq_set_verdict []   (3)  - issue verdict and optionally modified packet to kernel
+iptables []          (8)  - administration tool for IPv4 packet filtering and NAT
+iptables []          (8)  - restore - Restore IP Tables
+iptables []          (8)  - save - Save IP Tables
+iptables []          (8)  - xml - Convert iptables-save format to XML
+iptraf []            (8)  - Interactive Colorful IP LAN Monitor
+ipv6 []              (7)  - Linux IPv6 protocol implementation
+irb(main):009:0>Caca.constants =>['BROWN' [] (3)  - rcaca -e 'c=Caca::Canvas.new(6, 3).fill_box(0, 0, 2, 2, '#'[0]); c2=Caca::Canvas.new(1, 1).put_str(0, 0, 'x'); c.blit(1, 1, c2); puts c.export_memory('irc')' ### #x# ###
+iruserok []          (3)  - routines for returning a stream to a remote command
+is_cleared []        (3)  - curses window properties
+is_idcok []          (3)  - curses window properties
+is_idlok []          (3)  - curses window properties
+is_immedok []        (3)  - curses window properties
+is_keypad []         (3)  - curses window properties
+is_leaveok []        (3)  - curses window properties
+is_linetouched []    (3)  - curses refresh control routines
+is_nodelay []        (3)  - curses window properties
+is_scrollok []       (3)  - curses window properties
+is_syncok []         (3)  - curses window properties
+is_term_resized []   (3)  - change the curses terminal size
+is_timeout []        (3)  - curses window properties
+is_wintouched []     (3)  - curses refresh control routines
+isadump []           (8)  - examine ISA registers
+isalnum []           (3)  - character classification routines
+isalpha []           (3)  - character classification routines
+isapnp []            (8)  - Configure ISA Plug-and-Play devices
+isapnp.conf []       (5)  - File format used by isapnp
+isascii []           (3)  - character classification routines
+isaset []            (8)  - set ISA registers
+isatty []            (3)  - test whether a file descriptor refers to a terminal
+isblank []           (3)  - character classification routines
+iscntrl []           (3)  - character classification routines
+isdigit []           (3)  - character classification routines
+isendwin []          (3)  - curses screen initialization and manipulation routines
+isfinite []          (3)  - floating-point classification macros
+isgraph []           (3)  - character classification routines
+isgreater []         (3)  - floating-point relational tests without exception for NaN
+isgreaterequal []    (3)  - floating-point relational tests without exception for NaN
+isinf []             (3)  - BSD floating - point classification functions
+isinf []             (3)  - floating-point classification macros
+isinff []            (3)  - BSD floating - point classification functions
+isinfl []            (3)  - BSD floating - point classification functions
+isless []            (3)  - floating-point relational tests without exception for NaN
+islessequal []       (3)  - floating-point relational tests without exception for NaN
+islessgreater []     (3)  - floating-point relational tests without exception for NaN
+islower []           (3)  - character classification routines
+isnan []             (3)  - BSD floating - point classification functions
+isnan []             (3)  - floating-point classification macros
+isnanf []            (3)  - BSD floating - point classification functions
+isnanl []            (3)  - BSD floating - point classification functions
+isnormal []          (3)  - floating-point classification macros
+iso_8859 []          (7)  - 1 - the ISO 8859-1 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 10 - the ISO 8859-10 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 11 - the ISO 8859-11 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 13 - the ISO 8859-13 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 14 - the ISO 8859-14 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 15 - the ISO 8859-15 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 16 - the ISO 8859-16 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 2 - the ISO 8859-2 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 3 - the ISO 8859-3 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 4 - the ISO 8859-4 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 5 - the ISO 8859-5 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 6 - the ISO 8859-6 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 7 - the ISO 8859-7 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 8 - the ISO 8859-8 character set encoded in octal, decimal, and hexadecimal
+iso_8859 []          (7)  - 9 - the ISO 8859-9 character set encoded in octal, decimal, and hexadecimal
+isodebug []          (8)  - print mkisofs debug info from ISO-9660 image
+isodump []           (5)  - format of IEEE 1394 isochronous packets dump file
+isodump []           (8)  - Utility programs for dumping and verifying iso9660 images
+isoinfo []           (8)  - Utility programs for dumping and verifying iso9660 images
+isosize []           (8)  - outputs the length of a iso9660 file system
+isovfy []            (8)  - Utility programs for dumping and verifying iso9660 images
+ispell []            (1)  - Interactive spelling checking
+ispell []            (4)  - format of ispell dictionaries and affix files
+isprint []           (3)  - character classification routines
+ispunct []           (3)  - character classification routines
+isspace []           (3)  - character classification routines
+issue []             (5)  - pre-login message and identification file
+isunordered []       (3)  - floating-point relational tests without exception for NaN
+isupper []           (3)  - character classification routines
+iswalnum []          (3)  - test for alphanumeric wide character
+iswalpha []          (3)  - test for alphabetic wide character
+iswblank []          (3)  - test for whitespace wide character
+iswcntrl []          (3)  - test for control wide character
+iswctype []          (3)  - wide-character classification
+iswdigit []          (3)  - test for decimal digit wide character
+iswgraph []          (3)  - test for graphic wide character
+iswlower []          (3)  - test for lowercase wide character
+iswprint []          (3)  - test for printing wide character
+iswpunct []          (3)  - test for punctuation or symbolic wide character
+iswspace []          (3)  - test for whitespace wide character
+iswupper []          (3)  - test for uppercase wide character
+iswxdigit []         (3)  - test for hexadecimal digit wide character
+isxdigit []          (3)  - character classification routines
+iterator_info_s []   (3)  - Holds iterator information containing functions which should be called by the iterator_handler to loop over your data set and sort it in a SNMP specific manner
+iw []                (8)  - show / manipulate wireless devices and their configuration
+iwconfig []          (8)  - configure a wireless network interface
+iwevent []           (8)  - Display Wireless Events generated by drivers and setting changes
+iwgetid []           (8)  - Report ESSID, NWID or AP/Cell Address of wireless network
+iwlist []            (8)  - Get more detailed wireless information from a wireless interface
+iwpriv []            (8)  - configure optionals (private) parameters of a wireless network interface
+iwspy []             (8)  - Get wireless statistics from specific nodes
+j0 []                (3)  - Bessel functions of the first kind
+j0f []               (3)  - Bessel functions of the first kind
+j0l []               (3)  - Bessel functions of the first kind
+j1 []                (3)  - Bessel functions of the first kind
+j1f []               (3)  - Bessel functions of the first kind
+j1l []               (3)  - Bessel functions of the first kind
+jasper []            (1)  - File format converter specialized in JPEG-2000 encoding
+jaztool []           (1)  - Tool for IOMega JAZ and ZIP drives
+jbigtopnm []         (1)  - JBIG to PNM image file converter
+jcf []               (1)  - dump - print information about Java class files
+jfs_debugfs []       (8)  - shell-type JFS file system editor
+jfs_fsck []          (8)  - initiate replay of the JFS transaction log, and check and repair a JFS formatted device
+jfs_fscklog []       (8)  - extract a JFS fsck service log into a file and/or format and display the extracted file
+jfs_logdump []       (8)  - dump a JFS formatted device's journal log
+jfs_mkfs []          (8)  - create a JFS formatted partition
+jfs_tune []          (8)  - adjust tunable file system parameters on JFS
+jigglypuff []        (6)  - save your screen by tormenting your eyes
+jigsaw []            (6)  - permute an image like a jigsaw puzzle
+jiv []               (1)  - Image display utility
+jn []                (3)  - Bessel functions of the first kind
+jnf []               (3)  - Bessel functions of the first kind
+jng []               (5)  - JPEG Network Graphics (JNG) sub-format
+jnl []               (3)  - Bessel functions of the first kind
+jobs []              (1)  - bash built-in commands, see bash(1)
+joe []               (1)  - Joe's Own Editor
+join []              (1)  - join lines of two files on a common field
+join []              (n)  - Create a string by joining together list elements
+jove []              (1)  - an interactive display-oriented text editor
+joystick []          (4)  - Joystick input driver
+joystick_close []    (3)  - close a joystick
+joystick_getaxis []  (3)  - query the current state of a joystick
+joystick_getbutton [] (3)  - query the current state of a joystick
+joystick_getnumaxes [] (3)  - query the capabilities of a joystick
+joystick_getnumbuttons [] (3)  - query the capabilities of a joystick
+joystick_init []     (3)  - open a joystick
+joystick_setdefaulthandler [] (3)  - set the joystick event handler
+joystick_sethandler [] (3)  - set the joystick event handler
+joystick_update []   (3)  - query joysticks for status changes
+joytest []           (6)  - test the svgalib joystick package in text mode
+jpeg2ktopam []       (1)  - see http://netpbm.sourceforge.net/doc/jpeg2ktopam.html
+jpegicc []           (1)  - little cms ICC profile applier for JPEG
+jpegtopnm []         (1)  - convert JPEG/JFIF file to portable pixmap or graymap
+jpegtran []          (1)  - lossless transformation of JPEG files
+jrand48 []           (3)  - generate uniformly distributed pseudo-random numbers
+jrand48_r []         (3)  - generate uniformly distributed pseudo-random numbers reentrantly
+juggle []            (6)  - juggling man screen saver
+julia []             (6)  - draws spinning, animating julia-set fractals
+jv []                (1)  - convert - Convert file from one encoding to another
+jw []                (1)  - (Jade Wrapper) converts SGML files to other formats
+kabcclient []        (1)  - commandline client for the KDE addressbook
+kalzium []           (1)  - A KDE based chemistry teaching tool
+kappfinder []        (1)  - An app to add installed applications to the KDE menu
+karma_helper []      (1)  - program to do something FIXME
+kate []              (1)  - Advanced text editor for KDE
+kbd []               (4)  - Keyboard input driver
+kbd_mode []          (1)  - report or set the keyboard mode
+kbdrate []           (8)  - reset the keyboard repeat rate and delay time
+kbookmarkmerger []   (1)  - A program for merging a given set of bookmarks into the user's list of bookmarks
+kbruch []            (1)  - Learn calculating with fractions
+kbuildsycoca4 []     (8)  - Rebuilds the system configuration cache
+kcookiejar4 []       (8)  - KDE HTTP cookie daemon
+kde4 []              (1)  - config - Prints KDE installation paths
+kded4 []             (8)  - KDE daemon - triggers Sycoca database updates when needed
+kdeinit4 []          (8)  - Start all other KDE programs and kdeinit loadable modules (KLMs)
+kdeoptions []        (7)  - Common commandline options for all applications based on the KDE libraries
+kdesu []             (1)  - Runs a program with elevated privileges
+key_decryptsession [] (3)  - interfaces to rpc keyserver daemon
+key_defined []       (3)  - check if a keycode is defined
+key_encryptsession [] (3)  - interfaces to rpc keyserver daemon
+key_gendes []        (3)  - interfaces to rpc keyserver daemon
+key_name []          (3)  - miscellaneous curses utility routines
+key_secretkey_is_set [] (3)  - interfaces to rpc keyserver daemon
+key_setsecret []     (3)  - interfaces to rpc keyserver daemon
+keyboard_clearstate [] (3)  - reset the state of all keys when in raw keyboard mode
+keyboard_close []    (3)  - return the keyboard to normal operation from raw mode
+keyboard_getstate [] (3)  - get a pointer to a buffer holding the state of all keys in raw keyboard mode
+keyboard_init []     (3)  - initialize the keyboard to raw mode
+keyboard_init_return_fd [] (3)  - initialize the keyboard to raw mode
+keyboard_keypressed [] (3)  - check if a key is pressed when in raw keyboard mode
+keyboard_setdefaulteventhandler [] (3)  - define an event handler for keyboard events in raw mode
+keyboard_seteventhandler [] (3)  - define an event handler for keyboard events in raw mode
+keyboard_translatekeys [] (3)  - modify scancode mappings in raw keyboard mode
+keyboard_update []   (3)  - process raw keyboard events
+keyboard_waitforupdate [] (3)  - process raw keyboard events
+keybound []          (3)  - return definition of keycode
+keymaps []           (5)  - keyboard table descriptions for loadkeys and dumpkeys
+keyname []           (3)  - miscellaneous curses utility routines
+keyok []             (3)  - enable or disable a keycode
+keypad []            (3)  - curses input options
+keysyms []           (n)  - keysyms recognized by Tk
+keytest []           (6)  - tests the svgalib raw keyboard functions
+kfind []             (1)  - file find utility for KDE
+khangman []          (6)  - The classical hangman game for KDE
+kibi []              (7)  - decimal and binary prefixes
+kibitz []            (1)  - allow two people to interact with one shell
+kig []               (1)  - an interactive geometry program for KDE
+kill []              (1)  - bash built-in commands, see bash(1)
+kill []              (1)  - terminate a process
+kill []              (2)  - send signal to a process
+killall []           (1)  - kill processes by name
+killall5 []          (8)  - - send a signal to all processes
+killchar []          (3)  - curses environment query routines
+killpg []            (2)  - send signal to a process group
+killwchar []         (3)  - curses environment query routines
+kilo []              (7)  - decimal and binary prefixes
+kjs []               (1)  - KDE ECMAScript compatible interpreter
+kjscmd []            (1)  - KDE KJSEmbed interpreter
+klein []             (6)  - A Klein Bottle (and other parametric surfaces) visualization
+klogctl []           (2)  - read and/or clear kernel message ring buffer; set console_loglevel
+klogd []             (8)  - Kernel Log Daemon
+kmag []              (1)  - Screen magnifier
+kmem []              (4)  - system memory, kernel memory and system ports
+kmousetool []        (1)  - Accessibility tool to help click the mouse
+kmouth []            (1)  - A type-and-say front end for speech synthesizers
+kmplot []            (1)  - mathematical function plotter
+koi8 []              (7)  - r - Russian Net Character Set encoded in octal, decimal, and hexadecimal
+koi8 []              (7)  - u - Ukrainian Net Character Set encoded in octal, decimal, and hexadecimal
+koi8rxterm []        (1)  - X terminal emulator for KOI8-R environments
+kross []             (1)  - KDE application to run kross scripts
+ksh93 []             (1)  - KornShell, a
+ktouch []            (1)  - a typing tutor for KDE
+kumppa []            (6)  - spiraling, spinning, splashes of color rush toward the screen
+l2ping []            (1)  - Send L2CAP echo request and receive answer
+l64a []              (3)  - convert between long and base-64
+label []             (n)  - Create and manipulate label widgets
+labelframe []        (n)  - Create and manipulate labelframe widgets
+labs []              (3)  - compute the absolute value of an integer
+lament []            (6)  - animates the Lament Configuration
+lappend []           (n)  - Append list elements onto a variable
+lassign []           (n)  - Assign list elements to variables
+last []              (1)  - list logins on the system
+last []              (1)  - show listing of last logged in users
+lastb []             (1)  - show listing of last logged in users
+lastcomm []          (1)  - print out information about previously executed commands
+lastlog []           (8)  - examine lastlog file
+lavalite []          (6)  - 3D OpenGL simulation of a Lavalite
+lbxproxy []          (1)  - Low BandWidth X proxy
+lcdscrub []          (6)  - attempt to repair burn-in on LCD screens
+lchown []            (2)  - change ownership of a file
+lckpwdf []           (3)  - get shadow password file entry
+lcong48 []           (3)  - generate uniformly distributed pseudo-random numbers
+lcong48_r []         (3)  - generate uniformly distributed pseudo-random numbers reentrantly
+ld []                (1)  - The GNU linker
+ld []                (8)  - linux.so* - dynamic linker/loader
+ld.so []             (8)  - linux.so* - dynamic linker/loader
+ld86 []              (1)  - Linker for as86(1)
+ld_errno []          (3)  - LDAP protocol error handling routines
+ldap []              (3)  - OpenLDAP Lightweight Directory Access Protocol API
+ldap.conf []         (5)  - ldap configuration file
+ldap_abandon []      (3)  - Abandon an LDAP operation in progress
+ldap_abandon_ext []  (3)  - Abandon an LDAP operation in progress
+ldap_add []          (3)  - Perform an LDAP add operation
+ldap_add_ext []      (3)  - Perform an LDAP add operation
+ldap_add_ext_s []    (3)  - Perform an LDAP add operation
+ldap_add_s []        (3)  - Perform an LDAP add operation
+ldap_attributetype2name [] (3)  - Schema definition handling routines
+ldap_attributetype2str [] (3)  - Schema definition handling routines
+ldap_attributetype_free [] (3)  - Schema definition handling routines
+ldap_bind []         (3)  - LDAP bind routines
+ldap_bind_s []       (3)  - LDAP bind routines
+ldap_compare []      (3)  - Perform an LDAP compare operation
+ldap_compare_s []    (3)  - Perform an LDAP compare operation
+ldap_count_entries [] (3)  - LDAP result entry parsing and counting routines
+ldap_count_messages [] (3)  - Stepping through messages in a result chain
+ldap_count_references [] (3)  - Stepping through continuation references in a result chain
+ldap_count_values [] (3)  - LDAP attribute value handling routines
+ldap_delete []       (3)  - Perform an LDAP delete operation
+ldap_delete_s []     (3)  - Perform an LDAP delete operation
+ldap_dn2ufn []       (3)  - LDAP DN handling routines
+ldap_err2string []   (3)  - LDAP protocol error handling routines
+ldap_errlist []      (3)  - LDAP protocol error handling routines
+ldap_explode_dn []   (3)  - LDAP DN handling routines
+ldap_explode_rdn []  (3)  - LDAP DN handling routines
+ldap_first_attribute [] (3)  - step through LDAP entry attributes
+ldap_first_entry []  (3)  - LDAP result entry parsing and counting routines
+ldap_first_message [] (3)  - Stepping through messages in a result chain
+ldap_first_reference [] (3)  - Stepping through continuation references in a result chain
+ldap_free_urldesc [] (3)  - LDAP Uniform Resource Locator routines
+ldap_get_dn []       (3)  - LDAP DN handling routines
+ldap_get_values []   (3)  - LDAP attribute value handling routines
+ldap_get_values_len [] (3)  - LDAP attribute value handling routines
+ldap_init []         (3)  - Initialize the LDAP library and open a connection to an LDAP server
+ldap_is_ldap_url []  (3)  - LDAP Uniform Resource Locator routines
+ldap_matchingrule2name [] (3)  - Schema definition handling routines
+ldap_matchingrule2str [] (3)  - Schema definition handling routines
+ldap_matchingrule_free [] (3)  - Schema definition handling routines
+ldap_modify []       (3)  - Perform an LDAP modify operation
+ldap_modify_s []     (3)  - Perform an LDAP modify operation
+ldap_modrdn []       (3)  - Perform an LDAP modify RDN operation
+ldap_modrdn2 []      (3)  - Perform an LDAP modify RDN operation
+ldap_modrdn2_s []    (3)  - Perform an LDAP modify RDN operation
+ldap_modrdn_s []     (3)  - Perform an LDAP modify RDN operation
+ldap_next_attribute [] (3)  - step through LDAP entry attributes
+ldap_next_entry []   (3)  - LDAP result entry parsing and counting routines
+ldap_next_message [] (3)  - Stepping through messages in a result chain
+ldap_next_reference [] (3)  - Stepping through continuation references in a result chain
+ldap_objectclass2name [] (3)  - Schema definition handling routines
+ldap_objectclass2str [] (3)  - Schema definition handling routines
+ldap_objectclass_free [] (3)  - Schema definition handling routines
+ldap_open []         (3)  - Initialize the LDAP library and open a connection to an LDAP server
+ldap_parse_reference [] (3)  - Extract referrals and controls from a reference message
+ldap_parse_result [] (3)  - Parsing results
+ldap_parse_sasl_bind_result [] (3)  - LDAP bind routines
+ldap_perror []       (3)  - LDAP protocol error handling routines
+ldap_result []       (3)  - Wait for the result of an LDAP operation
+ldap_result2error [] (3)  - LDAP protocol error handling routines
+ldap_sasl_bind []    (3)  - LDAP bind routines
+ldap_sasl_bind_s []  (3)  - LDAP bind routines
+ldap_sasl_interactive_bind_s [] (3)  - LDAP bind routines
+ldap_scherr2str []   (3)  - Schema definition handling routines
+ldap_search []       (3)  - Perform an LDAP search operation
+ldap_search_s []     (3)  - Perform an LDAP search operation
+ldap_search_st []    (3)  - Perform an LDAP search operation
+ldap_simple_bind []  (3)  - LDAP bind routines
+ldap_simple_bind_s [] (3)  - LDAP bind routines
+ldap_sort_entries [] (3)  - LDAP sorting routines
+ldap_sort_strcasecmp [] (3)  - LDAP sorting routines
+ldap_sort_values []  (3)  - LDAP sorting routines
+ldap_str2attributetype [] (3)  - Schema definition handling routines
+ldap_str2matchingrule [] (3)  - Schema definition handling routines
+ldap_str2objectclass [] (3)  - Schema definition handling routines
+ldap_str2syntax []   (3)  - Schema definition handling routines
+ldap_syntax2name []  (3)  - Schema definition handling routines
+ldap_syntax2str []   (3)  - Schema definition handling routines
+ldap_syntax_free []  (3)  - Schema definition handling routines
+ldap_unbind []       (3)  - LDAP bind routines
+ldap_unbind_s []     (3)  - LDAP bind routines
+ldap_url_parse []    (3)  - LDAP Uniform Resource Locator routines
+ldapadd []           (1)  - LDAP modify entry and LDAP add entry tools
+ldapcompare []       (1)  - LDAP compare tool
+ldapdelete []        (1)  - LDAP delete entry tool
+ldapmodify []        (1)  - LDAP modify entry and LDAP add entry tools
+ldapmodrdn []        (1)  - LDAP rename entry tool
+ldappasswd []        (1)  - change the password of an LDAP entry
+ldapsearch []        (1)  - LDAP search tool
+ldapwhoami []        (1)  - LDAP who am i? tool
+ldattach []          (8)  - attach a line discipline to a serial line
+ldbadd []            (1)  - Command-line utility for adding records to an LDB
+ldbdel []            (1)  - Command-line program for deleting LDB records
+ldbedit []           (1)  - Edit LDB databases using your preferred editor
+ldbmodify []         (1)  - Modify records in a LDB database
+ldbsearch []         (1)  - Search for records in a LDB database
+ldd []               (1)  - print shared library dependencies
+ldexp []             (3)  - multiply floating-point number by integral power of 2
+ldexpf []            (3)  - multiply floating-point number by integral power of 2
+ldexpl []            (3)  - multiply floating-point number by integral power of 2
+ldif []              (5)  - LDAP Data Interchange Format
+ldiv []              (3)  - compute quotient and remainder of an integer division
+le16toh []           (3)  - convert values between host and big - /little-endian byte order
+le32toh []           (3)  - convert values between host and big - /little-endian byte order
+le64toh []           (3)  - convert values between host and big - /little-endian byte order
+leaf_handlers []     (3)  - Process individual leaf objects A group of handlers to implement individual leaf objects and instances (both scalar objects, and individual objects and instances within a table)
+leaftoppm []         (1)  - convert Interleaf image format to PPM image
+leaveok []           (3)  - curses output options
+less []              (1)  - opposite of more
+less []              (3)  - perl pragma to request less of something
+lesskey []           (1)  - specify key bindings for less
+let []               (1)  - bash built-in commands, see bash(1)
+lfind []             (3)  - linear search of an array
+lftp []              (1)  - Sophisticated file transfer program
+lftpget []           (1)  - get a file with lftp(1)
+lgamma []            (3)  - log gamma function
+lgamma_r []          (3)  - log gamma function
+lgammaf []           (3)  - log gamma function
+lgammaf_r []         (3)  - log gamma function
+lgammal []           (3)  - log gamma function
+lgammal_r []         (3)  - log gamma function
+lgetxattr []         (2)  - retrieve an extended attribute value
+lh_delete []         (3)  - dynamic hash table
+lh_doall []          (3)  - dynamic hash table
+lh_doall_arg []      (3)  - dynamic hash table
+lh_error []          (3)  - dynamic hash table
+lh_free []           (3)  - dynamic hash table
+lh_insert []         (3)  - dynamic hash table
+lh_new []            (3)  - dynamic hash table
+lh_node_stats []     (3)  - LHASH statistics
+lh_node_stats_bio [] (3)  - LHASH statistics
+lh_node_usage_stats [] (3)  - LHASH statistics
+lh_node_usage_stats_bio [] (3)  - LHASH statistics
+lh_retrieve []       (3)  - dynamic hash table
+lh_stats []          (3)  - LHASH statistics
+lh_stats_bio []      (3)  - LHASH statistics
+lib []               (3)  - manipulate @INC at compile time
+libXp []             (3)  - X Print Client Library
+libao.conf []        (5)  - configuration for libao
+libarchive []        (3)  - functions for reading and writing streaming archives
+libarchive []        (5)  - formats - archive formats supported by the libarchive library
+libarchive_internals [] (3)  - description of libarchive internal interfaces
+libblkid []          (3)  - block device identification library
+libc []              (7)  - Overview of standard C libraries on Linux
+libcaca []           (3)  - authors - Libcaca authors Sam Hocevar <sam@zoy.org>
+libcaca []           (3)  - canvas - The libcaca canvas format (version 1) All types are big endian
+libcaca []           (3)  - env - Libcaca environment variables Some environment variables can be used to change the behaviour of libcaca without having to modify the program which uses them. These variables are:
+libcaca []           (3)  - font - The libcaca font format (version 1) All types are big endian
+libcaca []           (3)  - migrating - Migrating from libcaca 0.x to the 1.0 API This section will guide you through the migration of a libcaca 0.x application to the latest API version
+libcaca []           (3)  - news - Libcaca news
+libcaca []           (3)  - ruby - Libcaca ruby bindings There is no real documentation yet for the Ruby binding but fCmethods on any object should help you :)
+libcaca []           (3)  - ruby-api - Libcaca Ruby API Theclasses available for libcaca are :
+libcaca []           (3)  - style - Libcaca coding style
+libcaca []           (3)  - thanks - Libcaca thanks
+libcaca []           (3)  - tutorial - A libcaca tutorial First, a very simple working program, to check for basic libcaca functionalities
+libcurl []           (3)  - client-side URL transfers
+libcurl []           (3)  - easy - easy interface overview
+libcurl []           (3)  - errors - error codes in libcurl
+libcurl []           (3)  - multi - how to use the multi interface
+libcurl []           (3)  - share - how to use the share interface
+libcurl []           (3)  - tutorial - libcurl programming tutorial
+libexpect []         (3)  - programmed dialogue library with interactive programs
+libexslt []          (3)  - extension library for XSLT
+libgphoto2 []        (3)  - cross-platform digital camera library
+libgphoto2_port []   (3)  - cross-platform port access library
+libieee1284 []       (3)  - IEEE1284 communications library
+libipq []            (3)  - iptables userspace packet queuing library
+libmcrypt []         (3)  - encryption/decryption library
+libmng []            (3)  - Multiple-image Network Graphics (MNG) Reference Library 1.0.9
+libnetFAQ []         (3)  - libnet Frequently Asked Questions
+libnetcfg []         (1)  - configure libnet
+libnetlink []        (3)  - A library for accessing the netlink service
+libnetpbm []         (3)  - see http://netpbm.sourceforge.net/doc/libnetpbm.html
+libntfs []           (8)  - gnomevfs - Module for GNOME VFS that allows access to NTFS filesystems
+libntfs []           (8)  - library for accessing and managing NTFS volumes
+libpbm []            (3)  - functions to read and write PBM image files
+libpgm []            (3)  - functions to support portable graymap (PGM) programs
+libpng []            (3)  - Portable Network Graphics (PNG) Reference Library 1.2.35
+libpng []            (3)  - Portable Network Graphics (PNG) Reference Library 1.2.35 (private functions)
+libpnm []            (3)  - functions to support pnm and pam programs
+libppm []            (3)  - functions to support portable pixmap (PPM) programs
+libraptor []         (3)  - Raptor RDF parser and serializer library
+librasqal []         (3)  - Rasqal RDF query library
+libsensors []        (3)  - publicly accessible functions provided by the sensors library
+libsmbclient []      (7)  - An extension library for browsers and that can be used as a generic browsing API
+libsox []            (3)  - SoX, an audio file-format and effect library
+libtiff []           (3)  - introduction to
+libvga.config []     (5)  - the svgalib configuration file
+libvga.et4000 []     (7)  - Information for Tseng ET4000 users
+libxml []            (3)  - library used to parse XML files
+libxslt []           (3)  - library used to do XSL transformations on XML documents
+libzip []            (3)  - library for manipulating zip archives
+lilo []              (8)  - install boot loader
+lilo.conf []         (5)  - configuration file for lilo
+limits []            (5)  - Resource limits definition
+lindex []            (n)  - Retrieve an element from a list
+line []              (1)  - read one line
+lineart []           (6)  - test a linear frame buffer
+link []              (1)  - call the link function to create a link to a file
+link []              (2)  - make a new name for a file
+linkat []            (2)  - create a file link relative to directory file descriptors
+links []             (1)  - lynx-like alternative character mode WWW browser
+linsert []           (n)  - Insert elements into a list
+linuxdoc []          (1)  - LinuxDoc DTD SGML converter to other output format
+lispmtopgm []        (1)  - convert a Lisp Machine bitmap file into pgm format
+list []              (n)  - Create a list
+listalias []         (1)  - list user and system aliases
+listbox []           (n)  - Create and manipulate listbox widgets
+listen []            (2)  - listen for connections on a socket
+listres []           (1)  - list resources in widgets
+listxattr []         (2)  - list extended attribute names
+lj4_font []          (5)  - groff fonts for use with devlj4
+ljlatest []          (6)  - prints the most recent public posts on livejournal.com
+lkbib []             (1)  - search bibliographic databases
+llabs []             (3)  - compute the absolute value of an integer
+lldiv []             (3)  - compute quotient and remainder of an integer division
+llength []           (n)  - Count the number of elements in a list
+llistxattr []        (2)  - list extended attribute names
+llrint []            (3)  - round to nearest integer
+llrintf []           (3)  - round to nearest integer
+llrintl []           (3)  - round to nearest integer
+llround []           (3)  - round to nearest integer, away from zero
+llroundf []          (3)  - round to nearest integer, away from zero
+llroundl []          (3)  - round to nearest integer, away from zero
+lmhosts []           (5)  - The Samba NetBIOS hosts file
+ln []                (1)  - make links between files
+lndir []             (1)  - create a shadow directory of symbolic links to another directory tree
+lnstat []            (8)  - unified linux network statistics
+load []              (n)  - Load machine code and initialize new commands
+loadTk []            (n)  - Load Tk into a safe interpreter
+loaderinfo []        (1)  - report SCSI tape device info
+loadkeys []          (1)  - load keyboard translation tables
+loadunimap []        (8)  - load the kernel unicode-to-font mapping table
+local []             (1)  - bash built-in commands, see bash(1)
+locale []            (3)  - Perl pragma to use and avoid POSIX locales for built-in operations
+locale []            (5)  - Describes a locale definition file
+locale []            (7)  - Description of multi-language support
+localeconv []        (3)  - get numeric formatting information
+localtime []         (3)  - transform date and time to broken-down time or ASCII
+localtime_r []       (3)  - transform date and time to broken-down time or ASCII
+lock []              (2)  - unimplemented system calls
+lockf []             (3)  - apply, test or remove a POSIX lock on an open file
+lockfile []          (1)  - conditional semaphore-file creator
+lockward []          (6)  - Rotating spinning color-cycling things
+log []               (3)  - natural logarithmic function
+log10 []             (3)  - base-10 logarithmic function
+log10f []            (3)  - base-10 logarithmic function
+log10l []            (3)  - base-10 logarithmic function
+log1p []             (3)  - logarithm of 1 plus argument
+log1pf []            (3)  - logarithm of 1 plus argument
+log1pl []            (3)  - logarithm of 1 plus argument
+log2 []              (3)  - base-2 logarithmic function
+log2f []             (3)  - base-2 logarithmic function
+log2l []             (3)  - base-2 logarithmic function
+log2pcap []          (1)  - Extract network traces from Samba log files
+logb []              (3)  - get exponent of a floating-point value
+logbf []             (3)  - get exponent of a floating-point value
+logbl []             (3)  - get exponent of a floating-point value
+logf []              (3)  - natural logarithmic function
+logger []            (1)  - a shell command interface to the syslog(3) system log module
+login []             (1)  - begin session on the system
+login []             (3)  - write utmp and wtmp entries
+login.access []      (5)  - Login access control table
+login_tty []         (3)  - tty utility functions
+logl []              (3)  - natural logarithmic function
+logname []           (1)  - print user's login name
+logout []            (1)  - bash built-in commands, see bash(1)
+logout []            (3)  - write utmp and wtmp entries
+logoutd []           (8)  - Enforce login time restrictions
+logresolve []        (8)  - Resolve IP-addresses to hostnames in Apache log files
+logrotate []         (8)  - rotates, compresses, and mails system logs
+logsave []           (8)  - save the output of a command in a logfile
+logwtmp []           (3)  - append an entry to the wtmp file
+longjmp []           (3)  - non-local jump to a saved stack context
+longname []          (3)  - curses environment query routines
+look []              (1)  - display lines beginning with a given string
+look []              (3)  - search for key in dictionary file
+lookbib []           (1)  - search bibliographic databases
+lookup_dcookie []    (2)  - return a directory entry's path
+loop []              (6)  - cellular automaton
+losetup []           (8)  - set up and control loop devices
+lower []             (n)  - Change a window's position in the stacking order
+lp []                (1)  - print files
+lp []                (4)  - line printer devices
+lpadmin []           (8)  - configure cups printers and classes
+lpc []               (8)  - line printer control program
+lpinfo []            (8)  - show available devices or drivers
+lpmove []            (8)  - move a job or all jobs to a new destination
+lpoptions []         (1)  - display or set printer options and defaults
+lppasswd []          (1)  - add, change, or delete digest passwords
+lpq []               (1)  - show printer queue status
+lpr []               (1)  - print files
+lprm []              (1)  - cancel print jobs
+lpstat []            (1)  - print cups status information
+lrand48 []           (3)  - generate uniformly distributed pseudo-random numbers
+lrand48_r []         (3)  - generate uniformly distributed pseudo-random numbers reentrantly
+lrange []            (n)  - Return one or more adjacent elements from a list
+lremovexattr []      (2)  - remove an extended attribute
+lrepeat []           (n)  - Build a list by repeating elements
+lreplace []          (n)  - Replace elements in a list with new elements
+lreverse []          (n)  - Reverse the order of a list
+lrint []             (3)  - round to nearest integer
+lrintf []            (3)  - round to nearest integer
+lrintl []            (3)  - round to nearest integer
+lround []            (3)  - round to nearest integer, away from zero
+lroundf []           (3)  - round to nearest integer, away from zero
+lroundl []           (3)  - round to nearest integer, away from zero
+ls []                (1)  - list directory contents
+lsattr []            (1)  - list file attributes on a Linux second extended file system
+lsdev []             (8)  - display information about installed hardware
+lsearch []           (3)  - linear search of an array
+lsearch []           (n)  - See if a list contains a particular element
+lseek []             (2)  - reposition read/write file offset
+lseek64 []           (3)  - reposition 64-bit read/write file offset
+lset []              (n)  - Change an element in a list
+lsetxattr []         (2)  - set an extended attribute value
+lshal []             (1)  - list HAL devices
+lsmod []             (8)  - program to show the status of modules in the Linux Kernel
+lsof []              (8)  - list open files
+lsort []             (n)  - Sort the elements of a list
+lspci []             (8)  - list all PCI devices
+lspcmcia []          (8)  - display extended PCMCIA debugging information
+lsscsi []            (8)  - list SCSI devices (or hosts) and their attributes
+lstat []             (2)  - get file status
+lsusb []             (8)  - list USB devices
+luit []              (1)  - Locale and ISO 2022 support for Unicode terminals
+lutimes []           (3)  - change file timestamps
+lvchange []          (8)  - change attributes of a logical volume
+lvconvert []         (8)  - convert a logical volume from linear to mirror or snapshot
+lvcreate []          (8)  - create a logical volume in an existing volume group
+lvdisplay []         (8)  - display attributes of a logical volume
+lvextend []          (8)  - extend the size of a logical volume
+lvm []               (8)  - LVM2 tools
+lvm.conf []          (5)  - Configuration file for LVM2
+lvmchange []         (8)  - change attributes of the logical volume manager
+lvmdiskscan []       (8)  - scan for all devices visible to LVM2
+lvmdump []           (8)  - create lvm2 information dumps for diagnostic purposes
+lvreduce []          (8)  - reduce the size of a logical volume
+lvremove []          (8)  - remove a logical volume
+lvrename []          (8)  - rename a logical volume
+lvresize []          (8)  - resize a logical volume
+lvs []               (8)  - report information about logical volumes
+lvscan []            (8)  - scan (all disks) for logical volumes
+lwres []             (3)  - introduction to the lightweight resolver library
+lwres_addr_parse []  (3)  - lightweight resolver utility functions
+lwres_buffer_add []  (3)  - lightweight resolver buffer management
+lwres_buffer_back [] (3)  - lightweight resolver buffer management
+lwres_buffer_clear [] (3)  - lightweight resolver buffer management
+lwres_buffer_first [] (3)  - lightweight resolver buffer management
+lwres_buffer_forward [] (3)  - lightweight resolver buffer management
+lwres_buffer_getmem [] (3)  - lightweight resolver buffer management
+lwres_buffer_getuint16 [] (3)  - lightweight resolver buffer management
+lwres_buffer_getuint32 [] (3)  - lightweight resolver buffer management
+lwres_buffer_getuint8 [] (3)  - lightweight resolver buffer management
+lwres_buffer_init [] (3)  - lightweight resolver buffer management
+lwres_buffer_invalidate [] (3)  - lightweight resolver buffer management
+lwres_buffer_putmem [] (3)  - lightweight resolver buffer management
+lwres_buffer_putuint16 [] (3)  - lightweight resolver buffer management
+lwres_buffer_putuint32 [] (3)  - lightweight resolver buffer management
+lwres_buffer_putuint8 [] (3)  - lightweight resolver buffer management
+lwres_buffer_subtract [] (3)  - lightweight resolver buffer management
+lwres_conf_clear []  (3)  - lightweight resolver configuration
+lwres_conf_get []    (3)  - lightweight resolver configuration
+lwres_conf_init []   (3)  - lightweight resolver configuration
+lwres_conf_parse []  (3)  - lightweight resolver configuration
+lwres_conf_print []  (3)  - lightweight resolver configuration
+lwres_context_allocmem [] (3)  - lightweight resolver context management
+lwres_context_create [] (3)  - lightweight resolver context management
+lwres_context_destroy [] (3)  - lightweight resolver context management
+lwres_context_freemem [] (3)  - lightweight resolver context management
+lwres_context_initserial [] (3)  - lightweight resolver context management
+lwres_context_nextserial [] (3)  - lightweight resolver context management
+lwres_context_sendrecv [] (3)  - lightweight resolver context management
+lwres_endhostent []  (3)  - lightweight resolver get network host entry
+lwres_endhostent_r [] (3)  - lightweight resolver get network host entry
+lwres_freeaddrinfo [] (3)  - socket address structure to host and service name
+lwres_freehostent [] (3)  - lightweight resolver nodename / address translation API
+lwres_freerrset []   (3)  - retrieve DNS records
+lwres_gabnrequest_free [] (3)  - lightweight resolver getaddrbyname message handling
+lwres_gabnrequest_parse [] (3)  - lightweight resolver getaddrbyname message handling
+lwres_gabnrequest_render [] (3)  - lightweight resolver getaddrbyname message handling
+lwres_gabnresponse_free [] (3)  - lightweight resolver getaddrbyname message handling
+lwres_gabnresponse_parse [] (3)  - lightweight resolver getaddrbyname message handling
+lwres_gabnresponse_render [] (3)  - lightweight resolver getaddrbyname message handling
+lwres_gai_strerror [] (3)  - print suitable error string
+lwres_getaddrinfo [] (3)  - socket address structure to host and service name
+lwres_getaddrsbyname [] (3)  - lightweight resolver utility functions
+lwres_gethostbyaddr [] (3)  - lightweight resolver get network host entry
+lwres_gethostbyaddr_r [] (3)  - lightweight resolver get network host entry
+lwres_gethostbyname [] (3)  - lightweight resolver get network host entry
+lwres_gethostbyname2 [] (3)  - lightweight resolver get network host entry
+lwres_gethostbyname_r [] (3)  - lightweight resolver get network host entry
+lwres_gethostent []  (3)  - lightweight resolver get network host entry
+lwres_gethostent_r [] (3)  - lightweight resolver get network host entry
+lwres_getipnodebyaddr [] (3)  - lightweight resolver nodename / address translation API
+lwres_getipnodebyname [] (3)  - lightweight resolver nodename / address translation API
+lwres_getnamebyaddr [] (3)  - lightweight resolver utility functions
+lwres_getnameinfo [] (3)  - lightweight resolver socket address structure to hostname and service name
+lwres_getrrsetbyname [] (3)  - retrieve DNS records
+lwres_gnbarequest_free [] (3)  - lightweight resolver getnamebyaddress message handling
+lwres_gnbarequest_parse [] (3)  - lightweight resolver getnamebyaddress message handling
+lwres_gnbarequest_render [] (3)  - lightweight resolver getnamebyaddress message handling
+lwres_gnbaresponse_free [] (3)  - lightweight resolver getnamebyaddress message handling
+lwres_gnbaresponse_parse [] (3)  - lightweight resolver getnamebyaddress message handling
+lwres_gnbaresponse_render [] (3)  - lightweight resolver getnamebyaddress message handling
+lwres_herror []      (3)  - lightweight resolver error message generation
+lwres_hstrerror []   (3)  - lightweight resolver error message generation
+lwres_lwpacket_parseheader [] (3)  - lightweight resolver packet handling functions
+lwres_lwpacket_renderheader [] (3)  - lightweight resolver packet handling functions
+lwres_net_ntop []    (3)  - lightweight resolver IP address presentation
+lwres_nooprequest_free [] (3)  - lightweight resolver no-op message handling
+lwres_nooprequest_parse [] (3)  - lightweight resolver no-op message handling
+lwres_nooprequest_render [] (3)  - lightweight resolver no-op message handling
+lwres_noopresponse_free [] (3)  - lightweight resolver no-op message handling
+lwres_noopresponse_parse [] (3)  - lightweight resolver no-op message handling
+lwres_noopresponse_render [] (3)  - lightweight resolver no-op message handling
+lwres_sethostent []  (3)  - lightweight resolver get network host entry
+lwres_sethostent_r [] (3)  - lightweight resolver get network host entry
+lwres_string_parse [] (3)  - lightweight resolver utility functions
+lwresd []            (8)  - lightweight resolver daemon
+lynx []              (1)  - a general purpose distributed information browser for the World Wide Web
+lzcmp []             (1)  - compare LZMA compressed files
+lzdiff []            (1)  - compare LZMA compressed files
+lzgrep []            (1)  - search LZMA compressed files for a regular expression
+lzless []            (1)  - view LZMA compressed (text) files
+lzmore []            (1)  - view LZMA compressed (text) files
+m17n []              (1)  - config - Print compile/link options of the m17n library
+m17n []              (1)  - db - Print information about the m17n database
+m17nCharacter []     (3)  - Character: Character objects and API for them
+m17nCharset []       (3)  - Charset: Charset objects and API for them
+m17nChartable []     (3)  - Chartable: Chartable objects and API for them
+m17nConv []          (3)  - Code Conversion: Coding system objects and API for them
+m17nCore []          (3)  - CORE API: API provided by libm17n-core.so
+m17nDatabase []      (3)  - Database: The m17n database and API for it
+m17nDebug []         (3)  - Debugging: Support for m17n library users to debug their programs
+m17nDraw []          (3)  - Drawing: Drawing M-texts on a window
+m17nError []         (3)  - Error Handling: Error handling of the m17n library
+m17nFLT []           (3)  - FLT API: API provided by libm17n-flt.so
+m17nFace []          (3)  - Face: A face is an object to control appearance of M-text
+m17nFont []          (3)  - Font: Font object
+m17nFontset []       (3)  - Fontset: A fontset is an object that maps a character to fonts
+m17nFrame []         (3)  - Frame: A frame is an object corresponding to the graphic device
+m17nGUI []           (3)  - GUI API: API provided by libm17n-gui.so
+m17nInputMethod []   (3)  - Input Method (basic): API for Input method
+m17nInputMethodWin [] (3)  - Input Method (GUI): Input method support on window systems
+m17nIntro []         (3)  - Introduction: Introduction to the m17n library
+m17nLocale []        (3)  - Locale: Locale objects and API for them
+m17nMisc []          (3)  - MISC API: Miscellaneous API
+m17nMtext []         (3)  - M-text: M-text objects and API for them
+m17nObject []        (3)  - Managed Object: Objects managed by the reference count
+m17nPlist []         (3)  - Property List: Property List objects and API for them
+m17nShell []         (3)  - SHELL API: API provided by libm17n.so
+m17nSymbol []        (3)  - Symbol: Symbol objects and API for them
+m17nTextProperty []  (3)  - Text Property: Function to handle text properties
+m17n_object []       (3)  - m17n_object: Allocate a managed object
+m17n_object_ref []   (3)  - m17n_object_ref: Increment the reference count of a managed object
+m17n_object_unref [] (3)  - m17n_object_unref: Decrement the reference count of a managed object
+m17n_status []       (3)  - m17n_status: Report which part of the m17n library is initialized
+m4 []                (1)  - macro processor
+macbinary []         (1)  - Macintosh file format transformer
+mach32info []        (6)  - read out configuration information of a Mach32
+macptopbm []         (1)  - convert a MacPaint file into a portable bitmap
+madplay []           (1)  - decode and play MPEG audio stream(s)
+madvise []           (2)  - give advice about use of memory
+madvise1 []          (2)  - unimplemented system calls
+magic []             (5)  - file command's magic pattern file
+magic_buffer []      (3)  - Magic number recognition library
+magic_check []       (3)  - Magic number recognition library
+magic_close []       (3)  - Magic number recognition library
+magic_compile []     (3)  - Magic number recognition library
+magic_error []       (3)  - Magic number recognition library
+magic_file []        (3)  - Magic number recognition library
+magic_load []        (3)  - Magic number recognition library
+magic_open []        (3)  - Magic number recognition library
+magic_setflags []    (3)  - Magic number recognition library
+mail.local []        (8)  - store mail in a mailbox
+mailaddr []          (7)  - mail addressing description
+mailcap []           (5)  - metamail capabilities file
+mailq []             (1)  - print the mail queue
+mailstats []         (8)  - display mail statistics
+mailto []            (1)  - Simple multimedia mail sending program
+mailto []            (1)  - hebrew - Run the mailto program to send Hebrew/English mail
+mailto.conf []       (5)  - configuration file for cups email notifier
+mailx []             (1)  - send and receive Internet mail
+main programmer Jean [] (3)  - Yves Lamoureux <jylam@lnxscene.org>
+major []             (3)  - manage a device number
+make []              (1)  - GNU make utility to maintain groups of programs
+make_win_bin_dist [] (1)  - package MySQL distribution as ZIP archive
+make_win_src_distribution [] (1)  - create source distribution for Windows
+makecontext []       (3)  - manipulate user context
+makedbm []           (8)  - create or dump a ypserv database file
+makedepend []        (1)  - create dependencies in makefiles
+makedev []           (3)  - manage a device number
+makeg []             (1)  - make a debuggable executable
+makeinfo []          (1)  - translate Texinfo documents
+makekdewidgets []    (1)  - Builds Qt widget plugins from an ini style description file
+makemap []           (8)  - create database maps for sendmail
+makepkg []           (8)  - make Slackware packages
+makestrs []          (1)  - makes string table C source and header(s)
+makewhatis []        (8)  - Create the whatis database
+malloc []            (3)  - Allocate and free dynamic memory
+man []               (1)  - format and display the on-line manual pages
+man []               (7)  - macros to format man pages
+man []               (7)  - pages - conventions for writing Linux man pages
+man.conf []          (5)  - configuration data for man
+man2html []          (1)  - format a manual page in html
+manuals with []      (7)  - mdoc
+mapscrn []           (8)  - load screen output mapping table
+math_error []        (7)  - detecting errors from mathematical functions
+matherr []           (3)  - SVID math library exception handling
+mathfunc []          (n)  - Mathematical functions for Tcl expressions
+mathop []            (n)  - Mathematical operators as Tcl commands
+mattrib []           (1)  - change MSDOS file attribute flags
+maze []              (6)  - an automated X11 demo repeatedly creating and solving a random maze
+mbadblocks []        (1)  - tests a floppy disk, and marks the bad blocks in the FAT
+mbind []             (2)  - Set memory policy for a memory range
+mblen []             (3)  - determine number of bytes in next multibyte character
+mbox []              (5)  - Format for mail message storage
+mbrlen []            (3)  - determine number of bytes in next multibyte character
+mbrtowc []           (3)  - convert a multibyte sequence to a wide character
+mbsinit []           (3)  - test for initial shift state
+mbsnrtowcs []        (3)  - convert a multibyte string to a wide-character string
+mbsrtowcs []         (3)  - convert a multibyte string to a wide-character string
+mbstowcs []          (3)  - convert a multibyte string to a wide-character string
+mbtowc []            (3)  - convert a multibyte sequence to a wide character
+mc []                (1)  - Visual shell for Unix-like systems
+mcabber []           (1)  - a simple Jabber console client
+mcat []              (1)  - dump raw disk image
+mcd []               (1)  - change MSDOS directory
+mcedit []            (1)  - Internal file editor of GNU Midnight Commander
+mchar_decode []      (3)  - Decode a code-point
+mchar_define_charset [] (3)  - Define a charset
+mchar_define_property [] (3)  - Define a character property
+mchar_encode []      (3)  - Encode a character code
+mchar_get_prop []    (3)  - Get the value of a character property
+mchar_get_prop_table [] (3)  - Get the char-table for a character property
+mchar_list_charset [] (3)  - List symbols representing charsets
+mchar_map_charset [] (3)  - Call a function for all the characters in a specified charset
+mchar_put_prop []    (3)  - Set the value of a character property
+mchar_resolve_charset [] (3)  - Resolve charset name
+mchartable []        (3)  - Create a new chartable
+mchartable_lookup [] (3)  - Return the assigned value of a character in a chartable
+mchartable_map []    (3)  - Call a function for characters in a chartable
+mchartable_max_char [] (3)  - Return the maximum character whose value is set in a chartabe
+mchartable_min_char [] (3)  - Return the minimum character whose value is set in a chartabe
+mchartable_range []  (3)  - Search for characters that have non-default value
+mchartable_set []    (3)  - Assign a value to a character in a chartable
+mchartable_set_range [] (3)  - Assign a value to the characters in the specified range
+mconv_buffer_converter [] (3)  - Create a code converter bound to a buffer
+mconv_decode []      (3)  - Decode a byte sequence into an M-text
+mconv_decode_buffer [] (3)  - Decode a buffer area based on a coding system
+mconv_decode_stream [] (3)  - Decode a stream input based on a coding system
+mconv_define_coding [] (3)  - Define a coding system
+mconv_encode []      (3)  - Encode an M-text into a byte sequence
+mconv_encode_buffer [] (3)  - Encode an M-text into a buffer area
+mconv_encode_range [] (3)  - Encode a part of an M-text
+mconv_encode_stream [] (3)  - Encode an M-text to write to a stream
+mconv_free_converter [] (3)  - Free a code converter
+mconv_getc []        (3)  - Read a character via a code converter
+mconv_gets []        (3)  - Read a line using a code converter
+mconv_list_codings [] (3)  - List symbols representing coding systems
+mconv_putc []        (3)  - Write a character via a code converter
+mconv_rebind_buffer [] (3)  - Bind a buffer to a code converter
+mconv_rebind_stream [] (3)  - Bind a stream to a code converter
+mconv_reset_converter [] (3)  - Reset a code converter
+mconv_resolve_coding [] (3)  - Resolve coding system name
+mconv_stream_converter [] (3)  - Create a code converter bound to a stream
+mconv_ungetc []      (3)  - Push a character back to a code converter
+mcookie []           (1)  - generate magic cookies for xauth
+mcopy []             (1)  - copy MSDOS files to/from Unix
+mcprint []           (3)  - ship binary data to printer
+mcview []            (1)  - Internal file viewer of GNU Midnight Commander
+md []                (4)  - Multiple Device driver aka Linux Software RAID
+md2 []               (1)  - message digests
+md4 []               (1)  - message digests
+md5 []               (1)  - message digests
+md5sum []            (1)  - compute and check MD5 message digest
+mdadm []             (8)  - manage MD devices aka Linux Software RAID
+mdadm.conf []        (5)  - configuration for management of Software RAID with mdadm
+mdatabase_define []  (3)  - Define a data of the m17n database
+mdatabase_find []    (3)  - Look for a data in the database
+mdatabase_list []    (3)  - Return a data list of the m17n database
+mdatabase_load []    (3)  - Load a data from the database
+mdatabase_tag []     (3)  - Get tags of a data
+mdatopbm []          (1)  - convert a Microdesign .mda or .mdp file into a portable bitmap
+mdbCharsetList []    (5)  - List of character set definitions
+mdbCodingList []     (5)  - List of coding system definitions
+mdbDir []            (5)  - List of data in a database directory
+mdbFLT []            (5)  - Font Layout Table
+mdbFontEncoding []   (5)  - Font Encoding
+mdbFontSize []       (5)  - Font Size
+mdbFontset []        (5)  - Fontset
+mdbGeneral []        (5)  - General Format
+mdbIM []             (5)  - Input Method
+mdbTutorialIM []     (5)  - Tutorial of input method
+mdc2 []              (1)  - message digests
+mdebug_dump_all_symbols [] (3)  - Dump all symbol names
+mdebug_dump_chartab [] (3)  - Dump a chartable
+mdebug_dump_face []  (3)  - Dump a face
+mdebug_dump_flt []   (3)  - Dump a Font Layout Table
+mdebug_dump_font []  (3)  - Dump a font
+mdebug_dump_fontset [] (3)  - Dump a fontset
+mdebug_dump_im []    (3)  - Dump an input method
+mdebug_dump_mtext [] (3)  - Dump an M-text
+mdebug_dump_plist [] (3)  - Dump a property list
+mdebug_dump_symbol [] (3)  - Dump a symbol
+mdebug_hook []       (3)  - Hook function called on an error
+mdel []              (1)  - delete an MSDOS file mdeltree - recursively delete an MSDOS directory and its contents
+mdeltree []          (1)  - recursively delete an MSDOS directory and its contents
+mdir []              (1)  - display an MSDOS directory
+mdoc []              (7)  - quick reference guide for the - mdoc macro package
+mdoc.samples []      (7)  - tutorial sampler for writing
+mdraw_clear_cache [] (3)  - clear cached information
+mdraw_coordinates_position [] (3)  - Return the character position nearest to the coordinates
+mdraw_default_line_break [] (3)  - Calculate a line breaking position
+mdraw_glyph_info []  (3)  - Compute information about a glyph
+mdraw_glyph_list []  (3)  - Compute information about glyph sequence
+mdraw_image_text []  (3)  - Draw an M-text on a window as an image
+mdraw_per_char_extents [] (3)  - Obtain per character dimension information
+mdraw_text []        (3)  - Draw an M-text on a window
+mdraw_text_extents [] (3)  - Compute text pixel width
+mdraw_text_items []  (3)  - Draw one or more textitems
+mdraw_text_per_char_extents [] (3)  - Compute the text dimensions of each character of M-text
+mdraw_text_with_control [] (3)  - Draw an M-text on a window with fine control
+mdu []               (1)  - display the amount of space occupied by an MSDOS directory
+mebi []              (7)  - decimal and binary prefixes
+mega []              (7)  - decimal and binary prefixes
+megatron []          (1)  - Macintosh file format transformer
+meinproc4 []         (8)  - KDE translator for XML
+mem []               (4)  - system memory, kernel memory and system ports
+mem_d []             (3)  - AA-lib memory driver
+memalign []          (3)  - Allocate aligned memory
+memccpy []           (3)  - byte string operations
+memccpy []           (3)  - copy memory area
+memchr []            (3)  - byte string operations
+memchr []            (3)  - scan memory for a character
+memcmp []            (3)  - byte string operations
+memcmp []            (3)  - compare memory areas
+memcpy []            (3)  - byte string operations
+memcpy []            (3)  - copy memory area
+memfrob []           (3)  - byte string operations
+memfrob []           (3)  - frobnicate (encrypt) a memory area
+memmem []            (3)  - byte string operations
+memmem []            (3)  - locate a substring
+memmove []           (3)  - byte string operations
+memmove []           (3)  - copy memory area
+memory []            (n)  - Control Tcl memory debugging capabilities
+mempcpy []           (3)  - copy memory area
+memrchr []           (3)  - scan memory for a character
+memscroller []       (6)  - scrolls a dump of its own RAM across the screen
+memset []            (3)  - byte string operations
+memset []            (3)  - fill memory with a constant byte
+mencoder []          (1)  - movie encoder
+menger []            (6)  - 3D menger gasket fractal
+menu []              (3)  - curses extension for programming menus
+menu []              (n)  - Create and manipulate menu widgets
+menu_attributes []   (3)  - color and attribute control for menus
+menu_cursor []       (3)  - position a menu's cursor
+menu_driver []       (3)  - command-processing loop of the menu system
+menu_format []       (3)  - set and get menu sizes
+menu_hook []         (3)  - set hooks for automatic invocation by applications
+menu_items []        (3)  - make and break connections between items and menus
+menu_mark []         (3)  - get and set the menu mark string
+menu_new []          (3)  - create and destroy menus
+menu_opts []         (3)  - set and get menu options
+menu_pattern []      (3)  - get and set a menu's pattern buffer
+menu_post []         (3)  - write or erase menus from associated subwindows
+menu_requestname []  (3)  - handle printable menu request names
+menu_spacing []      (3)  - Control spacing between menu items
+menu_userptr []      (3)  - associate application data with a menu item
+menu_win []          (3)  - make and break menu window and subwindow associations
+menubutton []        (n)  - Create and manipulate menubutton widgets
+merge []             (1)  - three-way file merge
+mergelib []          (1)  - merge one library into another
+mesg []              (1)  - display (do not display) messages from other users
+message []           (n)  - Create and manipulate message widgets
+messages []          (1)  - quick count of messages in mailbox or folder
+meta []              (3)  - curses input options
+metaflac []          (1)  - program to list, add, remove, or edit metadata in one or more FLAC files
+metamail []          (1)  - infrastructure for mailcap-based multimedia mail handling
+metasend []          (1)  - Crude interface for sending non-text mail
+mev []               (1)  - a program to report mouse events
+mface []             (3)  - Create a new face
+mface_copy []        (3)  - Make a copy of a face
+mface_equal []       (3)  - Compare faces
+mface_from_font []   (3)  - Make a face from a font
+mface_get_hook []    (3)  - Get the hook function of a face
+mface_get_prop []    (3)  - Get the value of a face property
+mface_merge []       (3)  - Merge faces
+mface_put_hook []    (3)  - Set a hook function to a face
+mface_put_prop []    (3)  - Set a value of a face property
+mface_update []      (3)  - Update a face
+mflt_coverage []     (3)  - Return a coverage of a FLT
+mflt_find []         (3)  - Find an FLT suitable for the specified character and font
+mflt_get []          (3)  - Return an FLT object that has a specified name
+mflt_name []         (3)  - Return the name of an FLT
+mflt_run []          (3)  - Layout characters with an FLT
+mfont []             (3)  - Create a new font
+mfont_check []       (3)  - Check the usability of a font
+mfont_close []       (3)  - Close a font
+mfont_copy []        (3)  - Make a copy of a font
+mfont_encapsulate [] (3)  - Encapusulate a font
+mfont_find []        (3)  - Find a font
+mfont_from_name []   (3)  - Create a new font from fontname
+mfont_get_prop []    (3)  - Get a property value of a font
+mfont_list []        (3)  - Get a list of fonts
+mfont_list_family_names [] (3)  - Get a list of font famiy names
+mfont_match_p []     (3)  - Check is a font matches with a font spec
+mfont_name []        (3)  - Create a fontname from a font
+mfont_open []        (3)  - Open a font
+mfont_parse_name []  (3)  - Create a font by parsing a fontname
+mfont_put_prop []    (3)  - Put a property value to a font
+mfont_resize_ratio [] (3)  - Get resize information of a font
+mfont_selection_priority [] (3)  - Return the font selection priority
+mfont_set_encoding [] (3)  - Set encoding of a font
+mfont_set_selection_priority [] (3)  - Set the font selection priority
+mfont_unparse_name [] (3)  - Create a fontname from a font
+mfontset []          (3)  - Return a fontset
+mfontset_copy []     (3)  - Make a copy of a fontset
+mfontset_lookup []   (3)  - Lookup a fontset
+mfontset_modify_entry [] (3)  - Modify the contents of a fontset
+mfontset_name []     (3)  - Return the name of a fontset
+mformat []           (1)  - add an MSDOS filesystem to a low-level formatted floppy disk
+mframe []            (3)  - Create a new frame
+mframe_get_prop []   (3)  - Return property value of frame
+mga []               (4)  - Matrox video driver
+mgrtopbm []          (1)  - convert a MGR bitmap into a portable bitmap
+mhash []             (3)  - Hash Library
+mib2c []             (1)  - - generate template code for extending the agent
+mib2c []             (1)  - update - script to merge custom code into updated mib2c code
+mib2c.conf []        (5)  - - How to write mib2c.conf files to do ANYTHING based on MIB input
+mib_handler_methods [] (3)  - Defines the subhandlers to be called by the multiplexer helper
+mii []               (8)  - tool - view, manipulate media-independent interface status
+mille []             (6)  - play Mille Bornes
+mime.convs []        (5)  - mime type conversion file for cups
+mime.types []        (5)  - mime type description file for cups
+mimencode []         (1)  - Translate to and from mail-oriented encoding formats
+mincore []           (2)  - determine whether pages are resident in memory
+minfo []             (1)  - print the parameters of a MSDOS filesystem
+minicom []           (1)  - friendly serial communication program
+minor []             (3)  - manage a device number
+minput_close_im []   (3)  - Close an input method
+minput_config_command [] (3)  - Configure the key sequence of an input method command
+minput_config_file [] (3)  - Get the name of per-user customization file
+minput_config_variable [] (3)  - Configure the value of an input method variable
+minput_create_ic []  (3)  - Create an input context
+minput_destroy_ic [] (3)  - Destroy an input context
+minput_event_to_key [] (3)  - Convert an event to an input key
+minput_filter []     (3)  - Filter an input key
+minput_get_command [] (3)  - Get information about input method command(s)
+minput_get_description [] (3)  - Get description text of an input method
+minput_get_title_icon [] (3)  - Get title and icon filename of an input method
+minput_get_variable [] (3)  - Get information about input method variable(s)
+minput_lookup []     (3)  - Look up a text produced in the input context
+minput_open_im []    (3)  - Open an input method
+minput_reset_ic []   (3)  - Reset an input context
+minput_save_config [] (3)  - Save configurations in per-user customization file
+minput_set_spot []   (3)  - Set the spot of the input context
+minput_toggle []     (3)  - Toggle input method
+mirrorblob []        (6)  - Draws a wobbly blob that distorts the image behind it
+mitem_current []     (3)  - set and get current_menu_item
+mitem_name []        (3)  - get menu item name and description fields
+mitem_new []         (3)  - create and destroy menu items
+mitem_opts []        (3)  - set and get menu item options
+mitem_userptr []     (3)  - associate application data with a menu item
+mitem_value []       (3)  - set and get menu item values
+mitem_visible []     (3)  - check visibility of a menu item
+mjoytest []          (6)  - test the svgalib joystick package in graphics mode
+mk_cmds []           (1)  - error table compiler
+mkcomposecache []    (8)  - create a cache file for a compose file explicitely
+mkdir []             (1)  - make directories
+mkdir []             (2)  - create a directory
+mkdirat []           (2)  - create a directory relative to a directory file descriptor
+mkdirhier []         (1)  - makes a directory hierarchy
+mkdosfs []           (8)  - create an MS-DOS file system under Linux
+mkdtemp []           (3)  - create a unique temporary directory
+mke2fs []            (8)  - create an ext2/ext3 filesystem
+mke2fs.conf []       (5)  - Configuration file for mke2fs
+mkfifo []            (1)  - make FIFOs (named pipes)
+mkfifo []            (3)  - make a FIFO special file (a named pipe)
+mkfifoat []          (3)  - make a FIFO (named pipe) relative to a directory file descriptor
+mkfontdir []         (1)  - create an index of X font files in a directory
+mkfontscale []       (1)  - create an index of scalable font files for X
+mkfs []              (8)  - build a Linux file system
+mkfs.bfs []          (8)  - make an SCO bfs filesystem
+mkfs.minix []        (8)  - make a Linux MINIX filesystem
+mkfs.xfs []          (8)  - construct an XFS filesystem
+mkhtmlindex []       (1)  - generate index files for HTML man pages
+mkinitrd []          (8)  - create or rebuilt an initrd (initial ramdisk) using initramfs (simple cpio+gzip)
+mkisofs []           (8)  - create an hybrid ISO9660/JOLIET/HFS filesystem with optional Rock Ridge attributes
+mklost+found []      (8)  - create a lost+found directory on a mounted Linux second extended file system
+mkmanifest []        (1)  - makes list of file names and their DOS 8+3 equivalent
+mknetid []           (8)  - generate data for netid map
+mknod []             (1)  - make block or character special files
+mknod []             (2)  - create a special or ordinary file
+mknodat []           (2)  - create a special or ordinary file relative to a directory file descriptor
+mkntfs []            (8)  - create an NTFS file system
+mkostemp []          (3)  - create a unique temporary file
+mkpasswd []          (1)  - generate new password, optionally apply it to a user
+mkpasswd []          (8)  - Update passwd and group database files
+mkreiserfs []        (8)  - The create tool for the Linux ReiserFS filesystem
+mkrescue []          (8)  - make rescue floppy
+mkstemp []           (3)  - create a unique temporary file
+mkswap []            (8)  - set up a Linux swap area
+mktemp []            (1)  - create a temporary file or directory
+mktemp []            (1)  - make temporary filename (unique)
+mktemp []            (3)  - make a unique temporary filename
+mktime []            (3)  - transform date and time to broken-down time or ASCII
+mkzftree []          (1)  - Create a zisofs/RockRidge compressed file tree
+mlabel []            (1)  - make an MSDOS volume label
+mlocale_get_prop []  (3)  - Get the value of a locale property
+mlocale_set []       (3)  - Set the current locale
+mlock []             (2)  - lock and unlock memory
+mlockall []          (2)  - lock and unlock memory
+mm []                (1)  - config - OSSP mm library configuration/build utility
+mmap []              (2)  - map or unmap files or devices into memory
+mmap2 []             (2)  - map files or devices into memory
+mmd []               (1)  - make an MSDOS subdirectory
+mmount []            (1)  - mount an MSDOS disk
+mmove []             (1)  - move or rename an MSDOS file or subdirectory
+mmroff []            (1)  - reference preprocessor
+mng []               (5)  - Multiple-image Network Graphics (MNG) format
+mode3 []             (8)  - set a vesa mode
+mode_end_call []     (3)  - At the end of a series of requests, call another handler hook
+modf []              (3)  - extract signed integral and fractional values from floating - point number
+modff []             (3)  - extract signed integral and fractional values from floating - point number
+modfl []             (3)  - extract signed integral and fractional values from floating - point number
+modify_ldt []        (2)  - get or set ldt
+modinfo []           (8)  - program to show information about a Linux Kernel module
+modprobe []          (8)  - program to add and remove modules from the Linux Kernel
+modprobe.conf []     (5)  - Configuration file/directory for modprobe
+modprobe.d []        (5)  - Configuration file/directory for modprobe
+modules.dep []       (5)  - List of module dependencies
+moduli []            (5)  - Diffie Hellman moduli
+moebius []           (6)  - Escher's Moebuis Strip II, with ants
+moebiusgears []      (6)  - draw a moebius strip of interlocking gears
+mogrify []           (1)  - resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. Mogrify overwrites the original image file, whereas, convert(1) writes to a different image file
+moire []             (6)  - draw circular interference patterns
+moire2 []            (6)  - circular interference patterns
+molecule []          (6)  - draws 3D molecular structures
+monop []             (6)  - Monopoly game
+montage []           (1)  - create a composite image by combining several separate images. The images are tiled on the composite image optionall adorned with a border, frame, image name, and more
+more []              (1)  - file perusal filter for crt viewing
+morph3d []           (6)  - 3d morphing objects
+morse []             (6)  - reformat input as punch cards, paper tape or morse code
+most []              (1)  - browse or page through a text file
+motd []              (5)  - message of the day
+mount []             (2)  - mount file system
+mount []             (8)  - mount a file system
+mount.cifs []        (8)  - mount using the Common Internet File System (CIFS)
+mount.nfs []         (8)  - mount a Network File System
+mount.nfs4 []        (8)  - mount a Network File System
+mountain []          (6)  - random 3D plots that look vaguely mountainous
+mountpoint []        (1)  - see if a directory is a mountpoint
+mouse []             (1)  - test - a tool for determining mouse type and device it's attached to
+mouse []             (4)  - Xorg mouse input driver
+mouse []             (4)  - serial mouse interface
+mouse_close []       (3)  - explicitly close a mouse
+mouse_getbutton []   (3)  - query the mouse state
+mouse_getcaps []     (3)  - returns the capabilities of the mouse
+mouse_getposition_6d [] (3)  - provide an interface to 3d mice
+mouse_getx []        (3)  - query the mouse state
+mouse_gety []        (3)  - query the mouse state
+mouse_init []        (3)  - specifically initialize a mouse
+mouse_init_return_fd [] (3)  - specifically initialize a mouse
+mouse_setdefaulteventhandler [] (3)  - set a mouse event handler
+mouse_seteventhandler [] (3)  - set a mouse event handler
+mouse_setposition [] (3)  - set the current mouse position
+mouse_setposition_6d [] (3)  - provide an interface to 3d mice
+mouse_setrange_6d [] (3)  - provide an interface to 3d mice
+mouse_setscale []    (3)  - sets a mouse scale factor
+mouse_setwrap []     (3)  - set what happens at the mouse boundaries
+mouse_setxrange []   (3)  - define the boundaries for the mouse cursor
+mouse_setyrange []   (3)  - define the boundaries for the mouse cursor
+mouse_trafo []       (3)  - mouse interface through curses
+mouse_update []      (3)  - updates the mouse state
+mouse_waitforupdate [] (3)  - wait for an mouse update
+mouseinterval []     (3)  - mouse interface through curses
+mousemask []         (3)  - mouse interface through curses
+mousetest []         (6)  - tests the svgalib mouse driver
+move []              (3)  - move curses window cursor
+move_pages []        (2)  - move individual pages of a process to another node
+mpartition []        (1)  - partition an MSDOS hard disk
+mpg321 []            (1)  - Free clone of mpg123, a command - line mp3 player
+mplayer []           (1)  - movie player
+mplist []            (3)  - Create a property list object
+mplist_add []        (3)  - Add a property at the end of a property list
+mplist_copy []       (3)  - Copy a property list
+mplist_deserialize [] (3)  - Generate a property list by deserializing an M-text
+mplist_find_by_key [] (3)  - Find a property of a specific key in a property list
+mplist_find_by_value [] (3)  - Find a property of a specific value in a property list
+mplist_get []        (3)  - Get the value of a property in a property list
+mplist_get_func []   (3)  - Get the value (function pointer) of a property in a property list
+mplist_key []        (3)  - Return the key of the first property in a property list
+mplist_length []     (3)  - Return the length of a property list
+mplist_next []       (3)  - Return the next sublist of a property list
+mplist_pop []        (3)  - Remove a property at the beginning of a property list
+mplist_push []       (3)  - Add a property at the beginning of a property list
+mplist_put []        (3)  - Set the value of a property in a property list
+mplist_put_func []   (3)  - Set the value (function pointer) of a property in a property list
+mplist_set []        (3)  - Set the first property in a property list
+mplist_value []      (3)  - Return the value of the first property in a property list
+mpool []             (3)  - shared memory buffer pool
+mprotect []          (2)  - set protection on a region of memory
+mpstat []            (1)  - Report processors related statistics
+mpx []               (2)  - unimplemented system calls
+mq_close []          (3)  - close a message queue descriptor
+mq_getattr []        (3)  - get/set message queue attributes
+mq_getsetattr []     (2)  - get/set message queue attributes
+mq_notify []         (3)  - register for notification when a message is available
+mq_open []           (3)  - open a message queue
+mq_overview []       (7)  - Overview of POSIX message queues
+mq_receive []        (3)  - receive a message from a message queue
+mq_send []           (3)  - send a message to a message queue
+mq_setattr []        (3)  - get/set message queue attributes
+mq_timedreceive []   (3)  - receive a message from a message queue
+mq_timedsend []      (3)  - send a message to a message queue
+mq_unlink []         (3)  - remove a message queue
+mrand48 []           (3)  - generate uniformly distributed pseudo-random numbers
+mrand48_r []         (3)  - generate uniformly distributed pseudo-random numbers reentrantly
+mrd []               (1)  - remove an MSDOS subdirectory
+mremap []            (2)  - re-map a virtual memory address
+mren []              (1)  - rename an existing MSDOS file
+mrftopbm []          (1)  - see http://netpbm.sourceforge.net/doc/mrftopbm.html
+mro []               (3)  - Method Resolution Order
+msgattrib []         (1)  - attribute matching and manipulation on message catalog
+msgcat []            (1)  - combines several message catalogs
+msgcat []            (n)  - Tcl message catalog
+msgcmp []            (1)  - compare message catalog and template
+msgcomm []           (1)  - match two message catalogs
+msgconv []           (1)  - character set conversion for message catalog
+msgctl []            (2)  - message control operations
+msgen []             (1)  - create English message catalog
+msgexec []           (1)  - process translations of message catalog
+msgfilter []         (1)  - edit translations of message catalog
+msgfmt []            (1)  - compile message catalog to binary format
+msgget []            (2)  - get a message queue identifier
+msggrep []           (1)  - pattern matching on message catalog
+msginit []           (1)  - initialize a message catalog
+msgmerge []          (1)  - merge message catalog and template
+msgrcv []            (2)  - message operations
+msgsnd []            (2)  - message operations
+msgunfmt []          (1)  - uncompile message catalog from binary format
+msguniq []           (1)  - unify duplicate translations in message catalog
+mshowfat []          (1)  - shows FAT clusters allocated to file
+msql2mysql []        (1)  - convert mSQL programs for use with MySQL
+msymbol []           (3)  - Get a symbol
+msymbol_as_managing_key [] (3)  - Create a managing key
+msymbol_exist []     (3)  - Search for a symbol that has a specified name
+msymbol_get []       (3)  - Get the value of a symbol property
+msymbol_get_func []  (3)  - Get the value (function pointer) of a symbol property
+msymbol_is_managing_key [] (3)  - Check if a symbol is a managing key
+msymbol_name []      (3)  - Get symbol name
+msymbol_put []       (3)  - Set the value of a symbol property
+msymbol_put_func []  (3)  - Set the value (function pointer) of a symbol property
+msync []             (2)  - synchronize a file with a memory map
+mt []                (1)  - control magnetic tape drive operation
+mtext []             (3)  - Allocate a new M-text
+mtext_attach_property [] (3)  - Attach a text property to an M-text
+mtext_case_compare [] (3)  - Compare specified regions of two M-texts ignoring cases
+mtext_casecmp []     (3)  - Compare two M-texts ignoring cases
+mtext_cat []         (3)  - Append an M-text to another
+mtext_cat_char []    (3)  - Append a character to an M-text
+mtext_character []   (3)  - Search a character in an M-text
+mtext_chr []         (3)  - Return the position of the first occurrence of a character in an M-text
+mtext_cmp []         (3)  - Compare two M-texts character-by-character
+mtext_coll []        (3)  - Compare two M-texts using the current locale
+mtext_compare []     (3)  - Compare specified regions of two M-texts
+mtext_copy []        (3)  - Copy characters in the specified range into an M-text
+mtext_cpy []         (3)  - Copy an M-text to another
+mtext_cspn []        (3)  - Search an M-text for the complement of a set of characters
+mtext_data []        (3)  - Get information about the text data in M-text
+mtext_del []         (3)  - Delete characters in the specified range destructively
+mtext_deserialize [] (3)  - Deserialize text properties in an M-text
+mtext_detach_property [] (3)  - Detach a text property from an M-text
+mtext_dup []         (3)  - Create a copy of an M-text
+mtext_duplicate []   (3)  - Create a new M-text from a part of an existing M-text
+mtext_from_data []   (3)  - Allocate a new M-text with specified data
+mtext_ftime []       (3)  - Format date and time
+mtext_get_prop []    (3)  - Get the value of the topmost text property
+mtext_get_prop_keys [] (3)  - Get a list of text property keys at a position of an M-text
+mtext_get_prop_values [] (3)  - Get multiple values of a text property
+mtext_get_properties [] (3)  - Get multiple text properties
+mtext_get_property [] (3)  - Get the topmost text property
+mtext_getenv []      (3)  - Get an environment variable
+mtext_ins []         (3)  - Insert an M-text into another M-text
+mtext_ins_char []    (3)  - Insert a character into an M-text
+mtext_insert []      (3)  - Insert sub-text of an M-text into another M-text
+mtext_len []         (3)  - Number of characters in M-text
+mtext_line_break []  (3)  - Find a linebreak postion of an M-text
+mtext_lowercase []   (3)  - Lowercase an M-text
+mtext_ncasecmp []    (3)  - Compare initial parts of two M-texts ignoring cases
+mtext_ncat []        (3)  - Append a part of an M-text to another
+mtext_ncmp []        (3)  - Compare initial parts of two M-texts character-by-character
+mtext_ncpy []        (3)  - Copy the first some characters in an M-text to another
+mtext_pbrk []        (3)  - Search an M-text for any of a set of characters
+mtext_pop_prop []    (3)  - Pop a text property
+mtext_prop_range []  (3)  - Find the range where the value of a text property is the same
+mtext_property []    (3)  - Create a text property
+mtext_property_end [] (3)  - Return the end position of a text property
+mtext_property_key [] (3)  - Return the key of a text property
+mtext_property_mtext [] (3)  - Return the M-text of a text property
+mtext_property_start [] (3)  - Return the start position of a text property
+mtext_property_value [] (3)  - Return the value of a text property
+mtext_push_prop []   (3)  - Push a text property
+mtext_push_property [] (3)  - Push a text property onto an M-text
+mtext_put_prop []    (3)  - Set a text property
+mtext_put_prop_values [] (3)  - Set multiple text properties with the same key
+mtext_putenv []      (3)  - Change or add an environment variable
+mtext_rchr []        (3)  - Return the position of the last occurrence of a character in an M-text
+mtext_ref_char []    (3)  - Return the character at the specified position in an M-text
+mtext_replace []     (3)  - Replace sub-text of M-text with another
+mtext_search []      (3)  - Locate an M-text in a specific range of another
+mtext_serialize []   (3)  - Serialize text properties in an M-text
+mtext_set_char []    (3)  - Store a character into an M-text
+mtext_spn []         (3)  - Search an M-text for a set of characters
+mtext_text []        (3)  - Locate an M-text in another
+mtext_titlecase []   (3)  - Titlecase an M-text
+mtext_tok []         (3)  - Look for a token in an M-text
+mtext_uppercase []   (3)  - Uppercase an M-text
+mtools []            (1)  - utilities to access DOS disks in Unix
+mtools.conf []       (5)  - mtools configuration files
+mtoolstest []        (1)  - tests and displays the configuration
+mtr []               (8)  - a network diagnostic tool
+mtrace []            (3)  - malloc debugging
+mtree []             (5)  - format of mtree dir hierarchy files
+mtvtoppm []          (1)  - convert output from the MTV or PRT ray tracers into a portable pixmap
+mtx []               (1)  - control SCSI media changer devices
+mtype []             (1)  - display contents of an MSDOS file
+multiplexer []       (3)  - Splits mode requests into calls to different handlers
+multixterm []        (1)  - drive multiple xterms separately or together
+munch []             (6)  - munching squares
+munchlist []         (1)  - Interactive spelling checking
+munlock []           (2)  - lock and unlock memory
+munlockall []        (2)  - lock and unlock memory
+munmap []            (2)  - map or unmap files or devices into memory
+muntrace []          (3)  - malloc debugging
+mutouch []           (4)  - Microtouch input driver
+mutt []              (1)  - The Mutt Mail User Agent
+mutt_dotlock []      (1)  - Lock mail spool files
+muttrc []            (5)  - Configuration file for the Mutt Mail User Agent
+mv []                (1)  - move (rename) files
+mvadd_wch []         (3)  - add a complex character and rendition to a curses window, then advance the cursor
+mvadd_wchnstr []     (3)  - add an array of complex characters (and attributes) to a curses window
+mvadd_wchstr []      (3)  - add an array of complex characters (and attributes) to a curses window
+mvaddch []           (3)  - add a character (with attributes) to a curses window, then advance the cursor
+mvaddchnstr []       (3)  - add a string of characters (and attributes) to a curses window
+mvaddchstr []        (3)  - add a string of characters (and attributes) to a curses window
+mvaddnstr []         (3)  - add a string of characters to a curses window and advance cursor
+mvaddnwstr []        (3)  - add a string of wide characters to a curses window and advance cursor
+mvaddstr []          (3)  - add a string of characters to a curses window and advance cursor
+mvaddwstr []         (3)  - add a string of wide characters to a curses window and advance cursor
+mvchgat []           (3)  - curses character and window attribute control routines
+mvcur []             (3)  - curses interfaces to terminfo database
+mvdelch []           (3)  - delete character under the cursor in a curses window
+mvderwin []          (3)  - create curses windows
+mvget_wch []         (3)  - get (or push back) a wide character from curses terminal keyboard
+mvget_wstr []        (3)  - get an array of wide characters from a curses terminal keyboard
+mvgetch []           (3)  - get (or push back) characters from curses terminal keyboard
+mvgetn_wstr []       (3)  - get an array of wide characters from a curses terminal keyboard
+mvgetnstr []         (3)  - accept character strings from curses terminal keyboard
+mvgetstr []          (3)  - accept character strings from curses terminal keyboard
+mvhline []           (3)  - create curses borders, horizontal and vertical lines
+mvhline_set []       (3)  - create curses borders or lines using complex characters and renditions
+mvin_wch []          (3)  - extract a complex character and rendition from a window
+mvin_wchnstr []      (3)  - get an array of complex characters and renditions from a curses window
+mvin_wchstr []       (3)  - get an array of complex characters and renditions from a curses window
+mvinch []            (3)  - get a character and attributes from a curses window
+mvinchnstr []        (3)  - get a string of characters (and attributes) from a curses window
+mvinchstr []         (3)  - get a string of characters (and attributes) from a curses window
+mvinnstr []          (3)  - get a string of characters from a curses window
+mvinnwstr []         (3)  - get a string of wchar_t characters from a curses window
+mvins_nwstr []       (3)  - insert a wide-character string into a curses window
+mvins_wch []         (3)  - insert a complex character and rendition into a window
+mvins_wstr []        (3)  - insert a wide-character string into a curses window
+mvinsch []           (3)  - insert a character before cursor in a curses window
+mvinsnstr []         (3)  - insert string before cursor in a curses window
+mvinsstr []          (3)  - insert string before cursor in a curses window
+mvinstr []           (3)  - get a string of characters from a curses window
+mvinwstr []          (3)  - get a string of wchar_t characters from a curses window
+mvprintw []          (3)  - print formatted output in curses windows
+mvscanw []           (3)  - convert formatted input from a curses window
+mvvline []           (3)  - create curses borders, horizontal and vertical lines
+mvvline_set []       (3)  - create curses borders or lines using complex characters and renditions
+mvwadd_wch []        (3)  - add a complex character and rendition to a curses window, then advance the cursor
+mvwadd_wchnstr []    (3)  - add an array of complex characters (and attributes) to a curses window
+mvwadd_wchstr []     (3)  - add an array of complex characters (and attributes) to a curses window
+mvwaddch []          (3)  - add a character (with attributes) to a curses window, then advance the cursor
+mvwaddchnstr []      (3)  - add a string of characters (and attributes) to a curses window
+mvwaddchstr []       (3)  - add a string of characters (and attributes) to a curses window
+mvwaddnstr []        (3)  - add a string of characters to a curses window and advance cursor
+mvwaddnwstr []       (3)  - add a string of wide characters to a curses window and advance cursor
+mvwaddstr []         (3)  - add a string of characters to a curses window and advance cursor
+mvwaddwstr []        (3)  - add a string of wide characters to a curses window and advance cursor
+mvwchgat []          (3)  - curses character and window attribute control routines
+mvwdelch []          (3)  - delete character under the cursor in a curses window
+mvwget_wch []        (3)  - get (or push back) a wide character from curses terminal keyboard
+mvwget_wstr []       (3)  - get an array of wide characters from a curses terminal keyboard
+mvwgetch []          (3)  - get (or push back) characters from curses terminal keyboard
+mvwgetn_wstr []      (3)  - get an array of wide characters from a curses terminal keyboard
+mvwgetnstr []        (3)  - accept character strings from curses terminal keyboard
+mvwgetstr []         (3)  - accept character strings from curses terminal keyboard
+mvwhline []          (3)  - create curses borders, horizontal and vertical lines
+mvwhline_set []      (3)  - create curses borders or lines using complex characters and renditions
+mvwin []             (3)  - create curses windows
+mvwin_wch []         (3)  - extract a complex character and rendition from a window
+mvwin_wchnstr []     (3)  - get an array of complex characters and renditions from a curses window
+mvwin_wchstr []      (3)  - get an array of complex characters and renditions from a curses window
+mvwinch []           (3)  - get a character and attributes from a curses window
+mvwinchnstr []       (3)  - get a string of characters (and attributes) from a curses window
+mvwinchstr []        (3)  - get a string of characters (and attributes) from a curses window
+mvwinnstr []         (3)  - get a string of characters from a curses window
+mvwinnwstr []        (3)  - get a string of wchar_t characters from a curses window
+mvwins_nwstr []      (3)  - insert a wide-character string into a curses window
+mvwins_wch []        (3)  - insert a complex character and rendition into a window
+mvwins_wstr []       (3)  - insert a wide-character string into a curses window
+mvwinsch []          (3)  - insert a character before cursor in a curses window
+mvwinsnstr []        (3)  - insert string before cursor in a curses window
+mvwinsstr []         (3)  - insert string before cursor in a curses window
+mvwinstr []          (3)  - get a string of characters from a curses window
+mvwinwstr []         (3)  - get a string of wchar_t characters from a curses window
+mvwprintw []         (3)  - print formatted output in curses windows
+mvwscanw []          (3)  - convert formatted input from a curses window
+mvwvline []          (3)  - create curses borders, horizontal and vertical lines
+mvwvline_set []      (3)  - create curses borders or lines using complex characters and renditions
+mwm []               (1)  - The M*tif Window Manager
+mwmrc []             (5)  - The M*tif Window Manager configuration file
+my_print_defaults [] (1)  - display options from option files
+myisam_ftdump []     (1)  - display full-text index information
+myisamchk []         (1)  - MyISAM table-maintenance utility
+myisamlog []         (1)  - display MyISAM log file contents
+myisampack []        (1)  - generate compressed, read-only MyISAM tables
+mysql []             (1)  - stress-test.pl - server stress test program
+mysql []             (1)  - test-run.pl - run MySQL test suite
+mysql []             (1)  - the MySQL command-line tool
+mysql.server []      (1)  - MySQL server startup script
+mysql_client_test [] (1)  - test client API
+mysql_client_test_embedded [] (1)  - test client API for embedded server
+mysql_config []      (1)  - get compile options for compiling clients
+mysql_convert_table_format [] (1)  - convert tables to use a given storage engine
+mysql_explain_log [] (1)  - use EXPLAIN on statements in query log
+mysql_find_rows []   (1)  - extract SQL statements from files
+mysql_fix_extensions [] (1)  - normalize table file name extensions
+mysql_fix_privilege_tables [] (1)  - upgrade MySQL system tables
+mysql_install_db []  (1)  - initialize MySQL data directory
+mysql_secure_installation [] (1)  - improve MySQL installation security
+mysql_setpermission [] (1)  - interactively set permissions in grant tables
+mysql_tableinfo []   (1)  - generate database metadata
+mysql_tzinfo_to_sql [] (1)  - load the time zone tables
+mysql_upgrade []     (1)  - check tables for MySQL upgrade
+mysql_waitpid []     (1)  - kill process and wait for its termination
+mysql_zap []         (1)  - kill processes that match a pattern
+mysqlaccess []       (1)  - client for checking access privileges
+mysqladmin []        (1)  - client for administering a MySQL server
+mysqlbinlog []       (1)  - utility for processing binary log files
+mysqlbug []          (1)  - generate bug report
+mysqlcheck []        (1)  - a table maintenance and repair program
+mysqld []            (8)  - the MySQL server
+mysqld_multi []      (1)  - manage multiple MySQL servers
+mysqld_safe []       (1)  - MySQL server startup script
+mysqldump []         (1)  - a database backup program
+mysqldumpslow []     (1)  - Summarize slow query log files
+mysqlhotcopy []      (1)  - a database backup program
+mysqlimport []       (1)  - a data import program
+mysqlman []          (1)  - default man page for mysql
+mysqlmanager []      (8)  - the MySQL Instance Manager
+mysqlshow []         (1)  - display database, table, and column information
+mysqltest []         (1)  - program to run test cases
+mysqltest_embedded [] (1)  - program to run embedded test cases
+mzip []              (1)  - change protection mode and eject disk on Zip/Jaz drive
+named []             (8)  - Internet domain name server
+named []             (8)  - checkconf - named configuration file syntax checking tool
+named []             (8)  - checkzone, named-compilezone - zone file validity checking or converting tool
+named.conf []        (5)  - configuration file for named
+namei []             (1)  - follow a pathname until a terminal point is found
+nameif []            (8)  - name network interfaces based on MAC addresses
+namespace []         (n)  - create and manipulate contexts for commands and variables
+nan []               (3)  - return 'Not a Number'
+nanf []              (3)  - return 'Not a Number'
+nanl []              (3)  - return 'Not a Number'
+nano []              (1)  - Nano's ANOther editor, an enhanced free Pico clone
+nanorc []            (5)  - GNU nano's rcfile
+nanosleep []         (2)  - high-resolution sleep
+napms []             (3)  - low-level curses routines
+nasm []              (1)  - the Netwide Assembler, a portable 80x86 assembler
+nbp []               (1)  - access NBP database
+nbp_name []          (3)  - NBP name parsing
+nbplkup []           (1)  - access NBP database
+nbprgstr []          (1)  - access NBP database
+nbpunrgstr []        (1)  - access NBP database
+nc []                (1)  - TCP/IP swiss army knife
+ncat []              (1)  - Concatenate and redirect sockets
+ncftp []             (1)  - Browser program for the File Transfer Protocol
+ncftpbatch []        (1)  - Individual batch FTP job processor
+ncftpget []          (1)  - Internet file transfer program for scripts
+ncftpls []           (1)  - Internet file transfer program for scripts
+ncftpput []          (1)  - Internet file transfer program for scripts
+ncftpspooler []      (1)  - Global batch FTP job processor daemon
+ncurses []           (3)  - CRT screen handling and optimization package
+ndiff []             (1)  - Utility to compare the results of Nmap scans
+ndisasm []           (1)  - the Netwide Disassembler, an 80x86 binary file disassembler
+ne_add_request_header [] (3)  - add headers to a request
+ne_addr_destroy []   (3)  - functions to resolve hostnames to addresses
+ne_addr_error []     (3)  - functions to resolve hostnames to addresses
+ne_addr_first []     (3)  - functions to resolve hostnames to addresses
+ne_addr_next []      (3)  - functions to resolve hostnames to addresses
+ne_addr_resolve []   (3)  - functions to resolve hostnames to addresses
+ne_addr_result []    (3)  - functions to resolve hostnames to addresses
+ne_buffer []         (3)  - string buffer handling
+ne_buffer_altered [] (3)  - general purpose of group of functions
+ne_buffer_append []  (3)  - append data to a string buffer
+ne_buffer_clear []   (3)  - general purpose of group of functions
+ne_buffer_concat []  (3)  - append data to a string buffer
+ne_buffer_create []  (3)  - general purpose of group of functions
+ne_buffer_destroy [] (3)  - destroy a buffer object
+ne_buffer_finish []  (3)  - destroy a buffer object
+ne_buffer_grow []    (3)  - general purpose of group of functions
+ne_buffer_ncreate [] (3)  - general purpose of group of functions
+ne_buffer_zappend [] (3)  - append data to a string buffer
+ne_calloc []         (3)  - memory allocation wrappers
+ne_close_connection [] (3)  - set up HTTP sessions
+ne_forget_auth []    (3)  - register authentication callbacks
+ne_get_error []      (3)  - error handling for HTTP sessions
+ne_get_request_flag [] (3)  - set and retrieve per-request flags
+ne_get_response_header [] (3)  - functions to access response headers
+ne_get_scheme []     (3)  - common properties for HTTP sessions
+ne_get_server_hostport [] (3)  - common properties for HTTP sessions
+ne_get_session_flag [] (3)  - set and retrieve session flags
+ne_get_status []     (3)  - retrieve HTTP response status for request
+ne_has_support []    (3)  - determine feature support status
+ne_i18n_init []      (3)  - functions to initialize internationalization support
+ne_iaddr_cmp []      (3)  - functions to manipulate and compare network addresses
+ne_iaddr_free []     (3)  - functions to manipulate and compare network addresses
+ne_iaddr_make []     (3)  - functions to manipulate and compare network addresses
+ne_iaddr_print []    (3)  - functions to manipulate and compare network addresses
+ne_iaddr_typeof []   (3)  - functions to manipulate and compare network addresses
+ne_malloc []         (3)  - memory allocation wrappers
+ne_oom_callback []   (3)  - memory allocation wrappers
+ne_print_request_header [] (3)  - add headers to a request
+ne_qtoken []         (3)  - string tokenizers
+ne_realloc []        (3)  - memory allocation wrappers
+ne_request_create [] (3)  - low-level HTTP request handling
+ne_request_destroy [] (3)  - low-level HTTP request handling
+ne_request_dispatch [] (3)  - low-level HTTP request handling
+ne_response_header_iterate [] (3)  - functions to access response headers
+ne_session_create [] (3)  - set up HTTP sessions
+ne_session_destroy [] (3)  - set up HTTP sessions
+ne_session_proxy []  (3)  - set up HTTP sessions
+ne_set_connect_timeout [] (3)  - common properties for HTTP sessions
+ne_set_error []      (3)  - error handling for HTTP sessions
+ne_set_proxy_auth [] (3)  - register authentication callbacks
+ne_set_read_timeout [] (3)  - common properties for HTTP sessions
+ne_set_request_body_buffer [] (3)  - include a message body with a request
+ne_set_request_body_fd [] (3)  - include a message body with a request
+ne_set_request_body_fd64 [] (3)  - include a message body with a request
+ne_set_request_flag [] (3)  - set and retrieve per-request flags
+ne_set_server_auth [] (3)  - register authentication callbacks
+ne_set_session_flag [] (3)  - set and retrieve session flags
+ne_set_useragent []  (3)  - common properties for HTTP sessions
+ne_shave []          (3)  - trim whitespace from a string
+ne_sock_exit []      (3)  - perform library initialization
+ne_sock_init []      (3)  - perform library initialization
+ne_ssl_cert_cmp []   (3)  - functions to operate on certificate objects
+ne_ssl_cert_export [] (3)  - functions to read or write certificates to and from files or strings
+ne_ssl_cert_free []  (3)  - functions to operate on certificate objects
+ne_ssl_cert_identity [] (3)  - functions to access certificate properties
+ne_ssl_cert_import [] (3)  - functions to read or write certificates to and from files or strings
+ne_ssl_cert_issuer [] (3)  - functions to access certificate properties
+ne_ssl_cert_read []  (3)  - functions to read or write certificates to and from files or strings
+ne_ssl_cert_signedby [] (3)  - functions to access certificate properties
+ne_ssl_cert_subject [] (3)  - functions to access certificate properties
+ne_ssl_cert_write [] (3)  - functions to read or write certificates to and from files or strings
+ne_ssl_clicert_decrypt [] (3)  - SSL client certificate handling
+ne_ssl_clicert_encrypted [] (3)  - SSL client certificate handling
+ne_ssl_clicert_free [] (3)  - SSL client certificate handling
+ne_ssl_clicert_name [] (3)  - SSL client certificate handling
+ne_ssl_clicert_owner [] (3)  - SSL client certificate handling
+ne_ssl_clicert_read [] (3)  - SSL client certificate handling
+ne_ssl_dname_cmp []  (3)  - SSL distinguished name handling
+ne_ssl_readable_dname [] (3)  - SSL distinguished name handling
+ne_ssl_set_verify [] (3)  - register an SSL certificate verification callback
+ne_ssl_trust_cert [] (3)  - functions to indicate that certificates are trusted
+ne_ssl_trust_default_ca [] (3)  - functions to indicate that certificates are trusted
+ne_status []         (3)  - HTTP status structure
+ne_strdup []         (3)  - memory allocation wrappers
+ne_strndup []        (3)  - memory allocation wrappers
+ne_token []          (3)  - string tokenizers
+ne_version_match []  (3)  - library versioning
+ne_version_string [] (3)  - library versioning
+ne_xml_create []     (3)  - create and destroy an XML parser
+ne_xml_destroy []    (3)  - create and destroy an XML parser
+nearbyint []         (3)  - round to nearest integer
+nearbyintf []        (3)  - round to nearest integer
+nearbyintl []        (3)  - round to nearest integer
+neomagic []          (4)  - Neomagic video driver
+neon []              (1)  - config - script providing information about installed copy of neon library
+neon []              (3)  - HTTP and WebDAV client library
+neotoppm []          (1)  - convert an Atari Neochrome .neo into a PPM image
+neqn []              (1)  - format equations for ascii output
+nerverot []          (6)  - induces edginess in the viewer
+net []               (1)  - snmp-config - returns information about installed net-snmp libraries and binaries
+net []               (8)  - Tool for administration of Samba and remote CIFS servers
+netatalk []          (1)  - config - script to get information about the installed version of netatalk
+netatalk.conf []     (5)  - Configuration file used by netatalk(8) to determine its general configuration
+netdate []           (8)  - set date and time by ARPA Internet RFC 868
+netdevice []         (7)  - Low level access to Linux network devices
+netgroup []          (5)  - specify network groups
+netlink []           (3)  - Netlink macros
+netlink []           (7)  - Communication between kernel and userspace (AF_NETLINK)
+netpbm []            (1)  - package of graphics manipulation programs and libraries
+netrc []             (5)  - user configuration for ftp
+netstat []           (8)  - Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
+networks []          (5)  - network name information
+newalias []          (1)  - install new elm aliases for user and/or system
+newaliases []        (1)  - rebuild the data base for the mail aliases file
+newgrp []            (1)  - log in to a new group
+newmail []           (1)  - programs to asynchronously notify of new mail
+newpad []            (3)  - create and display curses pads
+newport []           (4)  - Newport video driver
+newsetup []          (1)  - a program to set up a .newsrc file
+newsgroups []        (1)  - a program to list unsubscribed newsgroups
+newspost []          (1)  - a usenet binary autoposter
+newterm []           (3)  - curses screen initialization and manipulation routines
+newusers []          (8)  - update and create new users in batch
+newwin []            (3)  - create curses windows
+nextafter []         (3)  - floating - point number manipulation
+nextafterf []        (3)  - floating - point number manipulation
+nextafterl []        (3)  - floating - point number manipulation
+nexttoward []        (3)  - floating - point number manipulation
+nexttowardf []       (3)  - floating - point number manipulation
+nexttowardl []       (3)  - floating - point number manipulation
+nfrm []              (1)  - list from and subject of selected messages in mailbox or folder
+nfs []               (5)  - fstab format and options for the nfs and nfs4 file systems
+nfsd []              (7)  - special filesystem for controlling Linux NFS server
+nfsservctl []        (2)  - syscall interface to kernel nfs daemon
+nfsstat []           (8)  - list NFS statistics
+nftw []              (3)  - file tree walk
+ngettext []          (1)  - translate message and choose plural form
+ngettext []          (3)  - translate message and choose plural form
+nice []              (1)  - run a program with modified scheduling priority
+nice []              (2)  - change process priority
+nisdomainname []     (1)  - show or set system's NIS/YP domain name
+nisdomainname []     (8)  - set or display name of current NIS(YP) domain
+nl []                (1)  - number lines of files
+nl []                (3)  - curses output options
+nl_langinfo []       (3)  - query language and locale information
+nlmconv []           (1)  - converts object code into an NLM
+nm []                (1)  - list symbols from object files
+nmap []              (1)  - Network exploration tool and security / port scanner
+nmbd []              (8)  - NetBIOS name server to provide NetBIOS over IP naming services to clients
+nmblookup []         (1)  - NetBIOS over TCP/IP client used to lookup NetBIOS names
+nn []                (1)  - efficient net news interface (No News is good news)
+nnacct []            (1)  - news accounting and access authorization (nn)
+nnadmin []           (1)  - nn database administration
+nncheck []           (1)  - check for unread articles
+nngoback []          (1)  - make news articles unread on a day-by-day basis (nn)
+nngrab []            (1)  - news retrieval by keyword (nn)
+nngrep []            (1)  - grep for news group names (nn)
+nnmaster []          (8)  - nn database manager
+nnpost []            (1)  - post news articles (nn)
+nnspew []            (8)  - subject database manager (nn)
+nnstats []           (1)  - display nnmaster collection and expire statistics
+nntidy []            (1)  - tidy your personal .newsrc file
+nnusage []           (1)  - display nn usage statistics
+nnview []            (1)  - invokes nn on a folder
+nocbreak []          (3)  - curses input options
+nodelay []           (3)  - curses input options
+nodename []          (1)  - show or set the system's DECnet node name
+noecho []            (3)  - curses input options
+nofilter []          (3)  - miscellaneous curses utility routines
+nohup []             (1)  - run a command immune to hangups, with output to a non-tty
+nologin []           (5)  - prevent non-root users from logging into the system
+none []              (3)  - undocumented library functions
+nonl []              (3)  - curses output options
+noof []              (6)  - draw rotatey patterns
+noqiflush []         (3)  - curses input options
+noraw []             (3)  - curses input options
+normalize []         (1)  - adjusts volume levels of audio files
+normalize []         (1)  - mp3 - adjust levels of mp3 or ogg files by running normalize(1), then re - encoding
+noseguy []           (6)  - a little guy with a big nose wanders around being witty
+notimeout []         (3)  - curses input options
+nrand48 []           (3)  - generate uniformly distributed pseudo-random numbers
+nrand48_r []         (3)  - generate uniformly distributed pseudo-random numbers reentrantly
+nroff []             (1)  - emulate nroff command with groff
+nseq []              (1)  - create or examine a netscape certificate sequence
+nslookup []          (1)  - query Internet name servers interactively
+nsswitch.conf []     (5)  - System Databases and Name Service Switch configuration file
+nstat []             (8)  - network statistics tools
+nsupdate []          (1)  - Dynamic DNS update utility
+ntfs []              (8)  - 3g - Third Generation Read/Write NTFS Driver
+ntfs []              (8)  - 3g.probe - Probe an NTFS volume mountability
+ntfscat []           (8)  - print NTFS files and streams on the standard output
+ntfsclone []         (8)  - Efficiently clone, image, restore or rescue an NTFS
+ntfscluster []       (8)  - identify files in a specified region of an NTFS volume
+ntfscmp []           (8)  - compare two NTFS filesystems and tell the differences
+ntfscp []            (8)  - copy file to an NTFS volume
+ntfsfix []           (8)  - fix common errors and force Windows to check NTFS
+ntfsinfo []          (8)  - dump a file's attributes
+ntfslabel []         (8)  - display/change the label on an ntfs file system
+ntfsls []            (8)  - list directory contents on an NTFS filesystem
+ntfsmount []         (8)  - Read/Write userspace NTFS driver
+ntfsprogs []         (8)  - tools for doing neat things with NTFS
+ntfsresize []        (8)  - resize an NTFS filesystem without data loss
+ntfsundelete []      (8)  - recover a deleted file from an NTFS volume
+ntlm_auth []         (1)  - tool to allow external access to Winbind's NTLM authentication function
+ntohl []             (3)  - convert values between host and network byte order
+ntohs []             (3)  - convert values between host and network byte order
+ntp []               (1)  - keygen - Create a NTP host key
+ntpd []              (1)  - NTP daemon program
+ntpdc []             (1)  - vendor-specific NTP query program
+ntpdsim []           (1)  - NTP daemon simulation program
+ntpq []              (1)  - standard NTP query program
+null []              (4)  - data sink
+numa []              (7)  - overview of Non-Uniform Memory Architecture
+number []            (6)  - convert Arabic numerals to English
+nv []                (4)  - NVIDIA video driver
+obexftp []           (1)  - Mobile Equipment file transfer tool
+obexftpd []          (1)  - Mobile Equipment file transfer server
+objcopy []           (1)  - copy and translate object files
+objdump []           (1)  - display information from object files
+oclock []            (1)  - round X clock
+ocsp []              (1)  - Online Certificate Status Protocol utility
+od []                (1)  - dump files in octal and other formats
+offsetof []          (3)  - offset of a structure member
+ogg123 []            (1)  - plays Ogg Vorbis files
+oggdec []            (1)  - simple decoder, Ogg Vorbis file to PCM audio file (WAV or RAW)
+oggenc []            (1)  - encode audio into the Ogg Vorbis format
+ogginfo []           (1)  - gives information about Ogg files, and does extensive validity checking
+ogonkify []          (1)  - international support for PostScript
+old_api []           (3)  - Calls mib module code written in the old style of code
+omshell []           (1)  - OMAPI Command Shell
+omshell []           (3)  - OMAPI Command Shell
+on_ac_power []       (1)  - test whether the computer is running on line power
+on_exit []           (3)  - register a function to be called at normal process termination
+onsgmls []           (1)  - An SGML/XML parser and validator
+opannotate []        (1)  - produce source or assembly annotated with profile data
+oparchive []         (1)  - produce archive of oprofile data for offline analysis
+opcontrol []         (1)  - control OProfile profiling
+open []              (2)  - open and possibly create a file or device
+open []              (3)  - perl pragma to set default PerlIO layers for input and output
+open []              (n)  - Open a file-based or command pipeline channel
+open2 []             (3)  - open a process for both reading and writing
+open3 []             (3)  - open a process for reading, writing, and error handling
+open_by_handle []    (3)  - file handle operations
+open_memstream []    (3)  - open memory as stream
+open_wmemstream []   (3)  - open memory as stream
+openat []            (2)  - open a file relative to a directory file descriptor
+openchrome []        (4)  - video driver for VIA Unichromes
+opendir []           (3)  - open a directory
+openjade []          (1)  - apply a DSSSL stylesheet to an SGML or XML document
+openlog []           (3)  - send messages to the system logger
+openpty []           (3)  - tty utility functions
+openssl []           (1)  - OpenSSL command line tool
+openvpn []           (8)  - secure IP tunnel daemon
+openvt []            (1)  - start a program on a new virtual terminal (VT)
+opgprof []           (1)  - produce gprof-format profile data
+ophelp []            (1)  - list OProfile events
+opimport []          (1)  - converts sample database files
+opml2snow []         (1)  - snownews OPML subsription file import/export utility
+opreport []          (1)  - produce symbol or binary image summaries
+oprofile []          (1)  - a system-wide profiler
+ops []               (3)  - Perl pragma to restrict unsafe operations when compiling
+optarg []            (3)  - Parse command-line options
+opterr []            (3)  - Parse command-line options
+optind []            (3)  - Parse command-line options
+option []            (n)  - Add/retrieve window options to/from the option database
+options []           (n)  - Standard options supported by widgets
+optopt []            (3)  - Parse command-line options
+orage                (1)  - Calendar for the Xfce Desktop Environment
+orage []             (1)  - Calendar for the Xfce Desktop Environment
+osgmlnorm []         (1)  - An SGML/XML document normalizer
+ospam []             (1)  - An SGML/XML markup stream editor
+ospcat []            (1)  - SGML print catalog
+ospent []            (1)  - Concatenates entities in an SGML/XML document
+osx []               (1)  - An SGML to XML converter
+outb []              (2)  - port I/O
+outb_p []            (2)  - port I/O
+outl []              (2)  - port I/O
+outl_p []            (2)  - port I/O
+outsb []             (2)  - port I/O
+outsl []             (2)  - port I/O
+outsw []             (2)  - port I/O
+outw []              (2)  - port I/O
+outw_p []            (2)  - port I/O
+overlay []           (3)  - overlay and manipulate overlapped curses windows
+overload []          (3)  - Package for overloading Perl operations
+overwrite []         (3)  - overlay and manipulate overlapped curses windows
+ownership []         (8)  - Compaq ownership tag retriever
+p2c []               (1)  - Pascal to C translator, version 1.21alpha-07.Dec.93
+p2cc []              (1)  - Pascal compiler using p2c
+pack []              (n)  - Geometry manager that packs around edges of cavity
+pack []              (n)  - old - Obsolete syntax for packer geometry manager
+package []           (n)  - Facilities for package loading and version control
+packet []            (7)  - packet interface on device level
+pacman []            (6)  - simulates a game of Pac-Man on a randomly-created level
+pair_content []      (3)  - curses color manipulation routines
+pal2rgb []           (1)  - convert a palette color TIFF image to a full color image
+palmtopnm []         (1)  - convert a Palm pixmap into a portable anymap
+pam []               (5)  - portable arbitrary map file format
+pam_winbind []       (7)  - PAM module for Winbind
+pamaddnoise []       (1)  - see http://netpbm.sourceforge.net/doc/pamaddnoise.html
+pamarith []          (1)  - see http://netpbm.sourceforge.net/doc/pamarith.html
+pambayer []          (1)  - see http://netpbm.sourceforge.net/doc/pambayer.html
+pamchannel []        (1)  - extract channels from a PAM image
+pamcomp []           (1)  - see http://netpbm.sourceforge.net/doc/pamcomp.html
+pamcut []            (1)  - cut a rectangle out of a PAM, PBM, PGM, or PPM image
+pamdeinterlace []    (1)  - remove ever other row from a PAM/PNM image
+pamdepth []          (1)  - see http://netpbm.sourceforge.net/doc/pamdepth.html
+pamdice []           (1)  - slice a Netpbm image into many horizontally and/or vertically
+pamditherbw []       (1)  - see http://netpbm.sourceforge.net/doc/pamditherbw.html
+pamedge []           (1)  - see http://netpbm.sourceforge.net/doc/pamedge.html
+pamendian []         (1)  - see http://netpbm.sourceforge.net/doc/pamendian.html
+pamenlarge []        (1)  - see http://netpbm.sourceforge.net/doc/pamenlarge.html
+pamfile []           (1)  - describe a Netpbm (PAM or PNM) file
+pamflip []           (1)  - see http://netpbm.sourceforge.net/doc/pamflip.html
+pamfunc []           (1)  - see http://netpbm.sourceforge.net/doc/pamfunc.html
+pamgauss []          (1)  - see http://netpbm.sourceforge.net/doc/pamgauss.html
+pamgradient []       (1)  - see http://netpbm.sourceforge.net/doc/pamgradient.html
+pamlookup []         (1)  - see http://netpbm.sourceforge.net/doc/pamlookup.html
+pammasksharpen []    (1)  - see http://netpbm.sourceforge.net/doc/pammasksharpen.html
+pammixinterlace []   (1)  - see http://netpbm.sourceforge.net/doc/pammixinterlace.html
+pamoil []            (1)  - turn a PAM image into an oil painting
+pamperspective []    (1)  - see http://netpbm.sourceforge.net/doc/pamperspective.html
+pampick []           (1)  - see http://netpbm.sourceforge.net/doc/pampick.html
+pampop9 []           (1)  - see http://netpbm.sourceforge.net/doc/pampop9.html
+pamrgbatopng []      (1)  - see http://netpbm.sourceforge.net/doc/pamrgbatopng.html
+pamscale []          (1)  - see http://netpbm.sourceforge.net/doc/pamscale.html
+pamseq []            (1)  - see http://netpbm.sourceforge.net/doc/pamseq.html
+pamsharpmap []       (1)  - see http://netpbm.sourceforge.net/doc/pamsharpmap.html
+pamsharpness []      (1)  - see http://netpbm.sourceforge.net/doc/pamsharpness.html
+pamslice []          (1)  - see http://netpbm.sourceforge.net/doc/pamslice.html
+pamsplit []          (1)  - see http://netpbm.sourceforge.net/doc/pamsplit.html
+pamstack []          (1)  - see http://netpbm.sourceforge.net/doc/pamstack.html
+pamstereogram []     (1)  - see http://netpbm.sourceforge.net/doc/pamstereogram.html
+pamstretch []        (1)  - gen - use pamstretch and pnmscale to scale by non-integer values
+pamstretch []        (1)  - scale up a PNM or PAM image by interpolating between pixels
+pamsumm []           (1)  - see http://netpbm.sourceforge.net/doc/pamsumm.html
+pamsummcol []        (1)  - see http://netpbm.sourceforge.net/doc/pamsummcol.html
+pamthreshold []      (1)  - see http://netpbm.sourceforge.net/doc/pamthreshold.html
+pamtilt []           (1)  - see http://netpbm.sourceforge.net/doc/pamtilt.html
+pamtodjvurle []      (1)  - see http://netpbm.sourceforge.net/doc/pamtodjvurle.html
+pamtofits []         (1)  - see http://netpbm.sourceforge.net/doc/pamtofits.html
+pamtohdiff []        (1)  - see http://netpbm.sourceforge.net/doc/pamtohdiff.html
+pamtohtmltbl []      (1)  - see http://netpbm.sourceforge.net/doc/pamtohtmltbl.html
+pamtojpeg2k []       (1)  - see http://netpbm.sourceforge.net/doc/pamtojpeg2k.html
+pamtopfm []          (1)  - see http://netpbm.sourceforge.net/doc/pamtopfm.html
+pamtopnm []          (1)  - convert PAM image to PBM, PGM, or PPM
+pamtosvg []          (1)  - see http://netpbm.sourceforge.net/doc/pamtosvg.html
+pamtotga []          (1)  - see http://netpbm.sourceforge.net/doc/pamtotga.html
+pamtotiff []         (1)  - see http://netpbm.sourceforge.net/doc/pamtotiff.html
+pamtouil []          (1)  - see http://netpbm.sourceforge.net/doc/pamtouil.html
+pamtoxvmini []       (1)  - see http://netpbm.sourceforge.net/doc/pamtoxvmini.html
+pamx []              (1)  - see http://netpbm.sourceforge.net/doc/pamx.html
+pand []              (1)  - BlueZ Bluetooth PAN daemon
+panedwindow []       (n)  - Create and manipulate panedwindow widgets
+panel []             (3)  - panel stack extension for curses
+pango []             (1)  - querymodules - Module registration utility
+pap []               (1)  - client interface to remote printers using Printer Access Protocol
+papd []              (8)  - AppleTalk print server daemon
+papd.conf []         (5)  - Configuration file used by papd(8) to determine the configuration of printers used by the Netatalk printing daemon
+papstatus []         (8)  - get the status of an AppleTalk-connected printer
+parport []           (3)  - representation of a parallel port
+parport_list []      (3)  - a collection of parallel ports
+parray []            (n)  - standard library of Tcl procedures
+partprobe []         (8)  - inform the OS of partition table changes
+passmass []          (1)  - change password on multiple machines
+passwd []            (1)  - change user password
+passwd []            (1)  - compute password hashes
+passwd []            (5)  - The password file
+passwd2des []        (3)  - RFS password encryption
+paste []             (1)  - merge lines of files
+patch []             (1)  - apply a diff file to an original
+patch []             (1)  - metamail - Install a patch to the latest metamail release
+path_id []           (8)  - udev callout to create a device path based unique name for a device to implement the Linux Persistent Device Naming scheme
+path_to_fshandle []  (3)  - file handle operations
+path_to_handle []    (3)  - file handle operations
+pathchk []           (1)  - check whether file names are valid or portable
+pathconf []          (3)  - get configuration values for files
+pause []             (2)  - wait for signal
+pbm []               (5)  - portable bitmap file format
+pbmclean []          (1)  - flip isolated pixels in portable bitmap
+pbmfilters []        (1)  - list of all programs in the PBMPlus package
+pbmlife []           (1)  - apply Conway's rules of Life to a portable bitmap
+pbmmake []           (1)  - create a blank bitmap of a specified size
+pbmmask []           (1)  - create a mask bitmap from a regular bitmap
+pbmpage []           (1)  - create a one page test pattern for printing
+pbmpscale []         (1)  - enlarge a portable bitmap with edge smoothing
+pbmreduce []         (1)  - read a portable bitmap and reduce it N times
+pbmtext []           (1)  - render text into a bitmap
+pbmtextps []         (1)  - see http://netpbm.sourceforge.net/doc/pbmtextps.html
+pbmto10x []          (1)  - convert a portable bitmap into Gemini 10X printer graphics
+pbmto4425 []         (1)  - Display PBM images on an AT&T 4425 terminal
+pbmtoascii []        (1)  - convert a portable bitmap into ASCII graphics
+pbmtoatk []          (1)  - convert portable bitmap to Andrew Toolkit raster object
+pbmtobg []           (1)  - convert a portable bitmap into BitGraph graphics
+pbmtocmuwm []        (1)  - convert a portable bitmap into a CMU window manager bitmap
+pbmtodjvurle []      (1)  - see http://netpbm.sourceforge.net/doc/pbmtodjvurle.html
+pbmtoepsi []         (1)  - convert a portable bitmap into an encapsulated PostScript style preview bitmap
+pbmtoepson []        (1)  - convert a portable bitmap into Epson printer graphics
+pbmtoescp2 []        (1)  - see http://netpbm.sourceforge.net/doc/pbmtoescp2.html
+pbmtog3 []           (1)  - convert a portable bitmap into a Group 3 fax file
+pbmtogem []          (1)  - convert a portable bitmap into a GEM .img file
+pbmtogo []           (1)  - convert a portable bitmap into compressed GraphOn graphics
+pbmtoibm23xx []      (1)  - see http://netpbm.sourceforge.net/doc/pbmtoibm23xx.html
+pbmtoicon []         (1)  - convert a portable bitmap into a Sun icon
+pbmtolj []           (1)  - convert a PBM image to HP LaserJet format
+pbmtoln03 []         (1)  - convert protable bitmap to DEC LN03+ Sixel output
+pbmtolps []          (1)  - convert portable bitmap to PostScript
+pbmtomacp []         (1)  - convert a portable bitmap into a MacPaint file
+pbmtomatrixorbital [] (1)  - see http://netpbm.sourceforge.net/doc/pbmtomatrixorbital.html
+pbmtomda []          (1)  - convert a portable bitmap to a Microdesign .mda
+pbmtomgr []          (1)  - convert a portable bitmap into a MGR bitmap
+pbmtomrf []          (1)  - see http://netpbm.sourceforge.net/doc/pbmtomrf.html
+pbmtonokia []        (1)  - convert a portable bitmap to Nokia Smart Messaging Formats
+pbmtopgm []          (1)  - convert PBM image to PGM by averaging areas
+pbmtopi3 []          (1)  - convert a portable bitmap into an Atari Degas .pi3 file
+pbmtopk []           (1)  - convert a portable bitmap into a packed (PK) format font
+pbmtoplot []         (1)  - convert a portable bitmap into a Unix plot(5) file
+pbmtoppa []          (1)  - convert PBM image to HP Printer Performance Architecture (PPA)
+pbmtopsg3 []         (1)  - convert PBM images to Postscript with G3 fax compression
+pbmtoptx []          (1)  - convert a portable bitmap into Printronix printer graphics
+pbmtowbmp []         (1)  - convert a portable bitmap (pbm) to a wireless bitmap (wbmp) file
+pbmtox10bm []        (1)  - convert a portable bitmap into an X10 bitmap
+pbmtoxbm []          (1)  - convert a portable bitmap into an X11 bitmap
+pbmtozinc []         (1)  - convert a portable bitmap into a Zinc bitmap
+pbmupc []            (1)  - create a Universal Product Code bitmap
+pc1toppm []          (1)  - see http://netpbm.sourceforge.net/doc/pc1toppm.html
+pcap []              (1)  - config - write libpcap compiler and linker flags to standard output
+pcap []              (3)  - Packet Capture library
+pcap []              (5)  - savefile - libpcap savefile format
+pcap []              (7)  - filter - packet filter syntax
+pcap []              (7)  - linktype - link-layer header types supported by libpcap
+pcap_activate []     (3)  - activate a capture handle
+pcap_breakloop []    (3)  - force a pcap_dispatch() or pcap_loop() call to return
+pcap_can_set_rfmon [] (3)  - check whether monitor mode can be set for a not - yet-activated capture handle
+pcap_close []        (3)  - close a capture device or savefile
+pcap_compile []      (3)  - compile a filter expression
+pcap_create []       (3)  - create a live capture handle
+pcap_datalink []     (3)  - get the link-layer header type
+pcap_datalink_name_to_val [] (3)  - get the link-layer header type value corresponding to a header type name
+pcap_datalink_val_to_description [] (3)  - get a name or description for a link - layer header type value
+pcap_datalink_val_to_name [] (3)  - get a name or description for a link - layer header type value
+pcap_dispatch []     (3)  - process packets from a live capture or savefile
+pcap_dump []         (3)  - write a packet to a capture file
+pcap_dump_close []   (3)  - close a savefile being written to
+pcap_dump_file []    (3)  - get the standard I/O stream for a savefile being written
+pcap_dump_flush []   (3)  - flush to a savefile packets dumped
+pcap_dump_fopen []   (3)  - open a file to which to write packets
+pcap_dump_ftell []   (3)  - get the current file offset for a savefile being written
+pcap_dump_open []    (3)  - open a file to which to write packets
+pcap_file []         (3)  - get the standard I/O stream for a savefile being read
+pcap_fileno []       (3)  - get the file descriptor for a live capture
+pcap_findalldevs []  (3)  - get a list of capture devices
+pcap_fopen_offline [] (3)  - open a saved capture file for reading
+pcap_free_datalinks [] (3)  - free a list of link-layer header types from pcap_get_datalinks()
+pcap_freealldevs []  (3)  - free a list of capture devices
+pcap_freecode []     (3)  - free a BPF program
+pcap_get_selectable_fd [] (3)  - get a file descriptor on which a select() can be done for a live capture
+pcap_geterr []       (3)  - get or print libpcap error message text
+pcap_getnonblock []  (3)  - set or get the state of non - blocking mode on a capture device
+pcap_inject []       (3)  - transmit a packet
+pcap_is_swapped []   (3)  - find out whether a savefile has the native byte order
+pcap_lib_version []  (3)  - get the version information for libpcap
+pcap_list_datalinks [] (3)  - get a list of link-layer header types supported by a capture device
+pcap_lookupdev []    (3)  - find the default device on which to capture
+pcap_lookupnet []    (3)  - find the IPv4 network number and netmask for a device
+pcap_loop []         (3)  - process packets from a live capture or savefile
+pcap_major_version [] (3)  - get the version number of a savefile
+pcap_minor_version [] (3)  - get the version number of a savefile
+pcap_next []         (3)  - read the next packet from a pcap_t
+pcap_next_ex []      (3)  - read the next packet from a pcap_t
+pcap_offline_filter [] (3)  - check whether a filter matches a packet
+pcap_open_dead []    (3)  - open a fake pcap_t for compiling filters or opening a capture for output
+pcap_open_live []    (3)  - open a device for capturing
+pcap_open_offline [] (3)  - open a saved capture file for reading
+pcap_perror []       (3)  - get or print libpcap error message text
+pcap_sendpacket []   (3)  - transmit a packet
+pcap_set_buffer_size [] (3)  - set the buffer size for a not-yet-activated capture handle
+pcap_set_datalink [] (3)  - set the link-layer header type to be used by a capture device
+pcap_set_promisc []  (3)  - set promiscuous mode for a not-yet-activated capture handle
+pcap_set_rfmon []    (3)  - set monitor mode for a not-yet-activated capture handle
+pcap_set_snaplen []  (3)  - set the snapshot length for a not-yet-activated capture handle
+pcap_set_timeout []  (3)  - set the read timeout for a not-yet-activated capture handle
+pcap_setdirection [] (3)  - set the direction for which packets will be captured
+pcap_setfilter []    (3)  - set the filter
+pcap_setnonblock []  (3)  - set or get the state of non - blocking mode on a capture device
+pcap_snapshot []     (3)  - get the snapshot length
+pcap_stats []        (3)  - get capture statistics
+pcap_statustostr []  (3)  - convert a PCAP_ERROR_ or PCAP_WARNING_ value to a string
+pcap_strerror []     (3)  - convert an errno value to a string
+pccardctl []         (8)  - PCMCIA card control utility
+pcdindex []          (1)  - create index image for a photo CD
+pcdovtoppm []        (1)  - see http://netpbm.sourceforge.net/doc/pcdovtoppm.html
+pciconfig_iobase []  (2)  - pci device information handling
+pciconfig_read []    (2)  - pci device information handling
+pciconfig_write []   (2)  - pci device information handling
+pclose []            (3)  - pipe stream to or from a process
+pcre []              (1)  - config - program to return PCRE configuration
+pcregrep []          (1)  - a grep with Perl-compatible regular expressions
+pcretest []          (1)  - a program for testing Perl-compatible regular expressions
+pcxtoppm []          (1)  - convert a PCX file into a portable pixmap
+pdbedit []           (8)  - manage the SAM database (Database of Samba Users)
+pdf2dsc []           (1)  - generate a PostScript page list of a PDF document
+pdf2ps []            (1)  - Ghostscript PDF to PostScript translator
+pdffonts []          (1)  - Portable Document Format (PDF) font analyzer (version 3.00)
+pdfimages []         (1)  - Portable Document Format (PDF) image extractor (version 3.00)
+pdfinfo []           (1)  - Portable Document Format (PDF) document information extractor (version 3.00)
+pdfopt []            (1)  - Ghostscript PDF Optimizer
+pdfroff []           (1)  - create PDF documents using groff
+pdftohtml []         (1)  - program to convert pdf files into html, xml and png images
+pdftoppm []          (1)  - Portable Document Format (PDF) to Portable Pixmap (PPM) converter (version 3.00)
+pdftops []           (1)  - Portable Document Format (PDF) to PostScript converter (version 3.00)
+pdftotext []         (1)  - Portable Document Format (PDF) to text converter (version 3.00)
+pdiff []             (1)  - produce a pretty comparison between files
+pecho_wchar []       (3)  - create and display curses pads
+pechochar []         (3)  - create and display curses pads
+pedal []             (6)  - pretty geometric picture program
+penetrate []         (6)  - simulates a classic arcade shooting game
+penmount []          (4)  - PenMount input driver
+penrose []           (6)  - draws quasiperiodic tilings
+perl []              (1)  - Practical Extraction and Report Language
+perl5004delta []     (1)  - what's new for perl5.004
+perl5005delta []     (1)  - what's new for perl5.005
+perl561delta []      (1)  - what's new for perl v5.6.x
+perl56delta []       (1)  - what's new for perl v5.6.0
+perl570delta []      (1)  - what's new for perl v5.7.0
+perl571delta []      (1)  - what's new for perl v5.7.1
+perl572delta []      (1)  - what's new for perl v5.7.2
+perl573delta []      (1)  - what's new for perl v5.7.3
+perl581delta []      (1)  - what is new for perl v5.8.1
+perl582delta []      (1)  - what is new for perl v5.8.2
+perl583delta []      (1)  - what is new for perl v5.8.3
+perl584delta []      (1)  - what is new for perl v5.8.4
+perl585delta []      (1)  - what is new for perl v5.8.5
+perl586delta []      (1)  - what is new for perl v5.8.6
+perl587delta []      (1)  - what is new for perl v5.8.7
+perl588delta []      (1)  - what is new for perl v5.8.8
+perl58delta []       (1)  - what is new for perl v5.8.0
+perl590delta []      (1)  - what is new for perl v5.9.0
+perl591delta []      (1)  - what is new for perl v5.9.1
+perl592delta []      (1)  - what is new for perl v5.9.2
+perl593delta []      (1)  - what is new for perl v5.9.3
+perl594delta []      (1)  - what is new for perl v5.9.4
+perl595delta []      (1)  - what is new for perl v5.9.5
+perlXStut []         (1)  - Tutorial for writing XSUBs
+perlamiga []         (1)  - Perl under Amiga OS
+perlapi []           (1)  - autogenerated documentation for the perl public API
+perlapio []          (1)  - perl's IO abstraction interface
+perlartistic []      (1)  - the Perl Artistic License
+perlbook []          (1)  - Perl book information
+perlboot []          (1)  - Beginner's Object-Oriented Tutorial
+perlbot []           (1)  - Bag'o Object Tricks (the BOT)
+perlbug []           (1)  - how to submit bug reports on Perl
+perlcall []          (1)  - Perl calling conventions from C
+perlce []            (1)  - Perl for WinCE
+perlcheat []         (1)  - Perl 5 Cheat Sheet
+perlclib []          (1)  - Internal replacements for standard C library functions
+perlcn []            (1)  - XXXX Perl XX
+perlcommunity []     (1)  - a brief overview of the Perl community
+perlcompile []       (1)  - Introduction to the Perl Compiler-Translator
+perldata []          (1)  - Perl data types
+perldbmfilter []     (1)  - Perl DBM Filters
+perldebguts []       (1)  - Guts of Perl debugging
+perldebtut []        (1)  - Perl debugging tutorial
+perldebug []         (1)  - Perl debugging
+perldelta []         (1)  - what is new for perl 5.10.0
+perldgux []          (1)  - Perl under DG/UX
+perldiag []          (1)  - various Perl diagnostics
+perldoc []           (1)  - Look up Perl documentation in Pod format
+perldos []           (1)  - Perl under DOS, W31, W95
+perldsc []           (1)  - Perl Data Structures Cookbook
+perlebcdic []        (1)  - Considerations for running Perl on EBCDIC platforms
+perlembed []         (1)  - how to embed perl in your C program
+perlfaq []           (1)  - frequently asked questions about Perl
+perlfaq1 []          (1)  - General Questions About Perl ($Revision: 10427 $)
+perlfaq2 []          (1)  - Obtaining and Learning about Perl ($Revision: 10144 $)
+perlfaq3 []          (1)  - Programming Tools ($Revision: 10127 $)
+perlfaq4 []          (1)  - Data Manipulation ($Revision: 10394 $)
+perlfaq5 []          (1)  - Files and Formats ($Revision: 10126 $)
+perlfaq6 []          (1)  - Regular Expressions ($Revision: 10126 $)
+perlfaq7 []          (1)  - General Perl Language Issues ($Revision: 10100 $)
+perlfaq8 []          (1)  - System Interaction ($Revision: 10183 $)
+perlfaq9 []          (1)  - Networking ($Revision: 8539 $)
+perlfilter []        (1)  - Source Filters
+perlfork []          (1)  - Perl's fork() emulation
+perlform []          (1)  - Perl formats
+perlfunc []          (1)  - Perl builtin functions
+perlglossary []      (1)  - Perl Glossary
+perlgpl []           (1)  - the GNU General Public License, version 2
+perlguts []          (1)  - Introduction to the Perl API
+perlhack []          (1)  - How to hack at the Perl internals
+perlhist []          (1)  - the Perl history records
+perlintern []        (1)  - autogenerated documentation of purely internal Perl functions
+perlintro []         (1)  - - a brief introduction and overview of Perl
+perliol []           (1)  - C API for Perl's implementation of IO in Layers
+perlipc []           (1)  - Perl interprocess communication (signals, fifos, pipes, safe subprocesses, sockets, and semaphores)
+perlivp []           (1)  - Perl Installation Verification Procedure
+perljp []            (1)  - XXX Perl XXX
+perlko []            (1)  - PerlX XXX XXX
+perllexwarn []       (1)  - Perl Lexical Warnings
+perllocale []        (1)  - Perl locale handling (internationalization and localization)
+perllol []           (1)  - Manipulating Arrays of Arrays in Perl
+perlmod []           (1)  - Perl modules (packages and symbol tables)
+perlmodinstall []    (1)  - Installing CPAN Modules
+perlmodlib []        (1)  - constructing new Perl modules and finding existing ones
+perlmodstyle []      (1)  - Perl module style guide
+perlnetware []       (1)  - Perl for NetWare
+perlnewmod []        (1)  - preparing a new module for distribution
+perlnumber []        (1)  - semantics of numbers and numeric operations in Perl
+perlobj []           (1)  - Perl objects
+perlop []            (1)  - Perl operators and precedence
+perlopentut []       (1)  - tutorial on opening things in Perl
+perlos2 []           (1)  - Perl under OS/2, DOS, Win0.3*, Win0.95 and WinNT
+perlothrtut []       (1)  - old tutorial on threads in Perl
+perlpacktut []       (1)  - tutorial on pack and unpack
+perlplan9 []         (1)  - Plan 9-specific documentation for Perl
+perlpod []           (1)  - the Plain Old Documentation format
+perlpodspec []       (1)  - Plain Old Documentation: format specification and notes
+perlport []          (1)  - Writing portable Perl
+perlpragma []        (1)  - how to write a user pragma
+perlre []            (1)  - Perl regular expressions
+perlreapi []         (1)  - perl regular expression plugin interface
+perlrebackslash []   (1)  - Perl Regular Expression Backslash Sequences and Escapes
+perlrecharclass []   (1)  - Perl Regular Expression Character Classes
+perlref []           (1)  - Perl references and nested data structures
+perlreftut []        (1)  - Mark's very short tutorial about references
+perlreguts []        (1)  - Description of the Perl regular expression engine
+perlrequick []       (1)  - Perl regular expressions quick start
+perlreref []         (1)  - Perl Regular Expressions Reference
+perlretut []         (1)  - Perl regular expressions tutorial
+perlrun []           (1)  - how to execute the Perl interpreter
+perlsec []           (1)  - Perl security
+perlstyle []         (1)  - Perl style guide
+perlsub []           (1)  - Perl subroutines
+perlsyn []           (1)  - Perl syntax
+perlthrtut []        (1)  - Tutorial on threads in Perl
+perltie []           (1)  - how to hide an object class in a simple variable
+perltoc []           (1)  - perl documentation table of contents
+perltodo []          (1)  - Perl TO-DO List
+perltooc []          (1)  - Tom's OO Tutorial for Class Data in Perl
+perltoot []          (1)  - Tom's object-oriented tutorial for perl
+perltrap []          (1)  - Perl traps for the unwary
+perltw []            (1)  - XXXX Perl XX
+perlunicode []       (1)  - Unicode support in Perl
+perlunifaq []        (1)  - Perl Unicode FAQ
+perluniintro []      (1)  - Perl Unicode introduction
+perlunitut []        (1)  - Perl Unicode Tutorial
+perlutil []          (1)  - utilities packaged with the Perl distribution
+perluts []           (1)  - Perl under UTS
+perlvar []           (1)  - Perl predefined variables
+perlvms []           (1)  - VMS-specific documentation for Perl
+perlwin32 []         (1)  - Perl under Windows
+perlxs []            (1)  - XS language reference manual
+perror []            (1)  - explain error codes
+perror []            (3)  - print a system error message
+personality []       (2)  - set the process execution domain
+petri []             (6)  - simulates mold growing in a petri dish
+pf2afm []            (1)  - Make an AFM file from Postscript (PFB/PFA/PFM) font files using ghostscript
+pfbtopfa []          (1)  - Convert Postscript .pfb fonts to .pfa format using ghostscript
+pfbtops []           (1)  - translate a PostScript font in .pfb format to ASCII
+pfifo []             (8)  - Packet limited First In, First Out queue .P bfifo - Byte limited First In, First Out queue
+pfifo_fast []        (8)  - three-band first in, first out queue
+pfksh []             (1)  - KornShell, a
+pfksh93 []           (1)  - KornShell, a
+pfmtopam []          (1)  - see http://netpbm.sourceforge.net/doc/pfmtopam.html
+pfsh []              (1)  - shell, the
+pg []                (1)  - browse pagewise through text files
+pgm []               (5)  - portable graymap file format
+pgmabel []           (1)  - see http://netpbm.sourceforge.net/doc/pgmabel.html
+pgmbentley []        (1)  - Bentleyize a portable graymap
+pgmcrater []         (1)  - create cratered terrain by fractal forgery
+pgmdeshadow []       (1)  - see http://netpbm.sourceforge.net/doc/pgmdeshadow.html
+pgmedge []           (1)  - edge-detect a portable graymap
+pgmenhance []        (1)  - edge-enhance a portable graymap
+pgmhist []           (1)  - print a histogram of the values in a portable graymap
+pgmkernel []         (1)  - generate a convolution kernel
+pgmmake []           (1)  - see http://netpbm.sourceforge.net/doc/pgmmake.html
+pgmmedian []         (1)  - see http://netpbm.sourceforge.net/doc/pgmmedian.html
+pgmminkowski []      (1)  - see http://netpbm.sourceforge.net/doc/pgmminkowski.html
+pgmmorphconv []      (1)  - see http://netpbm.sourceforge.net/doc/pgmmorphconv.html
+pgmnoise []          (1)  - create a graymap made up of white noise
+pgmramp []           (1)  - generate a grayscale ramp
+pgmslice []          (1)  - extract one line of pixel values out of a portable graymap
+pgmtexture []        (1)  - calculate textural features on a portable graymap
+pgmtofs []           (1)  - convert portable graymap to Usenix FaceSaver(tm) format
+pgmtolispm []        (1)  - convert a portable graymap into Lisp Machine format
+pgmtopbm []          (1)  - convert a portable graymap into a portable bitmap
+pgmtopgm []          (1)  - see http://netpbm.sourceforge.net/doc/pgmtopgm.html
+pgmtoppm []          (1)  - colorize a PGM (grayscale) image into a PGM (color) image
+pgmtoybm []          (1)  - convert a portable bitmap into a Bennet Yee face file
+pgrep []             (1)  - look up or signal processes based on name and other attributes
+phantasia []         (6)  - an interterminal fantasy game
+phosphor []          (6)  - simulates an old terminal with long-sustain phosphor
+photo []             (n)  - Full-color images
+photopile []         (6)  - displays multiple images in a periodically shuffled pile
+pi1toppm []          (1)  - convert an Atari Degas .pi1 into a portable pixmap
+pi3topbm []          (1)  - convert an Atari Degas .pi3 file into a portable bitmap
+pic []               (1)  - compile pictures for troff or TeX
+pic2graph []         (1)  - convert a PIC diagram into a cropped image
+pic2tpic []          (1)  - Convert pic files to tpic format
+pico []              (1)  - simple text editor in the style of the Alpine Composer
+piconv []            (1)  - - iconv(1), reinvented in perl
+picttoppm []         (1)  - convert a Macintosh PICT file into a portable pixmap
+pid []               (n)  - Retrieve process identifiers
+pidgin []            (1)  - Instant Messaging client
+pidof []             (8)  - - find the process ID of a running program
+piecewise []         (6)  - lots of moving circles intersecting in interesting ways
+pig []               (6)  - eformatray inputway asway Igpay Atinlay
+pilot []             (1)  - addresses - Read and write address book databases to and from a Palm handheld
+pilot []             (1)  - clip - Get or Set the Palm Clipboard contents from STDOUT/STDIN
+pilot []             (1)  - csd - Connection Service Daemon for Palm Devices
+pilot []             (1)  - debugsh - Simple debugging console for a Palm Handheld device [deprecated]
+pilot []             (1)  - dedupe - Removes duplicate records from any Palm database
+pilot []             (1)  - dlpsh - An interactive Desktop Link Protocol (DLP) Shell for your Palm device
+pilot []             (1)  - file - Dump application and header information from your local PRC/PDB files
+pilot []             (1)  - foto - Palm 'Foto' Image Installer/Remover/Fetcher/Converter
+pilot []             (1)  - foto-treo600 - Copies Treo foto databases to current directory and extracts image files from within them
+pilot []             (1)  - foto-treo650 - Copies Treo foto databases and videos to the current directory
+pilot []             (1)  - getram - Retrieves the RAM image from your Palm device for use in debugging
+pilot []             (1)  - getrom - Retrieves the ROM image from your Palm device for use in debugging
+pilot []             (1)  - getromtoken - Reads a ROM token from a Palm Handheld device
+pilot []             (1)  - hinotes - Syncronize your Hi-Notes database with your desktop machine
+pilot []             (1)  - install-datebook - Installs one or more new datebook entries onto your Palm handheld
+pilot []             (1)  - install-expenses - Install an expense record entries onto your Palm handheld device
+pilot []             (1)  - install-hinote - Install local files into your Hi-Note database on your Palm handheld
+pilot []             (1)  - install-memo - Installs a new Memo Pad entry onto your Palm handheld
+pilot []             (1)  - install-netsync - reads or sets the Network Preferences information on a Palm Device
+pilot []             (1)  - install-todo - Updates the Palm ToDo list with one new entry
+pilot []             (1)  - install-todos - Updates the Palm ToDo list with entries from a local file
+pilot []             (1)  - install-user - Reads or sets a Palm User and UserID on a Palm Device
+pilot []             (1)  - memos - Manipulate Memo entries from a file or your Palm device
+pilot []             (1)  - nredir - Accept connection and redirect via Network Hotsync Protocol
+pilot []             (1)  - read-expenses - Export Palm Expense application data in a text format
+pilot []             (1)  - read-ical - Exports the DatebookDB and/or ToDo applications to ical format
+pilot []             (1)  - read-notepad - List the record information found in the Palm Notepad
+pilot []             (1)  - read-palmpix - Convert all pictures in the files given or found on a Palm handheld
+pilot []             (1)  - read-screenshot - Read screenshots from Palm (ScreenShotDB)
+pilot []             (1)  - read-todos - Syncronize your Palm ToDo application's database with your desktop machine
+pilot []             (1)  - read-veo - Synchronize your Veo Traveler databases
+pilot []             (1)  - reminders - Exports your Palm Datebook database into a remind(1) data file format
+pilot []             (1)  - schlep - Pack an arbitrary file and install it on your Palm or unpack a file from your Palm
+pilot []             (1)  - simple file system browser in the style of the Alpine Composer
+pilot []             (1)  - wav - Decodes Palm Voice Memo files to wav files you can read on your desktop
+pilot []             (1)  - xfer - Backup, sync, and restore databases from a Palm handheld device
+pilot []             (7)  - link - A suite of tools for communicating with Palm handhelds, such as those made by Palm, Handspring, Handera, TRGPro, Sony or other Palm Compatible Handheld PDA device
+ping []              (8)  - send ICMP ECHO_REQUEST to network hosts
+ping6 []             (8)  - send ICMP ECHO_REQUEST to network hosts
+pinion []            (6)  - draws a scrolling sequence of interconnected gears
+pinky []             (1)  - lightweight finger
+pipe []              (2)  - create pipe
+pipe []              (7)  - overview of pipes and FIFOs
+pipe2 []             (2)  - create pipe
+pipes []             (6)  - fill the screen with a plumbing system
+pivot_root []        (2)  - change the root file system
+pivot_root []        (8)  - change the root file system
+pixmap []            (n)  - image type for the XPM file format
+pjtoppm []           (1)  - convert an HP PaintJet file to a portable pixmap
+pkcs12 []            (1)  - PKCS#12 file utility
+pkcs7 []             (1)  - PKCS#7 utility
+pkcs8 []             (1)  - PKCS#8 format private key conversion tool
+pkg []               (1)  - config - Return metainformation about installed libraries
+pkg::create []       (n)  - Construct an appropriate 'package ifneeded' command for a given package specification
+pkg_mkIndex []       (n)  - Build an index for automatic loading of packages
+pkgtool []           (8)  - software package maintenance tool
+pkill []             (1)  - look up or signal processes based on name and other attributes
+pktopbm []           (1)  - convert packed (PK) format font into portable bitmap(s)
+pl2pm []             (1)  - Rough tool to translate Perl4 .pl files to Perl5 .pm modules
+place []             (n)  - Geometry manager for fixed or rubber-sheet placement
+plane []             (6)  - draw a 3 dimensional plane
+platform []          (n)  - System identification support code and utilities
+platform::shell []   (n)  - System identification support code and utilities
+plipconfig []        (8)  - fine tune PLIP device parameters
+pluginviewer []      (8)  - list loadable SASL plugins and their properties
+pm []                (1)  - is-supported - Test whether suspend or hibernate is supported
+pm []                (8)  - action - Suspend or Hibernate your computer
+pm []                (8)  - pmu - suspend the computer on machines using a Macintosh-style PMU
+pm []                (8)  - powersave - Put your computer into low power mode
+pmake []             (1)  - maintain program dependencies
+pmap_dump []         (8)  - print a list of all registered RPC programs
+pmap_set []          (8)  - set the list of registered RPC programs
+png []               (5)  - Portable Network Graphics (PNG) format
+pngtopnm []          (1)  - convert a Portable Network Graphics file into a portable anymap
+pnm []               (5)  - portable anymap file format
+pnmalias []          (1)  - antialias a portable anyumap
+pnmarith []          (1)  - perform arithmetic on two portable anymaps
+pnmcat []            (1)  - concatenate portable anymaps
+pnmcolormap []       (1)  - create quantization color map for a Netpbm image
+pnmcomp []           (1)  - composite (overlay) two portable anymap files together
+pnmconvol []         (1)  - general MxN convolution on a portable anymap
+pnmcrop []           (1)  - crop a portable anymap
+pnmcut []            (1)  - cut a rectangle out of a PBM, PGM, or PPM image
+pnmdepth []          (1)  - change the maxval in a portable anymap
+pnmenlarge []        (1)  - read a portable anymap and enlarge it N times
+pnmfile []           (1)  - describe a portable anymap
+pnmflip []           (1)  - perform one or more flip operations on a portable anymap
+pnmgamma []          (1)  - perform gamma correction on a PNM image
+pnmhisteq []         (1)  - histogram equalise a portable anymap
+pnmhistmap []        (1)  - draw a histogram for a PGM or PPM file
+pnmindex []          (1)  - build a visual index of a bunch of anymaps
+pnminvert []         (1)  - invert a portable anymap
+pnmmargin []         (1)  - add a border to a portable anymap
+pnmmontage []        (1)  - create a montage of portable anymaps
+pnmnlfilt []         (1)  - non-linear filters: smooth, alpha trim mean, optimal estimation smoothing, edge enhancement
+pnmnorm []           (1)  - normalize the contrast in a Netbpm image
+pnmpad []            (1)  - add borders to portable anymap
+pnmpaste []          (1)  - paste a rectangle into a portable anymap
+pnmpsnr []           (1)  - compute the difference between two images (the PSNR)
+pnmquant []          (1)  - quantize the colors in a Netpbm image to a smaller set
+pnmremap []          (1)  - replace colors in a PPM image with colors from another set
+pnmrotate []         (1)  - rotate a portable anymap by some angle
+pnmscale []          (1)  - scale a PNM file quickly
+pnmscale []          (1)  - scale a PNM image
+pnmshear []          (1)  - shear a portable anymap by some angle
+pnmsmooth []         (1)  - smooth out an image
+pnmsplit []          (1)  - split a multi-image PNM file into multiple single-image files
+pnmstitch []         (1)  - see http://netpbm.sourceforge.net/doc/pnmstitch.html
+pnmtile []           (1)  - replicate a portable anymap into a specified size
+pnmtoddif []         (1)  - Convert a portable anymap to DDIF format
+pnmtofiasco []       (1)  - Convert PNM file to FIASCO compressed file
+pnmtofits []         (1)  - convert a portable anymap into FITS format
+pnmtojbig []         (1)  - PNM to JBIG file converter
+pnmtojpeg []         (1)  - convert PNM image to a JFIF (JPEG) image
+pnmtopalm []         (1)  - convert a portable anymap into a Palm pixmap
+pnmtopclxl []        (1)  - see http://netpbm.sourceforge.net/doc/pnmtopclxl.html
+pnmtoplainpnm []     (1)  - convert portable any map to plain (ASCII) anymap format
+pnmtopng []          (1)  - convert a portable anymap into a Portable Network Graphics file
+pnmtops []           (1)  - convert portable anymap to PostScript
+pnmtorast []         (1)  - convert a portable pixmap into a Sun rasterfile
+pnmtorle []          (1)  - convert a Netpbm image file into an RLE image file
+pnmtosgi []          (1)  - convert a portable anymap to a SGI image file
+pnmtosir []          (1)  - convert a portable anymap into a Solitaire format
+pnmtotiff []         (1)  - convert a PNM image to a TIFF file
+pnmtotiffcmyk []     (1)  - convert a a portable anymap into a CMYK encoded TIFF file
+pnmtoxwd []          (1)  - convert a portable anymap into an X11 window dump
+pnoutrefresh []      (3)  - create and display curses pads
+pnpdump []           (8)  - Dump ISA Plug-And-Play devices resource information
+po2xml []            (1)  - Translates an DocBook XML file using a PO file
+pod2html []          (1)  - convert .pod files to .html files
+pod2latex []         (1)  - convert pod documentation to latex format
+pod2man []           (1)  - Convert POD data to formatted *roff input
+pod2text []          (1)  - Convert POD data to formatted ASCII text
+pod2usage []         (1)  - print usage messages from embedded pod docs in files
+pod2usage() []       (3)  - print a usage message from embedded pod documentation
+podchecker []        (1)  - check the syntax of POD format documentation files
+podchecker() []      (3)  - check pod documents for syntax errors
+podselect []         (1)  - print selected sections of pod documentation on standard output
+podselect() []       (3)  - extract selected sections of POD from input
+poll []              (2)  - wait for some event on a file descriptor
+polyhedra []         (6)  - draws the 80 uniform polyhedra and their duals
+polyominoes []       (6)  - fill a rectangle with irregularly-shaped blocks
+polytopes []         (6)  - Draws one of the six regular 4d polytopes rotating in 4d
+pom []               (6)  - display the phase of the moon
+pong []              (6)  - Pong Home Video Game Emulator
+popa3d []            (8)  - Post Office Protocol (POP3) server
+popd []              (1)  - bash built-in commands, see bash(1)
+popen []             (3)  - pipe stream to or from a process
+popt []              (3)  - Parse command line options
+port []              (4)  - system memory, kernel memory and system ports
+portmap []           (8)  - DARPA port to RPC program number mapper
+porttime []          (5)  - port access time file
+posix_fadvise []     (2)  - predeclare an access pattern for file data
+posix_fallocate []   (3)  - allocate file space
+posix_memalign []    (3)  - Allocate aligned memory
+posix_openpt []      (3)  - open a pseudo-terminal device
+posixoptions []      (7)  - optional parts of the POSIX standard
+pow []               (3)  - power functions
+pow10 []             (3)  - base-10 power functions
+pow10f []            (3)  - base-10 power functions
+pow10l []            (3)  - base-10 power functions
+poweroff []          (8)  - stop the system
+powf []              (3)  - power functions
+powl []              (3)  - power functions
+ppdc []              (1)  - cups ppd compiler
+ppdcfile []          (5)  - cups ppd compiler source file format
+ppdhtml []           (1)  - cups html summary generator
+ppdi []              (1)  - import ppd files
+ppdmerge []          (1)  - merge ppd files
+ppdpo []             (1)  - cups message catalog generator
+ppm []               (5)  - portable pixmap file format
+ppm2tiff []          (1)  - create a TIFF file from PPM, PGM and PBM image files
+ppm3d []             (1)  - convert two portable pixmap into a red/blue 3d glasses pixmap
+ppmbrighten []       (1)  - change an images Saturation and Value from an HSV map
+ppmchange []         (1)  - change all pixels of one color to another in a portable pixmap
+ppmcie []            (1)  - draw a CIE color chart as a PPM image
+ppmcolormask []      (1)  - produce mask of areas of a certain color in a PPM file
+ppmcolors []         (1)  - generate a color map of all colors of a certain maxval
+ppmdcfont []         (1)  - see http://netpbm.sourceforge.net/doc/ppmdcfont.html
+ppmddumpfont []      (1)  - see http://netpbm.sourceforge.net/doc/ppmddumpfont.html
+ppmdim []            (1)  - dim a portable pixmap down to total blackness
+ppmdist []           (1)  - simplistic grayscale assignment for machine generated, color images
+ppmdither []         (1)  - ordered dither for color images
+ppmdmkfont []        (1)  - see http://netpbm.sourceforge.net/doc/ppmdmkfont.html
+ppmdraw []           (1)  - see http://netpbm.sourceforge.net/doc/ppmdraw.html
+ppmfade []           (1)  - generate a transition between two image files using special effects
+ppmflash []          (1)  - brighten a picture up to complete white-out
+ppmforge []          (1)  - fractal forgeries of clouds, planets, and starry skies
+ppmglobe []          (1)  - see http://netpbm.sourceforge.net/doc/ppmglobe.html
+ppmhist []           (1)  - print a histogram of a PPM image
+ppmlabel []          (1)  - add text to a portable pixmap
+ppmmake []           (1)  - create a pixmap of a specified size and color
+ppmmix []            (1)  - blend together two portable pixmaps
+ppmntsc []           (1)  - Make RGB colors legal for NTSC or PAL color systems
+ppmpat []            (1)  - make a pretty pixmap
+ppmquant []          (1)  - quantize the colors in a portable pixmap down to a specified number
+ppmquantall []       (1)  - run ppmquant on a bunch of files all at once, so they share a common colormap
+ppmqvga []           (1)  - 8 plane quantization
+ppmrainbow []        (1)  - Generate a rainbow
+ppmrelief []         (1)  - run a Laplacian relief filter on a portable pixmap
+ppmrough []          (1)  - see http://netpbm.sourceforge.net/doc/ppmrough.html
+ppmshadow []         (1)  - add simulated shadows to a portable pixmap image
+ppmshift []          (1)  - shift lines of a portable pixmap left or right by a random amount
+ppmspread []         (1)  - displace a portable pixmap's pixels by a random amount
+ppmsvgalib []        (1)  - display PPM image on Linux console using Svgalib
+ppmtoacad []         (1)  - convert portable pixmap to AutoCAD database or slide
+ppmtoarbtxt []       (1)  - see http://netpbm.sourceforge.net/doc/ppmtoarbtxt.html
+ppmtobmp []          (1)  - convert a portable pixmap into a BMP file
+ppmtoeyuv []         (1)  - convert a portable pixmap into a Berkeley YUV file
+ppmtogif []          (1)  - convert a portable pixmap into a GIF file
+ppmtoicr []          (1)  - convert a portable pixmap into NCSA ICR format
+ppmtoilbm []         (1)  - convert a portable pixmap into an ILBM file
+ppmtoleaf []         (1)  - convert PPM image to Interleaf image format
+ppmtolj []           (1)  - convert a portable pixmap to an HP LaserJet PCL 5 Color file
+ppmtomap []          (1)  - extract all colors from a portable pixmap
+ppmtomitsu []        (1)  - convert a portable pixmap to a Mitsubishi S340-10 file
+ppmtompeg []         (1)  - encodes MPEG-1 bitstreams
+ppmtoneo []          (1)  - convert a portable pixmap into an Atari Neochrome .neo file
+ppmtopcx []          (1)  - convert a portable pixmap into a PCX file
+ppmtopgm []          (1)  - convert a portable pixmap into a portable graymap
+ppmtopi1 []          (1)  - convert a portable pixmap into an Atari Degas .pi1 file
+ppmtopict []         (1)  - convert a portable pixmap into a Macintosh PICT file
+ppmtopj []           (1)  - convert a portable pixmap to an HP PaintJet file
+ppmtopjxl []         (1)  - convert a portable pixmap into an HP PaintJet XL PCL file
+ppmtoppm []          (1)  - see http://netpbm.sourceforge.net/doc/ppmtoppm.html
+ppmtopuzz []         (1)  - convert a portable pixmap into an X11 puzzle file
+ppmtorgb3 []         (1)  - separate a portable pixmap into three portable graymaps
+ppmtosixel []        (1)  - convert a portable pixmap into DEC sixel format
+ppmtoterm []         (1)  - see http://netpbm.sourceforge.net/doc/ppmtoterm.html
+ppmtotga []          (1)  - convert portable pixmap into a TrueVision Targa file
+ppmtouil []          (1)  - convert a portable pixmap into a Motif UIL icon file
+ppmtowinicon []      (1)  - convert 1 or more portable pixmaps into a Windows .ico file
+ppmtoxpm []          (1)  - convert a PPM iamge into an X11 pixmap
+ppmtoyuv []          (1)  - convert a portable pixmap into an Abekas YUV file
+ppmtoyuvsplit []     (1)  - convert a portable pixmap into 3 subsampled raw YUV files
+ppmtv []             (1)  - make a portable pixmap look like taken from an American TV
+ppmwheel []          (1)  - see http://netpbm.sourceforge.net/doc/ppmwheel.html
+ppoll []             (2)  - wait for some event on a file descriptor
+pppd []              (8)  - Point-to-Point Protocol Daemon
+pppdump []           (8)  - convert PPP record file to readable format
+pppoe []             (8)  - connect - Shell script to manage a PPPoE link
+pppoe []             (8)  - relay - user-space PPPoE relay agent
+pppoe []             (8)  - server - user-space PPPoE server
+pppoe []             (8)  - setup - Shell script to configure Roaring Penguin PPPoE client
+pppoe []             (8)  - sniff - examine network for non-standard PPPoE frames
+pppoe []             (8)  - start - Shell script to bring up a PPPoE link
+pppoe []             (8)  - status - Shell script to report on status of PPPoE link
+pppoe []             (8)  - stop - Shell script to shut down a PPPoE link
+pppoe []             (8)  - user-space PPPoE client
+pppoe.conf []        (5)  - Configuration file used by pppoe-start(8), pppoe - stop(8), pppoe-status(8) and pppoe-connect(8)
+pppstats []          (8)  - print PPP statistics
+ppt []               (6)  - reformat input as punch cards, paper tape or morse code
+pr []                (1)  - convert text files for printing
+pr29_4 []            (3)  - check if input trigger Unicode normalization bugs
+pr29_4z []           (3)  - check if input trigger Unicode normalization bugs
+pr29_8z []           (3)  - check if input trigger Unicode normalization bugs
+pr29_strerror []     (3)  - return string describing pr29 error code
+praliases []         (8)  - display system mail aliases
+prctl []             (2)  - operations on a process
+pread []             (2)  - read from or write to a file descriptor at a given offset
+preconv []           (1)  - convert encoding of input files to something GNU troff understands
+prefresh []          (3)  - create and display curses pads
+prezip []            (1)  - bin - prefix zip delta word list compressor/decompressor
+primes []            (6)  - factor a number, generate primes
+print_description [] (3)  - mib_api functions
+print_mib []         (3)  - mib_api functions
+print_objid []       (3)  - mib_api functions
+print_value []       (3)  - mib_api functions
+print_variable []    (3)  - mib_api functions
+printafm []          (1)  - Print the metrics from a Postscript font in AFM format using ghostscript
+printenv []          (1)  - print all or part of environment
+printers.conf []     (5)  - printer configuration file for cups
+printf []            (1)  - bash built-in commands, see bash(1)
+printf []            (1)  - format and print data
+printf []            (3)  - formatted output conversion
+printftest []        (6)  - tests the vgagl gl_printf function
+printmail []         (1)  - format mail in a readable fashion for printing
+printw []            (3)  - print formatted output in curses windows
+proc []              (5)  - process information pseudo-file system
+proc []              (n)  - Create a Tcl procedure
+procinfo []          (8)  - display system status gathered from /proc
+procmail []          (1)  - autonomous mail processor
+procmailex []        (5)  - procmail rcfile examples
+procmailrc []        (5)  - procmail rcfile
+procmailsc []        (5)  - procmail weighted scoring technique
+prof []              (2)  - unimplemented system calls
+profil []            (2)  - unimplemented system calls
+profil []            (3)  - execution time profile
+profiles []          (1)  - A utility to report and change SIDs in registry files
+proftpd []           (8)  - Professional configurable, secure file transfer protocol server
+program_invocation_name [] (3)  - obtain name used to invoke calling program
+program_invocation_short_name [] (3)  - obtain name used to invoke calling program
+protocols []         (5)  - the protocols definition file
+prove []             (1)  - - A command-line tool for running tests against Test::Harness
+providence []        (6)  - eye in glory screenhack
+proxymngr []         (1)  - proxy manager service
+pruneemptydirs []    (1)  - Detects stale source directories in a CVS tree
+ps []                (1)  - report a snapshot of the current processes
+ps2ascii []          (1)  - Ghostscript translator from PostScript or PDF to ASCII
+ps2epsi []           (1)  - generate conforming Encapsulated PostScript
+ps2pdf []            (1)  - Convert PostScript to PDF using ghostscript
+ps2pdf12 []          (1)  - Convert PostScript to PDF 1.2 (Acrobat 3-and-later compatible) using ghostscript
+ps2pdf13 []          (1)  - Convert PostScript to PDF 1.3 (Acrobat 4-and-later compatible) using ghostscript
+ps2pdfwr []          (1)  - Convert PostScript to PDF without specifying CompatibilityLevel, using ghostscript
+ps2ps []             (1)  - Ghostscript PostScript distiller
+psbook []            (1)  - rearrange pages in PostScript file into signatures
+psc []               (1)  - prepare sc files
+psed []              (1)  - a stream editor
+pselect []           (2)  - synchronous I/O multiplexing
+psf []               (8)  - PostScript filter
+psfaddtable []       (1)  - add a Unicode character table to a console font
+psfgettable []       (1)  - extract the embedded Unicode character table from a console font
+psfstriptable []     (1)  - remove the embedded Unicode character table from a console font
+psfxtable []         (1)  - handle Unicode character tables for console fonts
+psidtopgm []         (1)  - convert PostScript image data into a portable graymap
+psignal []           (3)  - print signal message
+psktool []           (1)  - Simple PSK password tool
+psmandup []          (1)  - print duplex on non duplex printers
+psmerge []           (1)  - filter to merge several PostScript files into one
+psnup []             (1)  - multiple pages per sheet
+psorder []           (1)  - PostScript pageorder filter
+pspell []            (1)  - config - prints information about a libpspell installation
+psresize []          (1)  - multiple pages per sheet
+psselect []          (1)  - select pages from a PostScript file
+psset []             (1)  - insert page device request in PostScript files
+pstopnm []           (1)  - convert a PostScript file into a portable anymap
+pstops []            (1)  - shuffle pages in a PostScript file
+pstree []            (1)  - display a tree of processes
+pstruct []           (1)  - Dump C structures as generated from cc -g -S stabs
+ptar []              (1)  - a tar-like program written in perl
+ptardiff []          (1)  - program that diffs an extracted archive against an unextracted one
+pth []               (1)  - config - Pth library build utility
+pth []               (3)  - GNU Portable Threads
+pthread.h []         (3)  - threads
+pthread_atfork []    (3)  - register fork handlers
+pthread_attr_destroy [] (3)  - destroy and initialize the thread attributes object
+pthread_attr_destroy [] (3)  - initialize and destroy thread attributes object
+pthread_attr_getaffinity_np [] (3)  - set/get CPU affinity attribute in thread attributes object
+pthread_attr_getdetachstate [] (3)  - get and set the detachstate attribute
+pthread_attr_getdetachstate [] (3)  - set/get detach state attribute in thread attributes object
+pthread_attr_getguardsize [] (3)  - get and set the thread guardsize attribute
+pthread_attr_getguardsize [] (3)  - set/get guard size attribute in thread attributes object
+pthread_attr_getinheritsched [] (3)  - get and set the inheritsched attribute (REALTIME THREADS)
+pthread_attr_getinheritsched [] (3)  - set/get inherit scheduler attribute in thread attributes object
+pthread_attr_getschedparam [] (3)  - get and set the schedparam attribute
+pthread_attr_getschedparam [] (3)  - set/get scheduling parameter attributes in thread attributes object
+pthread_attr_getschedpolicy [] (3)  - get and set the schedpolicy attribute (REALTIME THREADS)
+pthread_attr_getschedpolicy [] (3)  - set/get scheduling policy attribute in thread attributes object
+pthread_attr_getscope [] (3)  - get and set the contentionscope attribute (REALTIME THREADS)
+pthread_attr_getscope [] (3)  - set/get contention scope attribute in thread attributes object
+pthread_attr_getstack [] (3)  - get and set stack attributes
+pthread_attr_getstack [] (3)  - set/get stack attributes in thread attributes object
+pthread_attr_getstackaddr [] (3)  - get and set the stackaddr attribute
+pthread_attr_getstackaddr [] (3)  - set/get stack address attribute in thread attributes object
+pthread_attr_getstacksize [] (3)  - get and set the stacksize attribute
+pthread_attr_getstacksize [] (3)  - set/get stack size attribute in thread attributes object
+pthread_attr_init [] (3)  - destroy and initialize the thread attributes object
+pthread_attr_init [] (3)  - initialize and destroy thread attributes object
+pthread_attr_setaffinity_np [] (3)  - set/get CPU affinity attribute in thread attributes object
+pthread_attr_setdetachstate [] (3)  - get and set the detachstate attribute
+pthread_attr_setdetachstate [] (3)  - set/get detach state attribute in thread attributes object
+pthread_attr_setguardsize [] (3)  - get and set the thread guardsize attribute
+pthread_attr_setguardsize [] (3)  - set/get guard size attribute in thread attributes object
+pthread_attr_setinheritsched [] (3)  - get and set the inheritsched attribute (REALTIME THREADS)
+pthread_attr_setinheritsched [] (3)  - set/get inherit scheduler attribute in thread attributes object
+pthread_attr_setschedparam [] (3)  - get and set the schedparam attribute
+pthread_attr_setschedparam [] (3)  - set/get scheduling parameter attributes in thread attributes object
+pthread_attr_setschedpolicy [] (3)  - get and set the schedpolicy attribute (REALTIME THREADS)
+pthread_attr_setschedpolicy [] (3)  - set/get scheduling policy attribute in thread attributes object
+pthread_attr_setscope [] (3)  - get and set the contentionscope attribute (REALTIME THREADS)
+pthread_attr_setscope [] (3)  - set/get contention scope attribute in thread attributes object
+pthread_attr_setstack [] (3)  - get and set stack attributes
+pthread_attr_setstack [] (3)  - set/get stack attributes in thread attributes object
+pthread_attr_setstackaddr [] (3)  - get and set the stackaddr attribute
+pthread_attr_setstackaddr [] (3)  - set/get stack address attribute in thread attributes object
+pthread_attr_setstacksize [] (3)  - get and set the stacksize attribute
+pthread_attr_setstacksize [] (3)  - set/get stack size attribute in thread attributes object
+pthread_barrier_destroy [] (3)  - destroy and initialize a barrier object (ADVANCED REALTIME THREADS)
+pthread_barrier_init [] (3)  - destroy and initialize a barrier object (ADVANCED REALTIME THREADS)
+pthread_barrier_wait [] (3)  - synchronize at a barrier (ADVANCED REALTIME THREADS)
+pthread_barrierattr_destroy [] (3)  - destroy and initialize the barrier attributes object (ADVANCED REALTIME THREADS)
+pthread_barrierattr_getpshared [] (3)  - get and set the process - shared attribute of the barrier attributes object (ADVANCED REALTIME THREADS)
+pthread_barrierattr_init [] (3)  - destroy and initialize the barrier attributes object (ADVANCED REALTIME THREADS)
+pthread_barrierattr_setpshared [] (3)  - get and set the process - shared attribute of the barrier attributes object (ADVANCED REALTIME THREADS)
+pthread_cancel []    (3)  - cancel execution of a thread
+pthread_cancel []    (3)  - send a cancellation request to a thread
+pthread_cleanup_pop [] (3)  - establish cancellation handlers
+pthread_cleanup_pop [] (3)  - push and pop thread cancellation clean - up handlers
+pthread_cleanup_pop_restore_np [] (3)  - push and pop thread cancellation clean - up handlers while saving cancelability type
+pthread_cleanup_push [] (3)  - establish cancellation handlers
+pthread_cleanup_push [] (3)  - push and pop thread cancellation clean - up handlers
+pthread_cleanup_push_defer_np [] (3)  - push and pop thread cancellation clean - up handlers while saving cancelability type
+pthread_cond_broadcast [] (3)  - broadcast or signal a condition
+pthread_cond_destroy [] (3)  - destroy and initialize condition variables
+pthread_cond_init [] (3)  - destroy and initialize condition variables
+pthread_cond_signal [] (3)  - broadcast or signal a condition
+pthread_cond_timedwait [] (3)  - wait on a condition
+pthread_cond_wait [] (3)  - wait on a condition
+pthread_condattr_destroy [] (3)  - destroy and initialize the condition variable attributes object
+pthread_condattr_getclock [] (3)  - get and set the clock selection condition variable attribute (ADVANCED REALTIME)
+pthread_condattr_getpshared [] (3)  - get and set the process - shared condition variable attributes
+pthread_condattr_init [] (3)  - destroy and initialize the condition variable attributes object
+pthread_condattr_setclock [] (3)  - get and set the clock selection condition variable attribute (ADVANCED REALTIME)
+pthread_condattr_setpshared [] (3)  - get and set the process - shared condition variable attributes
+pthread_create []    (3)  - create a new thread
+pthread_create []    (3)  - thread creation
+pthread_detach []    (3)  - detach a thread
+pthread_equal []     (3)  - compare thread IDs
+pthread_exit []      (3)  - terminate calling thread
+pthread_exit []      (3)  - thread termination
+pthread_getaffinity_np [] (3)  - set/get CPU affinity of a thread
+pthread_getattr_np [] (3)  - get attributes of created thread
+pthread_getconcurrency [] (3)  - get and set the level of concurrency
+pthread_getcpuclockid [] (3)  - access a thread CPU-time clock (ADVANCED REALTIME THREADS)
+pthread_getcpuclockid [] (3)  - retrieve ID of a thread's CPU time clock
+pthread_getschedparam [] (3)  - dynamic thread scheduling parameters access (REALTIME THREADS)
+pthread_getspecific [] (3)  - thread-specific data management
+pthread_join []      (3)  - join with a terminated thread
+pthread_join []      (3)  - wait for thread termination
+pthread_key_create [] (3)  - thread-specific data key creation
+pthread_key_delete [] (3)  - thread-specific data key deletion
+pthread_kill []      (3)  - send a signal to a thread
+pthread_kill_other_threads_np [] (3)  - terminate all other threads in process
+pthread_mutex_destroy [] (3)  - destroy and initialize a mutex
+pthread_mutex_getprioceiling [] (3)  - get and set the priority ceiling of a mutex (REALTIME THREADS)
+pthread_mutex_init [] (3)  - destroy and initialize a mutex
+pthread_mutex_lock [] (3)  - lock and unlock a mutex
+pthread_mutex_setprioceiling [] (3)  - get and set the priority ceiling of a mutex (REALTIME THREADS)
+pthread_mutex_timedlock [] (3)  - lock a mutex (ADVANCED REALTIME)
+pthread_mutex_trylock [] (3)  - lock and unlock a mutex
+pthread_mutex_unlock [] (3)  - lock and unlock a mutex
+pthread_mutexattr_destroy [] (3)  - destroy and initialize the mutex attributes object
+pthread_mutexattr_getprioceiling [] (3)  - get and set the prioceiling attribute of the mutex attributes object (REALTIME THREADS)
+pthread_mutexattr_getprotocol [] (3)  - get and set the protocol attribute of the mutex attributes object (REALTIME THREADS)
+pthread_mutexattr_getpshared [] (3)  - get and set the process - shared attribute
+pthread_mutexattr_gettype [] (3)  - get and set the mutex type attribute
+pthread_mutexattr_init [] (3)  - destroy and initialize the mutex attributes object
+pthread_mutexattr_setprioceiling [] (3)  - get and set the prioceiling attribute of the mutex attributes object (REALTIME THREADS)
+pthread_mutexattr_setprotocol [] (3)  - get and set the protocol attribute of the mutex attributes object (REALTIME THREADS)
+pthread_mutexattr_setpshared [] (3)  - get and set the process - shared attribute
+pthread_mutexattr_settype [] (3)  - get and set the mutex type attribute
+pthread_once []      (3)  - dynamic package initialization
+pthread_rwlock_destroy [] (3)  - destroy and initialize a read - write lock object
+pthread_rwlock_init [] (3)  - destroy and initialize a read - write lock object
+pthread_rwlock_rdlock [] (3)  - lock a read-write lock object for reading
+pthread_rwlock_timedrdlock [] (3)  - lock a read-write lock for reading
+pthread_rwlock_timedwrlock [] (3)  - lock a read-write lock for writing
+pthread_rwlock_tryrdlock [] (3)  - lock a read-write lock object for reading
+pthread_rwlock_trywrlock [] (3)  - lock a read-write lock object for writing
+pthread_rwlock_unlock [] (3)  - unlock a read-write lock object
+pthread_rwlock_wrlock [] (3)  - lock a read-write lock object for writing
+pthread_rwlockattr_destroy [] (3)  - destroy and initialize the read - write lock attributes object
+pthread_rwlockattr_getpshared [] (3)  - get and set the process - shared attribute of the read - write lock attributes object
+pthread_rwlockattr_init [] (3)  - destroy and initialize the read - write lock attributes object
+pthread_rwlockattr_setpshared [] (3)  - get and set the process - shared attribute of the read - write lock attributes object
+pthread_self []      (3)  - compare thread IDs
+pthread_self []      (3)  - get the calling thread ID
+pthread_self []      (3)  - obtain ID of the calling thread
+pthread_setaffinity_np [] (3)  - set/get CPU affinity of a thread
+pthread_setcancelstate [] (3)  - set cancelability state
+pthread_setcancelstate [] (3)  - set cancelability state and type
+pthread_setcanceltype [] (3)  - set cancelability state
+pthread_setcanceltype [] (3)  - set cancelability state and type
+pthread_setconcurrency [] (3)  - get and set the level of concurrency
+pthread_setschedparam [] (3)  - dynamic thread scheduling parameters access (REALTIME THREADS)
+pthread_setschedparam [] (3)  - set/get scheduling policy and parameters of a thread
+pthread_setschedprio [] (3)  - dynamic thread scheduling parameters access (REALTIME THREADS)
+pthread_setschedprio [] (3)  - set scheduling priority of a thread
+pthread_setspecific [] (3)  - thread-specific data management
+pthread_sigmask []   (3)  - examine and change mask of blocked signals
+pthread_spin_destroy [] (3)  - destroy or initialize a spin lock object (ADVANCED REALTIME THREADS)
+pthread_spin_init [] (3)  - destroy or initialize a spin lock object (ADVANCED REALTIME THREADS)
+pthread_spin_lock [] (3)  - lock a spin lock object (ADVANCED REALTIME THREADS)
+pthread_spin_trylock [] (3)  - lock a spin lock object (ADVANCED REALTIME THREADS)
+pthread_spin_unlock [] (3)  - unlock a spin lock object (ADVANCED REALTIME THREADS)
+pthread_testcancel [] (3)  - request delivery of any pending cancellation request
+pthread_testcancel [] (3)  - set cancelability state
+pthread_timedjoin_np [] (3)  - try to join with a terminated thread
+pthread_tryjoin_np [] (3)  - try to join with a terminated thread
+pthreads []          (7)  - POSIX threads
+ptmx and pts []      (4)  - pseudo-terminal master and slave
+ptrace []            (2)  - process trace
+ptsname []           (3)  - get the name of the slave pseudo-terminal
+ptsname_r []         (3)  - get the name of the slave pseudo-terminal
+ptx []               (1)  - produce a permuted index of file contents
+pty []               (7)  - pseudo-terminal interfaces
+pulsar []            (6)  - intersecting planes, alpha blending, fog, and textures
+punycode_decode []   (3)  - decode Punycode to Unicode
+punycode_encode []   (3)  - encode Unicode to Punycode
+punycode_strerror [] (3)  - return string describing punycode error code
+pushd []             (1)  - bash built-in commands, see bash(1)
+putc []              (3)  - output of characters and strings
+putc_unlocked []     (3)  - non-locking stdio functions
+putchar []           (3)  - output of characters and strings
+putchar_unlocked []  (3)  - non-locking stdio functions
+putenv []            (3)  - change or add an environment variable
+putgrent []          (3)  - write a group database entry to a file
+putp []              (3)  - curses interfaces to terminfo database
+putpmsg []           (2)  - unimplemented system calls
+putpwent []          (3)  - write a password file entry
+puts []              (3)  - output of characters and strings
+puts []              (n)  - Write to a channel
+putspent []          (3)  - get shadow password file entry
+pututline []         (3)  - access utmp file entries
+putw []              (3)  - input and output of words (ints)
+putwc []             (3)  - write a wide character to a FILE stream
+putwchar []          (3)  - write a wide character to standard output
+putwin []            (3)  - miscellaneous curses utility routines
+pvchange []          (8)  - change attributes of a physical volume
+pvck []              (8)  - check physical volume metadata
+pvcreate []          (8)  - initialize a disk or partition for use by LVM
+pvdisplay []         (8)  - display attributes of a physical volume
+pvmove []            (8)  - move physical extents
+pvremove []          (8)  - remove a physical volume
+pvresize []          (8)  - resize a disk or partition in use by LVM2
+pvs []               (8)  - report information about physical volumes
+pvscan []            (8)  - scan all disks for physical volumes
+pwauth []            (3)  - administrator defined password authentication routines
+pwauth []            (8)  - administrator defined password authentication
+pwck []              (8)  - verify integrity of password files
+pwconv []            (8)  - convert to and from shadow passwords and groups
+pwd []               (1)  - bash built-in commands, see bash(1)
+pwd []               (1)  - print name of current/working directory
+pwd []               (n)  - Return the absolute path of the current working directory
+pwmconfig []         (8)  - tests the PWM outputs of sensors and configures fancontrol
+pwrite []            (2)  - read from or write to a file descriptor at a given offset
+pwunconv []          (8)  - convert to and from shadow passwords and groups
+pwupdate []          (8)  - updates passwd and shadow NIS map
+pyro []              (6)  - simulate fireworks
+python []            (1)  - an interpreted, interactive, object-oriented programming language
+qcatool []           (1)  - command line tool for the Qt Cryptographic Architecture
+qecvt []             (3)  - convert a floating-point number to a string
+qecvt_r []           (3)  - convert a floating-point number to a string
+qfcvt []             (3)  - convert a floating-point number to a string
+qfcvt_r []           (3)  - convert a floating-point number to a string
+qgcvt []             (3)  - convert a floating-point number to a string
+qiflush []           (3)  - curses input options
+qix []               (6)  - bounce colored lines around a window
+qrttoppm []          (1)  - convert output from the QRT ray tracer into a portable pixmap
+qsort []             (3)  - sorts an array
+qtdoc []             (1)  - Open a Qt help page in Konqueror
+qtoptions []         (7)  - Common commandline options for all applications based on the Qt toolkit
+queens []            (6)  - n queens screensaver
+query_module []      (2)  - query the kernel for various bits pertaining to modules
+quiz []              (6)  - random knowledge tests
+quot []              (8)  - summarize filesystem ownership
+quota []             (1)  - display disk usage and limits
+quotacheck []        (8)  - scan a filesystem for disk usage, create, check and repair quota files
+quotactl []          (2)  - manipulate disk quotas
+quotaoff []          (8)  - turn filesystem quotas on and off
+quotaon []           (8)  - turn filesystem quotas on and off
+quotastats []        (8)  - Program to query quota statistics
+r128 []              (4)  - ATI Rage 128 video driver
+radattr.so []        (8)  - RADIUS utility plugin for
+radeon []            (4)  - ATI RADEON video driver
+radeonhd []          (4)  - AMD GPG (ATI) R5xx/R6xx/R7xx video driver
+radiobutton []       (n)  - Create and manipulate radiobutton widgets
+radius.so []         (8)  - RADIUS authentication plugin for
+rain []              (6)  - animated raindrops display
+raise []             (3)  - send a signal to the caller
+raise []             (n)  - Change a window's position in the stacking order
+ram []               (4)  - ram disk device
+rand []              (1)  - generate pseudo-random bytes
+rand []              (3)  - pseudo-random number generator
+rand_r []            (3)  - pseudo-random number generator
+random []            (3)  - random number generator
+random []            (4)  - kernel random number source devices
+random []            (6)  - random lines from a file or random numbers
+random_r []          (3)  - reentrant random number generator
+ranlib []            (1)  - generate index to archive
+rapper []            (1)  - Raptor RDF parsing and serializing utility
+raptor []            (1)  - config - script to get information about the installed version of Raptor
+rarp []              (8)  - manipulate the system RARP table
+rarpd []             (8)  - answer RARP REQUESTs
+ras2tiff []          (1)  - create a TIFF file from a Sun rasterfile
+rasqal []            (1)  - config - script to get information about the installed version of the RDF query library
+rastertoescpx []     (1)  - enhanced esc/p raster driver for cups
+rastertopclx []      (1)  - enhanced pcl raster driver for cups
+rasttopnm []         (1)  - convert a Sun rasterfile into a portable anymap
+raw []               (3)  - curses input options
+raw []               (7)  - Linux IPv4 raw sockets
+raw []               (8)  - bind a Linux raw character device
+raw2tiff []          (1)  - create a TIFF file from a raw data
+rawmemchr []         (3)  - scan memory for a character
+rawtopgm []          (1)  - convert raw grayscale bytes into a portable graymap
+rawtoppm []          (1)  - convert raw RGB bytes into a portable pixmap
+rb []                (1)  - XMODEM, YMODEM, ZMODEM (Batch) file receive
+rbash []             (1)  - restricted bash, see bash(1)
+rc.inet1 []          (8)  - Slackware network configuration script
+rc.inet1.conf []     (5)  - Slackware network configuration file
+rclock (ouR CLOCK) [] (1)  - clock and appointment reminder for X11
+rcmd []              (3)  - routines for returning a stream to a remote command
+rcp []               (1)  - remote file copy
+rcs []               (1)  - change RCS file attributes
+rcsclean []          (1)  - clean up working files
+rcsdiff []           (1)  - compare RCS revisions
+rcsfile []           (5)  - format of RCS file
+rcsfreeze []         (1)  - freeze a configuration of sources checked in under RCS
+rcsintro []          (1)  - introduction to RCS commands
+rcsmerge []          (1)  - merge RCS revisions
+rd []                (6)  - bomb - reaction/diffusion textures
+rdesktop []          (1)  - Remote Desktop Protocol client
+rdev []              (8)  - query/set image root device, RAM disk size, or video mode
+rdfproc []           (1)  - Redland RDF processor utility
+rdisc []             (8)  - network router discovery daemon
+rdist []             (1)  - remote file distribution client program
+rdistd []            (1)  - remote file distribution server program
+rdjpgcom []          (1)  - display text comments from a JPEG file
+re []                (3)  - Perl pragma to alter regular expression behaviour
+re_comp []           (3)  - BSD regex functions
+re_exec []           (3)  - BSD regex functions
+re_syntax []         (n)  - Syntax of Tcl regular expressions
+read []              (1)  - bash built-in commands, see bash(1)
+read []              (2)  - read from a file descriptor
+read []              (n)  - Read from a channel
+read_all_mibs []     (3)  - mib_api functions
+read_configs []      (3)  - read_config functions
+read_mib []          (3)  - mib_api functions
+read_module []       (3)  - mib_api functions
+read_module_node []  (3)  - mib_api functions
+read_objid []        (3)  - mib_api functions
+read_only []         (3)  - Make your handler read_only automatically The only purpose of this handler is to return an appropriate error for any requests passed to it in a SET mode
+read_premib_configs [] (3)  - read_config functions
+readahead []         (2)  - perform file readahead into page cache
+readcd []            (1)  - read or write data Compact Discs
+readdir []           (2)  - read directory entry
+readdir []           (3)  - read a directory
+readdir_r []         (3)  - read a directory
+readelf []           (1)  - Displays information about ELF files
+readline []          (3)  - get a line from a user with editing
+readlink []          (1)  - display value of a symbolic link
+readlink []          (2)  - read value of a symbolic link
+readlink_by_handle [] (3)  - file handle operations
+readlinkat []        (2)  - read value of a symbolic link relative to a directory file descriptor
+readmsg []           (1)  - extract messages from a mail folder
+readonly []          (1)  - bash built-in commands, see bash(1)
+readprofile []       (1)  - a tool to read kernel profiling information
+readv []             (2)  - read or write data into multiple buffers
+realloc []           (3)  - Allocate and free dynamic memory
+realpath []          (3)  - return the canonicalized absolute pathname
+reboot []            (2)  - reboot or enable/disable Ctrl-Alt-Del
+reboot []            (8)  - stop the system
+recno []             (3)  - record number database access method
+recode []            (1)  - sr-latin - convert Serbian text from Cyrillic to Latin script
+recv []              (2)  - receive a message from a socket
+recvfrom []          (2)  - receive a message from a socket
+recvmsg []           (2)  - receive a message from a socket
+red []               (1)  - text editor
+red []               (8)  - Random Early Detection
+redland []           (1)  - config - script to get information about the installed version of Redland
+redland []           (1)  - db-upgrade - upgrade older Redland databases to 0.9.12 format
+redrawwin []         (3)  - refresh curses windows and lines
+ref []               (1)  - Display a C function header
+refchan []           (n)  - Command handler API of reflected channels, version 1
+refer []             (1)  - preprocess bibliographic references for groff
+refresh []           (3)  - refresh curses windows and lines
+regcomp []           (3)  - POSIX regex functions
+regdbdump []         (8)  - parse and print out regulatory rules file
+regerror []          (3)  - POSIX regex functions
+regex []             (7)  - POSIX.2 regular expressions
+regexec []           (3)  - POSIX regex functions
+regexp []            (n)  - Match a regular expression against a string
+regfree []           (3)  - POSIX regex functions
+register_config_handler [] (3)  - read_config functions
+register_mib_handlers [] (3)  - read_config functions
+register_premib_handler unregister_config_handler [] (3)  - read_config functions
+registry []          (n)  - Manipulate the Windows registry
+regsub []            (n)  - Perform substitutions based on regular expression pattern matching
+regulatory.bin []    (5)  - The Linux wireless regulatory database
+reiserfsck []        (8)  - The checking tool for the ReiserFS filesystem
+reiserfstune []      (8)  - The tunning tool for the ReiserFS filesystem
+remainder []         (3)  - floating - point remainder function
+remainderf []        (3)  - floating - point remainder function
+remainderl []        (3)  - floating - point remainder function
+remap_file_pages []  (2)  - create a non-linear file mapping
+remove []            (3)  - remove a file or directory
+removepkg []         (8)  - remove Slackware packages
+removexattr []       (2)  - remove an extended attribute
+remque []            (3)  - insert/remove an item from a queue
+remquo []            (3)  - remainder and part of quotient
+remquof []           (3)  - remainder and part of quotient
+remquol []           (3)  - remainder and part of quotient
+rename []            (1)  - Rename files
+rename []            (2)  - change the name or location of a file
+rename []            (n)  - Rename or delete a command
+renameat []          (2)  - rename a file relative to directory file descriptors
+rendercheck []       (1)  - simple tests of the X Render extension
+rendition []         (4)  - Rendition video driver
+renice []            (1)  - alter priority of running processes
+replace []           (1)  - a string-replacement utility
+reportview []        (1)  - ask KWeatherService to display a weather report
+repquota []          (8)  - summarize quotas for a filesystem
+req []               (1)  - PKCS#10 certificate request and certificate generating utility
+request_init []      (3)  - access control library
+request_set []       (3)  - access control library
+require'caca' c= Caca::Canvas.new(20 [] (3)  - 1)) && ! e.quit?) p e d.refresh end
+res_init []          (3)  - resolver routines
+res_mkquery []       (3)  - resolver routines
+res_query []         (3)  - resolver routines
+res_querydomain []   (3)  - resolver routines
+res_search []        (3)  - resolver routines
+res_send []          (3)  - resolver routines
+reset []             (1)  - initialize a terminal or query terminfo database
+reset []             (1)  - terminal initialization
+reset_prog_mode []   (3)  - low-level curses routines
+reset_shell_mode []  (3)  - low-level curses routines
+resetty []           (3)  - low-level curses routines
+resize []            (1)  - set TERMCAP and terminal settings to current xterm window size
+resize2fs []         (8)  - ext2/ext3 file system resizer
+resize_reiserfs []   (8)  - resizer tool for the ReiserFS filesystem
+resize_term []       (3)  - change the curses terminal size
+resizecons []        (8)  - change kernel idea of the console size
+resizeterm []        (3)  - change the curses terminal size
+resolv.conf []       (5)  - resolver configuration file
+resolve_stack_dump [] (1)  - resolve numeric stack trace dump to symbols
+resolveip []         (1)  - resolve host name to IP address or vice versa
+restartterm []       (3)  - curses interfaces to terminfo database
+restorefont []       (1)  - save or restore the SVGA font for textmode
+restorepalette []    (1)  - set the color palette for textmode
+restoretextmode []   (1)  - save or restore the SVGA registers for textmode
+return 0; } .fi What does it do? .IP (bu 2 Create a display. Physically [] (3)  - like system using the following comman (requiring pkg-config and gcc):
+return []            (1)  - bash built-in commands, see bash(1)
+return []            (n)  - Return from a procedure, or set return code of a script
+rev []               (1)  - reverse lines of a file or files
+revnetgroup []       (8)  - generate reverse netgroup data
+revpath []           (1)  - generate a relative path that can be used to undo a change-directory
+rewind []            (3)  - reposition a stream
+rewinddir []         (3)  - reset directory stream
+rexec []             (3)  - return stream to a remote command
+rexecd []            (8)  - remote execution server
+rexima []            (1)  - a curses-based (and command-line) mixer
+rfcomm []            (1)  - RFCOMM configuration utility
+rgb2ycbcr []         (1)  - convert non-YCbCr TIFF images to a YCbCr TIFF image
+rgb3toppm []         (1)  - combine three portable graymaps into one portable pixmap
+rgrep []             (1)  - a recursive, highlighting grep program
+richtext []          (1)  - View a richtext document, typically a mail message
+rindex []            (3)  - locate character in string
+rindex []            (3)  - string operations
+rint []              (3)  - round to nearest integer
+rintf []             (3)  - round to nearest integer
+rintl []             (3)  - round to nearest integer
+riocp []             (1)  - program to upload files to the Rio Karma
+ripemd160 []         (1)  - message digests
+ripoffline []        (3)  - low-level curses routines
+ripples []           (6)  - interference patterns
+ripquery []          (8)  - send a RIP request to a remote host
+rksh []              (1)  - KornShell, a
+rksh93 []            (1)  - KornShell, a
+rlatopam []          (1)  - see http://netpbm.sourceforge.net/doc/rlatopam.html
+rletopnm []          (1)  - convert a Utah Raster Tools RLE image file into a PNM image file
+rlog []              (1)  - print log messages and other information about RCS files
+rlogin []            (1)  - remote login
+rlogind []           (8)  - remote login server
+rm []                (1)  - remove files or directories
+rmail []             (8)  - handle remote mail received via uucp
+rmdir []             (1)  - remove empty directories
+rmdir []             (2)  - delete a directory
+rmmod []             (8)  - simple program to remove a module from the Linux Kernel
+rmt []               (8)  - remote magtape protocol module
+rnano []             (1)  - Restricted mode for Nano's ANOther editor, an enhanced free Pico clone
+rndc []              (8)  - confgen - rndc key generation tool
+rndc []              (8)  - name server control utility
+rndc.conf []         (5)  - rndc configuration file
+robots []            (6)  - fight off villainous robots
+rocks []             (6)  - animation of flying through an asteroid field
+roff []              (7)  - concepts and history of roff typesetting
+roff2dvi []          (1)  - transform roff code into dvi mode
+roff2html []         (1)  - transform roff code into html mode
+roff2pdf []          (1)  - transform roff code into pdf mode
+roff2ps []           (1)  - transform roff code into ps mode
+roff2text []         (1)  - transform roff code into text mode
+roff2x []            (1)  - transform roff code into x mode
+roqet []             (1)  - Rasqal RDF query utility
+rorschach []         (6)  - simulate ink-blot patterns
+rot13 []             (6)  - decrypt caesar cyphers
+rotatelogs []        (8)  - Piped logging program to rotate Apache logs
+rotzoomer []         (6)  - animated rotations and scalings of portions of the screen
+round []             (3)  - round to nearest integer, away from zero
+roundf []            (3)  - round to nearest integer, away from zero
+roundl []            (3)  - round to nearest integer, away from zero
+route []             (8)  - show / manipulate the IP routing table
+routed []            (8)  - network routing daemon
+routef []            (8)  - flush routes
+routel []            (8)  - list routes with pretty output format
+row_merge []         (3)  - Calls sub handlers with request for one row at a time
+rpc []               (3)  - library routines for remote procedure calls
+rpc []               (5)  - rpc program number data base
+rpc.mountd []        (8)  - NFS mount daemon
+rpc.nfsd []          (8)  - NFS server process
+rpc.rquotad []       (8)  - remote quota server
+rpc.rusersd []       (8)  - logged in users server
+rpc.rwalld []        (8)  - write messages to users currently logged in server
+rpc.statd []         (8)  - NSM status monitor
+rpc.yppasswdd []     (8)  - NIS password update daemon
+rpc.ypxfrd []        (8)  - NIS map transfer server
+rpcclient []         (1)  - tool for executing client side MS-RPC functions
+rpcdebug []          (8)  - set and clear NFS and RPC kernel debug flags
+rpdump []            (1)  - alpine remote data utility
+rpload []            (1)  - alpine remote data utility
+rpm []               (8)  - RPM Package Manager
+rpm2cpio []          (8)  - Extract cpio archive from RPM Package Manager (RPM) package
+rpmatch []           (3)  - determine if the answer to a question is affirmative or negative
+rpmbuild []          (8)  - Build RPM Package(s)
+rpmdeps []           (8)  - Generate RPM Package Dependencies
+rpmgraph []          (8)  - Display RPM Package Dependency Graph
+rquota []            (3)  - implement quotas on remote machines
+rquotad []           (8)  - remote quota server
+rresvport []         (3)  - routines for returning a stream to a remote command
+rsa []               (1)  - RSA key processing tool
+rsa []               (3)  - RSA public key cryptosystem
+rsautl []            (1)  - RSA utility
+rscsi []             (1)  - remote generic SCSI transport protocol server
+rsh []               (1)  - remote shell
+rsh []               (1)  - shell, the
+rshd []              (8)  - remote shell server
+rstart []            (1)  - a sample implementation of a Remote Start client
+rstartd []           (1)  - a sample implementation of a Remote Start rsh helper
+rsvg []              (1)  - Turn SVG files into raster images
+rsync []             (1)  - a fast, versatile, remote (and local) file - copying tool
+rsyncd.conf []       (5)  - configuration file for rsync in daemon mode
+rt_sigqueueinfo []   (2)  - queue a signal and data to a process
+rtacct []            (8)  - network statistics tools
+rtc []               (4)  - real-time clock
+rtcwake []           (8)  - enter a system sleep state until specified wakeup time
+rtf2rtf []           (1)  - programs to postprocess the raw RTF generated by the mapping files
+rtime []             (3)  - get time from a remote machine
+rtin []              (1)  - A Usenet newsreader
+rtin []              (5)  - related files
+rtld []              (7)  - audit - auditing API for the dynamic linker
+rtmon []             (8)  - listens to and monitors RTnetlink
+rtnetlink []         (3)  - macros to manipulate rtnetlink messages
+rtnetlink []         (7)  - Linux IPv4 routing socket
+rubik []             (6)  - screen saver that solves Rubik's Cube
+ruby []              (1)  - Interpreted object - oriented scripting language
+run []               (1)  - with-aspell - script to help use GNU Aspell as an ispell replacement
+run []               (8)  - parts - run scripts found in a directory
+runcon []            (1)  - run command with specified security context
+rundig []            (1)  - sample script to create a search database for ht://Dig
+runlevel []          (8)  - - find the current and previous system runlevel
+runscript []         (1)  - script interpreter for minicom
+runx []              (1)  - try to overcome problems of Xfree96 restoring textmode using svgalib
+rup []               (1)  - remote status display
+ruptime []           (1)  - show host status of local machines
+ruserok []           (3)  - routines for returning a stream to a remote command
+rusers []            (1)  - who is logged in to machines on local network
+rvnamed []           (8)  - reverse name resolution daemon for
+rwall []             (1)  - send a message to users logged on a host
+rwho []              (1)  - who is logged in on local machines
+rwhod []             (8)  - system status server
+rx []                (1)  - XMODEM, YMODEM, ZMODEM (Batch) file receive
+rxvt (ouR XVT) []    (1)  - a VT102 emulator for the X window system
+rz []                (1)  - XMODEM, YMODEM, ZMODEM (Batch) file receive
+rzip []              (1)  - a large-file compression program
+s3virge []           (4)  - S3 ViRGE video driver
+s_client []          (1)  - SSL/TLS client program
+s_server []          (1)  - SSL/TLS server program
+s_time []            (1)  - SSL/TLS performance timing program
+sa []                (8)  - summarizes accounting information
+sa1 []               (8)  - Collect and store binary data in the system activity daily data file
+sa2 []               (8)  - Write a daily report in the /var/log/sa directory
+sadc []              (8)  - System activity data collector
+sadf []              (1)  - Display data collected by sar in multiple formats
+safe_mysqld []       (1)  - MySQL server startup script
+sail []              (6)  - multi-user wooden ships and iron men
+samba []             (7)  - A Windows SMB/CIFS fileserver for UNIX
+sane []              (1)  - config - get information about the installed version of libsane
+sane []              (1)  - find-scanner - find SCSI and USB scanners and their device files
+sane []              (5)  - abaton - SANE backend for Abaton flatbed scanners
+sane []              (5)  - agfafocus - SANE backend for AGFA Focus flatbed scanners
+sane []              (5)  - apple - SANE backend for Apple flatbed scanners
+sane []              (5)  - artec - SANE backend for Artec flatbed scanners
+sane []              (5)  - artec_eplus48u - SANE backend for the scanner Artec E+ 48U and re-badged models
+sane []              (5)  - as6e - SANE backend for using the Artec AS6E parallel port interface scanner
+sane []              (5)  - avision - SANE backend for original Avision and Avision OEM scanners (HP, Minolta, Mitsubishi, UMAX and possibly more) flatbed and film scanners
+sane []              (5)  - bh - SANE backend for Bell+Howell Copiscan II series document scanners
+sane []              (5)  - canon - SANE backend for Canon SCSI scanners
+sane []              (5)  - canon630u - SANE backend for the Canon 630u USB flatbed scanner
+sane []              (5)  - canon_pp - SANE backend for Canon CanoScan Parallel Port flatbed scanners
+sane []              (5)  - cardscan - SANE backend for Corex CardScan 800c usb scanner
+sane []              (5)  - coolscan - SANE backend for Nikon film-scanners
+sane []              (5)  - coolscan2 - SANE backend for Nikon Coolscan film scanners
+sane []              (5)  - dc210 - SANE backend for Kodak DC210 Digital Camera
+sane []              (5)  - dc240 - SANE backend for Kodak DC240 Digital Camera
+sane []              (5)  - dc25 - SANE backend for Kodak DC20/DC25 Digital Cameras
+sane []              (5)  - dll - SANE dynamic backend loader
+sane []              (5)  - dmc - SANE backend for the Polaroid Digital Microscope Camera
+sane []              (5)  - epjitsu - SANE backend for Epson-based Fujitsu USB scanners
+sane []              (5)  - epson - SANE backend for EPSON scanners
+sane []              (5)  - fujitsu - SANE backend for Fujitsu flatbed and ADF scanners
+sane []              (5)  - genesys - SANE backend for GL646 and GL841 based USB flatbed scanners
+sane []              (5)  - gphoto2 - SANE backend for gphoto2 supported cameras
+sane []              (5)  - gt68xx - SANE backend for GT-68XX based USB flatbed scanners
+sane []              (5)  - hp - SANE backend for HP ScanJet scanners
+sane []              (5)  - hp3500 - SANE backend for Hewlett-Packard ScanJet 3500 series scanners
+sane []              (5)  - hp3900 - SANE backend for RTS8822 chipset based scanners
+sane []              (5)  - hp4200 - SANE backend for Hewlett-Packard 4200 scanners
+sane []              (5)  - hp5400 - SANE backend for Hewlett-Packard 54XX scanners
+sane []              (5)  - hp5590 - SANE backend for Hewlett-Packard 5550/5590/7650 Workgroup/Document scanners
+sane []              (5)  - hpljm1005 - SANE backend for Hewlett-Packard LaserJet M1005 MFP Scanner
+sane []              (5)  - hpsj5s - SANE backend for HP ScanJet 5S sheet-fed scanner
+sane []              (5)  - hs2p - SANE backend for Ricoh SCSI flatbed/ADF scanners
+sane []              (5)  - ibm - SANE backend for IBM and Ricoh SCSI flatbed scanners
+sane []              (5)  - leo - SANE backend for LEO Technologies scanners
+sane []              (5)  - lexmark - SANE backend for Lexmark X1100/X1200 Series scanners
+sane []              (5)  - ma1509 - SANE backend for Mustek BearPaw 1200F USB scanner
+sane []              (5)  - matsushita - SANE backend for Panasonic KV-SS high speed scanners
+sane []              (5)  - microtek - SANE backend for Microtek scanners
+sane []              (5)  - microtek2 - SANE backend for Microtek scanners with SCSI-2 command set
+sane []              (5)  - mustek - SANE backend for Mustek SCSI flatbed scanners (and some other devices)
+sane []              (5)  - mustek_pp - SANE backend for Mustek parallel port flatbed scanners
+sane []              (5)  - mustek_usb - SANE backend for Mustek USB flatbed scanners
+sane []              (5)  - mustek_usb2 - SANE backend for SQ113 based USB flatbed scanners
+sane []              (5)  - nec - SANE backend for NEC scanners
+sane []              (5)  - net - SANE network backend
+sane []              (5)  - niash - SANE backend for scanners based on the NIASH chipset
+sane []              (5)  - pie - SANE backend for PIE, Devcom and AdLib SCSI flatbed scanners
+sane []              (5)  - pint - SANE backend for scanners that use the PINT device driver
+sane []              (5)  - pixma - SANE backend for Canon PIXMA MP series
+sane []              (5)  - plustek - SANE backend for LM983[1/2/3] based USB flatbed scanners
+sane []              (5)  - plustek_pp - SANE backend for Plustek parallel port flatbed scanners
+sane []              (5)  - pnm - SANE PNM image reader pseudo-backend
+sane []              (5)  - qcam - SANE backend for Connectix QuickCam cameras
+sane []              (5)  - ricoh - SANE backend for Ricoh flatbed scanners
+sane []              (5)  - s9036 - SANE backend for Siemens 9036 flatbed scanners
+sane []              (5)  - sceptre - SANE backend for SCEPTRE scanners
+sane []              (5)  - scsi - SCSI adapter tips for scanners
+sane []              (5)  - sharp - SANE backend for SHARP scanners
+sane []              (5)  - sm3600 - SANE backend for Microtek scanners with M011 USB chip
+sane []              (5)  - sm3840 - SANE backend for Microtek scanners with SCAN08 USB chip
+sane []              (5)  - snapscan - SANE backend for AGFA SnapScan flatbed scanners
+sane []              (5)  - sp15c - SANE backend for Fujitsu ScanPartner 15C flatbed scanner
+sane []              (5)  - st400 - SANE backend for Siemens ST/Highscan flatbed scanners
+sane []              (5)  - stv680 - SANE backend for STV680 camera's
+sane []              (5)  - tamarack - SANE backend for Tamarack flatbed scanners
+sane []              (5)  - teco1 - SANE backend for TECO / RELISYS scanners
+sane []              (5)  - teco2 - SANE backend for TECO / RELISYS scanners
+sane []              (5)  - teco3 - SANE backend for TECO / RELISYS scanners
+sane []              (5)  - test - SANE backend for testing frontends
+sane []              (5)  - u12 - SANE backend for Plustek USB flatbed scanners, based on older parport designs
+sane []              (5)  - umax - SANE backend for UMAX scanners
+sane []              (5)  - umax1220u - SANE backend for the UMAX Astra 1220U and similar scanners
+sane []              (5)  - umax_pp - SANE backend for Umax Astra parallel port flatbed scanners
+sane []              (5)  - usb - USB configuration tips for SANE
+sane []              (5)  - v4l - SANE interface for Video for Linux API
+sane []              (7)  - Scanner Access Now Easy: API for accessing scanners
+saned []             (8)  - SANE network daemon
+sar []               (1)  - Collect, report, or save system activity information
+sasl_authorize_t []  (3)  - The SASL authorization callback
+sasl_auxprop []      (3)  - How to work with SASL auxiliary properties
+sasl_auxprop_getctx [] (3)  - Acquire an auxiliary property context
+sasl_auxprop_request [] (3)  - Request Auxiliary Properties from SASL
+sasl_callbacks []    (3)  - How to work with SASL callbacks
+sasl_chalprompt_t [] (3)  - Realm Acquisition Callback
+sasl_checkapop []    (3)  - Check an APOP challenge/response
+sasl_checkpass []    (3)  - Check a plaintext password
+sasl_client_init []  (3)  - SASL client authentication initialization
+sasl_client_new []   (3)  - Create a new client authentication object
+sasl_client_start [] (3)  - Begin an authentication negotiation
+sasl_client_step []  (3)  - Perform a step in the authentication negotiation
+sasl_decode []       (3)  - Decode data received
+sasl_dispose []      (3)  - Dispose of a SASL connection object
+sasl_done []         (3)  - Dispose of a SASL connection object
+sasl_encode []       (3)  - Encode data for transport to authenticated host
+sasl_errdetail []    (3)  - Retrieve detailed information about an error
+sasl_errors []       (3)  - SASL error codes
+sasl_errstring []    (3)  - Translate a SASL return code to a human-readable form
+sasl_getconfpath_t [] (3)  - The SASL callback to indicate location of the config files
+sasl_getopt_t []     (3)  - The SASL get option callback
+sasl_getpath_t []    (3)  - The SASL callback to indicate location of the mechanism drivers
+sasl_getprop []      (3)  - Get a SASL property
+sasl_getrealm_t []   (3)  - Realm Acquisition Callback
+sasl_getsecret_t []  (3)  - The SASL callback for secrets (passwords)
+sasl_getsimple_t []  (3)  - The SASL callback for username/authname/realm
+sasl_idle []         (3)  - Perform precalculations during an idle period
+sasl_listmech []     (3)  - Retrieve a list of the supported SASL mechanisms
+sasl_log_t []        (3)  - The SASL logging callback
+sasl_server_init []  (3)  - SASL server authentication initialization
+sasl_server_new []   (3)  - Create a new server authentication object
+sasl_server_start [] (3)  - Begin an authentication negotiation
+sasl_server_step []  (3)  - Perform a step in the authentication negotiation
+sasl_server_userdb_checkpass_t [] (3)  - Plaintext Password Verification Callback
+sasl_server_userdb_setpass_t [] (3)  - UserDB Plaintext Password Setting Callback
+sasl_setpass []      (3)  - Check a plaintext password
+sasl_setprop []      (3)  - Set a SASL property
+sasl_user_exists []  (3)  - Check if a user exists on server
+sasl_verifyfile_t [] (3)  - The SASL file verification
+saslauthd []         (8)  - sasl authentication server
+sasldblistusers2 []  (8)  - list users in sasldb
+saslpasswd2 []       (8)  - set a user's sasl password
+savage []            (4)  - S3 Savage video driver
+save_d []            (3)  - AA-lib driver used to save ascii-art image into file in used specified format
+savelog []           (8)  - save a log file
+savetextmode []      (1)  - save or restore the complete SVGA status for textmode
+savetty []           (3)  - low-level curses routines
+sb []                (1)  - XMODEM, YMODEM, ZMODEM file send
+sballs []            (6)  - draws balls spinning like crazy in GL
+sbigtopgm []         (1)  - convert an SBIG CCDOPS file into a portable graymap
+sbrk []              (2)  - change data segment size
+sc []                (1)  - spreadsheet calculator
+scalar []            (3)  - Process scalars easily
+scalar_group []      (3)  - Process groups of scalars
+scalb []             (3)  - multiply floating-point number by integral power of radix (OBSOLETE)
+scalbf []            (3)  - multiply floating-point number by integral power of radix (OBSOLETE)
+scalbl []            (3)  - multiply floating-point number by integral power of radix (OBSOLETE)
+scalbln []           (3)  - multiply floating - point number by integral power of radix
+scalblnf []          (3)  - multiply floating - point number by integral power of radix
+scalblnl []          (3)  - multiply floating - point number by integral power of radix
+scalbn []            (3)  - multiply floating - point number by integral power of radix
+scalbnf []           (3)  - multiply floating - point number by integral power of radix
+scalbnl []           (3)  - multiply floating - point number by integral power of radix
+scale []             (n)  - Create and manipulate scale widgets
+scan []              (n)  - Parse string using conversion specifiers in the style of sscanf
+scanadf []           (1)  - acquire multiple images from a scanner equipped with an ADF
+scandir []           (3)  - scan a directory for matching entries
+scanf []             (3)  - input format conversion
+scanimage []         (1)  - scan an image
+scanw []             (3)  - convert formatted input from a curses window
+scdaemon []          (1)  - Smartcard daemon for the GnuPG system
+scgcheck []          (1)  - check and validate the ABI of libscg
+sched_get_priority_max [] (2)  - get static priority range
+sched_get_priority_min [] (2)  - get static priority range
+sched_getaffinity [] (2)  - set and get a process's CPU affinity mask
+sched_getcpu []      (3)  - determine CPU on which the calling thread is running
+sched_getparam []    (2)  - set and get scheduling parameters
+sched_getscheduler [] (2)  - set and get scheduling policy/parameters
+sched_rr_get_interval [] (2)  - get the SCHED_RR interval for the named process
+sched_setaffinity [] (2)  - set and get a process's CPU affinity mask
+sched_setparam []    (2)  - set and get scheduling parameters
+sched_setscheduler [] (2)  - set and get scheduling policy/parameters
+sched_yield []       (2)  - yield the processor
+scim []              (1)  - make-table - generate data file for SCIM generic table module
+scp []               (1)  - secure copy (remote file copy program)
+scr_dump []          (3)  - read (write) a curses screen from (to) a file
+scr_init []          (3)  - read (write) a curses screen from (to) a file
+scr_restore []       (3)  - read (write) a curses screen from (to) a file
+scr_set []           (3)  - read (write) a curses screen from (to) a file
+screen []            (1)  - screen manager with VT100/ANSI terminal emulation
+script []            (1)  - make typescript of terminal session
+scriptreplay []      (1)  - play back typescripts, using timing information
+scrl []              (3)  - scroll a curses window
+scroll []            (3)  - scroll a curses window
+scrollbar []         (n)  - Create and manipulate scrollbar widgets
+scrollok []          (3)  - curses output options
+scrolltest []        (6)  - tests some scrolling algorithms with svgalib
+scsi_id []           (8)  - retrieve and generate a unique SCSI identifier
+scsitape []          (1)  - control SCSI tape devices
+sd []                (4)  - Driver for SCSI Disk Drives
+sdiff []             (1)  - side-by-side merge of file differences
+sdparm []            (8)  - fetch and potentially change SCSI device attributes. Send commands
+sdptool []           (1)  - control and interrogate SDP servers
+seamonkey []         (1)  - an internet application suite (browser, mail, etc.)
+securetty []         (5)  - file which lists ttys from which root can log in
+security []          (2)  - unimplemented system calls
+sed []               (1)  - stream editor for filtering and transforming text
+seed48 []            (3)  - generate uniformly distributed pseudo-random numbers
+seed48_r []          (3)  - generate uniformly distributed pseudo-random numbers reentrantly
+seek []              (n)  - Change the access position for an open channel
+seekdir []           (3)  - set the position of the next readdir() call in the directory stream
+select []            (2)  - synchronous I/O multiplexing
+selection []         (n)  - Manipulate the X selection
+sem_close []         (3)  - close a named semaphore
+sem_destroy []       (3)  - destroy an unnamed semaphore
+sem_getvalue []      (3)  - get the value of a semaphore
+sem_init []          (3)  - initialize an unnamed semaphore
+sem_open []          (3)  - initialize and open a named semaphore
+sem_overview []      (7)  - Overview of POSIX semaphores
+sem_post []          (3)  - unlock a semaphore
+sem_timedwait []     (3)  - lock a semaphore
+sem_trywait []       (3)  - lock a semaphore
+sem_unlink []        (3)  - remove a named semaphore
+sem_wait []          (3)  - lock a semaphore
+semctl []            (2)  - semaphore control operations
+semget []            (2)  - get a semaphore set identifier
+semop []             (2)  - semaphore operations
+semtimedop []        (2)  - semaphore operations
+send []              (2)  - send a message on a socket
+send []              (n)  - Execute a command in a different application
+send_easy_trap []    (3)  - send TRAPs or INFORMs from a Net-SNMP MIB module
+send_trap_vars []    (3)  - send TRAPs or INFORMs from a Net-SNMP MIB module
+send_v2trap []       (3)  - send TRAPs or INFORMs from a Net-SNMP MIB module
+sendfile []          (2)  - transfer data between file descriptors
+sendiso []           (1)  - send IEEE 1394 isochronous packets from dump file
+sendmail []          (8)  - an electronic mail transport agent
+sendmsg []           (2)  - send a message on a socket
+sendto []            (2)  - send a message on a socket
+sensors []           (1)  - print sensors information
+sensors []           (8)  - detect - detect hardware monitoring chips
+sensors.conf []      (5)  - libsensors configuration file
+seq []               (1)  - print a sequence of numbers
+serialize []         (3)  - Calls sub handlers one request at a time
+services []          (5)  - Internet network services list
+sess_id []           (1)  - SSL/TLS session handling utility
+sessreg []           (1)  - manage utmp/wtmp entries for non-init clients
+set []               (1)  - bash built-in commands, see bash(1)
+set []               (n)  - Read and write variables
+set_curterm []       (3)  - curses interfaces to terminfo database
+set_mempolicy []     (2)  - set default NUMA memory policy for a process and its children
+set_term []          (3)  - curses screen initialization and manipulation routines
+set_thread_area []   (2)  - Set a Thread Local Storage (TLS) area
+set_tid_address []   (2)  - set pointer to thread ID
+setaliasent []       (3)  - read an alias entry
+setarch []           (8)  - change reported architecture in new program environment and set personality flags
+setbuf []            (3)  - stream buffering operations
+setbuffer []         (3)  - stream buffering operations
+setcap []            (8)  - set file capabilities
+setcchar []          (3)  - Get a wide character string and rendition from a cchar_t or set a cchar_t from a wide-character string
+setcontext []        (2)  - get or set the user context
+setdomainname []     (2)  - get/set domain name
+setegid []           (2)  - set effective user or group ID
+setenv []            (3)  - change or add an environment variable
+seteuid []           (2)  - set effective user or group ID
+setfacl []           (1)  - set file access control lists
+setfattr []          (1)  - set extended attributes of filesystem objects
+setfdprm []          (1)  - sets user-provided floppy disk parameters
+setfont []           (8)  - load EGA/VGA console screen font
+setfsent []          (3)  - handle fstab entries
+setfsgid []          (2)  - set group identity used for file system checks
+setfsuid []          (2)  - set user identity used for file system checks
+setgid []            (2)  - set group identity
+setgrent []          (3)  - get group file entry
+setgroups []         (2)  - get/set list of supplementary group IDs
+sethostent []        (3)  - get network host entry
+sethostid []         (3)  - get or set the unique identifier of the current host
+sethostname []       (2)  - get/set hostname
+seticons []          (1)  - sets the icon images used in Window Maker
+setitimer []         (2)  - get or set value of an interval timer
+setjmp []            (3)  - save stack context for non-local goto
+setkey []            (3)  - encrypt 64-bit messages
+setkey_r []          (3)  - encrypt 64-bit messages
+setkeycodes []       (8)  - load kernel scancode-to-keycode mapping table entries
+setleds []           (1)  - set the keyboard leds
+setlinebuf []        (3)  - stream buffering operations
+setlocale []         (3)  - set the current locale
+setlogmask []        (3)  - set log priority mask
+setmclk []           (1)  - adjust the memory timing of certain Cirrus cards
+setmetamode []       (1)  - define the keyboard meta key handling
+setmntent []         (3)  - get file system descriptor file entry
+setnetent []         (3)  - get network entry
+setnetgrent []       (3)  - handle network group entries
+setpci []            (8)  - configure PCI devices
+setpgid []           (2)  - set/get process group
+setpgrp []           (2)  - set/get process group
+setpriority []       (2)  - get/set program scheduling priority
+setprotoent []       (3)  - get protocol entry
+setpwent []          (3)  - get password file entry
+setquota []          (8)  - set disk quotas
+setregid []          (2)  - set real and/or effective user or group ID
+setresgid []         (2)  - set real, effective and saved user or group ID
+setresuid []         (2)  - set real, effective and saved user or group ID
+setreuid []          (2)  - set real and/or effective user or group ID
+setrlimit []         (2)  - get/set resource limits
+setrpcent []         (3)  - get RPC entry
+setscrreg []         (3)  - curses output options
+setserial []         (8)  - get/set Linux serial port information
+setservent []        (3)  - get service entry
+setsid []            (1)  - run a program in a new session
+setsid []            (2)  - creates a session and sets the process group ID
+setsockopt []        (2)  - get and set options on sockets
+setspent []          (3)  - get shadow password file entry
+setstate []          (3)  - random number generator
+setstate_r []        (3)  - reentrant random number generator
+setstyle []          (1)  - set style related options for Window Maker or loads a theme
+setsyx []            (3)  - low-level curses routines
+setterm []           (1)  - set terminal attributes
+setterm []           (3)  - curses interfaces to terminfo database
+settimeofday []      (2)  - get / set time
+setttyent []         (3)  - get ttys file entry
+setuid []            (2)  - set user identity
+setup []             (2)  - setup devices and file systems, mount root file system
+setupterm []         (3)  - curses interfaces to terminfo database
+setusershell []      (3)  - get permitted user shells
+setutent []          (3)  - access utmp file entries
+setvbuf []           (3)  - stream buffering operations
+setxattr []          (2)  - set an extended attribute value
+setxkbmap []         (1)  - set the keyboard using the X Keyboard Extension
+sfdisk []            (8)  - Partition table manipulator for Linux
+sfq []               (8)  - Stochastic Fairness Queueing
+sftp []              (1)  - secure file transfer program
+sftp []              (8)  - server - SFTP server subsystem
+sg []                (1)  - execute command as different group ID
+sgetmask []          (2)  - manipulation of signal mask (obsolete)
+sgetspent []         (3)  - get shadow password file entry
+sgetspent_r []       (3)  - get shadow password file entry
+sgi2tiff []          (1)  - create a TIFF file from an SGI image file
+sgitopnm []          (1)  - convert a SGI image file to a portable anymap
+sgml2html []         (1)  - create HTML output from a LinuxDoc DTD SGML source file
+sgml2info []         (1)  - create GNU info output from a LinuxDoc DTD SGML source file
+sgml2latex []        (1)  - create LaTeX, DVI, PostScript or PDF output from a LinuxDoc DTD SGML source file
+sgml2lyx []          (1)  - create LyX output from a LinuxDoc DTD SGML source file
+sgml2rtf []          (1)  - create RTF output from a LinuxDoc DTD SGML source file
+sgml2txt []          (1)  - create plain text output from a LinuxDoc DTD SGML source file
+sgmlcheck []         (1)  - check the syntax of an LinuxDoc DTD sgml source file
+sgmldiff []          (1)  - Find differences in the markup of two SGML files
+sgmlpre []           (1)  - handle SGML conditionalization for SGML-tools
+sgmlsasp []          (1)  - translate output of sgmls using ASP replacement files
+sgmlspl []           (1)  - a simple post-processor for nsgmls
+sh []                (1)  - command interpreter (shell)
+sha []               (1)  - message digests
+sha1 []              (1)  - message digests
+sha1sum []           (1)  - compute and check SHA1 message digest
+sha224sum []         (1)  - compute and check SHA224 message digest
+sha256sum []         (1)  - compute and check SHA256 message digest
+sha384sum []         (1)  - compute and check SHA384 message digest
+sha512sum []         (1)  - compute and check SHA512 message digest
+shadebobs []         (6)  - oscillating vapor trails
+shadow []            (3)  - encrypted password file routines
+shadow []            (5)  - encrypted password file
+shadowconfig []      (8)  - toggle shadow passwords on and off
+shar []              (1)  - create shell archives
+shasum []            (1)  - Print or Check SHA Checksums
+shells []            (5)  - pathnames of valid login shells
+shift []             (1)  - bash built-in commands, see bash(1)
+shm_open []          (3)  - Create/open or unlink POSIX shared memory objects
+shm_overview []      (7)  - Overview of POSIX shared memory
+shm_unlink []        (3)  - Create/open or unlink POSIX shared memory objects
+shmat []             (2)  - shared memory operations
+shmctl []            (2)  - shared memory control
+shmdt []             (2)  - shared memory operations
+shmget []            (2)  - allocates a shared memory segment
+shopt []             (1)  - bash built-in commands, see bash(1)
+showaudio []         (1)  - Play an audio email message
+showconsolefont []   (8)  - Show the current EGA/VGA console screen font
+showexternal []      (1)  - Fetch and display the body of a mail message that is included by reference
+showfont []          (1)  - font dumper for X font server
+showkey []           (1)  - examine the codes sent by the keyboard
+showmount []         (8)  - show mount information for an NFS server
+shownonascii []      (1)  - View all or part of a mail message in a non-ASCII font
+showpartial []       (1)  - Fetch and display the body of a mail message that is included by reference
+showpicture []       (1)  - View an image received in the mail
+showrgb []           (1)  - display an rgb color-name database
+shred []             (1)  - overwrite a file to hide its contents, and optionally delete it
+shuf []              (1)  - generate random permutations
+shutdown []          (2)  - shut down part of a full-duplex connection
+shutdown []          (8)  - bring the system down
+shutdown_mib []      (3)  - mib_api functions
+sierpinski []        (6)  - draws Sierpinski triangle fractals
+sierpinski3d []      (6)  - 3D Sierpinski triangle fractal
+sigaction []         (2)  - examine and change a signal action
+sigaddset []         (3)  - POSIX signal set operations
+sigaltstack []       (2)  - set and/or get signal stack context
+sigblock []          (3)  - BSD signal API
+sigdelset []         (3)  - POSIX signal set operations
+sigemptyset []       (3)  - POSIX signal set operations
+sigfillset []        (3)  - POSIX signal set operations
+siggetmask []        (3)  - BSD signal API
+sighold []           (3)  - System V signal API
+sigignore []         (3)  - System V signal API
+siginterrupt []      (3)  - allow signals to interrupt system calls
+sigismember []       (3)  - POSIX signal set operations
+siglongjmp []        (3)  - non-local jump to a saved stack context
+sigmask []           (3)  - BSD signal API
+signal []            (2)  - ANSI C signal handling
+signal []            (7)  - overview of signals
+signalfd []          (2)  - create a file descriptor for accepting signals
+signbit []           (3)  - test sign of a real floating-point number
+signgam []           (3)  - log gamma function
+significand []       (3)  - get mantissa of floating - point number
+significandf []      (3)  - get mantissa of floating - point number
+significandl []      (3)  - get mantissa of floating - point number
+sigpause []          (3)  - atomically release blocked signals and wait for interrupt
+sigpending []        (2)  - examine pending signals
+sigprocmask []       (2)  - examine and change blocked signals
+sigqueue []          (2)  - queue a signal and data to a process
+sigrelse []          (3)  - System V signal API
+sigreturn []         (2)  - return from signal handler and cleanup stack frame
+sigset []            (3)  - System V signal API
+sigsetjmp []         (3)  - save stack context for non-local goto
+sigsetmask []        (3)  - BSD signal API
+sigsuspend []        (2)  - wait for a signal
+sigtimedwait []      (2)  - synchronously wait for queued signals
+sigtrap []           (3)  - Perl pragma to enable simple signal handling
+sigvec []            (3)  - BSD signal API
+sigwait []           (3)  - wait for a signal
+sigwaitinfo []       (2)  - synchronously wait for queued signals
+siliconmotion []     (4)  - Silicon Motion video driver
+sin []               (3)  - sine function
+sincos []            (3)  - calculate sin and cos simultaneously
+sincosf []           (3)  - calculate sin and cos simultaneously
+sincosl []           (3)  - calculate sin and cos simultaneously
+sinf []              (3)  - sine function
+single2bin []        (1)  - Macintosh file format transformer
+sinh []              (3)  - hyperbolic sine function
+sinhf []             (3)  - hyperbolic sine function
+sinhl []             (3)  - hyperbolic sine function
+sinl []              (3)  - sine function
+sirtopnm []          (1)  - convert a Solitaire file into a portable anymap
+sis []               (4)  - SiS and XGI video driver
+sisusb []            (4)  - SiS USB video driver
+size []              (1)  - list section sizes and total size
+sk98lin []           (4)  - Marvell/SysKonnect Gigabit Ethernet driver v6.21
+skill []             (1)  - send a signal or report process status
+skytentacles []      (6)  - 3D tentacles from the sky!
+slabtop []           (1)  - display kernel slab cache information in real time
+slackpkg []          (8)  - Automated tool for managing Slackware Linux packages
+slackpkg.conf []     (5)  - Configuration data for slackpkg
+slang) or even the whole screen (VGA). .IP (bu 2 Get the display's associated canvas. A canvas is the surface where everything happens: writing characters [] (3)  - like system using the following comman (requiring pkg-config and gcc):
+slattach []          (8)  - attach a network interface to a serial line
+sldtoppm []          (1)  - convert an AutoCAD slide file into a portable pixmap
+sleep []             (1)  - delay for a specified amount of time
+sleep []             (3)  - Sleep for the specified number of seconds
+sliceprint []        (1)  - slice documents with long lines
+slidescreen []       (6)  - permute the screen image like an 8-puzzle
+slip []              (6)  - sucks your screen into a jet engine
+slk_attr []          (3)  - curses soft label routines
+slk_attr_off []      (3)  - curses soft label routines
+slk_attr_on []       (3)  - curses soft label routines
+slk_attr_set []      (3)  - curses soft label routines
+slk_attroff []       (3)  - curses soft label routines
+slk_attron []        (3)  - curses soft label routines
+slk_attrset []       (3)  - curses soft label routines
+slk_clear []         (3)  - curses soft label routines
+slk_color []         (3)  - curses soft label routines
+slk_init []          (3)  - curses soft label routines
+slk_label []         (3)  - curses soft label routines
+slk_noutrefresh []   (3)  - curses soft label routines
+slk_refresh []       (3)  - curses soft label routines
+slk_restore []       (3)  - curses soft label routines
+slk_set []           (3)  - curses soft label routines
+slk_touch []         (3)  - curses soft label routines
+slocate []           (1)  - Security Enhanced version of the GNU Locate
+slrn []              (1)  - An easy to use NNTP / spool based newsreader
+slrnpull []          (1)  - Pull a small newsfeed for offline reading
+slsh []              (1)  - Interpreter for S-Lang scripts
+sm []                (8)  - notify - Send out NSM reboot notifications
+smartctl []          (8)  - Control and Monitor Utility for SMART Disks
+smartd []            (8)  - SMART Disk Monitoring Daemon
+smartd.conf []       (5)  - SMART Disk Monitoring Daemon Configuration File
+smb.conf []          (5)  - The configuration file for the Samba suite
+smbcacls []          (1)  - Set or get ACLs on an NT file or directory names
+smbclient []         (1)  - ftp-like client to access SMB/CIFS resources on servers
+smbcontrol []        (1)  - send messages to smbd, nmbd or winbindd processes
+smbcquotas []        (1)  - Set or get QUOTAs of NTFS 5 shares
+smbd []              (8)  - server to provide SMB/CIFS services to clients
+smbget []            (1)  - wget-like utility for download files over SMB
+smbgetrc []          (5)  - configuration file for smbget
+smbpasswd []         (5)  - The Samba encrypted password file
+smbpasswd []         (8)  - change a user's SMB password
+smbspool []          (8)  - send a print file to an SMB printer
+smbstatus []         (1)  - report on current Samba connections
+smbtar []            (1)  - shell script for backing up SMB/CIFS shares directly to UNIX tape drives
+smbtree []           (1)  - A text based smb network browser
+smime []             (1)  - S/MIME utility
+smproxy []           (1)  - Session Manager Proxy
+smrsh []             (8)  - restricted shell for sendmail
+snake []             (6)  - display chase game
+snice []             (1)  - send a signal or report process status
+snmp.conf []         (5)  - configuration files for the Net-SNMP applications
+snmp.conf []         (5)  - snmp configuration file for cups
+snmp_agent_api []    (3)  - embedding an agent into a external application
+snmp_alarm_register [] (3)  - alarm functions
+snmp_alarm_register_hr [] (3)  - alarm functions
+snmp_alarm_unregister [] (3)  - alarm functions
+snmp_api_errstring [] (3)  - send and receive SNMP messages
+snmp_close []        (3)  - send and receive SNMP messages
+snmp_config []       (5)  - handling of Net-SNMP configuration files
+snmp_error []        (3)  - send and receive SNMP messages
+snmp_free_pdu []     (3)  - send and receive SNMP messages
+snmp_open []         (3)  - send and receive SNMP messages
+snmp_perror []       (3)  - send and receive SNMP messages
+snmp_read []         (3)  - send and receive SNMP messages
+snmp_select_info []  (3)  - send and receive SNMP messages
+snmp_send []         (3)  - send and receive SNMP messages
+snmp_sess_async_send [] (3)  - session functions
+snmp_sess_close []   (3)  - session functions
+snmp_sess_error []   (3)  - session functions
+snmp_sess_init []    (3)  - send and receive SNMP messages
+snmp_sess_init []    (3)  - session functions
+snmp_sess_open []    (3)  - session functions
+snmp_sess_perror []  (3)  - send and receive SNMP messages
+snmp_sess_read []    (3)  - session functions
+snmp_sess_select_info [] (3)  - session functions
+snmp_sess_send []    (3)  - session functions
+snmp_sess_session [] (3)  - session functions
+snmp_sess_timeout [] (3)  - session functions
+snmp_set_mib_warnings [] (3)  - mib_api functions
+snmp_set_save_descriptions [] (3)  - mib_api functions
+snmp_timeout []      (3)  - send and receive SNMP messages
+snmpbulkget []       (1)  - communicates with a network entity using SNMP GETBULK requests
+snmpbulkwalk []      (1)  - retrieve a subtree of management values using SNMP GETBULK requests
+snmpcmd []           (1)  - options and behaviour common to most of the Net-SNMP command-line tools
+snmpconf []          (1)  - creates and modifies SNMP configuration files
+snmpd []             (8)  - daemon to respond to SNMP request packets
+snmpd.conf []        (5)  - configuration file for the Net-SNMP SNMP agent
+snmpd.examples []    (5)  - example configuration for the Net-SNMP agent
+snmpd.internal []    (5)  - internal configuration of the Net-SNMP agent
+snmpdelta []         (1)  - Monitor delta differences in SNMP Counter values
+snmpdf []            (1)  - display disk space usage on a network entity via SNMP
+snmpget []           (1)  - communicates with a network entity using SNMP GET requests
+snmpgetnext []       (1)  - communicates with a network entity using SNMP GETNEXT requests
+snmpinform []        (1)  - sends an SNMP notification to a manager
+snmpnetstat []       (1)  - display networking status and configuration information from a network entity via SNMP
+snmpset []           (1)  - communicates with a network entity using SNMP SET requests
+snmpstatus []        (1)  - retrieves a fixed set of management information from a network entity
+snmptable []         (1)  - retrieve an SNMP table and display it in tabular form
+snmptest []          (1)  - communicates with a network entity using SNMP requests
+snmptranslate []     (1)  - translate MIB OID names between numeric and textual forms
+snmptrap []          (1)  - sends an SNMP notification to a manager
+snmptrapd []         (8)  - Receive and log SNMP trap messages
+snmptrapd.conf []    (5)  - configuration file for the Net-SNMP notification receiver
+snmpusm []           (1)  - creates and maintains SNMPv3 users on a network entity
+snmpvacm []          (1)  - creates and maintains SNMPv3 View-based Access Control entries on a network entity
+snmpwalk []          (1)  - retrieve a subtree of management values using SNMP GETNEXT requests
+snownews []          (1)  - console RSS newsreader
+snprint_objid []     (3)  - mib_api functions
+snprint_value []     (3)  - mib_api functions
+snprint_variable []  (3)  - mib_api functions
+snprintf []          (3)  - formatted output conversion
+snscore []           (6)  - display chase game
+sntp []              (1)  - standard SNTP program
+sockaddr_in []       (3)  - load the C socket.h defines and structure manipulators
+sockaddr_un []       (3)  - load the C socket.h defines and structure manipulators
+sockatmark []        (3)  - determine whether socket is at out-of-band mark
+sockdown []          (1)  - shutdown(2) a socket
+socket []            (2)  - create an endpoint for communication
+socket []            (7)  - Linux socket interface
+socket []            (n)  - Open a TCP network connection
+socketcall []        (2)  - socket system calls
+socketpair []        (2)  - create a pair of connected sockets
+socklist []          (8)  - display list of open sockets
+soelim []            (1)  - interpret .so requests in groff input
+sonar []             (6)  - display a sonar scope
+sort []              (1)  - sort lines of text files
+sort []              (3)  - perl pragma to control sort() behaviour
+source []            (1)  - bash built-in commands, see bash(1)
+source []            (n)  - Evaluate a file or resource as a Tcl script
+spctoppm []          (1)  - convert an Atari compressed Spectrum file into a portable pixmap
+speaker []           (1)  - test - command-line speaker test tone generator for ALSA
+speed []             (1)  - test library performance
+speedmine []         (6)  - simulates speeding down a rocky mineshaft, or a funky dancing worm
+speedtest []         (6)  - tests the speed of memory access under svgalib
+spheremonics []      (6)  - 3d spherical harmonic shapes
+spider []            (6)  - play double deck solitaire
+spin []              (6)  - test a 6-dimension mouse or pointer device with svgalib
+spinbox []           (n)  - Create and manipulate spinbox widgets
+spkac []             (1)  - SPKAC printing and generating utility
+splain []            (1)  - produce verbose warning diagnostics
+splain []            (3)  - produce verbose warning diagnostics
+splice []            (2)  - splice data to/from a pipe
+split []             (1)  - split a file into pieces
+split []             (n)  - Split a string into a proper Tcl list
+split2po []          (1)  - Creates a po file from two DocBook XML files
+splitmail []         (1)  - Split a large mail message into MIME-compliant partial messages
+splitvt []           (1)  - run two shells in a split window
+spotlight []         (6)  - move spotlight around desktop
+spottopgm []         (1)  - convert SPOT satellite images to Portable Greymap format
+sprint_realloc_objid [] (3)  - mib_api functions
+sprint_realloc_value [] (3)  - mib_api functions
+sprint_realloc_variable [] (3)  - mib_api functions
+sprintf []           (3)  - formatted output conversion
+sprites []           (3)  - like system using the following comman (requiring pkg-config and gcc):
+sproingies []        (6)  - Q-Bert meets Marble Madness!
+spu_create []        (2)  - create a new spu context
+spu_run []           (2)  - execute an SPU context
+spufs []             (7)  - the SPU file system
+sputoppm []          (1)  - convert an Atari uncompressed Spectrum file into a portable pixmap
+sqlite3 []           (1)  - A command line interface for SQLite version 3
+sqrt []              (3)  - square root function
+sqrtf []             (3)  - square root function
+sqrtl []             (3)  - square root function
+squiral []           (6)  - square spirals screensaver
+srand []             (3)  - pseudo-random number generator
+srand48 []           (3)  - generate uniformly distributed pseudo-random numbers
+srand48_r []         (3)  - generate uniformly distributed pseudo-random numbers reentrantly
+srandom []           (3)  - random number generator
+srandom_r []         (3)  - reentrant random number generator
+srptool []           (1)  - Simple SRP password tool
+ss []                (8)  - another utility to investigate sockets
+sscanf []            (3)  - input format conversion
+ssetmask []          (2)  - manipulation of signal mask (obsolete)
+ssh []               (1)  - OpenSSH SSH client (remote login program)
+ssh []               (1)  - add - adds RSA or DSA identities to the authentication agent
+ssh []               (1)  - agent - authentication agent
+ssh []               (1)  - copy-id - install your public key in a remote machine's authorized_keys
+ssh []               (1)  - keygen - authentication key generation, management and conversion
+ssh []               (1)  - keyscan - gather ssh public keys
+ssh []               (8)  - keysign - ssh helper program for host - based authentication
+ssh_config []        (5)  - OpenSSH SSH client configuration files
+sshd []              (8)  - OpenSSH SSH daemon
+sshd_config []       (5)  - OpenSSH SSH daemon configuration file
+ssignal []           (3)  - software signal facility
+st []                (4)  - SCSI tape device
+stairs []            (6)  - Escher's infinite staircase
+standards []         (7)  - C and UNIX Standards
+standend []          (3)  - curses character and window attribute control routines
+standout []          (3)  - curses character and window attribute control routines
+starfish []          (6)  - radially-symmetric throbbing colormap-hacking graphics demo
+start_color []       (3)  - curses color manipulation routines
+startfluxbox []      (1)  - start a fluxbox session
+startx []            (1)  - initialize an X session
+starwars []          (6)  - draws a perspective text crawl, like at the beginning of the movie
+stash_cache []       (3)  - Automatically caches data for certain handlers
+stat []              (1)  - display file or file system status
+stat []              (2)  - get file status
+states []            (1)  - awk alike text processing tool
+statfs []            (2)  - get file system statistics
+statvfs []           (2)  - get file system statistics
+stdarg []            (3)  - variable argument lists
+stderr []            (3)  - standard I/O streams
+stdin []             (3)  - standard I/O streams
+stdio []             (3)  - standard input/output library functions
+stdout []            (3)  - standard I/O streams
+stime []             (2)  - set time
+stinit []            (8)  - initialize SCSI magnetic tape drives
+stonerview []        (6)  - 3D undulating ribbons of squares
+stpcpy []            (3)  - copy a string returning a pointer to its end
+stpncpy []           (3)  - copy a fixed-size string, returning a pointer to its end
+strace []            (1)  - trace system calls and signals
+strange []           (6)  - draws strange attractors
+strcasecmp []        (3)  - compare two strings ignoring case
+strcasecmp []        (3)  - string operations
+strcasestr []        (3)  - locate a substring
+strcat []            (3)  - concatenate two strings
+strcat []            (3)  - string operations
+strchr []            (3)  - locate character in string
+strchr []            (3)  - string operations
+strchrnul []         (3)  - locate character in string
+strcmp []            (3)  - compare two strings
+strcmp []            (3)  - string operations
+strcoll []           (3)  - compare two strings using the current locale
+strcoll []           (3)  - string operations
+strcpy []            (3)  - copy a string
+strcpy []            (3)  - string operations
+strcspn []           (3)  - search a string for a set of characters
+strcspn []           (3)  - string operations
+strdup []            (3)  - duplicate a string
+strdup []            (3)  - string operations
+strdupa []           (3)  - duplicate a string
+stream []            (1)  - a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats
+strerror []          (3)  - return string describing error number
+strerror_r []        (3)  - return string describing error number
+strfile []           (8)  - create a random access file for storing strings
+strfmon []           (3)  - convert monetary value to a string
+strfry []            (3)  - randomize a string
+strfry []            (3)  - string operations
+strftime []          (3)  - format date and time
+strict []            (3)  - Perl pragma to restrict unsafe constructs
+string []            (n)  - Manipulate strings
+stringprep []        (3)  - prepare internationalized string
+stringprep_4i []     (3)  - prepare internationalized string
+stringprep_4zi []    (3)  - prepare internationalized string
+stringprep_check_version [] (3)  - check for library version
+stringprep_convert [] (3)  - encode string using new character set
+stringprep_locale_charset [] (3)  - return charset used in current locale
+stringprep_locale_to_utf8 [] (3)  - convert locale encoded string to UTF-8
+stringprep_profile [] (3)  - prepare internationalized string
+stringprep_strerror [] (3)  - return string describing stringprep error code
+stringprep_ucs4_nfkc_normalize [] (3)  - normalize Unicode string
+stringprep_ucs4_to_utf8 [] (3)  - convert UCS-4 string to UTF-8
+stringprep_unichar_to_utf8 [] (3)  - convert Unicode code point to UTF-8
+stringprep_utf8_nfkc_normalize [] (3)  - normalize Unicode string
+stringprep_utf8_to_locale [] (3)  - encode UTF-8 string to locale encoding
+stringprep_utf8_to_ucs4 [] (3)  - convert UTF-8 string to UCS-4
+stringprep_utf8_to_unichar [] (3)  - convert UTF-8 to Unicode code point
+strings []           (1)  - find printable strings in a file
+strings []           (1)  - print the strings of printable characters in files
+strings []           (3)  - like system using the following comman (requiring pkg-config and gcc):
+strip []             (1)  - Discard symbols from object files
+strlen []            (3)  - calculate the length of a string
+strlen []            (3)  - string operations
+strncasecmp []       (3)  - compare two strings ignoring case
+strncasecmp []       (3)  - string operations
+strncat []           (3)  - concatenate two strings
+strncat []           (3)  - string operations
+strncmp []           (3)  - compare two strings
+strncmp []           (3)  - string operations
+strncpy []           (3)  - copy a string
+strncpy []           (3)  - string operations
+strndup []           (3)  - duplicate a string
+strndupa []          (3)  - duplicate a string
+strnlen []           (3)  - determine the length of a fixed-size string
+strpbrk []           (3)  - search a string for any of a set of characters
+strpbrk []           (3)  - string operations
+strptime []          (3)  - convert a string representation of time to a time tm structure
+strrchr []           (3)  - locate character in string
+strrchr []           (3)  - string operations
+strsep []            (3)  - extract token from string
+strsep []            (3)  - string operations
+strsignal []         (3)  - return string describing signal
+strspn []            (3)  - search a string for a set of characters
+strspn []            (3)  - string operations
+strstr []            (3)  - locate a substring
+strstr []            (3)  - string operations
+strtod []            (3)  - convert ASCII string to floating-point number
+strtof []            (3)  - convert ASCII string to floating-point number
+strtoimax []         (3)  - convert string to integer
+strtok []            (3)  - extract tokens from strings
+strtok []            (3)  - string operations
+strtok_r []          (3)  - extract tokens from strings
+strtol []            (3)  - convert a string to a long integer
+strtold []           (3)  - convert ASCII string to floating-point number
+strtoll []           (3)  - convert a string to a long integer
+strtoq []            (3)  - convert a string to a long integer
+strtoul []           (3)  - convert a string to an unsigned long integer
+strtoull []          (3)  - convert a string to an unsigned long integer
+strtoumax []         (3)  - convert string to integer
+strtouq []           (3)  - convert a string to an unsigned long integer
+struct berval []     (3)  - LBER types and allocation functions
+struct { magic: uint8_t caca_header[2]; // 'xCAxCA' uint8_t caca_file_type[2]; // 'CV' canvas_header: uint32_t control_size; // Control size (canvas_data [] (3)  - canvas_header) uint32_t data_size; // Data size (EOF - canvas_data)
+struct { magic: uint8_t caca_header[2]; // 'xCAxCA' uint8_t caca_file_type[2]; // 'FT' font_header: uint32_t control_size; // Control size (font_data [] (3)  - font_header) uint32_t data_size; // Data size (EOF - font_data)
+strverscmp []        (3)  - compare two version strings
+strxfrm []           (3)  - string operations
+strxfrm []           (3)  - string transformation
+stty []              (1)  - change and print terminal line settings
+stty []              (2)  - unimplemented system calls
+stunnel []           (8)  - universal SSL tunnel
+su []                (1)  - change user ID or become super-user
+suauth []            (5)  - Detailed su control file
+subpad []            (3)  - create and display curses pads
+subs []              (3)  - Perl pragma to predeclare sub names
+subscriptions.conf [] (5)  - subscriptions file for cups
+subst []             (n)  - Perform backslash, command, and variable substitutions
+substrate []         (6)  - Grow crystal-like lines on a computational substrate
+subwin []            (3)  - create curses windows
+sudo []              (8)  - execute a command as another user
+sudoedit []          (8)  - execute a command as another user
+sudoers []           (5)  - list of which users may execute what
+suexec []            (8)  - Switch user before executing external programs
+suffixes []          (7)  - list of file suffixes
+sulogin []           (8)  - Single-user login
+sum []               (1)  - checksum and count the blocks in a file
+superformat []       (1)  - format floppies
+superquadrics []     (6)  - morphing 3d shapes
+suspend []           (1)  - bash built-in commands, see bash(1)
+svgakeymap []        (1)  - generates keymaps for svgalib
+svgalib []           (7)  - a low level graphics library for linux
+svgalib.chips []     (7)  - Information for Chips and Technologies Users
+svgalib.et4000 []    (7)  - Information for Tseng ET4000 users
+svgalib.faq []       (7)  - frequently asked questions about svgalib
+svgalib.mach32 []    (7)  - Information on the Mach32 chipset driver
+svgalibrc []         (5)  - the svgalib configuration file
+svgtopam []          (1)  - see http://netpbm.sourceforge.net/doc/svgtopam.html
+svidtune []          (6)  - tunes svgalib modes
+svipc []             (7)  - System V interprocess communication mechanisms
+svn []               (1)  - Subversion command line client tool
+svnadmin []          (1)  - Subversion repository administration tool
+svndumpfilter []     (1)  - Filter a subversion repository 'dumpfile'
+svnlook []           (1)  - Subversion repository examination tool
+svnserve []          (8)  - Server for the 'svn' repository access method
+svnserve.conf []     (5)  - Repository configuration file for svnserve
+svnsync []           (1)  - Subversion repository synchronization tool
+svnversion []        (1)  - Produce a compact version number for a working copy
+swab []              (3)  - swap adjacent bytes
+swapcontext []       (3)  - manipulate user context
+swapoff []           (2)  - start/stop swapping to file/device
+swapoff []           (8)  - enable/disable devices and files for paging and swapping
+swapon []            (2)  - start/stop swapping to file/device
+swapon []            (8)  - enable/disable devices and files for paging and swapping
+swappo []            (1)  - swap msgid and msgstr fields in a PO file
+swat []              (8)  - Samba Web Administration Tool
+swirl []             (6)  - draws swirly color-cycling patterns
+switch []            (n)  - Evaluate one of several scripts, depending on a given value
+swprintf []          (3)  - formatted wide - character output conversion
+sx []                (1)  - XMODEM, YMODEM, ZMODEM file send
+sxpm []              (1)  - Show an XPM (X PixMap) file and/or convert XPM 1 or 2 files to XPM 3
+symcryptrun []       (1)  - Call a simple symmetric encryption tool
+symlink []           (2)  - make a new name for a file
+symlink []           (7)  - symbolic link handling
+symlinkat []         (2)  - create a symbolic link relative to a directory file descriptor
+synaptics []         (4)  - Synaptics touchpad input driver
+sync []              (1)  - flush file system buffers
+sync []              (2)  - commit buffer cache to disk
+sync []              (8)  - synchronize data on disk with memory
+sync_file_range []   (2)  - sync a file segment with disk
+synclient []         (1)  - commandline utitlity to query and modify Synaptics driver options
+syncok []            (3)  - create curses windows
+syndaemon []         (1)  - a program that monitors keyboard activity and disables the touchpad when the keyboard is being used
+syscall []           (2)  - indirect system call
+syscalls []          (2)  - Linux system calls
+sysconf []           (3)  - Get configuration information at runtime
+sysctl []            (2)  - read/write system parameters
+sysctl []            (8)  - configure kernel parameters at runtime
+sysctl.conf []       (5)  - sysctl(8) preload/configuration file
+sysfs []             (2)  - get file system type information
+sysinfo []           (2)  - returns information on overall system statistics
+sysklogd []          (8)  - Linux system logging utilities
+syslog []            (2)  - read and/or clear kernel message ring buffer; set console_loglevel
+syslog []            (3)  - send messages to the system logger
+syslog.conf []       (5)  - syslogd(8) configuration file
+system []            (3)  - execute a shell command
+systool []           (1)  - view system device information by bus, class, and topology
+sysv_signal []       (3)  - signal handling with System V semantics
+sz []                (1)  - XMODEM, YMODEM, ZMODEM file send
+table []             (3)  - Helps you implement a table
+table_array []       (3)  - Helps you implement a table when data can be stored locally
+table_data []        (3)  - Helps you implement a table with datamatted storage
+table_dataset []     (3)  - Helps you implement a table with automatted storage
+table_iterator []    (3)  - The table iterator helper is designed to simplify the task of writing a table handler for the net-snmp agent when the data being accessed is not in an oid sorted form and must be accessed externally
+tac []               (1)  - concatenate and print files in reverse
+tail []              (1)  - output the last part of files
+tailf []             (1)  - follow the growth of a log file
+talk []              (1)  - talk to another user
+talkd []             (8)  - remote user communication server
+tan []               (3)  - tangent function
+tanf []              (3)  - tangent function
+tangram []           (6)  - watch the computer solve tangram puzzles
+tanh []              (3)  - hyperbolic tangent function
+tanhf []             (3)  - hyperbolic tangent function
+tanhl []             (3)  - hyperbolic tangent function
+tanl []              (3)  - tangent function
+tapeinfo []          (1)  - report SCSI tape device info
+tar []               (1)  - The GNU version of the tar archiving utility
+tar []               (1)  - manipulate tape archives
+tar []               (5)  - format of tape archive files
+taskset []           (1)  - retrieve or set a process's CPU affinity
+tbf []               (8)  - Token Bucket Filter
+tbl []               (1)  - format tables for troff
+tc []                (8)  - show / manipulate traffic control settings
+tcdrain []           (3)  - get and set terminal attributes, line control, get and set baud rate
+tcflow []            (3)  - get and set terminal attributes, line control, get and set baud rate
+tcflush []           (3)  - get and set terminal attributes, line control, get and set baud rate
+tcgetattr []         (3)  - get and set terminal attributes, line control, get and set baud rate
+tcgetpgrp []         (3)  - get and set terminal foreground process group
+tcgetsid []          (3)  - get session ID
+tcl_endOfWord []     (n)  - standard library of Tcl procedures
+tcl_findLibrary []   (n)  - standard library of Tcl procedures
+tcl_startOfNextWord [] (n)  - standard library of Tcl procedures
+tcl_startOfPreviousWord [] (n)  - standard library of Tcl procedures
+tcl_wordBreakAfter [] (n)  - standard library of Tcl procedures
+tcl_wordBreakBefore [] (n)  - standard library of Tcl procedures
+tclsh []             (1)  - Simple shell containing Tcl interpreter
+tcltest []           (n)  - Test harness support code and utilities
+tclvars []           (n)  - Variables used by Tcl
+tcp []               (7)  - TCP protocol
+tcpd []              (8)  - access control facility for internet services
+tcpdchk []           (8)  - tcp wrapper configuration checker
+tcpdmatch []         (8)  - tcp wrapper oracle
+tcpdump []           (1)  - dump traffic on a network
+tcsendbreak []       (3)  - get and set terminal attributes, line control, get and set baud rate
+tcsetattr []         (3)  - get and set terminal attributes, line control, get and set baud rate
+tcsetpgrp []         (3)  - get and set terminal foreground process group
+tcsh []              (1)  - C shell with file name completion and command line editing
+tdbbackup []         (8)  - tool for backing up and for validating the integrity of samba .tdb files
+tdbdump []           (8)  - tool for printing the contents of a TDB file
+tdbtool []           (8)  - manipulate the contents TDB files
+tdelete []           (3)  - manage a binary tree
+tdestroy []          (3)  - manage a binary tree
+tdfx []              (4)  - 3Dfx video driver
+teachgammon []       (6)  - learn to play backgammon
+teachjove []         (1)  - learn how to use the JOVE editor
+tee []               (1)  - read from standard input and write to standard output and files
+tee []               (2)  - duplicating pipe content
+telinit []           (8)  - process control initialization
+tell []              (n)  - Return current access position for an open channel
+telldir []           (3)  - return current location in directory stream
+telnet []            (1)  - user interface to the TELNET protocol
+telnetd []           (8)  - DARPA telnet protocol server
+tempfile []          (1)  - create a temporary file in a safe manner
+tempnam []           (3)  - create a name for a temporary file
+term []              (5)  - format of compiled term file
+term []              (7)  - conventions for naming terminal types
+term_attrs []        (3)  - curses environment query routines
+termattrs []         (3)  - curses environment query routines
+termcap []           (5)  - terminal capability database
+terminfo []          (5)  - terminal capability data base
+termio []            (7)  - the System V terminal driver interface
+termios []           (3)  - get and set terminal attributes, line control, get and set baud rate
+termname []          (3)  - curses environment query routines
+test []              (1)  - bash built-in commands, see bash(1)
+test []              (1)  - check file types and compare values
+testaccel []         (6)  - test the old style blitter functions and vga_ext_set()
+testgl []            (6)  - test the vgagl library
+testlibraw []        (1)  - run basic functionality tests on libraw1394
+testlinear []        (6)  - test a linear frame buffer
+testparm []          (1)  - check an smb.conf configuration file for internal correctness
+texi2dvi []          (1)  - convert Texinfo documents to DVI
+texi2dvi []          (1)  - convert Texinfo documents to PDF
+texi2dvi4a2ps []     (1)  - Compile Texinfo and LaTeX files to DVI or PDF
+texindex []          (1)  - sort Texinfo index files
+texinfo []           (5)  - software documentation system
+text []              (n)  - Create and manipulate text widgets
+textdomain []        (3)  - set domain for future gettext() calls
+textmode []          (1)  - save or restore the complete SVGA status for textmode
+tfind []             (3)  - manage a binary tree
+tfmtodit []          (1)  - create font files for use with groff -Tdvi
+tftp []              (1)  - IPv4 Trivial File Transfer Protocol client
+tftpd []             (8)  - IPv4 Trivial File Transfer Protocol server
+tgamma []            (3)  - true gamma function
+tgammaf []           (3)  - true gamma function
+tgammal []           (3)  - true gamma function
+tgatoppm []          (1)  - convert TrueVision Targa file into a portable pixmap
+tgetent []           (3)  - direct curses interface to the terminfo capability database
+tgetflag []          (3)  - direct curses interface to the terminfo capability database
+tgetnum []           (3)  - direct curses interface to the terminfo capability database
+tgetstr []           (3)  - direct curses interface to the terminfo capability database
+tgkill []            (2)  - send a signal to a thread
+tgoto []             (3)  - direct curses interface to the terminfo capability database
+the canvas will be automatically freed as well. You can then compile this code on an UNIX [] (3)  - like system using the following comman (requiring pkg-config and gcc):
+the display is either a window or a context in a terminal (ncurses [] (3)  - like system using the following comman (requiring pkg-config and gcc):
+thinkjettopbm []     (1)  - convert HP ThinkJet printer commands file to PBM
+thornbird []         (6)  - Bird in a Thornbush fractal
+threads::shared []   (3)  - Perl extension for sharing data structures between threads
+threed []            (6)  - The svgalib 3d demo
+threedkit []         (7)  - a set of functions for 3D support
+thumbnail []         (1)  - create a TIFF file with thumbnail images
+tic []               (1)  - the terminfo entry-description compiler
+tiff2bw []           (1)  - convert a color TIFF image to greyscale
+tiff2pdf []          (1)  - convert a TIFF image to a PDF document
+tiff2ps []           (1)  - convert a TIFF image to (tm
+tiff2rgba []         (1)  - convert a TIFF image to RGBA color space
+tiffcmp []           (1)  - compare two TIFF files
+tiffcp []            (1)  - copy (and possibly convert) a TIFF file
+tiffdither []        (1)  - convert a greyscale image to bilevel using dithering
+tiffdump []          (1)  - print verbatim information about TIFF files
+tiffgt []            (1)  - display an image stored in a TIFF file (Silicon Graphics version)
+tifficc []           (1)  - little cms ICC profile applier for TIFF
+tiffinfo []          (1)  - print information about TIFF files
+tiffmedian []        (1)  - apply the median cut algorithm to data in a TIFF file
+tiffset []           (1)  - set a field in a TIFF header
+tiffsplit []         (1)  - split a multi-image TIFF into single - image TIFF files
+tiffsv []            (1)  - save an image from the framebuffer in a TIFF file (Silicon Graphics version)
+tifftopnm []         (1)  - convert a TIFF file into a portable anymap
+tigetflag []         (3)  - curses interfaces to terminfo database
+tigetnum []          (3)  - curses interfaces to terminfo database
+tigetstr []          (3)  - curses interfaces to terminfo database
+time []              (1)  - time a simple command or give resource usage
+time []              (2)  - get time in seconds
+time []              (7)  - overview of time and timers
+time []              (n)  - Time the execution of a script
+timed []             (8)  - time server daemon
+timedc []            (8)  - timed control program
+timegm []            (3)  - inverses of gmtime and localtime
+timelimit []         (1)  - spawn a subprocess and if the child does not finish within the time limit either kill it, or exit, leaving the child in the background
+timelocal []         (3)  - inverses of gmtime and localtime
+timelord []          (8)  - Macintosh time server daemon
+timeout []           (1)  - run a command with a time limit
+timeout []           (3)  - curses input options
+timer_create []      (2)  - create a POSIX per-process timer
+timer_delete []      (2)  - delete a POSIX per-process timer
+timer_getoverrun []  (2)  - get overrun count for a POSIX per-process timer
+timer_gettime []     (2)  - arm/disarm and fetch state of POSIX per - process timer
+timer_settime []     (2)  - arm/disarm and fetch state of POSIX per - process timer
+timeradd []          (3)  - timeval operations
+timerclear []        (3)  - timeval operations
+timercmp []          (3)  - timeval operations
+timerfd_create []    (2)  - timers that notify via file descriptors
+timerfd_gettime []   (2)  - timers that notify via file descriptors
+timerfd_settime []   (2)  - timers that notify via file descriptors
+timerisset []        (3)  - timeval operations
+timersub []          (3)  - timeval operations
+times []             (1)  - bash built-in commands, see bash(1)
+times []             (2)  - get process times
+timetunnel []        (6)  - Plasma tunnels fade in and out
+timezone []          (3)  - initialize time conversion information
+tin []               (1)  - A Usenet newsreader
+tin []               (5)  - related files
+tinews.pl []         (1)  - Post and sign an article via NNTP
+tix []               (n)  - Manipulate internal states of the Tix library
+tixBalloon []        (n)  - Create and manipulate tixBalloon widgets
+tixButtonBox []      (n)  - Create and manipulate Tix ButtonBox widgets
+tixCheckList []      (n)  - Create and manipulate tixCheckList widgets
+tixComboBox []       (n)  - Create and manipulate tixComboBox widgets
+tixControl []        (n)  - Create and manipulate tixControl widgets
+tixDestroy []        (n)  - Destroy Tix Objects
+tixDirList []        (n)  - Create and manipulate tixDirList widgets
+tixDirSelectDialog [] (n)  - Create and manipulate directory selection dialogs
+tixDirTree []        (n)  - Create and manipulate tixDirTree widgets
+tixDisplayStyle []   (n)  - Create style object for Tix display items
+tixExFileSelectBox [] (n)  - Create and manipulate tixExFileSelectBox widgets
+tixExFileSelectDialog [] (n)  - Create and manipulate tixExFileSelectDialog widgets
+tixFileEntry []      (n)  - Create and manipulate tixFileEntry widgets
+tixFileSelectBox []  (n)  - Create and manipulate Tix FileSelectBox widgets
+tixFileSelectDialog [] (n)  - Create and manipulate tixFileSelectDialog widgets
+tixForm []           (n)  - Geometry manager based on attachment rules
+tixGetBoolean []     (n)  - Get the boolean value of a string
+tixGetInt []         (n)  - Get the integer value of a string
+tixGrid []           (n)  - Create and manipulate Tix Grid widgets
+tixHList []          (n)  - Create and manipulate Tix Hierarchial List widgets
+tixInputOnly []      (n)  - Create and manipulate TIX InputOnly widgets
+tixLabelEntry []     (n)  - Create and manipulate tixLabelEntry widgets
+tixLabelFrame []     (n)  - Create and manipulate tixLabelFrame widgets
+tixListNoteBook []   (n)  - Create and manipulate tixListNoteBook widgets
+tixMeter []          (n)  - Create and manipulate Tix Meter widgets
+tixMwm []            (n)  - Communicate with the Motif(tm) window manager
+tixNBFrame []        (n)  - Create and manipulate Tix NoteBook Frame widgets
+tixNoteBook []       (n)  - Create and manipulate tixNoteBook widgets
+tixOptionMenu []     (n)  - Create and manipulate tixOptionMenu widgets
+tixPanedWindow []    (n)  - Create and manipulate tixPanedWindow widgets
+tixPopupMenu []      (n)  - Create and manipulate tixPopupMenu widgets
+tixScrolledHList []  (n)  - Create and manipulate Tix ScrolledHList widgets
+tixScrolledListBox [] (n)  - Create and manipulate Tix ScrolledListBox widgets
+tixScrolledText []   (n)  - Create and manipulate Tix ScrolledText widgets
+tixScrolledWindow [] (n)  - Create and manipulate Tix ScrolledWindow widgets
+tixSelect []         (n)  - Create and manipulate tixSelect widgets
+tixStdButtonBox []   (n)  - Create and manipulate Tix StdButtonBox widgets
+tixTList []          (n)  - Create and manipulate Tix Tabular List widgets
+tixTree []           (n)  - Create and manipulate tixTree widgets
+tixUtils []          (n)  - Utility commands in Tix
+tk []                (n)  - Manipulate Tk internal state
+tk_bindForTraversal [] (n)  - Obsolete support for menu bars
+tk_bisque []         (n)  - Modify the Tk color palette
+tk_chooseColor []    (n)  - pops up a dialog box for the user to select a color
+tk_chooseDirectory [] (n)  - pops up a dialog box for the user to select a directory
+tk_dialog []         (n)  - Create modal dialog and wait for response
+tk_focusFollowsMouse [] (n)  - Utility procedures for managing the input focus
+tk_focusNext []      (n)  - Utility procedures for managing the input focus
+tk_focusPrev []      (n)  - Utility procedures for managing the input focus
+tk_getOpenFile []    (n)  - pop up a dialog box for the user to select a file to open or save
+tk_getSaveFile []    (n)  - pop up a dialog box for the user to select a file to open or save
+tk_menuBar []        (n)  - Obsolete support for menu bars
+tk_menuSetFocus []   (n)  - Create and manipulate menu widgets
+tk_messageBox []     (n)  - pops up a message window and waits for user response
+tk_optionMenu []     (n)  - Create an option menubutton and its menu
+tk_popup []          (n)  - Post a popup menu
+tk_setPalette []     (n)  - Modify the Tk color palette
+tk_textCopy []       (n)  - Create and manipulate text widgets
+tk_textCut []        (n)  - Create and manipulate text widgets
+tk_textPaste []      (n)  - Create and manipulate text widgets
+tkerror []           (n)  - Command invoked to process background errors
+tkill []             (2)  - send a signal to a thread
+tkmib []             (1)  - an interactive graphical MIB browser for SNMP
+tknewsbiff []        (1)  - pop up a window when news appears
+tkvars []            (n)  - Variables used or set by Tk
+tkwait []            (n)  - Wait for variable to change or window to be destroyed
+tld_check_4 []       (3)  - verify that characters are permitted
+tld_check_4t []      (3)  - verify that characters are permitted
+tld_check_4tz []     (3)  - verify that characters are permitted
+tld_check_4z []      (3)  - verify that characters are permitted
+tld_check_8z []      (3)  - verify that characters are permitted
+tld_check_lz []      (3)  - verify that characters are permitted
+tld_default_table [] (3)  - get table for a TLD name
+tld_get_4 []         (3)  - extract top level domain part in input Unicode string
+tld_get_4z []        (3)  - extract top level domain part in input Unicode string
+tld_get_table []     (3)  - get table for a TLD name in table
+tld_get_z []         (3)  - extract top level domain part in input string
+tld_strerror []      (3)  - return string describing tld error code
+tload []             (1)  - graphic representation of system load average
+tm []                (n)  - Facilities for locating and loading of Tcl Modules
+tmpfile []           (3)  - create a temporary file
+tmpnam []            (3)  - create a name for a temporary file
+tmpnam_r []          (3)  - create a name for a temporary file
+toascii []           (3)  - convert character to ASCII
+todos []             (1)  - convert UNIX text file format to DOS
+toe []               (1)  - table of (terminfo) entries
+tolower []           (3)  - convert letter to upper or lower case
+top []               (1)  - display Linux tasks
+topblock []          (6)  - a 3D world of falling blocks that build up and up
+toplevel []          (n)  - Create and manipulate toplevel widgets
+touch []             (1)  - change file timestamps
+touchline []         (3)  - curses refresh control routines
+touchwin []          (3)  - curses refresh control routines
+toupper []           (3)  - convert letter to upper or lower case
+towctrans []         (3)  - wide-character transliteration
+towlower []          (3)  - convert a wide character to lowercase
+towupper []          (3)  - convert a wide character to uppercase
+tparm []             (3)  - curses interfaces to terminfo database
+tput []              (1)  - initialize a terminal or query terminfo database
+tputs []             (3)  - curses interfaces to terminfo database
+tputs []             (3)  - direct curses interface to the terminfo capability database
+tr []                (1)  - translate or delete characters
+trace []             (3)  - curses debugging routines
+trace []             (n)  - Monitor variable accesses, command usages and command executions
+tracepath []         (8)  - traces path to a network host discovering MTU along this path
+tracepath6 []        (8)  - traces path to a network host discovering MTU along this path
+traceroute []        (8)  - print the route packets take to network host
+traceroute6 []       (8)  - traces path to a network host
+trampoline []        (3)  - closures as first-class C functions
+transfig []          (1)  - creates a makefile for portable LaTeX figures
+transxx []           (1)  - Create a pseudo translated PO file from a PO template file
+trap []              (1)  - bash built-in commands, see bash(1)
+traptoemail []       (1)  - snmptrapd handler script to convert snmp traps into emails
+tree []              (1)  - list contents of directories in a tree-like format
+trek []              (6)  - trekkie game
+triangle []          (6)  - random mountains using iterative subdivision of triangles
+trident []           (4)  - Trident video driver
+trn []               (1)  - threaded read news program
+troff []             (1)  - the troff processor of the groff text formatting system
+truchet []           (6)  - draws curved or angular Truchet patterns
+true []              (1)  - do nothing, successfully
+trunc []             (3)  - round to integer, towards zero
+truncate []          (1)  - shrink or extend the size of a file to the specified size
+truncate []          (2)  - truncate a file to a specified length
+truncf []            (3)  - round to integer, towards zero
+truncl []            (3)  - round to integer, towards zero
+tryaffix []          (1)  - Interactive spelling checking
+tsearch []           (3)  - manage a binary tree
+tseng []             (4)  - Tseng Labs video driver
+tset []              (1)  - terminal initialization
+tsort []             (1)  - perform topological sort
+ttk::button []       (n)  - Widget that issues a command when pressed
+ttk::checkbutton []  (n)  - On/off widget
+ttk::combobox []     (n)  - text field with popdown selection list
+ttk::entry []        (n)  - Editable text field widget
+ttk::frame []        (n)  - Simple container widget
+ttk::image []        (n)  - Define an element based on an image
+ttk::intro []        (n)  - Introduction to the Tk theme engine
+ttk::label []        (n)  - Display a text string and/or image
+ttk::labelframe []   (n)  - Container widget with optional label
+ttk::menubutton []   (n)  - Widget that pops down a menu when pressed
+ttk::notebook []     (n)  - Multi-paned container widget
+ttk::panedwindow []  (n)  - Multi-pane container window
+ttk::progressbar []  (n)  - Provide progress feedback
+ttk::radiobutton []  (n)  - Mutually exclusive option widget
+ttk::scale []        (n)  - Create and manipulate a scale widget
+ttk::scrollbar []    (n)  - Control the viewport of a scrollable widget
+ttk::separator []    (n)  - Separator bar
+ttk::sizegrip []     (n)  - Bottom-right corner resize widget
+ttk::style []        (n)  - Manipulate style database
+ttk::treeview []     (n)  - hierarchical multicolumn data display widget
+ttk::widget []       (n)  - Standard options and commands supported by Tk themed widgets
+tty []               (1)  - print the file name of the terminal connected to standard input
+tty []               (4)  - controlling terminal
+tty ioctl []         (4)  - ioctls for terminals and serial lines
+ttyS []              (4)  - serial terminal lines
+ttyname []           (3)  - return name of a terminal
+ttyname_r []         (3)  - return name of a terminal
+ttyslot []           (3)  - find the slot of the current user's terminal in some file
+ttytype []           (5)  - terminal device to default terminal type mapping
+tune2fs []           (8)  - adjust tunable filesystem parameters on ext2/ext3 filesystems
+tunelp []            (8)  - set various parameters for the lp device
+tuxcall []           (2)  - unimplemented system calls
+twalk []             (3)  - manage a binary tree
+twang []             (6)  - pluck pieces of the screen
+twm []               (1)  - Tab Window Manager for the X Window System
+type []              (1)  - bash built-in commands, see bash(1)
+typeahead []         (3)  - curses input options
+typeset []           (1)  - bash built-in commands, see bash(1)
+tzfile []            (5)  - timezone information
+tzname []            (3)  - initialize time conversion information
+tzselect []          (8)  - select a timezone
+tzset []             (3)  - initialize time conversion information
+ualarm []            (3)  - schedule signal after given number of microseconds
+ucs2any []           (1)  - generate BDF fonts containing subsets of ISO 10646-1 codepoints
+udev []              (7)  - dynamic device management
+udevadm []           (8)  - udev management tool
+udevd []             (8)  - event managing daemon
+udp []               (7)  - User Datagram Protocol for IPv4
+udplite []           (7)  - Lightweight User Datagram Protocol
+uint16_t blocks; // Number of blocks in the font uint32_t glyphs; // Total number of glyphs in the font uint16_t bpp; // Bits per pixel for glyph data (valid // Values are 1 [] (3)  - 15: unused yet, must be 0
+uint16_t version; // Canvas format version // bit 0: set to 1 if canvas is compatible // with version 1 of the format // bits 1 [] (3)  - 15: unused yet, must be 0
+uint16_t version; // Font format version // bit 0: set to 1 if font is compatible // with version 1 of the format // bits 1 [] (3)  - 15: unused yet, must be 0
+uint32_t frames; // Frame count uint16_t flags; // Feature flags // bits 0 [] (3)  - 15: unused yet, must be 0
+ul []                (1)  - do underlining
+ulckpwdf []          (3)  - get shadow password file entry
+ulimit []            (1)  - bash built-in commands, see bash(1)
+ulimit []            (2)  - unimplemented system calls
+ulimit []            (3)  - get and set user limits
+umask []             (1)  - bash built-in commands, see bash(1)
+umask []             (2)  - set file mode creation mask
+umount []            (2)  - unmount file system
+umount []            (8)  - unmount file systems
+umount.cifs []       (8)  - for normal, non-root users, to unmount their own Common Internet File System (CIFS) mounts
+umount.nfs []        (8)  - unmount a Network File System
+umount.nfs4 []       (8)  - unmount a Network File System
+umount2 []           (2)  - unmount file system
+unalias []           (1)  - bash built-in commands, see bash(1)
+uname []             (1)  - print system information
+uname []             (2)  - get name and information about current kernel
+unbin []             (1)  - Macintosh file format transformer
+unbuffer []          (1)  - unbuffer output
+uncompress []        (1)  - compress and expand data (version 4.1)
+unctrl []            (3)  - miscellaneous curses utility routines
+unexpand []          (1)  - convert spaces to tabs
+unget_wch []         (3)  - get (or push back) a wide character from curses terminal keyboard
+ungetc []            (3)  - input of characters and strings
+ungetch []           (3)  - get (or push back) characters from curses terminal keyboard
+ungetmouse []        (3)  - mouse interface through curses
+ungetwc []           (3)  - push back a wide character onto a FILE stream
+unhex []             (1)  - Macintosh file format transformer
+unicode_start []     (1)  - put keyboard and console in unicode mode
+unicode_stop []      (1)  - revert keyboard and console from unicode mode
+uniconv []           (1)  - convert Netatalk volume encoding
+uniq []              (1)  - report or omit repeated lines
+units []             (7)  - decimal and binary prefixes
+unix []              (7)  - Sockets for local interprocess communication
+unknown []           (n)  - Handle attempts to use non-existent commands
+unlink []            (1)  - call the unlink function to remove the specified file
+unlink []            (2)  - delete a name and possibly the file it refers to
+unlinkat []          (2)  - remove a directory entry relative to a directory file descriptor
+unload []            (n)  - Unload machine code
+unlockpt []          (3)  - unlock a pseudo-terminal master/slave pair
+unset []             (1)  - bash built-in commands, see bash(1)
+unset []             (n)  - Delete variables
+unshar []            (1)  - unpack a shar file
+unshare []           (2)  - disassociate parts of the process execution context
+unsingle []          (1)  - Macintosh file format transformer
+unstr []             (8)  - create a random access file for storing strings
+untouchwin []        (3)  - curses refresh control routines
+unzip []             (1)  - list, test and extract compressed files in a ZIP archive
+unzipsfx []          (1)  - self-extracting stub for prepending to ZIP archives
+update []            (1)  - mime-database - a program to build the Shared MIME-Info database cache
+update []            (n)  - Process pending events and idle callbacks
+updatedb []          (1)  - update the slocate database
+updwtmp []           (3)  - append an entry to the wtmp file
+upgradepkg []        (8)  - upgrade Slackware packages
+uplevel []           (n)  - Execute a script in a different stack frame
+uptime []            (1)  - Tell how long the system has been running
+upvar []             (n)  - Create link to variable in a different stack frame
+urandom []           (4)  - kernel random number source devices
+uri []               (7)  - uniform resource identifier (URI), including a URL or URN
+url []               (7)  - uniform resource identifier (URI), including a URL or URN
+urn []               (7)  - uniform resource identifier (URI), including a URL or URN
+usb_id []            (8)  - udev callout to read information from USB devices
+use_default_colors [] (3)  - use terminal's default colors
+use_env []           (3)  - miscellaneous curses utility routines
+use_extended_names [] (3)  - miscellaneous curses extensions
+use_legacy_coding [] (3)  - use terminal's default colors
+use_screen []        (3)  - curses thread support
+use_window []        (3)  - curses thread support
+uselib []            (2)  - load shared library
+useradd []           (8)  - Create a new user or update default new user information
+userdel []           (8)  - Delete a user account and related files
+usermod []           (8)  - Modify a user account
+users []             (1)  - print the user names of users currently logged in to the current host
+usleep []            (1)  - sleep some number of microseconds
+usleep []            (3)  - suspend execution for microsecond intervals
+ustat []             (2)  - get file system statistics
+utf8 []              (3)  - Perl pragma to enable/disable UTF-8 (or UTF-EBCDIC) in source code
+utility_handlers []  (3)  - Simplify request processing A group of handlers intended to simplify certain aspects of processing a request for a MIB object
+utime []             (2)  - change file last access and modification times
+utimensat []         (2)  - change file timestamps with nanosecond precision
+utimes []            (2)  - change file last access and modification times
+utmp []              (5)  - login records
+utmpname []          (3)  - access utmp file entries
+uucico []            (8)  - UUCP file transfer daemon
+uucp []              (1)  - Unix to Unix copy
+uudecode []          (1)  - encode a binary file, or decode its representation
+uudepipe []          (1)  - uudecode a file
+uuencode []          (1)  - encode a binary file, or decode its representation
+uuencode []          (5)  - format of an encoded uuencode file
+uuenpipe []          (1)  - uuencode a file
+uuid []              (3)  - DCE compatible Universally Unique Identifier library
+uuid_clear []        (3)  - reset value of UUID variable to the NULL value
+uuid_compare []      (3)  - compare whether two UUIDs are the same
+uuid_copy []         (3)  - copy a UUID value
+uuid_generate []     (3)  - create a new unique UUID value
+uuid_generate_random [] (3)  - create a new unique UUID value
+uuid_generate_time [] (3)  - create a new unique UUID value
+uuid_is_null []      (3)  - compare the value of the UUID to the NULL value
+uuid_parse []        (3)  - convert an input UUID string into binary representation
+uuid_time []         (3)  - extract the time at which the UUID was created
+uuid_unparse []      (3)  - convert an UUID from binary representation to a string
+uuidgen []           (1)  - command-line utility to create a new UUID value
+uustat []            (1)  - UUCP status inquiry and control
+uux []               (1)  - Remote command execution over UUCP
+uuxqt []             (8)  - UUCP execution daemon
+uxterm []            (1)  - X terminal emulator for Unicode (UTF-8) environments
+v4l []               (4)  - video4linux driver
+va_arg []            (3)  - variable argument lists
+va_copy []           (3)  - variable argument lists
+va_end []            (3)  - variable argument lists
+va_start []          (3)  - variable argument lists
+vacall []            (3)  - C functions called with variable arguments
+vacation []          (1)  - E-mail auto-responder
+valloc []            (3)  - Allocate aligned memory
+variable []          (n)  - create and initialize a namespace variable
+variables []         (5)  - Format of specifying variable names to SNMP tools
+vars []              (3)  - Perl pragma to predeclare global variable names (obsolete)
+vasprintf []         (3)  - print to allocated string
+vbetool []           (1)  - run real-mode video BIOS code to alter hardware state
+vconfig []           (8)  - VLAN (802.1q) configuration program
+vcs []               (4)  - virtual console memory
+vcsa []              (4)  - virtual console memory
+vcut []              (1)  - cuts Ogg Vorbis files
+vdir []              (1)  - list directory contents
+vdprintf []          (3)  - print to a file descriptor
+verify []            (1)  - Utility to verify certificates
+vermiculate []       (6)  - to move in a worm-like manner
+verr []              (3)  - formatted error messages
+verrx []             (3)  - formatted error messages
+version []           (1)  - print OpenSSL version information
+version []           (3)  - Perl extension for Version Objects
+versionsort []       (3)  - scan a directory for matching entries
+vesa []              (4)  - Generic VESA video driver
+vfork []             (2)  - create a child process and block parent
+vfprintf []          (3)  - formatted output conversion
+vfs_audit []         (8)  - record selected Samba VFS operations in the system log
+vfs_cacheprime []    (8)  - prime the kernel file data cache
+vfs_cap []           (8)  - CAP encode filenames
+vfs_catia []         (8)  - translate illegal characters in Catia filenames
+vfs_commit []        (8)  - flush dirty data at specified intervals
+vfs_default_quota [] (8)  - store default quota records for Windows clients
+vfs_extd_audit []    (8)  - record selected Samba VFS operations
+vfs_fake_perms []    (8)  - enable read only Roaming Profiles
+vfs_fileid []        (8)  - Generates file_id structs with unique device id values for cluster setups
+vfs_full_audit []    (8)  - record Samba VFS operations in the system log
+vfs_gpfs []          (8)  - gpfs specific samba extensions like acls and prealloc
+vfs_netatalk []      (8)  - hide .AppleDouble files from CIFS clients
+vfs_notify_fam []    (8)  - FAM support for file change notifications
+vfs_prealloc []      (8)  - preallocate matching files to a predetermined size
+vfs_readahead []     (8)  - pre-load the kernel buffer cache
+vfs_readonly []      (8)  - make a Samba share read only for a specified time period
+vfs_recycle []       (8)  - Samba VFS recycle bin
+vfs_shadow_copy []   (8)  - Make a Samba share read only for a specified time period
+vfs_shadow_copy2 []  (8)  - Expose snapshots to Windows clients as shadow copies
+vfs_smb_traffic_analyzer [] (8)  - log Samba VFS read and write operations through a socket to a helper application
+vfs_streams_depot [] (8)  - EXPERIMENTAL module to store alternate data streams in a central directory
+vfs_streams_xattr [] (8)  - Store alternate data streams in posix xattrs
+vfs_xattr_tdb []     (8)  - Save Extended Attributes (EAs) in a tdb file
+vfscanf []           (3)  - input format conversion
+vfstest []           (1)  - tool for testing samba VFS modules
+vfwprintf []         (3)  - formatted wide - character output conversion
+vga_accel []         (3)  - calls the graphics accelerator
+vga_addmode []       (3)  - add a mode to svgalib modes list
+vga_addtiming []     (3)  - add a timing line to svgalib user timing list
+vga_bitblt []        (3)  - copy pixmap on screen using an accelerator
+vga_blitwait []      (3)  - wait for any accelerator operation to finish
+vga_changetiming []  (3)  - change the current timing parameters
+vga_claimvideomemory [] (3)  - declare the amount of video memory used
+vga_clear []         (3)  - clear the screen
+vga_copytoplanar16 [] (3)  - copy linear pixmap into VGA 16 color mode video memory
+vga_copytoplanar256 [] (3)  - copy linear pixmap into Mode X video memory
+vga_copytoplane []   (3)  - copy linear pixmap to some planes of VGA 16 color mode video memory
+vga_disabledriverreport [] (3)  - makes svgalib not emit any startup messages
+vga_drawline []      (3)  - draw a line on the screen
+vga_drawpixel []     (3)  - draw a pixel on the screen
+vga_drawscanline []  (3)  - draw a horizontal line of pixels
+vga_drawscansegment [] (3)  - draw a horizontal line of pixels
+vga_dumpregs []      (3)  - dump the contents of the SVGA registers
+vga_ext_set []       (3)  - set and query several extended features
+vga_fillblt []       (3)  - file rectangular area in video memory with a single color
+vga_flip []          (3)  - toggle between text and graphics mode
+vga_getcardinfo []   (3)  - returns pointer to information about the video card
+vga_getch []         (3)  - wait for a key
+vga_getcolors []     (3)  - return the current screen resolution
+vga_getcurrentchipset [] (3)  - returns the current SVGA chipset
+vga_getcurrentmode [] (3)  - returns the current video mode
+vga_getcurrenttiming [] (3)  - get the current timing parameters
+vga_getdefaultmode [] (3)  - returns the default graphics mode number
+vga_getgraphmem []   (3)  - returns the address of the VGA memory
+vga_getkey []        (3)  - read a character from the keyboard without waiting
+vga_getmodeinfo []   (3)  - returns pointer to mode information structure for a mode
+vga_getmodename []   (3)  - return a name for the given video mode
+vga_getmodenumber [] (3)  - return a number for the given video mode
+vga_getmonitortype [] (3)  - returns the monitor type configured
+vga_getmousetype []  (3)  - returns the mouse type configured
+vga_getpalette []    (3)  - get a color in the color lookup table
+vga_getpalvec []     (3)  - gets colors from the color lookup table
+vga_getpixel []      (3)  - get a pixels value from the screen
+vga_getscansegment [] (3)  - get a list of consecutive pixel values
+vga_gettextfont []   (3)  - get/set the font used in text mode
+vga_gettextmoderegs [] (3)  - get/set the vga state used in text mode
+vga_getxdim []       (3)  - return the current screen resolution
+vga_getydim []       (3)  - return the current screen resolution
+vga_guesstiming []   (3)  - calculate a timing line for the given resolution
+vga_hasmode []       (3)  - returns if a video mode is supported
+vga_hlinelistblt []  (3)  - draw horizontal scan lines
+vga_imageblt []      (3)  - copy a rectangular pixmap from system memory to video memory
+vga_init []          (3)  - initialize svgalib library
+vga_initcursor []    (3)  - initialize mouse cursor
+vga_lastmodenumber [] (3)  - returns the last video mode number
+vga_lockvc []        (3)  - disables virtual console switching for safety
+vga_norevokeprivs [] (3)  - Keep root privileges if run as suid root
+vga_oktowrite []     (3)  - indicates whether the program has direct access to the SVGA
+vga_puttextfont []   (3)  - get/set the font used in text mode
+vga_reset []         (8)  - reset video graphic board
+vga_runinbackground [] (3)  - enable running of the program while there is no VGA access
+vga_runinbackground_version [] (3)  - returns the version of the current background support
+vga_safety_fork []   (3)  - start a parallel process to restore the console at a crash
+vga_screenoff []     (3)  - turn generation of the video signal on or off
+vga_screenon []      (3)  - turn generation of the video signal on or off
+vga_selectcursor []  (3)  - select mouse cursor pattern
+vga_setchipset []    (3)  - force chipset
+vga_setchipsetandfeatures [] (3)  - force chipset and optional parameters
+vga_setcolor []      (3)  - set the current color
+vga_setcursorimage [] (3)  - set the pattern and colors of the mouse cursor
+vga_setcursorposition [] (3)  - set the mouse cursor position
+vga_setdisplaystart [] (3)  - set the display start address
+vga_setegacolor []   (3)  - set the current color
+vga_setflipchar []   (3)  - set the character causing a vga_flip()
+vga_setlinearaddressing [] (3)  - switch to linear addressing mode
+vga_setlogicalwidth [] (3)  - set the logical scanline width
+vga_setmode []       (3)  - sets a video mode
+vga_setmodeX []      (3)  - try to set Mode X-like memory organization
+vga_setmousesupport [] (3)  - enable mouse support
+vga_setpage []       (3)  - set the 64K SVGA page number
+vga_setpalette []    (3)  - set a color in the color lookup table
+vga_setpalvec []     (3)  - sets colors in the color lookup table
+vga_setreadpage []   (3)  - set the 64K SVGA page number
+vga_setrgbcolor []   (3)  - set the current color
+vga_settextmoderegs [] (3)  - get/set the vga state used in text mode
+vga_setwritepage []  (3)  - set the 64K SVGA page number
+vga_showcursor []    (3)  - show / hide mouse cursor
+vga_unlockvc []      (3)  - re-enables virtual console switching
+vga_waitevent []     (3)  - wait for various I/O events
+vga_waitretrace []   (3)  - wait for vertical retrace
+vga_white []         (3)  - return the color white in the current screen resolution
+vgagl []             (7)  - a fast framebuffer-level graphics library based ion svgalib
+vgatest []           (6)  - makes basic tests on any svgalib graphics mode
+vgcfgbackup []       (8)  - backup volume group descriptor area
+vgcfgrestore []      (8)  - restore volume group descriptor area
+vgchange []          (8)  - change attributes of a volume group
+vgck []              (8)  - check volume group metadata
+vgconvert []         (8)  - convert volume group metadata format
+vgcreate []          (8)  - create a volume group
+vgdisplay []         (8)  - display attributes of volume groups
+vgexport []          (8)  - make volume groups unknown to the system
+vgextend []          (8)  - add physical volumes to a volume group
+vgimport []          (8)  - make exported volume groups known to the system
+vgmerge []           (8)  - merge two volume groups
+vgmknodes []         (8)  - recreate volume group directory and logical volume special files
+vgreduce []          (8)  - reduce a volume group
+vgremove []          (8)  - remove a volume group
+vgrename []          (8)  - rename a volume group
+vgs []               (8)  - report information about volume groups
+vgscan []            (8)  - scan all disks for volume groups and rebuild caches
+vgsplit []           (8)  - split a volume group into two
+vhangup []           (2)  - virtually hangup the current tty
+vid_attr []          (3)  - curses interfaces to terminfo database
+vid_puts []          (3)  - curses interfaces to terminfo database
+vidattr []           (3)  - curses interfaces to terminfo database
+vidputs []           (3)  - curses interfaces to terminfo database
+vidwhacker []        (6)  - grab images and apply random filters to them
+viewres []           (1)  - graphical class browser for Xt
+vigr []              (8)  - edit the password, group, shadow-password, or shadow-group file
+vim []               (1)  - Vi IMproved, a programmers text editor
+vimdiff []           (1)  - edit two, three or four versions of a file with Vim and show differences
+vimtutor []          (1)  - the Vim tutor
+vipw []              (8)  - edit the password, group, shadow-password, or shadow-group file
+visudo []            (8)  - edit the sudoers file
+vline []             (3)  - create curses borders, horizontal and vertical lines
+vline_set []         (3)  - create curses borders or lines using complex characters and renditions
+vm86 []              (2)  - enter virtual 8086 mode
+vm86old []           (2)  - enter virtual 8086 mode
+vmmouse []           (4)  - VMware Mouse input driver
+vmmouse_detect []    (1)  - VMware mouse device autodetection tool
+vmsish []            (3)  - Perl pragma to control VMS-specific language features
+vmsplice []          (2)  - splice user pages into a pipe
+vmstat []            (8)  - Report virtual memory statistics
+vmware []            (4)  - VMware SVGA video driver
+void XpPutDocumentData [] (3)  - Sends and incorporates data into the output
+void []              (4)  - null input driver
+vol_id []            (8)  - probe filesystem type and read label and uuid
+volname []           (1)  - return volume name
+voodoo []            (4)  - Voodoo video driver
+vorbiscomment []     (1)  - List or edit comments in Ogg Vorbis files
+voronoi []           (6)  - draws a randomly-colored Voronoi tessellation
+vpddecode []         (8)  - VPD structure decoder
+vprintf []           (3)  - formatted output conversion
+vscanf []            (3)  - input format conversion
+vserver []           (2)  - unimplemented system calls
+vsftpd []            (8)  - Very Secure FTP Daemon
+vsftpd.conf []       (5)  - config file for vsftpd
+vsnprintf []         (3)  - formatted output conversion
+vsprintf []          (3)  - formatted output conversion
+vsscanf []           (3)  - input format conversion
+vswprintf []         (3)  - formatted wide - character output conversion
+vsyslog []           (3)  - send messages to the system logger
+vw_printw []         (3)  - print formatted output in curses windows
+vw_scanw []          (3)  - convert formatted input from a curses window
+vwait []             (n)  - Process events until a variable is written
+vwarn []             (3)  - formatted error messages
+vwarnx []            (3)  - formatted error messages
+vwprintf []          (3)  - formatted wide - character output conversion
+vwprintw []          (3)  - print formatted output in curses windows
+vwscanw []           (3)  - convert formatted input from a curses window
+w []                 (1)  - Show who is logged on and what they are doing
+wadd_wch []          (3)  - add a complex character and rendition to a curses window, then advance the cursor
+wadd_wchnstr []      (3)  - add an array of complex characters (and attributes) to a curses window
+wadd_wchstr []       (3)  - add an array of complex characters (and attributes) to a curses window
+waddch []            (3)  - add a character (with attributes) to a curses window, then advance the cursor
+waddchnstr []        (3)  - add a string of characters (and attributes) to a curses window
+waddchstr []         (3)  - add a string of characters (and attributes) to a curses window
+waddnstr []          (3)  - add a string of characters to a curses window and advance cursor
+waddnwstr []         (3)  - add a string of wide characters to a curses window and advance cursor
+waddstr []           (3)  - add a string of characters to a curses window and advance cursor
+waddwstr []          (3)  - add a string of wide characters to a curses window and advance cursor
+wait []              (1)  - bash built-in commands, see bash(1)
+wait []              (2)  - wait for process to change state
+wait3 []             (2)  - wait for process to change state, BSD style
+wait4 []             (2)  - wait for process to change state, BSD style
+waitid []            (2)  - wait for process to change state
+waitpid []           (2)  - wait for process to change state
+wall []              (1)  - write a message to users
+wander []            (6)  - colorful random-walk
+wargames []          (6)  - shall we play a game?
+warn []              (3)  - formatted error messages
+warnings []          (3)  - Perl pragma to control optional warnings
+warnings::register [] (3)  - warnings import function
+warnquota []         (8)  - send mail to users over quota
+warnx []             (3)  - formatted error messages
+watch []             (1)  - execute a program periodically, showing output fullscreen
+watcher []           (3)  - Watch a specified variable and process it as an instance or scalar object
+watchgnupg []        (1)  - Read and print logs from a socket
+wattr_get []         (3)  - curses character and window attribute control routines
+wattr_off []         (3)  - curses character and window attribute control routines
+wattr_on []          (3)  - curses character and window attribute control routines
+wattr_set []         (3)  - curses character and window attribute control routines
+wattroff []          (3)  - curses character and window attribute control routines
+wattron []           (3)  - curses character and window attribute control routines
+wattrset []          (3)  - curses character and window attribute control routines
+wavelan []           (4)  - AT&T GIS WaveLAN ISA device driver
+wbinfo []            (1)  - Query information from winbind daemon
+wbkgd []             (3)  - curses window background manipulation routines
+wbkgdset []          (3)  - curses window background manipulation routines
+wbkgrnd []           (3)  - curses window complex background manipulation routines
+wbkgrndset []        (3)  - curses window complex background manipulation routines
+wbmptopbm []         (1)  - convert a wireless bitmap (wbmp) file to a portable bitmap (pbm)
+wborder []           (3)  - create curses borders, horizontal and vertical lines
+wborder_set []       (3)  - create curses borders or lines using complex characters and renditions
+wc []                (1)  - print newline, word, and byte counts for each file
+wchgat []            (3)  - curses character and window attribute control routines
+wclear []            (3)  - clear all or part of a curses window
+wclrtobot []         (3)  - clear all or part of a curses window
+wclrtoeol []         (3)  - clear all or part of a curses window
+wcolor_set []        (3)  - curses character and window attribute control routines
+wcpcpy []            (3)  - copy a wide-character string, returning a pointer to its end
+wcpncpy []           (3)  - copy a fixed-size string of wide characters, returning a pointer to its end
+wcrtomb []           (3)  - convert a wide character to a multibyte sequence
+wcscasecmp []        (3)  - compare two wide-character strings, ignoring case
+wcscat []            (3)  - concatenate two wide-character strings
+wcschr []            (3)  - search a wide character in a wide-character string
+wcscmp []            (3)  - compare two wide-character strings
+wcscpy []            (3)  - copy a wide-character string
+wcscspn []           (3)  - search a wide-character string for any of a set of wide characters
+wcsdup []            (3)  - duplicate a wide-character string
+wcslen []            (3)  - determine the length of a wide-character string
+wcsncasecmp []       (3)  - compare two fixed-size wide-character strings, ignoring case
+wcsncat []           (3)  - concatenate two wide-character strings
+wcsncmp []           (3)  - compare two fixed-size wide-character strings
+wcsncpy []           (3)  - copy a fixed-size string of wide characters
+wcsnlen []           (3)  - determine the length of a fixed-size wide-character string
+wcsnrtombs []        (3)  - convert a wide-character string to a multibyte string
+wcspbrk []           (3)  - search a wide-character string for any of a set of wide characters
+wcsrchr []           (3)  - search a wide character in a wide-character string
+wcsrtombs []         (3)  - convert a wide-character string to a multibyte string
+wcsspn []            (3)  - advance in a wide-character string, skipping any of a set of wide characters
+wcsstr []            (3)  - locate a substring in a wide-character string
+wcstoimax []         (3)  - convert wide-character string to integer
+wcstok []            (3)  - split wide-character string into tokens
+wcstombs []          (3)  - convert a wide-character string to a multibyte string
+wcstoumax []         (3)  - convert wide-character string to integer
+wcswidth []          (3)  - determine columns needed for a fixed-size wide-character string
+wctob []             (3)  - try to represent a wide character as a single byte
+wctomb []            (3)  - convert a wide character to a multibyte sequence
+wctrans []           (3)  - wide-character translation mapping
+wctype []            (3)  - wide-character classification
+wcursyncup []        (3)  - create curses windows
+wcwidth []           (3)  - determine columns needed for a wide character
+wdelch []            (3)  - delete character under the cursor in a curses window
+wdeleteln []         (3)  - delete and insert lines in a curses window
+wdwrite []           (1)  - writes keys and values to the defaults database
+webcollage []        (6)  - decorate the screen with random images from the web
+wecho_wchar []       (3)  - add a complex character and rendition to a curses window, then advance the cursor
+wechochar []         (3)  - add a character (with attributes) to a curses window, then advance the cursor
+wenclose []          (3)  - mouse interface through curses
+werase []            (3)  - clear all or part of a curses window
+wftopfa []           (1)  - Convert a Wadalab base font to Postscript .PFA (or .PFB) format using ghostscript
+wget_wch []          (3)  - get (or push back) a wide character from curses terminal keyboard
+wget_wstr []         (3)  - get an array of wide characters from a curses terminal keyboard
+wgetbkgrnd []        (3)  - curses window complex background manipulation routines
+wgetch []            (3)  - get (or push back) characters from curses terminal keyboard
+wgetn_wstr []        (3)  - get an array of wide characters from a curses terminal keyboard
+wgetnstr []          (3)  - accept character strings from curses terminal keyboard
+wgetstr []           (3)  - accept character strings from curses terminal keyboard
+whatis []            (1)  - search the whatis database for complete words
+whereis []           (1)  - locate the binary, source, and manual page files for a command
+which []             (1)  - shows the full path of (shell) commands
+while []             (n)  - Execute script repeatedly as long as a condition is met
+whirlwindwarp []     (6)  - crazy moving stars
+whline []            (3)  - create curses borders, horizontal and vertical lines
+whline_set []        (3)  - create curses borders or lines using complex characters and renditions
+who []               (1)  - show who is logged on
+whoami []            (1)  - print effective userid
+whois []             (1)  - client for the whois directory service
+win_wch []           (3)  - extract a complex character and rendition from a window
+win_wchnstr []       (3)  - get an array of complex characters and renditions from a curses window
+win_wchstr []        (3)  - get an array of complex characters and renditions from a curses window
+winbindd []          (8)  - Name Service Switch daemon for resolving names from NT servers
+winch []             (3)  - get a character and attributes from a curses window
+winchnstr []         (3)  - get a string of characters (and attributes) from a curses window
+winchstr []          (3)  - get a string of characters (and attributes) from a curses window
+windmc []            (1)  - generates Windows message resources
+winfo []             (n)  - Return window-related information
+winicontoppm []      (1)  - convert a Windows .ico file into 1 or more portable pixmap files
+winnstr []           (3)  - get a string of characters from a curses window
+winnwstr []          (3)  - get a string of wchar_t characters from a curses window
+wins_nwstr []        (3)  - insert a wide-character string into a curses window
+wins_wch []          (3)  - insert a complex character and rendition into a window
+wins_wstr []         (3)  - insert a wide-character string into a curses window
+winsch []            (3)  - insert a character before cursor in a curses window
+winsdelln []         (3)  - delete and insert lines in a curses window
+winsertln []         (3)  - delete and insert lines in a curses window
+winsnstr []          (3)  - insert string before cursor in a curses window
+winsstr []           (3)  - insert string before cursor in a curses window
+winstr []            (3)  - get a string of characters from a curses window
+winwstr []           (3)  - get a string of wchar_t characters from a curses window
+wireless []          (7)  - Wireless Tools and Wireless Extensions
+wish []              (1)  - Simple windowing shell
+wm []                (n)  - Communicate with window manager
+wmaker []            (1)  - X11 window manager with a NEXTSTEP look
+wmemchr []           (3)  - search a wide character in a wide-character array
+wmemcmp []           (3)  - compare two arrays of wide-characters
+wmemcpy []           (3)  - copy an array of wide-characters
+wmemmove []          (3)  - copy an array of wide-characters
+wmempcpy []          (3)  - copy memory area
+wmemset []           (3)  - fill an array of wide-characters with a constant wide character
+wmouse_trafo []      (3)  - mouse interface through curses
+wmove []             (3)  - move curses window cursor
+wmsetbg []           (1)  - sets the background on the X11 display
+wnewmail []          (1)  - programs to asynchronously notify of new mail
+wnoutrefresh []      (3)  - refresh curses windows and lines
+word []              (1)  - list-compress - word list compressor/decompressor for GNU Aspell
+wordexp []           (3)  - perform word expansion like a posix-shell
+wordfree []          (3)  - perform word expansion like a posix-shell
+workbone []          (1)  - an interactive text-mode program for controlling and playing audio CD Roms under Linux
+worm []              (6)  - Play the growing worm game
+wormhole []          (6)  - animation of flying through a wormhole
+worms []             (6)  - animate worms on a display terminal
+wpa_background []    (8)  - Background information on Wi-Fi Protected Access and IEEE 802.11i
+wpa_cli []           (8)  - WPA command line client
+wpa_gui []           (8)  - WPA Graphical User Interface
+wpa_passphrase []    (8)  - Generate a WPA PSK from an ASCII passphrase for a SSID
+wpa_priv []          (8)  - wpa_supplicant privilege separation helper
+wpa_supplicant []    (8)  - Wi-Fi Protected Access client and IEEE 802.1X supplicant
+wpa_supplicant.conf [] (5)  - configuration file for wpa_supplicant
+wprintf []           (3)  - formatted wide - character output conversion
+wprintw []           (3)  - print formatted output in curses windows
+wrapdemo []          (6)  - demonstrates surface wrapping of pixmaps
+wredrawln []         (3)  - refresh curses windows and lines
+wrefresh []          (3)  - refresh curses windows and lines
+wresize []           (3)  - resize a curses window
+write []             (1)  - send a message to another user
+write []             (2)  - write to a file descriptor
+writed []            (8)  - remote write server
+writemain []         (3)  - write the C code for perlmain.c
+writev []            (2)  - read or write data into multiple buffers
+wrjpgcom []          (1)  - insert text comments into a JPEG file
+wscanw []            (3)  - convert formatted input from a curses window
+wscrl []             (3)  - scroll a curses window
+wsetscrreg []        (3)  - curses output options
+wstandend []         (3)  - curses character and window attribute control routines
+wstandout []         (3)  - curses character and window attribute control routines
+wsyncdown []         (3)  - create curses windows
+wsyncup []           (3)  - create curses windows
+wtf []               (6)  - translates acronyms for you
+wtimeout []          (3)  - curses input options
+wtmp []              (5)  - login records
+wtouchln []          (3)  - curses refresh control routines
+wtpt []              (1)  - Show media white of profiles, identifying black body locus
+wump []              (6)  - hunt the wumpus in an underground cave
+wunctrl []           (3)  - miscellaneous curses utility routines
+wvline []            (3)  - create curses borders, horizontal and vertical lines
+wvline_set []        (3)  - create curses borders or lines using complex characters and renditions
+wxcopy []            (1)  - copy stdin or file into cutbuffer
+wxpaste []           (1)  - output a cutbuffer to stdout
+x11perf []           (1)  - X11 server performance test program
+x11perfcomp []       (1)  - X11 server performance comparison program
+x25 []               (7)  - ITU-T X.25 / ISO-8208 protocol interface
+x3270 []             (1)  - - 1IBM host access tool
+x3270if []           (1)  - command interface to x3270, c3270 and s3270
+x509 []              (1)  - Certificate display and signing utility
+x509 []              (3)  - X.509 certificate handling
+x509v3_config []     (5)  - X509 V3 certificate extension configuration format
+xanalogtv []         (6)  - Simulate reception on an old analog TV set
+xapm []              (1)  - display Advanced Power Management (APM) BIOS information
+xargs []             (1)  - build and execute command lines from standard input
+xauth []             (1)  - X authority file utility
+xbacklight []        (1)  - adjust backlight brightness using RandR extension
+xbattery []          (1)  - display Advanced Power Management (APM) BIOS information
+xbiff []             (1)  - mailbox flag for X
+xbmtopbm []          (1)  - convert an X11 or X10 bitmap into a portable bitmap
+xboard []            (6)  - X graphical user interface for chess
+xcalc []             (1)  - scientific calculator for X
+xcam []              (1)  - a graphical camera frontend for SANE
+xclipboard []        (1)  - X clipboard client
+xclock []            (1)  - analog / digital clock for X
+xcmap []             (1)  - displays the default colormap on X11 displays
+xcmsdb []            (1)  - Device Color Characterization utility for X Color Management System
+xcompmgr []          (1)  - sample X compositing manager
+xconsole []          (1)  - monitor system console messages with X
+xcuckoo []           (6)  - cuckoo clock for X
+xcursorgen []        (1)  - create an X cursor file from a collection of PNG images
+xcutsel []           (1)  - interchange between cut buffer and selection
+xdbedizzy []         (1)  - demo of DBE creating a double buffered spinning scene
+xdecrypt []          (3)  - RFS password encryption
+xdfcopy []           (1)  - Program to copy and format Xdf disks in Linux
+xdg []               (1)  - desktop-icon - command line tool for (un)installing icons to the desktop
+xdg []               (1)  - desktop-menu - command line tool for (un)installing desktop menu items
+xdg []               (1)  - email - command line tool for sending mail using the user's preferred e-mail composer
+xdg []               (1)  - icon-resource - command line tool for (un)installing icon resources
+xdg []               (1)  - mime - command line tool for querying information about file type handling and adding descriptions for new file types
+xdg []               (1)  - open - opens a file or URL in the user's preferred application
+xdg []               (1)  - screensaver - command line tool for controlling the screensaver
+xditview []          (1)  - display ditroff output
+xdm []               (1)  - X Display Manager with support for XDMCP, host chooser
+xdpr []              (1)  - dump an X window directly to a printer
+xdpyinfo []          (1)  - display information utility for X
+xdr []               (3)  - library routines for external data representation
+xdriinfo []          (1)  - query configuration information of DRI drivers
+xedit []             (1)  - simple text editor for X
+xencrypt []          (3)  - RFS password encryption
+xev []               (1)  - print contents of X events
+xeyes []             (1)  - a follow the mouse X demo
+xfce4 []             (1)  - session - Starts up the Xfce Desktop Environment
+xfce4 []             (1)  - session-logout - Logs out from Xfce
+xfce4-session        (1)  - Starts up the Xfce Desktop Environment
+xfce4-session-logout (1)  - Logs out from Xfce
+xfd []               (1)  - display all the characters in an X font
+xfdesktop            (1)  - The Xfce 4 Desktop Environment's desktop manager
+xfdesktop []         (1)  - The Xfce 4 Desktop Environment's desktop manager
+xferlog []           (5)  - ProFTPD server logfile
+xfig []              (1)  - Facility for Interactive Generation of figures under X11
+xfindproxy []        (1)  - locate proxy services
+xflame []            (6)  - draws animated flames
+xfontsel []          (1)  - point and click selection of X11 font names
+xfractint []         (1)  - fractal generation program
+xfs []               (1)  - X font server
+xfs []               (5)  - layout of the XFS filesystem
+xfs_admin []         (8)  - change parameters of an XFS filesystem
+xfs_bmap []          (8)  - print block mapping for an XFS file
+xfs_check []         (8)  - check XFS filesystem consistency
+xfs_copy []          (8)  - copy the contents of an XFS filesystem
+xfs_db []            (8)  - debug an XFS filesystem
+xfs_estimate []      (8)  - estimate the space that an XFS filesystem will take
+xfs_freeze []        (8)  - suspend access to an XFS filesystem
+xfs_fsr []           (8)  - filesystem reorganizer for XFS
+xfs_growfs []        (8)  - expand an XFS filesystem
+xfs_info []          (8)  - expand an XFS filesystem
+xfs_io []            (8)  - debug the I/O path of an XFS filesystem
+xfs_logprint []      (8)  - print the log of an XFS filesystem
+xfs_mdrestore []     (8)  - restores an XFS metadump image to a filesystem image
+xfs_metadump []      (8)  - copy XFS filesystem metadata to a file
+xfs_mkfile []        (8)  - create an XFS file
+xfs_ncheck []        (8)  - generate pathnames from i-numbers for XFS
+xfs_quota []         (8)  - manage use of quota on XFS filesystems
+xfs_repair []        (8)  - repair an XFS filesystem
+xfs_rtcp []          (8)  - XFS realtime copy command
+xfsctl []            (3)  - control XFS filesystems and individual files
+xfsdump []           (8)  - XFS filesystem incremental dump utility
+xfsinfo []           (1)  - X font server information utility
+xfsinvutil []        (8)  - xfsdump inventory database checking and pruning utility
+xfsrestore []        (8)  - XFS filesystem incremental restore utility
+xft []               (1)  - config - report Xft version, compiler, linker, and/or installation directory information
+xfwp []              (1)  - X firewall proxy
+xgamma []            (1)  - Alter a monitor's gamma correction through the X server
+xgc []               (1)  - X graphics demo
+xgettext []          (1)  - extract gettext strings from source
+xhfs []              (1)  - graphical interface for manipulating HFS volumes
+xhost []             (1)  - server access control program for X
+ximtoppm []          (1)  - convert an Xim file into a portable pixmap
+xine []              (1)  - a free video player
+xine []              (1)  - check - a checker for the xine video player
+xine []              (1)  - config - script to get information about the installed version of libxine
+xine []              (1)  - remote - a small tool to connect xine remote control server
+xine []              (5)  - a free video player
+xinit []             (1)  - X Window System initializer
+xinput []            (1)  - utility to configure and test XInput devices
+xjack []             (6)  - all work and no play makes jack a dull boy
+xkbcomp []           (1)  - compile XKB keyboard description
+xkbevd []            (1)  - XKB event daemon
+xkbprint []          (1)  - print an XKB keyboard description
+xkibitz []           (1)  - allow multiple people to interact in an xterm
+xkill []             (1)  - kill a client by its X resource
+xlander []           (6)  - A lunar landing simulation with a twist
+xload []             (1)  - system load average display for X
+xlock []             (1)  - Locks the local X display until a password is entered
+xlogo []             (1)  - X Window System logo
+xlsatoms []          (1)  - list interned atoms defined on server
+xlsclients []        (1)  - list client applications running on a display
+xlsfonts []          (1)  - server font list displayer for X
+xlyap []             (6)  - display an array of Lyapunov exponents graphically
+xmag []              (1)  - magnify parts of the screen
+xman []              (1)  - Manual page display program for the X Window System
+xmatrix []           (6)  - simulates the computer displays from the movie
+xmbind []            (1)  - configures the virtual key bindings of LessTif applications
+xmessage []          (1)  - display a message or query in a window (X-based /bin/echo)
+xmh []               (1)  - send and read mail with an X interface to MH
+xminesweep []        (6)  - A mine-sweeper game
+xmkmf []             (1)  - create a Makefile from an Imakefile
+xml []               (1)  - config - script to get information about the installed version of GNOME-XML
+xml2po []            (1)  - program to create a PO-template file from a DocBook XML file and merge it back into a (translated) XML file
+xml2pot []           (1)  - Creates a PO template file from a DocBook XML file
+xmlcatalog []        (1)  - Command line tool to parse and manipulate XML or SGML catalog files
+xmlif []             (1)  - conditional processing instructions for XML
+xmllint []           (1)  - command line XML tool
+xmlto []             (1)  - apply an XSL stylesheet to an XML document
+xmlwf []             (1)  - Determines if an XML document is well-formed
+xmodmap []           (1)  - utility for modifying keymaps and pointer button mappings in X
+xmore []             (1)  - plain text display program for the X Window System
+xneko []             (6)  - cat-and-mouse chase in an X window
+xon []               (1)  - start an X program on a remote machine
+xorg.conf []         (5)  - configuration File for Xorg X server
+xpaint []            (1)  - Simple Paint program
+xpdf []              (1)  - Portable Document Format (PDF) file viewer for X (version 3.02)
+xpdfrc []            (5)  - configuration file for Xpdf tools (version 3.02)
+xplsprinters []      (1)  - shows a list of Xprint printers and it's attributes
+xpmroot []           (1)  - Sets the root window of the current X display to an Xpm pixmap
+xpmtoppm []          (1)  - convert an X11 pixmap into a PPM image
+xpr []               (1)  - print an X window dump
+xprehashprinterlist [] (1)  - Recomputes the list of available printers
+xprop []             (1)  - property displayer for X
+xqmstats []          (8)  - Display XFS quota manager statistics from /proc
+xrandr []            (1)  - primitive command line interface to RandR extension
+xrayswarm []         (6)  - swarms with color trails
+xrdb []              (1)  - X server resource database utility
+xrefresh []          (1)  - refresh all or part of an X screen
+xroach []            (6)  - cockroaches hide under your windows
+xsane []             (1)  - scanner frontend for SANE
+xscanimage []        (1)  - scan an image
+xscope []            (1)  - X Window Protocol Viewer
+xscreensaver []      (1)  - command - control a running xscreensaver process
+xscreensaver []      (1)  - demo - interactively control the background xscreensaver daemon
+xscreensaver []      (1)  - extensible screen saver framework, plus locking
+xscreensaver []      (1)  - getimage - put some randomly-selected image on the root window
+xscreensaver []      (1)  - getimage-file - put a randomly-selected image on the root window
+xscreensaver []      (1)  - getimage-video - put a video frame on the root window
+xscreensaver []      (1)  - text - prints some text to stdout, for use by screen savers
+xscreensaver []      (6)  - gl-helper - figure out which X visual to use for GL programs
+xset []              (1)  - user preference utility for X
+xsetmode []          (1)  - set the mode for an X Input device
+xsetpointer []       (1)  - set an X Input device as the main pointer
+xsetroot []          (1)  - root window parameter setting utility for X
+xsldbg []            (1)  - A command line tool to debug XSLT scripts
+xsltproc []          (1)  - command line XSLT processor
+xsm []               (1)  - X Session Manager
+xsnow []             (6)  - create a snowy and Santa-y desktop
+xspirograph []       (6)  - simulates the rotation of a disk inside a circular rim
+xstdcmap []          (1)  - X standard colormap utility
+xsubpp []            (1)  - compiler to convert Perl XS code into C code
+xterm []             (1)  - terminal emulator for X
+xtotroff []          (1)  - convert X font metrics into GNU troff font metrics
+xtrapchar []         (1)  - XTrap sample clients
+xtrapin []           (1)  - XTrap sample clients
+xtrapinfo []         (1)  - XTrap sample clients
+xtrapout []          (1)  - XTrap sample clients
+xtrapproto []        (1)  - XTrap sample clients
+xtrapreset []        (1)  - XTrap sample clients
+xtrapstats []        (1)  - XTrap sample clients
+xv []                (1)  - interactive image display for the X Window System
+xvidtune []          (1)  - video mode tuner for Xorg
+xvinfo []            (1)  - Print out X-Video extension adaptor information
+xvminitoppm []       (1)  - convert a XV thumbnail picture to PPM
+xvpictoppm []        (1)  - converts XV 'thumbnail' files to standard PPM format
+xwd []               (1)  - dump an image of an X window
+xwdtopnm []          (1)  - convert a X11 or X10 window dump file into a portable anymap
+xwininfo []          (1)  - window information utility for X
+xwmconfig []         (1)  - choose a default window manager for X
+xwud []              (1)  - image displayer for X
+xxd []               (1)  - make a hexdump or do the reverse
+xxgdb []             (1)  - X window system interface to the gdb debugger
+y0 []                (3)  - Bessel functions of the second kind
+y0f []               (3)  - Bessel functions of the second kind
+y0l []               (3)  - Bessel functions of the second kind
+y1 []                (3)  - Bessel functions of the second kind
+y1f []               (3)  - Bessel functions of the second kind
+y1l []               (3)  - Bessel functions of the second kind
+yacc                 (1)  - GNU Project parser generator
+ybmtopbm []          (1)  - convert a Bennet Yee face file into a portable bitmap
+yes []               (1)  - output a string repeatedly until killed
+yn []                (3)  - Bessel functions of the second kind
+ynf []               (3)  - Bessel functions of the second kind
+ynl []               (3)  - Bessel functions of the second kind
+ypbind []            (8)  - NIS binding process
+ypcat []             (1)  - print values of all keys in a NIS database
+ypchfn []            (1)  - change your password in the NIS database
+ypchsh []            (1)  - change your password in the NIS database
+ypdomainname []      (1)  - show or set the system's NIS/YP domain name
+ypdomainname []      (8)  - set or display name of current NIS(YP) domain
+yphelper []          (8)  - helper application for internal use
+ypinit []            (8)  - NIS database install and build program
+ypmatch []           (1)  - print the values of one or more keys from a NIS map
+yppasswd []          (1)  - change your password in the NIS database
+yppoll []            (8)  - return version and master server of a NIS map
+yppush []            (8)  - force propagation of changed NIS databases
+ypserv []            (8)  - NIS server
+ypserv.conf []       (5)  - configuration file for ypserv and rpc.ypxfrd
+ypset []             (8)  - bind ypbind to a particular NIS server
+yptest []            (8)  - test NIS configuration
+ypwhich []           (1)  - return name of NIS server or map master
+ypxfr []             (8)  - transfer NIS database from remote server to local host
+ytalk []             (1)  - A multi-user chat program
+yuvplittoppm []      (1)  - convert a Y- and U- and a V-file into a portable pixmap
+yuvtoppm []          (1)  - convert Abekas YUV bytes into a portable pixmap
+zcat []              (1)  - compress and expand data (version 4.1)
+zcat []              (1)  - compress or expand files
+zcmp []              (1)  - compare compressed files
+zdiff []             (1)  - compare compressed files
+zdump []             (8)  - timezone dumper
+zeisstopnm []        (1)  - convert a Zeiss confocal file into a portable anymap
+zenmap []            (1)  - Graphical Nmap frontend and results viewer
+zero []              (4)  - data sink
+zforce []            (1)  - force a '.gz' extension on all gzip files
+zgrep []             (1)  - search possibly compressed files for a regular expression
+zic []               (8)  - timezone compiler
+zic2xpm []           (6)  - Tool to convert ZIICS chess pieces into XBoard (XPM/XIM) pieces
+zip []               (1)  - package and compress (archive) files
+zip_add, [zip_add]   (3)  - .Nm zip_replace add file to zip archive or replace file in zip archive
+zip_add, [zip_replace] (3)  - .Nm zip_replace add file to zip archive or replace file in zip archive
+zip_add_dir []       (3)  - add directory to zip archive
+zip_close []         (3)  - close zip archive
+zip_delete []        (3)  - delete file from zip archive
+zip_error_clear, [zip_error_clear] (3)  - .Nm zip_file_error_clear clear error state for archive or file
+zip_error_clear, [zip_file_error_clear] (3)  - .Nm zip_file_error_clear clear error state for archive or file
+zip_error_get, [zip_error_get] (3)  - .Nm zip_file_error_get get error codes for archive or file
+zip_error_get, [zip_file_error_get] (3)  - .Nm zip_file_error_get get error codes for archive or file
+zip_error_get_sys_type [] (3)  - get type of system error code
+zip_error_to_str []  (3)  - get string representation of zip error
+zip_errors []        (3)  - list of all libzip error codes
+zip_fclose []        (3)  - close file in zip archive
+zip_file_strerror, [zip_file_strerror] (3)  - .Nm zip_strerror get string representation for a zip error
+zip_file_strerror, [zip_strerror] (3)  - .Nm zip_strerror get string representation for a zip error
+zip_fopen, [zip_fopen] (3)  - .Nm zip_fopen_index open file in zip archive for reading
+zip_fopen, [zip_fopen_index] (3)  - .Nm zip_fopen_index open file in zip archive for reading
+zip_fread []         (3)  - read from file
+zip_get_archive_comment [] (3)  - get zip archive comment
+zip_get_archive_flag [] (3)  - get status flags for zip
+zip_get_file_comment [] (3)  - get comment for file in zip
+zip_get_name []      (3)  - get name of file by index
+zip_get_num_files [] (3)  - get number of files in archive
+zip_name_locate []   (3)  - get index of file by name
+zip_open []          (3)  - open zip archive
+zip_rename []        (3)  - rename file in zip archive
+zip_set_archive_comment [] (3)  - set zip archive comment
+zip_set_archive_flag [] (3)  - set zip archive flag
+zip_set_file_comment [] (3)  - set comment for file in zip
+zip_source_buffer [] (3)  - create zip data source from buffer
+zip_source_file []   (3)  - create data source from a file
+zip_source_filep []  (3)  - create data source from FILE *
+zip_source_free []   (3)  - free zip data source
+zip_source_function [] (3)  - create data source from function
+zip_source_zip []    (3)  - create data source from zip file
+zip_stat, [zip_stat] (3)  - .Nm zip_stat_index get information about file
+zip_stat, [zip_stat_index] (3)  - .Nm zip_stat_index get information about file
+zip_stat_init []     (3)  - initialize zip_stat structure
+zip_unchange []      (3)  - undo changes to file in zip archive
+zip_unchange_all []  (3)  - undo all changes in a zip archive
+zip_unchange_archive [] (3)  - undo global changes to zip archive
+zipcloak []          (1)  - package and compress (archive) files
+zipcmp []            (1)  - compare contents of zip archives
+zipgrep []           (1)  - search files in a ZIP archive for lines matching a pattern
+zipinfo []           (1)  - list detailed information about a ZIP archive
+zipmerge []          (1)  - merge zip archives
+zipnote []           (1)  - package and compress (archive) files
+zipsplit []          (1)  - package and compress (archive) files
+ziptool []           (1)  - Tool for IOMega JAZ and ZIP drives
+ziptorrent []        (1)  - torrentzip zip archives
+zless []             (1)  - file perusal filter for crt viewing of compressed text
+zlib []              (3)  - compression/decompression library
+zmore []             (1)  - file perusal filter for crt viewing of compressed text
+znew []              (1)  - recompress .Z files to .gz files
+zonetab2pot.py []    (1)  - Converts a timezone list to a PO file template
+zoo []               (1)  - manipulate archives of files in compressed form
+zoom []              (6)  - wander around magnified desktop
+zsh []               (1)  - the Z shell
+zshall []            (1)  - the Z shell meta-man page
+zshbuiltins []       (1)  - zsh built-in commands
+zshcalsys []         (1)  - zsh calendar system
+zshcompctl []        (1)  - zsh programmable completion
+zshcompsys []        (1)  - zsh completion system
+zshcompwid []        (1)  - zsh completion widgets
+zshcontrib []        (1)  - user contributions to zsh
+zshexpn []           (1)  - zsh expansion and substitution
+zshmisc []           (1)  - everything and then some
+zshmodules []        (1)  - zsh loadable modules
+zshoptions []        (1)  - zsh options
+zshparam []          (1)  - zsh parameters
+zshroadmap []        (1)  - informal introduction to the zsh manual
+zshtcpsys []         (1)  - zsh tcp system
+zshzftpsys []        (1)  - zftp function front-end
+zshzle []            (1)  - zsh command line editor
diff --git a/source/ap/man/doinst.sh b/source/ap/man/doinst.sh
new file mode 100644
index 000000000..22fa61d14
--- /dev/null
+++ b/source/ap/man/doinst.sh
@@ -0,0 +1,14 @@
+#!/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 usr/lib/man.conf.new
+
diff --git a/source/ap/man/man-1.6f.nroff.mandoc.diff b/source/ap/man/man-1.6f.nroff.mandoc.diff
new file mode 100644
index 000000000..6b14b3e7e
--- /dev/null
+++ b/source/ap/man/man-1.6f.nroff.mandoc.diff
@@ -0,0 +1,11 @@
+--- ./src/man.conf.in.orig	2007-08-20 23:15:21.000000000 -0500
++++ ./src/man.conf.in	2009-08-08 20:53:33.000000000 -0500
+@@ -89,7 +89,7 @@
+ # causes problems, add the -c option to TROFF, NROFF, JNROFF.
+ #
+ TROFF		@troff@
+-NROFF		@nroff@
++NROFF		/usr/bin/nroff -mandoc
+ JNROFF		@jnroff@
+ EQN		@eqn@
+ NEQN		@neqn@
diff --git a/source/ap/man/man.SlackBuild b/source/ap/man/man.SlackBuild
new file mode 100755
index 000000000..6ee765c3f
--- /dev/null
+++ b/source/ap/man/man.SlackBuild
@@ -0,0 +1,90 @@
+#!/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=1.6f
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-man
+
+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 $PKG
+mkdir -p $TMP $PKG
+rm -rf man-$VERSION
+tar xvf $CWD/man-$VERSION.tar.bz2
+cd man-$VERSION
+
+# In man.conf, set NROFF to "/usr/bin/nroff -mandoc" rather
+# than "/usr/bin/nroff -Tlatin1".  This works better with
+# modern console encodings.  Thanks to rg3.
+zcat $CWD/man-1.6f.nroff.mandoc.diff.gz | patch -p1 || 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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure +lang all +traditional -confdir /usr/lib${LIBDIRSUFFIX}
+make
+make install PREFIX=$PKG
+mv $PKG/usr/lib${LIBDIRSUFFIX}/man.conf $PKG/usr/lib${LIBDIRSUFFIX}/man.conf.new
+
+( 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
+)
+
+( cd $PKG/usr/man
+  find . -name "*.?" -exec gzip -9 {} \;
+  # hack to remove empty man directories:
+  ( find . -type d | xargs rmdir ) 2> /dev/null
+  ( find . -type d | xargs rmdir ) 2> /dev/null
+)
+
+mkdir -p $PKG/usr/doc/man-$VERSION
+cp -a COPYING* INSTALL LSM README TODO $PKG/usr/doc/man-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \
+  > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/man-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/man/slack-desc b/source/ap/man/slack-desc
new file mode 100644
index 000000000..284c863c6
--- /dev/null
+++ b/source/ap/man/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------------------------------------------------------|
+man: man (format and display the on-line manual pages)
+man:
+man: The man package is a collection of tools used for searching and
+man: reading the online system documentation.  In fact, on most UNIX-like
+man: operating systems it is the primary means of finding out how programs
+man: on the system work.  For example, 'man man' will display the
+man: documentation for man itself.
+man:
+man: Man requires the groff text processing package.
+man:
+man:
diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild
new file mode 100755
index 000000000..8beae8b41
--- /dev/null
+++ b/source/ap/mc/mc.SlackBuild
@@ -0,0 +1,108 @@
+#!/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=20090714_git
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mc
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr
+
+cd $TMP
+rm -rf mc-$VERSION
+tar xvf $CWD/mc-$VERSION.tar.xz || exit 1
+cd mc-$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 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --localstatedir=/var \
+  --docdir=/usr/doc/mc-$VERSION \
+  --enable-extcharset \
+  --enable-netcode \
+  --enable-background \
+  --enable-charset \
+  --with-gpm-mouse \
+  --with-ext2undel \
+  --with-x=yes \
+  --with-vfs \
+  --with-samba \
+  --with-configdir=/etc/samba \
+  --with-codepagedir=/etc/codepages \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make DESTDIR=$PKG install || 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/usr/share/mc/bin
+cp -a $CWD/profile.d/mc-wrapper.* $PKG/usr/share/mc/bin
+chown root:root $PKG/usr/share/mc/bin/*
+chmod 755 $PKG/usr/share/mc/bin/*
+mkdir -p $PKG/etc/profile.d
+cp -a $CWD/profile.d/mc.* $PKG/etc/profile.d
+chown root:root $PKG/etc/profile.d/*
+chmod 755 $PKG/etc/profile.d/*
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/usr/doc/mc-$VERSION
+cp -a \
+  AUTHORS doc/COPYING* doc/FAQ doc/HACKING doc/INSTALL doc/MAINTAINERS doc/NEWS doc/README* doc/TODO \
+  $PKG/usr/doc/mc-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/mc-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/mc/profile.d/mc-wrapper.csh b/source/ap/mc/profile.d/mc-wrapper.csh
new file mode 100755
index 000000000..7b4c383d9
--- /dev/null
+++ b/source/ap/mc/profile.d/mc-wrapper.csh
@@ -0,0 +1,20 @@
+set MC_USER="`id | sed 's/[^(]*(//;s/).*//'`"
+
+if ($?TMPDIR) then
+	setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$
+else
+	setenv MC_PWD_FILE /tmp/mc-$MC_USER/mc.pwd.$$
+endif
+
+/usr/bin/mc -P "$MC_PWD_FILE" $*
+
+if (-r "$MC_PWD_FILE") then
+	setenv MC_PWD "`cat '$MC_PWD_FILE'`"
+	if ( -d "$MC_PWD" ) then
+		cd "$MC_PWD"
+	endif
+	unsetenv MC_PWD
+endif
+
+rm -f "$MC_PWD_FILE"
+unsetenv MC_PWD_FILE
diff --git a/source/ap/mc/profile.d/mc-wrapper.sh b/source/ap/mc/profile.d/mc-wrapper.sh
new file mode 100755
index 000000000..36db15747
--- /dev/null
+++ b/source/ap/mc/profile.d/mc-wrapper.sh
@@ -0,0 +1,14 @@
+MC_USER=`id | sed 's/[^(]*(//;s/).*//'`
+MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
+/usr/bin/mc -P "$MC_PWD_FILE" "$@"
+
+if test -r "$MC_PWD_FILE"; then
+	MC_PWD="`cat "$MC_PWD_FILE"`"
+	if test -n "$MC_PWD" && test -d "$MC_PWD"; then
+		cd "$MC_PWD"
+	fi
+	unset MC_PWD
+fi
+
+rm -f "$MC_PWD_FILE"
+unset MC_PWD_FILE
diff --git a/source/ap/mc/profile.d/mc.csh b/source/ap/mc/profile.d/mc.csh
new file mode 100755
index 000000000..5a614bb22
--- /dev/null
+++ b/source/ap/mc/profile.d/mc.csh
@@ -0,0 +1 @@
+alias mc 'source /usr/share/mc/bin/mc-wrapper.csh'
diff --git a/source/ap/mc/profile.d/mc.sh b/source/ap/mc/profile.d/mc.sh
new file mode 100755
index 000000000..8198ab456
--- /dev/null
+++ b/source/ap/mc/profile.d/mc.sh
@@ -0,0 +1 @@
+alias mc='. /usr/share/mc/bin/mc-wrapper.sh'
diff --git a/source/ap/mc/slack-desc b/source/ap/mc/slack-desc
new file mode 100644
index 000000000..be6ca439a
--- /dev/null
+++ b/source/ap/mc/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------------------------------------------------------|
+mc: mc (Midnight Commander file manager)
+mc:
+mc: The Midnight Commander is a Norton Commander clone, a program that
+mc: manipulates and manages files and directories.  Useful, fast, and has
+mc: color displays on the Linux console.  Mouse support is provided
+mc: through the gpm mouse server.  This is a lightweight compilation of
+mc: mc for use on the text console or in an xterm.
+mc:
+mc: mc was written by Miguel de Icaza and Mauricio Plaza.
+mc:
+mc:
diff --git a/source/ap/most/most.SlackBuild b/source/ap/most/most.SlackBuild
new file mode 100755
index 000000000..8d4456a08
--- /dev/null
+++ b/source/ap/most/most.SlackBuild
@@ -0,0 +1,89 @@
+#!/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=5.0.0a
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-most
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf most-$VERSION
+tar xvf $CWD/most-$VERSION.tar.bz2 || exit 1
+cd most-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --docdir=/usr/doc \
+  --with-slang=/usr \
+  --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
+
+# Was --mandir ignored?
+if [ -d $PKG/usr/share/man ]; then
+  mv $PKG/usr/share/man $PKG/usr
+fi
+
+gzip -9 $PKG/usr/man/man?/*
+
+mv $PKG/usr/share/doc $PKG/usr
+mv $PKG/usr/doc/most $PKG/usr/doc/most-$VERSION
+for file in $PKG/usr/doc/most-$VERSION/* ; do
+  if [ -r `basename $file` ]; then
+    cp -a `basename $file` $file
+  fi
+done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/most-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/most/slack-desc b/source/ap/most/slack-desc
new file mode 100644
index 000000000..1d5b44930
--- /dev/null
+++ b/source/ap/most/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------------------------------------------------------|
+most: most (another pager, like 'more' and 'less')
+most:
+most: most is a paging program that displays, one windowful at a time,  the
+most: contents of a file on a terminal.  Unlike other well-known paging
+most: programs, most supports multiple windows and can scroll left and
+most: right.  Why settle for less?
+most:
+most: 'most' was written by John E. Davis.
+most:
+most:
+most:
diff --git a/source/ap/mpg321/mpg321.SlackBuild b/source/ap/mpg321/mpg321.SlackBuild
new file mode 100755
index 000000000..340c32703
--- /dev/null
+++ b/source/ap/mpg321/mpg321.SlackBuild
@@ -0,0 +1,77 @@
+#!/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=0.2.10
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mpg321
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+tar xvf $CWD/mpg321-$VERSION.tar.gz || exit 1
+cd mpg321-$VERSION || exit 1
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+
+strip mpg321
+mkdir -p $PKG/usr/bin
+cat mpg321 > $PKG/usr/bin/mpg321
+chmod 755 $PKG/usr/bin/mpg321
+( cd $PKG/usr/bin ; rm -f mpg123 ; ln -sf mpg321 mpg123 )
+
+mkdir -p $PKG/usr/man/man1
+cat mpg321.1 | gzip -9c > $PKG/usr/man/man1/mpg321.1.gz
+
+mkdir -p $PKG/usr/doc/mpg321-$VERSION
+cp -a \
+  AUTHORS BUGS COPYING ChangeLog HACKING INSTALL NEWS \
+  README README.remote THANKS TODO \
+  $PKG/usr/doc/mpg321-$VERSION
+chown -R root:root $PKG/usr/doc/mpg321-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/mpg321-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/mpg321/slack-desc b/source/ap/mpg321/slack-desc
new file mode 100644
index 000000000..81b435b58
--- /dev/null
+++ b/source/ap/mpg321/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------------------------------------------------------|
+mpg321: mpg321 (a command-line mp3 player)
+mpg321:
+mpg321: mpg321 is a free command-line mp3 player, which uses the mad audio
+mpg321: decoding library.  mpg321 is written to be a drop-in replacement for
+mpg321: the mpg123 player for front-ends such as gqmpeg and programs which use
+mpg321: mpg123 to decode mp3 files (like gtoaster, and other CD-recording
+mpg321: software).
+mpg321:
+mpg321: mpg321 requires libao.so from the oggutils package.
+mpg321:
+mpg321:
diff --git a/source/ap/mysql/doinst.sh b/source/ap/mysql/doinst.sh
new file mode 100644
index 000000000..22f77474e
--- /dev/null
+++ b/source/ap/mysql/doinst.sh
@@ -0,0 +1,22 @@
+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...
+}
+
+# Keep same perms on rc.mysqld.new:
+if [ -e etc/rc.d/rc.mysqld ]; then
+  cp -a etc/rc.d/rc.mysqld etc/rc.d/rc.mysqld.new.incoming
+  cat etc/rc.d/rc.mysqld.new > etc/rc.d/rc.mysqld.new.incoming
+  mv etc/rc.d/rc.mysqld.new.incoming etc/rc.d/rc.mysqld.new
+fi
+
+config etc/rc.d/rc.mysqld.new
+
diff --git a/source/ap/mysql/mirror-url b/source/ap/mysql/mirror-url
new file mode 100644
index 000000000..37be0283c
--- /dev/null
+++ b/source/ap/mysql/mirror-url
@@ -0,0 +1 @@
+http://mysql.he.net/Downloads/MySQL-5.0/mysql-5.0.82.tar.gz                     
diff --git a/source/ap/mysql/mysql-embedded.build b/source/ap/mysql/mysql-embedded.build
new file mode 100755
index 000000000..9b06d386b
--- /dev/null
+++ b/source/ap/mysql/mysql-embedded.build
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Build and install MySQL on Slackware
+# by:  David Cantrell <david@slackware.com>
+# Currently maintained by:  Patrick Volkerding <volkerdi@slackware.com>
+
+VERSION=5.0.84
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mysql
+
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf mysql-$VERSION
+tar xvf $CWD/mysql-$VERSION.tar.?z* || exit 1
+cd mysql-$VERSION
+
+CFLAGS="$SLKCFLAGS -fPIC" CXXFLAGS="$SLKCFLAGS -fPIC" \
+    ./configure --prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --datadir=/usr/share --sysconfdir=/etc/mysql \
+    --libexecdir=/usr/sbin --localstatedir=/var/lib/mysql \
+    --without-docs --without-man --without-server \
+    --with-embedded-server --without-innodb --without-bench \
+    --without-berkeley-db --without-row-based-replication \
+    --without-readline --disable-shared --with-charset=utf8 \
+    --without-debug --with-pthread --without-openssl --without-query-cache \
+    --without-geometry --with-pic
+
+make -j6 || make || exit 1
+
+cp libmysqld/libmysqld.a /usr/lib${LIBDIRSUFFIX}/mysql/
+
diff --git a/source/ap/mysql/mysql.SlackBuild b/source/ap/mysql/mysql.SlackBuild
new file mode 100755
index 000000000..16ba3efa8
--- /dev/null
+++ b/source/ap/mysql/mysql.SlackBuild
@@ -0,0 +1,182 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+# Build and install MySQL on Slackware
+# by:  David Cantrell <david@slackware.com>
+# Currently maintained by:  Patrick Volkerding <volkerdi@slackware.com>
+
+
+VERSION=5.0.84
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mysql
+
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf mysql-$VERSION
+tar xvf $CWD/mysql-$VERSION.tar.?z* || exit 1
+cd mysql-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -felide-constructors -fno-exceptions -fno-rtti" \
+CXX=gcc \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-mysqld-user=mysql \
+  --with-unix-socket-path=/var/run/mysql/mysql.sock \
+  --localstatedir=/var/lib/mysql \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --enable-assembler \
+  --with-raid \
+  --without-debug \
+  --enable-thread-safe-client \
+  --without-bench \
+  --with-extra-charsets=complex \
+  --with-vio \
+  --with-openssl \
+  --build=$ARCH-slackware-linux
+#
+# --without-readline
+
+make $NUMJOBS || make || exit 1
+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
+
+# Install support files
+mkdir -p $PKG/etc
+cp support-files/my-{huge,large,medium,small}.cnf $PKG/etc
+
+# Install docs
+mkdir -p $PKG/usr/doc/mysql-$VERSION/Docs
+cp -a \
+  COPYING* MIRRORS README* \
+  $PKG/usr/doc/mysql-$VERSION
+( cd Docs
+  cp -a INSTALL-BINARY *.html *.txt Flags \
+     $PKG/usr/doc/mysql-$VERSION/Docs )
+# Too large to justify since the .html version is right there:
+rm $PKG/usr/doc/mysql-$VERSION/Docs/manual.txt
+find $PKG/usr/doc/mysql-$VERSION -type f -exec chmod 0644 {} \;
+
+# This is the directory where databases are stored
+mkdir -p $PKG/var/lib/mysql
+chown mysql.mysql $PKG/var/lib/mysql
+chmod 0750 $PKG/var/lib/mysql
+
+# This is where the socket is stored
+mkdir -p $PKG/var/run/mysql
+chown mysql.mysql $PKG/var/run/mysql
+chmod 0755 $PKG/var/run/mysql
+
+# Do not include the test suite:
+rm -rf $PKG/usr/mysql-test
+
+# Add init script:
+mkdir -p $PKG/etc/rc.d
+# This is intentionally chmod 644.
+zcat $CWD/rc.mysqld.gz > $PKG/etc/rc.d/rc.mysqld.new
+
+# Install script:
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Add some handy library symlinks:
+if [ -r $PKG/usr/lib${LIBDIRSUFFIX}/mysql/libmysqlclient.so.15 ]; then
+  ( cd $PKG/usr/lib${LIBDIRSUFFIX}
+    rm -f libmysqlclient.so libmysqlclient.so.15
+    ln -sf mysql/libmysqlclient.so .
+    ln -sf mysql/libmysqlclient.so.15 .
+  )
+else
+  exit 1
+fi
+if [ -r $PKG/usr/lib${LIBDIRSUFFIX}/mysql/libmysqlclient_r.so.15 ]; then
+  ( cd $PKG/usr/lib${LIBDIRSUFFIX}
+    rm -f libmysqlclient_r.so libmysqlclient_r.so.15
+    ln -sf mysql/libmysqlclient_r.so .
+    ln -sf mysql/libmysqlclient_r.so.15 .
+  )
+else
+  exit 1
+fi
+
+# Packaging standards:
+rm -f $PKG/usr/info/dir
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Build package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/mysql-$VERSION-$ARCH-$BUILD.txz
+
+if [ "$1" == "--cleanup" ]; then
+   cd $TMP
+   rm -rf mysql-$VERSION
+fi
diff --git a/source/ap/mysql/rc.mysqld b/source/ap/mysql/rc.mysqld
new file mode 100644
index 000000000..300e6eb2d
--- /dev/null
+++ b/source/ap/mysql/rc.mysqld
@@ -0,0 +1,86 @@
+#!/bin/sh
+# Start/stop/restart mysqld.
+#
+# Copyright 2003  Patrick J. Volkerding, Concord, CA
+# Copyright 2003  Slackware Linux, Inc., Concord, CA
+# Copyright 2008  Patrick J. Volkerding, Sebeka, MN
+#
+# This program comes with NO WARRANTY, to the extent permitted by law.
+# You may redistribute copies of this program under the terms of the
+# GNU General Public License.
+
+# To start MySQL automatically at boot, be sure this script is executable:
+# chmod 755 /etc/rc.d/rc.mysqld
+
+# Before you can run MySQL, you must have a database.  To install an initial
+# database, do this as root:
+#
+#   mysql_install_db --user=mysql
+#
+# Note that the mysql user must exist in /etc/passwd, and the created files
+# will be owned by this dedicated user.  This is important, or else mysql
+# (which runs as user "mysql") will not be able to write to the database
+# later (this can be fixed with 'chown -R mysql.mysql /var/lib/mysql').
+#
+# To increase system security, consider using "mysql_secure_installation"
+# as well.  For more information on this tool, please read:
+#   man mysql_secure_installation
+
+# To allow outside connections to the database comment out the next line.
+# If you don't need incoming network connections, then leave the line
+# uncommented to improve system security.
+SKIP="--skip-networking"
+
+# Start mysqld:
+mysqld_start() {
+  if [ -x /usr/bin/mysqld_safe ]; then
+    # If there is an old PID file (no mysqld running), clean it up:
+    if [ -r /var/run/mysql/mysql.pid ]; then
+      if ! ps axc | grep mysqld 1> /dev/null 2> /dev/null ; then
+        echo "Cleaning up old /var/run/mysql/mysql.pid."
+        rm -f /var/run/mysql/mysql.pid
+      fi
+    fi
+    /usr/bin/mysqld_safe --datadir=/var/lib/mysql --pid-file=/var/run/mysql/mysql.pid $SKIP &
+  fi
+}
+
+# Stop mysqld:
+mysqld_stop() {
+  # If there is no PID file, ignore this request...
+  if [ -r /var/run/mysql/mysql.pid ]; then
+    killall mysqld
+    # Wait at least one minute for it to exit, as we don't know how big the DB is...
+    for second in 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 \
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 60 ; do
+      if [ ! -r /var/run/mysql/mysql.pid ]; then
+        break;
+      fi
+      sleep 1
+    done
+    if [ "$second" = "60" ]; then
+      echo "WARNING:  Gave up waiting for mysqld to exit!"
+      sleep 15
+    fi
+  fi
+}
+
+# Restart mysqld:
+mysqld_restart() {
+  mysqld_stop
+  mysqld_start
+}
+
+case "$1" in
+'start')
+  mysqld_start
+  ;;
+'stop')
+  mysqld_stop
+  ;;
+'restart')
+  mysqld_restart
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/source/ap/mysql/slack-desc b/source/ap/mysql/slack-desc
new file mode 100644
index 000000000..29e1b8be4
--- /dev/null
+++ b/source/ap/mysql/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------------------------------------------------------|
+mysql: mysql (SQL-based relational database server)
+mysql:
+mysql: MySQL is a fast, multi-threaded, multi-user, and robust SQL
+mysql: (Structured Query Language) database server.  It comes with a nice API
+mysql: which makes it easy to integrate into other applications.
+mysql:
+mysql: The home page for MySQL is http://www.mysql.com/
+mysql:
+mysql:
+mysql:
+mysql:
diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild
new file mode 100755
index 000000000..7a1440e01
--- /dev/null
+++ b/source/ap/nano/nano.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+
+PKGNAM=nano
+VERSION=${VERSION:-2.0.9}
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION || 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 \
+  --sysconfdir=/etc \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --program-prefix= \
+  --program-suffix= \
+  --enable-color \
+  --enable-multibuffer \
+  --enable-nanorc \
+  --enable-all \
+  --enable-utf8 \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# 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
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS BUGS COPYING* INSTALL NEWS README* THANKS TODO UPGRADE \
+  doc/faq.html doc/nanorc.sample \
+  $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/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/nano/slack-desc b/source/ap/nano/slack-desc
new file mode 100644
index 000000000..8b9b54c8a
--- /dev/null
+++ b/source/ap/nano/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------------------------------------------------------|
+nano: nano (Nano's ANOther editor, an enhanced free Pico clone)
+nano:
+nano: nano is a small, free, and friendly editor from the GNU project.  It
+nano: aims to copy Pico's look and feel while providing additional (or
+nano: disabled by default) features that are missing from Pico, such as
+nano: "search and replace" or "go to line and column number".
+nano:
+nano: Chris Allegretta is Nano's author.
+nano:
+nano:
+nano:
diff --git a/source/ap/normalize/normalize.SlackBuild b/source/ap/normalize/normalize.SlackBuild
new file mode 100755
index 000000000..0a40ec1e4
--- /dev/null
+++ b/source/ap/normalize/normalize.SlackBuild
@@ -0,0 +1,80 @@
+#!/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=0.7.7
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-normalize
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf normalize-$VERSION
+tar xvf $CWD/normalize-$VERSION.tar.bz2 || exit 1
+cd normalize-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --enable-xmms \
+  --with-mad \
+  --build=$ARCH-slackware-linux
+  #--without-audiofile \
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+gzip -9 $PKG/usr/man/man?/*.?
+
+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/normalize-$VERSION
+cp -a \
+  COPYING INSTALL NEWS README THANKS TODO \
+  $PKG/usr/doc/normalize-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/normalize-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/normalize/slack-desc b/source/ap/normalize/slack-desc
new file mode 100644
index 000000000..156c080ff
--- /dev/null
+++ b/source/ap/normalize/slack-desc
@@ -0,0 +1,20 @@
+# 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------------------------------------------------------|
+normalize: normalize (adjusts volume levels of audio files)
+normalize:
+normalize: normalize is a tool for adjusting the volume of audio files to a
+normalize: standard level.  This is useful for things like creating mix CDs
+normalize: from mp3 collections, where different recording levels on
+normalize: different albums can cause the volume to vary greatly from song
+normalize: to song.  The package also contains an XMMS plugin.
+normalize:
+normalize: Chris Vaill is the author of normalize.
+normalize:
+normalize:
+
diff --git a/source/ap/ntfsprogs/ntfsprogs.SlackBuild b/source/ap/ntfsprogs/ntfsprogs.SlackBuild
new file mode 100755
index 000000000..e18fa97dc
--- /dev/null
+++ b/source/ap/ntfsprogs/ntfsprogs.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 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.
+
+PKGNAM=ntfsprogs
+VERSION=${VERSION:-2.0.0}
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+cd ${PKGNAM}-$VERSION || 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} \
+  --bindir=/bin \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-gnome-vfs \
+  --disable-ntfsmount \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/lib${LIBDIRSUFFIX}
+mv $PKG/usr/lib${LIBDIRSUFFIX}/libntfs.so.* $PKG/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf ../../lib${LIBDIRSUFFIX}/libntfs* . )
+
+# 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
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS COPYING* CREDITS INSTALL NEWS README TODO* doc \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/doc/Makefile*
+
+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/ap/ntfsprogs/slack-desc b/source/ap/ntfsprogs/slack-desc
new file mode 100644
index 000000000..4ed38c92b
--- /dev/null
+++ b/source/ap/ntfsprogs/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------------------------------------------------------|
+ntfsprogs: ntfsprogs (utilities for working with NTFS volumes)
+ntfsprogs:
+ntfsprogs: The ntfsprogs includes utilities for doing all required tasks to NTFS
+ntfsprogs: partitions.  In general, just run a utility without any command line
+ntfsprogs: options to display the version number and usage syntax.  The following
+ntfsprogs: utilities are implemented (so far): ntfsfix, mkntfs, ntfslabel,
+ntfsprogs: ntfsundelete, ntfsresize, ntfsclone, ntfscluster, ntfsinfo, ntfsls,
+ntfsprogs: ntfscat, ntfscp, and ntfsmount.
+ntfsprogs:
+ntfsprogs: The Linux-NTFS home page is:  http://www.linux-ntfs.org/
+ntfsprogs:
diff --git a/source/ap/pm-utils/README.SLACKWARE b/source/ap/pm-utils/README.SLACKWARE
new file mode 100644
index 000000000..071624395
--- /dev/null
+++ b/source/ap/pm-utils/README.SLACKWARE
@@ -0,0 +1,119 @@
+README.SLACKWARE
+20090414 - rworkman@slackware.com
+
+===============================================================================
+PLEASE READ THIS ENTIRE FILE BEFORE REPORTING PROBLEMS OR ASKING FOR HELP!
+===============================================================================
+
+One of these routines should tell you whether any of the operations
+are supported by your current kernel/userspace at all:
+
+  for i in hibernate suspend suspend-hybrid ; do
+    pm-is-supported --$i \
+      && echo "$i is supported" \
+      || echo "$i is not supported" ;
+  done
+
+  *OR*
+
+  cat /sys/power/state
+
+Assuming they are supported, running "pm-suspend" as root should do a suspend
+to ram, and "pm-hibernate" should suspend to disk. Note that you must have a 
+swap partition (or file, but partition is easier) which is large enough 
+(2x ram is good here) and the relevant initrd lines and such for this to work. 
+If you're not familiar with all of that, don't test pm-hibernate.
+I don't have hardware which supports suspend-hybrid, so I have no idea if/how
+it works at all.
+
+Here's the short version of using suspend to disk:
+
+Stanza in /etc/lilo.conf should look something like this:
+  image = /boot/vmlinuz-generic-smp-2.6.29.1-smp
+    initrd = /boot/initrd.gz
+    append = "resume=/dev/hda2"
+    root = /dev/hda1
+    label = Slackware
+    read-only
+
+/etc/mkinitrd.conf should look something like this:
+  MODULE_LIST="jfs"
+  ROOTDEV="/dev/hda1"
+  ROOTFS="jfs"
+  RESUMEDEV="/dev/hda2"
+
+mkinitrd command invocation would be this:
+  mkinitrd -c -k 2.6.29.1-smp -F
+
+All of the above assumes at least a cursory understanding of what those
+commands and parameters do. If it's not clear, don't attempt it on a
+system that you can't easily reinstall without concern.
+
+==============================================================================
+
+If it works for you, and/or you want to automate it a bit, you'll find
+some sample acpi event declarations and scripts here:
+  http://rlworkman.net/conf/acpi/
+A better option is to use the power manager daemon included with your choice
+of desktop environment (both kde and xfce have one).
+
+==============================================================================
+
+If it doesn't work by default for you, consider having a look at
+  http://people.freedesktop.org/~hughsient/quirk/quirk-suspend-index.html
+for some debugging hints.  Pay particular attention to this page:
+  http://people.freedesktop.org/~hughsient/quirk/quirk-suspend-try.html
+
+If you are able to get your machine to suspend/resume correctly by passing
+additional quirks on the command line, then I would like to know about it so
+that upstream hal-info can get the correct information to use.  Please email
+the make/model and other relevant information about your machine along with
+the full output of "lshal" and "lspci" attached, and what extra quirks you
+needed to add for successful suspend/resume to rworkman@slackware.com
+
+==============================================================================
+
+If you need the system to do certain operations before going to sleep and
+then undo them (or perhaps do something new) when waking back up, pm-utils
+supports something called "hooks."  The hooks installed by packages (not only
+pm-utils itself) should be in /usr/lib/pm-utils/sleep.d/, while any hooks 
+installed by the local system administrator (e.g. things that are only an
+issue on that one machine) should be in /etc/pm/sleep.d/.
+
+Looking at some of the existing hooks should give you a decent idea of their
+capabilities; as a head start, the functions used in the hooks are declared 
+in /usr/lib/pm-utils/functions, which is inherited elsewhere by 
+/usr/lib/pm-utils/pm-functions.  Note that an error exit code on any hook
+will cause the sleep operation to fail, so if you don't care whether your
+hook executes successfully, be sure to return an exit code of 0 (success) if
+you don't want the suspend operation to fail.  Some other exit codes are 
+also available; none of these will cause the suspend to fail:
+  $NA (not applicable), $NX (hook not executable), and $DX (hook disabled)
+
+One way to contribute to pm-utils indirectly is by writing and sending any
+needed hooks scripts to upstream projects; as an example, the hook that 
+ships with wicd was contributed by me.  Ideally, the pm-utils package should
+have a very minimum number of hooks shipped with it, as they should ship with
+the package to which the hook pertains; for example, the grub package would
+ship its own hook.
+
+==============================================================================
+
+KNOWN ISSUES
+
+****  If you encounter either of these, mail rworkman@slackware.com ****
+
+If your alsa drivers don't correctly save and restore state across a sleep /
+resume cycle (due to a buggy driver), then you will need to add the drivers
+to a custom file named /etc/pm/config.d/defaults (create the file if it does
+not exist already) in a variable named "SUSPEND_MODULES" - see the file at
+/usr/lib/pm-utils/defaults for proper format.
+
+The /usr/lib/pm-utils/sleep.d/90clock does not run by default.  It added
+over a second to suspend, and the vast majority of hardware does not need it 
+to keep the clocks in sync.  If you need this hook, you can set the 
+NEED_CLOCK_SYNC environment variable in a custom /etc/pm/config.d/defaults 
+file. 
+
+==============================================================================
+
diff --git a/source/ap/pm-utils/pm-utils.SlackBuild b/source/ap/pm-utils/pm-utils.SlackBuild
new file mode 100755
index 000000000..26e60714f
--- /dev/null
+++ b/source/ap/pm-utils/pm-utils.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for pm-utils
+
+# Copyright 2008, 2009  Robby Workman, Northport, Alabama, USA 
+# 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.
+
+PRGNAM=pm-utils
+VERSION=1.2.5
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+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
+
+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
+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="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make 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
+)
+
+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/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING INSTALL NEWS README* TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+
+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
+
diff --git a/source/ap/pm-utils/pm-utils.url b/source/ap/pm-utils/pm-utils.url
new file mode 100644
index 000000000..976c938fb
--- /dev/null
+++ b/source/ap/pm-utils/pm-utils.url
@@ -0,0 +1 @@
+http://pm-utils.freedesktop.org
diff --git a/source/ap/pm-utils/slack-desc b/source/ap/pm-utils/slack-desc
new file mode 100644
index 000000000..8791c9304
--- /dev/null
+++ b/source/ap/pm-utils/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-------------------------------------------------------|
+pm-utils: pm-utils (Power Management Utilities)
+pm-utils:
+pm-utils: The pm-utils package provides simple shell command line tools to
+pm-utils: suspend and hibernate computers that can be used to run vendor or
+pm-utils: distribution supplied scripts on suspend and resume.
+pm-utils:
+pm-utils: Homepage: http://pm-utils.freedesktop.org/
+pm-utils:
+pm-utils:
+pm-utils:
+pm-utils:
diff --git a/source/ap/radeontool/radeontool.SlackBuild b/source/ap/radeontool/radeontool.SlackBuild
new file mode 100755
index 000000000..3292a21c7
--- /dev/null
+++ b/source/ap/radeontool/radeontool.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Copyright 2008  Robby Workman, Northport, Alabama, USA
+# 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=1.5
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-radeontool
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf radeontool-$VERSION
+tar xvf $CWD/radeontool-$VERSION.tar.gz
+cd radeontool-$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 {} \;
+
+# Fix a bad include
+zcat $CWD/radeontool.c.diff.gz | patch -p1 || exit 1
+
+gcc -Wall $SLKCFLAGS -o radeontool radeontool.c
+strip --strip-unneeded radeontool
+mkdir -p $PKG/usr/sbin
+cp -a radeontool $PKG/usr/sbin
+
+mkdir -p $PKG/usr/doc/radeontool-$VERSION
+cp -a CHANGES $PKG/usr/doc/radeontool-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/radeontool-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/radeontool/radeontool.c.diff b/source/ap/radeontool/radeontool.c.diff
new file mode 100644
index 000000000..156863ed5
--- /dev/null
+++ b/source/ap/radeontool/radeontool.c.diff
@@ -0,0 +1,12 @@
+diff -u radeontool-1.5.orig/radeontool.c radeontool-1.5/radeontool.c
+--- radeontool-1.5.orig/radeontool.c	2004-02-10 21:50:27.000000000 -0600
++++ radeontool-1.5/radeontool.c	2008-11-24 13:21:32.895434558 -0600
+@@ -21,7 +21,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+-#include <asm/page.h>
++#include <sys/user.h>
+ 
+ #include "radeon_reg.h"
+ 
diff --git a/source/ap/radeontool/radeontool.info b/source/ap/radeontool/radeontool.info
new file mode 100644
index 000000000..7c7c1c6c4
--- /dev/null
+++ b/source/ap/radeontool/radeontool.info
@@ -0,0 +1,8 @@
+PRGNAM="radeontool"
+VERSION="1.5"
+HOMEPAGE="http://fdd.com/software/radeon/"
+DOWNLOAD="http://fdd.com/software/radeon/radeontool-1.5.tar.gz"
+MD5SUM="8065eebe5a2b163e43b40461bfe49a56"
+MAINTAINER="Robby Workman"
+EMAIL="rw@rlworkman.net"
+APPROVED=""
diff --git a/source/ap/radeontool/slack-desc b/source/ap/radeontool/slack-desc
new file mode 100644
index 000000000..9eea43477
--- /dev/null
+++ b/source/ap/radeontool/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--------------------------------------------------|
+radeontool: radeontool (small utility for ati radeon-based laptops)
+radeontool: 
+radeontool: Radeontool is a small utility to control ATI Radeon-based 
+radeontool: laptops' backlight and external output functions
+radeontool: 
+radeontool: Homepage: http://fdd.com/software/radeon/
+radeontool: 
+radeontool: 
+radeontool: 
+radeontool: 
+radeontool: 
diff --git a/source/ap/rexima/rexima.SlackBuild b/source/ap/rexima/rexima.SlackBuild
new file mode 100755
index 000000000..4ef9ec9e5
--- /dev/null
+++ b/source/ap/rexima/rexima.SlackBuild
@@ -0,0 +1,68 @@
+#!/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=1.4
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-rexima
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf rexima-$VERSION
+tar xvf $CWD/rexima-$VERSION.tar.gz || exit 1
+cd rexima-$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 || exit 1
+
+strip rexima
+mkdir -p $PKG/usr/bin
+cat rexima > $PKG/usr/bin/rexima
+chmod 755 $PKG/usr/bin/rexima
+
+mkdir -p $PKG/usr/man/man1
+cat rexima.1 | gzip -9c > $PKG/usr/man/man1/rexima.1.gz
+
+mkdir -p $PKG/usr/doc/rexima-$VERSION
+cp -a \
+  COPYING README ChangeLog NEWS \
+  $PKG/usr/doc/rexima-$VERSION
+chmod 644 $PKG/usr/doc/rexima-$VERSION/*
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/rexima-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/rexima/slack-desc b/source/ap/rexima/slack-desc
new file mode 100644
index 000000000..8a8adabcc
--- /dev/null
+++ b/source/ap/rexima/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------------------------------------------------------|
+rexima: rexima (console audio mixer)
+rexima:
+rexima: Rexima is a curses-based interactive audio mixer. It can also be used
+rexima: from the command-line.  It's designed to be small, fast, and
+rexima: straightforward.  It also offers a command line mode so you can script
+rexima: mixer settings.
+rexima:
+rexima: Rexima was written by Russell Marks.
+rexima:
+rexima:
+rexima:
diff --git a/source/ap/rpm/Packages b/source/ap/rpm/Packages
new file mode 100644
index 000000000..f78d20ebb
--- /dev/null
+++ b/source/ap/rpm/Packages
diff --git a/source/ap/rpm/doinst.sh b/source/ap/rpm/doinst.sh
new file mode 100644
index 000000000..8b00622b7
--- /dev/null
+++ b/source/ap/rpm/doinst.sh
@@ -0,0 +1,5 @@
+if [ ! -r var/lib/rpm/Packages ]; then
+  ( cd var/lib/rpm/tmp ; cp -a * .. )
+fi
+( cd var/lib/rpm && rm -f tmp/* && rmdir tmp )
+# Symlinks:
diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild
new file mode 100755
index 000000000..a16f0a3ea
--- /dev/null
+++ b/source/ap/rpm/rpm.SlackBuild
@@ -0,0 +1,122 @@
+#!/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.
+
+# Build RPM (of all things) for Slackware.
+
+VERSION=${VERSION:-4.7.0}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "armel" ]; then
+  SLKCFLAGS="-O2 -march=armv4t"
+  LIBDIRSUFFIX=""
+fi
+
+NSS_INC="/usr/include/seamonkey/nss"
+NSPR_INC="/usr/include/seamonkey/nspr"
+DB_INC="/usr/include/db44"
+NSS_LIBS="/usr/lib${LIBDIRSUFFIX}/seamonkey"
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=/tmp/package-rpm
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf rpm-$VERSION
+xz -dc $CWD/rpm-$VERSION.tar.xz | tar xvf - || exit 1
+cd rpm-$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 {} \;
+
+# We have to tell it where to find Seamonkey's NSS.
+# Also, --enable-sqlite3 needs "-ldl" in LDFLAGS
+# And --enable-broken-chown fits, as ours follows symlinks.
+CFLAGS="$SLKCFLAGS -I$NSS_INC -I$NSPR_INC -I$DB_INC" \
+LDFLAGS="-L${NSS_LIBS} -ldl" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-python \
+  --with-external-db \
+  --enable-broken-chown \
+  --without-hackingdocs \
+  --without-selinux \
+  --without-lua \
+  --without-dmalloc \
+  --enable-sqlite3 \
+  --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
+
+# Here's a bug - /var/tmp should NOT have mode 0755
+rmdir $PKG/var/tmp || exit 1
+
+# Compress man pages
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+# Initialize a dummy package database
+mkdir -p $PKG/var/lib/rpm/tmp
+zcat $CWD/Packages.gz > $PKG/var/lib/rpm/tmp/Packages
+
+# Install docs
+mkdir -p $PKG/usr/doc/rpm-$VERSION
+cp -a \
+  CHANGES COPYING CREDITS GROUPS INSTALL README TODO doc/manual \
+    $PKG/usr/doc/rpm-$VERSION
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/rpm-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/rpm/slack-desc b/source/ap/rpm/slack-desc
new file mode 100644
index 000000000..e41765e1a
--- /dev/null
+++ b/source/ap/rpm/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-------------------------------------------------------|
+rpm: rpm (RPM package format tool)
+rpm:
+rpm: RPM is a tool from Red Hat Software used to install and remove
+rpm: packages in the .rpm format.  When installing RPM packages on
+rpm: Slackware, you may need to use the --nodeps and --force options.
+rpm: Before installing any binary package, it's wise to examine it to
+rpm: see what it's going to do, and if it will overwrite any files.  You
+rpm: can use rpm2tgz to convert .rpm packages to .tgz packages so you
+rpm: can look them over.
+rpm:
+rpm:
diff --git a/source/ap/rzip/rzip.SlackBuild b/source/ap/rzip/rzip.SlackBuild
new file mode 100755
index 000000000..adcc2556b
--- /dev/null
+++ b/source/ap/rzip/rzip.SlackBuild
@@ -0,0 +1,84 @@
+#!/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=2.1
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-rzip
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf rzip-$VERSION
+tar xvf $CWD/rzip-$VERSION.tar.gz || exit 1
+cd rzip-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --program-prefix="" \
+  --program-suffix="" \
+  --build=$ARCH-slackware-linux
+
+make || exit 1
+
+mkdir -p $PKG/bin
+cp rzip $PKG/bin
+chmod 755 $PKG/bin/rzip
+
+mkdir -p $PKG/usr/man/man1
+cat rzip.1 | gzip -9c > $PKG/usr/man/man1/rzip.1.gz
+
+mkdir -p $PKG/usr/doc/rzip-$VERSION
+cp -a \
+ COPYING \
+ $PKG/usr/doc/rzip-$VERSION
+
+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/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/rzip-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/rzip/slack-desc b/source/ap/rzip/slack-desc
new file mode 100644
index 000000000..155b90583
--- /dev/null
+++ b/source/ap/rzip/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------------------------------------------------------|
+rzip: rzip (a large-file compression program)
+rzip:
+rzip: rzip is a file compression program designed to do particularly well
+rzip: on very large files containing long distance redundancy.
+rzip:
+rzip: rzip was written by Andrew Tridgell.
+rzip:
+rzip:
+rzip:
+rzip:
+rzip:
diff --git a/source/ap/sc/sc-7.16.lsm b/source/ap/sc/sc-7.16.lsm
new file mode 100644
index 000000000..e37be385e
--- /dev/null
+++ b/source/ap/sc/sc-7.16.lsm
@@ -0,0 +1,17 @@
+Begin4
+Title:		sc Spreadsheet Calculator
+Version:	7.16
+Entered-date:	2002-9-19
+Description:	sc is a free curses-based spreadsheet program that uses
+		key bindings similar to vi and less.
+Keywords:	spreadsheet calculator console textmode curses ncurses
+Author:		Too numerous to mention.
+Maintained-by:	nrocinu@myrealbox.com (Chuck Martin)
+Primary-site:	ibiblio.org /pub/Linux/apps/financial/spreadsheet
+Alternate-site:
+Original-site:
+Platforms:	Pre-7.x versions presumably worked on any Unix or Unix
+		clone, as well as VMS and DOS.  Hopefully, this is still
+		true, but it's only been tested on Linux.
+Copying-policy:	Public domain
+End
diff --git a/source/ap/sc/sc-gcc34.diff b/source/ap/sc/sc-gcc34.diff
new file mode 100644
index 000000000..28ec88107
--- /dev/null
+++ b/source/ap/sc/sc-gcc34.diff
@@ -0,0 +1,10 @@
+--- vi.c.orig	2005-01-15 16:56:05.632773048 +0000
++++ vi.c	2005-01-15 16:56:14.788381184 +0000
+@@ -40,7 +40,6 @@
+ 
+ #define istext(a) (isalnum(a) || ((a) == '_'))
+ 
+-#define bool	int
+ #define true	1
+ #define false	0
+ 
diff --git a/source/ap/sc/sc-malloc.diff b/source/ap/sc/sc-malloc.diff
new file mode 100644
index 000000000..2133ed42e
--- /dev/null
+++ b/source/ap/sc/sc-malloc.diff
@@ -0,0 +1,13 @@
+--- xmalloc.c.orig	2004-07-11 22:34:48.681076912 +0200
++++ xmalloc.c	2004-07-11 22:34:57.150789320 +0200
+@@ -6,8 +6,8 @@
+ #include <curses.h>
+ #include "sc.h"
+ 
+-extern char	*malloc();
+-extern char	*realloc();
++extern void	*malloc(size_t size);
++extern void	*realloc();
+ extern void	free();
+ void		fatal();
+ 
diff --git a/source/ap/sc/sc.SlackBuild b/source/ap/sc/sc.SlackBuild
new file mode 100755
index 000000000..8a8bba72c
--- /dev/null
+++ b/source/ap/sc/sc.SlackBuild
@@ -0,0 +1,86 @@
+#!/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=7.16
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sc
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_sc.tar.gz
+mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
+
+cd $TMP
+tar xvf $CWD/sc-$VERSION.tar.gz || exit 1
+cd sc-$VERSION || exit 1
+# Old software, modern compiler:
+zcat $CWD/sc-gcc34.diff.gz | patch -p0 --verbose || exit 1
+zcat $CWD/sc-malloc.diff.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 \) \
+  -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 || exit 1
+
+cat sc > $PKG/usr/bin/sc
+cat scqref > $PKG/usr/bin/scqref
+cat psc > $PKG/usr/bin/psc
+
+name=sc NAME=SC LIBDIR=/usr/lib${LIBDIRSUFFIX}/sc sh torev sc.doc >  sc.1
+name=sc NAME=SC LIBDIR=/usr/lib${LIBDIRSUFFIX}/sc sh torev psc.doc > psc.1
+cat sc.1 | gzip -9c > $PKG/usr/man/man1/sc.1.gz
+cat psc.1 | gzip -9c > $PKG/usr/man/man1/psc.1.gz
+
+mkdir -p $PKG/usr/doc/sc-$VERSION
+cp -a CHANGES README TODO $PKG/usr/doc/sc-$VERSION
+chmod 644 $PKG/usr/doc/sc-$VERSION/*
+cat tutorial.sc > $PKG/usr/lib${LIBDIRSUFFIX}/sc/tutorial.sc
+
+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/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/sc-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/sc/slack-desc b/source/ap/sc/slack-desc
new file mode 100644
index 000000000..c64ef2f66
--- /dev/null
+++ b/source/ap/sc/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------------------------------------------------------|
+sc: sc (spreadsheet calculator)
+sc:
+sc: This is a simple curses-based spreadsheet program.
+sc:
+sc:
+sc:
+sc:
+sc:
+sc:
+sc:
+sc:
diff --git a/source/ap/screen/screen.SlackBuild b/source/ap/screen/screen.SlackBuild
new file mode 100755
index 000000000..a9f05634c
--- /dev/null
+++ b/source/ap/screen/screen.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VERSION=${VERSION:-4.0.3}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-screen
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf screen-$VERSION
+tar xjvf $CWD/screen-$VERSION.tar.bz2
+
+cd screen-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure --prefix=/usr \
+  --with-sys-screenrc=/etc/screenrc \
+  --with-pty-mode=0620 \
+  --with-pty-group=5 \
+  --enable-telnet \
+  --disable-socket-dir \
+  --enable-locale \
+  --enable-colors256 \
+  --enable-rxvt_osc \
+  $ARCH-slackware-linux
+
+# Substitutions:
+perl -pi -e 's|.*#undef HAVE_BRAILLE.*|#define HAVE_BRAILLE 1|' config.h
+perl -pi -e 's|/usr/local/etc/screenrc|/etc/screenrc|' etc/etcscreenrc doc/*
+perl -pi -e 's|/local/etc/screenrc|/etc/screenrc|' doc/*
+
+# Build screen:
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Prepare package:
+( 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
+)
+# Sorry, pal.  Not around here.
+chmod 755 $PKG/usr/bin/screen-$VERSION
+mkdir -p $PKG/etc/skel
+cat etc/etcscreenrc > $PKG/etc/screenrc.new
+cat etc/screenrc > $PKG/etc/skel/.screenrc.new
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+gzip -9 $PKG/usr/man/man1/*
+mkdir -p $PKG/usr/doc/screen-$VERSION
+chmod 644 doc/FAQ
+cp -a COPYING ChangeLog INSTALL NEWS README TODO \
+  doc/FAQ doc/README.DOTSCREEN \
+  $PKG/usr/doc/screen-$VERSION
+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...
+}
+config etc/screenrc.new
+config etc/skel/.screenrc.new
+# This is probably safer than leaving the hidden .new file...  maybe?
+rm -f etc/skel/.screenrc.new
+EOF
+
+# Build package:
+cd $PKG
+makepkg -l y -c n $TMP/screen-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/screen/slack-desc b/source/ap/screen/slack-desc
new file mode 100644
index 000000000..cfe3136b6
--- /dev/null
+++ b/source/ap/screen/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------------------------------------------------------|
+screen: screen (screen manager with VT100/ANSI terminal emulation)
+screen:
+screen: Screen is a full-screen window manager that multiplexes a physical
+screen: terminal between several processes (typically interactive shells).
+screen: Each virtual terminal provides the functions of a DEC VT100 terminal
+screen: and several control functions from the ISO 6492 (ECMA 48, ANSI X3.64)
+screen: and ISO 2022 standards (e.g. insert/delete line and support for
+screen: multiple character sets).  There is a scrollback history buffer for
+screen: each virtual terminal and a copy-and-paste mechanism that allows
+screen: moving text regions between windows.
+screen:
diff --git a/source/ap/seejpeg/seejpeg-1.10.diff b/source/ap/seejpeg/seejpeg-1.10.diff
new file mode 100644
index 000000000..61a8be788
--- /dev/null
+++ b/source/ap/seejpeg/seejpeg-1.10.diff
@@ -0,0 +1,63 @@
+diff -c -r seejpeg-1.10.orig/Makefile seejpeg-1.10/Makefile
+*** seejpeg-1.10.orig/Makefile	Sat Nov  6 21:55:19 1999
+--- seejpeg-1.10/Makefile	Sat Apr 29 22:51:54 2000
+***************
+*** 6,25 ****
+  # $Id: Makefile,v 1.8 1999/11/07 05:55:19 evan Exp $	
+  
+  # The installation directories.
+! BIN=	/usr/local/bin
+! MAN=	/usr/local/man/man1
+  
+  # See the README for a description of these options.
+  #OPTIONS= -DNO_32K_CASCADE -DTESTMODE=G640x480x32K -DBUG_WORKAROUND -DONLY_1_8_MODES
+  OPTIONS= -DBUG_WORKAROUND
+  
+  # This should be the location of the JPEG v6 header files.
+! JPEG_HEADERS=	-I /usr/local/include
+! #JPEG_HEADERS=	-I /usr/X11R6/include
+  
+  # This should be the location of the JPEG v6 libraries.
+! JPEG_LIBS=	-L /usr/local/lib
+! #JPEG_LIBS=	-L /usr/X11R6/lib
+  
+  # These may be changed, if desired.
+  
+--- 6,25 ----
+  # $Id: Makefile,v 1.8 1999/11/07 05:55:19 evan Exp $	
+  
+  # The installation directories.
+! BIN=	/usr/bin
+! MAN=	/usr/man/man1
+  
+  # See the README for a description of these options.
+  #OPTIONS= -DNO_32K_CASCADE -DTESTMODE=G640x480x32K -DBUG_WORKAROUND -DONLY_1_8_MODES
+  OPTIONS= -DBUG_WORKAROUND
+  
+  # This should be the location of the JPEG v6 header files.
+! #JPEG_HEADERS=	-I /usr/local/include
+! JPEG_HEADERS=	-I /usr/X11R6/include
+  
+  # This should be the location of the JPEG v6 libraries.
+! #JPEG_LIBS=	-L /usr/local/lib
+! JPEG_LIBS=	-L /usr/X11R6/lib
+  
+  # These may be changed, if desired.
+  
+***************
+*** 29,35 ****
+  # Editing of the rest of this Makefile shouldn't be necessary.
+  
+  CFLAGS=		$(JPEG_HEADERS) -I jpeglib $(CCOPTS) $(OPTIONS)
+! LIBS=		-lvga $(JPEG_LIBS) -ljpeg -lm
+  LDOPTS=		-s
+  
+  SEEJPEG=	seejpeg.o jpeg.o image.o display.o cmap.o \
+--- 29,35 ----
+  # Editing of the rest of this Makefile shouldn't be necessary.
+  
+  CFLAGS=		$(JPEG_HEADERS) -I jpeglib $(CCOPTS) $(OPTIONS)
+! LIBS=		-lvga jpeglib/libjpeg.a -lm
+  LDOPTS=		-s
+  
+  SEEJPEG=	seejpeg.o jpeg.o image.o display.o cmap.o \
diff --git a/source/ap/seejpeg/seejpeg-1.10.lsm b/source/ap/seejpeg/seejpeg-1.10.lsm
new file mode 100644
index 000000000..da3644b74
--- /dev/null
+++ b/source/ap/seejpeg/seejpeg-1.10.lsm
@@ -0,0 +1,21 @@
+Begin3
+Title:		seejpeg - another JPEG (+GIF+PPM+BMP+TARGA) viewer
+Version:	1.10
+Entered-date:	08NOV99
+Description:	A JPEG image viewer which uses svgalib to display images.
+		It works out the best video mode to use based on the video
+		card, image size and user options.  This can be overridden.
+		It contains GIF, PPM, BMP and TARGA viewing support, and can
+		show images in a slideshow.
+		This version adds a reload command, and support for a
+		large number of new 4x3 and 16x9 video modes added in svgalib
+		1.4.0.
+Keywords:	graphics JPEG GIF PPM BMP TARGA picture image viewer svgalib
+		slideshow
+Author:		evan@cs.mu.oz.au (Evan Harris)
+Primary-site:	sunsite.unc.edu /pub/Linux/apps/graphics/viewers/svga
+		46550 seejpeg-1.10.tgz
+Platforms:	svgalib 1.3.0 or greater, best with 1.4.0 or greater
+		libjpeg v6
+Copying-policy:	Freely redistributable.
+End
diff --git a/source/ap/seejpeg/seejpeg.SlackBuild b/source/ap/seejpeg/seejpeg.SlackBuild
new file mode 100755
index 000000000..ca745063d
--- /dev/null
+++ b/source/ap/seejpeg/seejpeg.SlackBuild
@@ -0,0 +1,72 @@
+#!/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=1.10
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-seejpeg
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Explode the package framework:
+cd $PKG
+explodepkg $CWD/_seejpeg.tar.gz
+
+cd $TMP
+tar xvf $CWD/seejpeg-$VERSION.tgz || exit 1
+cd seejpeg-$VERSION || exit 1
+zcat $CWD/seejpeg-$VERSION.diff.gz | patch -p1 --verbose || exit 1
+rm -rf jpeglib
+tar xvf $CWD/libjpeg-6a.tar.gz || 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 {} \;
+
+( cd libjpeg-6a ; ./configure ; make )
+ln -sf libjpeg-6a jpeglib
+
+make seejpeg
+strip seejpeg
+cat seejpeg > $PKG/usr/bin/seejpeg
+
+cat seejpeg.1 | gzip -9c > $PKG/usr/man/man1/seejpeg.1.gz
+
+mkdir -p $PKG/usr/doc/seejpeg-$VERSION
+cp -a CHANGELOG README $PKG/usr/doc/seejpeg-$VERSION
+chmod 644 $PKG/usr/doc/seejpeg-$VERSION/*
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/seejpeg-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/seejpeg/slack-desc b/source/ap/seejpeg/slack-desc
new file mode 100644
index 000000000..b6c325ea3
--- /dev/null
+++ b/source/ap/seejpeg/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------------------------------------------------------|
+seejpeg: seejpeg (console JPEG viewer)
+seejpeg:
+seejpeg: Seejpeg is an image viewer which uses SVGAlib.  In spite of the name,
+seejpeg: it understands the JPEG, GIF, PPM, BMP and TARGA formats.  One nice
+seejpeg: feature of seejpeg is that it automatically decides on the best video
+seejpeg: mode to use based on the image being displayed and the video card
+seejpeg: being used.  
+seejpeg:
+seejpeg: Evan Harris is the author of seejpeg.
+seejpeg:
+seejpeg:
diff --git a/source/ap/slackpkg/README b/source/ap/slackpkg/README
new file mode 100644
index 000000000..985b0ca80
--- /dev/null
+++ b/source/ap/slackpkg/README
@@ -0,0 +1,4 @@
+NOTE:
+
+"slackpkg" is a shell script, so there is no source package.
+
diff --git a/source/ap/sox/slack-desc b/source/ap/sox/slack-desc
new file mode 100644
index 000000000..8b36469ea
--- /dev/null
+++ b/source/ap/sox/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------------------------------------------------------|
+sox: sox (universal sound sample translator)
+sox:
+sox: Sox is a universal sound converter, player, and recorder.  It can
+sox: play, record, and convert between several sound file formats such as
+sox: .au, .snd, .voc and .wav.
+sox:
+sox:
+sox:
+sox:
+sox:
+sox:
diff --git a/source/ap/sox/sox.SlackBuild b/source/ap/sox/sox.SlackBuild
new file mode 100755
index 000000000..aea5d7c16
--- /dev/null
+++ b/source/ap/sox/sox.SlackBuild
@@ -0,0 +1,98 @@
+#!/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=14.3.0
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+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"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sox
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf sox-$VERSION
+tar xvf $CWD/sox-$VERSION.tar.?z* || exit 1
+cd sox-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --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
+
+# 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
+
+mkdir -p $PKG/usr/doc/sox-$VERSION
+cp -a \
+  AUTHORS COPYING INSTALL NEWS README \
+  $PKG/usr/doc/sox-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/sox-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/sqlite/COPYRIGHT b/source/ap/sqlite/COPYRIGHT
new file mode 100644
index 000000000..a89b4e720
--- /dev/null
+++ b/source/ap/sqlite/COPYRIGHT
@@ -0,0 +1,68 @@
+   SQLite Logo
+   Small. Fast. Reliable.
+   Choose any three.
+
+   About Sitemap Documentation Download License News Developers Support                                                       
+
+SQLite Copyright
+
+                                                                                                         +------------------+
+                                                                                                         | SQLite is in the |
+                                                                                                         |  Public Domain   |
+                                                                                                         +------------------+
+
+   All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and
+   representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain
+   and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy,
+   modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled
+   binary, for any purpose, commercial or non-commercial, and by any means.
+
+   The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually
+   bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process
+   might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation
+   and build code so much because none of these things are part of the core deliverable SQLite library.
+
+   All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from
+   the open internet. Every line of code can be traced back to its original author, and all of those authors have public
+   domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects.
+
+Obtaining An Explicit License To Use SQLite
+
+   Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway.
+   Some reasons for obtaining a license include:
+
+     * You are using SQLite in a jurisdiction that does not recognize the public domain.
+     * You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the
+       public domain.
+     * You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite.
+     * Your legal department tells you that you have to purchase a license.
+
+   If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and
+   principal developers of SQLite, will sell you one.
+
+Contributed Code
+
+   In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are
+   asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible
+   inclusion in the SQLite source tree, please accompany the patch with the following statement:
+
+     The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make
+     this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this
+     dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under
+     copyright law.
+
+   We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In
+   addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient.
+   You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright
+   release should be mailed to:
+
+     Hwaci
+     6200 Maple Cove Lane
+     Charlotte, NC 28269
+     USA
+
+   A template copyright release is available in PDF or HTML. You can use this release to make future changes.
+
+     ----------------------------------------------------------------------------------------------------------------------
+
+   This page last modified 2007/11/14 15:25:42 UTC
diff --git a/source/ap/sqlite/slack-desc b/source/ap/sqlite/slack-desc
new file mode 100644
index 000000000..8605ff192
--- /dev/null
+++ b/source/ap/sqlite/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-------------------------------------------------------|
+sqlite: SQLite (simple, self contained database engine)
+sqlite:
+sqlite: SQLite is a small C library that implements a self-contained,
+sqlite: embeddable, zero-configuration SQL database engine.
+sqlite:
+sqlite: The SQLite distribution comes with a standalone command-line access
+sqlite: program (sqlite) that can be used to administer an SQLite database
+sqlite: and which serves as an example of how to use the SQLite library.
+sqlite:
+sqlite: Homepage:  http://www.sqlite.org/
+sqlite:
diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild
new file mode 100755
index 000000000..ffc75b330
--- /dev/null
+++ b/source/ap/sqlite/sqlite.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Slackware build script for sqlite
+
+# Copyright 2006  Martin Lefebvre <dadexter@gmail.com>
+# 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.
+
+PRGNAM=sqlite
+VERSION=3.6.14.2
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+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"
+fi
+
+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.?z* || exit 1
+cd $PRGNAM-$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 {} \;
+
+configure() {
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --enable-threadsafe \
+  --enable-cross-thread-connections \
+  --enable-tempstore=yes \
+  --enable-load-extension \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux 
+  return $?
+}
+
+if ! configure ; then
+  # Try regenerating configure:
+  autoconf
+  configure || exit 1
+fi
+
+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
+
+# Add missed man page:
+install -D -m 0644 sqlite3.1 $PKG/usr/man/man1/sqlite3.1
+gzip -9 $PKG/usr/man/man1/sqlite3.1
+
+# Fix up the pkgconfig file
+sed -i 's|Libs: -L${libdir} -lsqlite3|Libs: -L${libdir} -lsqlite3 -ldl|g' \
+  $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/sqlite3.pc
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README* VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+# Add a COPYRIGHT file -- http://www.sqlite.org/copyright.html
+zcat $CWD/COPYRIGHT.gz > $PKG/usr/doc/$PRGNAM-$VERSION/COPYRIGHT
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/CVS
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
+
+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
+
diff --git a/source/ap/sudo/doinst.sh b/source/ap/sudo/doinst.sh
new file mode 100644
index 000000000..01e3d173e
--- /dev/null
+++ b/source/ap/sudo/doinst.sh
@@ -0,0 +1,14 @@
+#!/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 etc/sudoers.new
+rm -f etc/sudoers.new
diff --git a/source/ap/sudo/slack-desc b/source/ap/sudo/slack-desc
new file mode 100644
index 000000000..66f1aa8c9
--- /dev/null
+++ b/source/ap/sudo/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------------------------------------------------------|
+sudo: sudo (give limited root privileges to certain users)
+sudo:
+sudo: 'sudo' is a command that allows users to execute some commands as 
+sudo: root.  The /etc/sudoers file (edited with 'visudo') specifies which
+sudo: users have access to sudo and which commands they can run.  'sudo' 
+sudo: logs all its activities to /var/log/ so the system administrator
+sudo: can keep an eye on things.
+sudo:
+sudo:
+sudo:
+sudo:
diff --git a/source/ap/sudo/sudo.SlackBuild b/source/ap/sudo/sudo.SlackBuild
new file mode 100755
index 000000000..c170e868d
--- /dev/null
+++ b/source/ap/sudo/sudo.SlackBuild
@@ -0,0 +1,91 @@
+#!/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=1.6.8p12
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-sudo
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+cd $TMP
+rm -rf sudo-$VERSION
+tar xvf $CWD/sudo-$VERSION.tar.gz || exit 1
+cd sudo-$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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure --prefix=/usr --sbindir=/usr/sbin --with-getpass --with-C2
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+( cd $PKG/usr/bin
+  chmod 4711 sudo
+  ln -sf sudo sudoedit
+)
+chmod 755 $PKG/usr/sbin/visudo
+
+rm -f $PKG/usr/man/man8/sudoedit.8
+gzip -9 $PKG/usr/man/man?/*.?
+( cd $PKG/usr/man/man8 ; ln -sf sudo.8.gz sudoedit.8.gz )
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mv $PKG/etc/sudoers $PKG/etc/sudoers.new
+
+mkdir -p $PKG/usr/doc/sudo-$VERSION
+cp -a \
+  BUGS HISTORY INSTALL LICENSE PORTING README* \
+  RUNSON TODO TROUBLESHOOTING UPGRADE \
+  $PKG/usr/doc/sudo-$VERSION
+chmod 644 $PKG/usr/doc/sudo-$VERSION/*
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/sudo-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/sysstat/slack-desc b/source/ap/sysstat/slack-desc
new file mode 100644
index 000000000..e36d25ff9
--- /dev/null
+++ b/source/ap/sysstat/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------------------------------------------------------|
+sysstat: sysstat (system performance monitoring tools)
+sysstat:
+sysstat: The sysstat utilities are a collection of performance monitoring
+sysstat: tools for Linux.  These include sar, sadf, mpstat, iostat and sa
+sysstat: tools.
+sysstat:
+sysstat: The sysstat utilities were written by Sebastien Godard.
+sysstat:
+sysstat:
+sysstat:
+sysstat:
diff --git a/source/ap/sysstat/sysstat.SlackBuild b/source/ap/sysstat/sysstat.SlackBuild
new file mode 100755
index 000000000..399bb4bd4
--- /dev/null
+++ b/source/ap/sysstat/sysstat.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Copyright 2006, 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.
+
+
+PKGNAM=sysstat
+VERSION=${VERSION:-7.0.0}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf ${PKGNAM}-${VERSION}
+tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2
+cd ${PKGNAM}-$VERSION
+
+# 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 {} \;
+
+# Put the config file in /etc/sysstat, not /etc/sysconfig (a Red Hat thing):
+zcat $CWD/sysstat.etc.sysstat.diff.gz | patch -p1 --verbose || exit 1
+
+# PREFIX is hardcoded in some places, so this is just easier:
+zcat $CWD/sysstat.prefix.usr.diff.gz | patch -p1 --verbose || exit 1
+
+# Don't use /tmp in a script root will probably run... that's not good.
+zcat $CWD/sysstat.var.run.diff.gz | patch -p1 --verbose || exit 1
+
+make SA_LIB_DIR=/usr/lib${LIBDIRSUFFIX}/sa DESTDIR=$PKG || exit 1
+make install SA_LIB_DIR=/usr/lib${LIBDIRSUFFIX}/sa DESTDIR=$PKG || exit 1
+
+# Yeah, technically this is an init script that could go in /etc/rc.d/, but
+# I'd rather not put too many things in there.  If you need this, I'm sure
+# you will find it here:
+mkdir -p $PKG/etc/sysstat
+cp -a sysstat $PKG/etc/sysstat/sysstat
+chown root:root $PKG/etc/sysstat/sysstat
+chmod 755 $PKG/etc/sysstat/sysstat
+
+# 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 [ -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
+
+# Fix the documentation directory to preserve timestamps:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/*
+cp -a \
+  COPYING CREDITS FAQ README TODO sysstat-7.0.0.lsm \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $TMP/package-${PKGNAM}
+makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/sysstat/sysstat.etc.sysstat.diff b/source/ap/sysstat/sysstat.etc.sysstat.diff
new file mode 100644
index 000000000..f5cf15211
--- /dev/null
+++ b/source/ap/sysstat/sysstat.etc.sysstat.diff
@@ -0,0 +1,46 @@
+--- ./Makefile.orig	2006-07-05 10:46:04.000000000 -0500
++++ ./Makefile	2006-08-14 21:40:38.000000000 -0500
+@@ -34,7 +34,7 @@
+ MAN8_DIR = $(MAN_DIR)/man8
+ DOC_DIR = $(PREFIX)/doc/sysstat-$(VERSION)
+ NLS_DIR = $(PREFIX)/share/locale
+-SYSCONFIG_DIR = /etc/sysconfig
++SYSCONFIG_DIR = /etc/sysstat
+ 
+ # Compiler flags
+ CFLAGS = -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce
+--- ./sa2.in.orig	2006-06-09 03:17:26.000000000 -0500
++++ ./sa2.in	2006-08-14 21:38:35.000000000 -0500
+@@ -7,7 +7,7 @@
+ #   make history configurable
+ #
+ HISTORY=7
+-[ -r /etc/sysconfig/sysstat ] && . /etc/sysconfig/sysstat
++[ -r /etc/sysstat/sysstat ] && . /etc/sysstat/sysstat
+ [ ${HISTORY} -gt 28 ] && HISTORY=28
+ S_TIME_FORMAT=ISO ; export S_TIME_FORMAT
+ umask 0022
+--- ./README.orig	2006-07-05 10:51:54.000000000 -0500
++++ ./README	2006-08-14 21:39:27.000000000 -0500
+@@ -91,8 +91,8 @@
+ ${PREFIX}/doc/sysstat-x.y.z/*
+ /var/log/sa
+ ${INIT_DIR}/sysstat
+-/etc/sysconfig/sysstat
+-/etc/sysconfig/sysstat.ioconf
++/etc/sysstat/sysstat
++/etc/sysstat/sysstat.ioconf
+ /etc/cron.d/sysstat
+ /etc/rc.d/rc.sysstat		for [SLACKWARE]
+ ${RC_DIR}/rc2.d/S03sysstat
+--- ./ioconf.h.orig	2006-07-09 03:19:06.000000000 -0500
++++ ./ioconf.h	2006-08-14 21:36:48.000000000 -0500
+@@ -20,7 +20,7 @@
+ #define MAX_BLKDEV	255
+ #endif
+ 
+-#define IOCONF	"/etc/sysconfig/sysstat.ioconf"
++#define IOCONF	"/etc/sysstat/sysstat.ioconf"
+ 
+ #define K_NODEV	"nodev"
+ 
diff --git a/source/ap/sysstat/sysstat.prefix.usr.diff b/source/ap/sysstat/sysstat.prefix.usr.diff
new file mode 100644
index 000000000..c7c526b42
--- /dev/null
+++ b/source/ap/sysstat/sysstat.prefix.usr.diff
@@ -0,0 +1,42 @@
+--- ./build/Configure.sh.orig	2006-06-09 03:21:27.000000000 -0500
++++ ./build/Configure.sh	2006-08-14 21:54:37.000000000 -0500
+@@ -10,10 +10,10 @@
+ 
+ # Installation directory
+ 
+-PREFIX=`${ASK} 'Installation directory:' "/usr/local" "prefix"`
++PREFIX=`${ASK} 'Installation directory:' "/usr" "prefix"`
+ if [ ! -d ${PREFIX} ]; then
+-	echo "WARNING: Directory ${PREFIX} not found: Using default (/usr/local)."
+-	PREFIX=/usr/local
++	echo "WARNING: Directory ${PREFIX} not found: Using default (/usr)."
++	PREFIX=/usr
+ fi
+ 
+ # sadc directory
+--- ./build/CONFIG.def.orig	2006-06-09 03:20:56.000000000 -0500
++++ ./build/CONFIG.def	2006-08-14 21:54:19.000000000 -0500
+@@ -2,8 +2,8 @@
+ # (C) 2000-2006 Sebastien GODARD (sysstat <at> wanadoo.fr)
+ 
+ # Directories
+-PREFIX = /usr/local
+-SA_LIB_DIR = /usr/local/lib/sa
++PREFIX = /usr
++SA_LIB_DIR = /usr/lib/sa
+ SADC_PATH = ${SA_LIB_DIR}/sadc
+ SA_DIR = /var/log/sa
+ # Do not use ${PREFIX}/share/man by default: not necessarily in man path!
+--- ./build/CONFIG.orig	2006-07-09 04:47:17.000000000 -0500
++++ ./build/CONFIG	2006-08-14 21:54:10.000000000 -0500
+@@ -2,8 +2,8 @@
+ # (C) 2000-2006 Sebastien GODARD (sysstat <at> wanadoo.fr)
+ 
+ # Directories
+-PREFIX = /usr/local
+-SA_LIB_DIR = /usr/local/lib/sa
++PREFIX = /usr
++SA_LIB_DIR = /usr/lib/sa
+ SADC_PATH = ${SA_LIB_DIR}/sadc
+ SA_DIR = /var/log/sa
+ # Do not use ${PREFIX}/share/man by default: not necessarily in man path!
diff --git a/source/ap/sysstat/sysstat.var.run.diff b/source/ap/sysstat/sysstat.var.run.diff
new file mode 100644
index 000000000..3b54f37e6
--- /dev/null
+++ b/source/ap/sysstat/sysstat.var.run.diff
@@ -0,0 +1,28 @@
+--- ./sysstat.in.orig	2006-07-05 10:58:00.000000000 -0500
++++ ./sysstat.in	2006-08-14 22:03:13.000000000 -0500
+@@ -22,21 +22,21 @@
+ 
+ RETVAL=0
+ # Remove flag indicating that sadc was successfully launched
+-rm -f /tmp/sysstat.run
++rm -f /var/run/sysstat.run
+ 
+ # See how we were called.
+ case "$1" in
+   start)
+         echo -n "Calling the system activity data collector (sadc): "
+-        SU SA_LIB_DIR/sadc -F -L - && touch /tmp/sysstat.run QUOTE
++        SU SA_LIB_DIR/sadc -F -L - && touch /var/run/sysstat.run QUOTE
+ 
+ # Try to guess if sadc was successfully launched. The difficulty
+ # here is that the exit code is lost when the above command is
+ # run via "su foo -c ..."
+-	if [ ! -f /tmp/sysstat.run ]; then
++	if [ ! -f /var/run/sysstat.run ]; then
+ 		RETVAL=1
+ 	else
+-		rm -f /tmp/sysstat.run
++		rm -f /var/run/sysstat.run
+ 	fi
+         echo
+         ;;
diff --git a/source/ap/texinfo/dir b/source/ap/texinfo/dir
new file mode 100644
index 000000000..122b25fd4
--- /dev/null
+++ b/source/ap/texinfo/dir
@@ -0,0 +1,314 @@
+This is the file .../info/dir, which contains the
+topmost node of the Info hierarchy, called (dir)Top.
+The first time you invoke Info you start off looking at this node.
+
+File: dir,	Node: Top	This is the top of the INFO tree
+
+  This (the Directory node) gives a menu of major topics.
+  Typing "q" exits, "?" lists all Info commands, "d" returns here,
+  "h" gives a primer for first-timers,
+  "mEmacs<Return>" visits the Emacs manual, etc.
+
+  In Emacs, you can click mouse button 2 on a menu item or cross reference
+  to select it.
+
+* Menu:
+
+GNU packages
+* Diff: (diff).                 Comparing and merging files.
+
+Printing Tools
+* PreScript: (a2ps) PreScript.     Input language for a2ps
+* a2ps: (a2ps).                    PostScript Generating Utility
+* card: (a2ps) card.               Print Reference Cards
+* fixnt: (a2ps) fixnt.             Fixing Microsoft NT PostScript Files
+* fixps: (a2ps) fixps.             Fixing Some Ill Designed PostScript Files
+* ogonkify: (ogonkify).            Ogonkify
+* pdiff: (a2ps) pdiff.             Produce Pretty Comparison of Files
+* psmandup: (a2ps) psmandup.       Printing Duplex on Simplex Printers
+* psset: (a2ps) psset.             Inserting calls to setpagedevice
+
+Libraries
+* AA-lib: (aalib).              An ASCII-art graphics library
+* History: (history).       The GNU history library API
+* RLuserman: (rluserman).       The GNU readline library User's Manual.
+* Readline: (readline).       The GNU readline library API
+
+Emacs
+* Ada mode: (ada-mode). The GNU Emacs mode for editing Ada.
+* Autotype: (autotype). Convenient features for text that you enter frequently
+                          in Emacs.
+* CC Mode: (ccmode).   Emacs mode for editing C, C++, Objective-C,
+                          Java, Pike, and IDL code.
+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
+* Dired-X: (dired-x).   Dired Extra Features.
+* EUDC: (eudc).   A client for directory servers (LDAP, PH)
+* Ebrowse: (ebrowse).   A C++ class browser for Emacs.
+* Ediff: (ediff).       A visual interface for comparing and merging programs.
+* Emacs: (emacs).	The extensible self-documenting text editor.
+* Emacs FAQ: (efaq).	Frequently Asked Questions about Emacs.
+* Emacs MIME: (emacs-mime).   The MIME de/composition library.
+* Eshell: (eshell).     A command shell implemented in Emacs Lisp.
+* Forms: (forms).	Emacs package for editing data bases
+			  by filling in forms.
+* Gnus: (gnus).         The newsreader Gnus.
+* IDLWAVE: (idlwave).	Major mode and shell for IDL and WAVE/CL files.
+* MH-E: (mh-e).		Emacs interface to the MH mail system.
+* Message: (message).   Mail and news composition mode that goes with Gnus.
+* PCL-CVS: (pcl-cvs).	Emacs front-end to CVS.
+* RefTeX: (reftex).	Emacs support for LaTeX cross-references and citations.
+* SC: (sc).		Supercite lets you cite parts of messages you're
+			  replying to, in flexible ways.
+* Speedbar: (speedbar).        File/Tag summarizing utility.
+* VIP: (vip).		An older VI-emulation for Emacs.
+* VIPER: (viper).       The newest Emacs VI-emulation mode.
+                          (also, A VI Plan for Emacs Rescue
+                           or the VI PERil.)
+* Widget: (widget).      Documenting the "widget" package used by the
+                           Emacs Custom facility.
+* WoMan: (woman).       Browse UN*X Manual Pages `Wo (without) Man'.
+
+Miscellaneous
+* As: (as).                     The GNU assembler.
+* Bfd: (bfd).                   The Binary File Descriptor library.
+* Binutils: (binutils).         The GNU binary utilities.
+* CVS: (cvs).          Concurrent Versions System
+* Fdutils: (fdutils).        Fdutils: Linux' floppy utilities
+* File utilities: (fileutils).  GNU file utilities.
+* Finding Files: (find).        Listing and operating on files
+                                that match certain criteria.
+* Flex: (flex).         A fast scanner generator.
+* Gpm: (gpm).   A server wich hands mouse events to non-X programs.
+* Ld: (ld).                       The GNU linker.
+* Mtools: (mtools).        Mtools: utilities to access DOS disks in Unix.
+* Shar utilities: (sharutils).          GNU shar utilities.
+* Shell utilities: (sh-utils).          GNU shell utilities.
+* Standards: (standards).        GNU coding standards.
+* Text utilities: (textutils).          GNU text utilities.
+* UUCP: (uucp).                 Transfer mail and news across phone lines.
+* addr2line: (binutils)addr2line. Convert addresses to file and line
+* ar: (binutils)ar.               Create, modify, and extract from archives
+* basename: (sh-utils)basename invocation.      Strip directory and suffix.
+* bison: (bison).	GNU Project parser generator (yacc replacement).
+* c++filt: (binutils)c++filt.	  Filter to demangle encoded C++ symbols
+* cat: (textutils)cat invocation.               Concatenate and write files.
+* chgrp: (fileutils)chgrp invocation.           Change file groups.
+* chmod: (fileutils)chmod invocation.           Change file permissions.
+* chown: (fileutils)chown invocation.           Change file owners/groups.
+* chroot: (sh-utils)chroot invocation.          Specify the root directory.
+* cksum: (textutils)cksum invocation.           Print POSIX CRC checksum.
+* comm: (textutils)comm invocation.             Compare sorted files by line.
+* cp: (fileutils)cp invocation.                 Copy files.
+* cpio: (cpio).                 Making tape (or disk) archives.
+* csplit: (textutils)csplit invocation.         Split by context.
+* cut: (textutils)cut invocation.               Print selected parts of lines.
+* cxxfilt: (binutils)c++filt.     MS-DOS name for c++filt
+* date: (sh-utils)date invocation.              Print/set system date and time.
+* dc: (dc).                   Arbritrary precision RPN "Desktop Calculator".
+* dd: (fileutils)dd invocation.                 Copy and convert a file.
+* df: (fileutils)df invocation.                 Report filesystem disk usage.
+* dir: (fileutils)dir invocation.               List directories briefly.
+* dircolors: (fileutils)dircolors invocation.   Color setup for ls.
+* dirname: (sh-utils)dirname invocation.        Strip non-directory suffix.
+* dlltool: (binutils)dlltool.	  Create files needed to build and use DLLs
+* du: (fileutils)du invocation.                 Report on disk usage.
+* echo: (sh-utils)echo invocation.              Print a line of text.
+* env: (sh-utils)env invocation.                Modify the environment.
+* expand: (textutils)expand invocation.         Convert tabs to spaces.
+* expr: (sh-utils)expr invocation.              Evaluate expressions.
+* factor: (sh-utils)factor invocation.          Print prime factors
+* false: (sh-utils)false invocation.            Do nothing, unsuccessfully.
+* fmt: (textutils)fmt invocation.               Reformat paragraph text.
+* fold: (textutils)fold invocation.             Wrap long input lines.
+* gasp: (gasp).                     The GNU Assembler Preprocessor
+* gprof: (gprof).                Profiling your program's execution
+* grep: (grep).                   print lines matching a pattern.
+* groups: (sh-utils)groups invocation.          Print group names a user is in.
+* head: (textutils)head invocation.             Output the first part of files.
+* hostname: (sh-utils)hostname invocation.      Print or set system name.
+* id: (sh-utils)id invocation.                  Print real/effective uid/gid.
+* install: (fileutils)install invocation.       Copy and change attributes.
+* ipc: (ipc).           System V style inter process communication
+* join: (textutils)join invocation.             Join lines on a common field.
+* ln: (fileutils)ln invocation.                 Make links between files.
+* logname: (sh-utils)logname invocation.        Print current login name.
+* ls: (fileutils)ls invocation.                 List directory contents.
+* m4: (m4).			A powerful macro processor.
+* mail-files: (sharutils)mail-files invocation. Send files to remote site.
+* mailshar: (sharutils)mailshar invocation.     Make and send a shell archive.
+* md5sum: (textutils)md5sum invocation.         Print or check message-digests.
+* mkdir: (fileutils)mkdir invocation.           Create directories.
+* mkfifo: (fileutils)mkfifo invocation.         Create FIFOs (named pipes).
+* mknod: (fileutils)mknod invocation.           Create special files.
+* mv: (fileutils)mv invocation.                 Rename files.
+* mysql: (mysql).               MySQL documentation.
+* nice: (sh-utils)nice invocation.              Modify scheduling priority.
+* nl: (textutils)nl invocation.                 Number lines and write files.
+* nlmconv: (binutils)nlmconv.     Converts object code into an NLM
+* nm: (binutils)nm.               List symbols from object files
+* nohup: (sh-utils)nohup invocation.            Immunize to hangups.
+* objcopy: (binutils)objcopy.	  Copy and translate object files
+* objdump: (binutils)objdump.     Display information from object files
+* od: (textutils)od invocation.                 Dump files in octal, etc.
+* paste: (textutils)paste invocation.           Merge lines of files.
+* pathchk: (sh-utils)pathchk invocation.        Check file name portability.
+* pr: (textutils)pr invocation.                 Paginate or columnate files.
+* printenv: (sh-utils)printenv invocation.      Print environment variables.
+* printf: (sh-utils)printf invocation.          Format and print data.
+* ptx: (textutils)ptx invocation.               Produce permuted indexes.
+* pwd: (sh-utils)pwd invocation.                Print working directory.
+* ranlib: (binutils)ranlib.       Generate index to archive contents
+* readelf: (binutils)readelf.	  Display the contents of ELF format files.
+* remsync: (sharutils)remsync invocation.       Synchronize remote files.
+* rm: (fileutils)rm invocation.                 Remove files.
+* rmdir: (fileutils)rmdir invocation.           Remove empty directories.
+* sed: (sed).                   Stream EDitor.
+* seq: (sh-utils)seq invocation.                Print numeric sequences
+* shar: (sharutils)shar invocation.             Make a shell archive.
+* shred: (fileutils)shred invocation.           Remove files more securely.
+* size: (binutils)size.           List section sizes and total size
+* sleep: (sh-utils)sleep invocation.            Delay for a specified time.
+* sort: (textutils)sort invocation.             Sort text files.
+* split: (textutils)split invocation.           Split into fixed-size pieces.
+* strings: (binutils)strings.     List printable strings from files
+* strip: (binutils)strip.         Discard symbols
+* stty: (sh-utils)stty invocation.              Print/change terminal settings.
+* su: (sh-utils)su invocation.                  Modify user and group id.
+* sum: (textutils)sum invocation.               Print traditional checksum.
+* sync: (fileutils)sync invocation.             Synchronize memory and disk.
+* tac: (textutils)tac invocation.               Reverse files.
+* tail: (textutils)tail invocation.             Output the last part of files.
+* tee: (sh-utils)tee invocation.                Redirect to multiple files.
+* test: (sh-utils)test invocation.              File/string tests.
+* touch: (fileutils)touch invocation.           Change file timestamps.
+* tr: (textutils)tr invocation.                 Translate characters.
+* true: (sh-utils)true invocation.              Do nothing, successfully.
+* tsort: (textutils)tsort invocation.           Topological sort.
+* tty: (sh-utils)tty invocation.                Print terminal name.
+* uname: (sh-utils)uname invocation.            Print system information.
+* unexpand: (textutils)unexpand invocation.     Convert spaces to tabs.
+* uniq: (textutils)uniq invocation.             Uniquify files.
+* unshar: (sharutils)unshar invocation.         Explode a shell archive.
+* users: (sh-utils)users invocation.            Print current user names.
+* uudecode: (sharutils)uudecode invocation.     Restore file from 7-bits.
+* uuencode: (sharutils)uuencode invocation.     Force binary file to 7-bits.
+* vdir: (fileutils)vdir invocation.             List directories verbosely.
+* wc: (textutils)wc invocation.                 Byte, word, and line counts.
+* who: (sh-utils)who invocation.                Print who is logged in.
+* whoami: (sh-utils)whoami invocation.          Print effective user id.
+* windres: (binutils)windres.	  Manipulate Windows resources
+* yes: (sh-utils)yes invocation.                Print a string indefinitely.
+
+GNU admin
+* Autoconf: (autoconf).         Create source code configuration scripts
+
+Individual utilities
+* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
+* autoconf: (autoconf)autoconf Invocation.
+                                How to create configuration scripts
+* autoconf-invocation: (autoconf)autoconf Invocation.
+                                                How to create configuration 
+                                                  scripts
+* autoheader: (autoconf)autoheader Invocation.  How to create configuration 
+                                                  templates
+* autom4te: (autoconf)autom4te Invocation.      The Autoconf executables 
+                                                  backbone
+* automake: (automake)Invoking Automake.        Generating Makefile.in.
+* autoreconf: (autoconf)autoreconf Invocation.  Remaking multiple `configure' 
+                                                  scripts
+* autoscan: (autoconf)autoscan Invocation.      Semi-automatic `configure.ac' 
+                                                  writing
+* autoupdate: (autoconf)autoupdate Invocation.  Automatic update of 
+                                                  `configure.ac'
+* awk: (gawk)Invoking gawk.           Text scanning and processing.
+* cmp: (diff)Invoking cmp.                      Compare 2 files byte by byte.
+* config.status: (autoconf)config.status Invocation.
+                                                Recreating configurations.
+* configure: (autoconf)configure Invocation.    Configuring a package.
+* diff: (diff)Invoking diff.                    Compare 2 files line by line.
+* diff3: (diff)Invoking diff3.                  Compare 3 files line by line.
+* ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
+* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
+* patch: (diff)Invoking patch.                  Apply a patch to a file.
+* sdiff: (diff)Invoking sdiff.                  Merge 2 files side-by-side.
+* tar: (tar)tar invocation.                     Invoking GNU `tar'
+* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
+
+GNU programming tools
+* Libtool: (libtool).           Generic shared library support script.
+This is libtool.info, produced by makeinfo version 4.11 from libtool.texi.
+* automake: (automake).		Making Makefile.in's
+
+Software development
+* Autoconf: (autoconf).         Create source code configuration scripts.
+* Automake: (automake).         Making GNU standards-compliant Makefiles.
+
+Utilities
+* Bash: (bash).                     The GNU Bourne-Again SHell.
+* Enscript: (enscript).		    GNU Enscript
+* Gzip: (gzip).                 The gzip command for compressing files.
+* ZSH: (zsh).                     The Z Shell Manual.
+
+Programming
+* Cpp: (cpp).		       The GNU C preprocessor.
+* cvsclient: (cvsclient).      The CVS client/server protocol.
+* g77: (g77).                  The GNU Fortran compiler.
+* gcc: (gcc).                  The GNU Compiler Collection.
+
+GNU Packages
+* Gawk: (gawk).           A text scanning and processing language.
+* Gawkinet: (gawkinet).    TCP/IP Internetworking With `gawk'.
+* Make: (make).            Remake files automatically.
+* Tar: (tar).			Making tape (or disk) archives.
+
+Programming & development tools.
+* Gdb: (gdb).                     The GNU debugger.
+* Gdb-Internals: (gdbint).	The GNU debugger's internals.
+
+User Interface Toolkit
+* GDK: (gdk).		The General Drawing Kit
+* GTK: (gtk).		The GIMP Toolkit
+
+GNU Gettext Utilities
+* Gettext: (gettext).                           GNU gettext utilities.
+* gettextize: (gettext)gettextize Invocation.   Prepare a package for gettext.
+* msgfmt: (gettext)msgfmt Invocation.           Make MO files out of PO files.
+* msgmerge: (gettext)msgmerge Invocation.       Update two PO files into one.
+* xgettext: (gettext)xgettext Invocation.       Extract strings into a PO file.
+
+Library of useful routines for 'C' programing
+* GLIB: (glib).        useful routines for 'C' programming
+
+GNU libraries
+* Libc: (libc).                 C library.
+* gmp: (gmp).                   GNU Multiple Precision Arithmetic Library.
+
+Indent Code Formatter
+* Indent: (indent).		C code formatter.
+
+Texinfo documentation system
+* Info: (info).                 Documentation browsing system.
+* Standalone info program: (info-stnd).    Standalone Info-reading program.
+* Texinfo: (texinfo).           The GNU documentation format.
+* install-info: (texinfo)Invoking install-info. Update info/dir entries.
+* makeinfo: (texinfo)makeinfo Preferred.        Translate Texinfo source.
+* texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
+* texindex: (texinfo)Format with tex/texindex.  Sort Texinfo index files.
+
+Development
+* libext2fs: (libext2fs.info).  The EXT2FS library.
+
+C library code
+* Regex: (regex).                  Regular expression library.
+
+General Commands
+* Screen: (screen).             Full-screen window manager.
+
+Net Utilities
+* Wget: (wget).         The non-interactive network downloader.
+
+World Wide Web
+* Wget: (wget).         The non-interactive network downloader.
+
+Games
+* xboard: (xboard).         An X Window System graphical chessboard.
diff --git a/source/ap/texinfo/doinst.sh b/source/ap/texinfo/doinst.sh
new file mode 100644
index 000000000..ab42f74f4
--- /dev/null
+++ b/source/ap/texinfo/doinst.sh
@@ -0,0 +1,11 @@
+# If no dir file exists, we'll assume it's a fresh installation and create one
+# Otherwise, we'll throw out the new copy to preserve what's already installed
+if [ -e usr/info/dir ]; then
+  # If there is no topmost node, this dir file is broken, so replace it:
+  if ! grep -q "Node: Top" usr/info/dir ; then
+    mv usr/info/dir.new usr/info/dir
+  fi
+else
+  mv usr/info/dir.new usr/info/dir
+fi
+
diff --git a/source/ap/texinfo/slack-desc b/source/ap/texinfo/slack-desc
new file mode 100644
index 000000000..597f5520c
--- /dev/null
+++ b/source/ap/texinfo/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------------------------------------------------------|
+texinfo: texinfo (GNU software documentation system)
+texinfo:
+texinfo: 'Texinfo' is a documentation system that uses a single source file to
+texinfo: produce both on-line information and printed output.  Using Texinfo,
+texinfo: you can create a printed document with the normal features of a book,
+texinfo: including chapters, sections, cross references, and indices.  From the
+texinfo: same Texinfo source file, you can create a menu-driven, on-line Info
+texinfo: file with nodes, menus, cross references, and indices.
+texinfo:
+texinfo: This package is needed to read the documentation files in /usr/info.
+texinfo:
diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild
new file mode 100755
index 000000000..8c505a55a
--- /dev/null
+++ b/source/ap/texinfo/texinfo.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VERSION=${VERSION:-4.13}
+PKG_VERSION=${PKG_VERSION:-${VERSION}a}
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-3}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-texinfo
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+tar xvf $CWD/texinfo-$PKG_VERSION.tar.?z* || exit 1
+cd texinfo-$VERSION
+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="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/texinfo-$PKG_VERSION \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG
+
+# Be sure this is "fresh"
+zcat $CWD/dir.gz > $PKG/usr/info/dir
+mv $PKG/usr/info/dir $PKG/usr/info/dir.new
+
+gzip -9 $PKG/usr/info/*info*
+gzip -9 $PKG/usr/man/man?/*
+
+mkdir -p $PKG/usr/doc/texinfo-$PKG_VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING* INSTALL INTRODUCTION NEWS README* TODO \
+  $PKG/usr/doc/texinfo-$PKG_VERSION
+chmod 644 $PKG/usr/doc/texinfo-$PKG_VERSION/*
+chown -R root:root $PKG/usr/doc/texinfo-$PKG_VERSION
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/texinfo-$PKG_VERSION-$ARCH-$BUILD.txz
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/texinfo-$VERSION
+  rm -rf $PKG
+fi
diff --git a/source/ap/vbetool/slack-desc b/source/ap/vbetool/slack-desc
new file mode 100644
index 000000000..c43966918
--- /dev/null
+++ b/source/ap/vbetool/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------------------------------------------------------|
+vbetool: vbetool (video bios execution tool)
+vbetool: 
+vbetool: vbetool is a small application that executes code from the BIOS of 
+vbetool: your video card. 
+vbetool: 
+vbetool: This is mostly useful for reinitialising the hardware, for instance 
+vbetool: after ACPI suspend/resuming. 
+vbetool: 
+vbetool: Homepage: http://www.codon.org.uk/~mjg59/vbetool/
+vbetool: 
+vbetool: 
diff --git a/source/ap/vbetool/vbetool.SlackBuild b/source/ap/vbetool/vbetool.SlackBuild
new file mode 100755
index 000000000..fcd23c9fd
--- /dev/null
+++ b/source/ap/vbetool/vbetool.SlackBuild
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Copyright 2008  Robby Workman, Northport, Alabama, USA
+# 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=1.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-vbetool
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf vbetool-$VERSION
+tar xvf $CWD/vbetool-$VERSION.tar.gz
+cd vbetool-$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 {} \;
+
+autoreconf
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/vbetool-$VERSION \
+  --with-x86emu \
+  --build=$ARCH-slackware-linux
+
+make || exit 1
+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
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/usr/doc/vbetool-$VERSION
+cp -a COPYING $PKG/usr/doc/vbetool-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/vbetool-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/vbetool/vbetool.info b/source/ap/vbetool/vbetool.info
new file mode 100644
index 000000000..0538212ea
--- /dev/null
+++ b/source/ap/vbetool/vbetool.info
@@ -0,0 +1,2 @@
+HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
+DOWNLOAD="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz"
diff --git a/source/ap/vim/doinst.sh b/source/ap/vim/doinst.sh
new file mode 100644
index 000000000..f1ccd5ca3
--- /dev/null
+++ b/source/ap/vim/doinst.sh
@@ -0,0 +1,5 @@
+
+# If there's no vi link, take over:
+if [ ! -r usr/bin/vi ]; then
+  ( cd usr/bin ; ln -sf vim vi )
+fi
diff --git a/source/ap/vim/gvim.desktop b/source/ap/vim/gvim.desktop
new file mode 100644
index 000000000..520c72e61
--- /dev/null
+++ b/source/ap/vim/gvim.desktop
@@ -0,0 +1,120 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Vi IMproved
+Name[af]=Vi Verbeterde
+Name[ar]=�ي.أي المحسن
+Name[bn]=ভি-আই উন�নত
+Name[br]=Vi gwellaet
+Name[ca]=Vi millorat
+Name[cy]=VIM (Vi wedi'i wella)
+Name[da]=Vi IMproved (Vi forbedret)
+Name[eo]=VIM
+Name[fa]=Vi پیشر�ت کرده VIM
+Name[hi]=वीआई इम�प�रूव�ड
+Name[hu]=VIM
+Name[is]=Vi endurbættur (vim)
+Name[it]=Vi iMproved
+Name[ko]=� 나� Vi
+Name[mn]=Сайжир�ан Vi
+Name[nso]=KAonafaditswe ka Vi
+Name[oc]=VI aMillorat
+Name[pl]=Poprawiony VI (vim)
+Name[pt_BR]=Vi melhorado
+Name[ru]=Улучшенный vi
+Name[rw]=Vi Ivuguruwe
+Name[sl]=Izboljšani vi (vim)
+Name[sv]=Förbättrad Vi
+Name[ta]=Vi மேம�பட�த�தப�பட�ட
+Name[tg]=Vi пешрафт кардаи VIM
+Name[th]=VI IMprove
+Name[uz]=Яхшиланган Vi
+Name[ven]=Vi Khwinifhadzhwa
+Name[vi]=Vi Cải tiến
+Name[wa]=VIM
+Name[zh_CN]=改进的 VI (VIM)
+Name[zh_TW]=VIM
+Name[zu]=I-Vi yenziwe ngcono
+GenericName=Text Editor
+GenericName[af]=Teks Redigeerder
+GenericName[ar]=محرر نصوص
+GenericName[az]=Mətn Editoru
+GenericName[be]=Т�к�тавы р�дактар
+GenericName[bg]=Тек�тов редактор
+GenericName[bn]=টেক�সট সম�পাদক
+GenericName[br]=Aozer skrid
+GenericName[bs]=Tekst editor
+GenericName[ca]=Editor de text
+GenericName[cs]=Textový editor
+GenericName[cy]=Golygydd Testun
+GenericName[da]= Teksteditor
+GenericName[de]=Texteditor
+GenericName[el]=Επεξε�γαστής κειμένου
+GenericName[eo]=Tekstredaktilo
+GenericName[es]=Editor de texto
+GenericName[et]=Tekstiredaktor
+GenericName[eu]=Testu editorea
+GenericName[fa]=ویرایشگر متن
+GenericName[fi]=Tekstieditori
+GenericName[fo]=Tekstritil
+GenericName[fr]=Éditeur de texte
+GenericName[fy]=Tekst Bewurker
+GenericName[ga]=Eagarthóir Téacs
+GenericName[gl]=Editor de Textos
+GenericName[he]=עורך טקסט
+GenericName[hi]=पाठ संपादक
+GenericName[hr]=Uređiva� teksta
+GenericName[hsb]=Wobdźěłar tekstow
+GenericName[hu]=Szövegszerkesztő
+GenericName[is]=Textaritill
+GenericName[it]=Editor di testi
+GenericName[ja]=テキストエディタ
+GenericName[km]=កម្មវិធី​វាយ​អ�្�បទ
+GenericName[ko]=글월 편집기
+GenericName[lo]=ເຄື່ອງມື��້ໄຂຂ�້ຄວາມ
+GenericName[lt]=Teksto rengyklÄ—
+GenericName[lv]=Teksta Redaktors
+GenericName[mk]=Уредувач на тек�т
+GenericName[mn]=Тек�т болов�руулагч
+GenericName[ms]=Penyunting Teks
+GenericName[mt]=Editur tat-test
+GenericName[nb]=Skriveprogram
+GenericName[nds]=Texteditor
+GenericName[nl]=Teksteditor
+GenericName[nn]=Skriveprogram
+GenericName[nso]=Mofetosi wa Sengwalwana
+GenericName[pa]=ਪਾਠ ਸੰਪਾਦਕ
+GenericName[pl]=Edytor tekstu
+GenericName[pt]=Editor de Texto
+GenericName[pt_BR]=Editor de Texto
+GenericName[ro]=Editor de text
+GenericName[ru]=Тек�товый редактор
+GenericName[rw]=Muhinduzi Umwandiko
+GenericName[se]=Čállinprográmma
+GenericName[sk]=Textový editor
+GenericName[sl]=Urejevalnik besedil
+GenericName[sr]=Уређивач тек�та
+GenericName[sr@Latn]=Uređiva� teksta
+GenericName[ss]=Sihleli sembhalo
+GenericName[sv]=Texteditor
+GenericName[ta]=உரை தொக�ப�பாளர�
+GenericName[tg]=Муҳаррири матн
+GenericName[th]=โปร��รม��้ไขข้อความ
+GenericName[tr]=Metin Düzenleyici
+GenericName[tt]=Mäten Tözätkeçe
+GenericName[uk]=Редактор тек�тів
+GenericName[uz]=Матн таҳрирчи
+GenericName[ven]=Musengulusi wa Manwalwa
+GenericName[vi]=Trình soạn văn bản
+GenericName[wa]=Aspougneu di tecse
+GenericName[xh]=Umhleli Wombhalo
+GenericName[zh_CN]=文本编辑器
+GenericName[zh_TW]=文字編輯器
+GenericName[zu]=Umlungisi wombhalo
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=gvim -f %f
+Icon=gvim.png
+Type=Application
+Terminal=false
+X-KDE-StartupNotify=true
+X-KDE-AuthorizeAction=shell_access
+Categories=TextEditor;
diff --git a/source/ap/vim/gvim.png b/source/ap/vim/gvim.png
new file mode 100644
index 000000000..2bdc8bd8c
--- /dev/null
+++ b/source/ap/vim/gvim.png
diff --git a/source/ap/vim/patches/7.2.001 b/source/ap/vim/patches/7.2.001
new file mode 100644
index 000000000..3bcb7d090
--- /dev/null
+++ b/source/ap/vim/patches/7.2.001
@@ -0,0 +1,61 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.001
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.001
+Problem:    Mac: pseudo-ttys don't work properly on Leopard, resulting in the
+            shell not to have a prompt, CTRL-C not working, etc.
+Solution:   Don't use SVR4 compatible ptys, even though they are detected.
+            (Ben Schmidt)
+Files:      src/pty.c
+
+
+*** ../vim-7.2.000/src/pty.c	Wed Aug  6 19:04:29 2008
+--- src/pty.c	Fri Aug 15 04:00:34 2008
+***************
+*** 270,278 ****
+  }
+  #endif
+  
+! #if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux)
+  
+! /* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! */
+  #define PTY_DONE
+      int
+  OpenPTY(ttyn)
+--- 270,279 ----
+  }
+  #endif
+  
+! #if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) && !defined(MACOS_X)
+  
+! /* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work!
+!  * Same for Mac OS X Leopard. */
+  #define PTY_DONE
+      int
+  OpenPTY(ttyn)
+*** ../vim-7.2.000/src/version.c	Sat Aug  9 19:37:37 2008
+--- src/version.c	Sun Aug 17 22:56:25 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     1,
+  /**/
+
+-- 
+ARTHUR:       Now stand aside worthy adversary.
+BLACK KNIGHT: (Glancing at his shoulder) 'Tis but a scratch.
+ARTHUR:       A scratch?  Your arm's off.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.002 b/source/ap/vim/patches/7.2.002
new file mode 100644
index 000000000..e1ee32cd5
--- /dev/null
+++ b/source/ap/vim/patches/7.2.002
@@ -0,0 +1,47 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.002
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.002
+Problem:    Leaking memory when displaying menus.
+Solution:   Free allocated memory. (Dominique Pelle)
+Files:      src/menu.c
+
+
+*** ../vim-7.2.001/src/menu.c	Wed Jun 25 00:19:17 2008
+--- src/menu.c	Sat Aug 16 05:38:45 2008
+***************
+*** 1120,1125 ****
+--- 1120,1126 ----
+  	parent = menu;
+  	menu = menu->children;
+      }
++     vim_free(path_name);
+  
+      /* Now we have found the matching menu, and we list the mappings */
+  						    /* Highlight title */
+*** ../vim-7.2.001/src/version.c	Sun Aug 17 23:01:21 2008
+--- src/version.c	Sun Aug 17 23:42:53 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     2,
+  /**/
+
+-- 
+ARTHUR:       You are indeed brave Sir knight, but the fight is mine.
+BLACK KNIGHT: Had enough?
+ARTHUR:       You stupid bastard.  You havn't got any arms left.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.003 b/source/ap/vim/patches/7.2.003
new file mode 100644
index 000000000..626d81e5a
--- /dev/null
+++ b/source/ap/vim/patches/7.2.003
@@ -0,0 +1,107 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.003
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.003
+Problem:    Typo in translated message.  Message not translated.
+Solution:   Correct spelling. Add _(). (Dominique Pelle)
+Files:      src/spell.c, src/version.c
+
+
+*** ../vim-7.2.002/src/spell.c	Tue Jun 24 22:21:31 2008
+--- src/spell.c	Sun Aug 10 12:51:38 2008
+***************
+*** 77,83 ****
+  
+  /*
+   * Do the opposite: based on a maximum end score and a known sound score,
+!  * compute the the maximum word score that can be used.
+   */
+  #define MAXSCORE(word_score, sound_score) ((4 * word_score - sound_score) / 3)
+  
+--- 77,83 ----
+  
+  /*
+   * Do the opposite: based on a maximum end score and a known sound score,
+!  * compute the maximum word score that can be used.
+   */
+  #define MAXSCORE(word_score, sound_score) ((4 * word_score - sound_score) / 3)
+  
+***************
+*** 625,631 ****
+  /* TRUE if a word appears in the list of banned words.  */
+  #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&su->su_banned, word)))
+  
+! /* Number of suggestions kept when cleaning up.  we need to keep more than
+   * what is displayed, because when rescore_suggestions() is called the score
+   * may change and wrong suggestions may be removed later. */
+  #define SUG_CLEAN_COUNT(su)    ((su)->su_maxcount < 130 ? 150 : (su)->su_maxcount + 20)
+--- 625,631 ----
+  /* TRUE if a word appears in the list of banned words.  */
+  #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&su->su_banned, word)))
+  
+! /* Number of suggestions kept when cleaning up.  We need to keep more than
+   * what is displayed, because when rescore_suggestions() is called the score
+   * may change and wrong suggestions may be removed later. */
+  #define SUG_CLEAN_COUNT(su)    ((su)->su_maxcount < 130 ? 150 : (su)->su_maxcount + 20)
+***************
+*** 5980,5986 ****
+  	else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
+  	    MSG(_("Too many compound flags"));
+  	else
+! 	    MSG(_("Too many posponed prefixes and/or compound flags"));
+      }
+  
+      if (syllable != NULL)
+--- 5980,5986 ----
+  	else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
+  	    MSG(_("Too many compound flags"));
+  	else
+! 	    MSG(_("Too many postponed prefixes and/or compound flags"));
+      }
+  
+      if (syllable != NULL)
+*** ../vim-7.2.002/src/version.c	Sun Aug 17 23:43:53 2008
+--- src/version.c	Mon Aug 25 04:06:52 2008
+***************
+*** 790,796 ****
+      MSG_PUTS(_("\nRISC OS version"));
+  #endif
+  #ifdef VMS
+!     MSG_PUTS("\nOpenVMS version");
+  # ifdef HAVE_PATHDEF
+      if (*compiled_arch != NUL)
+      {
+--- 792,798 ----
+      MSG_PUTS(_("\nRISC OS version"));
+  #endif
+  #ifdef VMS
+!     MSG_PUTS(_("\nOpenVMS version"));
+  # ifdef HAVE_PATHDEF
+      if (*compiled_arch != NUL)
+      {
+*** ../vim-7.2.002/src/version.c	Sun Aug 17 23:43:53 2008
+--- src/version.c	Mon Aug 25 04:06:52 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     3,
+  /**/
+
+-- 
+I learned the customs and mannerisms of engineers by observing them, much the
+way Jane Goodall learned about the great apes, but without the hassle of
+grooming.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.004 b/source/ap/vim/patches/7.2.004
new file mode 100644
index 000000000..8e7ed3e9d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.004
@@ -0,0 +1,103 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.004
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.004
+Problem:    Cscope help message is not translated.
+Solution:   Put it in _(). (Dominique Pelle)
+Files:      src/if_cscope.c, src/if_cscope.h
+
+
+*** ../vim-7.2.003/src/if_cscope.c	Tue Jun 24 23:52:06 2008
+--- src/if_cscope.c	Mon Aug 25 04:34:19 2008
+***************
+*** 74,80 ****
+      { "add",	cs_add,
+  		N_("Add a new database"),     "add file|dir [pre-path] [flags]", 0 },
+      { "find",	cs_find,
+! 		N_("Query for a pattern"),    FIND_USAGE, 1 },
+      { "help",	cs_help,
+  		N_("Show this message"),      "help", 0 },
+      { "kill",	cs_kill,
+--- 74,80 ----
+      { "add",	cs_add,
+  		N_("Add a new database"),     "add file|dir [pre-path] [flags]", 0 },
+      { "find",	cs_find,
+! 		N_("Query for a pattern"),    "find c|d|e|f|g|i|s|t name", 1 },
+      { "help",	cs_help,
+  		N_("Show this message"),      "help", 0 },
+      { "kill",	cs_kill,
+***************
+*** 1180,1186 ****
+  	(void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
+  				      cmdp->name, _(cmdp->help), cmdp->usage);
+  	if (strcmp(cmdp->name, "find") == 0)
+! 	    MSG_PUTS(FIND_HELP);
+  	cmdp++;
+      }
+  
+--- 1180,1195 ----
+  	(void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
+  				      cmdp->name, _(cmdp->help), cmdp->usage);
+  	if (strcmp(cmdp->name, "find") == 0)
+! 	    MSG_PUTS(_("\n"
+! 		       "       c: Find functions calling this function\n"
+! 		       "       d: Find functions called by this function\n"
+! 		       "       e: Find this egrep pattern\n"
+! 		       "       f: Find this file\n"
+! 		       "       g: Find this definition\n"
+! 		       "       i: Find files #including this file\n"
+! 		       "       s: Find this C symbol\n"
+! 		       "       t: Find assignments to\n"));
+! 
+  	cmdp++;
+      }
+  
+*** ../vim-7.2.003/src/if_cscope.h	Thu Sep  6 17:38:58 2007
+--- src/if_cscope.h	Mon Aug 25 04:34:17 2008
+***************
+*** 42,58 ****
+   * f 7name	Find this file
+   * i 8name	Find files #including this file
+   */
+- #define	FIND_USAGE "find c|d|e|f|g|i|s|t name"
+- #define FIND_HELP "\n\
+-        c: Find functions calling this function\n\
+-        d: Find functions called by this function\n\
+-        e: Find this egrep pattern\n\
+-        f: Find this file\n\
+-        g: Find this definition\n\
+-        i: Find files #including this file\n\
+-        s: Find this C symbol\n\
+-        t: Find assignments to\n"
+- 
+  
+  typedef struct {
+      char *  name;
+--- 42,47 ----
+*** ../vim-7.2.003/src/version.c	Mon Aug 25 04:12:38 2008
+--- src/version.c	Mon Aug 25 04:29:53 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     4,
+  /**/
+
+-- 
+If someone questions your market projections, simply point out that your
+target market is "People who are nuts" and "People who will buy any damn
+thing".  Nobody is going to tell you there aren't enough of those people
+to go around.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.005 b/source/ap/vim/patches/7.2.005
new file mode 100644
index 000000000..20cce85b3
--- /dev/null
+++ b/source/ap/vim/patches/7.2.005
@@ -0,0 +1,149 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.005
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.005
+Problem:    A few problems when profiling.  Using flag pointer instead of flag
+            value.  Allocating zero bytes.  Not freeing used memory.
+Solution:   Remove wrong '&' characters.  Skip dumping when there is nothing
+            to dump.  Free used memory. (Dominique Pelle)
+Files:      src/eval.c
+
+
+*** ../vim-7.2.004/src/eval.c	Fri Aug  8 12:36:31 2008
+--- src/eval.c	Mon Aug 25 04:40:11 2008
+***************
+*** 3657,3664 ****
+  }
+  
+  /*
+!  * Return TRUE if typeval "tv" is locked: Either tha value is locked itself or
+!  * it refers to a List or Dictionary that is locked.
+   */
+      static int
+  tv_islocked(tv)
+--- 3657,3664 ----
+  }
+  
+  /*
+!  * Return TRUE if typeval "tv" is locked: Either that value is locked itself
+!  * or it refers to a List or Dictionary that is locked.
+   */
+      static int
+  tv_islocked(tv)
+***************
+*** 15838,15847 ****
+      if (res == FAIL)
+  	res = ITEM_COMPARE_FAIL;
+      else
+- 	/* return value has wrong type */
+  	res = get_tv_number_chk(&rettv, &item_compare_func_err);
+      if (item_compare_func_err)
+! 	res = ITEM_COMPARE_FAIL;
+      clear_tv(&rettv);
+      return res;
+  }
+--- 15838,15846 ----
+      if (res == FAIL)
+  	res = ITEM_COMPARE_FAIL;
+      else
+  	res = get_tv_number_chk(&rettv, &item_compare_func_err);
+      if (item_compare_func_err)
+! 	res = ITEM_COMPARE_FAIL;  /* return value has wrong type */
+      clear_tv(&rettv);
+      return res;
+  }
+***************
+*** 20590,20595 ****
+--- 20589,20597 ----
+      int		st_len = 0;
+  
+      todo = (int)func_hashtab.ht_used;
++     if (todo == 0)
++ 	return;     /* nothing to dump */
++ 
+      sorttab = (ufunc_T **)alloc((unsigned)(sizeof(ufunc_T) * todo));
+  
+      for (hi = func_hashtab.ht_array; todo > 0; ++hi)
+***************
+*** 20638,20643 ****
+--- 20640,20647 ----
+  							      prof_self_cmp);
+  	prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
+      }
++ 
++     vim_free(sorttab);
+  }
+  
+      static void
+***************
+*** 21204,21210 ****
+  	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
+  	    func_do_profile(fp);
+  	if (fp->uf_profiling
+! 		       || (fc.caller != NULL && &fc.caller->func->uf_profiling))
+  	{
+  	    ++fp->uf_tm_count;
+  	    profile_start(&call_start);
+--- 21208,21214 ----
+  	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
+  	    func_do_profile(fp);
+  	if (fp->uf_profiling
+! 		       || (fc.caller != NULL && fc.caller->func->uf_profiling))
+  	{
+  	    ++fp->uf_tm_count;
+  	    profile_start(&call_start);
+***************
+*** 21235,21247 ****
+  
+  #ifdef FEAT_PROFILE
+      if (do_profiling == PROF_YES && (fp->uf_profiling
+! 		    || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
+      {
+  	profile_end(&call_start);
+  	profile_sub_wait(&wait_start, &call_start);
+  	profile_add(&fp->uf_tm_total, &call_start);
+  	profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
+! 	if (fc.caller != NULL && &fc.caller->func->uf_profiling)
+  	{
+  	    profile_add(&fc.caller->func->uf_tm_children, &call_start);
+  	    profile_add(&fc.caller->func->uf_tml_children, &call_start);
+--- 21239,21251 ----
+  
+  #ifdef FEAT_PROFILE
+      if (do_profiling == PROF_YES && (fp->uf_profiling
+! 		    || (fc.caller != NULL && fc.caller->func->uf_profiling)))
+      {
+  	profile_end(&call_start);
+  	profile_sub_wait(&wait_start, &call_start);
+  	profile_add(&fp->uf_tm_total, &call_start);
+  	profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
+! 	if (fc.caller != NULL && fc.caller->func->uf_profiling)
+  	{
+  	    profile_add(&fc.caller->func->uf_tm_children, &call_start);
+  	    profile_add(&fc.caller->func->uf_tml_children, &call_start);
+*** ../vim-7.2.004/src/version.c	Mon Aug 25 04:35:13 2008
+--- src/version.c	Mon Aug 25 04:46:44 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     5,
+  /**/
+
+-- 
+The process for understanding customers primarily involves sitting around with
+other marketing people and talking about what you would to if you were dumb
+enough to be a customer.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.006 b/source/ap/vim/patches/7.2.006
new file mode 100644
index 000000000..f22eeae53
--- /dev/null
+++ b/source/ap/vim/patches/7.2.006
@@ -0,0 +1,50 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.006
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.006
+Problem:    HTML files are not recognized by contents.
+Solution:   Add a rule to the scripts file. (Nico Weber)
+Files:      runtime/scripts.vim
+
+
+*** ../vim-7.2.005/runtime/scripts.vim	Sat Aug  9 19:37:09 2008
+--- runtime/scripts.vim	Sat Aug 16 04:05:34 2008
+***************
+*** 234,239 ****
+--- 234,243 ----
+    elseif s:line1 =~ '\<DTD\s\+XHTML\s'
+      set ft=xhtml
+  
++     " HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
++   elseif s:line1 =~? '\<DOCTYPE\s\+html\>'
++     set ft=html
++ 
+      " PDF
+    elseif s:line1 =~ '^%PDF-'
+      set ft=pdf
+*** ../vim-7.2.005/src/version.c	Mon Aug 25 04:48:21 2008
+--- src/version.c	Mon Aug 25 05:02:34 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     6,
+  /**/
+
+-- 
+Never enter the boss's office unless it's absolutely necessary.  Every boss
+saves one corner of the desk for useless assignments that are doled out like
+Halloween candy to each visitor.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.007 b/source/ap/vim/patches/7.2.007
new file mode 100644
index 000000000..104b26785
--- /dev/null
+++ b/source/ap/vim/patches/7.2.007
@@ -0,0 +1,493 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.007 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.007 (extra)
+Problem:    Minor issues for VMS.
+Solution:   Minor fixes for VMS.  Add float support. (Zoltan Arpadffy)
+Files:	    runtime/doc/os_vms.txt, src/os_vms_conf.h, src/Make_vms.mms,
+	    src/testdir/Make_vms.mms, src/testdir/test30.in,
+	    src/testdir/test54.in
+
+
+*** ../vim-7.2.006/runtime/doc/os_vms.txt	Sat Aug  9 19:36:50 2008
+--- runtime/doc/os_vms.txt	Tue Aug 19 06:29:31 2008
+***************
+*** 1,4 ****
+! *os_vms.txt*    For Vim version 7.2.  Last change: 2006 Nov 18
+  
+  
+  		  VIM REFERENCE MANUAL
+--- 1,4 ----
+! *os_vms.txt*    For Vim version 7.2.  Last change: 2008 Aug 19
+  
+  
+  		  VIM REFERENCE MANUAL
+***************
+*** 312,318 ****
+  
+  8. Useful notes						*vms-notes*
+  
+! 8.1 backspace/delete
+  8.2 Filters
+  8.3 VMS file version numbers
+  8.4 Directory conversion
+--- 312,318 ----
+  
+  8. Useful notes						*vms-notes*
+  
+! 8.1 Backspace/delete
+  8.2 Filters
+  8.3 VMS file version numbers
+  8.4 Directory conversion
+***************
+*** 326,333 ****
+  8.12 diff-mode
+  8.13 Allow '$' in C keywords
+  8.14 VIMTUTOR for beginners
+  
+! 8.1 backspace/delete
+  
+  There are backspace/delete key inconsistencies with VMS.
+  :fixdel doesn't do the trick, but the solution is: >
+--- 326,335 ----
+  8.12 diff-mode
+  8.13 Allow '$' in C keywords
+  8.14 VIMTUTOR for beginners
++ 8.15 Slow start in console mode issue 
++ 8.16 Common VIM directory - different architectures 
+  
+! 8.1 Backspace/delete
+  
+  There are backspace/delete key inconsistencies with VMS.
+  :fixdel doesn't do the trick, but the solution is: >
+***************
+*** 663,674 ****
+  
+  (Thomas.R.Wyant III, Vim 6.1)
+  
+  ==============================================================================
+  
+  9. VMS related changes					*vms-changes*
+  
+! Version 7
+  - Improved low level char input (affects just console mode)
+  
+  Version 6.4 (2005 Oct 15)
+  - GTKLIB and Vim build on IA64
+--- 665,794 ----
+  
+  (Thomas.R.Wyant III, Vim 6.1)
+  
++ 8.14 Slow start in console mode issue
++ 
++ As GUI/GTK Vim works equally well in console mode, many administartors
++ deploy those executables system wide.
++ Unfortunately, on a remote slow connections GUI/GTK executables behave rather
++ slow when user wants to run Vim just in the console mode - because of X environment detection timeout.
++ 
++ Luckily, there is a simple solution for that. Administrators need to deploy
++ both GUI/GTK build and just console build executables, like below: >
++ 
++     |- vim72
++     |----- doc
++     |----- syntax        
++        vimrc    (system rc files)
++        gvimrc
++        gvim.exe (the remaned GUI or GTK built vim.exe)      
++        vim.exe  (the console only executable) 
++ 
++ Define system symbols like below in for ex in LOGIN.COM or SYLOGIN.COM: >
++ 
++ 	$ define/nolog VIM RF10:[UTIL.VIM72] ! where you VIM directory is
++ 	$ vi*m  :== mcr VIM:VIM.EXE
++ 	$ gvi*m :== mcr VIM:GVIM.EXE
++ 	$ ! or you can try to spawn with
++ 	$ gv*im :== spawn/nowait/input=NLA0 mcr VIM:GVIM.EXE -g -GEOMETRY 80x40
++ 
++ 
++ Like this, users that do not have X environment and want to use Vim just in 
++ console mode can avoid performance problems.
++ 
++ (Zoltan Arpadffy, Vim 7.2)
++ 
++ 8.15 Common VIM directory - different architectures
++ 
++ In a cluster that contains nodes with different architectures like below:
++ 
++ $show cluster
++ View of Cluster from system ID 11655  node: TOR                                                                     18-AUG-2008 11:58:31
++ +---------------------------------+
++ ¦        SYSTEMS        ¦ MEMBERS ¦
++ +-----------------------+---------¦
++ ¦  NODE  ¦   SOFTWARE   ¦  STATUS ¦
++ +--------+--------------+---------¦
++ ¦ TOR    ¦ VMS V7.3-2   ¦ MEMBER  ¦
++ ¦ TITAN2 ¦ VMS V8.3     ¦ MEMBER  ¦
++ ¦ ODIN   ¦ VMS V7.3-2   ¦ MEMBER  ¦
++ +---------------------------------+
++ 
++ It is convinient to have a common VIM directory but execute different
++ executables. 
++ There are more solutions for this problem:
++ 
++ solution 1. all executables in the same directory with different names
++ This is easily done with the following script that can be added
++ to the login.com or sylogin.com: >
++ 
++ 	$ if f$getsyi("NODE_HWTYPE") .eqs. "VAX"
++ 	$ then
++ 	$       say "VAX platform"
++ 	$       vi*m:== mcr vim:VIM.EXE_VAX
++ 	$ endif
++ 	$ if f$getsyi("NODE_HWTYPE") .eqs. "ALPH"
++ 	$ then
++ 	$       say "ALPHA platform"
++ 	$       vi*m :== mcr vim:VIM.EXE_AXP
++ 	$ endif
++ 	$ if f$getsyi("ARCH_NAME") .eqs. "IA64"
++ 	$ then
++ 	$      say "IA64 platform"
++ 	$      vi*m :== mcr vim:VIM.EXE_IA64
++ 	$ endif
++ 
++ solution 2. different directories: >
++ 
++ 	$ if f$getsyi("NODE_HWTYPE") .eqs. "VAX"
++ 	$ then
++ 	$       say "VAX platform"
++ 	$       define/nolog VIM RF10:[UTIL.VAX_EXE] ! VAX executables
++ 	$ endif
++ 	$ if f$getsyi("NODE_HWTYPE") .eqs. "ALPH"
++ 	$ then
++ 	$       say "ALPHA platform"
++ 	$       define/nolog VIM RF10:[UTIL.AXP_EXE] ! AXP executables
++ 	$ endif
++ 	$ if f$getsyi("ARCH_NAME") .eqs. "IA64"
++ 	$ then
++ 	$      say "IA64 platform"
++ 	$      define/nolog VIM RF10:[UTIL.IA64_EXE] ! IA64 executables
++ 	$ endif
++         $! VIMRUNTIME must be defined in order to find runtime files
++ 	$ define/nolog VIMRUNTIME RF10:[UTIL.VIM72]
++ 
++ A good examle for this approach is the [GNU]gnu_tools.com script from GNU_TOOLS.ZIP
++ package downloadable from http://www.polarhome.com/vim/
++ 
++ (Zoltan Arpadffy, Vim 7.2)
++ 
+  ==============================================================================
+  
+  9. VMS related changes					*vms-changes*
+  
+! Recent changes
+! - The following plugins are included into VMS runtime: 
+!   genutils 2.4, multiselect 2.2, multvals 3.1, selectbuf 4.3,
+!   bufexplorer 7.1.7, taglist 4.5
+! - minor changes in vimrc (just in VMS runtime) 
+! - make_vms.mms - HUGE model is the default
+! - [TESTDIR]make_vms.mms include as many tests possible
+! - modify test30 and test54 for VMS
+! - enable FLOAT feature in VMS port
+! - os_vms.txt updated  
+! 
+! Version 7.2 (2008 Aug 9)
+! - VCF files write corrected
+! - CTAGS 5.7 included
+! - corrected make_vms.mms (on VAX gave syntax error) 
+! 
+! Version 7.1 (2007 Jun 15)
+! - create TAGS file from menu 
+! 
+! Version 7 (2006 May 8)
+  - Improved low level char input (affects just console mode)
++ - Fixed plugin bug
++ - CTAGS 5.6 included
+  
+  Version 6.4 (2005 Oct 15)
+  - GTKLIB and Vim build on IA64
+***************
+*** 806,811 ****
+--- 926,932 ----
+  
+  OpenVMS documentation and executables are maintained by:
+  Zoltan Arpadffy <arpadffy@polarhome.com>
++ OpenVMS Vim page: http://www.polarhome.com/vim/
+  
+  This document uses parts and remarks from earlier authors and contributors
+  of OS_VMS.TXT:
+*** ../vim-7.2.006/src/os_vms_conf.h	Thu May 10 19:26:17 2007
+--- src/os_vms_conf.h	Sat Aug 16 05:09:17 2008
+***************
+*** 114,119 ****
+--- 114,121 ----
+  #define HAVE_PUTENV
+  #define HAVE_SETENV
+  #define HAVE_SETJMP_H
++ #define HAVE_MATH_H
++ #define HAVE_FLOAT_FUNCS
+  
+  #undef	HAVE_DIRENT_H
+  #undef	HAVE_SYS_NDIR_H
+*** ../vim-7.2.006/src/Make_vms.mms	Mon Oct 29 22:38:54 2007
+--- src/Make_vms.mms	Sat Aug 16 05:17:41 2008
+***************
+*** 2,8 ****
+  # Makefile for Vim on OpenVMS
+  #
+  # Maintainer:   Zoltan Arpadffy <arpadffy@polarhome.com>
+! # Last change:  2007 Oct 22
+  #
+  # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
+  # with MMS and MMK
+--- 2,8 ----
+  # Makefile for Vim on OpenVMS
+  #
+  # Maintainer:   Zoltan Arpadffy <arpadffy@polarhome.com>
+! # Last change:  2008 Aug 16
+  #
+  # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
+  # with MMS and MMK
+***************
+*** 36,42 ****
+  # BIG    - Many features enabled, as rich as possible. (default)
+  # HUGE   - All possible featues enabled.
+  # Please select one of these alternatives above.
+! MODEL = BIG
+  
+  # GUI or terminal mode executable.
+  # Comment out if you want just the character terminal mode only.
+--- 36,42 ----
+  # BIG    - Many features enabled, as rich as possible. (default)
+  # HUGE   - All possible featues enabled.
+  # Please select one of these alternatives above.
+! MODEL = HUGE
+  
+  # GUI or terminal mode executable.
+  # Comment out if you want just the character terminal mode only.
+*** ../vim-7.2.006/src/testdir/Make_vms.mms	Wed Jun 25 00:34:23 2008
+--- src/testdir/Make_vms.mms	Tue Aug 19 06:28:07 2008
+***************
+*** 4,12 ****
+  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
+  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
+  #
+! # Last change:  2008 Jun 19
+  #
+! # This has been tested on VMS 6.2 to 7.2 on DEC Alpha and VAX.
+  # Edit the lines in the Configuration section below to select.
+  #
+  # Execute with:
+--- 4,12 ----
+  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
+  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
+  #
+! # Last change:  2008 Aug 19
+  #
+! # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
+  # Edit the lines in the Configuration section below to select.
+  #
+  # Execute with:
+***************
+*** 32,37 ****
+--- 32,46 ----
+  # and directory handling.
+  # WANT_UNIX = YES
+  
++ # Comment out if you want to run Win32 specific tests as well, but please
++ # be aware, that on OpenVMS will fail, because of cat, rm, etc commands
++ # and directory handling.
++ # WANT_WIN = YES
++ 
++ # Comment out if you want to run spell checker tests. 
++ # They fail because VMS does not support file names.
++ # WANT_SPELL = YES
++ 
+  # Comment out if you have gzip on your system
+  # HAVE_GZIP = YES
+  
+***************
+*** 53,64 ****
+  	 test13.out test14.out test15.out test17.out \
+  	 test18.out test19.out test20.out test21.out test22.out \
+  	 test23.out test24.out test26.out \
+! 	 test28.out test29.out test31.out test32.out \
+  	 test33.out test34.out test35.out test36.out test37.out \
+  	 test38.out test39.out test40.out test41.out test42.out \
+  	 test43.out test44.out test45.out test46.out \
+  	 test48.out test51.out test53.out test54.out test55.out \
+! 	 test56.out test57.out test58.out test59.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out
+  
+  .IFDEF WANT_GUI
+--- 62,73 ----
+  	 test13.out test14.out test15.out test17.out \
+  	 test18.out test19.out test20.out test21.out test22.out \
+  	 test23.out test24.out test26.out \
+! 	 test28.out test29.out test30.out test31.out test32.out \
+  	 test33.out test34.out test35.out test36.out test37.out \
+  	 test38.out test39.out test40.out test41.out test42.out \
+  	 test43.out test44.out test45.out test46.out \
+  	 test48.out test51.out test53.out test54.out test55.out \
+! 	 test56.out test57.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out
+  
+  .IFDEF WANT_GUI
+***************
+*** 67,73 ****
+  .ENDIF
+  
+  .IFDEF WANT_UNIX
+! SCRIPT_UNIX = test10.out test12.out test25.out test27.out test30.out test49.out
+  .ENDIF
+  
+  .IFDEF HAVE_GZIP
+--- 76,90 ----
+  .ENDIF
+  
+  .IFDEF WANT_UNIX
+! SCRIPT_UNIX = test10.out test12.out test25.out test27.out test49.out
+! .ENDIF
+! 
+! .IFDEF WANT_WIN
+! SCRIPT_WIN = test50.out test52.out
+! .ENDIF
+! 
+! .IFDEF WANT_SPELL
+! SCRIPT_SPELL = test58.out test59.out 
+  .ENDIF
+  
+  .IFDEF HAVE_GZIP
+***************
+*** 84,94 ****
+  	-@ write sys$output "                "$*" "
+  	-@ write sys$output "-----------------------------------------------"
+  	-@ create/term/wait mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim --noplugin -s dotest.in $*.in
+! 	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then differences test.out $*.ok;
+  	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename test.out $*.out
+  	-@ if "''F$SEARCH("Xdotest.*")'"  .NES. "" then delete/noconfirm/nolog Xdotest.*.*
+  
+! all : clean nolog $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_GZIP) $(SCRIPT_GDIFF)
+  	-@ write sys$output " "
+  	-@ write sys$output "-----------------------------------------------"
+  	-@ write sys$output "                All done"
+--- 101,111 ----
+  	-@ write sys$output "                "$*" "
+  	-@ write sys$output "-----------------------------------------------"
+  	-@ create/term/wait mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim --noplugin -s dotest.in $*.in
+! 	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then differences /par test.out $*.ok;
+  	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename test.out $*.out
+  	-@ if "''F$SEARCH("Xdotest.*")'"  .NES. "" then delete/noconfirm/nolog Xdotest.*.*
+  
+! all : clean nolog $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_WIN) $(SCRIPT_SPELL) $(SCRIPT_GZIP) $(SCRIPT_GDIFF) 
+  	-@ write sys$output " "
+  	-@ write sys$output "-----------------------------------------------"
+  	-@ write sys$output "                All done"
+***************
+*** 113,118 ****
+--- 130,137 ----
+  	-@ write sys$output "MAKE_VMS.MMS options:"
+  	-@ write sys$output "   WANT_GUI  = ""$(WANT_GUI)"" "
+  	-@ write sys$output "   WANT_UNIX = ""$(WANT_UNIX)"" "
++ 	-@ write sys$output "   WANT_WIN  = ""$(WANT_WIN)"" "
++ 	-@ write sys$output "   WANT_SPELL= ""$(WANT_SPELL)"" "
+  	-@ write sys$output "   HAVE_GZIP = ""$(HAVE_GZIP)"" "
+  	-@ write sys$output "   HAVE_GDIFF= ""$(HAVE_GDIFF)"" "
+  	-@ write sys$output "Default vimrc file is VMS.VIM:
+***************
+*** 122,126 ****
+--- 141,153 ----
+  clean :
+  	-@ if "''F$SEARCH("*.out")'"     .NES. "" then delete/noconfirm/nolog *.out.*
+  	-@ if "''F$SEARCH("test.log")'"  .NES. "" then delete/noconfirm/nolog test.log.*
++ 	-@ if "''F$SEARCH("test.ok")'"   .NES. "" then delete/noconfirm/nolog test.ok.*
+  	-@ if "''F$SEARCH("Xdotest.*")'" .NES. "" then delete/noconfirm/nolog Xdotest.*.*
+  	-@ if "''F$SEARCH("*.*_sw*")'"   .NES. "" then delete/noconfirm/nolog *.*_sw*.*
++ 	-@ if "''F$SEARCH("*.failed")'"  .NES. "" then delete/noconfirm/nolog *.failed.*
++ 	-@ if "''F$SEARCH("*.rej")'"     .NES. "" then delete/noconfirm/nolog *.rej.*
++ 	-@ if "''F$SEARCH("tiny.vim")'"  .NES. "" then delete/noconfirm/nolog tiny.vim.*
++ 	-@ if "''F$SEARCH("small.vim")'" .NES. "" then delete/noconfirm/nolog small.vim.*
++ 	-@ if "''F$SEARCH("mbyte.vim")'" .NES. "" then delete/noconfirm/nolog mbyte.vim.*
++ 	-@ if "''F$SEARCH("viminfo.*")'" .NES. "" then delete/noconfirm/nolog viminfo.*.*
++ 
+*** ../vim-7.2.006/src/testdir/test30.in	Sun Jul 13 19:17:14 2008
+--- src/testdir/test30.in	Sat Aug 16 04:59:37 2008
+***************
+*** 24,33 ****
+  :set nobin eol
+  :bwipe XXUnix XXDos XXMac
+  :" create mixed format files
+! :!cat XXUnix XXDos >XXUxDs
+! :!cat XXUnix XXMac >XXUxMac
+! :!cat XXDos XXMac >XXDosMac
+! :!cat XXUnix XXDos XXMac >XXUxDsMc
+  :"
+  :" try reading and writing with 'fileformats' empty
+  :set fileformat=unix
+--- 24,40 ----
+  :set nobin eol
+  :bwipe XXUnix XXDos XXMac
+  :" create mixed format files
+! :if has("vms")
+! : !copy XXUnix,XXDos XXUxDs.
+! : !copy XXUnix,XXMac XXUxMac.
+! : !copy XXDos,XXMac  XXDosMac.
+! : !copy XXUnix,XXDos,XXMac XXUxDsMc.
+! :else
+! : !cat XXUnix XXDos >XXUxDs
+! : !cat XXUnix XXMac >XXUxMac
+! : !cat XXDos XXMac >XXDosMac
+! : !cat XXUnix XXDos XXMac >XXUxDsMc
+! :endif
+  :"
+  :" try reading and writing with 'fileformats' empty
+  :set fileformat=unix
+*** ../vim-7.2.006/src/testdir/test54.in	Sun Jan  2 12:43:19 2005
+--- src/testdir/test54.in	Tue Aug 19 06:26:55 2008
+***************
+*** 3,10 ****
+  STARTTEST
+  :so small.vim
+  :e xx
+! :!rm -f test.out
+! :au BufLeave <buffer> :!echo buffer-local autommand in %>> test.out
+  :e somefile           " here, autocommand for xx shall write test.out 
+  :                     " but autocommand shall not apply to buffer named <buffer>
+  :bwipe xx             " here, autocommand shall be auto-deleted
+--- 3,15 ----
+  STARTTEST
+  :so small.vim
+  :e xx
+! :if has("vms")
+! : !del test.out.*
+! : au BufLeave <buffer> :!write sys$output "buffer-local autommand in %" > test.out
+! :else
+! : !rm -f test.out
+! : au BufLeave <buffer> :!echo buffer-local autommand in %>> test.out
+! :endif
+  :e somefile           " here, autocommand for xx shall write test.out 
+  :                     " but autocommand shall not apply to buffer named <buffer>
+  :bwipe xx             " here, autocommand shall be auto-deleted
+*** ../vim-7.2.006/src/version.c	Mon Aug 25 05:03:29 2008
+--- src/version.c	Mon Sep  1 16:46:50 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     7,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+8. Don't use any punctuation marks.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.008 b/source/ap/vim/patches/7.2.008
new file mode 100644
index 000000000..d3fb58e5c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.008
@@ -0,0 +1,63 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.008
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.008
+Problem:    With a BufHidden autocommand that invokes ":bunload" the window
+	    count for a buffer can be wrong. (Bob Hiestand)
+Solution:   Don't call enter_buffer() when already in that buffer.
+Files:	    src/buffer.c
+
+
+*** ../vim-7.2.007/src/buffer.c	Wed Aug  6 18:32:40 2008
+--- src/buffer.c	Mon Sep  1 14:25:45 2008
+***************
+*** 1351,1361 ****
+  	}
+      }
+  #ifdef FEAT_AUTOCMD
+  # ifdef FEAT_EVAL
+!     /* An autocommand may have deleted buf or aborted the script processing! */
+!     if (buf_valid(buf) && !aborting())
+  # else
+!     if (buf_valid(buf))	    /* an autocommand may have deleted buf! */
+  # endif
+  #endif
+  	enter_buffer(buf);
+--- 1351,1362 ----
+  	}
+      }
+  #ifdef FEAT_AUTOCMD
++     /* An autocommand may have deleted "buf", already entered it (e.g., when
++      * it did ":bunload") or aborted the script processing! */
+  # ifdef FEAT_EVAL
+!     if (buf_valid(buf) && buf != curbuf && !aborting())
+  # else
+!     if (buf_valid(buf) && buf != curbuf)
+  # endif
+  #endif
+  	enter_buffer(buf);
+*** ../vim-7.2.007/src/version.c	Mon Sep  1 16:50:09 2008
+--- src/version.c	Mon Sep  1 17:31:28 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     8,
+  /**/
+
+-- 
+If Pacman had affected us as kids we'd be running around in dark rooms,
+munching pills and listening to repetitive music.
+                       -- Marcus Brigstocke
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.009 b/source/ap/vim/patches/7.2.009
new file mode 100644
index 000000000..fa891dcfc
--- /dev/null
+++ b/source/ap/vim/patches/7.2.009
@@ -0,0 +1,67 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.009
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.009
+Problem:    Can't compile with Perl 5.10 on MS-Windows. (Cesar Romani)
+Solution:   Add the Perl_sv_free2 function for dynamic loading. (Dan Sharp)
+Files:	    src/if_perl.xs
+
+
+*** ../vim-7.2.008/src/if_perl.xs	Thu Jul 24 16:24:15 2008
+--- src/if_perl.xs	Mon Sep  1 14:58:37 2008
+***************
+*** 136,141 ****
+--- 136,144 ----
+  #  define Perl_newXS_flags dll_Perl_newXS_flags
+  #endif
+  # define Perl_sv_free dll_Perl_sv_free
++ # if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
++ #  define Perl_sv_free2 dll_Perl_sv_free2
++ # endif
+  # define Perl_sv_isa dll_Perl_sv_isa
+  # define Perl_sv_magic dll_Perl_sv_magic
+  # define Perl_sv_setiv dll_Perl_sv_setiv
+***************
+*** 268,273 ****
+--- 271,277 ----
+  static void (*boot_DynaLoader)_((pTHX_ CV*));
+  
+  #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
++ static void (*Perl_sv_free2)(pTHX_ SV*);
+  static void (*Perl_sys_init3)(int* argc, char*** argv, char*** env);
+  static void (*Perl_sys_term)(void);
+  static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
+***************
+*** 367,372 ****
+--- 371,377 ----
+      {"Perl_TXpv_ptr", (PERL_PROC*)&Perl_TXpv_ptr},
+      {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr},
+  #else
++     {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2},
+      {"Perl_sys_init3", (PERL_PROC*)&Perl_sys_init3},
+      {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term},
+      {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr},
+*** ../vim-7.2.008/src/version.c	Mon Sep  1 17:32:40 2008
+--- src/version.c	Mon Sep  1 17:55:24 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     9,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+11. Specify that your drive-through order is "to go".
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.010 b/source/ap/vim/patches/7.2.010
new file mode 100644
index 000000000..47315881e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.010
@@ -0,0 +1,206 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.010
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.010
+Problem:    When using "K" in Visual mode not all characters are properly
+	    escaped. (Ben Schmidt)
+Solution:   Use a function with the functionality of shellescape(). (Jan
+	    Minar)
+Files:	    src/mbyte.c, src/misc2.c, src/normal.c
+
+
+*** ../vim-7.2.009/src/mbyte.c	Wed Aug  6 18:45:36 2008
+--- src/mbyte.c	Wed Sep  3 22:34:48 2008
+***************
+*** 2540,2546 ****
+      return (int)(p - q);
+  }
+  
+- #if defined(FEAT_EVAL) || defined(PROTO)
+  /*
+   * Copy a character from "*fp" to "*tp" and advance the pointers.
+   */
+--- 2540,2545 ----
+***************
+*** 2555,2561 ****
+      *tp += l;
+      *fp += l;
+  }
+- #endif
+  
+  /*
+   * Return the offset from "p" to the first byte of a character.  When "p" is
+--- 2554,2559 ----
+*** ../vim-7.2.009/src/misc2.c	Thu Jul 24 20:28:58 2008
+--- src/misc2.c	Wed Sep  3 22:05:21 2008
+***************
+*** 1257,1263 ****
+      return escaped_string;
+  }
+  
+- #if !defined(BACKSLASH_IN_FILENAME) || defined(FEAT_EVAL) || defined(PROTO)
+  /*
+   * Return TRUE when 'shell' has "csh" in the tail.
+   */
+--- 1257,1262 ----
+***************
+*** 1266,1274 ****
+  {
+      return (strstr((char *)gettail(p_sh), "csh") != NULL);
+  }
+- #endif
+  
+- #if defined(FEAT_EVAL) || defined(PROTO)
+  /*
+   * Escape "string" for use as a shell argument with system().
+   * This uses single quotes, except when we know we need to use double qoutes
+--- 1265,1271 ----
+***************
+*** 1391,1397 ****
+  
+      return escaped_string;
+  }
+- #endif
+  
+  /*
+   * Like vim_strsave(), but make all characters uppercase.
+--- 1388,1393 ----
+*** ../vim-7.2.009/src/normal.c	Thu Jul 31 22:03:54 2008
+--- src/normal.c	Sat Sep  6 15:06:07 2008
+***************
+*** 5469,5474 ****
+--- 5469,5479 ----
+  		STRCPY(buf, "he! ");
+  	    else
+  	    {
++ 		/* An external command will probably use an argument starting
++ 		 * with "-" as an option.  To avoid trouble we skip the "-". */
++ 		while (*ptr == '-')
++ 		    ++ptr;
++ 
+  		/* When a count is given, turn it into a range.  Is this
+  		 * really what we want? */
+  		isman = (STRCMP(kp, "man") == 0);
+***************
+*** 5511,5547 ****
+      /*
+       * Now grab the chars in the identifier
+       */
+!     if (cmdchar == '*')
+! 	aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
+!     else if (cmdchar == '#')
+! 	aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
+!     else if (cmdchar == 'K' && !kp_help)
+! 	aux_ptr = (char_u *)" \t\\\"|!";
+!     else
+! 	/* Don't escape spaces and Tabs in a tag with a backslash */
+! 	aux_ptr = (char_u *)"\\|\"";
+! 
+!     p = buf + STRLEN(buf);
+!     while (n-- > 0)
+!     {
+! 	/* put a backslash before \ and some others */
+! 	if (vim_strchr(aux_ptr, *ptr) != NULL)
+! 	    *p++ = '\\';
+! #ifdef FEAT_MBYTE
+! 	/* When current byte is a part of multibyte character, copy all bytes
+! 	 * of that character. */
+! 	if (has_mbyte)
+  	{
+! 	    int i;
+! 	    int len = (*mb_ptr2len)(ptr) - 1;
+! 
+! 	    for (i = 0; i < len && n >= 1; ++i, --n)
+! 		*p++ = *ptr++;
+  	}
+  #endif
+! 	*p++ = *ptr++;
+      }
+-     *p = NUL;
+  
+      /*
+       * Execute the command.
+--- 5516,5572 ----
+      /*
+       * Now grab the chars in the identifier
+       */
+!     if (cmdchar == 'K' && !kp_help)
+!     {
+! 	/* Escape the argument properly for a shell command */
+! 	p = vim_strsave_shellescape(ptr, TRUE);
+! 	if (p == NULL)
+  	{
+! 	    vim_free(buf);
+! 	    return;
+  	}
++ 	buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1);
++ 	if (buf == NULL)
++ 	{
++ 	    vim_free(buf);
++ 	    vim_free(p);
++ 	    return;
++ 	}
++ 	STRCAT(buf, p);
++ 	vim_free(p);
++     }
++     else
++     {
++ 	if (cmdchar == '*')
++ 	    aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
++ 	else if (cmdchar == '#')
++ 	    aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
++ 	else
++ 	    /* Don't escape spaces and Tabs in a tag with a backslash */
++ 	    aux_ptr = (char_u *)"\\|\"\n*?[";
++ 
++ 	p = buf + STRLEN(buf);
++ 	while (n-- > 0)
++ 	{
++ 	    /* put a backslash before \ and some others */
++ 	    if (vim_strchr(aux_ptr, *ptr) != NULL)
++ 		*p++ = '\\';
++ #ifdef FEAT_MBYTE
++ 	    /* When current byte is a part of multibyte character, copy all
++ 	     * bytes of that character. */
++ 	    if (has_mbyte)
++ 	    {
++ 		int i;
++ 		int len = (*mb_ptr2len)(ptr) - 1;
++ 
++ 		for (i = 0; i < len && n >= 1; ++i, --n)
++ 		    *p++ = *ptr++;
++ 	    }
+  #endif
+! 	    *p++ = *ptr++;
+! 	}
+! 	*p = NUL;
+      }
+  
+      /*
+       * Execute the command.
+*** ../vim-7.2.009/src/version.c	Mon Sep  1 17:56:05 2008
+--- src/version.c	Sat Sep  6 16:26:42 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     10,
+  /**/
+
+-- 
+Q. What happens to programmers when they die?
+A: MS-Windows programmers are reinstalled.  C++ programmers become undefined,
+   anyone who refers to them will die as well.  Java programmers reincarnate
+   after being garbage collected.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.011 b/source/ap/vim/patches/7.2.011
new file mode 100644
index 000000000..928f8d638
--- /dev/null
+++ b/source/ap/vim/patches/7.2.011
@@ -0,0 +1,105 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.011
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.011
+Problem:    Get an error when inserting a float value from the expression
+	    register.
+Solution:   Convert the Float to a String automatically in the same place
+	    where a List would be converted to a String.
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.010/src/eval.c	Mon Aug 25 04:48:21 2008
+--- src/eval.c	Sun Sep  7 13:50:38 2008
+***************
+*** 1256,1278 ****
+  
+  /*
+   * Top level evaluation function, returning a string.
+   * Return pointer to allocated memory, or NULL for failure.
+   */
+      char_u *
+! eval_to_string(arg, nextcmd, dolist)
+      char_u	*arg;
+      char_u	**nextcmd;
+!     int		dolist;		/* turn List into sequence of lines */
+  {
+      typval_T	tv;
+      char_u	*retval;
+      garray_T	ga;
+  
+      if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
+  	retval = NULL;
+      else
+      {
+! 	if (dolist && tv.v_type == VAR_LIST)
+  	{
+  	    ga_init2(&ga, (int)sizeof(char), 80);
+  	    if (tv.vval.v_list != NULL)
+--- 1256,1281 ----
+  
+  /*
+   * Top level evaluation function, returning a string.
++  * When "convert" is TRUE convert a List into a sequence of lines and convert
++  * a Float to a String.
+   * Return pointer to allocated memory, or NULL for failure.
+   */
+      char_u *
+! eval_to_string(arg, nextcmd, convert)
+      char_u	*arg;
+      char_u	**nextcmd;
+!     int		convert;
+  {
+      typval_T	tv;
+      char_u	*retval;
+      garray_T	ga;
++     char_u	numbuf[NUMBUFLEN];
+  
+      if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
+  	retval = NULL;
+      else
+      {
+! 	if (convert && tv.v_type == VAR_LIST)
+  	{
+  	    ga_init2(&ga, (int)sizeof(char), 80);
+  	    if (tv.vval.v_list != NULL)
+***************
+*** 1280,1285 ****
+--- 1283,1295 ----
+  	    ga_append(&ga, NUL);
+  	    retval = (char_u *)ga.ga_data;
+  	}
++ #ifdef FEAT_FLOAT
++ 	else if (convert && tv.v_type == VAR_FLOAT)
++ 	{
++ 	    vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv.vval.v_float);
++ 	    retval = vim_strsave(numbuf);
++ 	}
++ #endif
+  	else
+  	    retval = vim_strsave(get_tv_string(&tv));
+  	clear_tv(&tv);
+*** ../vim-7.2.010/src/version.c	Sat Sep  6 16:44:06 2008
+--- src/version.c	Sun Sep  7 13:52:00 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     11,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+34. You laugh at people with 14400 baud modems.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.012 b/source/ap/vim/patches/7.2.012
new file mode 100644
index 000000000..fa3ed2473
--- /dev/null
+++ b/source/ap/vim/patches/7.2.012
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.012
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.012
+Problem:    Compiler warnings when building with startup timing.
+Solution:   Add type casts.
+Files:	    src/ex_cmds2.c
+
+
+*** ../vim-7.2.011/src/ex_cmds2.c	Sun Jul 13 19:36:09 2008
+--- src/ex_cmds2.c	Tue Sep  2 11:14:41 2008
+***************
+*** 3145,3152 ****
+  	verbose_leave();
+      }
+  #ifdef STARTUPTIME
+!     vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
+!     time_msg(IObuff, &tv_start);
+      time_pop(&tv_rel);
+  #endif
+  
+--- 3145,3152 ----
+  	verbose_leave();
+      }
+  #ifdef STARTUPTIME
+!     vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
+!     time_msg((char *)IObuff, &tv_start);
+      time_pop(&tv_rel);
+  #endif
+  
+*** ../vim-7.2.011/src/version.c	Sun Sep  7 13:54:31 2008
+--- src/version.c	Sun Sep  7 15:49:00 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     12,
+  /**/
+
+-- 
+He who laughs last, thinks slowest.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.013 b/source/ap/vim/patches/7.2.013
new file mode 100644
index 000000000..2645f0a7d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.013
@@ -0,0 +1,135 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.013
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.013
+Problem:    While waiting for the X selection Vim consumes a lot of CPU time
+	    and hangs until a response is received.
+Solution:   Sleep a bit when the selection event hasn't been received yet.
+	    Time out after a couple of seconds to avoid a hang when the
+	    selection owner isn't responding.
+Files:	    src/ui.c
+
+
+*** ../vim-7.2.012/src/ui.c	Mon Jul 14 21:47:49 2008
+--- src/ui.c	Sun Sep  7 16:54:35 2008
+***************
+*** 2110,2115 ****
+--- 2110,2117 ----
+      int		i;
+      int		nbytes = 0;
+      char_u	*buffer;
++     time_t	start_time;
++     int		timed_out = FALSE;
+  
+      for (i =
+  #ifdef FEAT_MBYTE
+***************
+*** 2129,2134 ****
+--- 2131,2137 ----
+  	    case 3:  type = text_atom;		break;
+  	    default: type = XA_STRING;
+  	}
++ 	success = FALSE;
+  	XtGetSelectionValue(myShell, cbd->sel_atom, type,
+  	    clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
+  
+***************
+*** 2141,2167 ****
+  	 * characters, then they will appear before the one that requested the
+  	 * paste!  Don't worry, we will catch up with any other events later.
+  	 */
+  	for (;;)
+  	{
+  	    if (XCheckTypedEvent(dpy, SelectionNotify, &event))
+  		break;
+  	    if (XCheckTypedEvent(dpy, SelectionRequest, &event))
+  		/* We may get a SelectionRequest here and if we don't handle
+  		 * it we hang.  KDE klipper does this, for example. */
+  		XtDispatchEvent(&event);
+  
+  	    /* Do we need this?  Probably not. */
+  	    XSync(dpy, False);
+  
+! 	    /* Bernhard Walle solved a slow paste response in an X terminal by
+! 	     * adding: usleep(10000); here. */
+  	}
+  
+- 	/* this is where clip_x11_request_selection_cb() is actually called */
+- 	XtDispatchEvent(&event);
+- 
+  	if (success)
+  	    return;
+      }
+  
+      /* Final fallback position - use the X CUT_BUFFER0 store */
+--- 2144,2189 ----
+  	 * characters, then they will appear before the one that requested the
+  	 * paste!  Don't worry, we will catch up with any other events later.
+  	 */
++ 	start_time = time(NULL);
+  	for (;;)
+  	{
+  	    if (XCheckTypedEvent(dpy, SelectionNotify, &event))
++ 	    {
++ 		/* this is where clip_x11_request_selection_cb() is actually
++ 		 * called */
++ 		XtDispatchEvent(&event);
+  		break;
++ 	    }
+  	    if (XCheckTypedEvent(dpy, SelectionRequest, &event))
+  		/* We may get a SelectionRequest here and if we don't handle
+  		 * it we hang.  KDE klipper does this, for example. */
+  		XtDispatchEvent(&event);
+  
++ 	    /* Time out after 2 to 3 seconds to avoid that we hang when the
++ 	     * other process doesn't respond.  Note that the SelectionNotify
++ 	     * event may still come later when the selection owner comes back
++ 	     * to life and the text gets inserted unexpectedly (by xterm).
++ 	     * Don't know how to avoid that :-(. */
++ 	    if (time(NULL) > start_time + 2)
++ 	    {
++ 		timed_out = TRUE;
++ 		break;
++ 	    }
++ 
+  	    /* Do we need this?  Probably not. */
+  	    XSync(dpy, False);
+  
+! 	    /* Wait for 1 msec to avoid that we eat up all CPU time. */
+! 	    ui_delay(1L, TRUE);
+  	}
+  
+  	if (success)
+  	    return;
++ 
++ 	/* don't do a retry with another type after timing out, otherwise we
++ 	 * hang for 15 seconds. */
++ 	if (timed_out)
++ 	    break;
+      }
+  
+      /* Final fallback position - use the X CUT_BUFFER0 store */
+*** ../vim-7.2.012/src/version.c	Sun Sep  7 15:49:45 2008
+--- src/version.c	Sun Sep  7 21:45:55 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     13,
+  /**/
+
+-- 
+The users that I support would double-click on a landmine to find out
+what happens.				-- A system administrator
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.014 b/source/ap/vim/patches/7.2.014
new file mode 100644
index 000000000..a03794868
--- /dev/null
+++ b/source/ap/vim/patches/7.2.014
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.014
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.014
+Problem:    synstack() doesn't work in an emptly line.
+Solution:   Accept column zero as a valid position.
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.013/src/eval.c	Sun Sep  7 13:54:31 2008
+--- src/eval.c	Sun Sep  7 13:50:38 2008
+***************
+*** 16667,16673 ****
+      col = get_tv_number(&argvars[1]) - 1;	/* -1 on type error */
+  
+      if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
+! 	    && col >= 0 && col < (long)STRLEN(ml_get(lnum))
+  	    && rettv_list_alloc(rettv) != FAIL)
+      {
+  	(void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
+--- 16667,16673 ----
+      col = get_tv_number(&argvars[1]) - 1;	/* -1 on type error */
+  
+      if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
+! 	    && col >= 0 && (col == 0 || col < (long)STRLEN(ml_get(lnum)))
+  	    && rettv_list_alloc(rettv) != FAIL)
+      {
+  	(void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
+*** ../vim-7.2.013/src/version.c	Sun Sep  7 21:47:51 2008
+--- src/version.c	Wed Sep 10 15:36:52 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     14,
+  /**/
+
+-- 
+Everybody lies, but it doesn't matter since nobody listens.
+                                -- Lieberman's Law
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.015 b/source/ap/vim/patches/7.2.015
new file mode 100644
index 000000000..e03ac1564
--- /dev/null
+++ b/source/ap/vim/patches/7.2.015
@@ -0,0 +1,82 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.015
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.015
+Problem:    "make all test install" doesn't stop when the test fails. (Daniel
+	    Shahaf)
+Solution:   When test.log contains failures exit with non-zero status.
+Files:	    src/testdir/Makefile
+
+
+*** ../vim-7.2.014/src/testdir/Makefile	Wed Jun 25 00:22:53 2008
+--- src/testdir/Makefile	Sun Sep  7 21:31:49 2008
+***************
+*** 26,40 ****
+  
+  .SUFFIXES: .in .out
+  
+! nongui:	nolog $(SCRIPTS)
+! 	@echo
+! 	@cat test.log
+! 	@echo ALL DONE
+  
+! gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI)
+  	@echo
+! 	@cat test.log
+! 	@echo ALL DONE
+  
+  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
+  
+--- 26,42 ----
+  
+  .SUFFIXES: .in .out
+  
+! nongui:	nolog $(SCRIPTS) report
+! 
+! gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI) report
+  
+! report:
+  	@echo
+! 	@echo 'Test results:'
+! 	@/bin/sh -c "if test -f test.log; \
+! 		then cat test.log; echo TEST FAILURE; exit 1; \
+! 		else echo ALL DONE; \
+! 		fi"
+  
+  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
+  
+***************
+*** 71,74 ****
+  test60.out: test60.vim
+  
+  nolog:
+! 	-echo Test results: >test.log
+--- 73,76 ----
+  test60.out: test60.vim
+  
+  nolog:
+! 	-rm -f test.log
+*** ../vim-7.2.014/src/version.c	Wed Sep 10 15:38:13 2008
+--- src/version.c	Wed Sep 10 18:23:38 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     15,
+  /**/
+
+-- 
+Light travels faster than sound.  This is why some people
+appear bright until you hear them speak
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.016 b/source/ap/vim/patches/7.2.016
new file mode 100644
index 000000000..03d5207f2
--- /dev/null
+++ b/source/ap/vim/patches/7.2.016
@@ -0,0 +1,166 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.016
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.016
+Problem:    The pattern being completed may be in freed memory when the
+	    command line is being reallocated. (Dominique Pelle)
+Solution:   Keep a pointer to the expand_T in the command line structure.
+	    Don't use <S-Tab> as CTRL-P when there are no results.  Clear the
+	    completion when using a command line from the history.
+Files:	    src/ex_getln.c
+
+
+*** ../vim-7.2.015/src/ex_getln.c	Fri Aug  8 12:58:59 2008
+--- src/ex_getln.c	Wed Sep 10 22:43:41 2008
+***************
+*** 31,36 ****
+--- 31,38 ----
+      int		cmdattr;	/* attributes for prompt */
+      int		overstrike;	/* Typing mode on the command line.  Shared by
+  				   getcmdline() and put_on_cmdline(). */
++     expand_T	*xpc;		/* struct being used for expansion, xp_pattern
++ 				   may point into cmdbuff */
+      int		xp_context;	/* type of expansion */
+  # ifdef FEAT_EVAL
+      char_u	*xp_arg;	/* user-defined expansion arg */
+***************
+*** 38,44 ****
+  # endif
+  };
+  
+! static struct cmdline_info ccline;	/* current cmdline_info */
+  
+  static int	cmd_showtail;		/* Only show path tail in lists ? */
+  
+--- 40,50 ----
+  # endif
+  };
+  
+! /* The current cmdline_info.  It is initialized in getcmdline() and after that
+!  * used by other functions.  When invoking getcmdline() recursively it needs
+!  * to be saved with save_cmdline() and restored with restore_cmdline().
+!  * TODO: make it local to getcmdline() and pass it around. */
+! static struct cmdline_info ccline;
+  
+  static int	cmd_showtail;		/* Only show path tail in lists ? */
+  
+***************
+*** 238,243 ****
+--- 244,250 ----
+      }
+  
+      ExpandInit(&xpc);
++     ccline.xpc = &xpc;
+  
+  #ifdef FEAT_RIGHTLEFT
+      if (curwin->w_p_rl && *curwin->w_p_rlc == 's'
+***************
+*** 408,416 ****
+  #endif
+  
+  	/*
+! 	 * <S-Tab> works like CTRL-P (unless 'wc' is <S-Tab>).
+  	 */
+! 	if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles != -1)
+  	    c = Ctrl_P;
+  
+  #ifdef FEAT_WILDMENU
+--- 415,424 ----
+  #endif
+  
+  	/*
+! 	 * When there are matching completions to select <S-Tab> works like
+! 	 * CTRL-P (unless 'wc' is <S-Tab>).
+  	 */
+! 	if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles > 0)
+  	    c = Ctrl_P;
+  
+  #ifdef FEAT_WILDMENU
+***************
+*** 1513,1518 ****
+--- 1521,1527 ----
+  		    int		old_firstc;
+  
+  		    vim_free(ccline.cmdbuff);
++ 		    xpc.xp_context = EXPAND_NOTHING;
+  		    if (hiscnt == hislen)
+  			p = lookfor;	/* back to the old one */
+  		    else
+***************
+*** 1839,1844 ****
+--- 1848,1854 ----
+  #endif
+  
+      ExpandCleanup(&xpc);
++     ccline.xpc = NULL;
+  
+  #ifdef FEAT_SEARCH_EXTRA
+      if (did_incsearch)
+***************
+*** 2508,2513 ****
+--- 2518,2537 ----
+      }
+      mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen + 1);
+      vim_free(p);
++ 
++     if (ccline.xpc != NULL
++ 	    && ccline.xpc->xp_pattern != NULL
++ 	    && ccline.xpc->xp_context != EXPAND_NOTHING
++ 	    && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL)
++     {
++ 	int i = ccline.xpc->xp_pattern - p;
++ 
++ 	/* If xp_pattern points inside the old cmdbuff it needs to be adjusted
++ 	 * to point into the newly allocated memory. */
++ 	if (i >= 0 && i <= ccline.cmdlen)
++ 	    ccline.xpc->xp_pattern = ccline.cmdbuff + i;
++     }
++ 
+      return OK;
+  }
+  
+***************
+*** 2875,2880 ****
+--- 2899,2905 ----
+      prev_ccline = ccline;
+      ccline.cmdbuff = NULL;
+      ccline.cmdprompt = NULL;
++     ccline.xpc = NULL;
+  }
+  
+  /*
+***************
+*** 3582,3587 ****
+--- 3607,3613 ----
+  ExpandInit(xp)
+      expand_T	*xp;
+  {
++     xp->xp_pattern = NULL;
+      xp->xp_backslash = XP_BS_NONE;
+  #ifndef BACKSLASH_IN_FILENAME
+      xp->xp_shell = FALSE;
+*** ../vim-7.2.015/src/version.c	Wed Sep 10 18:25:18 2008
+--- src/version.c	Sun Sep 14 14:38:47 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     16,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+53. To find out what time it is, you send yourself an e-mail and check the
+    "Date:" field.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.017 b/source/ap/vim/patches/7.2.017
new file mode 100644
index 000000000..99979a152
--- /dev/null
+++ b/source/ap/vim/patches/7.2.017
@@ -0,0 +1,162 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.017
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.017
+Problem:    strlen() used on text that may not end in a NUL. (Dominique Pelle)
+	    Pasting a very big selection doesn't work.
+Solution:   Use the length passed to the XtSelectionCallbackProc() function.
+	    After getting the SelectionNotify event continue dispatching
+	    events until the callback is actually called.  Also dispatch the
+	    PropertyNotify event.
+Files:	    src/ui.c
+
+
+*** ../vim-7.2.016/src/ui.c	Sun Sep  7 21:47:51 2008
+--- src/ui.c	Sun Sep 14 15:52:19 2008
+***************
+*** 2020,2026 ****
+  
+      if (value == NULL || *length == 0)
+      {
+! 	clip_free_selection(cbd);	/* ???  [what's the query?] */
+  	*(int *)success = FALSE;
+  	return;
+      }
+--- 2020,2026 ----
+  
+      if (value == NULL || *length == 0)
+      {
+! 	clip_free_selection(cbd);	/* nothing received, clear register */
+  	*(int *)success = FALSE;
+  	return;
+      }
+***************
+*** 2076,2082 ****
+  	text_prop.value = (unsigned char *)value;
+  	text_prop.encoding = *type;
+  	text_prop.format = *format;
+! 	text_prop.nitems = STRLEN(value);
+  	status = XmbTextPropertyToTextList(X_DISPLAY, &text_prop,
+  							 &text_list, &n_text);
+  	if (status != Success || n_text < 1)
+--- 2076,2082 ----
+  	text_prop.value = (unsigned char *)value;
+  	text_prop.encoding = *type;
+  	text_prop.format = *format;
+! 	text_prop.nitems = len;
+  	status = XmbTextPropertyToTextList(X_DISPLAY, &text_prop,
+  							 &text_list, &n_text);
+  	if (status != Success || n_text < 1)
+***************
+*** 2131,2137 ****
+  	    case 3:  type = text_atom;		break;
+  	    default: type = XA_STRING;
+  	}
+! 	success = FALSE;
+  	XtGetSelectionValue(myShell, cbd->sel_atom, type,
+  	    clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
+  
+--- 2131,2137 ----
+  	    case 3:  type = text_atom;		break;
+  	    default: type = XA_STRING;
+  	}
+! 	success = MAYBE;
+  	XtGetSelectionValue(myShell, cbd->sel_atom, type,
+  	    clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
+  
+***************
+*** 2145,2169 ****
+  	 * paste!  Don't worry, we will catch up with any other events later.
+  	 */
+  	start_time = time(NULL);
+! 	for (;;)
+  	{
+! 	    if (XCheckTypedEvent(dpy, SelectionNotify, &event))
+  	    {
+! 		/* this is where clip_x11_request_selection_cb() is actually
+! 		 * called */
+  		XtDispatchEvent(&event);
+! 		break;
+  	    }
+- 	    if (XCheckTypedEvent(dpy, SelectionRequest, &event))
+- 		/* We may get a SelectionRequest here and if we don't handle
+- 		 * it we hang.  KDE klipper does this, for example. */
+- 		XtDispatchEvent(&event);
+  
+  	    /* Time out after 2 to 3 seconds to avoid that we hang when the
+  	     * other process doesn't respond.  Note that the SelectionNotify
+  	     * event may still come later when the selection owner comes back
+! 	     * to life and the text gets inserted unexpectedly (by xterm).
+! 	     * Don't know how to avoid that :-(. */
+  	    if (time(NULL) > start_time + 2)
+  	    {
+  		timed_out = TRUE;
+--- 2145,2171 ----
+  	 * paste!  Don't worry, we will catch up with any other events later.
+  	 */
+  	start_time = time(NULL);
+! 	while (success == MAYBE)
+  	{
+! 	    if (XCheckTypedEvent(dpy, SelectionNotify, &event)
+! 		    || XCheckTypedEvent(dpy, SelectionRequest, &event)
+! 		    || XCheckTypedEvent(dpy, PropertyNotify, &event))
+  	    {
+! 		/* This is where clip_x11_request_selection_cb() should be
+! 		 * called.  It may actually happen a bit later, so we loop
+! 		 * until "success" changes.
+! 		 * We may get a SelectionRequest here and if we don't handle
+! 		 * it we hang.  KDE klipper does this, for example.
+! 		 * We need to handle a PropertyNotify for large selections. */
+  		XtDispatchEvent(&event);
+! 		continue;
+  	    }
+  
+  	    /* Time out after 2 to 3 seconds to avoid that we hang when the
+  	     * other process doesn't respond.  Note that the SelectionNotify
+  	     * event may still come later when the selection owner comes back
+! 	     * to life and the text gets inserted unexpectedly.  Don't know
+! 	     * why that happens or how to avoid that :-(. */
+  	    if (time(NULL) > start_time + 2)
+  	    {
+  		timed_out = TRUE;
+***************
+*** 2177,2183 ****
+  	    ui_delay(1L, TRUE);
+  	}
+  
+! 	if (success)
+  	    return;
+  
+  	/* don't do a retry with another type after timing out, otherwise we
+--- 2179,2185 ----
+  	    ui_delay(1L, TRUE);
+  	}
+  
+! 	if (success == TRUE)
+  	    return;
+  
+  	/* don't do a retry with another type after timing out, otherwise we
+*** ../vim-7.2.016/src/version.c	Sun Sep 14 14:41:44 2008
+--- src/version.c	Sun Sep 14 15:55:34 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     17,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+54. You start tilting your head sideways to smile. :-)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.018 b/source/ap/vim/patches/7.2.018
new file mode 100644
index 000000000..b195f09dc
--- /dev/null
+++ b/source/ap/vim/patches/7.2.018
@@ -0,0 +1,45 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.018
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.018
+Problem:    Memory leak when substitute is aborted.
+Solution:   Free the buffer allocated for the new text. (Dominique Pelle)
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-7.2.017/src/ex_cmds.c	Wed Aug  6 15:03:07 2008
+--- src/ex_cmds.c	Sun Sep 14 13:45:03 2008
+***************
+*** 5059,5064 ****
+--- 5059,5065 ----
+  
+  	    if (did_sub)
+  		++sub_nlines;
++ 	    vim_free(new_start);	/* for when substitute was cancelled */
+  	    vim_free(sub_firstline);	/* free the copy of the original line */
+  	    sub_firstline = NULL;
+  	}
+*** ../vim-7.2.017/src/version.c	Sun Sep 14 15:57:54 2008
+--- src/version.c	Sun Sep 14 21:38:25 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     18,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+55. You ask your doctor to implant a gig in your brain.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.019 b/source/ap/vim/patches/7.2.019
new file mode 100644
index 000000000..4404bca4f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.019
@@ -0,0 +1,65 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.019
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.019
+Problem:    Completion of ":noautocmd" doesn't work and exists(":noautocmd")
+	    returns zero. (Ben Fritz)
+Solution:   Add "noautocmd" to the list of modifiers and commands.
+Files:	    src/ex_cmds.h, src/ex_docmd.c
+
+
+*** ../vim-7.2.018/src/ex_cmds.h	Wed Jun 25 00:44:40 2008
+--- src/ex_cmds.h	Sat Sep 13 18:37:25 2008
+***************
+*** 635,640 ****
+--- 635,642 ----
+  			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+  EX(CMD_noremap,		"noremap",	ex_map,
+  			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
++ EX(CMD_noautocmd,	"noautocmd",	ex_wrongmodifier,
++ 			NEEDARG|EXTRA|NOTRLCOM),
+  EX(CMD_nohlsearch,	"nohlsearch",	ex_nohlsearch,
+  			TRLBAR|SBOXOK|CMDWIN),
+  EX(CMD_noreabbrev,	"noreabbrev",	ex_abbreviate,
+*** ../vim-7.2.018/src/ex_docmd.c	Sat Jul 26 16:04:39 2008
+--- src/ex_docmd.c	Mon Sep 15 20:04:53 2008
+***************
+*** 2978,2983 ****
+--- 2979,2985 ----
+      {"keepmarks", 3, FALSE},
+      {"leftabove", 5, FALSE},
+      {"lockmarks", 3, FALSE},
++     {"noautocmd", 3, FALSE},
+      {"rightbelow", 6, FALSE},
+      {"sandbox", 3, FALSE},
+      {"silent", 3, FALSE},
+*** ../vim-7.2.018/src/version.c	Sun Sep 14 21:40:26 2008
+--- src/version.c	Thu Sep 18 12:39:56 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     19,
+  /**/
+
+-- 
+Proof techniques #2: Proof by Oddity.
+	SAMPLE: To prove that horses have an infinite number of legs.
+(1) Horses have an even number of legs.
+(2) They have two legs in back and fore legs in front.
+(3) This makes a total of six legs, which certainly is an odd number of
+    legs for a horse.
+(4) But the only number that is both odd and even is infinity.
+(5) Therefore, horses must have an infinite number of legs.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.020 b/source/ap/vim/patches/7.2.020
new file mode 100644
index 000000000..fb290407f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.020
@@ -0,0 +1,54 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.020
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.020
+Problem:    Starting the GUI when the executable starts with 'k', but the KDE
+	    version no longer exists.
+Solution:   Don't have "kvim" start the GUI.
+Files:	    src/main.c
+
+
+*** ../vim-7.2.019/src/main.c	Thu Jul 24 19:34:23 2008
+--- src/main.c	Sun Sep 14 13:26:10 2008
+***************
+*** 1457,1463 ****
+  	++initstr;
+      }
+  
+!     if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k')
+      {
+  	main_start_gui();
+  #ifdef FEAT_GUI
+--- 1458,1465 ----
+  	++initstr;
+      }
+  
+!     /* "gvim" starts the GUI.  Also accept "Gvim" for MS-Windows. */
+!     if (TOLOWER_ASC(initstr[0]) == 'g')
+      {
+  	main_start_gui();
+  #ifdef FEAT_GUI
+*** ../vim-7.2.019/src/version.c	Thu Sep 18 12:43:21 2008
+--- src/version.c	Thu Sep 18 20:54:10 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     20,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+90. Instead of calling you to dinner, your spouse sends e-mail.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.021 b/source/ap/vim/patches/7.2.021
new file mode 100644
index 000000000..fee0bd85c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.021
@@ -0,0 +1,147 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.021
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.021
+Problem:    When executing autocommands getting the full file name may be
+	    slow. (David Kotchan)
+Solution:   Postpone calling FullName_save() until autocmd_fname is used.
+Files:	    src/ex_docmd.c, src/fileio.c, src/globals.h
+
+
+*** ../vim-7.2.020/src/ex_docmd.c	Thu Sep 18 12:43:21 2008
+--- src/ex_docmd.c	Mon Sep 15 20:04:53 2008
+***************
+*** 9542,9547 ****
+--- 9569,9583 ----
+  #ifdef FEAT_AUTOCMD
+  	case SPEC_AFILE:	/* file name for autocommand */
+  		result = autocmd_fname;
++ 		if (result != NULL && !autocmd_fname_full)
++ 		{
++ 		    /* Still need to turn the fname into a full path.  It is
++ 		     * postponed to avoid a delay when <afile> is not used. */
++ 		    autocmd_fname_full = TRUE;
++ 		    result = FullName_save(autocmd_fname, FALSE);
++ 		    vim_free(autocmd_fname);
++ 		    autocmd_fname = result;
++ 		}
+  		if (result == NULL)
+  		{
+  		    *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
+*** ../vim-7.2.020/src/fileio.c	Wed Aug  6 18:43:07 2008
+--- src/fileio.c	Tue Sep 16 21:24:26 2008
+***************
+*** 8523,8528 ****
+--- 8523,8529 ----
+      char_u	*save_sourcing_name;
+      linenr_T	save_sourcing_lnum;
+      char_u	*save_autocmd_fname;
++     int		save_autocmd_fname_full;
+      int		save_autocmd_bufnr;
+      char_u	*save_autocmd_match;
+      int		save_autocmd_busy;
+***************
+*** 8601,8606 ****
+--- 8602,8608 ----
+       * Save the autocmd_* variables and info about the current buffer.
+       */
+      save_autocmd_fname = autocmd_fname;
++     save_autocmd_fname_full = autocmd_fname_full;
+      save_autocmd_bufnr = autocmd_bufnr;
+      save_autocmd_match = autocmd_match;
+      save_autocmd_busy = autocmd_busy;
+***************
+*** 8618,8631 ****
+  	if (fname != NULL && *fname != NUL)
+  	    autocmd_fname = fname;
+  	else if (buf != NULL)
+! 	    autocmd_fname = buf->b_fname;
+  	else
+  	    autocmd_fname = NULL;
+      }
+      else
+  	autocmd_fname = fname_io;
+      if (autocmd_fname != NULL)
+! 	autocmd_fname = FullName_save(autocmd_fname, FALSE);
+  
+      /*
+       * Set the buffer number to be used for <abuf>.
+--- 8620,8634 ----
+  	if (fname != NULL && *fname != NUL)
+  	    autocmd_fname = fname;
+  	else if (buf != NULL)
+! 	    autocmd_fname = buf->b_ffname;
+  	else
+  	    autocmd_fname = NULL;
+      }
+      else
+  	autocmd_fname = fname_io;
+      if (autocmd_fname != NULL)
+! 	autocmd_fname = vim_strsave(autocmd_fname);
+!     autocmd_fname_full = FALSE; /* call FullName_save() later */
+  
+      /*
+       * Set the buffer number to be used for <abuf>.
+***************
+*** 8810,8815 ****
+--- 8813,8819 ----
+      sourcing_lnum = save_sourcing_lnum;
+      vim_free(autocmd_fname);
+      autocmd_fname = save_autocmd_fname;
++     autocmd_fname_full = save_autocmd_fname_full;
+      autocmd_bufnr = save_autocmd_bufnr;
+      autocmd_match = save_autocmd_match;
+  #ifdef FEAT_EVAL
+***************
+*** 8918,8924 ****
+      {
+  	apc->curpat = NULL;
+  
+! 	/* only use a pattern when it has not been removed, has commands and
+  	 * the group matches. For buffer-local autocommands only check the
+  	 * buffer number. */
+  	if (ap->pat != NULL && ap->cmds != NULL
+--- 8922,8928 ----
+      {
+  	apc->curpat = NULL;
+  
+! 	/* Only use a pattern when it has not been removed, has commands and
+  	 * the group matches. For buffer-local autocommands only check the
+  	 * buffer number. */
+  	if (ap->pat != NULL && ap->cmds != NULL
+*** ../vim-7.2.020/src/globals.h	Sat Jul 26 16:04:49 2008
+--- src/globals.h	Mon Sep 15 19:59:28 2008
+***************
+*** 1022,1027 ****
+--- 1022,1028 ----
+  #endif
+  #ifdef FEAT_AUTOCMD
+  EXTERN char_u	*autocmd_fname INIT(= NULL); /* fname for <afile> on cmdline */
++ EXTERN int	autocmd_fname_full;	     /* autocmd_fname is full path */
+  EXTERN int	autocmd_bufnr INIT(= 0);     /* fnum for <abuf> on cmdline */
+  EXTERN char_u	*autocmd_match INIT(= NULL); /* name for <amatch> on cmdline */
+  EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
+*** ../vim-7.2.020/src/version.c	Thu Sep 18 20:55:19 2008
+--- src/version.c	Thu Sep 18 21:24:30 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     21,
+  /**/
+
+-- 
+From "know your smileys":
+ :----}  You lie like Pinocchio
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.022 b/source/ap/vim/patches/7.2.022
new file mode 100644
index 000000000..392773523
--- /dev/null
+++ b/source/ap/vim/patches/7.2.022
@@ -0,0 +1,140 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.022 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.022 (extra)
+Problem:    Testing is not possible when compiling with MingW.
+Solution:   Add a MingW specific test Makefile. (Bill McCarthy)
+Files:	    Filelist, src/testdir/Make_ming.mak
+
+
+*** ../vim-7.2.021/Filelist	Sun Jul 13 19:33:31 2008
+--- Filelist	Sun Sep 14 21:47:01 2008
+***************
+*** 285,290 ****
+--- 285,291 ----
+  		src/proto/os_win32.pro \
+  		src/proto/os_mswin.pro \
+  		src/testdir/Make_dos.mak \
++ 		src/testdir/Make_ming.mak \
+  		src/testdir/dos.vim \
+  		src/uninstal.c \
+  		src/vim.def \
+*** ../vim-7.2.021/src/testdir/Make_ming.mak	Sat Sep 20 16:25:06 2008
+--- src/testdir/Make_ming.mak	Sat Sep 20 16:25:58 2008
+***************
+*** 0 ****
+--- 1,91 ----
++ # Makefile to run tests for Vim, on Dos-like machines
++ # with sh.exe or zsh.exe in the path or not.
++ #
++ # Author: Bill McCarthy
++ #
++ # Note that test54 has been removed until it is fixed.
++ #
++ # Requires a set of Unix tools: echo, diff, etc.
++ 
++ ifneq (sh.exe, $(SHELL))
++ DEL = rm -f
++ MV = mv
++ CP = cp
++ DIRSLASH = /
++ else
++ DEL = del
++ MV = rename
++ CP = copy
++ DIRSLASH = \\
++ endif
++ 
++ VIMPROG = ..$(DIRSLASH)vim
++ 
++ # Omitted:
++ # test2		"\\tmp" doesn't work.
++ # test10	'errorformat' is different
++ # test12	can't unlink a swap file
++ # test25	uses symbolic link
++ # test27	can't edit file with "*" in file name
++ # test31	16 bit version runs out of memory...
++ 
++ SCRIPTS16 =	test1.out test19.out test20.out test22.out \
++ 		test23.out test24.out test28.out test29.out \
++ 		test35.out test36.out test43.out \
++ 		test44.out test45.out test46.out test47.out \
++ 		test48.out test51.out test53.out            \
++ 		test55.out test56.out test57.out test58.out test59.out \
++ 		test60.out test61.out test62.out test63.out test64.out
++ 
++ # Had to remove test54 which doesn't work yet.
++ #		                                 test54.out
++ 
++ SCRIPTS =	test3.out test4.out test5.out test6.out test7.out \
++ 		test8.out test9.out test11.out test13.out test14.out \
++ 		test15.out test17.out test18.out test21.out test26.out \
++ 		test30.out test31.out test32.out test33.out test34.out \
++ 		test37.out test38.out test39.out test40.out test41.out \
++ 		test42.out test52.out test65.out
++ 
++ SCRIPTS32 =	test50.out
++ 
++ SCRIPTS_GUI = test16.out
++ 
++ .SUFFIXES: .in .out
++ 
++ vimall:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32)
++ 	echo ALL DONE
++ 
++ nongui:	fixff $(SCRIPTS16) $(SCRIPTS)
++ 	echo ALL DONE
++ 
++ small:
++ 	echo ALL DONE
++ 
++ gui:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
++ 	echo ALL DONE
++ 
++ win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
++ 	echo ALL DONE
++ 
++ fixff:
++ 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
++ 
++ clean:
++ 	-$(DEL) *.out
++ 	-$(DEL) test.ok
++ 	-$(DEL) small.vim
++ 	-$(DEL) tiny.vim
++ 	-$(DEL) mbyte.vim
++ 	-$(DEL) X*
++ 	-$(DEL) viminfo
++ 
++ .in.out:
++ 	$(CP) $*.ok test.ok
++ 	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
++ 	diff test.out $*.ok
++ 	-$(DEL) $*.out
++ 	$(MV) test.out $*.out
++ 	-$(DEL) X*
++ 	-$(DEL) test.ok
++ 	-$(DEL) viminfo
+*** ../vim-7.2.021/src/version.c	Thu Sep 18 21:29:07 2008
+--- src/version.c	Sat Sep 20 16:25:16 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     22,
+  /**/
+
+-- 
+Where do you want to crash today?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.023 b/source/ap/vim/patches/7.2.023
new file mode 100644
index 000000000..0f6ad1e12
--- /dev/null
+++ b/source/ap/vim/patches/7.2.023
@@ -0,0 +1,65 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.023
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.023
+Problem:    'cursorcolumn' is in the wrong place in a closed fold when the
+	    display is shifted left. (Gary Johnson)
+Solution:   Subtract w_skipcol or w_leftcol when needed.
+Files:	    src/screen.c
+
+
+*** ../vim-7.2.022/src/screen.c	Thu Jul 24 20:29:09 2008
+--- src/screen.c	Fri Sep 26 21:23:06 2008
+***************
+*** 2439,2447 ****
+  
+  #ifdef FEAT_SYN_HL
+      /* Show 'cursorcolumn' in the fold line. */
+!     if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp))
+! 	ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr(
+! 		 ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC));
+  #endif
+  
+      SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),
+--- 2439,2455 ----
+  
+  #ifdef FEAT_SYN_HL
+      /* Show 'cursorcolumn' in the fold line. */
+!     if (wp->w_p_cuc)
+!     {
+! 	txtcol += wp->w_virtcol;
+! 	if (wp->w_p_wrap)
+! 	    txtcol -= wp->w_skipcol;
+! 	else
+! 	    txtcol -= wp->w_leftcol;
+! 	if (txtcol >= 0 && txtcol < W_WIDTH(wp))
+! 	    ScreenAttrs[off + txtcol] = hl_combine_attr(
+! 				 ScreenAttrs[off + txtcol], hl_attr(HLF_CUC));
+!     }
+  #endif
+  
+      SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),
+*** ../vim-7.2.022/src/version.c	Sat Sep 20 16:26:10 2008
+--- src/version.c	Wed Oct  1 21:07:31 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     23,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+124. You begin conversations with, "Who is your internet service provider?"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.024 b/source/ap/vim/patches/7.2.024
new file mode 100644
index 000000000..033b0a26b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.024
@@ -0,0 +1,50 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.024
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.024
+Problem:    It's possible to set 'history' to a negative value and that causes
+	    an out-of-memory error.
+Solution:   Check that 'history' has a positive value. (Doug Kearns)
+Files:	    src/option.c
+
+
+*** ../vim-7.2.023/src/option.c	Thu Jul 24 18:45:15 2008
+--- src/option.c	Fri Sep 26 22:20:20 2008
+***************
+*** 7974,7979 ****
+--- 7974,7984 ----
+  	else /* curwin->w_p_scr > curwin->w_height */
+  	    curwin->w_p_scr = curwin->w_height;
+      }
++     if (p_hi < 0)
++     {
++ 	errmsg = e_positive;
++ 	p_hi = 0;
++     }
+      if (p_report < 0)
+      {
+  	errmsg = e_positive;
+*** ../vim-7.2.023/src/version.c	Wed Oct  1 21:09:02 2008
+--- src/version.c	Thu Oct  2 22:47:22 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     24,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+127. You bring your laptop and cellular phone to church.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.025 b/source/ap/vim/patches/7.2.025
new file mode 100644
index 000000000..dab2cc867
--- /dev/null
+++ b/source/ap/vim/patches/7.2.025
@@ -0,0 +1,54 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.025
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.025
+Problem:    When a CursorHold event invokes system() it is retriggered over
+	    and over again.
+Solution:   Don't reset did_cursorhold when getting K_IGNORE.
+Files:	    src/normal.c
+
+
+*** ../vim-7.2.024/src/normal.c	Sat Sep  6 16:44:06 2008
+--- src/normal.c	Sat Sep 27 13:03:34 2008
+***************
+*** 1132,1138 ****
+  	out_flush();
+  #endif
+  #ifdef FEAT_AUTOCMD
+!     did_cursorhold = FALSE;
+  #endif
+  
+      State = NORMAL;
+--- 1132,1139 ----
+  	out_flush();
+  #endif
+  #ifdef FEAT_AUTOCMD
+!     if (ca.cmdchar != K_IGNORE)
+! 	did_cursorhold = FALSE;
+  #endif
+  
+      State = NORMAL;
+*** ../vim-7.2.024/src/version.c	Thu Oct  2 22:48:01 2008
+--- src/version.c	Thu Oct  2 22:54:41 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     25,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+128. You can access the Net -- via your portable and cellular phone.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.026 b/source/ap/vim/patches/7.2.026
new file mode 100644
index 000000000..ec8b1c7b1
--- /dev/null
+++ b/source/ap/vim/patches/7.2.026
@@ -0,0 +1,105 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.026
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.026 (after 7.2.010)
+Problem:    "K" doesn't use the length of the identifier but uses the rest of
+	    the line.
+Solution:   Copy the desired number of characters first.
+Files:	    src/normal.c
+
+
+*** ../vim-7.2.025/src/normal.c	Thu Oct  2 22:55:17 2008
+--- src/normal.c	Sat Nov  1 13:41:03 2008
+***************
+*** 183,188 ****
+--- 183,190 ----
+  static void	nv_cursorhold __ARGS((cmdarg_T *cap));
+  #endif
+  
++ static char *e_noident = N_("E349: No identifier under cursor");
++ 
+  /*
+   * Function to be called for a Normal or Visual mode command.
+   * The argument is a cmdarg_T.
+***************
+*** 3510,3516 ****
+  	if (find_type & FIND_STRING)
+  	    EMSG(_("E348: No string under cursor"));
+  	else
+! 	    EMSG(_("E349: No identifier under cursor"));
+  	return 0;
+      }
+      ptr += col;
+--- 3512,3518 ----
+  	if (find_type & FIND_STRING)
+  	    EMSG(_("E348: No string under cursor"));
+  	else
+! 	    EMSG(_(e_noident));
+  	return 0;
+      }
+      ptr += col;
+***************
+*** 5472,5479 ****
+  	    {
+  		/* An external command will probably use an argument starting
+  		 * with "-" as an option.  To avoid trouble we skip the "-". */
+! 		while (*ptr == '-')
+  		    ++ptr;
+  
+  		/* When a count is given, turn it into a range.  Is this
+  		 * really what we want? */
+--- 5474,5490 ----
+  	    {
+  		/* An external command will probably use an argument starting
+  		 * with "-" as an option.  To avoid trouble we skip the "-". */
+! 		while (*ptr == '-' && n > 0)
+! 		{
+  		    ++ptr;
++ 		    --n;
++ 		}
++ 		if (n == 0)
++ 		{
++ 		    EMSG(_(e_noident));	 /* found dashes only */
++ 		    vim_free(buf);
++ 		    return;
++ 		}
+  
+  		/* When a count is given, turn it into a range.  Is this
+  		 * really what we want? */
+***************
+*** 5520,5526 ****
+--- 5531,5539 ----
+      if (cmdchar == 'K' && !kp_help)
+      {
+  	/* Escape the argument properly for a shell command */
++ 	ptr = vim_strnsave(ptr, n);
+  	p = vim_strsave_shellescape(ptr, TRUE);
++ 	vim_free(ptr);
+  	if (p == NULL)
+  	{
+  	    vim_free(buf);
+*** ../vim-7.2.025/src/version.c	Thu Oct  2 22:55:17 2008
+--- src/version.c	Sat Nov  1 13:50:53 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     26,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+161. You get up before the sun rises to check your e-mail, and you
+     find yourself in the very same chair long after the sun has set.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.027 b/source/ap/vim/patches/7.2.027
new file mode 100644
index 000000000..59d708d28
--- /dev/null
+++ b/source/ap/vim/patches/7.2.027
@@ -0,0 +1,98 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.027
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.027
+Problem:    Can use cscope commands in the sandbox.
+Solution:   Disallow them, they might not be safe.
+Files:	    src/ex_cmds.h
+
+
+*** ../vim-7.2.026/src/ex_cmds.h	Thu Sep 18 12:43:21 2008
+--- src/ex_cmds.h	Thu Sep 18 22:18:14 2008
+***************
+*** 278,284 ****
+  EX(CMD_crewind,		"crewind",	ex_cc,
+  			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+  EX(CMD_cscope,		"cscope",	do_cscope,
+! 			EXTRA|NOTRLCOM|SBOXOK|XFILE),
+  EX(CMD_cstag,		"cstag",	do_cstag,
+  			BANG|TRLBAR|WORD1),
+  EX(CMD_cunmap,		"cunmap",	ex_unmap,
+--- 278,284 ----
+  EX(CMD_crewind,		"crewind",	ex_cc,
+  			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+  EX(CMD_cscope,		"cscope",	do_cscope,
+! 			EXTRA|NOTRLCOM|XFILE),
+  EX(CMD_cstag,		"cstag",	do_cstag,
+  			BANG|TRLBAR|WORD1),
+  EX(CMD_cunmap,		"cunmap",	ex_unmap,
+***************
+*** 506,512 ****
+  EX(CMD_lclose,		"lclose",	ex_cclose,
+  			RANGE|NOTADR|COUNT|TRLBAR),
+  EX(CMD_lcscope,		"lcscope",	do_cscope,
+! 			EXTRA|NOTRLCOM|SBOXOK|XFILE),
+  EX(CMD_left,		"left",		ex_align,
+  			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
+  EX(CMD_leftabove,	"leftabove",	ex_wrongmodifier,
+--- 506,512 ----
+  EX(CMD_lclose,		"lclose",	ex_cclose,
+  			RANGE|NOTADR|COUNT|TRLBAR),
+  EX(CMD_lcscope,		"lcscope",	do_cscope,
+! 			EXTRA|NOTRLCOM|XFILE),
+  EX(CMD_left,		"left",		ex_align,
+  			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
+  EX(CMD_leftabove,	"leftabove",	ex_wrongmodifier,
+***************
+*** 653,658 ****
+--- 653,660 ----
+  			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+  EX(CMD_open,		"open",		ex_open,
+  			RANGE|EXTRA),
++ EX(CMD_oldfiles,	"oldfiles",	ex_oldfiles,
++ 			BANG|TRLBAR|SBOXOK|CMDWIN),
+  EX(CMD_omap,		"omap",		ex_map,
+  			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+  EX(CMD_omapclear,	"omapclear",	ex_mapclear,
+***************
+*** 804,810 ****
+  EX(CMD_scriptencoding,	"scriptencoding", ex_scriptencoding,
+  			WORD1|TRLBAR|CMDWIN),
+  EX(CMD_scscope,		"scscope",	do_scscope,
+! 			EXTRA|NOTRLCOM|SBOXOK),
+  EX(CMD_set,		"set",		ex_set,
+  			TRLBAR|EXTRA|CMDWIN|SBOXOK),
+  EX(CMD_setfiletype,	"setfiletype",	ex_setfiletype,
+--- 806,812 ----
+  EX(CMD_scriptencoding,	"scriptencoding", ex_scriptencoding,
+  			WORD1|TRLBAR|CMDWIN),
+  EX(CMD_scscope,		"scscope",	do_scscope,
+! 			EXTRA|NOTRLCOM),
+  EX(CMD_set,		"set",		ex_set,
+  			TRLBAR|EXTRA|CMDWIN|SBOXOK),
+  EX(CMD_setfiletype,	"setfiletype",	ex_setfiletype,
+*** ../vim-7.2.026/src/version.c	Sat Nov  1 13:51:57 2008
+--- src/version.c	Thu Nov  6 10:21:21 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     27,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+179. You wonder why your household garbage can doesn't have an
+     "empty recycle bin" button.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.028 b/source/ap/vim/patches/7.2.028
new file mode 100644
index 000000000..4f148e96a
--- /dev/null
+++ b/source/ap/vim/patches/7.2.028
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.028
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.028
+Problem:    Confusing error message for missing ().
+Solution:   Change "braces" to "parentheses". (Gary Johnson)
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.027/src/eval.c	Wed Sep 10 15:38:13 2008
+--- src/eval.c	Tue Sep 30 21:43:38 2008
+***************
+*** 3287,3293 ****
+  
+      if (*startarg != '(')
+      {
+! 	EMSG2(_("E107: Missing braces: %s"), eap->arg);
+  	goto end;
+      }
+  
+--- 3293,3299 ----
+  
+      if (*startarg != '(')
+      {
+! 	EMSG2(_("E107: Missing parentheses: %s"), eap->arg);
+  	goto end;
+      }
+  
+*** ../vim-7.2.027/src/version.c	Thu Nov  6 10:23:03 2008
+--- src/version.c	Thu Nov  6 11:02:51 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     28,
+  /**/
+
+-- 
+Wizards had always known that the act of observation changed the thing that
+was observed, and sometimes forgot that it also changed the observer too.
+			Terry Pratchett  -  Interesting times
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.029 b/source/ap/vim/patches/7.2.029
new file mode 100644
index 000000000..56e847a76
--- /dev/null
+++ b/source/ap/vim/patches/7.2.029
@@ -0,0 +1,44 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.029
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.029
+Problem:    No completion for ":doautoall".
+Solution:   Complete ":doautoall" like ":doautocmd".  (Doug Kearns)
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.2.028/src/ex_docmd.c	Thu Sep 18 21:29:07 2008
+--- src/ex_docmd.c	Mon Nov  3 21:21:17 2008
+***************
+*** 3609,3614 ****
+--- 3610,3616 ----
+  	    return set_context_in_autocmd(xp, arg, FALSE);
+  
+  	case CMD_doautocmd:
++ 	case CMD_doautoall:
+  	    return set_context_in_autocmd(xp, arg, TRUE);
+  #endif
+  	case CMD_set:
+*** ../vim-7.2.028/src/version.c	Thu Nov  6 11:04:50 2008
+--- src/version.c	Thu Nov  6 17:14:58 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     29,
+  /**/
+
+-- 
+Press any key to continue, press any other key to quit.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.030 b/source/ap/vim/patches/7.2.030
new file mode 100644
index 000000000..310207ed3
--- /dev/null
+++ b/source/ap/vim/patches/7.2.030
@@ -0,0 +1,51 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.030
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.030 (after 7.2.027)
+Problem:    Can't compile.
+Solution:   Remove prematurely added ex_oldfiles.
+Files:	    src/ex_cmds.h
+
+
+*** ../vim-7.2.029/src/ex_cmds.h	Thu Nov  6 10:23:03 2008
+--- src/ex_cmds.h	Thu Nov  6 20:45:07 2008
+***************
+*** 653,660 ****
+  			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+  EX(CMD_open,		"open",		ex_open,
+  			RANGE|EXTRA),
+- EX(CMD_oldfiles,	"oldfiles",	ex_oldfiles,
+- 			BANG|TRLBAR|SBOXOK|CMDWIN),
+  EX(CMD_omap,		"omap",		ex_map,
+  			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+  EX(CMD_omapclear,	"omapclear",	ex_mapclear,
+--- 653,658 ----
+*** ../vim-7.2.029/src/version.c	Thu Nov  6 17:16:06 2008
+--- src/version.c	Thu Nov  6 20:46:11 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     30,
+  /**/
+
+-- 
+% cat /usr/include/sys/errno.h
+#define	EPERM		1		/* Operation not permitted */
+#define	ENOENT		2		/* No such file or directory */
+#define	ESRCH		3		/* No such process */
+[...]
+#define EMACS		666		/* Too many macros */
+%
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.031 b/source/ap/vim/patches/7.2.031
new file mode 100644
index 000000000..4b2bca700
--- /dev/null
+++ b/source/ap/vim/patches/7.2.031
@@ -0,0 +1,1281 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.031
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.031
+Problem:    Information in the viminfo file about previously edited files is
+	    not available to the user.  There is no way to get a complete list
+	    of files edited in previous Vim sessions.
+Solution:   Add v:oldfiles and fill it with the list of old file names when
+	    first reading the viminfo file.  Add the ":oldfiles" command,
+	    ":browse oldfiles" and the "#<123" special file name.  Increase
+	    the default value for 'viminfo' from '20 to '100.
+Files:	    runtime/doc/cmdline.txt, runtime/doc/eval.txt,
+	    runtime/doc/starting.txt, runtime/doc/usr_21.txt, src/eval.c,
+	    src/ex_cmds.c, src/ex_cmds.h, src/ex_docmd.c, src/feature.h,
+	    src/fileio.c, src/main.c, src/mark.c, src/misc1.c,
+	    src/proto/eval.pro, src/proto/ex_cmds.pro, src/proto/mark.pro,
+	    src/option.c, src/structs.h, src/vim.h
+
+
+*** ../vim-7.2.030/runtime/doc/cmdline.txt	Sat Aug  9 19:36:46 2008
+--- runtime/doc/cmdline.txt	Thu Sep 18 22:55:27 2008
+***************
+*** 1,4 ****
+! *cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+--- 1,4 ----
+! *cmdline.txt*   For Vim version 7.2.  Last change: 2008 Sep 18
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+***************
+*** 157,162 ****
+--- 157,167 ----
+  				(doesn't work at the expression prompt; some
+  				things such as changing the buffer or current
+  				window are not allowed to avoid side effects)
++ 				When the result is a |List| the items are used
++ 				as lines.  They can have line breaks inside
++ 				too.
++ 				When the result is a Float it's automatically
++ 				converted to a String.
+  		See |registers| about registers.  {not in Vi}
+  		Implementation detail: When using the |expression| register
+  		and invoking setcmdpos(), this sets the position before
+***************
+*** 730,748 ****
+  In Ex commands, at places where a file name can be used, the following
+  characters have a special meaning.  These can also be used in the expression
+  function expand() |expand()|.
+! 	%	is replaced with the current file name			*:_%*
+! 	#	is replaced with the alternate file name		*:_#*
+  	#n	(where n is a number) is replaced with the file name of
+! 		buffer n.  "#0" is the same as "#"
+! 	##	is replaced with all names in the argument list		*:_##*
+  		concatenated, separated by spaces.  Each space in a name
+  		is preceded with a backslash.
+! Note that these give the file name as it was typed.  If an absolute path is
+! needed (when using the file name from a different directory), you need to add
+! ":p".  See |filename-modifiers|.
+  Note that backslashes are inserted before spaces, so that the command will
+  correctly interpret the file name.  But this doesn't happen for shell
+! commands.  For those you probably have to use quotes: >
+  	:!ls "%"
+  	:r !spell "%"
+  
+--- 735,763 ----
+  In Ex commands, at places where a file name can be used, the following
+  characters have a special meaning.  These can also be used in the expression
+  function expand() |expand()|.
+! 	%	Is replaced with the current file name.		  *:_%* *c_%*
+! 	#	Is replaced with the alternate file name.	  *:_#* *c_#*
+  	#n	(where n is a number) is replaced with the file name of
+! 		buffer n.  "#0" is the same as "#".
+! 	##	Is replaced with all names in the argument list	  *:_##* *c_##*
+  		concatenated, separated by spaces.  Each space in a name
+  		is preceded with a backslash.
+! 	#<n	(where n is a number > 0) is replaced with old	  *:_#<* *c_#<*
+! 		file name n.  See |:oldfiles| or |v:oldfiles| to get the
+! 		number.							*E809*
+! 		{only when compiled with the +eval and +viminfo features}
+! 
+! Note that these, except "#<n", give the file name as it was typed.  If an
+! absolute path is needed (when using the file name from a different directory),
+! you need to add ":p".  See |filename-modifiers|.
+! 
+! The "#<n" item returns an absolute path, but it will start with "~/" for files
+! below your home directory.
+! 
+  Note that backslashes are inserted before spaces, so that the command will
+  correctly interpret the file name.  But this doesn't happen for shell
+! commands.  For those you probably have to use quotes (this fails for files
+! that contain a quote and wildcards): >
+  	:!ls "%"
+  	:r !spell "%"
+  
+*** ../vim-7.2.030/runtime/doc/eval.txt	Sat Aug  9 19:36:47 2008
+--- runtime/doc/eval.txt	Sun Nov  2 14:25:38 2008
+***************
+*** 1,4 ****
+! *eval.txt*	For Vim version 7.2.  Last change: 2008 Aug 09
+  
+  
+  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt*	For Vim version 7.2.  Last change: 2008 Nov 02
+  
+  
+  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+***************
+*** 1484,1489 ****
+--- 1484,1500 ----
+  		This is the screen column number, like with |virtcol()|.  The
+  		value is zero when there was no mouse button click.
+  
++ 					*v:oldfiles* *oldfiles-variable*
++ v:oldfiles	List of file names that is loaded from the |viminfo| file on
++ 		startup.  These are the files that Vim remembers marks for.
++ 		The length of the List is limited by the ' argument of the
++ 		'viminfo' option (default is 100).
++ 		Also see |:oldfiles| and |c_#<|.
++ 		The List can be modified, but this has no effect on what is
++ 		stored in the |viminfo| file later.  If you use values other
++ 		than String this will cause trouble.
++ 		{only when compiled with the +viminfo feature}
++ 
+  					*v:operator* *operator-variable*
+  v:operator	The last operator given in Normal mode.  This is a single
+  		character except for commands starting with <g> or <z>,
+*** ../vim-7.2.030/runtime/doc/starting.txt	Sat Aug  9 19:36:52 2008
+--- runtime/doc/starting.txt	Sun Nov  9 12:12:19 2008
+***************
+*** 1,4 ****
+! *starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+--- 1,4 ----
+! *starting.txt*  For Vim version 7.2.  Last change: 2008 Nov 09
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+***************
+*** 1337,1344 ****
+  							*viminfo-read*
+  When Vim is started and the 'viminfo' option is non-empty, the contents of
+  the viminfo file are read and the info can be used in the appropriate places.
+! The marks are not read in at startup (but file marks are).  See
+! |initialization| for how to set the 'viminfo' option upon startup.
+  
+  							*viminfo-write*
+  When Vim exits and 'viminfo' is non-empty, the info is stored in the viminfo
+--- 1335,1343 ----
+  							*viminfo-read*
+  When Vim is started and the 'viminfo' option is non-empty, the contents of
+  the viminfo file are read and the info can be used in the appropriate places.
+! The |v:oldfiles| variable is filled.  The marks are not read in at startup
+! (but file marks are).  See |initialization| for how to set the 'viminfo'
+! option upon startup.
+  
+  							*viminfo-write*
+  When Vim exits and 'viminfo' is non-empty, the info is stored in the viminfo
+***************
+*** 1372,1377 ****
+--- 1371,1378 ----
+  that start with any string given with the "r" flag in 'viminfo'.  This can be
+  used to avoid saving marks for files on removable media (for MS-DOS you would
+  use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:").
++ The |v:oldfiles| variable is filled with the file names that the viminfo file
++ has marks for.
+  
+  							*viminfo-file-marks*
+  Uppercase marks ('A to 'Z) are stored when writing the viminfo file.  The
+***************
+*** 1463,1470 ****
+  						   *:rv* *:rviminfo* *E195*
+  :rv[iminfo][!] [file]	Read from viminfo file [file] (default: see above).
+  			If [!] is given, then any information that is
+! 			already set (registers, marks, etc.) will be
+! 			overwritten.  {not in Vi}
+  
+  					*:wv* *:wviminfo* *E137* *E138* *E574*
+  :wv[iminfo][!] [file]	Write to viminfo file [file] (default: see above).
+--- 1464,1471 ----
+  						   *:rv* *:rviminfo* *E195*
+  :rv[iminfo][!] [file]	Read from viminfo file [file] (default: see above).
+  			If [!] is given, then any information that is
+! 			already set (registers, marks, |v:oldfiles|, etc.)
+! 			will be overwritten   {not in Vi}
+  
+  					*:wv* *:wviminfo* *E137* *E138* *E574*
+  :wv[iminfo][!] [file]	Write to viminfo file [file] (default: see above).
+***************
+*** 1479,1482 ****
+--- 1480,1499 ----
+  			the .viminfo file.
+  			{not in Vi}
+  
++ 						*:ol* *:oldfiles*
++ :ol[dfiles]		List the files that have marks stored in the viminfo
++ 			file.  This list is read on startup and only changes
++ 			afterwards with ":rviminfo!".  Also see |v:oldfiles|.
++ 			The number can be used with |c_#<|.
++ 			{not in Vi, only when compiled with the +eval feature}
++ 
++ :bro[wse] ol[dfiles][!]
++ 			List file names as with |:oldfiles|, and then prompt
++ 			for a number.  When the number is valid that file from
++ 			the list is edited.
++ 			If you get the |press-enter| prompt you can press "q"
++ 			and still get the prompt to enter a file number.
++ 			Use ! to abondon a modified buffer. |abandon|
++ 			{not when compiled with tiny or small features}
++ 
+   vim:tw=78:ts=8:ft=help:norl:
+*** ../vim-7.2.030/runtime/doc/usr_21.txt	Sat Aug  9 19:36:53 2008
+--- runtime/doc/usr_21.txt	Sun Nov  9 12:14:10 2008
+***************
+*** 1,4 ****
+! *usr_21.txt*	For Vim version 7.2.  Last change: 2007 May 01
+  
+  		     VIM USER MANUAL - by Bram Moolenaar
+  
+--- 1,4 ----
+! *usr_21.txt*	For Vim version 7.2.  Last change: 2008 Nov 09
+  
+  		     VIM USER MANUAL - by Bram Moolenaar
+  
+***************
+*** 153,159 ****
+  to be lost.  Each item can be remembered only once.
+  
+  
+! GETTING BACK TO WHERE YOU WERE
+  
+  You are halfway editing a file and it's time to leave for holidays.  You exit
+  Vim and go enjoy yourselves, forgetting all about your work.  After a couple
+--- 153,159 ----
+  to be lost.  Each item can be remembered only once.
+  
+  
+! GETTING BACK TO WHERE YOU STOPPED VIM
+  
+  You are halfway editing a file and it's time to leave for holidays.  You exit
+  Vim and go enjoy yourselves, forgetting all about your work.  After a couple
+***************
+*** 168,173 ****
+--- 168,215 ----
+     The |:marks| command is useful to find out where '0 to '9 will take you.
+  
+  
++ GETTING BACK TO SOME FILE
++ 
++ If you want to go back to a file that you edited recently, but not when
++ exiting Vim, there is a slightly more complicated way.  You can see a list of
++ files by typing the command: >
++ 
++ 	:oldfiles
++ <	1: ~/.viminfo ~
++ 	2: ~/text/resume.txt ~
++ 	3: /tmp/draft ~
++ 
++ Now you would like to edit the second file, which is in the list preceded by
++ "2:".  You type: >
++ 
++ 	:e #<2
++ 
++ Instead of ":e" you can use any command that has a file name argument, the
++ "#<2" item works in the same place as "%" (current file name) and "#"
++ (alternate file name).  So you can also split the window to edit the third
++ file: >
++ 
++ 	:split #<3
++ 
++ That #<123 thing is a bit complicated when you just want to edit a file.
++ Fortunately there is a simpler way: >
++ 
++ 	:browse oldfiles
++ <	1: ~/.viminfo ~
++ 	2: ~/text/resume.txt ~
++ 	3: /tmp/draft ~
++ 	-- More --
++ 
++ You get the same list of files as with |:oldfiles|.  If you want to edit
++ "resume.txt" first press "q" to stop the listing.  You will get a prompt:
++ 
++ 	Type number and <Enter> (empty cancels): ~
++ 
++ Type "2" and press <Enter> to edit the second file.
++ 
++ More info at |:oldfiles|, |v:oldfiles| and |c_#<|.
++ 
++ 
+  MOVE INFO FROM ONE VIM TO ANOTHER
+  
+  You can use the ":wviminfo" and ":rviminfo" commands to save and restore the
+*** ../vim-7.2.030/src/eval.c	Thu Nov  6 11:04:50 2008
+--- src/eval.c	Sun Nov  9 11:59:39 2008
+***************
+*** 348,353 ****
+--- 348,354 ----
+      {VV_NAME("mouse_col",	 VAR_NUMBER), 0},
+      {VV_NAME("operator",	 VAR_STRING), VV_RO},
+      {VV_NAME("searchforward",	 VAR_NUMBER), 0},
++     {VV_NAME("oldfiles",	 VAR_LIST), 0},
+  };
+  
+  /* shorthand */
+***************
+*** 355,360 ****
+--- 356,362 ----
+  #define vv_nr		vv_di.di_tv.vval.v_number
+  #define vv_float	vv_di.di_tv.vval.v_float
+  #define vv_str		vv_di.di_tv.vval.v_string
++ #define vv_list		vv_di.di_tv.vval.v_list
+  #define vv_tv		vv_di.di_tv
+  
+  /*
+***************
+*** 426,432 ****
+  static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));
+  static void list_append __ARGS((list_T *l, listitem_T *item));
+  static int list_append_tv __ARGS((list_T *l, typval_T *tv));
+- static int list_append_string __ARGS((list_T *l, char_u *str, int len));
+  static int list_append_number __ARGS((list_T *l, varnumber_T n));
+  static int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
+  static int list_extend __ARGS((list_T	*l1, list_T *l2, listitem_T *bef));
+--- 428,433 ----
+***************
+*** 845,852 ****
+  	p = &vimvars[i];
+  	if (p->vv_di.di_tv.v_type == VAR_STRING)
+  	{
+! 	    vim_free(p->vv_di.di_tv.vval.v_string);
+! 	    p->vv_di.di_tv.vval.v_string = NULL;
+  	}
+      }
+      hash_clear(&vimvarht);
+--- 846,858 ----
+  	p = &vimvars[i];
+  	if (p->vv_di.di_tv.v_type == VAR_STRING)
+  	{
+! 	    vim_free(p->vv_string);
+! 	    p->vv_string = NULL;
+! 	}
+! 	else if (p->vv_di.di_tv.v_type == VAR_LIST)
+! 	{
+! 	    list_unref(p->vv_list);
+! 	    p->vv_list = NULL;
+  	}
+      }
+      hash_clear(&vimvarht);
+***************
+*** 6057,6062 ****
+--- 6063,6087 ----
+  }
+  
+  /*
++  * Get list item "l[idx - 1]" as a string.  Returns NULL for failure.
++  */
++     char_u *
++ list_find_str(l, idx)
++     list_T	*l;
++     long	idx;
++ {
++     listitem_T	*li;
++ 
++     li = list_find(l, idx - 1);
++     if (li == NULL)
++     {
++ 	EMSGN(_(e_listidx), idx);
++ 	return NULL;
++     }
++     return get_tv_string(&li->li_tv);
++ }
++ 
++ /*
+   * Locate "item" list "l" and return its index.
+   * Returns -1 when "item" is not in the list.
+   */
+***************
+*** 6147,6153 ****
+   * When "len" >= 0 use "str[len]".
+   * Returns FAIL when out of memory.
+   */
+!     static int
+  list_append_string(l, str, len)
+      list_T	*l;
+      char_u	*str;
+--- 6172,6178 ----
+   * When "len" >= 0 use "str[len]".
+   * Returns FAIL when out of memory.
+   */
+!     int
+  list_append_string(l, str, len)
+      list_T	*l;
+      char_u	*str;
+***************
+*** 6507,6512 ****
+--- 6532,6540 ----
+  	set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID);
+      }
+  
++     /* v: vars */
++     set_ref_in_ht(&vimvarht, copyID);
++ 
+      /*
+       * 2. Go through the list of dicts and free items without the copyID.
+       */
+***************
+*** 6597,6603 ****
+      {
+  	case VAR_DICT:
+  	    dd = tv->vval.v_dict;
+! 	    if (dd->dv_copyID != copyID)
+  	    {
+  		/* Didn't see this dict yet. */
+  		dd->dv_copyID = copyID;
+--- 6625,6631 ----
+      {
+  	case VAR_DICT:
+  	    dd = tv->vval.v_dict;
+! 	    if (dd != NULL && dd->dv_copyID != copyID)
+  	    {
+  		/* Didn't see this dict yet. */
+  		dd->dv_copyID = copyID;
+***************
+*** 6607,6613 ****
+  
+  	case VAR_LIST:
+  	    ll = tv->vval.v_list;
+! 	    if (ll->lv_copyID != copyID)
+  	    {
+  		/* Didn't see this list yet. */
+  		ll->lv_copyID = copyID;
+--- 6635,6641 ----
+  
+  	case VAR_LIST:
+  	    ll = tv->vval.v_list;
+! 	    if (ll != NULL && ll->lv_copyID != copyID)
+  	    {
+  		/* Didn't see this list yet. */
+  		ll->lv_copyID = copyID;
+***************
+*** 18106,18111 ****
+--- 18134,18150 ----
+  }
+  
+  /*
++  * Get List v: variable value.  Caller must take care of reference count when
++  * needed.
++  */
++     list_T *
++ get_vim_var_list(idx)
++     int		idx;
++ {
++     return vimvars[idx].vv_list;
++ }
++ 
++ /*
+   * Set v:count, v:count1 and v:prevcount.
+   */
+      void
+***************
+*** 18141,18146 ****
+--- 18180,18199 ----
+  }
+  
+  /*
++  * Set List v: variable to "val".
++  */
++     void
++ set_vim_var_list(idx, val)
++     int		idx;
++     list_T	*val;
++ {
++     list_unref(vimvars[idx].vv_list);
++     vimvars[idx].vv_list = val;
++     if (val != NULL)
++ 	++val->lv_refcount;
++ }
++ 
++ /*
+   * Set v:register if needed.
+   */
+      void
+***************
+*** 21900,21905 ****
+--- 21953,22014 ----
+      }
+  }
+  
++ /*
++  * List v:oldfiles in a nice way.
++  */
++ /*ARGSUSED*/
++     void
++ ex_oldfiles(eap)
++     exarg_T	*eap;
++ {
++     list_T	*l = vimvars[VV_OLDFILES].vv_list;
++     listitem_T	*li;
++     int		nr = 0;
++ 
++     if (l == NULL)
++ 	msg((char_u *)_("No old files"));
++     else
++     {
++ 	msg_start();
++ 	msg_scroll = TRUE;
++ 	for (li = l->lv_first; li != NULL && !got_int; li = li->li_next)
++ 	{
++ 	    msg_outnum((long)++nr);
++ 	    MSG_PUTS(": ");
++ 	    msg_outtrans(get_tv_string(&li->li_tv));
++ 	    msg_putchar('\n');
++ 	    out_flush();	    /* output one line at a time */
++ 	    ui_breakcheck();
++ 	}
++ 	/* Assume "got_int" was set to truncate the listing. */
++ 	got_int = FALSE;
++ 
++ #ifdef FEAT_BROWSE_CMD
++ 	if (cmdmod.browse)
++ 	{
++ 	    quit_more = FALSE;
++ 	    nr = prompt_for_number(FALSE);
++ 	    msg_starthere();
++ 	    if (nr > 0)
++ 	    {
++ 		char_u *p = list_find_str(get_vim_var_list(VV_OLDFILES),
++ 								    (long)nr);
++ 
++ 		if (p != NULL)
++ 		{
++ 		    p = expand_env_save(p);
++ 		    eap->arg = p;
++ 		    eap->cmdidx = CMD_edit;
++ 		    cmdmod.browse = FALSE;
++ 		    do_exedit(eap, NULL);
++ 		    vim_free(p);
++ 		}
++ 	    }
++ 	}
++ #endif
++     }
++ }
++ 
+  #endif /* FEAT_EVAL */
+  
+  
+*** ../vim-7.2.030/src/ex_cmds.c	Sun Sep 14 21:40:26 2008
+--- src/ex_cmds.c	Sun Sep 14 13:45:03 2008
+***************
+*** 24,30 ****
+  static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
+  #ifdef FEAT_VIMINFO
+  static char_u *viminfo_filename __ARGS((char_u	*));
+! static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int want_info, int want_marks, int force_read));
+  static int viminfo_encoding __ARGS((vir_T *virp));
+  static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing));
+  #endif
+--- 24,30 ----
+  static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
+  #ifdef FEAT_VIMINFO
+  static char_u *viminfo_filename __ARGS((char_u	*));
+! static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int flags));
+  static int viminfo_encoding __ARGS((vir_T *virp));
+  static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing));
+  #endif
+***************
+*** 1676,1689 ****
+  
+  /*
+   * read_viminfo() -- Read the viminfo file.  Registers etc. which are already
+!  * set are not over-written unless force is TRUE. -- webb
+   */
+      int
+! read_viminfo(file, want_info, want_marks, forceit)
+!     char_u	*file;
+!     int		want_info;
+!     int		want_marks;
+!     int		forceit;
+  {
+      FILE	*fp;
+      char_u	*fname;
+--- 1676,1687 ----
+  
+  /*
+   * read_viminfo() -- Read the viminfo file.  Registers etc. which are already
+!  * set are not over-written unless "flags" includes VIF_FORCEIT. -- webb
+   */
+      int
+! read_viminfo(file, flags)
+!     char_u	*file;	    /* file name or NULL to use default name */
+!     int		flags;	    /* VIF_WANT_INFO et al. */
+  {
+      FILE	*fp;
+      char_u	*fname;
+***************
+*** 1691,1697 ****
+      if (no_viminfo())
+  	return FAIL;
+  
+!     fname = viminfo_filename(file);	    /* may set to default if NULL */
+      if (fname == NULL)
+  	return FAIL;
+      fp = mch_fopen((char *)fname, READBIN);
+--- 1689,1695 ----
+      if (no_viminfo())
+  	return FAIL;
+  
+!     fname = viminfo_filename(file);	/* get file name in allocated buffer */
+      if (fname == NULL)
+  	return FAIL;
+      fp = mch_fopen((char *)fname, READBIN);
+***************
+*** 1701,1708 ****
+  	verbose_enter();
+  	smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"),
+  		fname,
+! 		want_info ? _(" info") : "",
+! 		want_marks ? _(" marks") : "",
+  		fp == NULL ? _(" FAILED") : "");
+  	verbose_leave();
+      }
+--- 1699,1707 ----
+  	verbose_enter();
+  	smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"),
+  		fname,
+! 		(flags & VIF_WANT_INFO) ? _(" info") : "",
+! 		(flags & VIF_WANT_MARKS) ? _(" marks") : "",
+! 		(flags & VIF_GET_OLDFILES) ? _(" oldfiles") : "",
+  		fp == NULL ? _(" FAILED") : "");
+  	verbose_leave();
+      }
+***************
+*** 1712,1721 ****
+  	return FAIL;
+  
+      viminfo_errcnt = 0;
+!     do_viminfo(fp, NULL, want_info, want_marks, forceit);
+  
+      fclose(fp);
+- 
+      return OK;
+  }
+  
+--- 1711,1719 ----
+  	return FAIL;
+  
+      viminfo_errcnt = 0;
+!     do_viminfo(fp, NULL, flags);
+  
+      fclose(fp);
+      return OK;
+  }
+  
+***************
+*** 1968,1974 ****
+      }
+  
+      viminfo_errcnt = 0;
+!     do_viminfo(fp_in, fp_out, !forceit, !forceit, FALSE);
+  
+      fclose(fp_out);	    /* errors are ignored !? */
+      if (fp_in != NULL)
+--- 1966,1972 ----
+      }
+  
+      viminfo_errcnt = 0;
+!     do_viminfo(fp_in, fp_out, forceit ? 0 : (VIF_WANT_INFO | VIF_WANT_MARKS));
+  
+      fclose(fp_out);	    /* errors are ignored !? */
+      if (fp_in != NULL)
+***************
+*** 2041,2052 ****
+   * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo().
+   */
+      static void
+! do_viminfo(fp_in, fp_out, want_info, want_marks, force_read)
+      FILE	*fp_in;
+      FILE	*fp_out;
+!     int		want_info;
+!     int		want_marks;
+!     int		force_read;
+  {
+      int		count = 0;
+      int		eof = FALSE;
+--- 2039,2048 ----
+   * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo().
+   */
+      static void
+! do_viminfo(fp_in, fp_out, flags)
+      FILE	*fp_in;
+      FILE	*fp_out;
+!     int		flags;
+  {
+      int		count = 0;
+      int		eof = FALSE;
+***************
+*** 2061,2068 ****
+  
+      if (fp_in != NULL)
+      {
+! 	if (want_info)
+! 	    eof = read_viminfo_up_to_marks(&vir, force_read, fp_out != NULL);
+  	else
+  	    /* Skip info, find start of marks */
+  	    while (!(eof = viminfo_readline(&vir))
+--- 2057,2065 ----
+  
+      if (fp_in != NULL)
+      {
+! 	if (flags & VIF_WANT_INFO)
+! 	    eof = read_viminfo_up_to_marks(&vir,
+! 					 flags & VIF_FORCEIT, fp_out != NULL);
+  	else
+  	    /* Skip info, find start of marks */
+  	    while (!(eof = viminfo_readline(&vir))
+***************
+*** 2092,2099 ****
+  	write_viminfo_bufferlist(fp_out);
+  	count = write_viminfo_marks(fp_out);
+      }
+!     if (fp_in != NULL && want_marks)
+! 	copy_viminfo_marks(&vir, fp_out, count, eof);
+  
+      vim_free(vir.vir_line);
+  #ifdef FEAT_MBYTE
+--- 2089,2097 ----
+  	write_viminfo_bufferlist(fp_out);
+  	count = write_viminfo_marks(fp_out);
+      }
+!     if (fp_in != NULL
+! 	    && (flags & (VIF_WANT_MARKS | VIF_GET_OLDFILES | VIF_FORCEIT)))
+! 	copy_viminfo_marks(&vir, fp_out, count, eof, flags);
+  
+      vim_free(vir.vir_line);
+  #ifdef FEAT_MBYTE
+*** ../vim-7.2.030/src/ex_cmds.h	Thu Nov  6 20:47:00 2008
+--- src/ex_cmds.h	Thu Sep 18 22:18:14 2008
+***************
+*** 653,658 ****
+--- 653,660 ----
+  			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+  EX(CMD_open,		"open",		ex_open,
+  			RANGE|EXTRA),
++ EX(CMD_oldfiles,	"oldfiles",	ex_oldfiles,
++ 			BANG|TRLBAR|SBOXOK|CMDWIN),
+  EX(CMD_omap,		"omap",		ex_map,
+  			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+  EX(CMD_omapclear,	"omapclear",	ex_mapclear,
+*** ../vim-7.2.030/src/ex_docmd.c	Thu Nov  6 17:16:06 2008
+--- src/ex_docmd.c	Mon Nov  3 21:21:17 2008
+***************
+*** 364,369 ****
+--- 364,370 ----
+  # define ex_function		ex_ni
+  # define ex_delfunction		ex_ni
+  # define ex_return		ex_ni
++ # define ex_oldfiles		ex_ni
+  #endif
+  static char_u	*arg_all __ARGS((void));
+  #ifdef FEAT_SESSION
+***************
+*** 1770,1776 ****
+  			}
+  			if (checkforcmd(&ea.cmd, "browse", 3))
+  			{
+! #ifdef FEAT_BROWSE
+  			    cmdmod.browse = TRUE;
+  #endif
+  			    continue;
+--- 1771,1777 ----
+  			}
+  			if (checkforcmd(&ea.cmd, "browse", 3))
+  			{
+! #ifdef FEAT_BROWSE_CMD
+  			    cmdmod.browse = TRUE;
+  #endif
+  			    continue;
+***************
+*** 9508,9531 ****
+  		    break;
+  		}
+  		s = src + 1;
+  		i = (int)getdigits(&s);
+  		*usedlen = (int)(s - src); /* length of what we expand */
+  
+! 		buf = buflist_findnr(i);
+! 		if (buf == NULL)
+  		{
+! 		    *errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
+  		    return NULL;
+  		}
+! 		if (lnump != NULL)
+! 		    *lnump = ECMD_LAST;
+! 		if (buf->b_fname == NULL)
+  		{
+! 		    result = (char_u *)"";
+! 		    valid = 0;	    /* Must have ":p:h" to be valid */
+  		}
+- 		else
+- 		    result = buf->b_fname;
+  		break;
+  
+  #ifdef FEAT_SEARCHPATH
+--- 9509,9558 ----
+  		    break;
+  		}
+  		s = src + 1;
++ 		if (*s == '<')		/* "#<99" uses v:oldfiles */
++ 		    ++s;
+  		i = (int)getdigits(&s);
+  		*usedlen = (int)(s - src); /* length of what we expand */
+  
+! 		if (src[1] == '<')
+  		{
+! 		    if (*usedlen < 2)
+! 		    {
+! 			/* Should we give an error message for #<text? */
+! 			*usedlen = 1;
+! 			return NULL;
+! 		    }
+! #ifdef FEAT_EVAL
+! 		    result = list_find_str(get_vim_var_list(VV_OLDFILES),
+! 								     (long)i);
+! 		    if (result == NULL)
+! 		    {
+! 			*errormsg = (char_u *)"";
+! 			return NULL;
+! 		    }
+! #else
+! 		    *errormsg = (char_u *)_("E809: #< is not available without the +eval feature");
+  		    return NULL;
++ #endif
+  		}
+! 		else
+  		{
+! 		    buf = buflist_findnr(i);
+! 		    if (buf == NULL)
+! 		    {
+! 			*errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
+! 			return NULL;
+! 		    }
+! 		    if (lnump != NULL)
+! 			*lnump = ECMD_LAST;
+! 		    if (buf->b_fname == NULL)
+! 		    {
+! 			result = (char_u *)"";
+! 			valid = 0;	    /* Must have ":p:h" to be valid */
+! 		    }
+! 		    else
+! 			result = buf->b_fname;
+  		}
+  		break;
+  
+  #ifdef FEAT_SEARCHPATH
+***************
+*** 10700,10706 ****
+  	p_viminfo = (char_u *)"'100";
+      if (eap->cmdidx == CMD_rviminfo)
+      {
+! 	if (read_viminfo(eap->arg, TRUE, TRUE, eap->forceit) == FAIL)
+  	    EMSG(_("E195: Cannot open viminfo file for reading"));
+      }
+      else
+--- 10727,10734 ----
+  	p_viminfo = (char_u *)"'100";
+      if (eap->cmdidx == CMD_rviminfo)
+      {
+! 	if (read_viminfo(eap->arg, VIF_WANT_INFO | VIF_WANT_MARKS
+! 				  | (eap->forceit ? VIF_FORCEIT : 0)) == FAIL)
+  	    EMSG(_("E195: Cannot open viminfo file for reading"));
+      }
+      else
+*** ../vim-7.2.030/src/feature.h	Wed Aug  6 18:45:07 2008
+--- src/feature.h	Fri Sep 19 19:14:22 2008
+***************
+*** 767,775 ****
+  
+  /*
+   * +browse		":browse" command.
+   */
+! #if defined(FEAT_NORMAL) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC))
+! # define FEAT_BROWSE
+  #endif
+  
+  /*
+--- 767,779 ----
+  
+  /*
+   * +browse		":browse" command.
++  *			or just the ":browse" command modifier
+   */
+! #if defined(FEAT_NORMAL)
+! # define FEAT_BROWSE_CMD
+! # if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)
+! #  define FEAT_BROWSE
+! # endif
+  #endif
+  
+  /*
+*** ../vim-7.2.030/src/fileio.c	Thu Sep 18 21:29:07 2008
+--- src/fileio.c	Mon Nov  3 21:21:47 2008
+***************
+*** 2711,2717 ****
+  {
+      if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0
+  						  && curbuf->b_ffname != NULL)
+! 	read_viminfo(NULL, FALSE, TRUE, FALSE);
+  
+      /* Always set b_marks_read; needed when 'viminfo' is changed to include
+       * the ' parameter after opening a buffer. */
+--- 2711,2717 ----
+  {
+      if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0
+  						  && curbuf->b_ffname != NULL)
+! 	read_viminfo(NULL, VIF_WANT_MARKS);
+  
+      /* Always set b_marks_read; needed when 'viminfo' is changed to include
+       * the ' parameter after opening a buffer. */
+***************
+*** 9108,9114 ****
+  set_context_in_autocmd(xp, arg, doautocmd)
+      expand_T	*xp;
+      char_u	*arg;
+!     int		doautocmd;	/* TRUE for :doautocmd, FALSE for :autocmd */
+  {
+      char_u	*p;
+      int		group;
+--- 9109,9115 ----
+  set_context_in_autocmd(xp, arg, doautocmd)
+      expand_T	*xp;
+      char_u	*arg;
+!     int		doautocmd;	/* TRUE for :doauto*, FALSE for :autocmd */
+  {
+      char_u	*p;
+      int		group;
+*** ../vim-7.2.030/src/main.c	Thu Sep 18 20:55:19 2008
+--- src/main.c	Sun Sep 14 13:26:10 2008
+***************
+*** 645,655 ****
+  
+  #ifdef FEAT_VIMINFO
+      /*
+!      * Read in registers, history etc, but not marks, from the viminfo file
+       */
+      if (*p_viminfo != NUL)
+      {
+! 	read_viminfo(NULL, TRUE, FALSE, FALSE);
+  	TIME_MSG("reading viminfo");
+      }
+  #endif
+--- 645,656 ----
+  
+  #ifdef FEAT_VIMINFO
+      /*
+!      * Read in registers, history etc, but not marks, from the viminfo file.
+!      * This is where v:oldfiles gets filled.
+       */
+      if (*p_viminfo != NUL)
+      {
+! 	read_viminfo(NULL, VIF_WANT_INFO | VIF_GET_OLDFILES);
+  	TIME_MSG("reading viminfo");
+      }
+  #endif
+*** ../vim-7.2.030/src/mark.c	Sat Aug  9 19:37:29 2008
+--- src/mark.c	Sun Sep 14 13:46:19 2008
+***************
+*** 1627,1641 ****
+  
+  /*
+   * Handle marks in the viminfo file:
+!  * fp_out == NULL   read marks for current buffer only
+!  * fp_out != NULL   copy marks for buffers not in buffer list
+   */
+      void
+! copy_viminfo_marks(virp, fp_out, count, eof)
+      vir_T	*virp;
+      FILE	*fp_out;
+      int		count;
+      int		eof;
+  {
+      char_u	*line = virp->vir_line;
+      buf_T	*buf;
+--- 1627,1643 ----
+  
+  /*
+   * Handle marks in the viminfo file:
+!  * fp_out != NULL: copy marks for buffers not in buffer list
+!  * fp_out == NULL && (flags & VIF_WANT_MARKS): read marks for curbuf only
+!  * fp_out == NULL && (flags & VIF_GET_OLDFILES | VIF_FORCEIT): fill v:oldfiles
+   */
+      void
+! copy_viminfo_marks(virp, fp_out, count, eof, flags)
+      vir_T	*virp;
+      FILE	*fp_out;
+      int		count;
+      int		eof;
++     int		flags;
+  {
+      char_u	*line = virp->vir_line;
+      buf_T	*buf;
+***************
+*** 1647,1656 ****
+--- 1649,1671 ----
+      char_u	*p;
+      char_u	*name_buf;
+      pos_T	pos;
++ #ifdef FEAT_EVAL
++     list_T	*list = NULL;
++ #endif
+  
+      if ((name_buf = alloc(LSIZE)) == NULL)
+  	return;
+      *name_buf = NUL;
++ 
++ #ifdef FEAT_EVAL
++     if (fp_out == NULL && (flags & (VIF_GET_OLDFILES | VIF_FORCEIT)))
++     {
++ 	list = list_alloc();
++ 	if (list != NULL)
++ 	    set_vim_var_list(VV_OLDFILES, list);
++     }
++ #endif
++ 
+      num_marked_files = get_viminfo_parameter('\'');
+      while (!eof && (count < num_marked_files || fp_out == NULL))
+      {
+***************
+*** 1681,1686 ****
+--- 1696,1706 ----
+  	    p++;
+  	*p = NUL;
+  
++ #ifdef FEAT_EVAL
++ 	if (list != NULL)
++ 	    list_append_string(list, str, -1);
++ #endif
++ 
+  	/*
+  	 * If fp_out == NULL, load marks for current buffer.
+  	 * If fp_out != NULL, copy marks for buffers not in buflist.
+***************
+*** 1688,1694 ****
+  	load_marks = copy_marks_out = FALSE;
+  	if (fp_out == NULL)
+  	{
+! 	    if (curbuf->b_ffname != NULL)
+  	    {
+  		if (*name_buf == NUL)	    /* only need to do this once */
+  		    home_replace(NULL, curbuf->b_ffname, name_buf, LSIZE, TRUE);
+--- 1708,1714 ----
+  	load_marks = copy_marks_out = FALSE;
+  	if (fp_out == NULL)
+  	{
+! 	    if ((flags & VIF_WANT_MARKS) && curbuf->b_ffname != NULL)
+  	    {
+  		if (*name_buf == NUL)	    /* only need to do this once */
+  		    home_replace(NULL, curbuf->b_ffname, name_buf, LSIZE, TRUE);
+*** ../vim-7.2.030/src/misc1.c	Wed Jun 25 00:24:52 2008
+--- src/misc1.c	Sun Nov  9 11:47:00 2008
+***************
+*** 3245,3253 ****
+  
+      /* When using ":silent" assume that <CR> was entered. */
+      if (mouse_used != NULL)
+! 	MSG_PUTS(_("Type number or click with mouse (<Enter> cancels): "));
+      else
+! 	MSG_PUTS(_("Choice number (<Enter> cancels): "));
+  
+      /* Set the state such that text can be selected/copied/pasted and we still
+       * get mouse events. */
+--- 3245,3253 ----
+  
+      /* When using ":silent" assume that <CR> was entered. */
+      if (mouse_used != NULL)
+! 	MSG_PUTS(_("Type number and <Enter> or click with mouse (empty cancels): "));
+      else
+! 	MSG_PUTS(_("Type number and <Enter> (empty cancels): "));
+  
+      /* Set the state such that text can be selected/copied/pasted and we still
+       * get mouse events. */
+*** ../vim-7.2.030/src/proto/eval.pro	Sun Jan  6 20:06:30 2008
+--- src/proto/eval.pro	Sun Nov  9 12:05:56 2008
+***************
+*** 17,23 ****
+  int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
+  char_u *eval_to_string_skip __ARGS((char_u *arg, char_u **nextcmd, int skip));
+  int skip_expr __ARGS((char_u **pp));
+! char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int dolist));
+  char_u *eval_to_string_safe __ARGS((char_u *arg, char_u **nextcmd, int use_sandbox));
+  int eval_to_number __ARGS((char_u *expr));
+  list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr));
+--- 17,23 ----
+  int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
+  char_u *eval_to_string_skip __ARGS((char_u *arg, char_u **nextcmd, int skip));
+  int skip_expr __ARGS((char_u **pp));
+! char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int convert));
+  char_u *eval_to_string_safe __ARGS((char_u *arg, char_u **nextcmd, int use_sandbox));
+  int eval_to_number __ARGS((char_u *expr));
+  list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr));
+***************
+*** 46,52 ****
+--- 46,54 ----
+  void list_unref __ARGS((list_T *l));
+  void list_free __ARGS((list_T *l, int recurse));
+  dictitem_T *dict_lookup __ARGS((hashitem_T *hi));
++ char_u *list_find_str __ARGS((list_T *l, long idx));
+  int list_append_dict __ARGS((list_T *list, dict_T *dict));
++ int list_append_string __ARGS((list_T *l, char_u *str, int len));
+  int garbage_collect __ARGS((void));
+  dict_T *dict_alloc __ARGS((void));
+  int dict_add_nr_str __ARGS((dict_T *d, char *key, long nr, char_u *str));
+***************
+*** 58,65 ****
+--- 60,69 ----
+  void set_vim_var_nr __ARGS((int idx, long val));
+  long get_vim_var_nr __ARGS((int idx));
+  char_u *get_vim_var_str __ARGS((int idx));
++ list_T *get_vim_var_list __ARGS((int idx));
+  void set_vcount __ARGS((long count, long count1));
+  void set_vim_var_string __ARGS((int idx, char_u *val, int len));
++ void set_vim_var_list __ARGS((int idx, list_T *val));
+  void set_reg_var __ARGS((int c));
+  char_u *v_exception __ARGS((char_u *oldval));
+  char_u *v_throwpoint __ARGS((char_u *oldval));
+***************
+*** 94,99 ****
+--- 98,104 ----
+  void write_viminfo_varlist __ARGS((FILE *fp));
+  int store_session_globals __ARGS((FILE *fd));
+  void last_set_msg __ARGS((scid_T scriptID));
++ void ex_oldfiles __ARGS((exarg_T *eap));
+  int modify_fname __ARGS((char_u *src, int *usedlen, char_u **fnamep, char_u **bufp, int *fnamelen));
+  char_u *do_string_sub __ARGS((char_u *str, char_u *pat, char_u *sub, char_u *flags));
+  /* vim: set ft=c : */
+*** ../vim-7.2.030/src/proto/ex_cmds.pro	Sat May  5 20:13:58 2007
+--- src/proto/ex_cmds.pro	Sat Sep 13 17:27:21 2008
+***************
+*** 11,17 ****
+  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
+  void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
+  int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
+! int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit));
+  void write_viminfo __ARGS((char_u *file, int forceit));
+  int viminfo_readline __ARGS((vir_T *virp));
+  char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
+--- 11,17 ----
+  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
+  void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
+  int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
+! int read_viminfo __ARGS((char_u *file, int flags));
+  void write_viminfo __ARGS((char_u *file, int forceit));
+  int viminfo_readline __ARGS((vir_T *virp));
+  char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
+*** ../vim-7.2.030/src/proto/mark.pro	Sat May  5 19:29:37 2007
+--- src/proto/mark.pro	Sat Sep 13 18:06:20 2008
+***************
+*** 26,30 ****
+  void write_viminfo_filemarks __ARGS((FILE *fp));
+  int removable __ARGS((char_u *name));
+  int write_viminfo_marks __ARGS((FILE *fp_out));
+! void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof));
+  /* vim: set ft=c : */
+--- 26,30 ----
+  void write_viminfo_filemarks __ARGS((FILE *fp));
+  int removable __ARGS((char_u *name));
+  int write_viminfo_marks __ARGS((FILE *fp_out));
+! void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof, int flags));
+  /* vim: set ft=c : */
+*** ../vim-7.2.030/src/option.c	Thu Oct  2 22:48:01 2008
+--- src/option.c	Fri Sep 26 22:20:20 2008
+***************
+*** 2593,2605 ****
+  #ifdef FEAT_VIMINFO
+  			    (char_u *)&p_viminfo, PV_NONE,
+  #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
+! 			    {(char_u *)"", (char_u *)"'20,<50,s10,h,rA:,rB:"}
+  #else
+  # ifdef AMIGA
+  			    {(char_u *)"",
+! 				 (char_u *)"'20,<50,s10,h,rdf0:,rdf1:,rdf2:"}
+  # else
+! 			    {(char_u *)"", (char_u *)"'20,<50,s10,h"}
+  # endif
+  #endif
+  #else
+--- 2593,2605 ----
+  #ifdef FEAT_VIMINFO
+  			    (char_u *)&p_viminfo, PV_NONE,
+  #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
+! 			    {(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"}
+  #else
+  # ifdef AMIGA
+  			    {(char_u *)"",
+! 				 (char_u *)"'100,<50,s10,h,rdf0:,rdf1:,rdf2:"}
+  # else
+! 			    {(char_u *)"", (char_u *)"'100,<50,s10,h"}
+  # endif
+  #endif
+  #else
+*** ../vim-7.2.030/src/structs.h	Thu Jul 31 22:04:27 2008
+--- src/structs.h	Fri Sep 19 19:15:18 2008
+***************
+*** 459,465 ****
+  typedef struct
+  {
+      int		hide;			/* TRUE when ":hide" was used */
+! # ifdef FEAT_BROWSE
+      int		browse;			/* TRUE to invoke file dialog */
+  # endif
+  # ifdef FEAT_WINDOWS
+--- 459,465 ----
+  typedef struct
+  {
+      int		hide;			/* TRUE when ":hide" was used */
+! # ifdef FEAT_BROWSE_CMD
+      int		browse;			/* TRUE to invoke file dialog */
+  # endif
+  # ifdef FEAT_WINDOWS
+*** ../vim-7.2.030/src/vim.h	Sat Aug  9 19:37:40 2008
+--- src/vim.h	Sat Sep 13 17:41:24 2008
+***************
+*** 1728,1734 ****
+  #define VV_MOUSE_COL	51
+  #define VV_OP		52
+  #define VV_SEARCHFORWARD 53
+! #define VV_LEN		54	/* number of v: vars */
+  
+  #ifdef FEAT_CLIPBOARD
+  
+--- 1728,1735 ----
+  #define VV_MOUSE_COL	51
+  #define VV_OP		52
+  #define VV_SEARCHFORWARD 53
+! #define VV_OLDFILES	54
+! #define VV_LEN		55	/* number of v: vars */
+  
+  #ifdef FEAT_CLIPBOARD
+  
+***************
+*** 2054,2057 ****
+--- 2055,2064 ----
+  #define DOSO_VIMRC	1	/* loading vimrc file */
+  #define DOSO_GVIMRC	2	/* loading gvimrc file */
+  
++ /* flags for read_viminfo() and children */
++ #define VIF_WANT_INFO		1	/* load non-mark info */
++ #define VIF_WANT_MARKS		2	/* load file marks */
++ #define VIF_FORCEIT		4	/* overwrite info already read */
++ #define VIF_GET_OLDFILES	8	/* load v:oldfiles */
++ 
+  #endif /* VIM__H */
+*** ../vim-7.2.030/src/version.c	Thu Nov  6 20:47:00 2008
+--- src/version.c	Sun Nov  9 13:39:19 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     31,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+217. Your sex life has drastically improved...so what if it's only cyber-sex!
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.032 b/source/ap/vim/patches/7.2.032
new file mode 100644
index 000000000..f4a0d9bea
--- /dev/null
+++ b/source/ap/vim/patches/7.2.032
@@ -0,0 +1,55 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.032
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.032 (after 7.2.031)
+Problem:    Can't build with EXITFREE defined. (Dominique Pelle)
+Solution:   Change vv_string to vv_str.
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.031/src/eval.c	Sun Nov  9 13:43:25 2008
+--- src/eval.c	Sun Nov  9 17:16:06 2008
+***************
+*** 846,853 ****
+  	p = &vimvars[i];
+  	if (p->vv_di.di_tv.v_type == VAR_STRING)
+  	{
+! 	    vim_free(p->vv_string);
+! 	    p->vv_string = NULL;
+  	}
+  	else if (p->vv_di.di_tv.v_type == VAR_LIST)
+  	{
+--- 846,853 ----
+  	p = &vimvars[i];
+  	if (p->vv_di.di_tv.v_type == VAR_STRING)
+  	{
+! 	    vim_free(p->vv_str);
+! 	    p->vv_str = NULL;
+  	}
+  	else if (p->vv_di.di_tv.v_type == VAR_LIST)
+  	{
+*** ../vim-7.2.031/src/version.c	Sun Nov  9 13:43:25 2008
+--- src/version.c	Sun Nov  9 17:21:00 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     32,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+218. Your spouse hands you a gift wrapped magnet with your PC's name
+     on it and you accuse him or her of genocide.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.033 b/source/ap/vim/patches/7.2.033
new file mode 100644
index 000000000..d96a94b72
--- /dev/null
+++ b/source/ap/vim/patches/7.2.033
@@ -0,0 +1,78 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.033
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.033
+Problem:    When detecting a little endian BOM "ucs-2le" is used, but the text
+	    might be "utf-16le".
+Solution:   Default to "utf-16le", it also works for "ucs-2le". (Jia Yanwei)
+Files:	    src/fileio.c, src/testdir/test42.ok
+
+
+*** ../vim-7.2.032/src/fileio.c	Sun Nov  9 13:43:25 2008
+--- src/fileio.c	Mon Nov  3 21:21:47 2008
+***************
+*** 5550,5558 ****
+  	    name = "ucs-4le";	/* FF FE 00 00 */
+  	    len = 4;
+  	}
+! 	else if (flags == FIO_ALL || flags == (FIO_UCS2 | FIO_ENDIAN_L))
+  	    name = "ucs-2le";	/* FF FE */
+! 	else if (flags == (FIO_UTF16 | FIO_ENDIAN_L))
+  	    name = "utf-16le";	/* FF FE */
+      }
+      else if (p[0] == 0xfe && p[1] == 0xff
+--- 5550,5559 ----
+  	    name = "ucs-4le";	/* FF FE 00 00 */
+  	    len = 4;
+  	}
+! 	else if (flags == (FIO_UCS2 | FIO_ENDIAN_L))
+  	    name = "ucs-2le";	/* FF FE */
+! 	else if (flags == FIO_ALL || flags == (FIO_UTF16 | FIO_ENDIAN_L))
+! 	    /* utf-16le is preferred, it also works for ucs-2le text */
+  	    name = "utf-16le";	/* FF FE */
+      }
+      else if (p[0] == 0xfe && p[1] == 0xff
+*** ../vim-7.2.032/src/testdir/test42.ok	Sat Mar  1 13:49:21 2008
+--- src/testdir/test42.ok	Sat Nov  1 17:09:29 2008
+***************
+*** 20,26 ****
+  ucs-2
+  
+  
+!   fileencoding=ucs-2le
+    bomb
+  ucs-2le
+  
+--- 20,26 ----
+  ucs-2
+  
+  
+!   fileencoding=utf-16le
+    bomb
+  ucs-2le
+  
+*** ../vim-7.2.032/src/version.c	Sun Nov  9 17:21:10 2008
+--- src/version.c	Tue Nov 11 21:54:14 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     33,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+234. You started college as a chemistry major, and walk out four years
+     later as an Internet provider.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.034 b/source/ap/vim/patches/7.2.034
new file mode 100644
index 000000000..957fb35d9
--- /dev/null
+++ b/source/ap/vim/patches/7.2.034
@@ -0,0 +1,81 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.034
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.034
+Problem:    Memory leak in spell info when deleting buffer.
+Solution:   Free the memory. (Dominique Pelle)
+Files:	    src/buffer.c
+
+
+*** ../vim-7.2.033/src/buffer.c	Mon Sep  1 17:32:40 2008
+--- src/buffer.c	Wed Nov 12 11:21:49 2008
+***************
+*** 647,652 ****
+--- 647,655 ----
+      vim_free(buf->b_start_fenc);
+      buf->b_start_fenc = NULL;
+  #endif
++ #ifdef FEAT_SPELL
++     ga_clear(&buf->b_langp);
++ #endif
+  }
+  
+  /*
+***************
+*** 1237,1243 ****
+  	 * "buf" if one exists */
+  	if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf))
+  	    return OK;
+! 	/* If 'switchbuf' contians "usetab": jump to first window in any tab
+  	 * page containing "buf" if one exists */
+  	if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf))
+  	    return OK;
+--- 1240,1246 ----
+  	 * "buf" if one exists */
+  	if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf))
+  	    return OK;
+! 	/* If 'switchbuf' contains "usetab": jump to first window in any tab
+  	 * page containing "buf" if one exists */
+  	if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf))
+  	    return OK;
+***************
+*** 3964,3970 ****
+      width = vim_strsize(out);
+      if (maxwidth > 0 && width > maxwidth)
+      {
+! 	/* Result is too long, must trunctate somewhere. */
+  	l = 0;
+  	if (itemcnt == 0)
+  	    s = out;
+--- 3967,3973 ----
+      width = vim_strsize(out);
+      if (maxwidth > 0 && width > maxwidth)
+      {
+! 	/* Result is too long, must truncate somewhere. */
+  	l = 0;
+  	if (itemcnt == 0)
+  	    s = out;
+*** ../vim-7.2.033/src/version.c	Tue Nov 11 21:55:29 2008
+--- src/version.c	Wed Nov 12 12:51:21 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     34,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+236. You start saving URL's in your digital watch.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.035 b/source/ap/vim/patches/7.2.035
new file mode 100644
index 000000000..e8c73915a
--- /dev/null
+++ b/source/ap/vim/patches/7.2.035
@@ -0,0 +1,128 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.035
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.035
+Problem:    Mismatches between alloc/malloc, free/vim_free,
+	    realloc/vim_realloc.
+Solution:   Use the right function. (Dominique Pelle)
+Files:	    src/gui_x11.c, src/mbyte.c, src/misc2.c, src/os_unix.c
+
+
+*** ../vim-7.2.034/src/gui_x11.c	Fri Jun 20 11:59:25 2008
+--- src/gui_x11.c	Wed Nov 12 11:47:03 2008
+***************
+*** 2450,2456 ****
+  	*colorPtr = colortable[closest];
+      }
+  
+!     free(colortable);
+      return OK;
+  }
+  
+--- 2450,2456 ----
+  	*colorPtr = colortable[closest];
+      }
+  
+!     vim_free(colortable);
+      return OK;
+  }
+  
+*** ../vim-7.2.034/src/mbyte.c	Sat Sep  6 16:44:06 2008
+--- src/mbyte.c	Wed Nov 12 11:24:14 2008
+***************
+*** 5384,5390 ****
+  			draw_feedback = (char *)alloc(draw_data->chg_first
+  							      + text->length);
+  		    else
+! 			draw_feedback = realloc(draw_feedback,
+  					 draw_data->chg_first + text->length);
+  		    if (draw_feedback != NULL)
+  		    {
+--- 5384,5390 ----
+  			draw_feedback = (char *)alloc(draw_data->chg_first
+  							      + text->length);
+  		    else
+! 			draw_feedback = vim_realloc(draw_feedback,
+  					 draw_data->chg_first + text->length);
+  		    if (draw_feedback != NULL)
+  		    {
+*** ../vim-7.2.034/src/misc2.c	Sat Sep  6 16:44:06 2008
+--- src/misc2.c	Wed Nov 12 11:42:51 2008
+***************
+*** 873,879 ****
+  	    /* 3. check for available memory: call mch_avail_mem() */
+  	    if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
+  	    {
+! 		vim_free((char *)p);	/* System is low... no go! */
+  		p = NULL;
+  	    }
+  	    else
+--- 873,879 ----
+  	    /* 3. check for available memory: call mch_avail_mem() */
+  	    if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
+  	    {
+! 		free((char *)p);	/* System is low... no go! */
+  		p = NULL;
+  	    }
+  	    else
+*** ../vim-7.2.034/src/os_unix.c	Wed Aug  6 18:45:01 2008
+--- src/os_unix.c	Wed Nov 12 11:55:33 2008
+***************
+*** 2905,2911 ****
+       * Ignore any errors.
+       */
+  #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
+!     signal_stack = malloc(SIGSTKSZ);
+      init_signal_stack();
+  #endif
+  }
+--- 2905,2911 ----
+       * Ignore any errors.
+       */
+  #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
+!     signal_stack = (char *)alloc(SIGSTKSZ);
+      init_signal_stack();
+  #endif
+  }
+***************
+*** 6814,6820 ****
+      if (xsmp_icefd != -1)
+      {
+  	SmcCloseConnection(xsmp.smcconn, 0, NULL);
+! 	vim_free(xsmp.clientid);
+  	xsmp.clientid = NULL;
+  	xsmp_icefd = -1;
+      }
+--- 6815,6822 ----
+      if (xsmp_icefd != -1)
+      {
+  	SmcCloseConnection(xsmp.smcconn, 0, NULL);
+! 	if (xsmp.clientid != NULL)
+! 	    free(xsmp.clientid);
+  	xsmp.clientid = NULL;
+  	xsmp_icefd = -1;
+      }
+*** ../vim-7.2.034/src/version.c	Wed Nov 12 12:51:38 2008
+--- src/version.c	Wed Nov 12 13:05:40 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     35,
+  /**/
+
+-- 
+You can tune a file system, but you can't tuna fish
+							-- man tunefs
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.036 b/source/ap/vim/patches/7.2.036
new file mode 100644
index 000000000..4db2a26f3
--- /dev/null
+++ b/source/ap/vim/patches/7.2.036
@@ -0,0 +1,276 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.036 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.036 (extra)
+Problem:    Mismatches between alloc/malloc, free/vim_free,
+	    realloc/vim_realloc.
+Solution:   Use the right function. (Dominique Pelle)
+Files:	    src/gui_riscos.c, src/gui_w48.c, src/mbyte.c, src/os_vms.c,
+	    src/os_w32exe.c, src/os_win16.c
+
+
+*** ../vim-7.2.035/src/gui_riscos.c	Thu May 10 19:33:26 2007
+--- src/gui_riscos.c	Wed Nov 12 11:47:54 2008
+***************
+*** 695,701 ****
+  gui_mch_set_shellsize(width, height, min_width, min_height, base_width, base_height, direction)
+      int width;		/* In OS units */
+      int height;
+!     int min_width;	/* Smallest permissable window size (ignored) */
+      int min_height;
+      int base_width;	/* Space for scroll bars, etc */
+      int base_height;
+--- 695,701 ----
+  gui_mch_set_shellsize(width, height, min_width, min_height, base_width, base_height, direction)
+      int width;		/* In OS units */
+      int height;
+!     int min_width;	/* Smallest permissible window size (ignored) */
+      int min_height;
+      int base_width;	/* Space for scroll bars, etc */
+      int base_height;
+***************
+*** 863,869 ****
+      if (strncmp(file, "ZapFont\015", 8) == 0)
+  	return file;	/* Loaded OK! */
+  
+!     free(file);
+      return NULL;	/* Not a valid font file */
+  }
+  
+--- 863,869 ----
+      if (strncmp(file, "ZapFont\015", 8) == 0)
+  	return file;	/* Loaded OK! */
+  
+!     vim_free(file);
+      return NULL;	/* Not a valid font file */
+  }
+  
+*** ../vim-7.2.035/src/gui_w48.c	Thu Jul 24 20:50:23 2008
+--- src/gui_w48.c	Wed Nov 12 11:37:41 2008
+***************
+*** 3335,3341 ****
+  
+  /*
+   * Convert the string s to the proper format for a filter string by replacing
+!  * the \t and \n delimeters with \0.
+   * Returns the converted string in allocated memory.
+   *
+   * Keep in sync with convert_filterW() above!
+--- 3335,3341 ----
+  
+  /*
+   * Convert the string s to the proper format for a filter string by replacing
+!  * the \t and \n delimiters with \0.
+   * Returns the converted string in allocated memory.
+   *
+   * Keep in sync with convert_filterW() above!
+***************
+*** 3674,3680 ****
+   * Use "prog" as the name of the program and "cmdline" as the arguments.
+   * Copy the arguments to allocated memory.
+   * Return the number of arguments (including program name).
+!  * Return pointers to the arguments in "argvp".
+   * Return pointer to buffer in "tofree".
+   * Returns zero when out of memory.
+   */
+--- 3674,3681 ----
+   * Use "prog" as the name of the program and "cmdline" as the arguments.
+   * Copy the arguments to allocated memory.
+   * Return the number of arguments (including program name).
+!  * Return pointers to the arguments in "argvp".  Memory is allocated with
+!  * malloc(), use free() instead of vim_free().
+   * Return pointer to buffer in "tofree".
+   * Returns zero when out of memory.
+   */
+***************
+*** 3692,3697 ****
+--- 3693,3700 ----
+      char	**argv = NULL;
+      int		round;
+  
++     *tofree = NULL;
++ 
+  #ifdef FEAT_MBYTE
+      /* Try using the Unicode version first, it takes care of conversion when
+       * 'encoding' is changed. */
+***************
+*** 3802,3816 ****
+  	    argv = (char **)malloc((argc + 1) * sizeof(char *));
+  	    if (argv == NULL )
+  	    {
+! 		vim_free(newcmdline);
+  		return 0;		   /* malloc error */
+  	    }
+  	    pnew = newcmdline;
+  	}
+      }
+  
+  done:
+- 
+      argv[argc] = NULL;		/* NULL-terminated list */
+      *argvp = argv;
+      return argc;
+--- 3805,3819 ----
+  	    argv = (char **)malloc((argc + 1) * sizeof(char *));
+  	    if (argv == NULL )
+  	    {
+! 		free(newcmdline);
+  		return 0;		   /* malloc error */
+  	    }
+  	    pnew = newcmdline;
++ 	    *tofree = newcmdline;
+  	}
+      }
+  
+  done:
+      argv[argc] = NULL;		/* NULL-terminated list */
+      *argvp = argv;
+      return argc;
+*** ../vim-7.2.035/src/os_vms.c	Wed Aug  6 18:38:52 2008
+--- src/os_vms.c	Wed Nov 12 11:42:12 2008
+***************
+*** 228,234 ****
+      else if ((sbuf = getenv((char *)lognam)))
+      {
+  	lengte = strlen(sbuf) + 1;
+! 	cp = (char_u *)malloc((size_t)lengte);
+  	if (cp)
+  	    strcpy((char *)cp, sbuf);
+  	return cp;
+--- 228,234 ----
+      else if ((sbuf = getenv((char *)lognam)))
+      {
+  	lengte = strlen(sbuf) + 1;
+! 	cp = (char_u *)alloc((size_t)lengte);
+  	if (cp)
+  	    strcpy((char *)cp, sbuf);
+  	return cp;
+***************
+*** 381,387 ****
+      if (--vms_match_free == 0) {
+  	/* add more space to store matches */
+  	vms_match_alloced += EXPL_ALLOC_INC;
+! 	vms_fmatch = (char_u **)realloc(vms_fmatch,
+  		sizeof(char **) * vms_match_alloced);
+  	if (!vms_fmatch)
+  	    return 0;
+--- 381,387 ----
+      if (--vms_match_free == 0) {
+  	/* add more space to store matches */
+  	vms_match_alloced += EXPL_ALLOC_INC;
+! 	vms_fmatch = (char_u **)vim_realloc(vms_fmatch,
+  		sizeof(char **) * vms_match_alloced);
+  	if (!vms_fmatch)
+  	    return 0;
+***************
+*** 460,466 ****
+  	    if (--files_free < 1)
+  	    {
+  		files_alloced += EXPL_ALLOC_INC;
+! 		*file = (char_u **)realloc(*file,
+  		    sizeof(char_u **) * files_alloced);
+  		if (*file == NULL)
+  		{
+--- 460,466 ----
+  	    if (--files_free < 1)
+  	    {
+  		files_alloced += EXPL_ALLOC_INC;
+! 		*file = (char_u **)vim_realloc(*file,
+  		    sizeof(char_u **) * files_alloced);
+  		if (*file == NULL)
+  		{
+***************
+*** 614,627 ****
+      {
+  	buflen = len + 128;
+  	if (buf)
+! 	    buf = (char *)realloc(buf, buflen);
+  	else
+! 	    buf = (char *)calloc(buflen, sizeof(char));
+      }
+  
+  #ifdef DEBUG
+       char		 *tmpbuf = NULL;
+!      tmpbuf = (char *)calloc(buflen, sizeof(char));
+       strcpy(tmpbuf, instring);
+  #endif
+  
+--- 614,627 ----
+      {
+  	buflen = len + 128;
+  	if (buf)
+! 	    buf = (char *)vim_realloc(buf, buflen);
+  	else
+! 	    buf = (char *)alloc(buflen * sizeof(char));
+      }
+  
+  #ifdef DEBUG
+       char		 *tmpbuf = NULL;
+!      tmpbuf = (char *)alloc(buflen * sizeof(char));
+       strcpy(tmpbuf, instring);
+  #endif
+  
+*** ../vim-7.2.035/src/os_w32exe.c	Fri Jul  1 00:06:20 2005
+--- src/os_w32exe.c	Wed Nov 12 11:45:43 2008
+***************
+*** 129,135 ****
+  errout:
+  #endif
+      free(argv);
+!     free(tofree);
+  #ifdef FEAT_MBYTE
+      free_cmd_argsW();
+  #endif
+--- 129,136 ----
+  errout:
+  #endif
+      free(argv);
+!     if (tofree != NULL)
+! 	free(tofree);
+  #ifdef FEAT_MBYTE
+      free_cmd_argsW();
+  #endif
+*** ../vim-7.2.035/src/os_win16.c	Wed Jun 25 00:49:34 2008
+--- src/os_win16.c	Wed Nov 12 11:45:53 2008
+***************
+*** 121,127 ****
+      pmain(argc, argv);
+  
+      free(argv);
+!     free(tofree);
+  
+      return 0;
+  }
+--- 121,128 ----
+      pmain(argc, argv);
+  
+      free(argv);
+!     if (tofree != NULL)
+! 	free(tofree);
+  
+      return 0;
+  }
+*** ../vim-7.2.035/src/version.c	Wed Nov 12 13:07:48 2008
+--- src/version.c	Wed Nov 12 13:28:51 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     36,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+239. You think "surfing" is something you do on dry land.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.037 b/source/ap/vim/patches/7.2.037
new file mode 100644
index 000000000..20a439836
--- /dev/null
+++ b/source/ap/vim/patches/7.2.037
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.037
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.037
+Problem:    Double free with GTK 1 and compiled with EXITFREE.
+Solution:   Don't close display. (Dominique Pelle)
+Files:	    src/os_unix.c
+
+
+*** ../vim-7.2.036/src/os_unix.c	Wed Nov 12 13:07:48 2008
+--- src/os_unix.c	Wed Nov 12 11:55:33 2008
+***************
+*** 2936,2942 ****
+      }
+  #  endif
+  # endif
+! # ifdef FEAT_X11
+      if (x11_display != NULL
+  #  ifdef FEAT_XCLIPBOARD
+  	    && x11_display != xterm_dpy
+--- 2936,2943 ----
+      }
+  #  endif
+  # endif
+!     /* Don't close the display for GTK 1, it is done in exit(). */
+! # if defined(FEAT_X11) && (!defined(FEAT_GUI_GTK) || defined(HAVE_GTK2))
+      if (x11_display != NULL
+  #  ifdef FEAT_XCLIPBOARD
+  	    && x11_display != xterm_dpy
+*** ../vim-7.2.036/src/version.c	Wed Nov 12 13:35:31 2008
+--- src/version.c	Wed Nov 12 14:08:56 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     37,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+240. You think Webster's Dictionary is a directory of WEB sites.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.038 b/source/ap/vim/patches/7.2.038
new file mode 100644
index 000000000..449821e81
--- /dev/null
+++ b/source/ap/vim/patches/7.2.038
@@ -0,0 +1,86 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.038
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.038
+Problem:    Overlapping arguments to memcpy().
+Solution:   Use mch_memmove(). (Dominique Pelle)
+Files:	    src/if_xcmdsrv.c
+
+
+*** ../vim-7.2.037/src/if_xcmdsrv.c	Wed Aug  6 18:38:13 2008
+--- src/if_xcmdsrv.c	Wed Nov 12 12:09:01 2008
+***************
+*** 736,742 ****
+  		+ serverReply.ga_len;
+  	    e.id = w;
+  	    ga_init2(&e.strings, 1, 100);
+! 	    memcpy(p, &e, sizeof(e));
+  	    serverReply.ga_len++;
+  	}
+      }
+--- 736,742 ----
+  		+ serverReply.ga_len;
+  	    e.id = w;
+  	    ga_init2(&e.strings, 1, 100);
+! 	    mch_memmove(p, &e, sizeof(e));
+  	    serverReply.ga_len++;
+  	}
+      }
+***************
+*** 1018,1024 ****
+  	p++;
+  	count = numItems - (p - regProp);
+  	if (count > 0)
+! 	    memcpy(entry, p, count);
+  	XChangeProperty(dpy, RootWindow(dpy, 0), registryProperty, XA_STRING,
+  			8, PropModeReplace, regProp,
+  			(int)(numItems - (p - entry)));
+--- 1018,1024 ----
+  	p++;
+  	count = numItems - (p - regProp);
+  	if (count > 0)
+! 	    mch_memmove(entry, p, count);
+  	XChangeProperty(dpy, RootWindow(dpy, 0), registryProperty, XA_STRING,
+  			8, PropModeReplace, regProp,
+  			(int)(numItems - (p - entry)));
+***************
+*** 1072,1078 ****
+  		p++;
+  		lastHalf = numItems - (p - regProp);
+  		if (lastHalf > 0)
+! 		    memcpy(entry, p, lastHalf);
+  		numItems = (entry - regProp) + lastHalf;
+  		p = entry;
+  		continue;
+--- 1072,1078 ----
+  		p++;
+  		lastHalf = numItems - (p - regProp);
+  		if (lastHalf > 0)
+! 		    mch_memmove(entry, p, lastHalf);
+  		numItems = (entry - regProp) + lastHalf;
+  		p = entry;
+  		continue;
+*** ../vim-7.2.037/src/version.c	Wed Nov 12 14:09:38 2008
+--- src/version.c	Wed Nov 12 14:51:00 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     38,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+241. You try to look for Net Search even when you're in File Manager.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.039 b/source/ap/vim/patches/7.2.039
new file mode 100644
index 000000000..f9cb18eb4
--- /dev/null
+++ b/source/ap/vim/patches/7.2.039
@@ -0,0 +1,46 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.039
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.039
+Problem:    Accessing freed memory on exit when EXITFREE is defined.
+Solution:   Call hash_init() on the v: hash table.
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.038/src/eval.c	Sun Nov  9 17:21:10 2008
+--- src/eval.c	Wed Nov 12 12:15:14 2008
+***************
+*** 856,861 ****
+--- 856,862 ----
+  	}
+      }
+      hash_clear(&vimvarht);
++     hash_init(&vimvarht);  /* garbage_collect() will access it */
+      hash_clear(&compat_hashtab);
+  
+      /* script-local variables */
+*** ../vim-7.2.038/src/version.c	Wed Nov 12 14:52:11 2008
+--- src/version.c	Wed Nov 12 15:09:39 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     39,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+242. You turn down a better-paying job because it doesn't come with
+     a free e-mail account.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.040 b/source/ap/vim/patches/7.2.040
new file mode 100644
index 000000000..76ea73af3
--- /dev/null
+++ b/source/ap/vim/patches/7.2.040
@@ -0,0 +1,64 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.040
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.040
+Problem:    When using ":e ++ff=dos fname" and the file contains a NL without
+	    a CR before it and 'ffs' contains "unix" then the fileformat
+	    becomes unix.
+Solution:   Ignore 'ffs' when using the ++ff argument. (Ben Schmidt)
+	    Also remove unreachable code.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.039/src/fileio.c	Tue Nov 11 21:55:29 2008
+--- src/fileio.c	Wed Nov 12 13:19:42 2008
+***************
+*** 932,938 ****
+--- 932,941 ----
+      else
+      {
+  	if (eap != NULL && eap->force_ff != 0)
++ 	{
+  	    fileformat = get_fileformat_force(curbuf, eap);
++ 	    try_unix = try_dos = try_mac = FALSE;
++ 	}
+  	else if (curbuf->b_p_bin)
+  	    fileformat = EOL_UNIX;		/* binary: use Unix format */
+  	else if (*p_ffs == NUL)
+***************
+*** 2341,2351 ****
+  		STRCAT(IObuff, _("[CR missing]"));
+  		c = TRUE;
+  	    }
+- 	    if (ff_error == EOL_MAC)
+- 	    {
+- 		STRCAT(IObuff, _("[NL found]"));
+- 		c = TRUE;
+- 	    }
+  	    if (split)
+  	    {
+  		STRCAT(IObuff, _("[long lines split]"));
+--- 2344,2349 ----
+*** ../vim-7.2.039/src/version.c	Wed Nov 12 15:28:37 2008
+--- src/version.c	Wed Nov 12 16:03:44 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     40,
+  /**/
+
+-- 
+If you're sending someone Styrofoam, what do you pack it in?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.041 b/source/ap/vim/patches/7.2.041
new file mode 100644
index 000000000..b562206ce
--- /dev/null
+++ b/source/ap/vim/patches/7.2.041
@@ -0,0 +1,729 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.041
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.041
+Problem:    In diff mode, when using two tabs, each with two diffed buffers,
+	    editing a buffer of the other tab messes up the diff.  (Matt
+	    Mzyzik)
+Solution:   Only copy options from a window where the buffer was edited that
+	    doesn't have 'diff' set or is for the current tab page.
+	    Also fix that window options for a buffer are stored with the
+	    wrong window.
+Files:	    src/buffer.c, src/ex_cmds.c, src/ex_cmds2.c, src/ex_docmd.c,
+	    src/ex_getln.c, src/if_sniff.c, src/main.c, src/netbeans.c,
+	    src/normal.c, src/popupmnu.c, src/proto/buffer.pro,
+	    src/proto/ex_cmds.pro src/quickfix.c, src/window.c
+
+
+*** ../vim-7.2.040/src/buffer.c	Wed Nov 12 12:51:38 2008
+--- src/buffer.c	Wed Nov 12 17:45:01 2008
+***************
+*** 33,39 ****
+  static char_u	*fname_match __ARGS((regprog_T *prog, char_u *name));
+  #endif
+  static void	buflist_setfpos __ARGS((buf_T *buf, win_T *win, linenr_T lnum, colnr_T col, int copy_options));
+! static wininfo_T *find_wininfo __ARGS((buf_T *buf));
+  #ifdef UNIX
+  static buf_T	*buflist_findname_stat __ARGS((char_u *ffname, struct stat *st));
+  static int	otherfile_buf __ARGS((buf_T *buf, char_u *ffname, struct stat *stp));
+--- 33,39 ----
+  static char_u	*fname_match __ARGS((regprog_T *prog, char_u *name));
+  #endif
+  static void	buflist_setfpos __ARGS((buf_T *buf, win_T *win, linenr_T lnum, colnr_T col, int copy_options));
+! static wininfo_T *find_wininfo __ARGS((buf_T *buf, int skip_diff_buffer));
+  #ifdef UNIX
+  static buf_T	*buflist_findname_stat __ARGS((char_u *ffname, struct stat *st));
+  static int	otherfile_buf __ARGS((buf_T *buf, char_u *ffname, struct stat *stp));
+***************
+*** 1093,1099 ****
+  #endif
+  	    setpcmark();
+  	    retval = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE,
+! 						  forceit ? ECMD_FORCEIT : 0);
+  
+  	    /*
+  	     * do_ecmd() may create a new buffer, then we have to delete
+--- 1093,1099 ----
+  #endif
+  	    setpcmark();
+  	    retval = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE,
+! 					  forceit ? ECMD_FORCEIT : 0, curwin);
+  
+  	    /*
+  	     * do_ecmd() may create a new buffer, then we have to delete
+***************
+*** 1316,1322 ****
+      setpcmark();
+      if (!cmdmod.keepalt)
+  	curwin->w_alt_fnum = curbuf->b_fnum; /* remember alternate file */
+!     buflist_altfpos();			 /* remember curpos */
+  
+  #ifdef FEAT_VISUAL
+      /* Don't restart Select mode after switching to another buffer. */
+--- 1316,1322 ----
+      setpcmark();
+      if (!cmdmod.keepalt)
+  	curwin->w_alt_fnum = curbuf->b_fnum; /* remember alternate file */
+!     buflist_altfpos(curwin);			 /* remember curpos */
+  
+  #ifdef FEAT_VISUAL
+      /* Don't restart Select mode after switching to another buffer. */
+***************
+*** 2404,2425 ****
+      return;
+  }
+  
+  /*
+   * Find info for the current window in buffer "buf".
+   * If not found, return the info for the most recently used window.
+   * Returns NULL when there isn't any info.
+   */
+      static wininfo_T *
+! find_wininfo(buf)
+      buf_T	*buf;
+  {
+      wininfo_T	*wip;
+  
+      for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next)
+! 	if (wip->wi_win == curwin)
+  	    break;
+!     if (wip == NULL)	/* if no fpos for curwin, use the first in the list */
+! 	wip = buf->b_wininfo;
+      return wip;
+  }
+  
+--- 2404,2473 ----
+      return;
+  }
+  
++ #ifdef FEAT_DIFF
++ static int wininfo_other_tab_diff __ARGS((wininfo_T *wip));
++ 
++ /*
++  * Return TRUE when "wip" has 'diff' set and the diff is only for another tab
++  * page.  That's because a diff is local to a tab page.
++  */
++     static int
++ wininfo_other_tab_diff(wip)
++     wininfo_T	*wip;
++ {
++     win_T	*wp;
++ 
++     if (wip->wi_opt.wo_diff)
++     {
++ 	for (wp = firstwin; wp != NULL; wp = wp->w_next)
++ 	    /* return FALSE when it's a window in the current tab page, thus
++ 	     * the buffer was in diff mode here */
++ 	    if (wip->wi_win == wp)
++ 		return FALSE;
++ 	return TRUE;
++     }
++     return FALSE;
++ }
++ #endif
++ 
+  /*
+   * Find info for the current window in buffer "buf".
+   * If not found, return the info for the most recently used window.
++  * When "skip_diff_buffer" is TRUE avoid windows with 'diff' set that is in
++  * another tab page.
+   * Returns NULL when there isn't any info.
+   */
++ /*ARGSUSED*/
+      static wininfo_T *
+! find_wininfo(buf, skip_diff_buffer)
+      buf_T	*buf;
++     int		skip_diff_buffer;
+  {
+      wininfo_T	*wip;
+  
+      for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next)
+! 	if (wip->wi_win == curwin
+! #ifdef FEAT_DIFF
+! 		&& (!skip_diff_buffer || !wininfo_other_tab_diff(wip))
+! #endif
+! 	   )
+  	    break;
+! 
+!     /* If no wininfo for curwin, use the first in the list (that doesn't have
+!      * 'diff' set and is in another tab page). */
+!     if (wip == NULL)
+!     {
+! #ifdef FEAT_DIFF
+! 	if (skip_diff_buffer)
+! 	{
+! 	    for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next)
+! 		if (!wininfo_other_tab_diff(wip))
+! 		    break;
+! 	}
+! 	else
+! #endif
+! 	    wip = buf->b_wininfo;
+!     }
+      return wip;
+  }
+  
+***************
+*** 2440,2446 ****
+      clearFolding(curwin);
+  #endif
+  
+!     wip = find_wininfo(buf);
+      if (wip != NULL && wip->wi_optset)
+      {
+  	copy_winopt(&wip->wi_opt, &curwin->w_onebuf_opt);
+--- 2488,2494 ----
+      clearFolding(curwin);
+  #endif
+  
+!     wip = find_wininfo(buf, TRUE);
+      if (wip != NULL && wip->wi_optset)
+      {
+  	copy_winopt(&wip->wi_opt, &curwin->w_onebuf_opt);
+***************
+*** 2472,2478 ****
+      wininfo_T	*wip;
+      static pos_T no_position = {1, 0};
+  
+!     wip = find_wininfo(buf);
+      if (wip != NULL)
+  	return &(wip->wi_fpos);
+      else
+--- 2520,2526 ----
+      wininfo_T	*wip;
+      static pos_T no_position = {1, 0};
+  
+!     wip = find_wininfo(buf, FALSE);
+      if (wip != NULL)
+  	return &(wip->wi_fpos);
+      else
+***************
+*** 2793,2806 ****
+  #endif
+  
+  /*
+!  * Set alternate cursor position for current window.
+   * Also save the local window option values.
+   */
+      void
+! buflist_altfpos()
+  {
+!     buflist_setfpos(curbuf, curwin, curwin->w_cursor.lnum,
+! 						  curwin->w_cursor.col, TRUE);
+  }
+  
+  /*
+--- 2841,2854 ----
+  #endif
+  
+  /*
+!  * Set alternate cursor position for the current buffer and window "win".
+   * Also save the local window option values.
+   */
+      void
+! buflist_altfpos(win)
+!     win_T *win;
+  {
+!     buflist_setfpos(curbuf, win, win->w_cursor.lnum, win->w_cursor.col, TRUE);
+  }
+  
+  /*
+***************
+*** 4492,4498 ****
+  		      ECMD_ONE,
+  		      ((P_HID(curwin->w_buffer)
+  			   || bufIsChanged(curwin->w_buffer)) ? ECMD_HIDE : 0)
+! 							       + ECMD_OLDBUF);
+  #ifdef FEAT_AUTOCMD
+  	    if (use_firstwin)
+  		++autocmd_no_leave;
+--- 4540,4546 ----
+  		      ECMD_ONE,
+  		      ((P_HID(curwin->w_buffer)
+  			   || bufIsChanged(curwin->w_buffer)) ? ECMD_HIDE : 0)
+! 						       + ECMD_OLDBUF, curwin);
+  #ifdef FEAT_AUTOCMD
+  	    if (use_firstwin)
+  		++autocmd_no_leave;
+*** ../vim-7.2.040/src/ex_cmds.c	Sun Nov  9 13:43:25 2008
+--- src/ex_cmds.c	Wed Nov 12 22:41:41 2008
+***************
+*** 3052,3058 ****
+  	retval = 0;	/* it's in the same file */
+      }
+      else if (do_ecmd(fnum, ffname, sfname, NULL, lnum,
+! 		(P_HID(curbuf) ? ECMD_HIDE : 0) + (forceit ? ECMD_FORCEIT : 0)) == OK)
+  	retval = -1;	/* opened another file */
+      else
+  	retval = 1;	/* error encountered */
+--- 3052,3059 ----
+  	retval = 0;	/* it's in the same file */
+      }
+      else if (do_ecmd(fnum, ffname, sfname, NULL, lnum,
+! 		(P_HID(curbuf) ? ECMD_HIDE : 0) + (forceit ? ECMD_FORCEIT : 0),
+! 		curwin) == OK)
+  	retval = -1;	/* opened another file */
+      else
+  	retval = 1;	/* error encountered */
+***************
+*** 3085,3101 ****
+   *	 ECMD_OLDBUF: use existing buffer if it exists
+   *	ECMD_FORCEIT: ! used for Ex command
+   *	 ECMD_ADDBUF: don't edit, just add to buffer list
+   *
+   * return FAIL for failure, OK otherwise
+   */
+      int
+! do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
+      int		fnum;
+      char_u	*ffname;
+      char_u	*sfname;
+      exarg_T	*eap;			/* can be NULL! */
+      linenr_T	newlnum;
+      int		flags;
+  {
+      int		other_file;		/* TRUE if editing another file */
+      int		oldbuf;			/* TRUE if using existing buffer */
+--- 3086,3106 ----
+   *	 ECMD_OLDBUF: use existing buffer if it exists
+   *	ECMD_FORCEIT: ! used for Ex command
+   *	 ECMD_ADDBUF: don't edit, just add to buffer list
++  *   oldwin: Should be "curwin" when editing a new buffer in the current
++  *           window, NULL when splitting the window first.  When not NULL info
++  *           of the previous buffer for "oldwin" is stored.
+   *
+   * return FAIL for failure, OK otherwise
+   */
+      int
+! do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin)
+      int		fnum;
+      char_u	*ffname;
+      char_u	*sfname;
+      exarg_T	*eap;			/* can be NULL! */
+      linenr_T	newlnum;
+      int		flags;
++     win_T	*oldwin;
+  {
+      int		other_file;		/* TRUE if editing another file */
+      int		oldbuf;			/* TRUE if using existing buffer */
+***************
+*** 3267,3273 ****
+  	{
+  	    if (!cmdmod.keepalt)
+  		curwin->w_alt_fnum = curbuf->b_fnum;
+! 	    buflist_altfpos();
+  	}
+  
+  	if (fnum)
+--- 3272,3279 ----
+  	{
+  	    if (!cmdmod.keepalt)
+  		curwin->w_alt_fnum = curbuf->b_fnum;
+! 	    if (oldwin != NULL)
+! 		buflist_altfpos(oldwin);
+  	}
+  
+  	if (fnum)
+***************
+*** 3371,3377 ****
+  
+  		/* close the link to the current buffer */
+  		u_sync(FALSE);
+! 		close_buffer(curwin, curbuf,
+  				      (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD);
+  
+  #ifdef FEAT_AUTOCMD
+--- 3377,3383 ----
+  
+  		/* close the link to the current buffer */
+  		u_sync(FALSE);
+! 		close_buffer(oldwin, curbuf,
+  				      (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD);
+  
+  #ifdef FEAT_AUTOCMD
+***************
+*** 5609,5615 ****
+  	     */
+  	    alt_fnum = curbuf->b_fnum;
+  	    (void)do_ecmd(0, NULL, NULL, NULL, ECMD_LASTL,
+! 						   ECMD_HIDE + ECMD_SET_HELP);
+  	    if (!cmdmod.keepalt)
+  		curwin->w_alt_fnum = alt_fnum;
+  	    empty_fnum = curbuf->b_fnum;
+--- 5615,5627 ----
+  	     */
+  	    alt_fnum = curbuf->b_fnum;
+  	    (void)do_ecmd(0, NULL, NULL, NULL, ECMD_LASTL,
+! 			  ECMD_HIDE + ECMD_SET_HELP,
+! #ifdef FEAT_WINDOWS
+! 			  NULL  /* buffer is still open, don't store info */
+! #else
+! 			  curwin
+! #endif
+! 		    );
+  	    if (!cmdmod.keepalt)
+  		curwin->w_alt_fnum = alt_fnum;
+  	    empty_fnum = curbuf->b_fnum;
+*** ../vim-7.2.040/src/ex_cmds2.c	Sun Sep  7 15:49:45 2008
+--- src/ex_cmds2.c	Wed Nov 12 17:46:41 2008
+***************
+*** 2132,2139 ****
+  	 * argument index. */
+  	if (do_ecmd(0, alist_name(&ARGLIST[curwin->w_arg_idx]), NULL,
+  		      eap, ECMD_LAST,
+! 		      (P_HID(curwin->w_buffer) ? ECMD_HIDE : 0) +
+! 				   (eap->forceit ? ECMD_FORCEIT : 0)) == FAIL)
+  	    curwin->w_arg_idx = old_arg_idx;
+  	/* like Vi: set the mark where the cursor is in the file. */
+  	else if (eap->cmdidx != CMD_argdo)
+--- 2132,2139 ----
+  	 * argument index. */
+  	if (do_ecmd(0, alist_name(&ARGLIST[curwin->w_arg_idx]), NULL,
+  		      eap, ECMD_LAST,
+! 		      (P_HID(curwin->w_buffer) ? ECMD_HIDE : 0)
+! 			 + (eap->forceit ? ECMD_FORCEIT : 0), curwin) == FAIL)
+  	    curwin->w_arg_idx = old_arg_idx;
+  	/* like Vi: set the mark where the cursor is in the file. */
+  	else if (eap->cmdidx != CMD_argdo)
+*** ../vim-7.2.040/src/ex_docmd.c	Sun Nov  9 13:43:25 2008
+--- src/ex_docmd.c	Wed Nov 12 18:04:22 2008
+***************
+*** 7488,7494 ****
+  	/* ":new" or ":tabnew" without argument: edit an new empty buffer */
+  	setpcmark();
+  	(void)do_ecmd(0, NULL, NULL, eap, ECMD_ONE,
+! 			       ECMD_HIDE + (eap->forceit ? ECMD_FORCEIT : 0));
+      }
+      else if ((eap->cmdidx != CMD_split
+  #ifdef FEAT_VERTSPLIT
+--- 7488,7495 ----
+  	/* ":new" or ":tabnew" without argument: edit an new empty buffer */
+  	setpcmark();
+  	(void)do_ecmd(0, NULL, NULL, eap, ECMD_ONE,
+! 		      ECMD_HIDE + (eap->forceit ? ECMD_FORCEIT : 0),
+! 		      old_curwin == NULL ? curwin : NULL);
+      }
+      else if ((eap->cmdidx != CMD_split
+  #ifdef FEAT_VERTSPLIT
+***************
+*** 7525,7531 ****
+  #ifdef FEAT_LISTCMDS
+  		    + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
+  #endif
+! 		    ) == FAIL)
+  	{
+  	    /* Editing the file failed.  If the window was split, close it. */
+  #ifdef FEAT_WINDOWS
+--- 7526,7532 ----
+  #ifdef FEAT_LISTCMDS
+  		    + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
+  #endif
+! 		    , old_curwin == NULL ? curwin : NULL) == FAIL)
+  	{
+  	    /* Editing the file failed.  If the window was split, close it. */
+  #ifdef FEAT_WINDOWS
+*** ../vim-7.2.040/src/ex_getln.c	Sun Sep 14 14:41:44 2008
+--- src/ex_getln.c	Wed Nov 12 18:06:25 2008
+***************
+*** 6051,6057 ****
+  	cmdwin_type = '-';
+  
+      /* Create the command-line buffer empty. */
+!     (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE);
+      (void)setfname(curbuf, (char_u *)"[Command Line]", NULL, TRUE);
+      set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
+      set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
+--- 6051,6057 ----
+  	cmdwin_type = '-';
+  
+      /* Create the command-line buffer empty. */
+!     (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL);
+      (void)setfname(curbuf, (char_u *)"[Command Line]", NULL, TRUE);
+      set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
+      set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
+*** ../vim-7.2.040/src/if_sniff.c	Sat Aug  9 19:41:16 2008
+--- src/if_sniff.c	Wed Nov 12 17:48:46 2008
+***************
+*** 1114,1120 ****
+      char *fname;
+  {
+      ++no_wait_return;
+!     do_ecmd(0, (char_u *)fname, NULL, NULL, ECMD_ONE, ECMD_HIDE+ECMD_OLDBUF);
+      curbuf->b_sniff = TRUE;
+      --no_wait_return;					/* [ex_docmd.c] */
+  }
+--- 1114,1121 ----
+      char *fname;
+  {
+      ++no_wait_return;
+!     do_ecmd(0, (char_u *)fname, NULL, NULL, ECMD_ONE, ECMD_HIDE+ECMD_OLDBUF,
+! 	    curwin);
+      curbuf->b_sniff = TRUE;
+      --no_wait_return;					/* [ex_docmd.c] */
+  }
+*** ../vim-7.2.040/src/main.c	Sun Nov  9 13:43:25 2008
+--- src/main.c	Wed Nov 12 17:49:06 2008
+***************
+*** 2588,2594 ****
+  # endif
+  	    (void)do_ecmd(0, arg_idx < GARGCOUNT
+  			  ? alist_name(&GARGLIST[arg_idx]) : NULL,
+! 			  NULL, NULL, ECMD_LASTL, ECMD_HIDE);
+  # ifdef HAS_SWAP_EXISTS_ACTION
+  	    if (swap_exists_did_quit)
+  	    {
+--- 2588,2594 ----
+  # endif
+  	    (void)do_ecmd(0, arg_idx < GARGCOUNT
+  			  ? alist_name(&GARGLIST[arg_idx]) : NULL,
+! 			  NULL, NULL, ECMD_LASTL, ECMD_HIDE, curwin);
+  # ifdef HAS_SWAP_EXISTS_ACTION
+  	    if (swap_exists_did_quit)
+  	    {
+*** ../vim-7.2.040/src/netbeans.c	Sun Jul 13 19:18:03 2008
+--- src/netbeans.c	Wed Nov 12 17:49:40 2008
+***************
+*** 1795,1801 ****
+  	    buf->displayname = NULL;
+  
+  	    netbeansReadFile = 0; /* don't try to open disk file */
+! 	    do_ecmd(0, NULL, 0, 0, ECMD_ONE, ECMD_HIDE + ECMD_OLDBUF);
+  	    netbeansReadFile = 1;
+  	    buf->bufp = curbuf;
+  	    maketitle();
+--- 1795,1801 ----
+  	    buf->displayname = NULL;
+  
+  	    netbeansReadFile = 0; /* don't try to open disk file */
+! 	    do_ecmd(0, NULL, 0, 0, ECMD_ONE, ECMD_HIDE + ECMD_OLDBUF, curwin);
+  	    netbeansReadFile = 1;
+  	    buf->bufp = curbuf;
+  	    maketitle();
+***************
+*** 1960,1966 ****
+  
+  	    netbeansReadFile = 0; /* don't try to open disk file */
+  	    do_ecmd(0, (char_u *)buf->displayname, 0, 0, ECMD_ONE,
+! 						     ECMD_HIDE + ECMD_OLDBUF);
+  	    netbeansReadFile = 1;
+  	    buf->bufp = curbuf;
+  	    maketitle();
+--- 1960,1966 ----
+  
+  	    netbeansReadFile = 0; /* don't try to open disk file */
+  	    do_ecmd(0, (char_u *)buf->displayname, 0, 0, ECMD_ONE,
+! 					     ECMD_HIDE + ECMD_OLDBUF, curwin);
+  	    netbeansReadFile = 1;
+  	    buf->bufp = curbuf;
+  	    maketitle();
+***************
+*** 1979,1985 ****
+  	    vim_free(buf->displayname);
+  	    buf->displayname = nb_unquote(args, NULL);
+  	    do_ecmd(0, (char_u *)buf->displayname, NULL, NULL, ECMD_ONE,
+! 						     ECMD_HIDE + ECMD_OLDBUF);
+  	    buf->bufp = curbuf;
+  	    buf->initDone = TRUE;
+  	    doupdate = 1;
+--- 1979,1985 ----
+  	    vim_free(buf->displayname);
+  	    buf->displayname = nb_unquote(args, NULL);
+  	    do_ecmd(0, (char_u *)buf->displayname, NULL, NULL, ECMD_ONE,
+! 					     ECMD_HIDE + ECMD_OLDBUF, curwin);
+  	    buf->bufp = curbuf;
+  	    buf->initDone = TRUE;
+  	    doupdate = 1;
+*** ../vim-7.2.040/src/normal.c	Sat Nov  1 13:51:57 2008
+--- src/normal.c	Wed Nov 12 17:49:50 2008
+***************
+*** 6050,6056 ****
+  	    autowrite(curbuf, FALSE);
+  	setpcmark();
+  	(void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST,
+! 					       P_HID(curbuf) ? ECMD_HIDE : 0);
+  	if (cap->nchar == 'F' && lnum >= 0)
+  	{
+  	    curwin->w_cursor.lnum = lnum;
+--- 6050,6056 ----
+  	    autowrite(curbuf, FALSE);
+  	setpcmark();
+  	(void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST,
+! 				       P_HID(curbuf) ? ECMD_HIDE : 0, curwin);
+  	if (cap->nchar == 'F' && lnum >= 0)
+  	{
+  	    curwin->w_cursor.lnum = lnum;
+*** ../vim-7.2.040/src/popupmnu.c	Sun Jul 13 19:33:51 2008
+--- src/popupmnu.c	Wed Nov 12 18:08:07 2008
+***************
+*** 573,579 ****
+  		{
+  		    /* Don't want to sync undo in the current buffer. */
+  		    ++no_u_sync;
+! 		    res = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, 0);
+  		    --no_u_sync;
+  		    if (res == OK)
+  		    {
+--- 573,579 ----
+  		{
+  		    /* Don't want to sync undo in the current buffer. */
+  		    ++no_u_sync;
+! 		    res = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, 0, NULL);
+  		    --no_u_sync;
+  		    if (res == OK)
+  		    {
+*** ../vim-7.2.040/src/proto/buffer.pro	Sun May  6 13:57:53 2007
+--- src/proto/buffer.pro	Wed Nov 12 17:43:39 2008
+***************
+*** 33,39 ****
+  char_u *getaltfname __ARGS((int errmsg));
+  int buflist_add __ARGS((char_u *fname, int flags));
+  void buflist_slash_adjust __ARGS((void));
+! void buflist_altfpos __ARGS((void));
+  int otherfile __ARGS((char_u *ffname));
+  void buf_setino __ARGS((buf_T *buf));
+  void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate));
+--- 33,39 ----
+  char_u *getaltfname __ARGS((int errmsg));
+  int buflist_add __ARGS((char_u *fname, int flags));
+  void buflist_slash_adjust __ARGS((void));
+! void buflist_altfpos __ARGS((win_T *win));
+  int otherfile __ARGS((char_u *ffname));
+  void buf_setino __ARGS((buf_T *buf));
+  void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate));
+*** ../vim-7.2.040/src/proto/ex_cmds.pro	Sun Nov  9 13:43:25 2008
+--- src/proto/ex_cmds.pro	Wed Nov 12 17:44:27 2008
+***************
+*** 27,33 ****
+  void do_wqall __ARGS((exarg_T *eap));
+  int not_writing __ARGS((void));
+  int getfile __ARGS((int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, int forceit));
+! int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags));
+  void ex_append __ARGS((exarg_T *eap));
+  void ex_change __ARGS((exarg_T *eap));
+  void ex_z __ARGS((exarg_T *eap));
+--- 27,33 ----
+  void do_wqall __ARGS((exarg_T *eap));
+  int not_writing __ARGS((void));
+  int getfile __ARGS((int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, int forceit));
+! int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags, win_T *oldwin));
+  void ex_append __ARGS((exarg_T *eap));
+  void ex_change __ARGS((exarg_T *eap));
+  void ex_z __ARGS((exarg_T *eap));
+*** ../vim-7.2.040/src/quickfix.c	Thu Jul 24 18:44:59 2008
+--- src/quickfix.c	Wed Nov 12 18:12:00 2008
+***************
+*** 1420,1425 ****
+--- 1420,1426 ----
+      win_T		*win;
+      win_T		*altwin;
+  #endif
++     win_T		*oldwin = curwin;
+      int			print_message = TRUE;
+      int			len;
+  #ifdef FEAT_FOLDING
+***************
+*** 1744,1750 ****
+  	    }
+  	    else
+  		ok = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1,
+! 						   ECMD_HIDE + ECMD_SET_HELP);
+  	}
+  	else
+  	    ok = buflist_getfile(qf_ptr->qf_fnum,
+--- 1745,1752 ----
+  	    }
+  	    else
+  		ok = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1,
+! 					   ECMD_HIDE + ECMD_SET_HELP,
+! 					   oldwin == curwin ? curwin : NULL);
+  	}
+  	else
+  	    ok = buflist_getfile(qf_ptr->qf_fnum,
+***************
+*** 2267,2272 ****
+--- 2269,2275 ----
+      win_T	*win;
+      tabpage_T	*prevtab = curtab;
+      buf_T	*qf_buf;
++     win_T	*oldwin = curwin;
+  
+      if (eap->cmdidx == CMD_lopen || eap->cmdidx == CMD_lwindow)
+      {
+***************
+*** 2326,2339 ****
+  	    win->w_llist->qf_refcount++;
+  	}
+  
+  	if (qf_buf != NULL)
+  	    /* Use the existing quickfix buffer */
+  	    (void)do_ecmd(qf_buf->b_fnum, NULL, NULL, NULL, ECMD_ONE,
+! 						     ECMD_HIDE + ECMD_OLDBUF);
+  	else
+  	{
+  	    /* Create a new quickfix buffer */
+! 	    (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE);
+  	    /* switch off 'swapfile' */
+  	    set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
+  	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
+--- 2329,2344 ----
+  	    win->w_llist->qf_refcount++;
+  	}
+  
++ 	if (oldwin != curwin)
++ 	    oldwin = NULL;  /* don't store info when in another window */
+  	if (qf_buf != NULL)
+  	    /* Use the existing quickfix buffer */
+  	    (void)do_ecmd(qf_buf->b_fnum, NULL, NULL, NULL, ECMD_ONE,
+! 					     ECMD_HIDE + ECMD_OLDBUF, oldwin);
+  	else
+  	{
+  	    /* Create a new quickfix buffer */
+! 	    (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, oldwin);
+  	    /* switch off 'swapfile' */
+  	    set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
+  	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
+*** ../vim-7.2.040/src/window.c	Wed Aug  6 18:32:11 2008
+--- src/window.c	Wed Nov 12 18:12:37 2008
+***************
+*** 531,537 ****
+  # ifdef FEAT_SCROLLBIND
+  			curwin->w_p_scb = FALSE;
+  # endif
+! 			(void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, ECMD_HIDE);
+  			if (nchar == 'F' && lnum >= 0)
+  			{
+  			    curwin->w_cursor.lnum = lnum;
+--- 531,538 ----
+  # ifdef FEAT_SCROLLBIND
+  			curwin->w_p_scb = FALSE;
+  # endif
+! 			(void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL,
+! 							   ECMD_HIDE, NULL);
+  			if (nchar == 'F' && lnum >= 0)
+  			{
+  			    curwin->w_cursor.lnum = lnum;
+*** ../vim-7.2.040/src/version.c	Wed Nov 12 16:04:43 2008
+--- src/version.c	Wed Nov 12 16:54:35 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     41,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+260. Co-workers have to E-mail you about the fire alarm to get
+     you out of the building.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.042 b/source/ap/vim/patches/7.2.042
new file mode 100644
index 000000000..cd2b56899
--- /dev/null
+++ b/source/ap/vim/patches/7.2.042
@@ -0,0 +1,166 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.042
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.042
+Problem:    When using winrestview() in a BufWinEnter autocommand the window
+	    is scrolled anyway. (Matt Zyzik)
+Solution:   Don't recompute topline when above 'scrolloff' from the bottom.
+	    Don't always put the cursor halfway when entering a buffer.  Add
+	    "w_topline_was_set".
+Files:	    src/buffer.c, src/move.c, src/structs.h
+
+
+*** ../vim-7.2.041/src/buffer.c	Sat Nov 15 14:10:23 2008
+--- src/buffer.c	Sat Nov 15 14:58:52 2008
+***************
+*** 1401,1406 ****
+--- 1401,1409 ----
+      curwin->w_cursor.coladd = 0;
+  #endif
+      curwin->w_set_curswant = TRUE;
++ #ifdef FEAT_AUTOCMD
++     curwin->w_topline_was_set = FALSE;
++ #endif
+  
+      /* Make sure the buffer is loaded. */
+      if (curbuf->b_ml.ml_mfp == NULL)	/* need to load the file */
+***************
+*** 1440,1446 ****
+      maketitle();
+  #endif
+  #ifdef FEAT_AUTOCMD
+!     if (curwin->w_topline == 1)		/* when autocmds didn't change it */
+  #endif
+  	scroll_cursor_halfway(FALSE);	/* redisplay at correct position */
+  
+--- 1443,1450 ----
+      maketitle();
+  #endif
+  #ifdef FEAT_AUTOCMD
+! 	/* when autocmds didn't change it */
+!     if (curwin->w_topline == 1 && !curwin->w_topline_was_set)
+  #endif
+  	scroll_cursor_halfway(FALSE);	/* redisplay at correct position */
+  
+*** ../vim-7.2.041/src/move.c	Sun Jul 13 19:25:23 2008
+--- src/move.c	Sat Nov 15 14:56:47 2008
+***************
+*** 280,297 ****
+  
+  	if (curwin->w_botline <= curbuf->b_ml.ml_line_count)
+  	{
+! 	    if (curwin->w_cursor.lnum < curwin->w_botline
+! 		    && ((long)curwin->w_cursor.lnum
+  					     >= (long)curwin->w_botline - p_so
+  #ifdef FEAT_FOLDING
+  			|| hasAnyFolding(curwin)
+  #endif
+  			))
+! 	    {
+  		lineoff_T	loff;
+  
+! 		/* Cursor is above botline, check if there are 'scrolloff'
+! 		 * window lines below the cursor.  If not, need to scroll. */
+  		n = curwin->w_empty_rows;
+  		loff.lnum = curwin->w_cursor.lnum;
+  #ifdef FEAT_FOLDING
+--- 280,299 ----
+  
+  	if (curwin->w_botline <= curbuf->b_ml.ml_line_count)
+  	{
+! 	    if (curwin->w_cursor.lnum < curwin->w_botline)
+! 	    {
+! 	      if (((long)curwin->w_cursor.lnum
+  					     >= (long)curwin->w_botline - p_so
+  #ifdef FEAT_FOLDING
+  			|| hasAnyFolding(curwin)
+  #endif
+  			))
+! 	      {
+  		lineoff_T	loff;
+  
+! 		/* Cursor is (a few lines) above botline, check if there are
+! 		 * 'scrolloff' window lines below the cursor.  If not, need to
+! 		 * scroll. */
+  		n = curwin->w_empty_rows;
+  		loff.lnum = curwin->w_cursor.lnum;
+  #ifdef FEAT_FOLDING
+***************
+*** 317,322 ****
+--- 319,328 ----
+  		if (n >= p_so)
+  		    /* sufficient context, no need to scroll */
+  		    check_botline = FALSE;
++ 	      }
++ 	      else
++ 		  /* sufficient context, no need to scroll */
++ 		  check_botline = FALSE;
+  	    }
+  	    if (check_botline)
+  	    {
+***************
+*** 509,514 ****
+--- 515,523 ----
+      /* Approximate the value of w_botline */
+      wp->w_botline += lnum - wp->w_topline;
+      wp->w_topline = lnum;
++ #ifdef FEAT_AUTOCMD
++     wp->w_topline_was_set = TRUE;
++ #endif
+  #ifdef FEAT_DIFF
+      wp->w_topfill = 0;
+  #endif
+*** ../vim-7.2.041/src/structs.h	Sun Nov  9 13:43:25 2008
+--- src/structs.h	Sat Nov 15 14:56:42 2008
+***************
+*** 1784,1793 ****
+  #endif
+  
+      /*
+!      * The next three specify the offsets for displaying the buffer:
+       */
+      linenr_T	w_topline;	    /* buffer line number of the line at the
+  				       top of the window */
+  #ifdef FEAT_DIFF
+      int		w_topfill;	    /* number of filler lines above w_topline */
+      int		w_old_topfill;	    /* w_topfill at last redraw */
+--- 1784,1798 ----
+  #endif
+  
+      /*
+!      * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for
+!      * displaying the buffer.
+       */
+      linenr_T	w_topline;	    /* buffer line number of the line at the
+  				       top of the window */
++ #ifdef FEAT_AUTOCMD
++     char	w_topline_was_set;  /* flag set to TRUE when topline is set,
++ 				       e.g. by winrestview() */
++ #endif
+  #ifdef FEAT_DIFF
+      int		w_topfill;	    /* number of filler lines above w_topline */
+      int		w_old_topfill;	    /* w_topfill at last redraw */
+*** ../vim-7.2.041/src/version.c	Sat Nov 15 14:10:23 2008
+--- src/version.c	Sat Nov 15 16:01:29 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     42,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+261. You find diskettes in your pockets when doing laundry.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.043 b/source/ap/vim/patches/7.2.043
new file mode 100644
index 000000000..5c5225471
--- /dev/null
+++ b/source/ap/vim/patches/7.2.043
@@ -0,0 +1,78 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.043
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.043
+Problem:    VMS: Too many characters are escaped in filename and shell
+	    commands.
+Solution:   Escape fewer characters. (Zoltan Arpadffy)
+Files:	    src/vim.h
+
+
+*** ../vim-7.2.042/src/vim.h	Sun Nov  9 13:43:25 2008
+--- src/vim.h	Fri Nov 14 21:41:17 2008
+***************
+*** 341,348 ****
+  #ifdef BACKSLASH_IN_FILENAME
+  # define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<")
+  #else
+! # define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
+! # define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
+  #endif
+  
+  #define NUMBUFLEN 30	    /* length of a buffer to store a number in ASCII */
+--- 341,354 ----
+  #ifdef BACKSLASH_IN_FILENAME
+  # define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<")
+  #else
+! # ifdef VMS
+!     /* VMS allows a lot of characters in the file name */
+! #  define PATH_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'\"|!")
+! #  define SHELL_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'|!()&")
+! # else
+! #  define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
+! #  define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
+! # endif
+  #endif
+  
+  #define NUMBUFLEN 30	    /* length of a buffer to store a number in ASCII */
+***************
+*** 370,376 ****
+     * Define __w64 as an empty token for everything but MSVC 7.x or later.
+     */
+  # if !defined(_MSC_VER)	|| (_MSC_VER < 1300)
+! #  define __w64 
+  # endif
+  typedef unsigned long __w64	long_u;
+  typedef		 long __w64     long_i;
+--- 376,382 ----
+     * Define __w64 as an empty token for everything but MSVC 7.x or later.
+     */
+  # if !defined(_MSC_VER)	|| (_MSC_VER < 1300)
+! #  define __w64
+  # endif
+  typedef unsigned long __w64	long_u;
+  typedef		 long __w64     long_i;
+*** ../vim-7.2.042/src/version.c	Sat Nov 15 16:05:30 2008
+--- src/version.c	Thu Nov 20 10:23:51 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     43,
+  /**/
+
+-- 
+In his lifetime van Gogh painted 486 oil paintings. Oddly enough, 8975
+of them are to be found in the United States.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.044 b/source/ap/vim/patches/7.2.044
new file mode 100644
index 000000000..4cfe651e2
--- /dev/null
+++ b/source/ap/vim/patches/7.2.044
@@ -0,0 +1,161 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.044
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.044
+Problem:    Crash because of STRCPY() being over protective of the destination
+	    size. (Dominique Pelle)
+Solution:   Add -D_FORTIFY_SOURCE=1 to CFLAGS.  Use an intermediate variable
+	    for the pointer to avoid a warning.
+Files:	    src/auto/configure, src/configure.in, src/eval.c
+
+
+*** ../vim-7.2.043/src/auto/configure	Thu Jul 24 17:20:50 2008
+--- src/auto/configure	Sun Nov 16 17:08:44 2008
+***************
+*** 16819,16839 ****
+    LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
+  fi
+  
+- { $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
+- $as_echo_n "checking for GCC 3 or later... " >&6; }
+  DEPEND_CFLAGS_FILTER=
+  if test "$GCC" = yes; then
+    gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
+    if test "$gccmajor" -gt "2"; then
+      DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
+!   fi
+! fi
+! if test "$DEPEND_CFLAGS_FILTER" = ""; then
+!   { $as_echo "$as_me:$LINENO: result: no" >&5
+  $as_echo "no" >&6; }
+! else
+!   { $as_echo "$as_me:$LINENO: result: yes" >&5
+  $as_echo "yes" >&6; }
+  fi
+  
+  
+--- 16819,16847 ----
+    LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
+  fi
+  
+  DEPEND_CFLAGS_FILTER=
+  if test "$GCC" = yes; then
++   { $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
++ $as_echo_n "checking for GCC 3 or later... " >&6; }
+    gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
+    if test "$gccmajor" -gt "2"; then
+      DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
+!     { $as_echo "$as_me:$LINENO: result: yes" >&5
+! $as_echo "yes" >&6; }
+!   else
+!     { $as_echo "$as_me:$LINENO: result: no" >&5
+  $as_echo "no" >&6; }
+!   fi
+!       { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
+! $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
+!   if test "$gccmajor" -gt "3"; then
+!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+!     { $as_echo "$as_me:$LINENO: result: yes" >&5
+  $as_echo "yes" >&6; }
++   else
++     { $as_echo "$as_me:$LINENO: result: no" >&5
++ $as_echo "no" >&6; }
++   fi
+  fi
+  
+  
+*** ../vim-7.2.043/src/configure.in	Thu Jul 24 17:20:31 2008
+--- src/configure.in	Sun Nov 16 17:08:40 2008
+***************
+*** 3152,3169 ****
+  dnl But only when making dependencies, cproto and lint don't take "-isystem".
+  dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
+  dnl the number before the version number.
+- AC_MSG_CHECKING(for GCC 3 or later)
+  DEPEND_CFLAGS_FILTER=
+  if test "$GCC" = yes; then
+    gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
+    if test "$gccmajor" -gt "2"; then
+      DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
+    fi
+- fi
+- if test "$DEPEND_CFLAGS_FILTER" = ""; then
+-   AC_MSG_RESULT(no)
+- else
+-   AC_MSG_RESULT(yes)
+  fi
+  AC_SUBST(DEPEND_CFLAGS_FILTER)
+  
+--- 3152,3176 ----
+  dnl But only when making dependencies, cproto and lint don't take "-isystem".
+  dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
+  dnl the number before the version number.
+  DEPEND_CFLAGS_FILTER=
+  if test "$GCC" = yes; then
++   AC_MSG_CHECKING(for GCC 3 or later)
+    gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
+    if test "$gccmajor" -gt "2"; then
+      DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
++     AC_MSG_RESULT(yes)
++   else
++     AC_MSG_RESULT(no)
++   fi
++   dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
++   dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
++   AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
++   if test "$gccmajor" -gt "3"; then
++     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
++     AC_MSG_RESULT(yes)
++   else
++     AC_MSG_RESULT(no)
+    fi
+  fi
+  AC_SUBST(DEPEND_CFLAGS_FILTER)
+  
+*** ../vim-7.2.043/src/eval.c	Wed Nov 12 15:28:37 2008
+--- src/eval.c	Sun Nov 16 20:46:28 2008
+***************
+*** 21150,21157 ****
+      init_var_dict(&fc.l_avars, &fc.l_avars_var);
+      add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
+  				(varnumber_T)(argcount - fp->uf_args.ga_len));
+      v = &fc.fixvar[fixvar_idx++].var;
+!     STRCPY(v->di_key, "000");
+      v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+      hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
+      v->di_tv.v_type = VAR_LIST;
+--- 21150,21160 ----
+      init_var_dict(&fc.l_avars, &fc.l_avars_var);
+      add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
+  				(varnumber_T)(argcount - fp->uf_args.ga_len));
++     /* Use "name" to avoid a warning from some compiler that checks the
++      * destination size. */
+      v = &fc.fixvar[fixvar_idx++].var;
+!     name = v->di_key;
+!     STRCPY(name, "000");
+      v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+      hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
+      v->di_tv.v_type = VAR_LIST;
+*** ../vim-7.2.043/src/version.c	Thu Nov 20 10:26:19 2008
+--- src/version.c	Thu Nov 20 10:34:31 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     44,
+  /**/
+
+-- 
+Error:015 - Unable to exit Windows.  Try the door.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.045 b/source/ap/vim/patches/7.2.045
new file mode 100644
index 000000000..cf37908d2
--- /dev/null
+++ b/source/ap/vim/patches/7.2.045
@@ -0,0 +1,67 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.045
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.045
+Problem:    The Python interface has an empty entry in sys.path.
+Solution:   Filter out the empty entry. (idea from James Vega)
+Files:	    src/if_python.c
+
+
+*** ../vim-7.2.044/src/if_python.c	Thu Jul 24 16:24:48 2008
+--- src/if_python.c	Thu Nov 20 11:03:53 2008
+***************
+*** 531,536 ****
+--- 531,542 ----
+  	if (PythonMod_Init())
+  	    goto fail;
+  
++ 	/* Remove the element from sys.path that was added because of our
++ 	 * argv[0] value in PythonMod_Init().  Previously we used an empty
++ 	 * string, but dependinding on the OS we then get an empty entry or
++ 	 * the current directory in sys.path. */
++ 	PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
++ 
+  	/* the first python thread is vim's, release the lock */
+  	Python_SaveThread();
+  
+***************
+*** 2345,2351 ****
+  {
+      PyObject *mod;
+      PyObject *dict;
+!     static char *(argv[2]) = {"", NULL};
+  
+      /* Fixups... */
+      BufferType.ob_type = &PyType_Type;
+--- 2351,2358 ----
+  {
+      PyObject *mod;
+      PyObject *dict;
+!     /* The special value is removed from sys.path in Python_Init(). */
+!     static char *(argv[2]) = {"/must>not&exist/foo", NULL};
+  
+      /* Fixups... */
+      BufferType.ob_type = &PyType_Type;
+*** ../vim-7.2.044/src/version.c	Thu Nov 20 10:36:04 2008
+--- src/version.c	Thu Nov 20 10:58:11 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     45,
+  /**/
+
+-- 
+press CTRL-ALT-DEL for more information
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.046 b/source/ap/vim/patches/7.2.046
new file mode 100644
index 000000000..335f814d5
--- /dev/null
+++ b/source/ap/vim/patches/7.2.046
@@ -0,0 +1,55 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.046
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.046
+Problem:    Wrong check for filling buffer with encoding. (Danek Duvall)
+Solution:   Remove pointers. (Dominique Pelle)
+Files:	    src/mbyte.c
+
+
+*** ../vim-7.2.045/src/mbyte.c	Wed Nov 12 13:07:48 2008
+--- src/mbyte.c	Wed Nov 19 21:44:50 2008
+***************
+*** 3131,3137 ****
+  	else
+  	    s = p + 1;
+      }
+!     for (i = 0; s[i] != NUL && s + i < buf + sizeof(buf) - 1; ++i)
+      {
+  	if (s[i] == '_' || s[i] == '-')
+  	    buf[i] = '-';
+--- 3131,3137 ----
+  	else
+  	    s = p + 1;
+      }
+!     for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
+      {
+  	if (s[i] == '_' || s[i] == '-')
+  	    buf[i] = '-';
+*** ../vim-7.2.045/src/version.c	Thu Nov 20 11:04:01 2008
+--- src/version.c	Thu Nov 20 11:54:23 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     46,
+  /**/
+
+-- 
+       He was not in the least bit scared to be mashed into a pulp
+       Or to have his eyes gouged out and his elbows broken;
+       To have his kneecaps split and his body burned away
+       And his limbs all hacked and mangled, brave Sir Robin.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.047 b/source/ap/vim/patches/7.2.047
new file mode 100644
index 000000000..5826d2a98
--- /dev/null
+++ b/source/ap/vim/patches/7.2.047
@@ -0,0 +1,88 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.047
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.047
+Problem:    Starting Vim with the -nb argument while it's not supported causes
+	    the other side to hang.
+Solution:   When -nb is used while it's not supported exit Vim. (Xavier de
+	    Gaye)
+Files:	    src/main.c, src/vim.h
+
+
+*** ../vim-7.2.046/src/main.c	Sat Nov 15 14:10:23 2008
+--- src/main.c	Thu Nov 20 14:09:27 2008
+***************
+*** 1510,1516 ****
+  early_arg_scan(parmp)
+      mparm_T	*parmp;
+  {
+! #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER)
+      int		argc = parmp->argc;
+      char	**argv = parmp->argv;
+      int		i;
+--- 1510,1517 ----
+  early_arg_scan(parmp)
+      mparm_T	*parmp;
+  {
+! #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
+! 	|| !defined(FEAT_NETBEANS_INTG)
+      int		argc = parmp->argc;
+      char	**argv = parmp->argv;
+      int		i;
+***************
+*** 1582,1587 ****
+--- 1583,1596 ----
+  	else if (STRICMP(argv[i], "--echo-wid") == 0)
+  	    echo_wid_arg = TRUE;
+  # endif
++ # ifndef FEAT_NETBEANS_INTG
++ 	else if (strncmp(argv[i], "-nb", (size_t)3) == 0)
++         {
++             mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n"));
++             mch_exit(2);
++         }
++ # endif
++ 
+      }
+  #endif
+  }
+*** ../vim-7.2.046/src/vim.h	Thu Nov 20 10:26:19 2008
+--- src/vim.h	Thu Nov 20 12:06:14 2008
+***************
+*** 1986,1991 ****
+--- 1986,1994 ----
+  # endif
+  #endif
+  
++ #ifndef FEAT_NETBEANS_INTG
++ # undef NBDEBUG
++ #endif
+  #ifdef NBDEBUG /* Netbeans debugging. */
+  # include "nbdebug.h"
+  #else
+*** ../vim-7.2.046/src/version.c	Thu Nov 20 11:55:53 2008
+--- src/version.c	Thu Nov 20 14:07:57 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     47,
+  /**/
+
+-- 
+FIRST HEAD:  Oh! quick! get the sword out I want to cut his head off.
+THIRD HEAD:  Oh, cut your own head off.
+SECOND HEAD: Yes - do us all a favour.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.048 b/source/ap/vim/patches/7.2.048
new file mode 100644
index 000000000..3975308b5
--- /dev/null
+++ b/source/ap/vim/patches/7.2.048
@@ -0,0 +1,160 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.048
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.048
+Problem:    v:prevcount is changed too often.  Counts are not multiplied when
+	    setting v:count.
+Solution:   Set v:prevcount properly.  Multiply counts. (idea by Ben Schmidt)
+Files:	    src/eval.c, src/normal.c, src/proto/eval.pro
+
+
+*** ../vim-7.2.047/src/eval.c	Thu Nov 20 10:36:04 2008
+--- src/eval.c	Thu Nov 20 15:53:47 2008
+***************
+*** 18146,18159 ****
+  }
+  
+  /*
+!  * Set v:count, v:count1 and v:prevcount.
+   */
+      void
+! set_vcount(count, count1)
+      long	count;
+      long	count1;
+  {
+!     vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
+      vimvars[VV_COUNT].vv_nr = count;
+      vimvars[VV_COUNT1].vv_nr = count1;
+  }
+--- 18146,18162 ----
+  }
+  
+  /*
+!  * Set v:count to "count" and v:count1 to "count1".
+!  * When "set_prevcount" is TRUE first set v:prevcount from v:count.
+   */
+      void
+! set_vcount(count, count1, set_prevcount)
+      long	count;
+      long	count1;
++     int		set_prevcount;
+  {
+!     if (set_prevcount)
+! 	vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
+      vimvars[VV_COUNT].vv_nr = count;
+      vimvars[VV_COUNT1].vv_nr = count1;
+  }
+*** ../vim-7.2.047/src/normal.c	Sat Nov 15 14:10:23 2008
+--- src/normal.c	Thu Nov 20 16:04:44 2008
+***************
+*** 580,585 ****
+--- 580,588 ----
+      static int	old_mapped_len = 0;
+  #endif
+      int		idx;
++ #ifdef FEAT_EVAL
++     int		set_prevcount = FALSE;
++ #endif
+  
+      vim_memset(&ca, 0, sizeof(ca));	/* also resets ca.retval */
+      ca.oap = oap;
+***************
+*** 615,621 ****
+--- 618,629 ----
+      /* When not finishing an operator and no register name typed, reset the
+       * count. */
+      if (!finish_op && !oap->regname)
++     {
+  	ca.opcount = 0;
++ #ifdef FEAT_EVAL
++ 	set_prevcount = TRUE;
++ #endif
++     }
+  
+  #ifdef FEAT_AUTOCMD
+      /* Restore counts from before receiving K_CURSORHOLD.  This means after
+***************
+*** 719,725 ****
+  	     * command, so that v:count can be used in an expression mapping
+  	     * right after the count. */
+  	    if (toplevel && stuff_empty())
+! 		set_vcount(ca.count0, ca.count0 == 0 ? 1 : ca.count0);
+  #endif
+  	    if (ctrl_w)
+  	    {
+--- 727,741 ----
+  	     * command, so that v:count can be used in an expression mapping
+  	     * right after the count. */
+  	    if (toplevel && stuff_empty())
+! 	    {
+! 		long count = ca.count0;
+! 
+! 		/* multiply with ca.opcount the same way as below */
+! 		if (ca.opcount != 0)
+! 		    count = ca.opcount * (count == 0 ? 1 : count);
+! 		set_vcount(count, count == 0 ? 1 : count, set_prevcount);
+! 		set_prevcount = FALSE;  /* only set v:prevcount once */
+! 	    }
+  #endif
+  	    if (ctrl_w)
+  	    {
+***************
+*** 806,812 ****
+       * Only set v:count when called from main() and not a stuffed command.
+       */
+      if (toplevel && stuff_empty())
+! 	set_vcount(ca.count0, ca.count1);
+  #endif
+  
+      /*
+--- 822,828 ----
+       * Only set v:count when called from main() and not a stuffed command.
+       */
+      if (toplevel && stuff_empty())
+! 	set_vcount(ca.count0, ca.count1, set_prevcount);
+  #endif
+  
+      /*
+*** ../vim-7.2.047/src/proto/eval.pro	Sun Nov  9 13:43:25 2008
+--- src/proto/eval.pro	Thu Nov 20 15:53:54 2008
+***************
+*** 61,67 ****
+  long get_vim_var_nr __ARGS((int idx));
+  char_u *get_vim_var_str __ARGS((int idx));
+  list_T *get_vim_var_list __ARGS((int idx));
+! void set_vcount __ARGS((long count, long count1));
+  void set_vim_var_string __ARGS((int idx, char_u *val, int len));
+  void set_vim_var_list __ARGS((int idx, list_T *val));
+  void set_reg_var __ARGS((int c));
+--- 61,67 ----
+  long get_vim_var_nr __ARGS((int idx));
+  char_u *get_vim_var_str __ARGS((int idx));
+  list_T *get_vim_var_list __ARGS((int idx));
+! void set_vcount __ARGS((long count, long count1, int set_prevcount));
+  void set_vim_var_string __ARGS((int idx, char_u *val, int len));
+  void set_vim_var_list __ARGS((int idx, list_T *val));
+  void set_reg_var __ARGS((int c));
+*** ../vim-7.2.047/src/version.c	Thu Nov 20 14:11:47 2008
+--- src/version.c	Thu Nov 20 16:08:19 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     48,
+  /**/
+
+-- 
+Microsoft's definition of a boolean: TRUE, FALSE, MAYBE
+"Embrace and extend"...?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.049 b/source/ap/vim/patches/7.2.049
new file mode 100644
index 000000000..0f6efa87f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.049
@@ -0,0 +1,1193 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.049 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.049 (extra)
+Problem:    Win32: the clipboard doesn't support UTF-16.
+Solution:   Change UCS-2 support to UTF-16 support. (Jia Yanwei)
+Files:	    src/gui_w32.c, src/gui_w48.c, src/mbyte.c, src/misc1.c,
+	    src/os_mswin.c, src/os_win32.c, src/proto/os_mswin.pro
+
+
+*** ../vim-7.2.048/src/gui_w32.c	Tue Jun 24 23:46:14 2008
+--- src/gui_w32.c	Thu Nov 20 16:47:10 2008
+***************
+*** 992,998 ****
+  			    SendMessage(lpdi->hdr.hwndFrom, TTM_SETMAXTIPWIDTH,
+  								      0, 500);
+  
+! 			    tt_text = enc_to_ucs2(str, NULL);
+  			    lpdi->lpszText = tt_text;
+  			    /* can't show tooltip if failed */
+  			}
+--- 992,998 ----
+  			    SendMessage(lpdi->hdr.hwndFrom, TTM_SETMAXTIPWIDTH,
+  								      0, 500);
+  
+! 			    tt_text = enc_to_utf16(str, NULL);
+  			    lpdi->lpszText = tt_text;
+  			    /* can't show tooltip if failed */
+  			}
+***************
+*** 1935,1941 ****
+      if (buf == NULL)
+  	return NULL;
+  
+!     convbuf = ucs2_to_enc(buf, lenp);
+      pImmReleaseContext(hwnd, hIMC);
+      vim_free(buf);
+      return convbuf;
+--- 1935,1941 ----
+      if (buf == NULL)
+  	return NULL;
+  
+!     convbuf = utf16_to_enc(buf, lenp);
+      pImmReleaseContext(hwnd, hIMC);
+      vim_free(buf);
+      return convbuf;
+***************
+*** 2566,2572 ****
+  	    {
+  		/* 'encoding' differs from active codepage: convert menu name
+  		 * and use wide function */
+! 		wn = enc_to_ucs2(menu->name, NULL);
+  		if (wn != NULL)
+  		{
+  		    MENUITEMINFOW	infow;
+--- 2566,2572 ----
+  	    {
+  		/* 'encoding' differs from active codepage: convert menu name
+  		 * and use wide function */
+! 		wn = enc_to_utf16(menu->name, NULL);
+  		if (wn != NULL)
+  		{
+  		    MENUITEMINFOW	infow;
+***************
+*** 2728,2734 ****
+  	{
+  	    /* 'encoding' differs from active codepage: convert menu item name
+  	     * and use wide function */
+! 	    wn = enc_to_ucs2(menu->name, NULL);
+  	    if (wn != NULL)
+  	    {
+  		n = InsertMenuW(parent->submenu_id, (UINT)idx,
+--- 2728,2734 ----
+  	{
+  	    /* 'encoding' differs from active codepage: convert menu item name
+  	     * and use wide function */
+! 	    wn = enc_to_utf16(menu->name, NULL);
+  	    if (wn != NULL)
+  	    {
+  		n = InsertMenuW(parent->submenu_id, (UINT)idx,
+***************
+*** 3570,3576 ****
+      if (enc_codepage == 0 && (int)GetACP() != enc_codepage)
+      {
+  	/* Not a codepage, use our own conversion function. */
+! 	wn = enc_to_ucs2(lpAnsiIn, NULL);
+  	if (wn != NULL)
+  	{
+  	    wcscpy(lpWCStr, wn);
+--- 3570,3576 ----
+      if (enc_codepage == 0 && (int)GetACP() != enc_codepage)
+      {
+  	/* Not a codepage, use our own conversion function. */
+! 	wn = enc_to_utf16(lpAnsiIn, NULL);
+  	if (wn != NULL)
+  	{
+  	    wcscpy(lpWCStr, wn);
+*** ../vim-7.2.048/src/gui_w48.c	Wed Nov 12 13:35:31 2008
+--- src/gui_w48.c	Thu Nov 20 16:42:32 2008
+***************
+*** 547,553 ****
+  	else
+  	{
+  	    len = 1;
+! 	    ws = ucs2_to_enc(wstring, &len);
+  	    if (ws == NULL)
+  		len = 0;
+  	    else
+--- 547,553 ----
+  	else
+  	{
+  	    len = 1;
+! 	    ws = utf16_to_enc(wstring, &len);
+  	    if (ws == NULL)
+  		len = 0;
+  	    else
+***************
+*** 2128,2134 ****
+      {
+  	/* 'encoding' differs from active codepage: convert text and use wide
+  	 * function */
+! 	wstr = enc_to_ucs2(str, &wlen);
+  	if (wstr != NULL)
+  	{
+  	    n = GetTextExtentPointW(hdc, wstr, wlen, &size);
+--- 2128,2134 ----
+      {
+  	/* 'encoding' differs from active codepage: convert text and use wide
+  	 * function */
+! 	wstr = enc_to_utf16(str, &wlen);
+  	if (wstr != NULL)
+  	{
+  	    n = GetTextExtentPointW(hdc, wstr, wlen, &size);
+***************
+*** 2252,2258 ****
+      {
+  	/* 'encoding' differs from active codepage: convert menu name
+  	 * and use wide function */
+! 	wn = enc_to_ucs2(item_text, NULL);
+  	if (wn != NULL)
+  	{
+  	    MENUITEMINFOW	infow;
+--- 2252,2258 ----
+      {
+  	/* 'encoding' differs from active codepage: convert menu name
+  	 * and use wide function */
+! 	wn = enc_to_utf16(item_text, NULL);
+  	if (wn != NULL)
+  	{
+  	    MENUITEMINFOW	infow;
+***************
+*** 2422,2428 ****
+  	if (use_unicode)
+  	{
+  	    /* Need to go through Unicode. */
+! 	    wstr = enc_to_ucs2(NameBuff, NULL);
+  	    if (wstr != NULL)
+  	    {
+  		TCITEMW		tiw;
+--- 2422,2428 ----
+  	if (use_unicode)
+  	{
+  	    /* Need to go through Unicode. */
+! 	    wstr = enc_to_utf16(NameBuff, NULL);
+  	    if (wstr != NULL)
+  	    {
+  		TCITEMW		tiw;
+***************
+*** 2521,2528 ****
+  	WCHAR	*wbuf;
+  	int	n;
+  
+! 	/* Convert the title from 'encoding' to ucs2. */
+! 	wbuf = (WCHAR *)enc_to_ucs2((char_u *)title, NULL);
+  	if (wbuf != NULL)
+  	{
+  	    n = SetWindowTextW(hwnd, wbuf);
+--- 2521,2528 ----
+  	WCHAR	*wbuf;
+  	int	n;
+  
+! 	/* Convert the title from 'encoding' to UTF-16. */
+! 	wbuf = (WCHAR *)enc_to_utf16((char_u *)title, NULL);
+  	if (wbuf != NULL)
+  	{
+  	    n = SetWindowTextW(hwnd, wbuf);
+***************
+*** 3222,3228 ****
+  	char_u *initdir,
+  	char_u *filter)
+  {
+!     /* We always use the wide function.  This means enc_to_ucs2() must work,
+       * otherwise it fails miserably! */
+      OPENFILENAMEW	fileStruct;
+      WCHAR		fileBuf[MAXPATHL];
+--- 3222,3228 ----
+  	char_u *initdir,
+  	char_u *filter)
+  {
+!     /* We always use the wide function.  This means enc_to_utf16() must work,
+       * otherwise it fails miserably! */
+      OPENFILENAMEW	fileStruct;
+      WCHAR		fileBuf[MAXPATHL];
+***************
+*** 3238,3244 ****
+  	fileBuf[0] = NUL;
+      else
+      {
+! 	wp = enc_to_ucs2(dflt, NULL);
+  	if (wp == NULL)
+  	    fileBuf[0] = NUL;
+  	else
+--- 3238,3244 ----
+  	fileBuf[0] = NUL;
+      else
+      {
+! 	wp = enc_to_utf16(dflt, NULL);
+  	if (wp == NULL)
+  	    fileBuf[0] = NUL;
+  	else
+***************
+*** 3263,3273 ****
+  #endif
+  
+      if (title != NULL)
+! 	titlep = enc_to_ucs2(title, NULL);
+      fileStruct.lpstrTitle = titlep;
+  
+      if (ext != NULL)
+! 	extp = enc_to_ucs2(ext, NULL);
+      fileStruct.lpstrDefExt = extp;
+  
+      fileStruct.lpstrFile = fileBuf;
+--- 3263,3273 ----
+  #endif
+  
+      if (title != NULL)
+! 	titlep = enc_to_utf16(title, NULL);
+      fileStruct.lpstrTitle = titlep;
+  
+      if (ext != NULL)
+! 	extp = enc_to_utf16(ext, NULL);
+      fileStruct.lpstrDefExt = extp;
+  
+      fileStruct.lpstrFile = fileBuf;
+***************
+*** 3278,3284 ****
+      if (initdir != NULL && *initdir != NUL)
+      {
+  	/* Must have backslashes here, no matter what 'shellslash' says */
+! 	initdirp = enc_to_ucs2(initdir, NULL);
+  	if (initdirp != NULL)
+  	{
+  	    for (wp = initdirp; *wp != NUL; ++wp)
+--- 3278,3284 ----
+      if (initdir != NULL && *initdir != NUL)
+      {
+  	/* Must have backslashes here, no matter what 'shellslash' says */
+! 	initdirp = enc_to_utf16(initdir, NULL);
+  	if (initdirp != NULL)
+  	{
+  	    for (wp = initdirp; *wp != NUL; ++wp)
+***************
+*** 3318,3324 ****
+      vim_free(extp);
+  
+      /* Convert from UCS2 to 'encoding'. */
+!     p = ucs2_to_enc(fileBuf, NULL);
+      if (p != NULL)
+  	/* when out of memory we get garbage for non-ASCII chars */
+  	STRCPY(fileBuf, p);
+--- 3318,3324 ----
+      vim_free(extp);
+  
+      /* Convert from UCS2 to 'encoding'. */
+!     p = utf16_to_enc(fileBuf, NULL);
+      if (p != NULL)
+  	/* when out of memory we get garbage for non-ASCII chars */
+  	STRCPY(fileBuf, p);
+***************
+*** 3518,3524 ****
+  	{
+  #ifdef FEAT_MBYTE
+  	    if (DragQueryFileW(hDrop, i, wszFile, BUFPATHLEN) > 0)
+! 		fnames[i] = ucs2_to_enc(wszFile, NULL);
+  	    else
+  #endif
+  	    {
+--- 3518,3524 ----
+  	{
+  #ifdef FEAT_MBYTE
+  	    if (DragQueryFileW(hDrop, i, wszFile, BUFPATHLEN) > 0)
+! 		fnames[i] = utf16_to_enc(wszFile, NULL);
+  	    else
+  #endif
+  	    {
+*** ../vim-7.2.048/src/mbyte.c	Thu Nov 20 11:55:53 2008
+--- src/mbyte.c	Thu Nov 20 16:47:41 2008
+***************
+*** 6101,6107 ****
+  
+  	    /* 1. codepage/UTF-8  ->  ucs-2. */
+  	    if (vcp->vc_cpfrom == 0)
+! 		tmp_len = utf8_to_ucs2(ptr, len, NULL, NULL);
+  	    else
+  		tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, 0,
+  							      ptr, len, 0, 0);
+--- 6101,6107 ----
+  
+  	    /* 1. codepage/UTF-8  ->  ucs-2. */
+  	    if (vcp->vc_cpfrom == 0)
+! 		tmp_len = utf8_to_utf16(ptr, len, NULL, NULL);
+  	    else
+  		tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, 0,
+  							      ptr, len, 0, 0);
+***************
+*** 6109,6121 ****
+  	    if (tmp == NULL)
+  		break;
+  	    if (vcp->vc_cpfrom == 0)
+! 		utf8_to_ucs2(ptr, len, tmp, unconvlenp);
+  	    else
+  		MultiByteToWideChar(vcp->vc_cpfrom, 0, ptr, len, tmp, tmp_len);
+  
+  	    /* 2. ucs-2  ->  codepage/UTF-8. */
+  	    if (vcp->vc_cpto == 0)
+! 		retlen = ucs2_to_utf8(tmp, tmp_len, NULL);
+  	    else
+  		retlen = WideCharToMultiByte(vcp->vc_cpto, 0,
+  						    tmp, tmp_len, 0, 0, 0, 0);
+--- 6109,6121 ----
+  	    if (tmp == NULL)
+  		break;
+  	    if (vcp->vc_cpfrom == 0)
+! 		utf8_to_utf16(ptr, len, tmp, unconvlenp);
+  	    else
+  		MultiByteToWideChar(vcp->vc_cpfrom, 0, ptr, len, tmp, tmp_len);
+  
+  	    /* 2. ucs-2  ->  codepage/UTF-8. */
+  	    if (vcp->vc_cpto == 0)
+! 		retlen = utf16_to_utf8(tmp, tmp_len, NULL);
+  	    else
+  		retlen = WideCharToMultiByte(vcp->vc_cpto, 0,
+  						    tmp, tmp_len, 0, 0, 0, 0);
+***************
+*** 6123,6129 ****
+  	    if (retval != NULL)
+  	    {
+  		if (vcp->vc_cpto == 0)
+! 		    ucs2_to_utf8(tmp, tmp_len, retval);
+  		else
+  		    WideCharToMultiByte(vcp->vc_cpto, 0,
+  					  tmp, tmp_len, retval, retlen, 0, 0);
+--- 6123,6129 ----
+  	    if (retval != NULL)
+  	    {
+  		if (vcp->vc_cpto == 0)
+! 		    utf16_to_utf8(tmp, tmp_len, retval);
+  		else
+  		    WideCharToMultiByte(vcp->vc_cpto, 0,
+  					  tmp, tmp_len, retval, retlen, 0, 0);
+*** ../vim-7.2.048/src/misc1.c	Sun Nov  9 13:43:25 2008
+--- src/misc1.c	Thu Nov 20 16:42:59 2008
+***************
+*** 8728,8734 ****
+  	/* The active codepage differs from 'encoding'.  Attempt using the
+  	 * wide function.  If it fails because it is not implemented fall back
+  	 * to the non-wide version (for Windows 98) */
+! 	wn = enc_to_ucs2(buf, NULL);
+  	if (wn != NULL)
+  	{
+  	    hFind = FindFirstFileW(wn, &wfb);
+--- 8728,8734 ----
+  	/* The active codepage differs from 'encoding'.  Attempt using the
+  	 * wide function.  If it fails because it is not implemented fall back
+  	 * to the non-wide version (for Windows 98) */
+! 	wn = enc_to_utf16(buf, NULL);
+  	if (wn != NULL)
+  	{
+  	    hFind = FindFirstFileW(wn, &wfb);
+***************
+*** 8756,8762 ****
+  #ifdef WIN3264
+  # ifdef FEAT_MBYTE
+  	if (wn != NULL)
+! 	    p = ucs2_to_enc(wfb.cFileName, NULL);   /* p is allocated here */
+  	else
+  # endif
+  	    p = (char_u *)fb.cFileName;
+--- 8756,8762 ----
+  #ifdef WIN3264
+  # ifdef FEAT_MBYTE
+  	if (wn != NULL)
+! 	    p = utf16_to_enc(wfb.cFileName, NULL);   /* p is allocated here */
+  	else
+  # endif
+  	    p = (char_u *)fb.cFileName;
+***************
+*** 8830,8836 ****
+  	    if (wn != NULL)
+  	    {
+  		vim_free(wn);
+! 		wn = enc_to_ucs2(buf, NULL);
+  		if (wn != NULL)
+  		    hFind = FindFirstFileW(wn, &wfb);
+  	    }
+--- 8830,8836 ----
+  	    if (wn != NULL)
+  	    {
+  		vim_free(wn);
+! 		wn = enc_to_utf16(buf, NULL);
+  		if (wn != NULL)
+  		    hFind = FindFirstFileW(wn, &wfb);
+  	    }
+*** ../vim-7.2.048/src/os_mswin.c	Sat Aug  9 19:37:30 2008
+--- src/os_mswin.c	Thu Nov 20 17:05:10 2008
+***************
+*** 309,315 ****
+  	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+  	{
+  	    /* Convert the title from 'encoding' to the active codepage. */
+! 	    WCHAR	*wp = enc_to_ucs2(title, NULL);
+  	    int	n;
+  
+  	    if (wp != NULL)
+--- 309,315 ----
+  	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+  	{
+  	    /* Convert the title from 'encoding' to the active codepage. */
+! 	    WCHAR	*wp = enc_to_utf16(title, NULL);
+  	    int	n;
+  
+  	    if (wp != NULL)
+***************
+*** 406,415 ****
+  	     * - invoke _wfullpath()
+  	     * - convert the result from UCS2 to 'encoding'.
+  	     */
+! 	    wname = enc_to_ucs2(fname, NULL);
+  	    if (wname != NULL && _wfullpath(wbuf, wname, MAX_PATH - 1) != NULL)
+  	    {
+! 		cname = ucs2_to_enc((short_u *)wbuf, NULL);
+  		if (cname != NULL)
+  		{
+  		    vim_strncpy(buf, cname, len - 1);
+--- 406,415 ----
+  	     * - invoke _wfullpath()
+  	     * - convert the result from UCS2 to 'encoding'.
+  	     */
+! 	    wname = enc_to_utf16(fname, NULL);
+  	    if (wname != NULL && _wfullpath(wbuf, wname, MAX_PATH - 1) != NULL)
+  	    {
+! 		cname = utf16_to_enc((short_u *)wbuf, NULL);
+  		if (cname != NULL)
+  		{
+  		    vim_strncpy(buf, cname, len - 1);
+***************
+*** 507,513 ****
+  # endif
+         )
+      {
+! 	WCHAR	*wp = enc_to_ucs2(buf, NULL);
+  	int	n;
+  
+  	if (wp != NULL)
+--- 507,513 ----
+  # endif
+         )
+      {
+! 	WCHAR	*wp = enc_to_utf16(buf, NULL);
+  	int	n;
+  
+  	if (wp != NULL)
+***************
+*** 668,674 ****
+  #ifdef FEAT_MBYTE
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	WCHAR	*p = enc_to_ucs2(path, NULL);
+  	int	n;
+  
+  	if (p != NULL)
+--- 668,674 ----
+  #ifdef FEAT_MBYTE
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	WCHAR	*p = enc_to_utf16(path, NULL);
+  	int	n;
+  
+  	if (p != NULL)
+***************
+*** 891,909 ****
+  
+  #if defined(FEAT_MBYTE) || defined(PROTO)
+  /*
+!  * Convert an UTF-8 string to UCS-2.
+   * "instr[inlen]" is the input.  "inlen" is in bytes.
+!  * When "outstr" is NULL only return the number of UCS-2 words produced.
+   * Otherwise "outstr" must be a buffer of sufficient size.
+!  * Returns the number of UCS-2 words produced.
+   */
+      int
+! utf8_to_ucs2(char_u *instr, int inlen, short_u *outstr, int *unconvlenp)
+  {
+      int		outlen = 0;
+      char_u	*p = instr;
+      int		todo = inlen;
+      int		l;
+  
+      while (todo > 0)
+      {
+--- 891,910 ----
+  
+  #if defined(FEAT_MBYTE) || defined(PROTO)
+  /*
+!  * Convert an UTF-8 string to UTF-16.
+   * "instr[inlen]" is the input.  "inlen" is in bytes.
+!  * When "outstr" is NULL only return the number of UTF-16 words produced.
+   * Otherwise "outstr" must be a buffer of sufficient size.
+!  * Returns the number of UTF-16 words produced.
+   */
+      int
+! utf8_to_utf16(char_u *instr, int inlen, short_u *outstr, int *unconvlenp)
+  {
+      int		outlen = 0;
+      char_u	*p = instr;
+      int		todo = inlen;
+      int		l;
++     int		ch;
+  
+      while (todo > 0)
+      {
+***************
+*** 917,924 ****
+  	    break;
+  	}
+  
+! 	if (outstr != NULL)
+! 	    *outstr++ = utf_ptr2char(p);
+  	++outlen;
+  	p += l;
+  	todo -= l;
+--- 918,936 ----
+  	    break;
+  	}
+  
+! 	ch = utf_ptr2char(p);
+! 	if (ch >= 0x10000)
+! 	{
+! 	    /* non-BMP character, encoding with surrogate pairs */
+! 	    ++outlen;
+! 	    if (outstr != NULL)
+! 	    {
+! 		*outstr++ = (0xD800 - (0x10000 >> 10)) + (ch >> 10);
+! 		*outstr++ = 0xDC00 | (ch & 0x3FF);
+! 	    }
+! 	}
+! 	else if (outstr != NULL)
+! 	    *outstr++ = ch;
+  	++outlen;
+  	p += l;
+  	todo -= l;
+***************
+*** 928,956 ****
+  }
+  
+  /*
+!  * Convert an UCS-2 string to UTF-8.
+!  * The input is "instr[inlen]" with "inlen" in number of ucs-2 words.
+   * When "outstr" is NULL only return the required number of bytes.
+   * Otherwise "outstr" must be a buffer of sufficient size.
+   * Return the number of bytes produced.
+   */
+      int
+! ucs2_to_utf8(short_u *instr, int inlen, char_u *outstr)
+  {
+      int		outlen = 0;
+      int		todo = inlen;
+      short_u	*p = instr;
+      int		l;
+  
+      while (todo > 0)
+      {
+  	if (outstr != NULL)
+  	{
+! 	    l = utf_char2bytes(*p, outstr);
+  	    outstr += l;
+  	}
+  	else
+! 	    l = utf_char2len(*p);
+  	++p;
+  	outlen += l;
+  	--todo;
+--- 940,981 ----
+  }
+  
+  /*
+!  * Convert an UTF-16 string to UTF-8.
+!  * The input is "instr[inlen]" with "inlen" in number of UTF-16 words.
+   * When "outstr" is NULL only return the required number of bytes.
+   * Otherwise "outstr" must be a buffer of sufficient size.
+   * Return the number of bytes produced.
+   */
+      int
+! utf16_to_utf8(short_u *instr, int inlen, char_u *outstr)
+  {
+      int		outlen = 0;
+      int		todo = inlen;
+      short_u	*p = instr;
+      int		l;
++     int		ch, ch2;
+  
+      while (todo > 0)
+      {
++ 	ch = *p;
++ 	if (ch >= 0xD800 && ch <= 0xDBFF && todo > 1)
++ 	{
++ 	    /* surrogate pairs handling */
++ 	    ch2 = p[1];
++ 	    if (ch2 >= 0xDC00 && ch2 <= 0xDFFF)
++ 	    {
++ 		ch = ((ch - 0xD800) << 10) + (ch2 & 0x3FF) + 0x10000;
++ 		++p;
++ 		--todo;
++ 	    }
++ 	}
+  	if (outstr != NULL)
+  	{
+! 	    l = utf_char2bytes(ch, outstr);
+  	    outstr += l;
+  	}
+  	else
+! 	    l = utf_char2len(ch);
+  	++p;
+  	outlen += l;
+  	--todo;
+***************
+*** 1079,1092 ****
+   */
+  
+  /*
+!  * Convert "str" from 'encoding' to UCS-2.
+   * Input in "str" with length "*lenp".  When "lenp" is NULL, use strlen().
+   * Output is returned as an allocated string.  "*lenp" is set to the length of
+   * the result.  A trailing NUL is always added.
+   * Returns NULL when out of memory.
+   */
+      short_u *
+! enc_to_ucs2(char_u *str, int *lenp)
+  {
+      vimconv_T	conv;
+      WCHAR	*ret;
+--- 1104,1117 ----
+   */
+  
+  /*
+!  * Convert "str" from 'encoding' to UTF-16.
+   * Input in "str" with length "*lenp".  When "lenp" is NULL, use strlen().
+   * Output is returned as an allocated string.  "*lenp" is set to the length of
+   * the result.  A trailing NUL is always added.
+   * Returns NULL when out of memory.
+   */
+      short_u *
+! enc_to_utf16(char_u *str, int *lenp)
+  {
+      vimconv_T	conv;
+      WCHAR	*ret;
+***************
+*** 1102,1108 ****
+  
+      if (enc_codepage > 0)
+      {
+! 	/* We can do any CP### -> UCS-2 in one pass, and we can do it
+  	 * without iconv() (convert_* may need iconv). */
+  	MultiByteToWideChar_alloc(enc_codepage, 0, str, *lenp, &ret, &length);
+      }
+--- 1127,1133 ----
+  
+      if (enc_codepage > 0)
+      {
+! 	/* We can do any CP### -> UTF-16 in one pass, and we can do it
+  	 * without iconv() (convert_* may need iconv). */
+  	MultiByteToWideChar_alloc(enc_codepage, 0, str, *lenp, &ret, &length);
+      }
+***************
+*** 1123,1133 ****
+  	}
+  	convert_setup(&conv, NULL, NULL);
+  
+! 	length = utf8_to_ucs2(str, *lenp, NULL, NULL);
+  	ret = (WCHAR *)alloc((unsigned)((length + 1) * sizeof(WCHAR)));
+  	if (ret != NULL)
+  	{
+! 	    utf8_to_ucs2(str, *lenp, (short_u *)ret, NULL);
+  	    ret[length] = 0;
+  	}
+  
+--- 1148,1158 ----
+  	}
+  	convert_setup(&conv, NULL, NULL);
+  
+! 	length = utf8_to_utf16(str, *lenp, NULL, NULL);
+  	ret = (WCHAR *)alloc((unsigned)((length + 1) * sizeof(WCHAR)));
+  	if (ret != NULL)
+  	{
+! 	    utf8_to_utf16(str, *lenp, (short_u *)ret, NULL);
+  	    ret[length] = 0;
+  	}
+  
+***************
+*** 1139,1145 ****
+  }
+  
+  /*
+!  * Convert an UCS-2 string to 'encoding'.
+   * Input in "str" with length (counted in wide characters) "*lenp".  When
+   * "lenp" is NULL, use wcslen().
+   * Output is returned as an allocated string.  If "*lenp" is not NULL it is
+--- 1164,1170 ----
+  }
+  
+  /*
+!  * Convert an UTF-16 string to 'encoding'.
+   * Input in "str" with length (counted in wide characters) "*lenp".  When
+   * "lenp" is NULL, use wcslen().
+   * Output is returned as an allocated string.  If "*lenp" is not NULL it is
+***************
+*** 1147,1153 ****
+   * Returns NULL when out of memory.
+   */
+      char_u *
+! ucs2_to_enc(short_u *str, int *lenp)
+  {
+      vimconv_T	conv;
+      char_u	*utf8_str = NULL, *enc_str = NULL;
+--- 1172,1178 ----
+   * Returns NULL when out of memory.
+   */
+      char_u *
+! utf16_to_enc(short_u *str, int *lenp)
+  {
+      vimconv_T	conv;
+      char_u	*utf8_str = NULL, *enc_str = NULL;
+***************
+*** 1161,1167 ****
+  
+      if (enc_codepage > 0)
+      {
+! 	/* We can do any UCS-2 -> CP### in one pass. */
+  	int length;
+  
+  	WideCharToMultiByte_alloc(enc_codepage, 0, str, *lenp,
+--- 1186,1192 ----
+  
+      if (enc_codepage > 0)
+      {
+! 	/* We can do any UTF-16 -> CP### in one pass. */
+  	int length;
+  
+  	WideCharToMultiByte_alloc(enc_codepage, 0, str, *lenp,
+***************
+*** 1171,1180 ****
+      }
+  
+      /* Avoid allocating zero bytes, it generates an error message. */
+!     utf8_str = alloc(ucs2_to_utf8(str, *lenp == 0 ? 1 : *lenp, NULL));
+      if (utf8_str != NULL)
+      {
+! 	*lenp = ucs2_to_utf8(str, *lenp, utf8_str);
+  
+  	/* We might be called before we have p_enc set up. */
+  	conv.vc_type = CONV_NONE;
+--- 1196,1205 ----
+      }
+  
+      /* Avoid allocating zero bytes, it generates an error message. */
+!     utf8_str = alloc(utf16_to_utf8(str, *lenp == 0 ? 1 : *lenp, NULL));
+      if (utf8_str != NULL)
+      {
+! 	*lenp = utf16_to_utf8(str, *lenp, utf8_str);
+  
+  	/* We might be called before we have p_enc set up. */
+  	conv.vc_type = CONV_NONE;
+***************
+*** 1308,1314 ****
+  		    if (hMemWstr[str_size] == NUL)
+  			break;
+  	    }
+! 	    to_free = str = ucs2_to_enc((short_u *)hMemWstr, &str_size);
+  	    GlobalUnlock(hMemW);
+  	}
+      }
+--- 1333,1339 ----
+  		    if (hMemWstr[str_size] == NUL)
+  			break;
+  	    }
+! 	    to_free = str = utf16_to_enc((short_u *)hMemWstr, &str_size);
+  	    GlobalUnlock(hMemW);
+  	}
+      }
+***************
+*** 1340,1346 ****
+  
+  # if defined(FEAT_MBYTE) && defined(WIN3264)
+  	    /* The text is in the active codepage.  Convert to 'encoding',
+! 	     * going through UCS-2. */
+  	    acp_to_enc(str, str_size, &to_free, &maxlen);
+  	    if (to_free != NULL)
+  	    {
+--- 1365,1371 ----
+  
+  # if defined(FEAT_MBYTE) && defined(WIN3264)
+  	    /* The text is in the active codepage.  Convert to 'encoding',
+! 	     * going through UTF-16. */
+  	    acp_to_enc(str, str_size, &to_free, &maxlen);
+  	    if (to_free != NULL)
+  	    {
+***************
+*** 1404,1410 ****
+      if (widestr != NULL)
+      {
+  	++*outlen;	/* Include the 0 after the string */
+! 	*out = ucs2_to_enc((short_u *)widestr, outlen);
+  	vim_free(widestr);
+      }
+  }
+--- 1429,1435 ----
+      if (widestr != NULL)
+      {
+  	++*outlen;	/* Include the 0 after the string */
+! 	*out = utf16_to_enc((short_u *)widestr, outlen);
+  	vim_free(widestr);
+      }
+  }
+***************
+*** 1466,1474 ****
+  	WCHAR		*out;
+  	int		len = metadata.txtlen;
+  
+! 	/* Convert the text to UCS-2. This is put on the clipboard as
+  	 * CF_UNICODETEXT. */
+! 	out = (WCHAR *)enc_to_ucs2(str, &len);
+  	if (out != NULL)
+  	{
+  	    WCHAR *lpszMemW;
+--- 1491,1499 ----
+  	WCHAR		*out;
+  	int		len = metadata.txtlen;
+  
+! 	/* Convert the text to UTF-16. This is put on the clipboard as
+  	 * CF_UNICODETEXT. */
+! 	out = (WCHAR *)enc_to_utf16(str, &len);
+  	if (out != NULL)
+  	{
+  	    WCHAR *lpszMemW;
+***************
+*** 1488,1494 ****
+  	    WideCharToMultiByte(GetACP(), 0, out, len,
+  						  str, metadata.txtlen, 0, 0);
+  
+! 	    /* Allocate memory for the UCS-2 text, add one NUL word to
+  	     * terminate the string. */
+  	    hMemW = (LPSTR)GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE,
+  						   (len + 1) * sizeof(WCHAR));
+--- 1513,1519 ----
+  	    WideCharToMultiByte(GetACP(), 0, out, len,
+  						  str, metadata.txtlen, 0, 0);
+  
+! 	    /* Allocate memory for the UTF-16 text, add one NUL word to
+  	     * terminate the string. */
+  	    hMemW = (LPSTR)GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE,
+  						   (len + 1) * sizeof(WCHAR));
+*** ../vim-7.2.048/src/os_win32.c	Thu Jul 24 20:50:30 2008
+--- src/os_win32.c	Thu Nov 20 16:44:33 2008
+***************
+*** 1587,1593 ****
+  #ifdef FEAT_MBYTE
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	WCHAR	*p = enc_to_ucs2(name, NULL);
+  	WCHAR	fnamew[_MAX_PATH];
+  	WCHAR	*dumw;
+  	long	n;
+--- 1587,1593 ----
+  #ifdef FEAT_MBYTE
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	WCHAR	*p = enc_to_utf16(name, NULL);
+  	WCHAR	fnamew[_MAX_PATH];
+  	WCHAR	*dumw;
+  	long	n;
+***************
+*** 2440,2446 ****
+  
+  	if (GetCurrentDirectoryW(_MAX_PATH, wbuf) != 0)
+  	{
+! 	    char_u  *p = ucs2_to_enc(wbuf, NULL);
+  
+  	    if (p != NULL)
+  	    {
+--- 2440,2446 ----
+  
+  	if (GetCurrentDirectoryW(_MAX_PATH, wbuf) != 0)
+  	{
+! 	    char_u  *p = utf16_to_enc(wbuf, NULL);
+  
+  	    if (p != NULL)
+  	    {
+***************
+*** 2466,2472 ****
+  #ifdef FEAT_MBYTE
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	WCHAR	*p = enc_to_ucs2(name, NULL);
+  	long	n;
+  
+  	if (p != NULL)
+--- 2466,2472 ----
+  #ifdef FEAT_MBYTE
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	WCHAR	*p = enc_to_utf16(name, NULL);
+  	long	n;
+  
+  	if (p != NULL)
+***************
+*** 2495,2501 ****
+  #ifdef FEAT_MBYTE
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	WCHAR	*p = enc_to_ucs2(name, NULL);
+  	long	n;
+  
+  	if (p != NULL)
+--- 2495,2501 ----
+  #ifdef FEAT_MBYTE
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	WCHAR	*p = enc_to_utf16(name, NULL);
+  	long	n;
+  
+  	if (p != NULL)
+***************
+*** 2522,2528 ****
+      WCHAR	*p = NULL;
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+! 	p = enc_to_ucs2(name, NULL);
+  #endif
+  
+  #ifdef FEAT_MBYTE
+--- 2522,2528 ----
+      WCHAR	*p = NULL;
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+! 	p = enc_to_utf16(name, NULL);
+  #endif
+  
+  #ifdef FEAT_MBYTE
+***************
+*** 2590,2596 ****
+      WCHAR	*wn = NULL;
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+! 	wn = enc_to_ucs2(fname, NULL);
+      if (wn != NULL)
+      {
+  	hFile = CreateFileW(wn,		/* file name */
+--- 2590,2596 ----
+      WCHAR	*wn = NULL;
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+! 	wn = enc_to_utf16(fname, NULL);
+      if (wn != NULL)
+      {
+  	hFile = CreateFileW(wn,		/* file name */
+***************
+*** 4239,4245 ****
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	wn = enc_to_ucs2(name, NULL);
+  	if (wn != NULL)
+  	{
+  	    SetFileAttributesW(wn, FILE_ATTRIBUTE_NORMAL);
+--- 4239,4245 ----
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	wn = enc_to_utf16(name, NULL);
+  	if (wn != NULL)
+  	{
+  	    SetFileAttributesW(wn, FILE_ATTRIBUTE_NORMAL);
+***************
+*** 4382,4389 ****
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	wold = enc_to_ucs2((char_u *)pszOldFile, NULL);
+! 	wnew = enc_to_ucs2((char_u *)pszNewFile, NULL);
+  	if (wold != NULL && wnew != NULL)
+  	    retval = mch_wrename(wold, wnew);
+  	vim_free(wold);
+--- 4382,4389 ----
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	wold = enc_to_utf16((char_u *)pszOldFile, NULL);
+! 	wnew = enc_to_utf16((char_u *)pszNewFile, NULL);
+  	if (wold != NULL && wnew != NULL)
+  	    retval = mch_wrename(wold, wnew);
+  	vim_free(wold);
+***************
+*** 4492,4498 ****
+      WCHAR	*wn = NULL;
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+! 	wn = enc_to_ucs2(n, NULL);
+  #endif
+  
+      if (mch_isdir(n))
+--- 4492,4498 ----
+      WCHAR	*wn = NULL;
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+! 	wn = enc_to_utf16(n, NULL);
+  #endif
+  
+      if (mch_isdir(n))
+***************
+*** 4618,4624 ****
+  
+  #if defined(FEAT_MBYTE) || defined(PROTO)
+  /*
+!  * Version of open() that may use ucs2 file name.
+   */
+      int
+  mch_open(char *name, int flags, int mode)
+--- 4618,4624 ----
+  
+  #if defined(FEAT_MBYTE) || defined(PROTO)
+  /*
+!  * Version of open() that may use UTF-16 file name.
+   */
+      int
+  mch_open(char *name, int flags, int mode)
+***************
+*** 4630,4636 ****
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	wn = enc_to_ucs2(name, NULL);
+  	if (wn != NULL)
+  	{
+  	    f = _wopen(wn, flags, mode);
+--- 4630,4636 ----
+  
+      if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+! 	wn = enc_to_utf16(name, NULL);
+  	if (wn != NULL)
+  	{
+  	    f = _wopen(wn, flags, mode);
+***************
+*** 4648,4654 ****
+  }
+  
+  /*
+!  * Version of fopen() that may use ucs2 file name.
+   */
+      FILE *
+  mch_fopen(char *name, char *mode)
+--- 4648,4654 ----
+  }
+  
+  /*
+!  * Version of fopen() that may use UTF-16 file name.
+   */
+      FILE *
+  mch_fopen(char *name, char *mode)
+***************
+*** 4675,4682 ****
+  	else if (newMode == 'b')
+  	    _set_fmode(_O_BINARY);
+  # endif
+! 	wn = enc_to_ucs2(name, NULL);
+! 	wm = enc_to_ucs2(mode, NULL);
+  	if (wn != NULL && wm != NULL)
+  	    f = _wfopen(wn, wm);
+  	vim_free(wn);
+--- 4675,4682 ----
+  	else if (newMode == 'b')
+  	    _set_fmode(_O_BINARY);
+  # endif
+! 	wn = enc_to_utf16(name, NULL);
+! 	wm = enc_to_utf16(mode, NULL);
+  	if (wn != NULL && wm != NULL)
+  	    f = _wfopen(wn, wm);
+  	vim_free(wn);
+***************
+*** 4776,4783 ****
+      int			len;
+  
+      /* Convert the file names to wide characters. */
+!     fromw = enc_to_ucs2(from, NULL);
+!     tow = enc_to_ucs2(to, NULL);
+      if (fromw != NULL && tow != NULL)
+      {
+  	/* Open the file for reading. */
+--- 4776,4783 ----
+      int			len;
+  
+      /* Convert the file names to wide characters. */
+!     fromw = enc_to_utf16(from, NULL);
+!     tow = enc_to_utf16(to, NULL);
+      if (fromw != NULL && tow != NULL)
+      {
+  	/* Open the file for reading. */
+***************
+*** 5122,5128 ****
+      for (i = 0; i < used_file_count; ++i)
+      {
+  	idx = used_file_indexes[i];
+! 	str = ucs2_to_enc(ArglistW[idx], NULL);
+  	if (str != NULL)
+  	{
+  #ifdef FEAT_DIFF
+--- 5122,5128 ----
+      for (i = 0; i < used_file_count; ++i)
+      {
+  	idx = used_file_indexes[i];
+! 	str = utf16_to_enc(ArglistW[idx], NULL);
+  	if (str != NULL)
+  	{
+  #ifdef FEAT_DIFF
+*** ../vim-7.2.048/src/proto/os_mswin.pro	Sat May  5 19:07:50 2007
+--- src/proto/os_mswin.pro	Thu Nov 20 16:41:00 2008
+***************
+*** 22,35 ****
+  int can_end_termcap_mode __ARGS((int give_msg));
+  int mch_screenmode __ARGS((char_u *arg));
+  int mch_libcall __ARGS((char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result));
+! int utf8_to_ucs2 __ARGS((char_u *instr, int inlen, short_u *outstr, int *unconvlenp));
+! int ucs2_to_utf8 __ARGS((short_u *instr, int inlen, char_u *outstr));
+  void MultiByteToWideChar_alloc __ARGS((UINT cp, DWORD flags, LPCSTR in, int inlen, LPWSTR *out, int *outlen));
+  void WideCharToMultiByte_alloc __ARGS((UINT cp, DWORD flags, LPCWSTR in, int inlen, LPSTR *out, int *outlen, LPCSTR def, LPBOOL useddef));
+  int clip_mch_own_selection __ARGS((VimClipboard *cbd));
+  void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
+! short_u *enc_to_ucs2 __ARGS((char_u *str, int *lenp));
+! char_u *ucs2_to_enc __ARGS((short_u *str, int *lenp));
+  void clip_mch_request_selection __ARGS((VimClipboard *cbd));
+  void acp_to_enc __ARGS((char_u *str, int str_size, char_u **out, int *outlen));
+  void clip_mch_set_selection __ARGS((VimClipboard *cbd));
+--- 22,35 ----
+  int can_end_termcap_mode __ARGS((int give_msg));
+  int mch_screenmode __ARGS((char_u *arg));
+  int mch_libcall __ARGS((char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result));
+! int utf8_to_utf16 __ARGS((char_u *instr, int inlen, short_u *outstr, int *unconvlenp));
+! int utf16_to_utf8 __ARGS((short_u *instr, int inlen, char_u *outstr));
+  void MultiByteToWideChar_alloc __ARGS((UINT cp, DWORD flags, LPCSTR in, int inlen, LPWSTR *out, int *outlen));
+  void WideCharToMultiByte_alloc __ARGS((UINT cp, DWORD flags, LPCWSTR in, int inlen, LPSTR *out, int *outlen, LPCSTR def, LPBOOL useddef));
+  int clip_mch_own_selection __ARGS((VimClipboard *cbd));
+  void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
+! short_u *enc_to_utf16 __ARGS((char_u *str, int *lenp));
+! char_u *utf16_to_enc __ARGS((short_u *str, int *lenp));
+  void clip_mch_request_selection __ARGS((VimClipboard *cbd));
+  void acp_to_enc __ARGS((char_u *str, int str_size, char_u **out, int *outlen));
+  void clip_mch_set_selection __ARGS((VimClipboard *cbd));
+*** ../vim-7.2.048/src/version.c	Thu Nov 20 16:11:03 2008
+--- src/version.c	Thu Nov 20 17:08:07 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     49,
+  /**/
+
+-- 
+FIRST HEAD: All right! All right! We'll kill him first and then have tea and
+            biscuits.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.050 b/source/ap/vim/patches/7.2.050
new file mode 100644
index 000000000..416d32b1e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.050
@@ -0,0 +1,316 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.050
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.050
+Problem:    Warnings for not checking return value of fwrite(). (Chip Campbell)
+Solution:   Use the return value.
+Files:	    src/spell.c
+
+
+*** ../vim-7.2.049/src/spell.c	Mon Aug 25 04:12:38 2008
+--- src/spell.c	Thu Nov 20 17:28:01 2008
+***************
+*** 7926,7931 ****
+--- 7926,7933 ----
+      char_u	*p;
+      int		rr;
+      int		retval = OK;
++     int		fwv = 1;  /* collect return value of fwrite() to avoid
++ 			     warnings from picky compiler */
+  
+      fd = mch_fopen((char *)fname, "w");
+      if (fd == NULL)
+***************
+*** 7936,7946 ****
+  
+      /* <HEADER>: <fileID> <versionnr> */
+  							    /* <fileID> */
+!     if (fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd) != 1)
+!     {
+! 	EMSG(_(e_write));
+! 	retval = FAIL;
+!     }
+      putc(VIMSPELLVERSION, fd);				    /* <versionnr> */
+  
+      /*
+--- 7938,7944 ----
+  
+      /* <HEADER>: <fileID> <versionnr> */
+  							    /* <fileID> */
+!     fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd);
+      putc(VIMSPELLVERSION, fd);				    /* <versionnr> */
+  
+      /*
+***************
+*** 7955,7961 ****
+  
+  	i = (int)STRLEN(spin->si_info);
+  	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
+! 	fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
+      }
+  
+      /* SN_REGION: <regionname> ...
+--- 7953,7959 ----
+  
+  	i = (int)STRLEN(spin->si_info);
+  	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
+! 	fwv &= fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
+      }
+  
+      /* SN_REGION: <regionname> ...
+***************
+*** 7966,7972 ****
+  	putc(SNF_REQUIRED, fd);				/* <sectionflags> */
+  	l = spin->si_region_count * 2;
+  	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
+! 	fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
+  							/* <regionname> ... */
+  	regionmask = (1 << spin->si_region_count) - 1;
+      }
+--- 7964,7970 ----
+  	putc(SNF_REQUIRED, fd);				/* <sectionflags> */
+  	l = spin->si_region_count * 2;
+  	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
+! 	fwv &= fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
+  							/* <regionname> ... */
+  	regionmask = (1 << spin->si_region_count) - 1;
+      }
+***************
+*** 8016,8022 ****
+  	}
+  
+  	put_bytes(fd, (long_u)l, 2);			/* <folcharslen> */
+! 	fwrite(folchars, (size_t)l, (size_t)1, fd);	/* <folchars> */
+      }
+  
+      /* SN_MIDWORD: <midword> */
+--- 8014,8020 ----
+  	}
+  
+  	put_bytes(fd, (long_u)l, 2);			/* <folcharslen> */
+! 	fwv &= fwrite(folchars, (size_t)l, (size_t)1, fd); /* <folchars> */
+      }
+  
+      /* SN_MIDWORD: <midword> */
+***************
+*** 8027,8033 ****
+  
+  	i = (int)STRLEN(spin->si_midword);
+  	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
+! 	fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); /* <midword> */
+      }
+  
+      /* SN_PREFCOND: <prefcondcnt> <prefcond> ... */
+--- 8025,8032 ----
+  
+  	i = (int)STRLEN(spin->si_midword);
+  	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
+! 	fwv &= fwrite(spin->si_midword, (size_t)i, (size_t)1, fd);
+! 							/* <midword> */
+      }
+  
+      /* SN_PREFCOND: <prefcondcnt> <prefcond> ... */
+***************
+*** 8113,8119 ****
+  		p = rr == 1 ? ftp->ft_from : ftp->ft_to;
+  		l = (int)STRLEN(p);
+  		putc(l, fd);
+! 		fwrite(p, l, (size_t)1, fd);
+  	    }
+  	}
+  
+--- 8112,8118 ----
+  		p = rr == 1 ? ftp->ft_from : ftp->ft_to;
+  		l = (int)STRLEN(p);
+  		putc(l, fd);
+! 		fwv &= fwrite(p, l, (size_t)1, fd);
+  	    }
+  	}
+  
+***************
+*** 8131,8141 ****
+  							/* <sectionlen> */
+  
+  	put_bytes(fd, (long_u)l, 2);			/* <sofofromlen> */
+! 	fwrite(spin->si_sofofr, l, (size_t)1, fd);	/* <sofofrom> */
+  
+  	l = (int)STRLEN(spin->si_sofoto);
+  	put_bytes(fd, (long_u)l, 2);			/* <sofotolen> */
+! 	fwrite(spin->si_sofoto, l, (size_t)1, fd);	/* <sofoto> */
+      }
+  
+      /* SN_WORDS: <word> ...
+--- 8130,8140 ----
+  							/* <sectionlen> */
+  
+  	put_bytes(fd, (long_u)l, 2);			/* <sofofromlen> */
+! 	fwv &= fwrite(spin->si_sofofr, l, (size_t)1, fd); /* <sofofrom> */
+  
+  	l = (int)STRLEN(spin->si_sofoto);
+  	put_bytes(fd, (long_u)l, 2);			/* <sofotolen> */
+! 	fwv &= fwrite(spin->si_sofoto, l, (size_t)1, fd); /* <sofoto> */
+      }
+  
+      /* SN_WORDS: <word> ...
+***************
+*** 8160,8166 ****
+  		    l = (int)STRLEN(hi->hi_key) + 1;
+  		    len += l;
+  		    if (round == 2)			/* <word> */
+! 			fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
+  		    --todo;
+  		}
+  	    if (round == 1)
+--- 8159,8165 ----
+  		    l = (int)STRLEN(hi->hi_key) + 1;
+  		    len += l;
+  		    if (round == 2)			/* <word> */
+! 			fwv &= fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
+  		    --todo;
+  		}
+  	    if (round == 1)
+***************
+*** 8176,8182 ****
+  	putc(0, fd);					/* <sectionflags> */
+  	l = spin->si_map.ga_len;
+  	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
+! 	fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
+  							/* <mapstr> */
+      }
+  
+--- 8175,8181 ----
+  	putc(0, fd);					/* <sectionflags> */
+  	l = spin->si_map.ga_len;
+  	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
+! 	fwv &= fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
+  							/* <mapstr> */
+      }
+  
+***************
+*** 8232,8241 ****
+  	{
+  	    p = ((char_u **)(spin->si_comppat.ga_data))[i];
+  	    putc((int)STRLEN(p), fd);			/* <comppatlen> */
+! 	    fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);/* <comppattext> */
+  	}
+  							/* <compflags> */
+! 	fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
+  							       (size_t)1, fd);
+      }
+  
+--- 8231,8241 ----
+  	{
+  	    p = ((char_u **)(spin->si_comppat.ga_data))[i];
+  	    putc((int)STRLEN(p), fd);			/* <comppatlen> */
+! 	    fwv &= fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);
+! 							/* <comppattext> */
+  	}
+  							/* <compflags> */
+! 	fwv &= fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
+  							       (size_t)1, fd);
+      }
+  
+***************
+*** 8259,8265 ****
+  
+  	l = (int)STRLEN(spin->si_syllable);
+  	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
+! 	fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); /* <syllable> */
+      }
+  
+      /* end of <SECTIONS> */
+--- 8259,8266 ----
+  
+  	l = (int)STRLEN(spin->si_syllable);
+  	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
+! 	fwv &= fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd);
+! 							/* <syllable> */
+      }
+  
+      /* end of <SECTIONS> */
+***************
+*** 8295,8307 ****
+  	(void)put_node(fd, tree, 0, regionmask, round == 3);
+      }
+  
+!     /* Write another byte to check for errors. */
+      if (putc(0, fd) == EOF)
+  	retval = FAIL;
+  
+      if (fclose(fd) == EOF)
+  	retval = FAIL;
+  
+      return retval;
+  }
+  
+--- 8296,8313 ----
+  	(void)put_node(fd, tree, 0, regionmask, round == 3);
+      }
+  
+!     /* Write another byte to check for errors (file system full). */
+      if (putc(0, fd) == EOF)
+  	retval = FAIL;
+  
+      if (fclose(fd) == EOF)
+  	retval = FAIL;
+  
++     if (fwv != 1)
++ 	retval = FAIL;
++     if (retval == FAIL)
++ 	EMSG(_(e_write));
++ 
+      return retval;
+  }
+  
+***************
+*** 9890,9895 ****
+--- 9896,9902 ----
+      char_u	*p;
+      int		len;
+      int		totlen;
++     int		x = 1;  /* collect return value of fwrite() */
+  
+      if (fd != NULL)
+  	put_bytes(fd, (long_u)gap->ga_len, 2);	    /* <prefcondcnt> */
+***************
+*** 9906,9912 ****
+  	    if (fd != NULL)
+  	    {
+  		fputc(len, fd);
+! 		fwrite(p, (size_t)len, (size_t)1, fd);
+  	    }
+  	    totlen += len;
+  	}
+--- 9913,9919 ----
+  	    if (fd != NULL)
+  	    {
+  		fputc(len, fd);
+! 		x &= fwrite(p, (size_t)len, (size_t)1, fd);
+  	    }
+  	    totlen += len;
+  	}
+*** ../vim-7.2.049/src/version.c	Thu Nov 20 17:09:09 2008
+--- src/version.c	Fri Nov 28 10:06:13 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     50,
+  /**/
+
+-- 
+You got to work at a mill?  Lucky!  I got sent back to work in the
+acid-mines for my daily crust of stale bread... which not even the
+birds would eat.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.051 b/source/ap/vim/patches/7.2.051
new file mode 100644
index 000000000..7c36dfe93
--- /dev/null
+++ b/source/ap/vim/patches/7.2.051
@@ -0,0 +1,411 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.051
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.051
+Problem:    Can't avoid 'wildignore' and 'suffixes' for glob() and globpath().
+Solution:   Add an extra argument to these functions. (Ingo Karkat)
+Files:	    src/eval.c, src/ex_getln.c, src/proto/ex_getln.pro,
+	    runtime/doc/eval.txt, runtime/doc/options.txt
+
+
+*** ../vim-7.2.050/src/eval.c	Thu Nov 20 16:11:03 2008
+--- src/eval.c	Thu Nov 27 22:15:40 2008
+***************
+*** 7564,7571 ****
+      {"getwinposx",	0, 0, f_getwinposx},
+      {"getwinposy",	0, 0, f_getwinposy},
+      {"getwinvar",	2, 2, f_getwinvar},
+!     {"glob",		1, 1, f_glob},
+!     {"globpath",	2, 2, f_globpath},
+      {"has",		1, 1, f_has},
+      {"has_key",		2, 2, f_has_key},
+      {"haslocaldir",	0, 0, f_haslocaldir},
+--- 7564,7571 ----
+      {"getwinposx",	0, 0, f_getwinposx},
+      {"getwinposy",	0, 0, f_getwinposy},
+      {"getwinvar",	2, 2, f_getwinvar},
+!     {"glob",		1, 2, f_glob},
+!     {"globpath",	2, 3, f_globpath},
+      {"has",		1, 1, f_has},
+      {"has_key",		2, 2, f_has_key},
+      {"haslocaldir",	0, 0, f_haslocaldir},
+***************
+*** 9557,9563 ****
+      else
+      {
+  	/* When the optional second argument is non-zero, don't remove matches
+! 	 * for 'suffixes' and 'wildignore' */
+  	if (argvars[1].v_type != VAR_UNKNOWN
+  				    && get_tv_number_chk(&argvars[1], &error))
+  	    flags |= WILD_KEEP_ALL;
+--- 9557,9563 ----
+      else
+      {
+  	/* When the optional second argument is non-zero, don't remove matches
+! 	 * for 'wildignore' and don't put matches for 'suffixes' at the end. */
+  	if (argvars[1].v_type != VAR_UNKNOWN
+  				    && get_tv_number_chk(&argvars[1], &error))
+  	    flags |= WILD_KEEP_ALL;
+***************
+*** 11323,11335 ****
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      expand_T	xpc;
+  
+!     ExpandInit(&xpc);
+!     xpc.xp_context = EXPAND_FILES;
+!     rettv->v_type = VAR_STRING;
+!     rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
+! 				     NULL, WILD_USE_NL|WILD_SILENT, WILD_ALL);
+  }
+  
+  /*
+--- 11323,11347 ----
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
++     int		flags = WILD_SILENT|WILD_USE_NL;
+      expand_T	xpc;
++     int		error = FALSE;
+  
+!     /* When the optional second argument is non-zero, don't remove matches
+!     * for 'wildignore' and don't put matches for 'suffixes' at the end. */
+!     if (argvars[1].v_type != VAR_UNKNOWN
+! 				&& get_tv_number_chk(&argvars[1], &error))
+! 	flags |= WILD_KEEP_ALL;
+!     rettv->v_type = VAR_STRING;
+!     if (!error)
+!     {
+! 	ExpandInit(&xpc);
+! 	xpc.xp_context = EXPAND_FILES;
+! 	rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
+! 						       NULL, flags, WILD_ALL);
+!     }
+!     else
+! 	rettv->vval.v_string = NULL;
+  }
+  
+  /*
+***************
+*** 11340,11353 ****
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      char_u	buf1[NUMBUFLEN];
+      char_u	*file = get_tv_string_buf_chk(&argvars[1], buf1);
+  
+      rettv->v_type = VAR_STRING;
+!     if (file == NULL)
+  	rettv->vval.v_string = NULL;
+      else
+! 	rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file);
+  }
+  
+  /*
+--- 11352,11373 ----
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
++     int		flags = 0;
+      char_u	buf1[NUMBUFLEN];
+      char_u	*file = get_tv_string_buf_chk(&argvars[1], buf1);
++     int		error = FALSE;
+  
++     /* When the optional second argument is non-zero, don't remove matches
++     * for 'wildignore' and don't put matches for 'suffixes' at the end. */
++     if (argvars[2].v_type != VAR_UNKNOWN
++ 				&& get_tv_number_chk(&argvars[2], &error))
++ 	flags |= WILD_KEEP_ALL;
+      rettv->v_type = VAR_STRING;
+!     if (file == NULL || error)
+  	rettv->vval.v_string = NULL;
+      else
+! 	rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file,
+! 								       flags);
+  }
+  
+  /*
+*** ../vim-7.2.050/src/ex_getln.c	Sat Nov 15 14:10:23 2008
+--- src/ex_getln.c	Thu Nov 20 18:37:20 2008
+***************
+*** 2524,2530 ****
+  	    && ccline.xpc->xp_context != EXPAND_NOTHING
+  	    && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL)
+      {
+! 	int i = ccline.xpc->xp_pattern - p;
+  
+  	/* If xp_pattern points inside the old cmdbuff it needs to be adjusted
+  	 * to point into the newly allocated memory. */
+--- 2524,2530 ----
+  	    && ccline.xpc->xp_context != EXPAND_NOTHING
+  	    && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL)
+      {
+! 	int i = (int)(ccline.xpc->xp_pattern - p);
+  
+  	/* If xp_pattern points inside the old cmdbuff it needs to be adjusted
+  	 * to point into the newly allocated memory. */
+***************
+*** 4897,4903 ****
+      if (s == NULL)
+  	return FAIL;
+      sprintf((char *)s, "%s/%s*.vim", dirname, pat);
+!     all = globpath(p_rtp, s);
+      vim_free(s);
+      if (all == NULL)
+  	return FAIL;
+--- 4897,4903 ----
+      if (s == NULL)
+  	return FAIL;
+      sprintf((char *)s, "%s/%s*.vim", dirname, pat);
+!     all = globpath(p_rtp, s, 0);
+      vim_free(s);
+      if (all == NULL)
+  	return FAIL;
+***************
+*** 4938,4946 ****
+   * newlines.  Returns NULL for an error or no matches.
+   */
+      char_u *
+! globpath(path, file)
+      char_u	*path;
+      char_u	*file;
+  {
+      expand_T	xpc;
+      char_u	*buf;
+--- 4938,4947 ----
+   * newlines.  Returns NULL for an error or no matches.
+   */
+      char_u *
+! globpath(path, file, expand_options)
+      char_u	*path;
+      char_u	*file;
++     int		expand_options;
+  {
+      expand_T	xpc;
+      char_u	*buf;
+***************
+*** 4969,4978 ****
+  	{
+  	    add_pathsep(buf);
+  	    STRCAT(buf, file);
+! 	    if (ExpandFromContext(&xpc, buf, &num_p, &p, WILD_SILENT) != FAIL
+! 								 && num_p > 0)
+  	    {
+! 		ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT);
+  		for (len = 0, i = 0; i < num_p; ++i)
+  		    len += (int)STRLEN(p[i]) + 1;
+  
+--- 4970,4979 ----
+  	{
+  	    add_pathsep(buf);
+  	    STRCAT(buf, file);
+! 	    if (ExpandFromContext(&xpc, buf, &num_p, &p,
+! 			     WILD_SILENT|expand_options) != FAIL && num_p > 0)
+  	    {
+! 		ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT|expand_options);
+  		for (len = 0, i = 0; i < num_p; ++i)
+  		    len += (int)STRLEN(p[i]) + 1;
+  
+*** ../vim-7.2.050/src/proto/ex_getln.pro	Wed May 28 16:49:01 2008
+--- src/proto/ex_getln.pro	Thu Nov 20 18:27:57 2008
+***************
+*** 31,37 ****
+  void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
+  int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches));
+  int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int))));
+! char_u *globpath __ARGS((char_u *path, char_u *file));
+  void init_history __ARGS((void));
+  int get_histtype __ARGS((char_u *name));
+  void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep));
+--- 31,37 ----
+  void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
+  int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches));
+  int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int))));
+! char_u *globpath __ARGS((char_u *path, char_u *file, int expand_options));
+  void init_history __ARGS((void));
+  int get_histtype __ARGS((char_u *name));
+  void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep));
+*** ../vim-7.2.050/runtime/doc/eval.txt	Sun Nov  9 13:43:25 2008
+--- runtime/doc/eval.txt	Thu Nov 27 22:17:13 2008
+***************
+*** 1,4 ****
+! *eval.txt*	For Vim version 7.2.  Last change: 2008 Nov 02
+  
+  
+  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt*	For Vim version 7.2.  Last change: 2008 Nov 27
+  
+  
+  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+***************
+*** 1706,1712 ****
+  exists( {expr})			Number	TRUE if {expr} exists
+  extend({expr1}, {expr2} [, {expr3}])
+  				List/Dict insert items of {expr2} into {expr1}
+! expand( {expr})			String	expand special keywords in {expr}
+  feedkeys( {string} [, {mode}])	Number	add key sequence to typeahead buffer
+  filereadable( {file})		Number	TRUE if {file} is a readable file
+  filewritable( {file})		Number	TRUE if {file} is a writable file
+--- 1709,1715 ----
+  exists( {expr})			Number	TRUE if {expr} exists
+  extend({expr1}, {expr2} [, {expr3}])
+  				List/Dict insert items of {expr2} into {expr1}
+! expand( {expr} [, {flag}])	String	expand special keywords in {expr}
+  feedkeys( {string} [, {mode}])	Number	add key sequence to typeahead buffer
+  filereadable( {file})		Number	TRUE if {file} is a readable file
+  filewritable( {file})		Number	TRUE if {file} is a writable file
+***************
+*** 1758,1765 ****
+  getwinposx()			Number	X coord in pixels of GUI Vim window
+  getwinposy()			Number	Y coord in pixels of GUI Vim window
+  getwinvar( {nr}, {varname})	any	variable {varname} in window {nr}
+! glob( {expr})			String	expand file wildcards in {expr}
+! globpath( {path}, {expr})	String	do glob({expr}) for all dirs in {path}
+  has( {feature})			Number	TRUE if feature {feature} supported
+  has_key( {dict}, {key})		Number	TRUE if {dict} has entry {key}
+  haslocaldir()			Number	TRUE if current window executed |:lcd|
+--- 1761,1769 ----
+  getwinposx()			Number	X coord in pixels of GUI Vim window
+  getwinposy()			Number	Y coord in pixels of GUI Vim window
+  getwinvar( {nr}, {varname})	any	variable {varname} in window {nr}
+! glob( {expr} [, {flag}])	String	expand file wildcards in {expr}
+! globpath( {path}, {expr} [, {flag}])
+! 				String	do glob({expr}) for all dirs in {path}
+  has( {feature})			Number	TRUE if feature {feature} supported
+  has_key( {dict}, {key})		Number	TRUE if {dict} has entry {key}
+  haslocaldir()			Number	TRUE if current window executed |:lcd|
+***************
+*** 3286,3299 ****
+  			:let list_is_on = getwinvar(2, '&list')
+  			:echo "myvar = " . getwinvar(1, 'myvar')
+  <
+! 							*glob()*
+! glob({expr})	Expand the file wildcards in {expr}.  See |wildcards| for the
+  		use of special characters.
+  		The result is a String.
+  		When there are several matches, they are separated by <NL>
+  		characters.
+! 		The 'wildignore' option applies: Names matching one of the
+! 		patterns in 'wildignore' will be skipped.
+  		If the expansion fails, the result is an empty string.
+  		A name for a non-existing file is not included.
+  
+--- 3290,3305 ----
+  			:let list_is_on = getwinvar(2, '&list')
+  			:echo "myvar = " . getwinvar(1, 'myvar')
+  <
+! glob({expr} [, {flag}])					*glob()*
+! 		Expand the file wildcards in {expr}.  See |wildcards| for the
+  		use of special characters.
+  		The result is a String.
+  		When there are several matches, they are separated by <NL>
+  		characters.
+! 		Unless the optional {flag} argument is given and is non-zero,
+! 		the 'suffixes' and 'wildignore' options apply: Names matching
+! 		one of the patterns in 'wildignore' will be skipped and
+! 		'suffixes' affect the ordering of matches.
+  		If the expansion fails, the result is an empty string.
+  		A name for a non-existing file is not included.
+  
+***************
+*** 3307,3326 ****
+  		See |expand()| for expanding special Vim variables.  See
+  		|system()| for getting the raw output of an external command.
+  
+! globpath({path}, {expr})				*globpath()*
+  		Perform glob() on all directories in {path} and concatenate
+  		the results.  Example: >
+  			:echo globpath(&rtp, "syntax/c.vim")
+  <		{path} is a comma-separated list of directory names.  Each
+  		directory name is prepended to {expr} and expanded like with
+! 		glob().  A path separator is inserted when needed.
+  		To add a comma inside a directory name escape it with a
+  		backslash.  Note that on MS-Windows a directory may have a
+  		trailing backslash, remove it if you put a comma after it.
+  		If the expansion fails for one of the directories, there is no
+  		error message.
+! 		The 'wildignore' option applies: Names matching one of the
+! 		patterns in 'wildignore' will be skipped.
+  
+  		The "**" item can be used to search in a directory tree.
+  		For example, to find all "README.txt" files in the directories
+--- 3313,3334 ----
+  		See |expand()| for expanding special Vim variables.  See
+  		|system()| for getting the raw output of an external command.
+  
+! globpath({path}, {expr} [, {flag}])			*globpath()*
+  		Perform glob() on all directories in {path} and concatenate
+  		the results.  Example: >
+  			:echo globpath(&rtp, "syntax/c.vim")
+  <		{path} is a comma-separated list of directory names.  Each
+  		directory name is prepended to {expr} and expanded like with
+! 		|glob()|.  A path separator is inserted when needed.
+  		To add a comma inside a directory name escape it with a
+  		backslash.  Note that on MS-Windows a directory may have a
+  		trailing backslash, remove it if you put a comma after it.
+  		If the expansion fails for one of the directories, there is no
+  		error message.
+! 		Unless the optional {flag} argument is given and is non-zero,
+! 		the 'suffixes' and 'wildignore' options apply: Names matching
+! 		one of the patterns in 'wildignore' will be skipped and
+! 		'suffixes' affect the ordering of matches.
+  
+  		The "**" item can be used to search in a directory tree.
+  		For example, to find all "README.txt" files in the directories
+*** ../vim-7.2.050/runtime/doc/options.txt	Sat Aug  9 19:36:49 2008
+--- runtime/doc/options.txt	Tue Nov 25 23:43:55 2008
+***************
+*** 1,4 ****
+! *options.txt*	For Vim version 7.2.  Last change: 2008 Aug 06
+  
+  
+  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+--- 1,4 ----
+! *options.txt*	For Vim version 7.2.  Last change: 2008 Nov 25
+  
+  
+  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+***************
+*** 7472,7478 ****
+  			{not available when compiled without the |+wildignore|
+  			feature}
+  	A list of file patterns.  A file that matches with one of these
+! 	patterns is ignored when completing file or directory names.
+  	The pattern is used like with |:autocmd|, see |autocmd-patterns|.
+  	Also see 'suffixes'.
+  	Example: >
+--- 7481,7489 ----
+  			{not available when compiled without the |+wildignore|
+  			feature}
+  	A list of file patterns.  A file that matches with one of these
+! 	patterns is ignored when completing file or directory names, and
+! 	influences the result of |expand()|, |glob()| and |globpath()| unless
+! 	a flag is passed to disable this.
+  	The pattern is used like with |:autocmd|, see |autocmd-patterns|.
+  	Also see 'suffixes'.
+  	Example: >
+*** ../vim-7.2.050/src/version.c	Fri Nov 28 10:08:05 2008
+--- src/version.c	Fri Nov 28 10:55:44 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     51,
+  /**/
+
+-- 
+Not too long ago, unzipping in public was illegal...
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.052 b/source/ap/vim/patches/7.2.052
new file mode 100644
index 000000000..eb331f348
--- /dev/null
+++ b/source/ap/vim/patches/7.2.052
@@ -0,0 +1,83 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.052
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.052
+Problem:    synIDattr() doesn't support "sp" for special color.
+Solution:   Recognize "sp" and "sp#".  (Matt Wozniski)
+Files:	    runtime/doc/eval.txt, src/eval.c
+
+
+*** ../vim-7.2.051/runtime/doc/eval.txt	Fri Nov 28 10:59:57 2008
+--- runtime/doc/eval.txt	Thu Nov 27 22:17:13 2008
+***************
+*** 5348,5357 ****
+  		"fg"		foreground color (GUI: color name used to set
+  				the color, cterm: color number as a string,
+  				term: empty string)
+! 		"bg"		background color (like "fg")
+  		"fg#"		like "fg", but for the GUI and the GUI is
+  				running the name in "#RRGGBB" form
+  		"bg#"		like "fg#" for "bg"
+  		"bold"		"1" if bold
+  		"italic"	"1" if italic
+  		"reverse"	"1" if reverse
+--- 5359,5370 ----
+  		"fg"		foreground color (GUI: color name used to set
+  				the color, cterm: color number as a string,
+  				term: empty string)
+! 		"bg"		background color (as with "fg")
+! 		"sp"		special color (as with "fg") |highlight-guisp|
+  		"fg#"		like "fg", but for the GUI and the GUI is
+  				running the name in "#RRGGBB" form
+  		"bg#"		like "fg#" for "bg"
++ 		"sp#"		like "fg#" for "sp"
+  		"bold"		"1" if bold
+  		"italic"	"1" if italic
+  		"reverse"	"1" if reverse
+*** ../vim-7.2.051/src/eval.c	Fri Nov 28 10:59:57 2008
+--- src/eval.c	Thu Nov 27 22:15:40 2008
+***************
+*** 16648,16655 ****
+  		p = highlight_has_attr(id, HL_INVERSE, modec);
+  		break;
+  
+! 	case 's':					/* standout */
+! 		p = highlight_has_attr(id, HL_STANDOUT, modec);
+  		break;
+  
+  	case 'u':
+--- 16648,16658 ----
+  		p = highlight_has_attr(id, HL_INVERSE, modec);
+  		break;
+  
+! 	case 's':
+! 		if (TOLOWER_ASC(what[1]) == 'p')	/* sp[#] */
+! 		    p = highlight_color(id, what, modec);
+! 		else					/* standout */
+! 		    p = highlight_has_attr(id, HL_STANDOUT, modec);
+  		break;
+  
+  	case 'u':
+*** ../vim-7.2.051/src/version.c	Fri Nov 28 10:59:57 2008
+--- src/version.c	Fri Nov 28 11:13:45 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     52,
+  /**/
+
+-- 
+Not too long ago, a keyboard was something to make music with...
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.053 b/source/ap/vim/patches/7.2.053
new file mode 100644
index 000000000..410d1666e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.053
@@ -0,0 +1,58 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.053
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.053
+Problem:    Crash when using WorkShop command ":ws foo". (Dominique Pelle)
+Solution:   Avoid using a NULL pointer.
+Files:	    src/workshop.c
+
+
+*** ../vim-7.2.052/src/workshop.c	Tue Jun 24 23:34:50 2008
+--- src/workshop.c	Thu Nov 27 22:31:27 2008
+***************
+*** 1121,1128 ****
+  				      ? (char *)curbuf->b_sfname : "<None>");
+  #endif
+  
+!     strcpy(ffname, (char *) curbuf->b_ffname);
+!     *filename = ffname;		/* copy so nobody can change b_ffname */
+      *curLine = curwin->w_cursor.lnum;
+      *curCol = curwin->w_cursor.col;
+  
+--- 1121,1132 ----
+  				      ? (char *)curbuf->b_sfname : "<None>");
+  #endif
+  
+!     if (curbuf->b_ffname == NULL)
+! 	ffname[0] = NUL;
+!     else
+! 	/* copy so nobody can change b_ffname */
+! 	strcpy(ffname, (char *) curbuf->b_ffname);
+!     *filename = ffname;
+      *curLine = curwin->w_cursor.lnum;
+      *curCol = curwin->w_cursor.col;
+  
+*** ../vim-7.2.052/src/version.c	Fri Nov 28 11:15:10 2008
+--- src/version.c	Fri Nov 28 11:44:23 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     53,
+  /**/
+
+-- 
+What the word 'politics' means: 'Poli' in Latin meaning 'many' and 'tics'
+meaning 'bloodsucking creatures'.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.054 b/source/ap/vim/patches/7.2.054
new file mode 100644
index 000000000..98ce9e8f9
--- /dev/null
+++ b/source/ap/vim/patches/7.2.054
@@ -0,0 +1,68 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.054
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.054
+Problem:    Compilation warnings for format in getchar.c.
+Solution:   Use fputs() instead of fprintf().  (Dominique Pelle)
+Files:	    src/getchar.c
+
+
+*** ../vim-7.2.053/src/getchar.c	Tue Jul 22 18:58:23 2008
+--- src/getchar.c	Thu Nov 27 22:38:24 2008
+***************
+*** 4702,4708 ****
+  			return FAIL;
+  		    if (mp->m_noremap != REMAP_YES && fprintf(fd, "nore") < 0)
+  			return FAIL;
+! 		    if (fprintf(fd, cmd) < 0)
+  			return FAIL;
+  		    if (buf != NULL && fputs(" <buffer>", fd) < 0)
+  			return FAIL;
+--- 4702,4708 ----
+  			return FAIL;
+  		    if (mp->m_noremap != REMAP_YES && fprintf(fd, "nore") < 0)
+  			return FAIL;
+! 		    if (fputs(cmd, fd) < 0)
+  			return FAIL;
+  		    if (buf != NULL && fputs(" <buffer>", fd) < 0)
+  			return FAIL;
+***************
+*** 4801,4807 ****
+  	    }
+  	    if (IS_SPECIAL(c) || modifiers)	/* special key */
+  	    {
+! 		if (fprintf(fd, (char *)get_special_key_name(c, modifiers)) < 0)
+  		    return FAIL;
+  		continue;
+  	    }
+--- 4801,4807 ----
+  	    }
+  	    if (IS_SPECIAL(c) || modifiers)	/* special key */
+  	    {
+! 		if (fputs((char *)get_special_key_name(c, modifiers), fd) < 0)
+  		    return FAIL;
+  		continue;
+  	    }
+*** ../vim-7.2.053/src/version.c	Fri Nov 28 11:47:14 2008
+--- src/version.c	Fri Nov 28 12:02:48 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     54,
+  /**/
+
+-- 
+Not too long ago, compress was something you did to garbage...
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.055 b/source/ap/vim/patches/7.2.055
new file mode 100644
index 000000000..ffab9a267
--- /dev/null
+++ b/source/ap/vim/patches/7.2.055
@@ -0,0 +1,1271 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.055
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.055
+Problem:    Various compiler warnings with strict checking.
+Solution:   Avoid the warnings by using return values and renaming.
+Files:	    src/diff.c, src/eval.c, src/ex_cmds.c, src/ex_docmd.c,
+	    src/fileio.c, src/fold.c, src/globals.h, src/gui.c,
+	    src/gui_at_sb.c, src/gui_gtk_x11.c, src/gui_xmdlg.c,
+	    src/gui_xmebw.c, src/main.c, src/mbyte.c, src/message.c,
+	    src/netbeans.c, src/option.c, src/os_unix.c, src/spell.c,
+	    src/ui.c, src/window.c
+
+
+*** ../vim-7.2.054/src/diff.c	Fri Jan 18 17:39:32 2008
+--- src/diff.c	Fri Nov 28 17:23:35 2008
+***************
+*** 661,666 ****
+--- 665,671 ----
+      char_u	*tmp_diff;
+      FILE	*fd;
+      int		ok;
++     int		io_error = FALSE;
+  
+      /* Delete all diffblocks. */
+      diff_clear(curtab);
+***************
+*** 697,714 ****
+      {
+  	ok = FALSE;
+  	fd = mch_fopen((char *)tmp_orig, "w");
+! 	if (fd != NULL)
+  	{
+! 	    fwrite("line1\n", (size_t)6, (size_t)1, fd);
+  	    fclose(fd);
+  	    fd = mch_fopen((char *)tmp_new, "w");
+! 	    if (fd != NULL)
+  	    {
+! 		fwrite("line2\n", (size_t)6, (size_t)1, fd);
+  		fclose(fd);
+  		diff_file(tmp_orig, tmp_new, tmp_diff);
+  		fd = mch_fopen((char *)tmp_diff, "r");
+! 		if (fd != NULL)
+  		{
+  		    char_u	linebuf[LBUFLEN];
+  
+--- 702,727 ----
+      {
+  	ok = FALSE;
+  	fd = mch_fopen((char *)tmp_orig, "w");
+! 	if (fd == NULL)
+! 	    io_error = TRUE;
+! 	else
+  	{
+! 	    if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
+! 		io_error = TRUE;
+  	    fclose(fd);
+  	    fd = mch_fopen((char *)tmp_new, "w");
+! 	    if (fd == NULL)
+! 		io_error = TRUE;
+! 	    else
+  	    {
+! 		if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
+! 		    io_error = TRUE;
+  		fclose(fd);
+  		diff_file(tmp_orig, tmp_new, tmp_diff);
+  		fd = mch_fopen((char *)tmp_diff, "r");
+! 		if (fd == NULL)
+! 		    io_error = TRUE;
+! 		else
+  		{
+  		    char_u	linebuf[LBUFLEN];
+  
+***************
+*** 761,766 ****
+--- 774,781 ----
+      }
+      if (!ok)
+      {
++ 	if (io_error)
++ 	    EMSG(_("E810: Cannot read or write temp files"));
+  	EMSG(_("E97: Cannot create diffs"));
+  	diff_a_works = MAYBE;
+  #if defined(MSWIN) || defined(MSDOS)
+***************
+*** 925,934 ****
+      {
+  # ifdef TEMPDIRNAMES
+  	if (vim_tempdir != NULL)
+! 	    mch_chdir((char *)vim_tempdir);
+  	else
+  # endif
+! 	    mch_chdir("/tmp");
+  	shorten_fnames(TRUE);
+      }
+  #endif
+--- 940,949 ----
+      {
+  # ifdef TEMPDIRNAMES
+  	if (vim_tempdir != NULL)
+! 	    ignored = mch_chdir((char *)vim_tempdir);
+  	else
+  # endif
+! 	    ignored = mch_chdir("/tmp");
+  	shorten_fnames(TRUE);
+      }
+  #endif
+*** ../vim-7.2.054/src/eval.c	Fri Nov 28 11:15:10 2008
+--- src/eval.c	Fri Nov 28 12:23:13 2008
+***************
+*** 10641,10647 ****
+  # ifdef FEAT_WINDOWS
+  	    win_T	*wp;
+  # endif
+! 	    int		n = 1;
+  
+  	    if (row >= 0 && col >= 0)
+  	    {
+--- 10641,10647 ----
+  # ifdef FEAT_WINDOWS
+  	    win_T	*wp;
+  # endif
+! 	    int		winnr = 1;
+  
+  	    if (row >= 0 && col >= 0)
+  	    {
+***************
+*** 10651,10659 ****
+  		(void)mouse_comp_pos(win, &row, &col, &lnum);
+  # ifdef FEAT_WINDOWS
+  		for (wp = firstwin; wp != win; wp = wp->w_next)
+! 		    ++n;
+  # endif
+! 		vimvars[VV_MOUSE_WIN].vv_nr = n;
+  		vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
+  		vimvars[VV_MOUSE_COL].vv_nr = col + 1;
+  	    }
+--- 10651,10659 ----
+  		(void)mouse_comp_pos(win, &row, &col, &lnum);
+  # ifdef FEAT_WINDOWS
+  		for (wp = firstwin; wp != win; wp = wp->w_next)
+! 		    ++winnr;
+  # endif
+! 		vimvars[VV_MOUSE_WIN].vv_nr = winnr;
+  		vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
+  		vimvars[VV_MOUSE_COL].vv_nr = col + 1;
+  	    }
+*** ../vim-7.2.054/src/ex_cmds.c	Sat Nov 15 14:10:23 2008
+--- src/ex_cmds.c	Fri Nov 28 17:24:08 2008
+***************
+*** 1941,1947 ****
+  	     * root.
+  	     */
+  	    if (fp_out != NULL)
+! 		(void)fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
+  #endif
+  	}
+      }
+--- 1941,1947 ----
+  	     * root.
+  	     */
+  	    if (fp_out != NULL)
+! 		ignored = fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
+  #endif
+  	}
+      }
+*** ../vim-7.2.054/src/ex_docmd.c	Sat Nov 15 14:10:23 2008
+--- src/ex_docmd.c	Fri Nov 28 17:26:13 2008
+***************
+*** 8753,8760 ****
+  		else if (*dirnow != NUL
+  			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
+  		{
+! 		    (void)mch_chdir((char *)globaldir);
+! 		    shorten_fnames(TRUE);
+  		}
+  
+  		failed |= (makeopens(fd, dirnow) == FAIL);
+--- 8753,8760 ----
+  		else if (*dirnow != NUL
+  			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
+  		{
+! 		    if (mch_chdir((char *)globaldir) == OK)
+! 			shorten_fnames(TRUE);
+  		}
+  
+  		failed |= (makeopens(fd, dirnow) == FAIL);
+*** ../vim-7.2.054/src/fileio.c	Wed Nov 12 16:04:43 2008
+--- src/fileio.c	Fri Nov 28 17:35:54 2008
+***************
+*** 2214,2220 ****
+      {
+  	/* Use stderr for stdin, makes shell commands work. */
+  	close(0);
+! 	dup(2);
+      }
+  #endif
+  
+--- 2214,2220 ----
+      {
+  	/* Use stderr for stdin, makes shell commands work. */
+  	close(0);
+! 	ignored = dup(2);
+      }
+  #endif
+  
+***************
+*** 3449,3455 ****
+  		{
+  # ifdef UNIX
+  #  ifdef HAVE_FCHOWN
+! 		    fchown(fd, st_old.st_uid, st_old.st_gid);
+  #  endif
+  		    if (mch_stat((char *)IObuff, &st) < 0
+  			    || st.st_uid != st_old.st_uid
+--- 3449,3455 ----
+  		{
+  # ifdef UNIX
+  #  ifdef HAVE_FCHOWN
+! 		    ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
+  #  endif
+  		    if (mch_stat((char *)IObuff, &st) < 0
+  			    || st.st_uid != st_old.st_uid
+***************
+*** 4365,4371 ****
+  		|| st.st_uid != st_old.st_uid
+  		|| st.st_gid != st_old.st_gid)
+  	{
+! 	    fchown(fd, st_old.st_uid, st_old.st_gid);
+  	    if (perm >= 0)	/* set permission again, may have changed */
+  		(void)mch_setperm(wfname, perm);
+  	}
+--- 4365,4371 ----
+  		|| st.st_uid != st_old.st_uid
+  		|| st.st_gid != st_old.st_gid)
+  	{
+! 	    ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
+  	    if (perm >= 0)	/* set permission again, may have changed */
+  		(void)mch_setperm(wfname, perm);
+  	}
+***************
+*** 6030,6038 ****
+  	{
+  	    tbuf[FGETS_SIZE - 2] = NUL;
+  #ifdef USE_CR
+! 	    fgets_cr((char *)tbuf, FGETS_SIZE, fp);
+  #else
+! 	    fgets((char *)tbuf, FGETS_SIZE, fp);
+  #endif
+  	} while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
+      }
+--- 6030,6038 ----
+  	{
+  	    tbuf[FGETS_SIZE - 2] = NUL;
+  #ifdef USE_CR
+! 	    ignoredp = fgets_cr((char *)tbuf, FGETS_SIZE, fp);
+  #else
+! 	    ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp);
+  #endif
+  	} while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
+      }
+*** ../vim-7.2.054/src/fold.c	Wed Aug  6 18:59:40 2008
+--- src/fold.c	Fri Nov 28 12:24:16 2008
+***************
+*** 48,54 ****
+  static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
+  static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum));
+  static void checkupdate __ARGS((win_T *wp));
+! static void setFoldRepeat __ARGS((linenr_T lnum, long count, int open));
+  static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep));
+  static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));
+  static void foldOpenNested __ARGS((fold_T *fpr));
+--- 48,54 ----
+  static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
+  static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum));
+  static void checkupdate __ARGS((win_T *wp));
+! static void setFoldRepeat __ARGS((linenr_T lnum, long count, int do_open));
+  static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep));
+  static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));
+  static void foldOpenNested __ARGS((fold_T *fpr));
+***************
+*** 1241,1250 ****
+   * Repeat "count" times.
+   */
+      static void
+! setFoldRepeat(lnum, count, open)
+      linenr_T	lnum;
+      long	count;
+!     int		open;
+  {
+      int		done;
+      long	n;
+--- 1241,1250 ----
+   * Repeat "count" times.
+   */
+      static void
+! setFoldRepeat(lnum, count, do_open)
+      linenr_T	lnum;
+      long	count;
+!     int		do_open;
+  {
+      int		done;
+      long	n;
+***************
+*** 1252,1258 ****
+      for (n = 0; n < count; ++n)
+      {
+  	done = DONE_NOTHING;
+! 	(void)setManualFold(lnum, open, FALSE, &done);
+  	if (!(done & DONE_ACTION))
+  	{
+  	    /* Only give an error message when no fold could be opened. */
+--- 1252,1258 ----
+      for (n = 0; n < count; ++n)
+      {
+  	done = DONE_NOTHING;
+! 	(void)setManualFold(lnum, do_open, FALSE, &done);
+  	if (!(done & DONE_ACTION))
+  	{
+  	    /* Only give an error message when no fold could be opened. */
+*** ../vim-7.2.054/src/globals.h	Thu Sep 18 21:29:07 2008
+--- src/globals.h	Fri Nov 28 17:35:50 2008
+***************
+*** 1549,1554 ****
+--- 1549,1562 ----
+  EXTERN time_t starttime;
+  
+  /*
++  * Some compilers warn for not using a return value, but in some situations we
++  * can't do anything useful with the value.  Assign to this variable to avoid
++  * the warning.
++  */
++ EXTERN int ignored;
++ EXTERN char *ignoredp;
++ 
++ /*
+   * Optional Farsi support.  Include it here, so EXTERN and INIT are defined.
+   */
+  #ifdef FEAT_FKMAP
+*** ../vim-7.2.054/src/gui.c	Wed Aug  6 14:37:26 2008
+--- src/gui.c	Fri Nov 28 18:48:31 2008
+***************
+*** 139,145 ****
+  		/* The read returns when the child closes the pipe (or when
+  		 * the child dies for some reason). */
+  		close(pipefd[1]);
+! 		(void)read(pipefd[0], &dummy, (size_t)1);
+  		close(pipefd[0]);
+  	    }
+  
+--- 139,145 ----
+  		/* The read returns when the child closes the pipe (or when
+  		 * the child dies for some reason). */
+  		close(pipefd[1]);
+! 		ignored = (int)read(pipefd[0], &dummy, (size_t)1);
+  		close(pipefd[0]);
+  	    }
+  
+*** ../vim-7.2.054/src/gui_at_sb.c	Sun Jun 13 21:37:13 2004
+--- src/gui_at_sb.c	Fri Nov 28 12:19:19 2008
+***************
+*** 1078,1083 ****
+--- 1078,1089 ----
+      Cardinal	*num_params;	/* unused */
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget)w;
++     /* Use a union to avoid a warning for the weird conversion from float to
++      * XtPointer.  Comes from Xaw/Scrollbar.c. */
++     union {
++ 	XtPointer xtp;
++ 	float xtf;
++     } xtpf;
+  
+      if (LookAhead(w, event))
+  	return;
+***************
+*** 1085,1091 ****
+      /* thumbProc is not pretty, but is necessary for backwards
+         compatibility on those architectures for which it work{s,ed};
+         the intent is to pass a (truncated) float by value. */
+!     XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);
+      XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
+  }
+  
+--- 1091,1098 ----
+      /* thumbProc is not pretty, but is necessary for backwards
+         compatibility on those architectures for which it work{s,ed};
+         the intent is to pass a (truncated) float by value. */
+!     xtpf.xtf = sbw->scrollbar.top;
+!     XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);
+      XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
+  }
+  
+*** ../vim-7.2.054/src/gui_gtk_x11.c	Tue Jul  8 12:46:08 2008
+--- src/gui_gtk_x11.c	Fri Nov 28 21:06:38 2008
+***************
+*** 4070,4083 ****
+  
+  	if (mask & (XValue | YValue))
+  	{
+! 	    int w, h;
+! 	    gui_mch_get_screen_dimensions(&w, &h);
+! 	    h += p_ghr + get_menu_tool_height();
+! 	    w += get_menu_tool_width();
+  	    if (mask & XNegative)
+! 		x += w - pixel_width;
+  	    if (mask & YNegative)
+! 		y += h - pixel_height;
+  #ifdef HAVE_GTK2
+  	    gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
+  #else
+--- 4070,4083 ----
+  
+  	if (mask & (XValue | YValue))
+  	{
+! 	    int ww, hh;
+! 	    gui_mch_get_screen_dimensions(&ww, &hh);
+! 	    hh += p_ghr + get_menu_tool_height();
+! 	    ww += get_menu_tool_width();
+  	    if (mask & XNegative)
+! 		x += ww - pixel_width;
+  	    if (mask & YNegative)
+! 		y += hh - pixel_height;
+  #ifdef HAVE_GTK2
+  	    gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
+  #else
+*** ../vim-7.2.054/src/gui_xmdlg.c	Tue Jun 24 23:39:32 2008
+--- src/gui_xmdlg.c	Fri Nov 28 21:04:08 2008
+***************
+*** 369,378 ****
+      char	buf[TEMP_BUF_SIZE];
+      XmString	items[MAX_ENTRIES_IN_LIST];
+      int		i;
+!     int		index;
+  
+!     for (index = (int)ENCODING; index < (int)NONE; ++index)
+! 	count[index] = 0;
+  
+      /* First we insert the wild char into every single list. */
+      if (fix != ENCODING)
+--- 369,378 ----
+      char	buf[TEMP_BUF_SIZE];
+      XmString	items[MAX_ENTRIES_IN_LIST];
+      int		i;
+!     int		idx;
+  
+!     for (idx = (int)ENCODING; idx < (int)NONE; ++idx)
+! 	count[idx] = 0;
+  
+      /* First we insert the wild char into every single list. */
+      if (fix != ENCODING)
+***************
+*** 503,516 ****
+      /*
+       * Now loop trough the remaining lists and set them up.
+       */
+!     for (index = (int)NAME; index < (int)NONE; ++index)
+      {
+  	Widget w;
+  
+! 	if (fix == (enum ListSpecifier)index)
+  	    continue;
+  
+! 	switch ((enum ListSpecifier)index)
+  	{
+  	    case NAME:
+  		w = data->list[NAME];
+--- 503,516 ----
+      /*
+       * Now loop trough the remaining lists and set them up.
+       */
+!     for (idx = (int)NAME; idx < (int)NONE; ++idx)
+      {
+  	Widget w;
+  
+! 	if (fix == (enum ListSpecifier)idx)
+  	    continue;
+  
+! 	switch ((enum ListSpecifier)idx)
+  	{
+  	    case NAME:
+  		w = data->list[NAME];
+***************
+*** 525,545 ****
+  		w = (Widget)0;	/* for lint */
+  	}
+  
+! 	for (i = 0; i < count[index]; ++i)
+  	{
+! 	    items[i] = XmStringCreateLocalized(list[index][i]);
+! 	    XtFree(list[index][i]);
+  	}
+  	XmListDeleteAllItems(w);
+! 	XmListAddItems(w, items, count[index], 1);
+! 	if (data->sel[index])
+  	{
+  	    XmStringFree(items[0]);
+! 	    items[0] = XmStringCreateLocalized(data->sel[index]);
+  	    XmListSelectItem(w, items[0], False);
+  	    XmListSetBottomItem(w, items[0]);
+  	}
+! 	for (i = 0; i < count[index]; ++i)
+  	    XmStringFree(items[i]);
+      }
+  }
+--- 525,545 ----
+  		w = (Widget)0;	/* for lint */
+  	}
+  
+! 	for (i = 0; i < count[idx]; ++i)
+  	{
+! 	    items[i] = XmStringCreateLocalized(list[idx][i]);
+! 	    XtFree(list[idx][i]);
+  	}
+  	XmListDeleteAllItems(w);
+! 	XmListAddItems(w, items, count[idx], 1);
+! 	if (data->sel[idx])
+  	{
+  	    XmStringFree(items[0]);
+! 	    items[0] = XmStringCreateLocalized(data->sel[idx]);
+  	    XmListSelectItem(w, items[0], False);
+  	    XmListSetBottomItem(w, items[0]);
+  	}
+! 	for (i = 0; i < count[idx]; ++i)
+  	    XmStringFree(items[i]);
+      }
+  }
+***************
+*** 695,708 ****
+  	int	    n;
+  	XmString    str;
+  	Arg	    args[4];
+! 	char	    *msg = _("no specific match");
+  
+  	n = 0;
+! 	str = XmStringCreateLocalized(msg);
+  	XtSetArg(args[n], XmNlabelString, str); ++n;
+  	XtSetValues(data->sample, args, n);
+  	apply_fontlist(data->sample);
+! 	XmTextSetString(data->name, msg);
+  	XmStringFree(str);
+  
+  	return False;
+--- 695,708 ----
+  	int	    n;
+  	XmString    str;
+  	Arg	    args[4];
+! 	char	    *nomatch_msg = _("no specific match");
+  
+  	n = 0;
+! 	str = XmStringCreateLocalized(nomatch_msg);
+  	XtSetArg(args[n], XmNlabelString, str); ++n;
+  	XtSetValues(data->sample, args, n);
+  	apply_fontlist(data->sample);
+! 	XmTextSetString(data->name, nomatch_msg);
+  	XmStringFree(str);
+  
+  	return False;
+***************
+*** 886,906 ****
+      {
+  	int	i;
+  	int	max;
+! 	int	index = 0;
+  	int	size;
+! 	char	str[128];
+  
+  	for (i = 0, max = 0; i < data->num; i++)
+  	{
+! 	    get_part(fn(data, i), 7, str);
+! 	    size = atoi(str);
+  	    if ((size > max) && (size < MAX_DISPLAY_SIZE))
+  	    {
+! 		index = i;
+  		max = size;
+  	    }
+  	}
+! 	strcpy(big_font, fn(data, index));
+      }
+      data->old = XLoadQueryFont(XtDisplay(parent), big_font);
+      data->old_list = gui_motif_create_fontlist(data->old);
+--- 886,906 ----
+      {
+  	int	i;
+  	int	max;
+! 	int	idx = 0;
+  	int	size;
+! 	char	buf[128];
+  
+  	for (i = 0, max = 0; i < data->num; i++)
+  	{
+! 	    get_part(fn(data, i), 7, buf);
+! 	    size = atoi(buf);
+  	    if ((size > max) && (size < MAX_DISPLAY_SIZE))
+  	    {
+! 		idx = i;
+  		max = size;
+  	    }
+  	}
+! 	strcpy(big_font, fn(data, idx));
+      }
+      data->old = XLoadQueryFont(XtDisplay(parent), big_font);
+      data->old_list = gui_motif_create_fontlist(data->old);
+***************
+*** 1217,1244 ****
+  
+  	if (i != 0)
+  	{
+! 	    char name[TEMP_BUF_SIZE];
+! 	    char style[TEMP_BUF_SIZE];
+! 	    char size[TEMP_BUF_SIZE];
+! 	    char encoding[TEMP_BUF_SIZE];
+  	    char *found;
+  
+  	    found = names[0];
+  
+! 	    name_part(found, name);
+! 	    style_part(found, style);
+! 	    size_part(found, size, data->in_pixels);
+! 	    encoding_part(found, encoding);
+! 
+! 	    if (strlen(name) > 0
+! 		    && strlen(style) > 0
+! 		    && strlen(size) > 0
+! 		    && strlen(encoding) > 0)
+  	    {
+! 		data->sel[NAME] = XtNewString(name);
+! 		data->sel[STYLE] = XtNewString(style);
+! 		data->sel[SIZE] = XtNewString(size);
+! 		data->sel[ENCODING] = XtNewString(encoding);
+  		data->font_name = XtNewString(names[0]);
+  		display_sample(data);
+  		XmTextSetString(data->name, data->font_name);
+--- 1217,1244 ----
+  
+  	if (i != 0)
+  	{
+! 	    char namebuf[TEMP_BUF_SIZE];
+! 	    char stylebuf[TEMP_BUF_SIZE];
+! 	    char sizebuf[TEMP_BUF_SIZE];
+! 	    char encodingbuf[TEMP_BUF_SIZE];
+  	    char *found;
+  
+  	    found = names[0];
+  
+! 	    name_part(found, namebuf);
+! 	    style_part(found, stylebuf);
+! 	    size_part(found, sizebuf, data->in_pixels);
+! 	    encoding_part(found, encodingbuf);
+! 
+! 	    if (strlen(namebuf) > 0
+! 		    && strlen(stylebuf) > 0
+! 		    && strlen(sizebuf) > 0
+! 		    && strlen(encodingbuf) > 0)
+  	    {
+! 		data->sel[NAME] = XtNewString(namebuf);
+! 		data->sel[STYLE] = XtNewString(stylebuf);
+! 		data->sel[SIZE] = XtNewString(sizebuf);
+! 		data->sel[ENCODING] = XtNewString(encodingbuf);
+  		data->font_name = XtNewString(names[0]);
+  		display_sample(data);
+  		XmTextSetString(data->name, data->font_name);
+*** ../vim-7.2.054/src/gui_xmebw.c	Thu Nov  8 20:48:14 2007
+--- src/gui_xmebw.c	Fri Nov 28 18:58:53 2008
+***************
+*** 1256,1262 ****
+      }
+      else
+      {
+! 	int adjust = 0;
+  
+  #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+  	/*
+--- 1256,1262 ----
+      }
+      else
+      {
+! 	adjust = 0;
+  
+  #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+  	/*
+***************
+*** 1268,1279 ****
+  	{
+  	    case XmEXTERNAL_HIGHLIGHT:
+  		adjust = (eb->primitive.highlight_thickness -
+! 			(eb->pushbutton.default_button_shadow_thickness ?
+! 			 Xm3D_ENHANCE_PIXEL : 0));
+  		break;
+  
+  	    case XmINTERNAL_HIGHLIGHT:
+- 		adjust = 0;
+  		break;
+  
+  	    default:
+--- 1268,1278 ----
+  	{
+  	    case XmEXTERNAL_HIGHLIGHT:
+  		adjust = (eb->primitive.highlight_thickness -
+! 			 (eb->pushbutton.default_button_shadow_thickness
+! 			  ?  Xm3D_ENHANCE_PIXEL : 0));
+  		break;
+  
+  	    case XmINTERNAL_HIGHLIGHT:
+  		break;
+  
+  	    default:
+*** ../vim-7.2.054/src/main.c	Thu Nov 20 14:11:47 2008
+--- src/main.c	Fri Nov 28 18:32:48 2008
+***************
+*** 2372,2378 ****
+       * Is there any other system that cannot do this?
+       */
+      close(0);
+!     dup(2);
+  #endif
+  }
+  
+--- 2372,2378 ----
+       * Is there any other system that cannot do this?
+       */
+      close(0);
+!     ignored = dup(2);
+  #endif
+  }
+  
+*** ../vim-7.2.054/src/mbyte.c	Thu Nov 20 17:09:09 2008
+--- src/mbyte.c	Fri Nov 28 18:44:05 2008
+***************
+*** 717,723 ****
+  		     * where mblen() returns 0 for invalid character.
+  		     * Therefore, following condition includes 0.
+  		     */
+! 		    (void)mblen(NULL, 0);	/* First reset the state. */
+  		    if (mblen(buf, (size_t)1) <= 0)
+  			n = 2;
+  		    else
+--- 717,723 ----
+  		     * where mblen() returns 0 for invalid character.
+  		     * Therefore, following condition includes 0.
+  		     */
+! 		    ignored = mblen(NULL, 0);	/* First reset the state. */
+  		    if (mblen(buf, (size_t)1) <= 0)
+  			n = 2;
+  		    else
+***************
+*** 5278,5284 ****
+  
+  /*ARGSUSED*/
+      static void
+! preedit_start_cbproc(XIC xic, XPointer client_data, XPointer call_data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("xim_decide_input_style()\n");
+--- 5278,5284 ----
+  
+  /*ARGSUSED*/
+      static void
+! preedit_start_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("xim_decide_input_style()\n");
+***************
+*** 5312,5318 ****
+  
+  /*ARGSUSED*/
+      static void
+! preedit_draw_cbproc(XIC xic, XPointer client_data, XPointer call_data)
+  {
+      XIMPreeditDrawCallbackStruct *draw_data;
+      XIMText	*text;
+--- 5312,5318 ----
+  
+  /*ARGSUSED*/
+      static void
+! preedit_draw_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+  {
+      XIMPreeditDrawCallbackStruct *draw_data;
+      XIMText	*text;
+***************
+*** 5453,5459 ****
+  
+  /*ARGSUSED*/
+      static void
+! preedit_caret_cbproc(XIC xic, XPointer client_data, XPointer call_data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("preedit_caret_cbproc()\n");
+--- 5453,5459 ----
+  
+  /*ARGSUSED*/
+      static void
+! preedit_caret_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("preedit_caret_cbproc()\n");
+***************
+*** 5462,5468 ****
+  
+  /*ARGSUSED*/
+      static void
+! preedit_done_cbproc(XIC xic, XPointer client_data, XPointer call_data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("preedit_done_cbproc()\n");
+--- 5462,5468 ----
+  
+  /*ARGSUSED*/
+      static void
+! preedit_done_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("preedit_done_cbproc()\n");
+*** ../vim-7.2.054/src/message.c	Sun Jul 13 19:18:44 2008
+--- src/message.c	Fri Nov 28 12:26:56 2008
+***************
+*** 4585,4645 ****
+  			if (remove_trailing_zeroes)
+  			{
+  			    int i;
+! 			    char *p;
+  
+  			    /* Using %g or %G: remove superfluous zeroes. */
+  			    if (fmt_spec == 'f')
+! 				p = tmp + str_arg_l - 1;
+  			    else
+  			    {
+! 				p = (char *)vim_strchr((char_u *)tmp,
+  						 fmt_spec == 'e' ? 'e' : 'E');
+! 				if (p != NULL)
+  				{
+  				    /* Remove superfluous '+' and leading
+  				     * zeroes from the exponent. */
+! 				    if (p[1] == '+')
+  				    {
+  					/* Change "1.0e+07" to "1.0e07" */
+! 					STRMOVE(p + 1, p + 2);
+  					--str_arg_l;
+  				    }
+! 				    i = (p[1] == '-') ? 2 : 1;
+! 				    while (p[i] == '0')
+  				    {
+  					/* Change "1.0e07" to "1.0e7" */
+! 					STRMOVE(p + i, p + i + 1);
+  					--str_arg_l;
+  				    }
+! 				    --p;
+  				}
+  			    }
+  
+! 			    if (p != NULL && !precision_specified)
+  				/* Remove trailing zeroes, but keep the one
+  				 * just after a dot. */
+! 				while (p > tmp + 2 && *p == '0' && p[-1] != '.')
+  				{
+! 				    STRMOVE(p, p + 1);
+! 				    --p;
+  				    --str_arg_l;
+  				}
+  			}
+  			else
+  			{
+! 			    char *p;
+  
+  			    /* Be consistent: some printf("%e") use 1.0e+12
+  			     * and some 1.0e+012.  Remove one zero in the last
+  			     * case. */
+! 			    p = (char *)vim_strchr((char_u *)tmp,
+  						 fmt_spec == 'e' ? 'e' : 'E');
+! 			    if (p != NULL && (p[1] == '+' || p[1] == '-')
+! 					  && p[2] == '0'
+! 					  && vim_isdigit(p[3])
+! 					  && vim_isdigit(p[4]))
+  			    {
+! 				STRMOVE(p + 2, p + 3);
+  				--str_arg_l;
+  			    }
+  			}
+--- 4585,4646 ----
+  			if (remove_trailing_zeroes)
+  			{
+  			    int i;
+! 			    char *tp;
+  
+  			    /* Using %g or %G: remove superfluous zeroes. */
+  			    if (fmt_spec == 'f')
+! 				tp = tmp + str_arg_l - 1;
+  			    else
+  			    {
+! 				tp = (char *)vim_strchr((char_u *)tmp,
+  						 fmt_spec == 'e' ? 'e' : 'E');
+! 				if (tp != NULL)
+  				{
+  				    /* Remove superfluous '+' and leading
+  				     * zeroes from the exponent. */
+! 				    if (tp[1] == '+')
+  				    {
+  					/* Change "1.0e+07" to "1.0e07" */
+! 					STRMOVE(tp + 1, tp + 2);
+  					--str_arg_l;
+  				    }
+! 				    i = (tp[1] == '-') ? 2 : 1;
+! 				    while (tp[i] == '0')
+  				    {
+  					/* Change "1.0e07" to "1.0e7" */
+! 					STRMOVE(tp + i, tp + i + 1);
+  					--str_arg_l;
+  				    }
+! 				    --tp;
+  				}
+  			    }
+  
+! 			    if (tp != NULL && !precision_specified)
+  				/* Remove trailing zeroes, but keep the one
+  				 * just after a dot. */
+! 				while (tp > tmp + 2 && *tp == '0'
+! 							     && tp[-1] != '.')
+  				{
+! 				    STRMOVE(tp, tp + 1);
+! 				    --tp;
+  				    --str_arg_l;
+  				}
+  			}
+  			else
+  			{
+! 			    char *tp;
+  
+  			    /* Be consistent: some printf("%e") use 1.0e+12
+  			     * and some 1.0e+012.  Remove one zero in the last
+  			     * case. */
+! 			    tp = (char *)vim_strchr((char_u *)tmp,
+  						 fmt_spec == 'e' ? 'e' : 'E');
+! 			    if (tp != NULL && (tp[1] == '+' || tp[1] == '-')
+! 					  && tp[2] == '0'
+! 					  && vim_isdigit(tp[3])
+! 					  && vim_isdigit(tp[4]))
+  			    {
+! 				STRMOVE(tp + 2, tp + 3);
+  				--str_arg_l;
+  			    }
+  			}
+*** ../vim-7.2.054/src/netbeans.c	Sat Nov 15 14:10:23 2008
+--- src/netbeans.c	Fri Nov 28 18:51:43 2008
+***************
+*** 1043,1049 ****
+  	nbdebug(("EVT: %s", buf));
+  /*	nb_send(buf, "netbeans_end");    avoid "write failed" messages */
+  	if (sd >= 0)
+! 	    sock_write(sd, buf, (int)STRLEN(buf));  /* ignore errors */
+      }
+  }
+  
+--- 1043,1049 ----
+  	nbdebug(("EVT: %s", buf));
+  /*	nb_send(buf, "netbeans_end");    avoid "write failed" messages */
+  	if (sd >= 0)
+! 	    ignored = sock_write(sd, buf, (int)STRLEN(buf));
+      }
+  }
+  
+***************
+*** 2277,2285 ****
+  	    int serNum;
+  	    int localTypeNum;
+  	    int typeNum;
+- # ifdef NBDEBUG
+- 	    int len;
+- # endif
+  	    pos_T *pos;
+  
+  	    if (buf == NULL || buf->bufp == NULL)
+--- 2277,2282 ----
+***************
+*** 2303,2315 ****
+  	    pos = get_off_or_lnum(buf->bufp, &args);
+  
+  	    cp = (char *)args;
+! # ifdef NBDEBUG
+! 	    len =
+! # endif
+! 		strtol(cp, &cp, 10);
+  	    args = (char_u *)cp;
+  # ifdef NBDEBUG
+! 	    if (len != -1)
+  	    {
+  		nbdebug(("    partial line annotation -- Not Yet Implemented!\n"));
+  	    }
+--- 2300,2309 ----
+  	    pos = get_off_or_lnum(buf->bufp, &args);
+  
+  	    cp = (char *)args;
+! 	    ignored = (int)strtol(cp, &cp, 10);
+  	    args = (char_u *)cp;
+  # ifdef NBDEBUG
+! 	    if (ignored != -1)
+  	    {
+  		nbdebug(("    partial line annotation -- Not Yet Implemented!\n"));
+  	    }
+*** ../vim-7.2.054/src/option.c	Sun Nov  9 13:43:25 2008
+--- src/option.c	Fri Nov 28 12:27:34 2008
+***************
+*** 8232,8244 ****
+  	    {
+  		if (number == 0 && string != NULL)
+  		{
+! 		    int index;
+  
+  		    /* Either we are given a string or we are setting option
+  		     * to zero. */
+! 		    for (index = 0; string[index] == '0'; ++index)
+  			;
+! 		    if (string[index] != NUL || index == 0)
+  		    {
+  			/* There's another character after zeros or the string
+  			 * is empty.  In both cases, we are trying to set a
+--- 8232,8244 ----
+  	    {
+  		if (number == 0 && string != NULL)
+  		{
+! 		    int idx;
+  
+  		    /* Either we are given a string or we are setting option
+  		     * to zero. */
+! 		    for (idx = 0; string[idx] == '0'; ++idx)
+  			;
+! 		    if (string[idx] != NUL || idx == 0)
+  		    {
+  			/* There's another character after zeros or the string
+  			 * is empty.  In both cases, we are trying to set a
+*** ../vim-7.2.054/src/os_unix.c	Wed Nov 12 14:09:38 2008
+--- src/os_unix.c	Fri Nov 28 18:39:55 2008
+***************
+*** 315,326 ****
+      {-1,	    "Unknown!", FALSE}
+  };
+  
+      void
+  mch_write(s, len)
+      char_u	*s;
+      int		len;
+  {
+!     write(1, (char *)s, len);
+      if (p_wd)		/* Unix is too fast, slow down a bit more */
+  	RealWaitForChar(read_cmd_fd, p_wd, NULL);
+  }
+--- 315,329 ----
+      {-1,	    "Unknown!", FALSE}
+  };
+  
++ /*
++  * Write s[len] to the screen.
++  */
+      void
+  mch_write(s, len)
+      char_u	*s;
+      int		len;
+  {
+!     ignored = (int)write(1, (char *)s, len);
+      if (p_wd)		/* Unix is too fast, slow down a bit more */
+  	RealWaitForChar(read_cmd_fd, p_wd, NULL);
+  }
+***************
+*** 3927,3935 ****
+  		 */
+  		if (fd >= 0)
+  		{
+! 		    dup(fd); /* To replace stdin  (file descriptor 0) */
+! 		    dup(fd); /* To replace stdout (file descriptor 1) */
+! 		    dup(fd); /* To replace stderr (file descriptor 2) */
+  
+  		    /* Don't need this now that we've duplicated it */
+  		    close(fd);
+--- 3930,3938 ----
+  		 */
+  		if (fd >= 0)
+  		{
+! 		    ignored = dup(fd); /* To replace stdin  (fd 0) */
+! 		    ignored = dup(fd); /* To replace stdout (fd 1) */
+! 		    ignored = dup(fd); /* To replace stderr (fd 2) */
+  
+  		    /* Don't need this now that we've duplicated it */
+  		    close(fd);
+***************
+*** 3997,4009 ****
+  
+  		    /* set up stdin/stdout/stderr for the child */
+  		    close(0);
+! 		    dup(pty_slave_fd);
+  		    close(1);
+! 		    dup(pty_slave_fd);
+  		    if (gui.in_use)
+  		    {
+  			close(2);
+! 			dup(pty_slave_fd);
+  		    }
+  
+  		    close(pty_slave_fd);    /* has been dupped, close it now */
+--- 4000,4012 ----
+  
+  		    /* set up stdin/stdout/stderr for the child */
+  		    close(0);
+! 		    ignored = dup(pty_slave_fd);
+  		    close(1);
+! 		    ignored = dup(pty_slave_fd);
+  		    if (gui.in_use)
+  		    {
+  			close(2);
+! 			ignored = dup(pty_slave_fd);
+  		    }
+  
+  		    close(pty_slave_fd);    /* has been dupped, close it now */
+***************
+*** 4014,4026 ****
+  		    /* set up stdin for the child */
+  		    close(fd_toshell[1]);
+  		    close(0);
+! 		    dup(fd_toshell[0]);
+  		    close(fd_toshell[0]);
+  
+  		    /* set up stdout for the child */
+  		    close(fd_fromshell[0]);
+  		    close(1);
+! 		    dup(fd_fromshell[1]);
+  		    close(fd_fromshell[1]);
+  
+  # ifdef FEAT_GUI
+--- 4017,4029 ----
+  		    /* set up stdin for the child */
+  		    close(fd_toshell[1]);
+  		    close(0);
+! 		    ignored = dup(fd_toshell[0]);
+  		    close(fd_toshell[0]);
+  
+  		    /* set up stdout for the child */
+  		    close(fd_fromshell[0]);
+  		    close(1);
+! 		    ignored = dup(fd_fromshell[1]);
+  		    close(fd_fromshell[1]);
+  
+  # ifdef FEAT_GUI
+***************
+*** 4028,4034 ****
+  		    {
+  			/* set up stderr for the child */
+  			close(2);
+! 			dup(1);
+  		    }
+  # endif
+  		}
+--- 4031,4037 ----
+  		    {
+  			/* set up stderr for the child */
+  			close(2);
+! 			ignored = dup(1);
+  		    }
+  # endif
+  		}
+***************
+*** 4159,4165 ****
+  					    && (lnum !=
+  						    curbuf->b_ml.ml_line_count
+  						    || curbuf->b_p_eol)))
+! 				    write(toshell_fd, "\n", (size_t)1);
+  				++lnum;
+  				if (lnum > curbuf->b_op_end.lnum)
+  				{
+--- 4162,4169 ----
+  					    && (lnum !=
+  						    curbuf->b_ml.ml_line_count
+  						    || curbuf->b_p_eol)))
+! 				    ignored = write(toshell_fd, "\n",
+! 								   (size_t)1);
+  				++lnum;
+  				if (lnum > curbuf->b_op_end.lnum)
+  				{
+*** ../vim-7.2.054/src/spell.c	Fri Nov 28 10:08:05 2008
+--- src/spell.c	Fri Nov 28 12:28:24 2008
+***************
+*** 4950,4956 ****
+  static void put_sugtime __ARGS((spellinfo_T *spin, FILE *fd));
+  static int write_vim_spell __ARGS((spellinfo_T *spin, char_u *fname));
+  static void clear_node __ARGS((wordnode_T *node));
+! static int put_node __ARGS((FILE *fd, wordnode_T *node, int index, int regionmask, int prefixtree));
+  static void spell_make_sugfile __ARGS((spellinfo_T *spin, char_u *wfname));
+  static int sug_filltree __ARGS((spellinfo_T *spin, slang_T *slang));
+  static int sug_maketable __ARGS((spellinfo_T *spin));
+--- 4950,4956 ----
+  static void put_sugtime __ARGS((spellinfo_T *spin, FILE *fd));
+  static int write_vim_spell __ARGS((spellinfo_T *spin, char_u *fname));
+  static void clear_node __ARGS((wordnode_T *node));
+! static int put_node __ARGS((FILE *fd, wordnode_T *node, int idx, int regionmask, int prefixtree));
+  static void spell_make_sugfile __ARGS((spellinfo_T *spin, char_u *wfname));
+  static int sug_filltree __ARGS((spellinfo_T *spin, slang_T *slang));
+  static int sug_maketable __ARGS((spellinfo_T *spin));
+*** ../vim-7.2.054/src/ui.c	Sun Sep 14 15:57:54 2008
+--- src/ui.c	Fri Nov 28 19:04:36 2008
+***************
+*** 1820,1826 ****
+  #ifdef HAVE_DUP
+  	    /* Use stderr for stdin, also works for shell commands. */
+  	    close(0);
+! 	    dup(2);
+  #else
+  	    read_cmd_fd = 2;	/* read from stderr instead of stdin */
+  #endif
+--- 1820,1826 ----
+  #ifdef HAVE_DUP
+  	    /* Use stderr for stdin, also works for shell commands. */
+  	    close(0);
+! 	    ignored = dup(2);
+  #else
+  	    read_cmd_fd = 2;	/* read from stderr instead of stdin */
+  #endif
+*** ../vim-7.2.054/src/window.c	Sat Nov 15 14:10:23 2008
+--- src/window.c	Fri Nov 28 18:46:45 2008
+***************
+*** 4029,4042 ****
+  	    if (mch_dirname(cwd, MAXPATHL) == OK)
+  		globaldir = vim_strsave(cwd);
+  	}
+! 	mch_chdir((char *)curwin->w_localdir);
+! 	shorten_fnames(TRUE);
+      }
+      else if (globaldir != NULL)
+      {
+  	/* Window doesn't have a local directory and we are not in the global
+  	 * directory: Change to the global directory. */
+! 	mch_chdir((char *)globaldir);
+  	vim_free(globaldir);
+  	globaldir = NULL;
+  	shorten_fnames(TRUE);
+--- 4029,4042 ----
+  	    if (mch_dirname(cwd, MAXPATHL) == OK)
+  		globaldir = vim_strsave(cwd);
+  	}
+! 	if (mch_chdir((char *)curwin->w_localdir) == 0)
+! 	    shorten_fnames(TRUE);
+      }
+      else if (globaldir != NULL)
+      {
+  	/* Window doesn't have a local directory and we are not in the global
+  	 * directory: Change to the global directory. */
+! 	ignored = mch_chdir((char *)globaldir);
+  	vim_free(globaldir);
+  	globaldir = NULL;
+  	shorten_fnames(TRUE);
+*** ../vim-7.2.054/src/version.c	Fri Nov 28 12:05:07 2008
+--- src/version.c	Fri Nov 28 21:12:42 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     55,
+  /**/
+
+-- 
+PRINCE:    He's come to rescue me, father.
+LAUNCELOT: (embarrassed) Well, let's not jump to conclusions ...
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.056 b/source/ap/vim/patches/7.2.056
new file mode 100644
index 000000000..9e23f3da6
--- /dev/null
+++ b/source/ap/vim/patches/7.2.056
@@ -0,0 +1,57 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.056
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.056 (after 7.2.050)
+Problem:    Tests 58 and 59 fail.
+Solution:   Don't invoke fwrite() with a zero length. (Dominique Pelle)
+Files:	    src/spell.c
+
+
+*** ../vim-7.2.055/src/spell.c	Fri Nov 28 21:26:50 2008
+--- src/spell.c	Sat Nov 29 19:58:21 2008
+***************
+*** 8112,8118 ****
+  		p = rr == 1 ? ftp->ft_from : ftp->ft_to;
+  		l = (int)STRLEN(p);
+  		putc(l, fd);
+! 		fwv &= fwrite(p, l, (size_t)1, fd);
+  	    }
+  	}
+  
+--- 8218,8225 ----
+  		p = rr == 1 ? ftp->ft_from : ftp->ft_to;
+  		l = (int)STRLEN(p);
+  		putc(l, fd);
+! 		if (l > 0)
+! 		    fwv &= fwrite(p, l, (size_t)1, fd);
+  	    }
+  	}
+  
+*** ../vim-7.2.055/src/version.c	Fri Nov 28 21:26:50 2008
+--- src/version.c	Sat Nov 29 20:10:05 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     56,
+  /**/
+
+-- 
+GUARD #1:  Where'd you get the coconut?
+ARTHUR:    We found them.
+GUARD #1:  Found them?  In Mercea?  The coconut's tropical!
+ARTHUR:    What do you mean?
+GUARD #1:  Well, this is a temperate zone.
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.057 b/source/ap/vim/patches/7.2.057
new file mode 100644
index 000000000..37549121e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.057
@@ -0,0 +1,111 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.057
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.057 (after 7.2.056)
+Problem:    Combination of int and size_t may not work.
+Solution:   Use size_t for variable.
+Files:	    src/spell.c
+
+
+*** ../vim-7.2.056/src/spell.c	Sat Nov 29 20:10:59 2008
+--- src/spell.c	Sat Nov 29 20:15:43 2008
+***************
+*** 7926,7932 ****
+      char_u	*p;
+      int		rr;
+      int		retval = OK;
+!     int		fwv = 1;  /* collect return value of fwrite() to avoid
+  			     warnings from picky compiler */
+  
+      fd = mch_fopen((char *)fname, "w");
+--- 8028,8034 ----
+      char_u	*p;
+      int		rr;
+      int		retval = OK;
+!     size_t	fwv = 1;  /* collect return value of fwrite() to avoid
+  			     warnings from picky compiler */
+  
+      fd = mch_fopen((char *)fname, "w");
+***************
+*** 7939,7944 ****
+--- 8041,8050 ----
+      /* <HEADER>: <fileID> <versionnr> */
+  							    /* <fileID> */
+      fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd);
++     if (fwv != (size_t)1)
++ 	/* Catch first write error, don't try writing more. */
++ 	goto theend;
++ 
+      putc(VIMSPELLVERSION, fd);				    /* <versionnr> */
+  
+      /*
+***************
+*** 8300,8310 ****
+      /* Write another byte to check for errors (file system full). */
+      if (putc(0, fd) == EOF)
+  	retval = FAIL;
+! 
+      if (fclose(fd) == EOF)
+  	retval = FAIL;
+  
+!     if (fwv != 1)
+  	retval = FAIL;
+      if (retval == FAIL)
+  	EMSG(_(e_write));
+--- 8406,8416 ----
+      /* Write another byte to check for errors (file system full). */
+      if (putc(0, fd) == EOF)
+  	retval = FAIL;
+! theend:
+      if (fclose(fd) == EOF)
+  	retval = FAIL;
+  
+!     if (fwv != (size_t)1)
+  	retval = FAIL;
+      if (retval == FAIL)
+  	EMSG(_(e_write));
+***************
+*** 9897,9903 ****
+      char_u	*p;
+      int		len;
+      int		totlen;
+!     int		x = 1;  /* collect return value of fwrite() */
+  
+      if (fd != NULL)
+  	put_bytes(fd, (long_u)gap->ga_len, 2);	    /* <prefcondcnt> */
+--- 10003,10009 ----
+      char_u	*p;
+      int		len;
+      int		totlen;
+!     size_t	x = 1;  /* collect return value of fwrite() */
+  
+      if (fd != NULL)
+  	put_bytes(fd, (long_u)gap->ga_len, 2);	    /* <prefcondcnt> */
+*** ../vim-7.2.056/src/version.c	Sat Nov 29 20:10:59 2008
+--- src/version.c	Sat Nov 29 20:13:46 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     57,
+  /**/
+
+-- 
+GUARD #1:  What -- a swallow carrying a coconut?
+ARTHUR:    It could grip it by the husk!
+GUARD #1:  It's not a question of where he grips it!  It's a simple question
+           of weight ratios!  A five ounce bird could not carry a 1 pound
+           coconut.
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.058 b/source/ap/vim/patches/7.2.058
new file mode 100644
index 000000000..95de243fc
--- /dev/null
+++ b/source/ap/vim/patches/7.2.058
@@ -0,0 +1,83 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.058
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.058
+Problem:    Can't add a patch name to the ":version" output.
+Solution:   Add the extra_patches array.
+Files:	    src/version.c
+
+
+*** ../vim-7.2.057/src/version.c	Sat Nov 29 20:18:44 2008
+--- src/version.c	Sun Nov 30 12:12:31 2008
+***************
+*** 794,799 ****
+--- 796,814 ----
+      0
+  };
+  
++ /*
++  * Place to put a short description when adding a feature with a patch.
++  * Keep it short, e.g.,: "relative numbers", "persistent undo".
++  * Also add a comment marker to separate the lines.
++  * See the official Vim patches for the diff format: It must use a context of
++  * one line only.  Use "diff -C2".
++  */
++ static char *(extra_patches[]) =
++ {   /* Add your patch description below this line */
++ /**/
++     NULL
++ };
++ 
+      int
+  highest_patch()
+  {
+***************
+*** 939,944 ****
+--- 954,972 ----
+  	}
+      }
+  
++     /* Print the list of extra patch descriptions if there is at least one. */
++     if (extra_patches[0] != NULL)
++     {
++ 	MSG_PUTS(_("\nExtra patches: "));
++ 	s = "";
++ 	for (i = 0; extra_patches[i] != NULL; ++i)
++ 	{
++ 	    MSG_PUTS(s);
++ 	    s = ", ";
++ 	    MSG_PUTS(extra_patches[i]);
++ 	}
++     }
++ 
+  #ifdef MODIFIED_BY
+      MSG_PUTS("\n");
+      MSG_PUTS(_("Modified by "));
+*** ../vim-7.2.057/src/version.c	Sat Nov 29 20:18:44 2008
+--- src/version.c	Sun Nov 30 12:12:31 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     58,
+  /**/
+
+-- 
+ARTHUR:    Well, it doesn't matter.  Will you go and tell your master that
+           Arthur from the Court of Camelot is here.
+GUARD #1:  Listen, in order to maintain air-speed velocity, a swallow
+           needs to beat its wings 43 times every second, right?
+ARTHUR:    Please!
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.059 b/source/ap/vim/patches/7.2.059
new file mode 100644
index 000000000..0012ad6db
--- /dev/null
+++ b/source/ap/vim/patches/7.2.059
@@ -0,0 +1,70 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.059
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.059
+Problem:    Diff display is not always updated.
+Solution:   Update the display more often.
+Files:	    src/diff.c
+
+
+*** ../vim-7.2.058/src/diff.c	Fri Nov 28 21:26:50 2008
+--- src/diff.c	Fri Nov 28 17:23:35 2008
+***************
+*** 73,78 ****
+--- 73,80 ----
+  	{
+  	    tp->tp_diffbuf[i] = NULL;
+  	    tp->tp_diff_invalid = TRUE;
++ 	    if (tp == curtab)
++ 		diff_redraw(TRUE);
+  	}
+      }
+  }
+***************
+*** 102,107 ****
+--- 104,110 ----
+  	    {
+  		curtab->tp_diffbuf[i] = NULL;
+  		curtab->tp_diff_invalid = TRUE;
++ 		diff_redraw(TRUE);
+  	    }
+  	}
+      }
+***************
+*** 131,136 ****
+--- 134,140 ----
+  	{
+  	    curtab->tp_diffbuf[i] = buf;
+  	    curtab->tp_diff_invalid = TRUE;
++ 	    diff_redraw(TRUE);
+  	    return;
+  	}
+  
+*** ../vim-7.2.058/src/version.c	Sun Nov 30 12:14:35 2008
+--- src/version.c	Sun Nov 30 15:13:18 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     59,
+  /**/
+
+-- 
+GUARD #2:  Wait a minute -- supposing two swallows carried it together?
+GUARD #1:  No, they'd have to have it on a line.
+GUARD #2:  Well, simple!  They'd just use a standard creeper!
+GUARD #1:  What, held under the dorsal guiding feathers?
+GUARD #2:  Well, why not?
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.060 b/source/ap/vim/patches/7.2.060
new file mode 100644
index 000000000..ec6e6b787
--- /dev/null
+++ b/source/ap/vim/patches/7.2.060
@@ -0,0 +1,1102 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.060
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.060
+Problem:    When a spell files has many compound rules it may take a very long
+	    time making the list of suggestions.  Displaying also can be slow
+	    when there are misspelled words.
+	    Can't parse some Hunspell .aff files.
+Solution:   Check if a compounding can possibly work before trying a
+	    combination, if the compound rules don't contain wildcards.
+	    Implement using CHECKCOMPOUNDPATTERN.
+	    Ignore COMPOUNDRULES.  Ignore a comment after most items.
+	    Accept ONLYINCOMPOUND as an alias for NEEDCOMPOUND.
+	    Accept FORBIDDENWORD as an alias for BAD.
+Files:	    runtime/doc/spell.txt, src/spell.c
+
+
+*** ../vim-7.2.059/runtime/doc/spell.txt	Sat Aug  9 19:36:52 2008
+--- runtime/doc/spell.txt	Sun Nov 30 16:30:02 2008
+***************
+*** 1,4 ****
+! *spell.txt*	For Vim version 7.2.  Last change: 2008 Jun 21
+  
+  
+  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+--- 1,4 ----
+! *spell.txt*	For Vim version 7.2.  Last change: 2008 Nov 30
+  
+  
+  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+***************
+*** 831,838 ****
+  
+  	# comment line ~
+  
+! With some items it's also possible to put a comment after it, but this isn't
+! supported in general.
+  
+  
+  ENCODING							*spell-SET*
+--- 831,841 ----
+  
+  	# comment line ~
+  
+! Items with a fixed number of arguments can be followed by a comment.  But only
+! if none of the arguments can contain white space.  The comment must start with
+! a "#" character.  Example:
+! 
+! 	KEEPCASE =  # fix case for words with this flag ~
+  
+  
+  ENCODING							*spell-SET*
+***************
+*** 965,970 ****
+--- 968,976 ----
+  
+  Note: When using utf-8 only characters up to 65000 may be used for flags.
+  
++ Note: even when using "num" or "long" the number of flags available to
++ compounding and prefixes is limited to about 250.
++ 
+  
+  AFFIXES
+  					    *spell-PFX* *spell-SFX*
+***************
+*** 1178,1183 ****
+--- 1185,1193 ----
+  The flag also applies to the word with affixes, thus this can be used to mark
+  a whole bunch of related words as bad.
+  
++ 							*spell-FORBIDDENWORD*
++ FORBIDDENWORD can be used just like BAD.  For compatibility with Hunspell.
++ 
+  							*spell-NEEDAFFIX*
+  The NEEDAFFIX flag is used to require that a word is used with an affix.  The
+  word itself is not a good word (unless there is an empty affix).  Example:
+***************
+*** 1268,1273 ****
+--- 1278,1287 ----
+  
+  	NEEDCOMPOUND & ~
+  
++ 							*spell-ONLYINCOMPOUND*
++ The ONLYINCOMPOUND does exactly the same as NEEDCOMPOUND.  Supported for
++ compatiblity with Hunspell.
++ 
+  							*spell-COMPOUNDMIN*
+  The minimal character length of a word used for compounding is specified with
+  COMPOUNDMIN.  Example:
+***************
+*** 1328,1333 ****
+--- 1342,1361 ----
+  rules.  Can also be used for an affix to count the affix as a compounding
+  word.
+  
++ 						*spell-CHECKCOMPOUNDPATTERN*
++ CHECKCOMPOUNDPATTERN is used to define patterns that, when matching at the
++ position where two words are compounded together forbids the compound.
++ For example:
++ 	CHECKCOMPOUNDPATTERN o e ~
++ 
++ This forbids compounding if the first word ends in "o" and the second word
++ starts with "e".
++ 
++ The arguments must be plain text, no patterns are actually supported, despite
++ the item name.  Case is always ignored.
++ 
++ The Hunspell feature to use three arguments and flags is not supported.
++ 
+  							*spell-SYLLABLE*
+  The SYLLABLE item defines characters or character sequences that are used to
+  count the number of syllables in a word.  Example:
+***************
+*** 1496,1501 ****
+--- 1524,1533 ----
+  ACCENT		(Hunspell)				*spell-ACCENT*
+  		Use MAP instead. |spell-MAP|
+  
++ BREAK		(Hunspell)				*spell-BREAK*
++ 		Define break points.  Unclear how it works exactly.
++ 		Not supported.
++ 
+  CHECKCOMPOUNDCASE  (Hunspell)			*spell-CHECKCOMPOUNDCASE*
+  		Disallow uppercase letters at compound word boundaries.
+  		Not supported.
+***************
+*** 1512,1520 ****
+  		Forbid three identical characters when compounding.  Not
+  		supported.
+  
+- CHECKCOMPOUNDPATTERN  (Hunspell)		*spell-CHECKCOMPOUNDPATTERN*
+- 		Forbid compounding when patterns match.  Not supported.
+- 
+  COMPLEXPREFIXES  (Hunspell)				*spell-COMPLEXPREFIXES*
+  		Enables using two prefixes.  Not supported.
+  
+--- 1544,1549 ----
+***************
+*** 1536,1548 ****
+  COMPOUNDMIDDLE	(Hunspell)				*spell-COMPOUNDMIDDLE*
+  		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
+  
+  COMPOUNDSYLLABLE  (Hunspell)			*spell-COMPOUNDSYLLABLE*
+  		Use SYLLABLE and COMPOUNDSYLMAX instead. |spell-SYLLABLE|
+  		|spell-COMPOUNDSYLMAX|
+  
+! FORBIDDENWORD	(Hunspell)				*spell-FORBIDDENWORD*
+! 		Use BAD instead. |spell-BAD|
+! 
+  LANG		(Hunspell)				*spell-LANG*
+  		This specifies language-specific behavior.  This actually
+  		moves part of the language knowledge into the program,
+--- 1565,1582 ----
+  COMPOUNDMIDDLE	(Hunspell)				*spell-COMPOUNDMIDDLE*
+  		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
+  
++ COMPOUNDRULES	(Hunspell)				*spell-COMPOUNDRULES*
++ 		Number of COMPOUNDRULE lines following.  Ignored, but the
++ 		argument must be a number.
++ 
+  COMPOUNDSYLLABLE  (Hunspell)			*spell-COMPOUNDSYLLABLE*
+  		Use SYLLABLE and COMPOUNDSYLMAX instead. |spell-SYLLABLE|
+  		|spell-COMPOUNDSYLMAX|
+  
+! KEY		(Hunspell)				*spell-KEY*
+! 		Define characters that are close together on the keyboard.
+! 		Used to give better suggestions.  Not supported.
+! 		
+  LANG		(Hunspell)				*spell-LANG*
+  		This specifies language-specific behavior.  This actually
+  		moves part of the language knowledge into the program,
+***************
+*** 1553,1562 ****
+  		Only needed for morphological analysis.
+  
+  MAXNGRAMSUGS	(Hunspell)				*spell-MAXNGRAMSUGS*
+! 		Not supported.
+! 
+! ONLYINCOMPOUND	(Hunspell)				*spell-ONLYINCOMPOUND*
+! 		Use NEEDCOMPOUND instead. |spell-NEEDCOMPOUND|
+  
+  PSEUDOROOT	(Hunspell)				*spell-PSEUDOROOT*
+  		Use NEEDAFFIX instead. |spell-NEEDAFFIX|
+--- 1587,1593 ----
+  		Only needed for morphological analysis.
+  
+  MAXNGRAMSUGS	(Hunspell)				*spell-MAXNGRAMSUGS*
+! 		Set number of n-gram suggestions.  Not supported.
+  
+  PSEUDOROOT	(Hunspell)				*spell-PSEUDOROOT*
+  		Use NEEDAFFIX instead. |spell-NEEDAFFIX|
+*** ../vim-7.2.059/src/spell.c	Sat Nov 29 20:18:44 2008
+--- src/spell.c	Sun Nov 30 20:59:13 2008
+***************
+*** 469,474 ****
+--- 469,475 ----
+      garray_T	sl_comppat;	/* CHECKCOMPOUNDPATTERN items */
+      regprog_T	*sl_compprog;	/* COMPOUNDRULE turned into a regexp progrm
+  				 * (NULL when no compounding) */
++     char_u	*sl_comprules;	/* all COMPOUNDRULE concatenated (or NULL) */
+      char_u	*sl_compstartflags; /* flags for first compound word */
+      char_u	*sl_compallflags; /* all flags for compound words */
+      char_u	sl_nobreak;	/* When TRUE: no spaces between words */
+***************
+*** 839,845 ****
+--- 840,849 ----
+  static void slang_clear __ARGS((slang_T *lp));
+  static void slang_clear_sug __ARGS((slang_T *lp));
+  static void find_word __ARGS((matchinf_T *mip, int mode));
++ static int match_checkcompoundpattern __ARGS((char_u *ptr, int wlen, garray_T *gap));
+  static int can_compound __ARGS((slang_T *slang, char_u *word, char_u *flags));
++ static int can_be_compound __ARGS((trystate_T *sp, slang_T *slang, char_u *compflags, int flag));
++ static int match_compoundrule __ARGS((slang_T *slang, char_u *compflags));
+  static int valid_word_prefix __ARGS((int totprefcnt, int arridx, int flags, char_u *word, slang_T *slang, int cond_req));
+  static void find_prefix __ARGS((matchinf_T *mip, int mode));
+  static int fold_more __ARGS((matchinf_T *mip));
+***************
+*** 1519,1524 ****
+--- 1523,1533 ----
+  					    ((unsigned)flags >> 24)))
+  		    continue;
+  
++ 		/* If there is a match with a CHECKCOMPOUNDPATTERN rule
++ 		 * discard the compound word. */
++ 		if (match_checkcompoundpattern(ptr, wlen, &slang->sl_comppat))
++ 		    continue;
++ 
+  		if (mode == FIND_COMPOUND)
+  		{
+  		    int	    capflags;
+***************
+*** 1577,1582 ****
+--- 1586,1596 ----
+  		    if (!can_compound(slang, fword, mip->mi_compflags))
+  			continue;
+  		}
++ 		else if (slang->sl_comprules != NULL
++ 			     && !match_compoundrule(slang, mip->mi_compflags))
++ 		    /* The compound flags collected so far do not match any
++ 		     * COMPOUNDRULE, discard the compounded word. */
++ 		    continue;
+  	    }
+  
+  	    /* Check NEEDCOMPOUND: can't use word without compounding. */
+***************
+*** 1727,1732 ****
+--- 1741,1779 ----
+  }
+  
+  /*
++  * Return TRUE if there is a match between the word ptr[wlen] and
++  * CHECKCOMPOUNDPATTERN rules, assuming that we will concatenate with another
++  * word.
++  * A match means that the first part of CHECKCOMPOUNDPATTERN matches at the
++  * end of ptr[wlen] and the second part matches after it.
++  */
++     static int
++ match_checkcompoundpattern(ptr, wlen, gap)
++     char_u	*ptr;
++     int		wlen;
++     garray_T	*gap;  /* &sl_comppat */
++ {
++     int		i;
++     char_u	*p;
++     int		len;
++ 
++     for (i = 0; i + 1 < gap->ga_len; i += 2)
++     {
++ 	p = ((char_u **)gap->ga_data)[i + 1];
++ 	if (STRNCMP(ptr + wlen, p, STRLEN(p)) == 0)
++ 	{
++ 	    /* Second part matches at start of following compound word, now
++ 	     * check if first part matches at end of previous word. */
++ 	    p = ((char_u **)gap->ga_data)[i];
++ 	    len = STRLEN(p);
++ 	    if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0)
++ 		return TRUE;
++ 	}
++     }
++     return FALSE;
++ }
++ 
++ /*
+   * Return TRUE if "flags" is a valid sequence of compound flags and "word"
+   * does not have too many syllables.
+   */
+***************
+*** 1773,1778 ****
+--- 1820,1917 ----
+  }
+  
+  /*
++  * Return TRUE when the sequence of flags in "compflags" plus "flag" can
++  * possibly form a valid compounded word.  This also checks the COMPOUNDRULE
++  * lines if they don't contain wildcards.
++  */
++     static int
++ can_be_compound(sp, slang, compflags, flag)
++     trystate_T	*sp;
++     slang_T	*slang;
++     char_u	*compflags;
++     int		flag;
++ {
++     /* If the flag doesn't appear in sl_compstartflags or sl_compallflags
++      * then it can't possibly compound. */
++     if (!byte_in_str(sp->ts_complen == sp->ts_compsplit
++ 		? slang->sl_compstartflags : slang->sl_compallflags, flag))
++ 	return FALSE;
++ 
++     /* If there are no wildcards, we can check if the flags collected so far
++      * possibly can form a match with COMPOUNDRULE patterns.  This only
++      * makes sense when we have two or more words. */
++     if (slang->sl_comprules != NULL && sp->ts_complen > sp->ts_compsplit)
++     {
++ 	int v;
++ 
++ 	compflags[sp->ts_complen] = flag;
++ 	compflags[sp->ts_complen + 1] = NUL;
++ 	v = match_compoundrule(slang, compflags + sp->ts_compsplit);
++ 	compflags[sp->ts_complen] = NUL;
++ 	return v;
++     }
++ 
++     return TRUE;
++ }
++ 
++ 
++ /*
++  * Return TRUE if the compound flags in compflags[] match the start of any
++  * compound rule.  This is used to stop trying a compound if the flags
++  * collected so far can't possibly match any compound rule.
++  * Caller must check that slang->sl_comprules is not NULL.
++  */
++     static int
++ match_compoundrule(slang, compflags)
++     slang_T	*slang;
++     char_u	*compflags;
++ {
++     char_u	*p;
++     int		i;
++     int		c;
++ 
++     /* loop over all the COMPOUNDRULE entries */
++     for (p = slang->sl_comprules; *p != NUL; ++p)
++     {
++ 	/* loop over the flags in the compound word we have made, match
++ 	 * them against the current rule entry */
++ 	for (i = 0; ; ++i)
++ 	{
++ 	    c = compflags[i];
++ 	    if (c == NUL)
++ 		/* found a rule that matches for the flags we have so far */
++ 		return TRUE;
++ 	    if (*p == '/' || *p == NUL)
++ 		break;  /* end of rule, it's too short */
++ 	    if (*p == '[')
++ 	    {
++ 		int match = FALSE;
++ 
++ 		/* compare against all the flags in [] */
++ 		++p;
++ 		while (*p != ']' && *p != NUL)
++ 		    if (*p++ == c)
++ 			match = TRUE;
++ 		if (!match)
++ 		    break;  /* none matches */
++ 	    }
++ 	    else if (*p != c)
++ 		break;  /* flag of word doesn't match flag in pattern */
++ 	    ++p;
++ 	}
++ 
++ 	/* Skip to the next "/", where the next pattern starts. */
++ 	p = vim_strchr(p, '/');
++ 	if (p == NULL)
++ 	    break;
++     }
++ 
++     /* Checked all the rules and none of them match the flags, so there
++      * can't possibly be a compound starting with these flags. */
++     return FALSE;
++ }
++ 
++ /*
+   * Return non-zero if the prefix indicated by "arridx" matches with the prefix
+   * ID in "flags" for the word "word".
+   * The WF_RAREPFX flag is included in the return value for a rare prefix.
+***************
+*** 2513,2521 ****
+--- 2652,2662 ----
+      lp->sl_midword = NULL;
+  
+      vim_free(lp->sl_compprog);
++     vim_free(lp->sl_comprules);
+      vim_free(lp->sl_compstartflags);
+      vim_free(lp->sl_compallflags);
+      lp->sl_compprog = NULL;
++     lp->sl_comprules = NULL;
+      lp->sl_compstartflags = NULL;
+      lp->sl_compallflags = NULL;
+  
+***************
+*** 3460,3465 ****
+--- 3601,3607 ----
+      char_u	*pp;
+      char_u	*cp;
+      char_u	*ap;
++     char_u	*crp;
+      int		cnt;
+      garray_T	*gap;
+  
+***************
+*** 3545,3550 ****
+--- 3687,3698 ----
+      slang->sl_compallflags = ap;
+      *ap = NUL;
+  
++     /* And a list of all patterns in their original form, for checking whether
++      * compounding may work in match_compoundrule().  This is freed when we
++      * encounter a wildcard, the check doesn't work then. */
++     crp = alloc(todo + 1);
++     slang->sl_comprules = crp;
++ 
+      pp = pat;
+      *pp++ = '^';
+      *pp++ = '\\';
+***************
+*** 3587,3592 ****
+--- 3735,3754 ----
+  		    atstart = 0;
+  	    }
+  	}
++ 
++ 	/* Copy flag to "sl_comprules", unless we run into a wildcard. */
++ 	if (crp != NULL)
++ 	{
++ 	    if (c == '+' || c == '*')
++ 	    {
++ 		vim_free(slang->sl_comprules);
++ 		slang->sl_comprules = NULL;
++ 		crp = NULL;
++ 	    }
++ 	    else
++ 		*crp++ = c;
++ 	}
++ 
+  	if (c == '/')	    /* slash separates two items */
+  	{
+  	    *pp++ = '\\';
+***************
+*** 3611,3616 ****
+--- 3773,3781 ----
+      *pp++ = '$';
+      *pp = NUL;
+  
++     if (crp != NULL)
++ 	*crp = NUL;
++ 
+      slang->sl_compprog = vim_regcomp(pat, RE_MAGIC + RE_STRING + RE_STRICT);
+      vim_free(pat);
+      if (slang->sl_compprog == NULL)
+***************
+*** 4915,4920 ****
+--- 5080,5086 ----
+  } spellinfo_T;
+  
+  static afffile_T *spell_read_aff __ARGS((spellinfo_T *spin, char_u *fname));
++ static int is_aff_rule __ARGS((char_u **items, int itemcnt, char *rulename, int	 mincount));
+  static void aff_process_flags __ARGS((afffile_T *affile, affentry_T *entry));
+  static int spell_info_item __ARGS((char_u *s));
+  static unsigned affitem2flag __ARGS((int flagtype, char_u *item, char_u	*fname, int lnum));
+***************
+*** 5223,5230 ****
+  	/* Handle non-empty lines. */
+  	if (itemcnt > 0)
+  	{
+! 	    if (STRCMP(items[0], "SET") == 0 && itemcnt == 2
+! 						       && aff->af_enc == NULL)
+  	    {
+  #ifdef FEAT_MBYTE
+  		/* Setup for conversion from "ENC" to 'encoding'. */
+--- 5389,5395 ----
+  	/* Handle non-empty lines. */
+  	if (itemcnt > 0)
+  	{
+! 	    if (is_aff_rule(items, itemcnt, "SET", 2) && aff->af_enc == NULL)
+  	    {
+  #ifdef FEAT_MBYTE
+  		/* Setup for conversion from "ENC" to 'encoding'. */
+***************
+*** 5239,5245 ****
+  		    smsg((char_u *)_("Conversion in %s not supported"), fname);
+  #endif
+  	    }
+! 	    else if (STRCMP(items[0], "FLAG") == 0 && itemcnt == 2
+  					      && aff->af_flagtype == AFT_CHAR)
+  	    {
+  		if (STRCMP(items[1], "long") == 0)
+--- 5404,5410 ----
+  		    smsg((char_u *)_("Conversion in %s not supported"), fname);
+  #endif
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "FLAG", 2)
+  					      && aff->af_flagtype == AFT_CHAR)
+  	    {
+  		if (STRCMP(items[1], "long") == 0)
+***************
+*** 5284,5352 ****
+  			spin->si_info = p;
+  		    }
+  	    }
+! 	    else if (STRCMP(items[0], "MIDWORD") == 0 && itemcnt == 2
+  							   && midword == NULL)
+  	    {
+  		midword = getroom_save(spin, items[1]);
+  	    }
+! 	    else if (STRCMP(items[0], "TRY") == 0 && itemcnt == 2)
+  	    {
+  		/* ignored, we look in the tree for what chars may appear */
+  	    }
+  	    /* TODO: remove "RAR" later */
+! 	    else if ((STRCMP(items[0], "RAR") == 0
+! 			|| STRCMP(items[0], "RARE") == 0) && itemcnt == 2
+! 						       && aff->af_rare == 0)
+  	    {
+  		aff->af_rare = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+  	    /* TODO: remove "KEP" later */
+! 	    else if ((STRCMP(items[0], "KEP") == 0
+! 		    || STRCMP(items[0], "KEEPCASE") == 0) && itemcnt == 2
+  						     && aff->af_keepcase == 0)
+  	    {
+  		aff->af_keepcase = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (STRCMP(items[0], "BAD") == 0 && itemcnt == 2
+! 						       && aff->af_bad == 0)
+  	    {
+  		aff->af_bad = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (STRCMP(items[0], "NEEDAFFIX") == 0 && itemcnt == 2
+  						    && aff->af_needaffix == 0)
+  	    {
+  		aff->af_needaffix = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (STRCMP(items[0], "CIRCUMFIX") == 0 && itemcnt == 2
+  						    && aff->af_circumfix == 0)
+  	    {
+  		aff->af_circumfix = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (STRCMP(items[0], "NOSUGGEST") == 0 && itemcnt == 2
+  						    && aff->af_nosuggest == 0)
+  	    {
+  		aff->af_nosuggest = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (STRCMP(items[0], "NEEDCOMPOUND") == 0 && itemcnt == 2
+  						     && aff->af_needcomp == 0)
+  	    {
+  		aff->af_needcomp = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (STRCMP(items[0], "COMPOUNDROOT") == 0 && itemcnt == 2
+  						     && aff->af_comproot == 0)
+  	    {
+  		aff->af_comproot = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (STRCMP(items[0], "COMPOUNDFORBIDFLAG") == 0
+! 				   && itemcnt == 2 && aff->af_compforbid == 0)
+  	    {
+  		aff->af_compforbid = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+--- 5449,5519 ----
+  			spin->si_info = p;
+  		    }
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "MIDWORD", 2)
+  							   && midword == NULL)
+  	    {
+  		midword = getroom_save(spin, items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "TRY", 2))
+  	    {
+  		/* ignored, we look in the tree for what chars may appear */
+  	    }
+  	    /* TODO: remove "RAR" later */
+! 	    else if ((is_aff_rule(items, itemcnt, "RAR", 2)
+! 			|| is_aff_rule(items, itemcnt, "RARE", 2))
+! 							 && aff->af_rare == 0)
+  	    {
+  		aff->af_rare = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+  	    /* TODO: remove "KEP" later */
+! 	    else if ((is_aff_rule(items, itemcnt, "KEP", 2)
+! 			|| is_aff_rule(items, itemcnt, "KEEPCASE", 2))
+  						     && aff->af_keepcase == 0)
+  	    {
+  		aff->af_keepcase = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if ((is_aff_rule(items, itemcnt, "BAD", 2)
+! 			|| is_aff_rule(items, itemcnt, "FORBIDDENWORD", 2))
+! 							  && aff->af_bad == 0)
+  	    {
+  		aff->af_bad = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "NEEDAFFIX", 2)
+  						    && aff->af_needaffix == 0)
+  	    {
+  		aff->af_needaffix = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "CIRCUMFIX", 2)
+  						    && aff->af_circumfix == 0)
+  	    {
+  		aff->af_circumfix = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "NOSUGGEST", 2)
+  						    && aff->af_nosuggest == 0)
+  	    {
+  		aff->af_nosuggest = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if ((is_aff_rule(items, itemcnt, "NEEDCOMPOUND", 2)
+! 			|| is_aff_rule(items, itemcnt, "ONLYINCOMPOUND", 2))
+  						     && aff->af_needcomp == 0)
+  	    {
+  		aff->af_needcomp = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "COMPOUNDROOT", 2)
+  						     && aff->af_comproot == 0)
+  	    {
+  		aff->af_comproot = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "COMPOUNDFORBIDFLAG", 2)
+! 						   && aff->af_compforbid == 0)
+  	    {
+  		aff->af_compforbid = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+***************
+*** 5354,5361 ****
+  		    smsg((char_u *)_("Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"),
+  			    fname, lnum);
+  	    }
+! 	    else if (STRCMP(items[0], "COMPOUNDPERMITFLAG") == 0
+! 				   && itemcnt == 2 && aff->af_comppermit == 0)
+  	    {
+  		aff->af_comppermit = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+--- 5521,5528 ----
+  		    smsg((char_u *)_("Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"),
+  			    fname, lnum);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "COMPOUNDPERMITFLAG", 2)
+! 						   && aff->af_comppermit == 0)
+  	    {
+  		aff->af_comppermit = affitem2flag(aff->af_flagtype, items[1],
+  								 fname, lnum);
+***************
+*** 5363,5369 ****
+  		    smsg((char_u *)_("Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"),
+  			    fname, lnum);
+  	    }
+! 	    else if (STRCMP(items[0], "COMPOUNDFLAG") == 0 && itemcnt == 2
+  							 && compflags == NULL)
+  	    {
+  		/* Turn flag "c" into COMPOUNDRULE compatible string "c+",
+--- 5530,5536 ----
+  		    smsg((char_u *)_("Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"),
+  			    fname, lnum);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "COMPOUNDFLAG", 2)
+  							 && compflags == NULL)
+  	    {
+  		/* Turn flag "c" into COMPOUNDRULE compatible string "c+",
+***************
+*** 5376,5382 ****
+  		    compflags = p;
+  		}
+  	    }
+! 	    else if (STRCMP(items[0], "COMPOUNDRULE") == 0 && itemcnt == 2)
+  	    {
+  		/* Concatenate this string to previously defined ones, using a
+  		 * slash to separate them. */
+--- 5543,5557 ----
+  		    compflags = p;
+  		}
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "COMPOUNDRULES", 2))
+! 	    {
+! 		/* We don't use the count, but do check that it's a number and
+! 		 * not COMPOUNDRULE mistyped. */
+! 		if (atoi((char *)items[1]) == 0)
+! 		    smsg((char_u *)_("Wrong COMPOUNDRULES value in %s line %d: %s"),
+! 						       fname, lnum, items[1]);
+! 	    }
+! 	    else if (is_aff_rule(items, itemcnt, "COMPOUNDRULE", 2))
+  	    {
+  		/* Concatenate this string to previously defined ones, using a
+  		 * slash to separate them. */
+***************
+*** 5395,5401 ****
+  		    compflags = p;
+  		}
+  	    }
+! 	    else if (STRCMP(items[0], "COMPOUNDWORDMAX") == 0 && itemcnt == 2
+  							      && compmax == 0)
+  	    {
+  		compmax = atoi((char *)items[1]);
+--- 5570,5576 ----
+  		    compflags = p;
+  		}
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "COMPOUNDWORDMAX", 2)
+  							      && compmax == 0)
+  	    {
+  		compmax = atoi((char *)items[1]);
+***************
+*** 5403,5409 ****
+  		    smsg((char_u *)_("Wrong COMPOUNDWORDMAX value in %s line %d: %s"),
+  						       fname, lnum, items[1]);
+  	    }
+! 	    else if (STRCMP(items[0], "COMPOUNDMIN") == 0 && itemcnt == 2
+  							   && compminlen == 0)
+  	    {
+  		compminlen = atoi((char *)items[1]);
+--- 5578,5584 ----
+  		    smsg((char_u *)_("Wrong COMPOUNDWORDMAX value in %s line %d: %s"),
+  						       fname, lnum, items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "COMPOUNDMIN", 2)
+  							   && compminlen == 0)
+  	    {
+  		compminlen = atoi((char *)items[1]);
+***************
+*** 5411,5417 ****
+  		    smsg((char_u *)_("Wrong COMPOUNDMIN value in %s line %d: %s"),
+  						       fname, lnum, items[1]);
+  	    }
+! 	    else if (STRCMP(items[0], "COMPOUNDSYLMAX") == 0 && itemcnt == 2
+  							   && compsylmax == 0)
+  	    {
+  		compsylmax = atoi((char *)items[1]);
+--- 5586,5592 ----
+  		    smsg((char_u *)_("Wrong COMPOUNDMIN value in %s line %d: %s"),
+  						       fname, lnum, items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "COMPOUNDSYLMAX", 2)
+  							   && compsylmax == 0)
+  	    {
+  		compsylmax = atoi((char *)items[1]);
+***************
+*** 5419,5450 ****
+  		    smsg((char_u *)_("Wrong COMPOUNDSYLMAX value in %s line %d: %s"),
+  						       fname, lnum, items[1]);
+  	    }
+! 	    else if (STRCMP(items[0], "CHECKCOMPOUNDDUP") == 0 && itemcnt == 1)
+  	    {
+  		compoptions |= COMP_CHECKDUP;
+  	    }
+! 	    else if (STRCMP(items[0], "CHECKCOMPOUNDREP") == 0 && itemcnt == 1)
+  	    {
+  		compoptions |= COMP_CHECKREP;
+  	    }
+! 	    else if (STRCMP(items[0], "CHECKCOMPOUNDCASE") == 0 && itemcnt == 1)
+  	    {
+  		compoptions |= COMP_CHECKCASE;
+  	    }
+! 	    else if (STRCMP(items[0], "CHECKCOMPOUNDTRIPLE") == 0
+! 							      && itemcnt == 1)
+  	    {
+  		compoptions |= COMP_CHECKTRIPLE;
+  	    }
+! 	    else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
+! 							      && itemcnt == 2)
+  	    {
+  		if (atoi((char *)items[1]) == 0)
+  		    smsg((char_u *)_("Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"),
+  						       fname, lnum, items[1]);
+  	    }
+! 	    else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
+! 							      && itemcnt == 3)
+  	    {
+  		garray_T    *gap = &spin->si_comppat;
+  		int	    i;
+--- 5594,5622 ----
+  		    smsg((char_u *)_("Wrong COMPOUNDSYLMAX value in %s line %d: %s"),
+  						       fname, lnum, items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDDUP", 1))
+  	    {
+  		compoptions |= COMP_CHECKDUP;
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDREP", 1))
+  	    {
+  		compoptions |= COMP_CHECKREP;
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDCASE", 1))
+  	    {
+  		compoptions |= COMP_CHECKCASE;
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDTRIPLE", 1))
+  	    {
+  		compoptions |= COMP_CHECKTRIPLE;
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 2))
+  	    {
+  		if (atoi((char *)items[1]) == 0)
+  		    smsg((char_u *)_("Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"),
+  						       fname, lnum, items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 3))
+  	    {
+  		garray_T    *gap = &spin->si_comppat;
+  		int	    i;
+***************
+*** 5463,5486 ****
+  					       = getroom_save(spin, items[2]);
+  		}
+  	    }
+! 	    else if (STRCMP(items[0], "SYLLABLE") == 0 && itemcnt == 2
+  							  && syllable == NULL)
+  	    {
+  		syllable = getroom_save(spin, items[1]);
+  	    }
+! 	    else if (STRCMP(items[0], "NOBREAK") == 0 && itemcnt == 1)
+  	    {
+  		spin->si_nobreak = TRUE;
+  	    }
+! 	    else if (STRCMP(items[0], "NOSPLITSUGS") == 0 && itemcnt == 1)
+  	    {
+  		spin->si_nosplitsugs = TRUE;
+  	    }
+! 	    else if (STRCMP(items[0], "NOSUGFILE") == 0 && itemcnt == 1)
+  	    {
+  		spin->si_nosugfile = TRUE;
+  	    }
+! 	    else if (STRCMP(items[0], "PFXPOSTPONE") == 0 && itemcnt == 1)
+  	    {
+  		aff->af_pfxpostpone = TRUE;
+  	    }
+--- 5635,5658 ----
+  					       = getroom_save(spin, items[2]);
+  		}
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "SYLLABLE", 2)
+  							  && syllable == NULL)
+  	    {
+  		syllable = getroom_save(spin, items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "NOBREAK", 1))
+  	    {
+  		spin->si_nobreak = TRUE;
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "NOSPLITSUGS", 1))
+  	    {
+  		spin->si_nosplitsugs = TRUE;
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "NOSUGFILE", 1))
+  	    {
+  		spin->si_nosugfile = TRUE;
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "PFXPOSTPONE", 1))
+  	    {
+  		aff->af_pfxpostpone = TRUE;
+  	    }
+***************
+*** 5771,5794 ****
+  		    }
+  		}
+  	    }
+! 	    else if (STRCMP(items[0], "FOL") == 0 && itemcnt == 2
+! 							       && fol == NULL)
+  	    {
+  		fol = vim_strsave(items[1]);
+  	    }
+! 	    else if (STRCMP(items[0], "LOW") == 0 && itemcnt == 2
+! 							       && low == NULL)
+  	    {
+  		low = vim_strsave(items[1]);
+  	    }
+! 	    else if (STRCMP(items[0], "UPP") == 0 && itemcnt == 2
+! 							       && upp == NULL)
+  	    {
+  		upp = vim_strsave(items[1]);
+  	    }
+! 	    else if ((STRCMP(items[0], "REP") == 0
+! 			|| STRCMP(items[0], "REPSAL") == 0)
+! 		    && itemcnt == 2)
+  	    {
+  		/* Ignore REP/REPSAL count */;
+  		if (!isdigit(*items[1]))
+--- 5943,5962 ----
+  		    }
+  		}
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "FOL", 2) && fol == NULL)
+  	    {
+  		fol = vim_strsave(items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "LOW", 2) && low == NULL)
+  	    {
+  		low = vim_strsave(items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "UPP", 2) && upp == NULL)
+  	    {
+  		upp = vim_strsave(items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "REP", 2)
+! 		     || is_aff_rule(items, itemcnt, "REPSAL", 2))
+  	    {
+  		/* Ignore REP/REPSAL count */;
+  		if (!isdigit(*items[1]))
+***************
+*** 5819,5825 ****
+  					 : &spin->si_rep, items[1], items[2]);
+  		}
+  	    }
+! 	    else if (STRCMP(items[0], "MAP") == 0 && itemcnt == 2)
+  	    {
+  		/* MAP item or count */
+  		if (!found_map)
+--- 5987,5993 ----
+  					 : &spin->si_rep, items[1], items[2]);
+  		}
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "MAP", 2))
+  	    {
+  		/* MAP item or count */
+  		if (!found_map)
+***************
+*** 5856,5864 ****
+  		    ga_append(&spin->si_map, '/');
+  		}
+  	    }
+! 	    /* Accept "SAL from to" and "SAL from to # comment". */
+! 	    else if (STRCMP(items[0], "SAL") == 0
+! 		    && (itemcnt == 3 || (itemcnt > 3 && items[3][0] == '#')))
+  	    {
+  		if (do_sal)
+  		{
+--- 6024,6031 ----
+  		    ga_append(&spin->si_map, '/');
+  		}
+  	    }
+! 	    /* Accept "SAL from to" and "SAL from to  #comment". */
+! 	    else if (is_aff_rule(items, itemcnt, "SAL", 3))
+  	    {
+  		if (do_sal)
+  		{
+***************
+*** 5877,5888 ****
+  								: items[2]);
+  		}
+  	    }
+! 	    else if (STRCMP(items[0], "SOFOFROM") == 0 && itemcnt == 2
+  							  && sofofrom == NULL)
+  	    {
+  		sofofrom = getroom_save(spin, items[1]);
+  	    }
+! 	    else if (STRCMP(items[0], "SOFOTO") == 0 && itemcnt == 2
+  							    && sofoto == NULL)
+  	    {
+  		sofoto = getroom_save(spin, items[1]);
+--- 6044,6055 ----
+  								: items[2]);
+  		}
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "SOFOFROM", 2)
+  							  && sofofrom == NULL)
+  	    {
+  		sofofrom = getroom_save(spin, items[1]);
+  	    }
+! 	    else if (is_aff_rule(items, itemcnt, "SOFOTO", 2)
+  							    && sofoto == NULL)
+  	    {
+  		sofoto = getroom_save(spin, items[1]);
+***************
+*** 6017,6022 ****
+--- 6184,6205 ----
+  }
+  
+  /*
++  * Return TRUE when items[0] equals "rulename", there are "mincount" items or
++  * a comment is following after item "mincount".
++  */
++     static int
++ is_aff_rule(items, itemcnt, rulename, mincount)
++     char_u	**items;
++     int		itemcnt;
++     char	*rulename;
++     int		mincount;
++ {
++     return (STRCMP(items[0], rulename) == 0
++ 	    && (itemcnt == mincount
++ 		|| (itemcnt > mincount && items[mincount][0] == '#')));
++ }
++ 
++ /*
+   * For affix "entry" move COMPOUNDFORBIDFLAG and COMPOUNDPERMITFLAG from
+   * ae_flags to ae_comppermit and ae_compforbid.
+   */
+***************
+*** 11492,11506 ****
+  		    vim_strncpy(preword + sp->ts_prewordlen,
+  			    tword + sp->ts_splitoff,
+  			    sp->ts_twordlen - sp->ts_splitoff);
+! 		    p = preword;
+! 		    while (*skiptowhite(p) != NUL)
+! 			p = skipwhite(skiptowhite(p));
+! 		    if (fword_ends && !can_compound(slang, p,
+! 						compflags + sp->ts_compsplit))
+! 			/* Compound is not allowed.  But it may still be
+! 			 * possible if we add another (short) word. */
+  			compound_ok = FALSE;
+  
+  		    /* Get pointer to last char of previous word. */
+  		    p = preword + sp->ts_prewordlen;
+  		    mb_ptr_back(preword, p);
+--- 11675,11698 ----
+  		    vim_strncpy(preword + sp->ts_prewordlen,
+  			    tword + sp->ts_splitoff,
+  			    sp->ts_twordlen - sp->ts_splitoff);
+! 
+! 		    /* Verify CHECKCOMPOUNDPATTERN  rules. */
+! 		    if (match_checkcompoundpattern(preword,  sp->ts_prewordlen,
+! 							  &slang->sl_comppat))
+  			compound_ok = FALSE;
+  
++ 		    if (compound_ok)
++ 		    {
++ 			p = preword;
++ 			while (*skiptowhite(p) != NUL)
++ 			    p = skipwhite(skiptowhite(p));
++ 			if (fword_ends && !can_compound(slang, p,
++ 						compflags + sp->ts_compsplit))
++ 			    /* Compound is not allowed.  But it may still be
++ 			     * possible if we add another (short) word. */
++ 			    compound_ok = FALSE;
++ 		    }
++ 
+  		    /* Get pointer to last char of previous word. */
+  		    p = preword + sp->ts_prewordlen;
+  		    mb_ptr_back(preword, p);
+***************
+*** 11697,11706 ****
+  			&& (slang->sl_compsylmax < MAXWLEN
+  			    || sp->ts_complen + 1 - sp->ts_compsplit
+  							  < slang->sl_compmax)
+! 			&& (byte_in_str(sp->ts_complen == sp->ts_compsplit
+! 					    ? slang->sl_compstartflags
+! 					    : slang->sl_compallflags,
+! 						    ((unsigned)flags >> 24))))
+  		{
+  		    try_compound = TRUE;
+  		    compflags[sp->ts_complen] = ((unsigned)flags >> 24);
+--- 11889,11897 ----
+  			&& (slang->sl_compsylmax < MAXWLEN
+  			    || sp->ts_complen + 1 - sp->ts_compsplit
+  							  < slang->sl_compmax)
+! 			&& (can_be_compound(sp, slang,
+! 					 compflags, ((unsigned)flags >> 24))))
+! 
+  		{
+  		    try_compound = TRUE;
+  		    compflags[sp->ts_complen] = ((unsigned)flags >> 24);
+*** ../vim-7.2.059/src/version.c	Sun Nov 30 15:15:56 2008
+--- src/version.c	Sun Nov 30 21:09:23 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     60,
+  /**/
+
+-- 
+DEAD PERSON:  I'm getting better!
+CUSTOMER:     No, you're not -- you'll be stone dead in a moment.
+MORTICIAN:    Oh, I can't take him like that -- it's against regulations.
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.061 b/source/ap/vim/patches/7.2.061
new file mode 100644
index 000000000..787aa66af
--- /dev/null
+++ b/source/ap/vim/patches/7.2.061
@@ -0,0 +1,56 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.061
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.061
+Problem:    Can't create a funcref for an autoload function without loading
+	    the script first. (Marc Weber)
+Solution:   Accept autoload functions that don't exist yet in function().
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.060/src/eval.c	Fri Nov 28 21:26:50 2008
+--- src/eval.c	Sat Nov 29 12:28:51 2008
+***************
+*** 10339,10345 ****
+      s = get_tv_string(&argvars[0]);
+      if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
+  	EMSG2(_(e_invarg2), s);
+!     else if (!function_exists(s))
+  	EMSG2(_("E700: Unknown function: %s"), s);
+      else
+      {
+--- 10339,10346 ----
+      s = get_tv_string(&argvars[0]);
+      if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
+  	EMSG2(_(e_invarg2), s);
+!     /* Don't check an autoload name for existence here. */
+!     else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
+  	EMSG2(_("E700: Unknown function: %s"), s);
+      else
+      {
+*** ../vim-7.2.060/src/version.c	Sun Nov 30 21:11:54 2008
+--- src/version.c	Wed Dec  3 09:49:07 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     61,
+  /**/
+
+-- 
+There are 2 kinds of people in my world: those who know Unix, Perl, Vim, GNU,
+Linux, etc, and those who know COBOL.  It gets very difficult for me at
+parties, not knowing which group to socialise with :-)
+						Sitaram Chamarty
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.062 b/source/ap/vim/patches/7.2.062
new file mode 100644
index 000000000..6b4b8909e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.062
@@ -0,0 +1,55 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.062
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.062
+Problem:    "[Scratch]" is not translated.
+Solution:   Mark the string for translation. (Dominique Pelle)
+Files:	    src/buffer.c
+
+
+*** ../vim-7.2.061/src/buffer.c	Sat Nov 15 16:05:30 2008
+--- src/buffer.c	Tue Dec  2 21:51:02 2008
+***************
+*** 5118,5124 ****
+      {
+  	if (buf->b_sfname != NULL)
+  	    return (char *)buf->b_sfname;
+! 	return "[Scratch]";
+      }
+  #endif
+      if (buf->b_fname == NULL)
+--- 5118,5124 ----
+      {
+  	if (buf->b_sfname != NULL)
+  	    return (char *)buf->b_sfname;
+! 	return _("[Scratch]");
+      }
+  #endif
+      if (buf->b_fname == NULL)
+*** ../vim-7.2.061/src/version.c	Wed Dec  3 09:51:19 2008
+--- src/version.c	Wed Dec  3 11:20:30 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     62,
+  /**/
+
+-- 
+DENNIS:  Listen -- strange women lying in ponds distributing swords is no
+         basis for a system of government.  Supreme executive power derives
+         from a mandate from the masses, not from some farcical aquatic
+         ceremony.
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.063 b/source/ap/vim/patches/7.2.063
new file mode 100644
index 000000000..f95155469
--- /dev/null
+++ b/source/ap/vim/patches/7.2.063
@@ -0,0 +1,103 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.063
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.063
+Problem:    Warning for NULL argument of Perl_sys_init3().
+Solution:   Use Perl_sys_init() instead. (partly by Dominique Pelle)
+Files:	    src/if_perl.xs
+
+
+*** ../vim-7.2.062/src/if_perl.xs	Mon Sep  1 17:56:05 2008
+--- src/if_perl.xs	Wed Dec  3 12:44:38 2008
+***************
+*** 166,172 ****
+  # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr
+  # define boot_DynaLoader dll_boot_DynaLoader
+  
+! # define Perl_sys_init3 dll_Perl_sys_init3
+  # define Perl_sys_term dll_Perl_sys_term
+  # define Perl_ISv_ptr dll_Perl_ISv_ptr
+  # define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr
+--- 166,172 ----
+  # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr
+  # define boot_DynaLoader dll_boot_DynaLoader
+  
+! # define Perl_sys_init dll_Perl_sys_init
+  # define Perl_sys_term dll_Perl_sys_term
+  # define Perl_ISv_ptr dll_Perl_ISv_ptr
+  # define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr
+***************
+*** 272,278 ****
+  
+  #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
+  static void (*Perl_sv_free2)(pTHX_ SV*);
+! static void (*Perl_sys_init3)(int* argc, char*** argv, char*** env);
+  static void (*Perl_sys_term)(void);
+  static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
+  static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
+--- 272,278 ----
+  
+  #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
+  static void (*Perl_sv_free2)(pTHX_ SV*);
+! static void (*Perl_sys_init)(int* argc, char*** argv);
+  static void (*Perl_sys_term)(void);
+  static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
+  static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
+***************
+*** 372,378 ****
+      {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr},
+  #else
+      {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2},
+!     {"Perl_sys_init3", (PERL_PROC*)&Perl_sys_init3},
+      {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term},
+      {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr},
+      {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr},
+--- 372,378 ----
+      {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr},
+  #else
+      {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2},
+!     {"Perl_sys_init", (PERL_PROC*)&Perl_sys_init},
+      {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term},
+      {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr},
+      {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr},
+***************
+*** 460,466 ****
+      static char *argv[] = { "", "-e", "" };
+  
+  #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
+!     Perl_sys_init3(&argc, (char***)&argv, NULL);
+  #endif
+      perl_interp = perl_alloc();
+      perl_construct(perl_interp);
+--- 460,466 ----
+      static char *argv[] = { "", "-e", "" };
+  
+  #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
+!     Perl_sys_init(&argc, (char***)&argv);
+  #endif
+      perl_interp = perl_alloc();
+      perl_construct(perl_interp);
+*** ../vim-7.2.062/src/version.c	Wed Dec  3 11:21:20 2008
+--- src/version.c	Wed Dec  3 12:42:50 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     63,
+  /**/
+
+-- 
+Windows
+M!uqoms
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.064 b/source/ap/vim/patches/7.2.064
new file mode 100644
index 000000000..48ca877ed
--- /dev/null
+++ b/source/ap/vim/patches/7.2.064
@@ -0,0 +1,66 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.064
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.064
+Problem:    Screen update bug when repeating "~" on a Visual block and the
+	    last line doesn't change.
+Solution:   Keep track of changes for all lines.  (Moritz Orbach)
+Files:	    src/ops.c
+
+
+*** ../vim-7.2.063/src/ops.c	Tue Jun 24 23:59:55 2008
+--- src/ops.c	Wed Dec  3 13:12:06 2008
+***************
+*** 2209,2220 ****
+      {
+  	for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
+  	{
+  	    block_prep(oap, &bd, pos.lnum, FALSE);
+  	    pos.col = bd.textcol;
+! 	    did_change = swapchars(oap->op_type, &pos, bd.textlen);
+  
+  # ifdef FEAT_NETBEANS_INTG
+! 	    if (usingNetbeans && did_change)
+  	    {
+  		char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
+  
+--- 2209,2223 ----
+      {
+  	for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
+  	{
++ 	    int one_change;
++ 
+  	    block_prep(oap, &bd, pos.lnum, FALSE);
+  	    pos.col = bd.textcol;
+! 	    one_change = swapchars(oap->op_type, &pos, bd.textlen);
+! 	    did_change |= one_change;
+  
+  # ifdef FEAT_NETBEANS_INTG
+! 	    if (usingNetbeans && one_change)
+  	    {
+  		char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
+  
+*** ../vim-7.2.063/src/version.c	Wed Dec  3 13:18:16 2008
+--- src/version.c	Wed Dec  3 13:14:46 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     64,
+  /**/
+
+-- 
+Q:   How many hardware engineers does it take to change a lightbulb?
+A:   None.  We'll fix it in software.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.065 b/source/ap/vim/patches/7.2.065
new file mode 100644
index 000000000..d2cac8416
--- /dev/null
+++ b/source/ap/vim/patches/7.2.065
@@ -0,0 +1,177 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.065
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.065
+Problem:    GTK GUI: the cursor disappears when doing ":vsp" and the Vim
+	    window is maximized.  (Dominique Pelle, Denis Smolyar)
+Solution:   Don't change "Columns" back to an old value at a wrong moment.
+	    Do change "Rows" when it should not be a problem.
+Files:	    src/gui.c
+
+
+*** ../vim-7.2.064/src/gui.c	Fri Nov 28 21:26:50 2008
+--- src/gui.c	Wed Dec  3 18:01:21 2008
+***************
+*** 3241,3247 ****
+  	    i = Rows;
+  	    gui_update_tabline();
+  	    Rows = i;
+! 	    need_set_size = RESIZE_VERT;
+  	    if (using_tabline)
+  		fix_size = TRUE;
+  	    if (!gui_use_tabline())
+--- 3241,3247 ----
+  	    i = Rows;
+  	    gui_update_tabline();
+  	    Rows = i;
+! 	    need_set_size |= RESIZE_VERT;
+  	    if (using_tabline)
+  		fix_size = TRUE;
+  	    if (!gui_use_tabline())
+***************
+*** 3275,3283 ****
+  		if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
+  		{
+  		    if (i == SBAR_BOTTOM)
+! 			need_set_size = RESIZE_VERT;
+  		    else
+! 			need_set_size = RESIZE_HOR;
+  		    if (gui.which_scrollbars[i])
+  			fix_size = TRUE;
+  		}
+--- 3275,3283 ----
+  		if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
+  		{
+  		    if (i == SBAR_BOTTOM)
+! 			need_set_size |= RESIZE_VERT;
+  		    else
+! 			need_set_size |= RESIZE_HOR;
+  		    if (gui.which_scrollbars[i])
+  			fix_size = TRUE;
+  		}
+***************
+*** 3297,3303 ****
+  	    gui_mch_enable_menu(gui.menu_is_active);
+  	    Rows = i;
+  	    prev_menu_is_active = gui.menu_is_active;
+! 	    need_set_size = RESIZE_VERT;
+  	    if (gui.menu_is_active)
+  		fix_size = TRUE;
+  	}
+--- 3297,3303 ----
+  	    gui_mch_enable_menu(gui.menu_is_active);
+  	    Rows = i;
+  	    prev_menu_is_active = gui.menu_is_active;
+! 	    need_set_size |= RESIZE_VERT;
+  	    if (gui.menu_is_active)
+  		fix_size = TRUE;
+  	}
+***************
+*** 3308,3314 ****
+  	{
+  	    gui_mch_show_toolbar(using_toolbar);
+  	    prev_toolbar = using_toolbar;
+! 	    need_set_size = RESIZE_VERT;
+  	    if (using_toolbar)
+  		fix_size = TRUE;
+  	}
+--- 3308,3314 ----
+  	{
+  	    gui_mch_show_toolbar(using_toolbar);
+  	    prev_toolbar = using_toolbar;
+! 	    need_set_size |= RESIZE_VERT;
+  	    if (using_toolbar)
+  		fix_size = TRUE;
+  	}
+***************
+*** 3318,3324 ****
+  	{
+  	    gui_mch_enable_footer(using_footer);
+  	    prev_footer = using_footer;
+! 	    need_set_size = RESIZE_VERT;
+  	    if (using_footer)
+  		fix_size = TRUE;
+  	}
+--- 3318,3324 ----
+  	{
+  	    gui_mch_enable_footer(using_footer);
+  	    prev_footer = using_footer;
+! 	    need_set_size |= RESIZE_VERT;
+  	    if (using_footer)
+  		fix_size = TRUE;
+  	}
+***************
+*** 3330,3339 ****
+  	    prev_tearoff = using_tearoff;
+  	}
+  #endif
+! 	if (need_set_size)
+  	{
+  #ifdef FEAT_GUI_GTK
+! 	    long    c = Columns;
+  #endif
+  	    /* Adjust the size of the window to make the text area keep the
+  	     * same size and to avoid that part of our window is off-screen
+--- 3330,3340 ----
+  	    prev_tearoff = using_tearoff;
+  	}
+  #endif
+! 	if (need_set_size != 0)
+  	{
+  #ifdef FEAT_GUI_GTK
+! 	    long    prev_Columns = Columns;
+! 	    long    prev_Rows = Rows;
+  #endif
+  	    /* Adjust the size of the window to make the text area keep the
+  	     * same size and to avoid that part of our window is off-screen
+***************
+*** 3349,3359 ****
+  	     * If you remove this, please test this command for resizing
+  	     * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
+  	     * Don't do this while starting up though.
+! 	     * And don't change Rows, it may have be reduced intentionally
+! 	     * when adding menu/toolbar/tabline. */
+! 	    if (!gui.starting)
+  		(void)char_avail();
+! 	    Columns = c;
+  #endif
+  	}
+  #ifdef FEAT_WINDOWS
+--- 3350,3363 ----
+  	     * If you remove this, please test this command for resizing
+  	     * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
+  	     * Don't do this while starting up though.
+! 	     * Don't change Rows when adding menu/toolbar/tabline.
+! 	     * Don't change Columns when adding vertical toolbar. */
+! 	    if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR))
+  		(void)char_avail();
+! 	    if ((need_set_size & RESIZE_VERT) == 0)
+! 		Rows = prev_Rows;
+! 	    if ((need_set_size & RESIZE_HOR) == 0)
+! 		Columns = prev_Columns;
+  #endif
+  	}
+  #ifdef FEAT_WINDOWS
+*** ../vim-7.2.064/src/version.c	Wed Dec  3 13:38:00 2008
+--- src/version.c	Wed Dec  3 18:47:11 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     65,
+  /**/
+
+-- 
+Seen on the back of a biker's vest: If you can read this, my wife fell off.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.066 b/source/ap/vim/patches/7.2.066
new file mode 100644
index 000000000..a5991d428
--- /dev/null
+++ b/source/ap/vim/patches/7.2.066
@@ -0,0 +1,70 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.066
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.066
+Problem:    It's not easy to see whether 'encoding' is a multi-byte encoding.
+Solution:   Add has('multi_byte_encoding').
+Files:	    runtime/doc/eval.txt, src/eval.c
+
+
+*** ../vim-7.2.065/runtime/doc/eval.txt	Fri Nov 28 11:15:10 2008
+--- runtime/doc/eval.txt	Tue Dec  9 10:55:59 2008
+***************
+*** 5841,5847 ****
+  mouse_pterm		Compiled with support for qnx pterm mouse.
+  mouse_sysmouse		Compiled with support for sysmouse (*BSD console mouse)
+  mouse_xterm		Compiled with support for xterm mouse.
+! multi_byte		Compiled with support for editing Korean et al.
+  multi_byte_ime		Compiled with support for IME input method.
+  multi_lang		Compiled with support for multiple languages.
+  mzscheme		Compiled with MzScheme interface |mzscheme|.
+--- 5852,5859 ----
+  mouse_pterm		Compiled with support for qnx pterm mouse.
+  mouse_sysmouse		Compiled with support for sysmouse (*BSD console mouse)
+  mouse_xterm		Compiled with support for xterm mouse.
+! multi_byte		Compiled with support for 'encoding'
+! multi_byte_encoding	'encoding' is set to a multi-byte encoding.
+  multi_byte_ime		Compiled with support for IME input method.
+  multi_lang		Compiled with support for multiple languages.
+  mzscheme		Compiled with MzScheme interface |mzscheme|.
+*** ../vim-7.2.065/src/eval.c	Wed Dec  3 09:51:19 2008
+--- src/eval.c	Wed Dec  3 14:29:09 2008
+***************
+*** 11842,11847 ****
+--- 11842,11851 ----
+  	    n = has_patch(atoi((char *)name + 5));
+  	else if (STRICMP(name, "vim_starting") == 0)
+  	    n = (starting != 0);
++ #ifdef FEAT_MBYTE
++ 	else if (STRICMP(name, "multi_byte_encoding") == 0)
++ 	    n = has_mbyte;
++ #endif
+  #if defined(FEAT_BEVAL) && defined(FEAT_GUI_W32)
+  	else if (STRICMP(name, "balloon_multiline") == 0)
+  	    n = multiline_balloon_available();
+*** ../vim-7.2.065/src/version.c	Wed Dec  3 18:50:09 2008
+--- src/version.c	Tue Dec  9 10:48:49 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     66,
+  /**/
+
+-- 
+ARTHUR: Listen, old crone!  Unless you tell us where we can buy a shrubbery,
+        my friend and I will ... we will say "Ni!"
+CRONE:  Do your worst!
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.067 b/source/ap/vim/patches/7.2.067
new file mode 100644
index 000000000..079a05302
--- /dev/null
+++ b/source/ap/vim/patches/7.2.067
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.067
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.067
+Problem:    Session file can't load extra file when the path contains special
+	    characters.
+Solution:   Escape the file name. (Lech Lorens)
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.2.066/src/ex_docmd.c	Fri Nov 28 21:26:50 2008
+--- src/ex_docmd.c	Fri Dec  5 21:34:11 2008
+***************
+*** 10106,10112 ****
+       */
+      if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
+  	    || put_line(fd, "if file_readable(s:sx)") == FAIL
+! 	    || put_line(fd, "  exe \"source \" . s:sx") == FAIL
+  	    || put_line(fd, "endif") == FAIL)
+  	return FAIL;
+  
+--- 10106,10112 ----
+       */
+      if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
+  	    || put_line(fd, "if file_readable(s:sx)") == FAIL
+! 	    || put_line(fd, "  exe \"source \" . fnameescape(s:sx)") == FAIL
+  	    || put_line(fd, "endif") == FAIL)
+  	return FAIL;
+  
+*** ../vim-7.2.066/src/version.c	Tue Dec  9 10:56:50 2008
+--- src/version.c	Tue Dec  9 11:16:27 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     67,
+  /**/
+
+-- 
+Life is a gift, living is an art.		(Bram Moolenaar)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.068 b/source/ap/vim/patches/7.2.068
new file mode 100644
index 000000000..508bac125
--- /dev/null
+++ b/source/ap/vim/patches/7.2.068
@@ -0,0 +1,101 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.068
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.068
+Problem:    Emacs tags file lines can be too long, resulting in an error
+	    message. (James Vega)
+Solution:   Ignore lines with errors if they are too long.
+Files:	    src/tag.c
+
+
+*** ../vim-7.2.067/src/tag.c	Fri Jul 18 11:26:12 2008
+--- src/tag.c	Sat Dec  6 13:54:33 2008
+***************
+*** 2725,2731 ****
+--- 2725,2748 ----
+  	 */
+  	p_7f = vim_strchr(lbuf, 0x7f);
+  	if (p_7f == NULL)
++ 	{
++ etag_fail:
++ 	    if (vim_strchr(lbuf, '\n') == NULL)
++ 	    {
++ 		/* Truncated line.  Ignore it. */
++ 		if (p_verbose >= 5)
++ 		{
++ 		    verbose_enter();
++ 		    MSG(_("Ignoring long line in tags file"));
++ 		    verbose_leave();
++ 		}
++ 		tagp->command = lbuf;
++ 		tagp->tagname = lbuf;
++ 		tagp->tagname_end = lbuf;
++ 		return OK;
++ 	    }
+  	    return FAIL;
++ 	}
+  
+  	/* Find ^A.  If not found the line number is after the 0x7f */
+  	p = vim_strchr(p_7f, Ctrl_A);
+***************
+*** 2735,2741 ****
+  	    ++p;
+  
+  	if (!VIM_ISDIGIT(*p))	    /* check for start of line number */
+! 	    return FAIL;
+  	tagp->command = p;
+  
+  
+--- 2752,2758 ----
+  	    ++p;
+  
+  	if (!VIM_ISDIGIT(*p))	    /* check for start of line number */
+! 	    goto etag_fail;
+  	tagp->command = p;
+  
+  
+***************
+*** 2749,2755 ****
+  	    /* find end of tagname */
+  	    for (p = p_7f - 1; !vim_iswordc(*p); --p)
+  		if (p == lbuf)
+! 		    return FAIL;
+  	    tagp->tagname_end = p + 1;
+  	    while (p >= lbuf && vim_iswordc(*p))
+  		--p;
+--- 2766,2772 ----
+  	    /* find end of tagname */
+  	    for (p = p_7f - 1; !vim_iswordc(*p); --p)
+  		if (p == lbuf)
+! 		    goto etag_fail;
+  	    tagp->tagname_end = p + 1;
+  	    while (p >= lbuf && vim_iswordc(*p))
+  		--p;
+*** ../vim-7.2.067/src/version.c	Tue Dec  9 11:17:23 2008
+--- src/version.c	Tue Dec  9 12:05:41 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     68,
+  /**/
+
+-- 
+Q: What do you call a fish without an eye?
+A: fsh!
+Q: What do you call a deer with no eyes?
+A: no eye deer.
+Q: What do you call a deer with no eyes and no legs?
+A: still no eye deer.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.069 b/source/ap/vim/patches/7.2.069
new file mode 100644
index 000000000..7714fae9d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.069
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.069
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.069 (after 7.2.060)
+Problem:    Compiler warning for storing size_t in int.
+Solution:   Add type cast.
+Files:      src/spell.c
+
+
+*** ../vim-7.2.068/src/spell.c	Sun Nov 30 21:11:54 2008
+--- src/spell.c	Tue Dec  9 22:19:04 2008
+***************
+*** 1765,1771 ****
+  	    /* Second part matches at start of following compound word, now
+  	     * check if first part matches at end of previous word. */
+  	    p = ((char_u **)gap->ga_data)[i];
+! 	    len = STRLEN(p);
+  	    if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0)
+  		return TRUE;
+  	}
+--- 1765,1771 ----
+  	    /* Second part matches at start of following compound word, now
+  	     * check if first part matches at end of previous word. */
+  	    p = ((char_u **)gap->ga_data)[i];
+! 	    len = (int)STRLEN(p);
+  	    if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0)
+  		return TRUE;
+  	}
+*** ../vim-7.2.068/src/version.c	Tue Dec  9 12:12:31 2008
+--- src/version.c	Tue Dec  9 22:21:15 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     69,
+  /**/
+
+-- 
+The war between Emacs and Vi is over.  Vi has won with 3 to 1.
+			http://www.ssc.com/lg/issue30/raymond.html
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.070 b/source/ap/vim/patches/7.2.070
new file mode 100644
index 000000000..9a7edc785
--- /dev/null
+++ b/source/ap/vim/patches/7.2.070
@@ -0,0 +1,566 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.070
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.070
+Problem:    Crash when a function returns a:000. (Matt Wozkiski)
+Solution:   Don't put the function struct on the stack, allocate it.  Free it
+	    only when nothing in it is used.
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.069/src/eval.c	Tue Dec  9 10:56:50 2008
+--- src/eval.c	Wed Dec 17 21:32:26 2008
+***************
+*** 32,37 ****
+--- 32,40 ----
+  
+  #define DICT_MAXNEST 100	/* maximum nesting of lists and dicts */
+  
++ #define DO_NOT_FREE_CNT 99999	/* refcount for dict or list that should not
++ 				   be freed. */
++ 
+  /*
+   * In a hashtab item "hi_key" points to "di_key" in a dictitem.
+   * This avoids adding a pointer to the hashtab item.
+***************
+*** 789,794 ****
+--- 792,799 ----
+  static void func_unref __ARGS((char_u *name));
+  static void func_ref __ARGS((char_u *name));
+  static void call_user_func __ARGS((ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, linenr_T firstline, linenr_T lastline, dict_T *selfdict));
++ static int can_free_funccal __ARGS((funccall_T *fc, int copyID)) ;
++ static void free_funccal __ARGS((funccall_T *fc, int free_val));
+  static void add_nr_var __ARGS((dict_T *dp, dictitem_T *v, char *name, varnumber_T nr));
+  static win_T *find_win_by_nr __ARGS((typval_T *vp, tabpage_T *tp));
+  static void getwinvar __ARGS((typval_T *argvars, typval_T *rettv, int off));
+***************
+*** 923,928 ****
+--- 928,937 ----
+  /* pointer to funccal for currently active function */
+  funccall_T *current_funccal = NULL;
+  
++ /* pointer to list of previously used funccal, still around because some
++  * item in it is still being used. */
++ funccall_T *previous_funccal = NULL;
++ 
+  /*
+   * Return TRUE when a function was ended by a ":return" command.
+   */
+***************
+*** 6490,6496 ****
+      buf_T	*buf;
+      win_T	*wp;
+      int		i;
+!     funccall_T	*fc;
+      int		did_free = FALSE;
+  #ifdef FEAT_WINDOWS
+      tabpage_T	*tp;
+--- 6499,6505 ----
+      buf_T	*buf;
+      win_T	*wp;
+      int		i;
+!     funccall_T	*fc, **pfc;
+      int		did_free = FALSE;
+  #ifdef FEAT_WINDOWS
+      tabpage_T	*tp;
+***************
+*** 6574,6579 ****
+--- 6583,6602 ----
+  	else
+  	    ll = ll->lv_used_next;
+  
++     /* check if any funccal can be freed now */
++     for (pfc = &previous_funccal; *pfc != NULL; )
++     {
++ 	if (can_free_funccal(*pfc, copyID))
++ 	{
++ 	    fc = *pfc;
++ 	    *pfc = fc->caller;
++ 	    free_funccal(fc, TRUE);
++ 	    did_free = TRUE;
++ 	}
++ 	else
++ 	    pfc = &(*pfc)->caller;
++     }
++ 
+      return did_free;
+  }
+  
+***************
+*** 18962,18968 ****
+      dictitem_T	*dict_var;
+  {
+      hash_init(&dict->dv_hashtab);
+!     dict->dv_refcount = 99999;
+      dict_var->di_tv.vval.v_dict = dict;
+      dict_var->di_tv.v_type = VAR_DICT;
+      dict_var->di_tv.v_lock = VAR_FIXED;
+--- 18985,18991 ----
+      dictitem_T	*dict_var;
+  {
+      hash_init(&dict->dv_hashtab);
+!     dict->dv_refcount = DO_NOT_FREE_CNT;
+      dict_var->di_tv.vval.v_dict = dict;
+      dict_var->di_tv.v_type = VAR_DICT;
+      dict_var->di_tv.v_lock = VAR_FIXED;
+***************
+*** 19299,19304 ****
+--- 19322,19329 ----
+   * Copy the values from typval_T "from" to typval_T "to".
+   * When needed allocates string or increases reference count.
+   * Does not make a copy of a list or dict but copies the reference!
++  * It is OK for "from" and "to" to point to the same item.  This is used to
++  * make a copy later.
+   */
+      static void
+  copy_tv(from, to)
+***************
+*** 21111,21117 ****
+      char_u	*save_sourcing_name;
+      linenr_T	save_sourcing_lnum;
+      scid_T	save_current_SID;
+!     funccall_T	fc;
+      int		save_did_emsg;
+      static int	depth = 0;
+      dictitem_T	*v;
+--- 21136,21142 ----
+      char_u	*save_sourcing_name;
+      linenr_T	save_sourcing_lnum;
+      scid_T	save_current_SID;
+!     funccall_T	*fc;
+      int		save_did_emsg;
+      static int	depth = 0;
+      dictitem_T	*v;
+***************
+*** 21137,21172 ****
+  
+      line_breakcheck();		/* check for CTRL-C hit */
+  
+!     fc.caller = current_funccal;
+!     current_funccal = &fc;
+!     fc.func = fp;
+!     fc.rettv = rettv;
+      rettv->vval.v_number = 0;
+!     fc.linenr = 0;
+!     fc.returned = FALSE;
+!     fc.level = ex_nesting_level;
+      /* Check if this function has a breakpoint. */
+!     fc.breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
+!     fc.dbg_tick = debug_tick;
+  
+      /*
+!      * Note about using fc.fixvar[]: This is an array of FIXVAR_CNT variables
+       * with names up to VAR_SHORT_LEN long.  This avoids having to alloc/free
+       * each argument variable and saves a lot of time.
+       */
+      /*
+       * Init l: variables.
+       */
+!     init_var_dict(&fc.l_vars, &fc.l_vars_var);
+      if (selfdict != NULL)
+      {
+  	/* Set l:self to "selfdict".  Use "name" to avoid a warning from
+  	 * some compiler that checks the destination size. */
+! 	v = &fc.fixvar[fixvar_idx++].var;
+  	name = v->di_key;
+  	STRCPY(name, "self");
+  	v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX;
+! 	hash_add(&fc.l_vars.dv_hashtab, DI2HIKEY(v));
+  	v->di_tv.v_type = VAR_DICT;
+  	v->di_tv.v_lock = 0;
+  	v->di_tv.vval.v_dict = selfdict;
+--- 21162,21198 ----
+  
+      line_breakcheck();		/* check for CTRL-C hit */
+  
+!     fc = (funccall_T *)alloc(sizeof(funccall_T));
+!     fc->caller = current_funccal;
+!     current_funccal = fc;
+!     fc->func = fp;
+!     fc->rettv = rettv;
+      rettv->vval.v_number = 0;
+!     fc->linenr = 0;
+!     fc->returned = FALSE;
+!     fc->level = ex_nesting_level;
+      /* Check if this function has a breakpoint. */
+!     fc->breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
+!     fc->dbg_tick = debug_tick;
+  
+      /*
+!      * Note about using fc->fixvar[]: This is an array of FIXVAR_CNT variables
+       * with names up to VAR_SHORT_LEN long.  This avoids having to alloc/free
+       * each argument variable and saves a lot of time.
+       */
+      /*
+       * Init l: variables.
+       */
+!     init_var_dict(&fc->l_vars, &fc->l_vars_var);
+      if (selfdict != NULL)
+      {
+  	/* Set l:self to "selfdict".  Use "name" to avoid a warning from
+  	 * some compiler that checks the destination size. */
+! 	v = &fc->fixvar[fixvar_idx++].var;
+  	name = v->di_key;
+  	STRCPY(name, "self");
+  	v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX;
+! 	hash_add(&fc->l_vars.dv_hashtab, DI2HIKEY(v));
+  	v->di_tv.v_type = VAR_DICT;
+  	v->di_tv.v_lock = 0;
+  	v->di_tv.vval.v_dict = selfdict;
+***************
+*** 21178,21208 ****
+       * Set a:0 to "argcount".
+       * Set a:000 to a list with room for the "..." arguments.
+       */
+!     init_var_dict(&fc.l_avars, &fc.l_avars_var);
+!     add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
+  				(varnumber_T)(argcount - fp->uf_args.ga_len));
+      /* Use "name" to avoid a warning from some compiler that checks the
+       * destination size. */
+!     v = &fc.fixvar[fixvar_idx++].var;
+      name = v->di_key;
+      STRCPY(name, "000");
+      v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+!     hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
+      v->di_tv.v_type = VAR_LIST;
+      v->di_tv.v_lock = VAR_FIXED;
+!     v->di_tv.vval.v_list = &fc.l_varlist;
+!     vim_memset(&fc.l_varlist, 0, sizeof(list_T));
+!     fc.l_varlist.lv_refcount = 99999;
+!     fc.l_varlist.lv_lock = VAR_FIXED;
+  
+      /*
+       * Set a:firstline to "firstline" and a:lastline to "lastline".
+       * Set a:name to named arguments.
+       * Set a:N to the "..." arguments.
+       */
+!     add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "firstline",
+  						      (varnumber_T)firstline);
+!     add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "lastline",
+  						       (varnumber_T)lastline);
+      for (i = 0; i < argcount; ++i)
+      {
+--- 21204,21234 ----
+       * Set a:0 to "argcount".
+       * Set a:000 to a list with room for the "..." arguments.
+       */
+!     init_var_dict(&fc->l_avars, &fc->l_avars_var);
+!     add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "0",
+  				(varnumber_T)(argcount - fp->uf_args.ga_len));
+      /* Use "name" to avoid a warning from some compiler that checks the
+       * destination size. */
+!     v = &fc->fixvar[fixvar_idx++].var;
+      name = v->di_key;
+      STRCPY(name, "000");
+      v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+!     hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
+      v->di_tv.v_type = VAR_LIST;
+      v->di_tv.v_lock = VAR_FIXED;
+!     v->di_tv.vval.v_list = &fc->l_varlist;
+!     vim_memset(&fc->l_varlist, 0, sizeof(list_T));
+!     fc->l_varlist.lv_refcount = DO_NOT_FREE_CNT;
+!     fc->l_varlist.lv_lock = VAR_FIXED;
+  
+      /*
+       * Set a:firstline to "firstline" and a:lastline to "lastline".
+       * Set a:name to named arguments.
+       * Set a:N to the "..." arguments.
+       */
+!     add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "firstline",
+  						      (varnumber_T)firstline);
+!     add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "lastline",
+  						       (varnumber_T)lastline);
+      for (i = 0; i < argcount; ++i)
+      {
+***************
+*** 21218,21224 ****
+  	}
+  	if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
+  	{
+! 	    v = &fc.fixvar[fixvar_idx++].var;
+  	    v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+  	}
+  	else
+--- 21244,21250 ----
+  	}
+  	if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
+  	{
+! 	    v = &fc->fixvar[fixvar_idx++].var;
+  	    v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+  	}
+  	else
+***************
+*** 21230,21236 ****
+  	    v->di_flags = DI_FLAGS_RO;
+  	}
+  	STRCPY(v->di_key, name);
+! 	hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
+  
+  	/* Note: the values are copied directly to avoid alloc/free.
+  	 * "argvars" must have VAR_FIXED for v_lock. */
+--- 21256,21262 ----
+  	    v->di_flags = DI_FLAGS_RO;
+  	}
+  	STRCPY(v->di_key, name);
+! 	hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
+  
+  	/* Note: the values are copied directly to avoid alloc/free.
+  	 * "argvars" must have VAR_FIXED for v_lock. */
+***************
+*** 21239,21247 ****
+  
+  	if (ai >= 0 && ai < MAX_FUNC_ARGS)
+  	{
+! 	    list_append(&fc.l_varlist, &fc.l_listitems[ai]);
+! 	    fc.l_listitems[ai].li_tv = argvars[i];
+! 	    fc.l_listitems[ai].li_tv.v_lock = VAR_FIXED;
+  	}
+      }
+  
+--- 21265,21273 ----
+  
+  	if (ai >= 0 && ai < MAX_FUNC_ARGS)
+  	{
+! 	    list_append(&fc->l_varlist, &fc->l_listitems[ai]);
+! 	    fc->l_listitems[ai].li_tv = argvars[i];
+! 	    fc->l_listitems[ai].li_tv.v_lock = VAR_FIXED;
+  	}
+      }
+  
+***************
+*** 21306,21312 ****
+  	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
+  	    func_do_profile(fp);
+  	if (fp->uf_profiling
+! 		       || (fc.caller != NULL && fc.caller->func->uf_profiling))
+  	{
+  	    ++fp->uf_tm_count;
+  	    profile_start(&call_start);
+--- 21332,21338 ----
+  	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
+  	    func_do_profile(fp);
+  	if (fp->uf_profiling
+! 		    || (fc->caller != NULL && fc->caller->func->uf_profiling))
+  	{
+  	    ++fp->uf_tm_count;
+  	    profile_start(&call_start);
+***************
+*** 21322,21328 ****
+      did_emsg = FALSE;
+  
+      /* call do_cmdline() to execute the lines */
+!     do_cmdline(NULL, get_func_line, (void *)&fc,
+  				     DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT);
+  
+      --RedrawingDisabled;
+--- 21348,21354 ----
+      did_emsg = FALSE;
+  
+      /* call do_cmdline() to execute the lines */
+!     do_cmdline(NULL, get_func_line, (void *)fc,
+  				     DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT);
+  
+      --RedrawingDisabled;
+***************
+*** 21337,21352 ****
+  
+  #ifdef FEAT_PROFILE
+      if (do_profiling == PROF_YES && (fp->uf_profiling
+! 		    || (fc.caller != NULL && fc.caller->func->uf_profiling)))
+      {
+  	profile_end(&call_start);
+  	profile_sub_wait(&wait_start, &call_start);
+  	profile_add(&fp->uf_tm_total, &call_start);
+  	profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
+! 	if (fc.caller != NULL && fc.caller->func->uf_profiling)
+  	{
+! 	    profile_add(&fc.caller->func->uf_tm_children, &call_start);
+! 	    profile_add(&fc.caller->func->uf_tml_children, &call_start);
+  	}
+      }
+  #endif
+--- 21363,21378 ----
+  
+  #ifdef FEAT_PROFILE
+      if (do_profiling == PROF_YES && (fp->uf_profiling
+! 		    || (fc->caller != NULL && fc->caller->func->uf_profiling)))
+      {
+  	profile_end(&call_start);
+  	profile_sub_wait(&wait_start, &call_start);
+  	profile_add(&fp->uf_tm_total, &call_start);
+  	profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
+! 	if (fc->caller != NULL && fc->caller->func->uf_profiling)
+  	{
+! 	    profile_add(&fc->caller->func->uf_tm_children, &call_start);
+! 	    profile_add(&fc->caller->func->uf_tml_children, &call_start);
+  	}
+      }
+  #endif
+***************
+*** 21359,21367 ****
+  
+  	if (aborting())
+  	    smsg((char_u *)_("%s aborted"), sourcing_name);
+! 	else if (fc.rettv->v_type == VAR_NUMBER)
+  	    smsg((char_u *)_("%s returning #%ld"), sourcing_name,
+! 					       (long)fc.rettv->vval.v_number);
+  	else
+  	{
+  	    char_u	buf[MSG_BUF_LEN];
+--- 21385,21393 ----
+  
+  	if (aborting())
+  	    smsg((char_u *)_("%s aborted"), sourcing_name);
+! 	else if (fc->rettv->v_type == VAR_NUMBER)
+  	    smsg((char_u *)_("%s returning #%ld"), sourcing_name,
+! 					       (long)fc->rettv->vval.v_number);
+  	else
+  	{
+  	    char_u	buf[MSG_BUF_LEN];
+***************
+*** 21372,21378 ****
+  	    /* The value may be very long.  Skip the middle part, so that we
+  	     * have some idea how it starts and ends. smsg() would always
+  	     * truncate it at the end. */
+! 	    s = tv2string(fc.rettv, &tofree, numbuf2, 0);
+  	    if (s != NULL)
+  	    {
+  		trunc_string(s, buf, MSG_BUF_CLEN);
+--- 21398,21404 ----
+  	    /* The value may be very long.  Skip the middle part, so that we
+  	     * have some idea how it starts and ends. smsg() would always
+  	     * truncate it at the end. */
+! 	    s = tv2string(fc->rettv, &tofree, numbuf2, 0);
+  	    if (s != NULL)
+  	    {
+  		trunc_string(s, buf, MSG_BUF_CLEN);
+***************
+*** 21408,21421 ****
+      }
+  
+      did_emsg |= save_did_emsg;
+!     current_funccal = fc.caller;
+  
+!     /* The a: variables typevals were not allocated, only free the allocated
+!      * variables. */
+!     vars_clear_ext(&fc.l_avars.dv_hashtab, FALSE);
+  
+!     vars_clear(&fc.l_vars.dv_hashtab);		/* free all l: variables */
+!     --depth;
+  }
+  
+  /*
+--- 21434,21517 ----
+      }
+  
+      did_emsg |= save_did_emsg;
+!     current_funccal = fc->caller;
+!     --depth;
+  
+!     /* if the a:000 list and the a: dict are not referenced we can free the
+!      * funccall_T and what's in it. */
+!     if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
+! 	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
+! 	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
+!     {
+! 	free_funccal(fc, FALSE);
+!     }
+!     else
+!     {
+! 	hashitem_T	*hi;
+! 	listitem_T	*li;
+! 	int		todo;
+  
+! 	/* "fc" is still in use.  This can happen when returning "a:000" or
+! 	 * assigning "l:" to a global variable.
+! 	 * Link "fc" in the list for garbage collection later. */
+! 	fc->caller = previous_funccal;
+! 	previous_funccal = fc;
+! 
+! 	/* Make a copy of the a: variables, since we didn't do that above. */
+! 	todo = (int)fc->l_avars.dv_hashtab.ht_used;
+! 	for (hi = fc->l_avars.dv_hashtab.ht_array; todo > 0; ++hi)
+! 	{
+! 	    if (!HASHITEM_EMPTY(hi))
+! 	    {
+! 		--todo;
+! 		v = HI2DI(hi);
+! 		copy_tv(&v->di_tv, &v->di_tv);
+! 	    }
+! 	}
+! 
+! 	/* Make a copy of the a:000 items, since we didn't do that above. */
+! 	for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
+! 	    copy_tv(&li->li_tv, &li->li_tv);
+!     }
+! }
+! 
+! /*
+!  * Return TRUE if items in "fc" do not have "copyID".  That means they are not
+!  * referenced from anywyere.
+!  */
+!     static int
+! can_free_funccal(fc, copyID)
+!     funccall_T	*fc;
+!     int		copyID;
+! {
+!     return (fc->l_varlist.lv_copyID != copyID
+! 	    && fc->l_vars.dv_copyID != copyID
+! 	    && fc->l_avars.dv_copyID != copyID);
+! }
+! 
+! /*
+!  * Free "fc" and what it contains.
+!  */
+!    static void
+! free_funccal(fc, free_val)
+!     funccall_T	*fc;
+!     int		free_val;  /* a: vars were allocated */
+! {
+!     listitem_T	*li;
+! 
+!     /* The a: variables typevals may not have been allocated, only free the
+!      * allocated variables. */
+!     vars_clear_ext(&fc->l_avars.dv_hashtab, free_val);
+! 
+!     /* free all l: variables */
+!     vars_clear(&fc->l_vars.dv_hashtab);
+! 
+!     /* Free the a:000 variables if they were allocated. */
+!     if (free_val)
+! 	for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
+! 	    clear_tv(&li->li_tv);
+! 
+!     vim_free(fc);
+  }
+  
+  /*
+*** ../vim-7.2.069/src/version.c	Tue Dec  9 22:34:02 2008
+--- src/version.c	Sun Dec 21 12:47:07 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     70,
+  /**/
+
+-- 
+Close your shells, or I'll kill -9 you
+Tomorrow I'll quota you
+Remember the disks'll always be full
+And then while I'm away
+I'll write ~ everyday
+And I'll send-pr all my buggings to you.
+    [ CVS log "Beatles style" for FreeBSD ports/INDEX, Satoshi Asami ]
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.071 b/source/ap/vim/patches/7.2.071
new file mode 100644
index 000000000..0a1e5137f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.071
@@ -0,0 +1,81 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.071
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.071 (extra)
+Problem:    Win32: Handling netbeans events while Vim is busy updating the
+	    screen may cause a crash.
+Solution:   Like with GTK, only handle netbeans messages in the main loop.
+	    (Xavier de Gaye)
+Files:	    src/gui_w48.c, src/netbeans.c
+
+
+*** ../vim-7.2.070/src/gui_w48.c	Thu Nov 20 17:09:09 2008
+--- src/gui_w48.c	Thu Dec 11 23:47:18 2008
+***************
+*** 1937,1942 ****
+--- 1937,1947 ----
+  	    s_need_activate = FALSE;
+  	}
+  
++ #ifdef FEAT_NETBEANS_INTG
++ 	/* Process the queued netbeans messages. */
++ 	netbeans_parse_messages();
++ #endif
++ 
+  	/*
+  	 * Don't use gui_mch_update() because then we will spin-lock until a
+  	 * char arrives, instead we use GetMessage() to hang until an
+*** ../vim-7.2.070/src/netbeans.c	Fri Nov 28 21:26:50 2008
+--- src/netbeans.c	Sun Nov 30 12:07:00 2008
+***************
+*** 769,779 ****
+  	return; /* don't try to parse it */
+      }
+  
+! #ifdef FEAT_GUI_GTK
+      if (gtk_main_level() > 0)
+  	gtk_main_quit();
+  #else
+!     /* Parse the messages, but avoid recursion. */
+      if (level == 1)
+  	netbeans_parse_messages();
+  
+--- 769,782 ----
+  	return; /* don't try to parse it */
+      }
+  
+! #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)
+!     /* Let the main loop handle messages. */
+! # ifdef FEAT_GUI_GTK
+      if (gtk_main_level() > 0)
+  	gtk_main_quit();
++ # endif
+  #else
+!     /* Parse the messages now, but avoid recursion. */
+      if (level == 1)
+  	netbeans_parse_messages();
+  
+*** ../vim-7.2.070/src/version.c	Sun Dec 21 13:02:47 2008
+--- src/version.c	Wed Dec 24 12:18:59 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     71,
+  /**/
+
+-- 
+No children may attend school with their breath smelling of "wild onions."
+		[real standing law in West Virginia, United States of America]
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.072 b/source/ap/vim/patches/7.2.072
new file mode 100644
index 000000000..1dffd9181
--- /dev/null
+++ b/source/ap/vim/patches/7.2.072
@@ -0,0 +1,56 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.072 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.072 (extra)
+Problem:    Compiler warning in Sniff code.
+Solution:   Use return value of pipe(). (Dominique Pelle)
+Files:	    src/if_sniff.c
+
+NOTE: Patch was adjusted to avoid problems with CVS interference.
+
+*** ../vim-7.2.071/src/if_sniff.c	Sat Nov 15 14:11:10 2008
+--- src/if_sniff.c	Sat Dec  6 14:01:57 2008
+***************
+*** 716,723 ****
+  #else		/* UNIX Version of the Code */
+      int ToSniffEmacs[2], FromSniffEmacs[2];
+  
+!     pipe(ToSniffEmacs);
+!     pipe(FromSniffEmacs);
+  
+      /* fork */
+      if ((sniffemacs_pid=fork()) == 0)
+--- 714,723 ----
+  #else		/* UNIX Version of the Code */
+      int ToSniffEmacs[2], FromSniffEmacs[2];
+  
+!     if (pipe(ToSniffEmacs) != 0)
+! 	return 1;
+!     if (pipe(FromSniffEmacs) != 0)
+! 	return 1;
+  
+      /* fork */
+      if ((sniffemacs_pid=fork()) == 0)
+*** ../vim-7.2.071/src/version.c	Wed Dec 24 12:20:10 2008
+--- src/version.c	Wed Dec 24 12:42:13 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     72,
+  /**/
+
+-- 
+SIGIRO -- irony detected (iron core dumped)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.073 b/source/ap/vim/patches/7.2.073
new file mode 100644
index 000000000..16f1297d3
--- /dev/null
+++ b/source/ap/vim/patches/7.2.073
@@ -0,0 +1,135 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.073
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.073
+Problem:    ":set <xHome>" has the same output as ":set <Home>". (Matt
+	    Wozniski)
+Solution:   Don't translate "x" keys to its alternative for ":set".
+Files:	    src/misc2.c, src/option.c, src/proto/misc2.pro
+
+
+*** ../vim-7.2.072/src/misc2.c	Wed Nov 12 13:07:48 2008
+--- src/misc2.c	Sun Dec 14 12:28:47 2008
+***************
+*** 2561,2567 ****
+      int		key;
+      int		dlen = 0;
+  
+!     key = find_special_key(srcp, &modifiers, keycode);
+      if (key == 0)
+  	return 0;
+  
+--- 2561,2567 ----
+      int		key;
+      int		dlen = 0;
+  
+!     key = find_special_key(srcp, &modifiers, keycode, FALSE);
+      if (key == 0)
+  	return 0;
+  
+***************
+*** 2597,2606 ****
+   * returns 0 if there is no match.
+   */
+      int
+! find_special_key(srcp, modp, keycode)
+      char_u	**srcp;
+      int		*modp;
+!     int		keycode; /* prefer key code, e.g. K_DEL instead of DEL */
+  {
+      char_u	*last_dash;
+      char_u	*end_of_name;
+--- 2597,2607 ----
+   * returns 0 if there is no match.
+   */
+      int
+! find_special_key(srcp, modp, keycode, keep_x_key)
+      char_u	**srcp;
+      int		*modp;
+!     int		keycode;     /* prefer key code, e.g. K_DEL instead of DEL */
+!     int		keep_x_key;  /* don't translate xHome to Home key */
+  {
+      char_u	*last_dash;
+      char_u	*end_of_name;
+***************
+*** 2668,2674 ****
+  	    else
+  	    {
+  		key = get_special_key_code(last_dash + 1);
+! 		key = handle_x_keys(key);
+  	    }
+  
+  	    /*
+--- 2669,2676 ----
+  	    else
+  	    {
+  		key = get_special_key_code(last_dash + 1);
+! 		if (!keep_x_key)
+! 		    key = handle_x_keys(key);
+  	    }
+  
+  	    /*
+*** ../vim-7.2.072/src/option.c	Fri Nov 28 21:26:50 2008
+--- src/option.c	Sun Dec 14 12:28:56 2008
+***************
+*** 8328,8334 ****
+      {
+  	--arg;			    /* put arg at the '<' */
+  	modifiers = 0;
+! 	key = find_special_key(&arg, &modifiers, TRUE);
+  	if (modifiers)		    /* can't handle modifiers here */
+  	    key = 0;
+      }
+--- 8328,8334 ----
+      {
+  	--arg;			    /* put arg at the '<' */
+  	modifiers = 0;
+! 	key = find_special_key(&arg, &modifiers, TRUE, TRUE);
+  	if (modifiers)		    /* can't handle modifiers here */
+  	    key = 0;
+      }
+*** ../vim-7.2.072/src/proto/misc2.pro	Thu Jul 24 20:29:37 2008
+--- src/proto/misc2.pro	Sun Dec 14 12:29:05 2008
+***************
+*** 59,65 ****
+  int handle_x_keys __ARGS((int key));
+  char_u *get_special_key_name __ARGS((int c, int modifiers));
+  int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
+! int find_special_key __ARGS((char_u **srcp, int *modp, int keycode));
+  int extract_modifiers __ARGS((int key, int *modp));
+  int find_special_key_in_table __ARGS((int c));
+  int get_special_key_code __ARGS((char_u *name));
+--- 59,65 ----
+  int handle_x_keys __ARGS((int key));
+  char_u *get_special_key_name __ARGS((int c, int modifiers));
+  int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
+! int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key));
+  int extract_modifiers __ARGS((int key, int *modp));
+  int find_special_key_in_table __ARGS((int c));
+  int get_special_key_code __ARGS((char_u *name));
+*** ../vim-7.2.072/src/version.c	Wed Dec 24 12:43:15 2008
+--- src/version.c	Wed Dec 24 12:51:26 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     73,
+  /**/
+
+
+-- 
+ARTHUR: If you do not open these doors, we will take this castle by force ...
+   [A bucket of slops land on ARTHUR.  He tries to retain his dignity.]
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.074 b/source/ap/vim/patches/7.2.074
new file mode 100644
index 000000000..6000fca53
--- /dev/null
+++ b/source/ap/vim/patches/7.2.074
@@ -0,0 +1,54 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.074 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.074 (extra, after 7.2.073)
+Problem:    ":set <xHome>" has the same output as ":set <Home>". (Matt
+	    Wozniski)
+Solution:   Don't translate "x" keys to its alternative for ":set".
+Files:	    src/gui_mac.c
+
+
+*** ../vim-7.2.073/src/gui_mac.c	Sat Aug  9 19:37:28 2008
+--- src/gui_mac.c	Sun Dec 14 12:28:26 2008
+***************
+*** 4966,4972 ****
+  	char_u	    *p_actext;
+  
+  	p_actext = menu->actext;
+! 	key = find_special_key(&p_actext, &modifiers, /*keycode=*/0);
+  	if (*p_actext != 0)
+  	    key = 0; /* error: trailing text */
+  	/* find_special_key() returns a keycode with as many of the
+--- 4966,4972 ----
+  	char_u	    *p_actext;
+  
+  	p_actext = menu->actext;
+! 	key = find_special_key(&p_actext, &modifiers, FALSE, FALSE);
+  	if (*p_actext != 0)
+  	    key = 0; /* error: trailing text */
+  	/* find_special_key() returns a keycode with as many of the
+*** ../vim-7.2.073/src/version.c	Wed Dec 24 12:53:33 2008
+--- src/version.c	Wed Dec 24 12:55:42 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     74,
+  /**/
+
+-- 
+   Another bucket of what can only be described as human ordure hits ARTHUR.
+ARTHUR: ... Right!  (to the KNIGHTS) That settles it!
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.075 b/source/ap/vim/patches/7.2.075
new file mode 100644
index 000000000..4bec708ab
--- /dev/null
+++ b/source/ap/vim/patches/7.2.075
@@ -0,0 +1,58 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.075
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.075 (after 7.2.058)
+Problem:    Explanation about making a diff for extra_patches is unclear.
+Solution:   Adjust comment.
+Files:	    src/version.c
+
+
+*** ../vim-7.2.074/src/version.c	Wed Dec 24 13:04:41 2008
+--- src/version.c	Wed Dec 24 13:07:47 2008
+***************
+*** 833,839 ****
+   * Keep it short, e.g.,: "relative numbers", "persistent undo".
+   * Also add a comment marker to separate the lines.
+   * See the official Vim patches for the diff format: It must use a context of
+!  * one line only.  Use "diff -C2".
+   */
+  static char *(extra_patches[]) =
+  {   /* Add your patch description below this line */
+--- 835,841 ----
+   * Keep it short, e.g.,: "relative numbers", "persistent undo".
+   * Also add a comment marker to separate the lines.
+   * See the official Vim patches for the diff format: It must use a context of
+!  * one line only.  Create it by hand or use "diff -C2" and edit the patch.
+   */
+  static char *(extra_patches[]) =
+  {   /* Add your patch description below this line */
+*** ../vim-7.2.074/src/version.c	Wed Dec 24 13:04:41 2008
+--- src/version.c	Wed Dec 24 13:07:47 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     75,
+  /**/
+
+-- 
+BEDEVERE: Stand by for attack!!
+   [CUT TO enormous army forming up.  Trebuchets, rows of PIKEMEN, siege
+   towers, pennants flying, shouts of "Stand by for attack!"  Traditional
+   army build-up shots.  The shouts echo across the ranks of the army.
+   We see various groups reacting, and stirring themselves in readiness.]
+ARTHUR:   Who are they?
+BEDEVERE: Oh, just some friends!
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.076 b/source/ap/vim/patches/7.2.076
new file mode 100644
index 000000000..5166bbab2
--- /dev/null
+++ b/source/ap/vim/patches/7.2.076
@@ -0,0 +1,86 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.076
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.076
+Problem:    rename(from, to) deletes the file if "from" and "to" are not equal
+	    but still refer to the same file.  E.g., on a FAT32 filesystem
+	    under Unix.
+Solution:   Go through another file name.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.075/src/fileio.c	Fri Nov 28 21:26:50 2008
+--- src/fileio.c	Tue Dec 30 16:04:44 2008
+***************
+*** 6119,6124 ****
+--- 6119,6165 ----
+      if (mch_stat((char *)from, &st) < 0)
+  	return -1;
+  
++ #ifdef UNIX
++     {
++ 	struct stat	st_to;
++ 	char		tempname[MAXPATHL + 1];
++ 
++ 	/* It's possible for the source and destination to be the same file.
++ 	 * This happens when "from" and "to" differ in case and are on a FAT32
++ 	 * filesystem.  In that case go through a temp file name. */
++ 	if (mch_stat((char *)to, &st_to) >= 0
++ 		&& st.st_dev == st_to.st_dev
++ 		&& st.st_ino == st_to.st_ino)
++ 	{
++ 	    /* Find a name that doesn't exist and is in the same directory.
++ 	     * Move "from" to "tempname" and then to "to". */
++ 	    if (STRLEN(from) >= MAXPATHL - 5)
++ 		return -1;
++ 	    STRCPY(tempname, from);
++ 	    for (n = 123; n < 99999; ++n)
++ 	    {
++ 		sprintf(gettail(tempname), "%d", n);
++ 		if (mch_stat(tempname, &st_to) < 0)
++ 		{
++ 		    if (mch_rename((char *)from, tempname) == 0)
++ 		    {
++ 			if (mch_rename(tempname, (char *)to) == 0)
++ 			    return 0;
++ 			/* Strange, the second step failed.  Try moving the
++ 			 * file back and return failure. */
++ 			mch_rename(tempname, (char *)from);
++ 			return -1;
++ 		    }
++ 		    /* If it fails for one temp name it will most likely fail
++ 		     * for any temp name, give up. */
++ 		    return -1;
++ 		}
++ 	    }
++ 	    return -1;
++ 	}
++     }
++ #endif
++ 
+      /*
+       * Delete the "to" file, this is required on some systems to make the
+       * mch_rename() work, on other systems it makes sure that we don't have
+*** ../vim-7.2.075/src/version.c	Wed Dec 24 14:24:41 2008
+--- src/version.c	Tue Dec 30 16:09:51 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     76,
+  /**/
+
+-- 
+FATAL ERROR! SYSTEM HALTED! - Press any key to continue doing nothing.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.077 b/source/ap/vim/patches/7.2.077
new file mode 100644
index 000000000..396444c3d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.077
@@ -0,0 +1,164 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.077
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.077 (after 7.2.076)
+Problem:    rename(from, to) doesn't work if "from" and "to" differ only in
+	    case on a system that ignores case in file names.
+Solution:   Go through another file name.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.076/src/fileio.c	Tue Dec 30 16:15:16 2008
+--- src/fileio.c	Wed Dec 31 14:59:59 2008
+***************
+*** 6106,6117 ****
+  #ifdef HAVE_ACL
+      vim_acl_T	acl;		/* ACL from original file */
+  #endif
+  
+      /*
+!      * When the names are identical, there is nothing to do.
+       */
+      if (fnamecmp(from, to) == 0)
+! 	return 0;
+  
+      /*
+       * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
+--- 6106,6129 ----
+  #ifdef HAVE_ACL
+      vim_acl_T	acl;		/* ACL from original file */
+  #endif
++ #if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
++     int		use_tmp_file = FALSE;
++ #endif
+  
+      /*
+!      * When the names are identical, there is nothing to do.  When they refer
+!      * to the same file (ignoring case and slash/backslash differences) but
+!      * the file name differs we need to go through a temp file.
+       */
+      if (fnamecmp(from, to) == 0)
+!     {
+! #ifdef CASE_INSENSITIVE_FILENAME
+! 	if (STRCMP(gettail(from), gettail(to)) != 0)
+! 	    use_tmp_file = TRUE;
+! 	else
+! #endif
+! 	    return 0;
+!     }
+  
+      /*
+       * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
+***************
+*** 6122,6128 ****
+  #ifdef UNIX
+      {
+  	struct stat	st_to;
+- 	char		tempname[MAXPATHL + 1];
+  
+  	/* It's possible for the source and destination to be the same file.
+  	 * This happens when "from" and "to" differ in case and are on a FAT32
+--- 6134,6139 ----
+***************
+*** 6130,6162 ****
+  	if (mch_stat((char *)to, &st_to) >= 0
+  		&& st.st_dev == st_to.st_dev
+  		&& st.st_ino == st_to.st_ino)
+  	{
+! 	    /* Find a name that doesn't exist and is in the same directory.
+! 	     * Move "from" to "tempname" and then to "to". */
+! 	    if (STRLEN(from) >= MAXPATHL - 5)
+! 		return -1;
+! 	    STRCPY(tempname, from);
+! 	    for (n = 123; n < 99999; ++n)
+  	    {
+! 		sprintf(gettail(tempname), "%d", n);
+! 		if (mch_stat(tempname, &st_to) < 0)
+  		{
+! 		    if (mch_rename((char *)from, tempname) == 0)
+! 		    {
+! 			if (mch_rename(tempname, (char *)to) == 0)
+! 			    return 0;
+! 			/* Strange, the second step failed.  Try moving the
+! 			 * file back and return failure. */
+! 			mch_rename(tempname, (char *)from);
+! 			return -1;
+! 		    }
+! 		    /* If it fails for one temp name it will most likely fail
+! 		     * for any temp name, give up. */
+  		    return -1;
+  		}
+  	    }
+- 	    return -1;
+  	}
+      }
+  #endif
+  
+--- 6141,6182 ----
+  	if (mch_stat((char *)to, &st_to) >= 0
+  		&& st.st_dev == st_to.st_dev
+  		&& st.st_ino == st_to.st_ino)
++ 	    use_tmp_file = TRUE;
++     }
++ #endif
++ 
++ #if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
++     if (use_tmp_file)
++     {
++ 	char	tempname[MAXPATHL + 1];
++ 
++ 	/*
++ 	 * Find a name that doesn't exist and is in the same directory.
++ 	 * Rename "from" to "tempname" and then rename "tempname" to "to".
++ 	 */
++ 	if (STRLEN(from) >= MAXPATHL - 5)
++ 	    return -1;
++ 	STRCPY(tempname, from);
++ 	for (n = 123; n < 99999; ++n)
+  	{
+! 	    sprintf((char *)gettail((char_u *)tempname), "%d", n);
+! 	    if (mch_stat(tempname, &st) < 0)
+  	    {
+! 		if (mch_rename((char *)from, tempname) == 0)
+  		{
+! 		    if (mch_rename(tempname, (char *)to) == 0)
+! 			return 0;
+! 		    /* Strange, the second step failed.  Try moving the
+! 		     * file back and return failure. */
+! 		    mch_rename(tempname, (char *)from);
+  		    return -1;
+  		}
++ 		/* If it fails for one temp name it will most likely fail
++ 		 * for any temp name, give up. */
++ 		return -1;
+  	    }
+  	}
++ 	return -1;
+      }
+  #endif
+  
+*** ../vim-7.2.076/src/version.c	Tue Dec 30 16:15:16 2008
+--- src/version.c	Wed Dec 31 16:19:29 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     77,
+  /**/
+
+-- 
+We apologise again for the fault in the subtitles.  Those responsible for
+sacking the people who have just been sacked have been sacked.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.078 b/source/ap/vim/patches/7.2.078
new file mode 100644
index 000000000..0e127bc41
--- /dev/null
+++ b/source/ap/vim/patches/7.2.078
@@ -0,0 +1,120 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.078
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.078
+Problem:    When deleting a fold that is specified with markers the cursor
+	    position may be wrong.  Folds may not be displayed properly after
+	    a delete.  Wrong fold may be deleted.
+Solution:   Fix the problems. (mostly by Lech Lorens)
+Files:	    src/fold.c
+
+
+*** ../vim-7.2.077/src/fold.c	Fri Nov 28 21:26:50 2008
+--- src/fold.c	Tue Jan  6 14:53:26 2009
+***************
+*** 740,746 ****
+      garray_T	*found_ga;
+      fold_T	*found_fp = NULL;
+      linenr_T	found_off = 0;
+!     int		use_level = FALSE;
+      int		maybe_small = FALSE;
+      int		level = 0;
+      linenr_T	lnum = start;
+--- 740,746 ----
+      garray_T	*found_ga;
+      fold_T	*found_fp = NULL;
+      linenr_T	found_off = 0;
+!     int		use_level;
+      int		maybe_small = FALSE;
+      int		level = 0;
+      linenr_T	lnum = start;
+***************
+*** 757,762 ****
+--- 757,763 ----
+  	gap = &curwin->w_folds;
+  	found_ga = NULL;
+  	lnum_off = 0;
++ 	use_level = FALSE;
+  	for (;;)
+  	{
+  	    if (!foldFind(gap, lnum - lnum_off, &fp))
+***************
+*** 783,802 ****
+  	else
+  	{
+  	    lnum = found_fp->fd_top + found_fp->fd_len + found_off;
+- 	    did_one = TRUE;
+  
+  	    if (foldmethodIsManual(curwin))
+  		deleteFoldEntry(found_ga,
+  		    (int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
+  	    else
+  	    {
+! 		if (found_fp->fd_top + found_off < first_lnum)
+! 		    first_lnum = found_fp->fd_top;
+! 		if (lnum > last_lnum)
+  		    last_lnum = lnum;
+! 		parseMarker(curwin);
+  		deleteFoldMarkers(found_fp, recursive, found_off);
+  	    }
+  
+  	    /* redraw window */
+  	    changed_window_setting();
+--- 784,804 ----
+  	else
+  	{
+  	    lnum = found_fp->fd_top + found_fp->fd_len + found_off;
+  
+  	    if (foldmethodIsManual(curwin))
+  		deleteFoldEntry(found_ga,
+  		    (int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
+  	    else
+  	    {
+! 		if (first_lnum > found_fp->fd_top + found_off)
+! 		    first_lnum = found_fp->fd_top + found_off;
+! 		if (last_lnum < lnum)
+  		    last_lnum = lnum;
+! 		if (!did_one)
+! 		    parseMarker(curwin);
+  		deleteFoldMarkers(found_fp, recursive, found_off);
+  	    }
++ 	    did_one = TRUE;
+  
+  	    /* redraw window */
+  	    changed_window_setting();
+***************
+*** 811,816 ****
+--- 813,822 ----
+  	    redraw_curbuf_later(INVERTED);
+  #endif
+      }
++     else
++ 	/* Deleting markers may make cursor column invalid. */
++ 	check_cursor_col();
++ 
+      if (last_lnum > 0)
+  	changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L);
+  }
+*** ../vim-7.2.077/src/version.c	Wed Dec 31 16:20:54 2008
+--- src/version.c	Tue Jan  6 15:00:36 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     78,
+  /**/
+
+-- 
+Looking at Perl through Lisp glasses, Perl looks atrocious.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.079 b/source/ap/vim/patches/7.2.079
new file mode 100644
index 000000000..60da797d6
--- /dev/null
+++ b/source/ap/vim/patches/7.2.079
@@ -0,0 +1,229 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.079
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.079
+Problem:    "killed" netbeans events are not handled correctly.
+Solution:   A "killed" netbeans event is sent when the buffer is deleted or
+	    wiped out (in this case, the netbeans annotations in this buffer
+	    have been removed).  A user can still remove a sign with the
+	    command ":sign unplace" and this does not trigger a "killed"
+	    event.  (Xavier de Gaye)
+Files:	    runtime/doc/netbeans.txt, src/buffer.c, src/globals.h,
+	    src/netbeans.c, src/proto/netbeans.pro
+
+
+*** ../vim-7.2.078/runtime/doc/netbeans.txt	Sat Aug  9 19:36:49 2008
+--- runtime/doc/netbeans.txt	Tue Jan  6 15:23:39 2009
+***************
+*** 1,4 ****
+! *netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
+  
+  
+  		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
+--- 1,4 ----
+! *netbeans.txt*  For Vim version 7.2.  Last change: 2009 Jan 06
+  
+  
+  		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
+***************
+*** 722,729 ****
+  		of the cursor.
+  		New in version 2.1.
+  
+! killed		A file was closed by the user.  Only for files that have been
+! 		assigned a number by the IDE.
+  
+  newDotAndMark off off
+  		Reports the position of the cursor being at "off" bytes into
+--- 722,731 ----
+  		of the cursor.
+  		New in version 2.1.
+  
+! killed		A file was deleted or wiped out by the user and the buffer
+! 		annotations have been removed.  The bufID number for this
+! 		buffer has become invalid.  Only for files that have been
+! 		assigned a bufID number by the IDE.
+  
+  newDotAndMark off off
+  		Reports the position of the cursor being at "off" bytes into
+*** ../vim-7.2.078/src/buffer.c	Wed Dec  3 11:21:20 2008
+--- src/buffer.c	Tue Jan  6 15:23:02 2009
+***************
+*** 437,446 ****
+  	return;
+  #endif
+  
+- #ifdef FEAT_NETBEANS_INTG
+-     if (usingNetbeans)
+- 	netbeans_file_closed(buf);
+- #endif
+      /* Change directories when the 'acd' option is set. */
+      DO_AUTOCHDIR
+  
+--- 437,442 ----
+***************
+*** 639,644 ****
+--- 635,644 ----
+  #ifdef FEAT_SIGNS
+      buf_delete_signs(buf);		/* delete any signs */
+  #endif
++ #ifdef FEAT_NETBEANS_INTG
++     if (usingNetbeans)
++         netbeans_file_killed(buf);
++ #endif
+  #ifdef FEAT_LOCALMAP
+      map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE);  /* clear local mappings */
+      map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE);   /* clear local abbrevs */
+***************
+*** 815,823 ****
+      int		bnr;		/* buffer number */
+      char_u	*p;
+  
+- #ifdef FEAT_NETBEANS_INTG
+-     netbeansCloseFile = 1;
+- #endif
+      if (addr_count == 0)
+      {
+  	(void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit);
+--- 815,820 ----
+***************
+*** 912,920 ****
+  	}
+      }
+  
+- #ifdef FEAT_NETBEANS_INTG
+-     netbeansCloseFile = 0;
+- #endif
+  
+      return errormsg;
+  }
+--- 909,914 ----
+*** ../vim-7.2.078/src/globals.h	Fri Nov 28 21:26:50 2008
+--- src/globals.h	Tue Jan  6 15:23:02 2009
+***************
+*** 1340,1346 ****
+  
+  #ifdef FEAT_NETBEANS_INTG
+  EXTERN char *netbeansArg INIT(= NULL);	/* the -nb[:host:port:passwd] arg */
+- EXTERN int netbeansCloseFile INIT(= 0);	/* send killed if != 0 */
+  EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
+  EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
+  EXTERN int netbeansReadFile INIT(= 1);	/* OK to read from disk if != 0 */
+--- 1340,1345 ----
+*** ../vim-7.2.078/src/netbeans.c	Wed Dec 24 12:20:10 2008
+--- src/netbeans.c	Tue Jan  6 15:23:02 2009
+***************
+*** 2921,2964 ****
+  }
+  
+  /*
+!  * Tell netbeans a file was closed.
+   */
+      void
+! netbeans_file_closed(buf_T *bufp)
+  {
+      int		bufno = nb_getbufno(bufp);
+      nbbuf_T	*nbbuf = nb_get_buf(bufno);
+      char	buffer[2*MAXPATHL];
+  
+!     if (!haveConnection || bufno < 0)
+  	return;
+  
+!     if (!netbeansCloseFile)
+!     {
+! 	nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n",
+! 		    bufp->b_ffname));
+! 	return;
+!     }
+! 
+!     nbdebug(("netbeans_file_closed:\n"));
+!     nbdebug(("    Closing bufno: %d", bufno));
+!     if (curbuf != NULL && curbuf != bufp)
+!     {
+! 	nbdebug(("    Curbuf bufno:  %d\n", nb_getbufno(curbuf)));
+!     }
+!     else if (curbuf == bufp)
+!     {
+! 	nbdebug(("    curbuf == bufp\n"));
+!     }
+! 
+!     if (bufno <= 0)
+! 	return;
+  
+      sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
+  
+      nbdebug(("EVT: %s", buffer));
+  
+!     nb_send(buffer, "netbeans_file_closed");
+  
+      if (nbbuf != NULL)
+  	nbbuf->bufp = NULL;
+--- 2921,2946 ----
+  }
+  
+  /*
+!  * Tell netbeans that a file was deleted or wiped out.
+   */
+      void
+! netbeans_file_killed(buf_T *bufp)
+  {
+      int		bufno = nb_getbufno(bufp);
+      nbbuf_T	*nbbuf = nb_get_buf(bufno);
+      char	buffer[2*MAXPATHL];
+  
+!     if (!haveConnection || bufno == -1)
+  	return;
+  
+!     nbdebug(("netbeans_file_killed:\n"));
+!     nbdebug(("    Killing bufno: %d", bufno));
+  
+      sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
+  
+      nbdebug(("EVT: %s", buffer));
+  
+!     nb_send(buffer, "netbeans_file_killed");
+  
+      if (nbbuf != NULL)
+  	nbbuf->bufp = NULL;
+*** ../vim-7.2.078/src/proto/netbeans.pro	Tue Jun 24 23:25:53 2008
+--- src/proto/netbeans.pro	Tue Jan  6 15:23:02 2009
+***************
+*** 11,17 ****
+  void netbeans_frame_moved __ARGS((int new_x, int new_y));
+  void netbeans_file_activated __ARGS((buf_T *bufp));
+  void netbeans_file_opened __ARGS((buf_T *bufp));
+! void netbeans_file_closed __ARGS((buf_T *bufp));
+  void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
+  void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
+  void netbeans_unmodified __ARGS((buf_T *bufp));
+--- 11,17 ----
+  void netbeans_frame_moved __ARGS((int new_x, int new_y));
+  void netbeans_file_activated __ARGS((buf_T *bufp));
+  void netbeans_file_opened __ARGS((buf_T *bufp));
+! void netbeans_file_killed __ARGS((buf_T *bufp));
+  void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
+  void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
+  void netbeans_unmodified __ARGS((buf_T *bufp));
+*** ../vim-7.2.078/src/version.c	Tue Jan  6 15:01:58 2009
+--- src/version.c	Tue Jan  6 16:11:11 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     79,
+  /**/
+
+-- 
+Friends?  I have lots of friends!  In fact, I have every episode ever made.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.080 b/source/ap/vim/patches/7.2.080
new file mode 100644
index 000000000..399f9e1c3
--- /dev/null
+++ b/source/ap/vim/patches/7.2.080
@@ -0,0 +1,365 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.080
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.080
+Problem:    When typing a composing character just after starting completion
+	    may access memory before its allocation point. (Dominique Pelle)
+Solution:   Don't delete before the completion start column.  Add extra checks
+	    for the offset not being negative.
+Files:	    src/edit.c
+
+
+*** ../vim-7.2.079/src/edit.c	Wed Aug  6 18:56:55 2008
+--- src/edit.c	Tue Jan 13 12:05:57 2009
+***************
+*** 147,152 ****
+--- 147,153 ----
+  static int  ins_compl_bs __ARGS((void));
+  static void ins_compl_new_leader __ARGS((void));
+  static void ins_compl_addleader __ARGS((int c));
++ static int ins_compl_len __ARGS((void));
+  static void ins_compl_restart __ARGS((void));
+  static void ins_compl_set_original_text __ARGS((char_u *str));
+  static void ins_compl_addfrommatch __ARGS((void));
+***************
+*** 197,203 ****
+  static void mb_replace_pop_ins __ARGS((int cc));
+  #endif
+  static void replace_flush __ARGS((void));
+! static void replace_do_bs __ARGS((void));
+  #ifdef FEAT_CINDENT
+  static int cindent_on __ARGS((void));
+  #endif
+--- 198,205 ----
+  static void mb_replace_pop_ins __ARGS((int cc));
+  #endif
+  static void replace_flush __ARGS((void));
+! static void replace_do_bs __ARGS((int limit_col));
+! static int del_char_after_col __ARGS((int limit_col));
+  #ifdef FEAT_CINDENT
+  static int cindent_on __ARGS((void));
+  #endif
+***************
+*** 1933,1938 ****
+--- 1935,1942 ----
+  /*
+   * Backspace the cursor until the given column.  Handles REPLACE and VREPLACE
+   * modes correctly.  May also be used when not in insert mode at all.
++  * Will attempt not to go before "col" even when there is a composing
++  * character.
+   */
+      void
+  backspace_until_column(col)
+***************
+*** 1942,1954 ****
+      {
+  	curwin->w_cursor.col--;
+  	if (State & REPLACE_FLAG)
+! 	    replace_do_bs();
+! 	else
+! 	    (void)del_char(FALSE);
+      }
+  }
+  #endif
+  
+  #if defined(FEAT_INS_EXPAND) || defined(PROTO)
+  /*
+   * CTRL-X pressed in Insert mode.
+--- 1946,1994 ----
+      {
+  	curwin->w_cursor.col--;
+  	if (State & REPLACE_FLAG)
+! 	    replace_do_bs(col);
+! 	else if (!del_char_after_col(col))
+! 	    break;
+      }
+  }
+  #endif
+  
++ /*
++  * Like del_char(), but make sure not to go before column "limit_col".
++  * Only matters when there are composing characters.
++  * Return TRUE when something was deleted.
++  */
++    static int
++ del_char_after_col(limit_col)
++     int limit_col;
++ {
++ #ifdef FEAT_MBYTE
++     if (enc_utf8 && limit_col >= 0)
++     {
++ 	int ecol = curwin->w_cursor.col + 1;
++ 
++ 	/* Make sure the cursor is at the start of a character, but
++ 	 * skip forward again when going too far back because of a
++ 	 * composing character. */
++ 	mb_adjust_cursor();
++ 	while (curwin->w_cursor.col < limit_col)
++ 	{
++ 	    int l = utf_ptr2len(ml_get_cursor());
++ 
++ 	    if (l == 0)  /* end of line */
++ 		break;
++ 	    curwin->w_cursor.col += l;
++ 	}
++ 	if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
++ 	    return FALSE;
++ 	del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE);
++     }
++     else
++ #endif
++ 	(void)del_char(FALSE);
++     return TRUE;
++ }
++ 
+  #if defined(FEAT_INS_EXPAND) || defined(PROTO)
+  /*
+   * CTRL-X pressed in Insert mode.
+***************
+*** 2418,2424 ****
+  	{
+  	    had_match = (curwin->w_cursor.col > compl_col);
+  	    ins_compl_delete();
+! 	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+  	    ins_redraw(FALSE);
+  
+  	    /* When the match isn't there (to avoid matching itself) remove it
+--- 2458,2464 ----
+  	{
+  	    had_match = (curwin->w_cursor.col > compl_col);
+  	    ins_compl_delete();
+! 	    ins_bytes(compl_leader + ins_compl_len());
+  	    ins_redraw(FALSE);
+  
+  	    /* When the match isn't there (to avoid matching itself) remove it
+***************
+*** 2470,2476 ****
+  	    *p = NUL;
+  	    had_match = (curwin->w_cursor.col > compl_col);
+  	    ins_compl_delete();
+! 	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+  	    ins_redraw(FALSE);
+  
+  	    /* When the match isn't there (to avoid matching itself) remove it
+--- 2510,2516 ----
+  	    *p = NUL;
+  	    had_match = (curwin->w_cursor.col > compl_col);
+  	    ins_compl_delete();
+! 	    ins_bytes(compl_leader + ins_compl_len());
+  	    ins_redraw(FALSE);
+  
+  	    /* When the match isn't there (to avoid matching itself) remove it
+***************
+*** 3209,3215 ****
+  {
+      ins_compl_del_pum();
+      ins_compl_delete();
+!     ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+      compl_used_match = FALSE;
+  
+      if (compl_started)
+--- 3249,3255 ----
+  {
+      ins_compl_del_pum();
+      ins_compl_delete();
+!     ins_bytes(compl_leader + ins_compl_len());
+      compl_used_match = FALSE;
+  
+      if (compl_started)
+***************
+*** 3264,3269 ****
+--- 3304,3323 ----
+  }
+  
+  /*
++  * Return the length of the completion, from the completion start column to
++  * the cursor column.  Making sure it never goes below zero.
++  */
++     static int
++ ins_compl_len()
++ {
++     int off = curwin->w_cursor.col - compl_col;
++ 
++     if (off < 0)
++ 	return 0;
++     return off;
++ }
++ 
++ /*
+   * Append one character to the match leader.  May reduce the number of
+   * matches.
+   */
+***************
+*** 3621,3630 ****
+  	    {
+  		ins_compl_delete();
+  		if (compl_leader != NULL)
+! 		    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+  		else if (compl_first_match != NULL)
+! 		    ins_bytes(compl_orig_text
+! 					  + curwin->w_cursor.col - compl_col);
+  		retval = TRUE;
+  	    }
+  
+--- 3675,3683 ----
+  	    {
+  		ins_compl_delete();
+  		if (compl_leader != NULL)
+! 		    ins_bytes(compl_leader + ins_compl_len());
+  		else if (compl_first_match != NULL)
+! 		    ins_bytes(compl_orig_text + ins_compl_len());
+  		retval = TRUE;
+  	    }
+  
+***************
+*** 4256,4262 ****
+      static void
+  ins_compl_insert()
+  {
+!     ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col);
+      if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
+  	compl_used_match = FALSE;
+      else
+--- 4309,4315 ----
+      static void
+  ins_compl_insert()
+  {
+!     ins_bytes(compl_shown_match->cp_str + ins_compl_len());
+      if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
+  	compl_used_match = FALSE;
+      else
+***************
+*** 4425,4431 ****
+  	if (!compl_get_longest || compl_used_match)
+  	    ins_compl_insert();
+  	else
+! 	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+      }
+      else
+  	compl_used_match = FALSE;
+--- 4478,4484 ----
+  	if (!compl_get_longest || compl_used_match)
+  	    ins_compl_insert();
+  	else
+! 	    ins_bytes(compl_leader + ins_compl_len());
+      }
+      else
+  	compl_used_match = FALSE;
+***************
+*** 7123,7131 ****
+   * cc == 0: character was inserted, delete it
+   * cc > 0: character was replaced, put cc (first byte of original char) back
+   * and check for more characters to be put back
+   */
+      static void
+! replace_do_bs()
+  {
+      int		cc;
+  #ifdef FEAT_VREPLACE
+--- 7176,7187 ----
+   * cc == 0: character was inserted, delete it
+   * cc > 0: character was replaced, put cc (first byte of original char) back
+   * and check for more characters to be put back
++  * When "limit_col" is >= 0, don't delete before this column.  Matters when
++  * using composing characters, use del_char_after_col() instead of del_char().
+   */
+      static void
+! replace_do_bs(limit_col)
+!     int		limit_col;
+  {
+      int		cc;
+  #ifdef FEAT_VREPLACE
+***************
+*** 7153,7159 ****
+  #ifdef FEAT_MBYTE
+  	if (has_mbyte)
+  	{
+! 	    del_char(FALSE);
+  # ifdef FEAT_VREPLACE
+  	    if (State & VREPLACE_FLAG)
+  		orig_len = (int)STRLEN(ml_get_cursor());
+--- 7209,7215 ----
+  #ifdef FEAT_MBYTE
+  	if (has_mbyte)
+  	{
+! 	    (void)del_char_after_col(limit_col);
+  # ifdef FEAT_VREPLACE
+  	    if (State & VREPLACE_FLAG)
+  		orig_len = (int)STRLEN(ml_get_cursor());
+***************
+*** 7203,7209 ****
+  	changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
+      }
+      else if (cc == 0)
+! 	(void)del_char(FALSE);
+  }
+  
+  #ifdef FEAT_CINDENT
+--- 7259,7265 ----
+  	changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
+      }
+      else if (cc == 0)
+! 	(void)del_char_after_col(limit_col);
+  }
+  
+  #ifdef FEAT_CINDENT
+***************
+*** 8239,8245 ****
+  	 * Replace mode */
+  	if (curwin->w_cursor.lnum != Insstart.lnum
+  		|| curwin->w_cursor.col >= Insstart.col)
+! 	    replace_do_bs();
+      }
+      else
+  	(void)del_char(FALSE);
+--- 8295,8301 ----
+  	 * Replace mode */
+  	if (curwin->w_cursor.lnum != Insstart.lnum
+  		|| curwin->w_cursor.col >= Insstart.col)
+! 	    replace_do_bs(-1);
+      }
+      else
+  	(void)del_char(FALSE);
+***************
+*** 8556,8562 ****
+  		break;
+  	    }
+  	    if (State & REPLACE_FLAG)
+! 		replace_do_bs();
+  	    else
+  	    {
+  #ifdef FEAT_MBYTE
+--- 8612,8618 ----
+  		break;
+  	    }
+  	    if (State & REPLACE_FLAG)
+! 		replace_do_bs(-1);
+  	    else
+  	    {
+  #ifdef FEAT_MBYTE
+*** ../vim-7.2.079/src/version.c	Tue Jan  6 16:13:42 2009
+--- src/version.c	Tue Jan 13 12:25:29 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     80,
+  /**/
+
+-- 
+At some point in the project somebody will start whining about the need to
+determine the project "requirements".  This involves interviewing people who
+don't know what they want but, curiously, know exactly when they need it.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.081 b/source/ap/vim/patches/7.2.081
new file mode 100644
index 000000000..9f1259d7c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.081
@@ -0,0 +1,60 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.081
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.081
+Problem:    Compiler warning for floating point overflow on VAX.
+Solution:   For VAX use a smaller number. (Zoltan Arpadffy)
+Files:	    src/message.c
+
+
+*** ../vim-7.2.080/src/message.c	Fri Nov 28 21:26:50 2008
+--- src/message.c	Tue Jan 13 16:19:07 2009
+***************
+*** 4556,4562 ****
+  			remove_trailing_zeroes = TRUE;
+  		    }
+  
+! 		    if (fmt_spec == 'f' && abs_f > 1.0e307)
+  		    {
+  			/* Avoid a buffer overflow */
+  			strcpy(tmp, "inf");
+--- 4556,4568 ----
+  			remove_trailing_zeroes = TRUE;
+  		    }
+  
+! 		    if (fmt_spec == 'f' &&
+! #ifdef VAX
+! 			    abs_f > 1.0e38
+! #else
+! 			    abs_f > 1.0e307
+! #endif
+! 			    )
+  		    {
+  			/* Avoid a buffer overflow */
+  			strcpy(tmp, "inf");
+*** ../vim-7.2.080/src/version.c	Tue Jan 13 12:29:03 2009
+--- src/version.c	Tue Jan 13 16:19:52 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     81,
+  /**/
+
+-- 
+Sometimes you can protect millions of dollars in your budget simply by buying
+a bag of cookies, dropping it on the budget anylyst's desk, and saying
+something deeply personal such as "How was your weekend, big guy?"
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.082 b/source/ap/vim/patches/7.2.082
new file mode 100644
index 000000000..c6bf703cc
--- /dev/null
+++ b/source/ap/vim/patches/7.2.082
@@ -0,0 +1,77 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.082
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.082
+Problem:    When 'ff' is "mac" then "ga" on a ^J shows 0x0d instead of 0x0a.
+	    (Andy Wokula)
+Solution:   Use NL for this situation. (Lech Lorens)
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-7.2.081/src/ex_cmds.c	Fri Nov 28 21:26:50 2008
+--- src/ex_cmds.c	Tue Jan 13 16:51:32 2009
+***************
+*** 49,54 ****
+--- 49,55 ----
+      exarg_T	*eap;
+  {
+      int		c;
++     int		cval;
+      char	buf1[20];
+      char	buf2[20];
+      char_u	buf3[7];
+***************
+*** 75,80 ****
+--- 76,85 ----
+      {
+  	if (c == NL)	    /* NUL is stored as NL */
+  	    c = NUL;
++ 	if (c == CAR && get_fileformat(curbuf) == EOL_MAC)
++ 	    cval = NL;	    /* NL is stored as CR */
++ 	else
++ 	    cval = c;
+  	if (vim_isprintc_strict(c) && (c < ' '
+  #ifndef EBCDIC
+  		    || c > '~'
+***************
+*** 94,100 ****
+  	    buf2[0] = NUL;
+  	vim_snprintf((char *)IObuff, IOSIZE,
+  		_("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
+! 					   transchar(c), buf1, buf2, c, c, c);
+  #ifdef FEAT_MBYTE
+  	if (enc_utf8)
+  	    c = cc[ci++];
+--- 99,105 ----
+  	    buf2[0] = NUL;
+  	vim_snprintf((char *)IObuff, IOSIZE,
+  		_("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
+! 				  transchar(c), buf1, buf2, cval, cval, cval);
+  #ifdef FEAT_MBYTE
+  	if (enc_utf8)
+  	    c = cc[ci++];
+*** ../vim-7.2.081/src/version.c	Tue Jan 13 16:37:31 2009
+--- src/version.c	Tue Jan 13 16:53:39 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     82,
+  /**/
+
+-- 
+The budget process was invented by an alien race of sadistic beings who
+resemble large cats.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.083 b/source/ap/vim/patches/7.2.083
new file mode 100644
index 000000000..5406ebc6b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.083
@@ -0,0 +1,54 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.083
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.083
+Problem:    ":tag" does not return to the right tag entry from the tag stack.
+Solution:   Don't change the current match when there is no argument.
+	    (Erik Falor)
+Files:	    src/tag.c
+
+
+*** ../vim-7.2.082/src/tag.c	Tue Dec  9 12:12:31 2008
+--- src/tag.c	Tue Jan 13 17:14:59 2009
+***************
+*** 515,521 ****
+  	     * If a count is supplied to the ":tag <name>" command, then
+  	     * jump to count'th matching tag.
+  	     */
+! 	    if (type == DT_TAG && count > 0)
+  		cur_match = count - 1;
+  
+  	    if (type == DT_SELECT || type == DT_JUMP
+--- 515,521 ----
+  	     * If a count is supplied to the ":tag <name>" command, then
+  	     * jump to count'th matching tag.
+  	     */
+! 	    if (type == DT_TAG && *tag != NUL && count > 0)
+  		cur_match = count - 1;
+  
+  	    if (type == DT_SELECT || type == DT_JUMP
+*** ../vim-7.2.082/src/version.c	Tue Jan 13 16:57:09 2009
+--- src/version.c	Tue Jan 13 17:16:42 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     83,
+  /**/
+
+-- 
+Engineers will go without food and hygiene for days to solve a problem.
+(Other times just because they forgot.)
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.084 b/source/ap/vim/patches/7.2.084
new file mode 100644
index 000000000..4c912ca7a
--- /dev/null
+++ b/source/ap/vim/patches/7.2.084
@@ -0,0 +1,144 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.084
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.084
+Problem:    Recursive structures are not handled properly in Python
+	    vim.eval().
+Solution:   Keep track of references in a better way. (Yukihiro Nakadaira)
+Files:	    src/if_python.c
+
+
+*** ../vim-7.2.083/src/if_python.c	Thu Nov 20 11:04:01 2008
+--- src/if_python.c	Tue Jan 13 18:08:06 2009
+***************
+*** 1151,1164 ****
+  
+      /* Check if we run into a recursive loop.  The item must be in lookupDict
+       * then and we can use it again. */
+!     sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, (long_u)our_tv);
+!     result = PyDict_GetItemString(lookupDict, ptrBuf);
+!     if (result != NULL)
+! 	Py_INCREF(result);
+!     else if (our_tv->v_type == VAR_STRING)
+      {
+  	result = Py_BuildValue("s", our_tv->vval.v_string);
+- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
+      }
+      else if (our_tv->v_type == VAR_NUMBER)
+      {
+--- 1151,1173 ----
+  
+      /* Check if we run into a recursive loop.  The item must be in lookupDict
+       * then and we can use it again. */
+!     if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL)
+! 	    || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL))
+!     {
+! 	sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U,
+! 	        our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list
+! 		                           : (long_u)our_tv->vval.v_dict);
+! 	result = PyDict_GetItemString(lookupDict, ptrBuf);
+! 	if (result != NULL)
+! 	{
+! 	    Py_INCREF(result);
+! 	    return result;
+! 	}
+!     }
+! 
+!     if (our_tv->v_type == VAR_STRING)
+      {
+  	result = Py_BuildValue("s", our_tv->vval.v_string);
+      }
+      else if (our_tv->v_type == VAR_NUMBER)
+      {
+***************
+*** 1167,1173 ****
+  	/* For backwards compatibility numbers are stored as strings. */
+  	sprintf(buf, "%ld", (long)our_tv->vval.v_number);
+  	result = Py_BuildValue("s", buf);
+- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
+      }
+  # ifdef FEAT_FLOAT
+      else if (our_tv->v_type == VAR_FLOAT)
+--- 1176,1181 ----
+***************
+*** 1176,1182 ****
+  
+  	sprintf(buf, "%f", our_tv->vval.v_float);
+  	result = Py_BuildValue("s", buf);
+- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
+      }
+  # endif
+      else if (our_tv->v_type == VAR_LIST)
+--- 1184,1189 ----
+***************
+*** 1185,1194 ****
+  	listitem_T	*curr;
+  
+  	result = PyList_New(0);
+- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
+  
+  	if (list != NULL)
+  	{
+  	    for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
+  	    {
+  		newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict);
+--- 1192,1202 ----
+  	listitem_T	*curr;
+  
+  	result = PyList_New(0);
+  
+  	if (list != NULL)
+  	{
++ 	    PyDict_SetItemString(lookupDict, ptrBuf, result);
++ 
+  	    for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
+  	    {
+  		newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict);
+***************
+*** 1200,1206 ****
+      else if (our_tv->v_type == VAR_DICT)
+      {
+  	result = PyDict_New();
+- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
+  
+  	if (our_tv->vval.v_dict != NULL)
+  	{
+--- 1208,1213 ----
+***************
+*** 1209,1214 ****
+--- 1216,1223 ----
+  	    hashitem_T	*hi;
+  	    dictitem_T	*di;
+  
++ 	    PyDict_SetItemString(lookupDict, ptrBuf, result);
++ 
+  	    for (hi = ht->ht_array; todo > 0; ++hi)
+  	    {
+  		if (!HASHITEM_EMPTY(hi))
+*** ../vim-7.2.083/src/version.c	Tue Jan 13 17:27:18 2009
+--- src/version.c	Tue Jan 13 17:54:14 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     84,
+  /**/
+
+-- 
+Article in the first Free Software Magazine: "Bram Moolenaar studied electrical
+engineering at the Technical University of Delft and graduated in 1985 on a
+multi-processor Unix architecture."
+Response by "dimator": Could the school not afford a proper stage for the
+ceremony?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.085 b/source/ap/vim/patches/7.2.085
new file mode 100644
index 000000000..f9828fa1d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.085
@@ -0,0 +1,62 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.085
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.085
+Problem:    ":set <M-b>=<Esc>b" does not work when 'encoding' is utf-8.
+Solution:   Put the <M-b> character in the input buffer as valid utf-8.
+	    (partly by Matt Wosniski)
+Files:	    src/term.c
+
+
+*** ../vim-7.2.084/src/term.c	Tue Jul 29 12:22:12 2008
+--- src/term.c	Thu Jan 22 18:18:29 2009
+***************
+*** 4920,4926 ****
+  	key_name[0] = KEY2TERMCAP0(key);
+  	key_name[1] = KEY2TERMCAP1(key);
+  	if (key_name[0] == KS_KEY)
+! 	    string[new_slen++] = key_name[1];	/* from ":set <M-b>=xx" */
+  	else
+  	{
+  	    string[new_slen++] = K_SPECIAL;
+--- 4920,4934 ----
+  	key_name[0] = KEY2TERMCAP0(key);
+  	key_name[1] = KEY2TERMCAP1(key);
+  	if (key_name[0] == KS_KEY)
+! 	{
+! 	    /* from ":set <M-b>=xx" */
+! #ifdef FEAT_MBYTE
+! 	    if (has_mbyte)
+! 		new_slen += (*mb_char2bytes)(key_name[1], string + new_slen);
+! 	    else
+! #endif
+! 		string[new_slen++] = key_name[1];
+! 	}
+  	else
+  	{
+  	    string[new_slen++] = K_SPECIAL;
+*** ../vim-7.2.084/src/version.c	Tue Jan 13 18:10:21 2009
+--- src/version.c	Thu Jan 22 18:31:50 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     85,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+20. When looking at a pageful of someone else's links, you notice all of them
+    are already highlighted in purple.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.086 b/source/ap/vim/patches/7.2.086
new file mode 100644
index 000000000..f55efbb2c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.086
@@ -0,0 +1,98 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.086
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.086
+Problem:    Using ":diffget 1" in buffer 1 corrupts the text.
+Solution:   Don't do anything when source and destination of ":diffget" or
+	    ":diffput" is the same buffer. (Dominique Pelle)
+Files:	    src/diff.c
+
+
+*** ../vim-7.2.085/src/diff.c	Sun Nov 30 15:15:56 2008
+--- src/diff.c	Wed Jan 14 20:40:25 2009
+***************
+*** 8,14 ****
+   */
+  
+  /*
+!  * diff.c: code for diff'ing two or three buffers.
+   */
+  
+  #include "vim.h"
+--- 8,14 ----
+   */
+  
+  /*
+!  * diff.c: code for diff'ing two, three or four buffers.
+   */
+  
+  #include "vim.h"
+***************
+*** 116,122 ****
+   * Add a buffer to make diffs for.
+   * Call this when a new buffer is being edited in the current window where
+   * 'diff' is set.
+!  * Marks the current buffer as being part of the diff and requireing updating.
+   * This must be done before any autocmd, because a command may use info
+   * about the screen contents.
+   */
+--- 116,122 ----
+   * Add a buffer to make diffs for.
+   * Call this when a new buffer is being edited in the current window where
+   * 'diff' is set.
+!  * Marks the current buffer as being part of the diff and requiring updating.
+   * This must be done before any autocmd, because a command may use info
+   * about the screen contents.
+   */
+***************
+*** 929,935 ****
+  	goto theend;
+  
+  #ifdef UNIX
+!     /* Temporaraly chdir to /tmp, to avoid patching files in the current
+       * directory when the patch file contains more than one patch.  When we
+       * have our own temp dir use that instead, it will be cleaned up when we
+       * exit (any .rej files created).  Don't change directory if we can't
+--- 929,935 ----
+  	goto theend;
+  
+  #ifdef UNIX
+!     /* Temporarily chdir to /tmp, to avoid patching files in the current
+       * directory when the patch file contains more than one patch.  When we
+       * have our own temp dir use that instead, it will be cleaned up when we
+       * exit (any .rej files created).  Don't change directory if we can't
+***************
+*** 2129,2134 ****
+--- 2129,2136 ----
+  	    EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
+  	    return;
+  	}
++ 	if (buf == curbuf)
++ 	    return;		/* nothing to do */
+  	idx_other = diff_buf_idx(buf);
+  	if (idx_other == DB_COUNT)
+  	{
+*** ../vim-7.2.085/src/version.c	Thu Jan 22 18:32:55 2009
+--- src/version.c	Thu Jan 22 20:46:54 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     86,
+  /**/
+
+-- 
+Shift happens.
+                -- Doppler
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.087 b/source/ap/vim/patches/7.2.087
new file mode 100644
index 000000000..942acca2c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.087
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.087
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.087
+Problem:    Adding URL to 'path' doesn't work to edit a file.
+Solution:   Skip simplify_filename() for URLs. (Matt Wosniski)
+Files:	    src/misc2.c
+
+
+*** ../vim-7.2.086/src/misc2.c	Wed Dec 24 12:53:33 2008
+--- src/misc2.c	Sun Jan 18 12:26:20 2009
+***************
+*** 4696,4702 ****
+  				stackp->ffs_filearray_cur = i + 1;
+  				ff_push(search_ctx, stackp);
+  
+! 				simplify_filename(file_path);
+  				if (mch_dirname(ff_expand_buffer, MAXPATHL)
+  									== OK)
+  				{
+--- 4696,4703 ----
+  				stackp->ffs_filearray_cur = i + 1;
+  				ff_push(search_ctx, stackp);
+  
+! 				if (!path_with_url(file_path))
+! 				    simplify_filename(file_path);
+  				if (mch_dirname(ff_expand_buffer, MAXPATHL)
+  									== OK)
+  				{
+*** ../vim-7.2.086/src/version.c	Thu Jan 22 20:48:07 2009
+--- src/version.c	Thu Jan 22 21:30:36 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     87,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+21. Your dog has its own home page.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.088 b/source/ap/vim/patches/7.2.088
new file mode 100644
index 000000000..1cb985116
--- /dev/null
+++ b/source/ap/vim/patches/7.2.088
@@ -0,0 +1,99 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.088 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.088 (extra)
+Problem:    OpenClipboard() may fail when another application is using the
+	    clipboard.
+Solution:   Retry OpenClipboard() a few times. (Jianrong Yu)
+Files:	    src/os_mswin.c
+
+
+*** ../vim-7.2.087/src/os_mswin.c	Thu Nov 20 17:09:09 2008
+--- src/os_mswin.c	Thu Jan 22 18:38:12 2009
+***************
+*** 1224,1229 ****
+--- 1224,1248 ----
+  #endif /* FEAT_MBYTE */
+  
+  /*
++  * Wait for another process to Close the Clipboard.
++  * Returns TRUE for success.
++  */
++     int
++ vim_open_clipboard()
++ {
++     int delay = 10;
++ 
++     while (!OpenClipboard(NULL))
++     {
++         if (delay > 500)
++             return FALSE;  /* waited too long, give up */
++         Sleep(delay);
++         delay *= 2;	/* wait for 10, 20, 40, 80, etc. msec */
++     }
++     return TRUE;
++ }
++ 
++ /*
+   * Get the current selection and put it in the clipboard register.
+   *
+   * NOTE: Must use GlobalLock/Unlock here to ensure Win32s compatibility.
+***************
+*** 1254,1260 ****
+       * Don't pass GetActiveWindow() as an argument to OpenClipboard() because
+       * then we can't paste back into the same window for some reason - webb.
+       */
+!     if (!OpenClipboard(NULL))
+  	return;
+  
+      /* Check for vim's own clipboard format first.  This only gets the type of
+--- 1273,1279 ----
+       * Don't pass GetActiveWindow() as an argument to OpenClipboard() because
+       * then we can't paste back into the same window for some reason - webb.
+       */
+!     if (!vim_open_clipboard())
+  	return;
+  
+      /* Check for vim's own clipboard format first.  This only gets the type of
+***************
+*** 1562,1568 ****
+       * because then we can't paste back into the same window for some
+       * reason - webb.
+       */
+!     if (OpenClipboard(NULL))
+      {
+  	if (EmptyClipboard())
+  	{
+--- 1581,1587 ----
+       * because then we can't paste back into the same window for some
+       * reason - webb.
+       */
+!     if (vim_open_clipboard())
+      {
+  	if (EmptyClipboard())
+  	{
+*** ../vim-7.2.087/src/version.c	Thu Jan 22 21:31:24 2009
+--- src/version.c	Thu Jan 22 21:47:52 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     88,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+22. You've already visited all the links at Yahoo and you're halfway through
+    Lycos.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.089 b/source/ap/vim/patches/7.2.089
new file mode 100644
index 000000000..74276c6d4
--- /dev/null
+++ b/source/ap/vim/patches/7.2.089
@@ -0,0 +1,91 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.089 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.089 (extra)
+Problem:    Win32: crash when using Ultramon buttons.
+Solution:   Don't use a WM_OLE message of zero size. (Ray Megal)
+Files:	    src/if_ole.cpp, src/gui_w48.c
+
+
+*** ../vim-7.2.088/src/if_ole.cpp	Sun Mar 16 14:53:11 2008
+--- src/if_ole.cpp	Mon Jan 19 21:16:33 2009
+***************
+*** 353,361 ****
+      }
+  
+      /* Pass the string to the main input loop. The memory will be freed when
+!      * the message is processed.
+       */
+!     PostMessage(NULL, WM_OLE, 0, (LPARAM)str);
+  
+      return S_OK;
+  }
+--- 353,365 ----
+      }
+  
+      /* Pass the string to the main input loop. The memory will be freed when
+!      * the message is processed.  Except for an empty message, we don't need
+!      * to post it then.
+       */
+!     if (*str == NUL)
+! 	vim_free(str);
+!     else
+! 	PostMessage(NULL, WM_OLE, 0, (LPARAM)str);
+  
+      return S_OK;
+  }
+*** ../vim-7.2.088/src/gui_w48.c	Wed Dec 24 12:20:10 2008
+--- src/gui_w48.c	Mon Jan 19 21:19:30 2009
+***************
+*** 1663,1670 ****
+      if (msg.message == WM_OLE)
+      {
+  	char_u *str = (char_u *)msg.lParam;
+! 	add_to_input_buf(str, (int)STRLEN(str));
+! 	vim_free(str);
+  	return;
+      }
+  #endif
+--- 1663,1679 ----
+      if (msg.message == WM_OLE)
+      {
+  	char_u *str = (char_u *)msg.lParam;
+! 	if (str == NULL || *str == NUL)
+! 	{
+! 	    /* Message can't be ours, forward it.  Fixes problem with Ultramon
+! 	     * 3.0.4 */
+! 	    DispatchMessage(&msg);
+! 	}
+! 	else
+! 	{
+! 	    add_to_input_buf(str, (int)STRLEN(str));
+! 	    vim_free(str);  /* was allocated in CVim::SendKeys() */
+! 	}
+  	return;
+      }
+  #endif
+*** ../vim-7.2.088/src/version.c	Thu Jan 22 21:49:21 2009
+--- src/version.c	Wed Jan 28 14:16:01 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     89,
+  /**/
+
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+16. Have your coworkers address you by your wrestling name, Rock Hard Kim.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.090 b/source/ap/vim/patches/7.2.090
new file mode 100644
index 000000000..59dd7acf3
--- /dev/null
+++ b/source/ap/vim/patches/7.2.090
@@ -0,0 +1,130 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.090
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.090
+Problem:    User command containing 0x80 in multi-byte character does not work
+	    properly. (Yasuhiro Matsumoto)
+Solution:   Undo replacement of K_SPECIAL and CSI characters when executing
+	    the command.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.2.089/src/ex_docmd.c	Tue Dec  9 11:17:23 2008
+--- src/ex_docmd.c	Wed Jan 28 15:34:19 2009
+***************
+*** 5482,5487 ****
+--- 5482,5490 ----
+      return OK;
+  }
+  
++ /*
++  * ":command ..."
++  */
+      static void
+  ex_command(eap)
+      exarg_T   *eap;
+***************
+*** 5914,5919 ****
+--- 5917,5923 ----
+  
+      char_u	*start;
+      char_u	*end;
++     char_u	*ksp;
+      size_t	len, totlen;
+  
+      size_t	split_len = 0;
+***************
+*** 5930,5945 ****
+  
+      /*
+       * Replace <> in the command by the arguments.
+       */
+      buf = NULL;
+      for (;;)
+      {
+! 	p = cmd->uc_rep;
+! 	q = buf;
+  	totlen = 0;
+! 	while ((start = vim_strchr(p, '<')) != NULL
+! 	       && (end = vim_strchr(start + 1, '>')) != NULL)
+  	{
+  	    /* Include the '>' */
+  	    ++end;
+  
+--- 5934,5984 ----
+  
+      /*
+       * Replace <> in the command by the arguments.
++      * First round: "buf" is NULL, compute length, allocate "buf".
++      * Second round: copy result into "buf".
+       */
+      buf = NULL;
+      for (;;)
+      {
+! 	p = cmd->uc_rep;    /* source */
+! 	q = buf;	    /* destinateion */
+  	totlen = 0;
+! 
+! 	for (;;)
+  	{
++ 	    start = vim_strchr(p, '<');
++ 	    if (start != NULL)
++ 		end = vim_strchr(start + 1, '>');
++ 	    if (buf != NULL)
++ 	    {
++ 		ksp = vim_strchr(p, K_SPECIAL);
++ 		if (ksp != NULL && (start == NULL || ksp < start || end == NULL)
++ 			&& ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER)
++ # ifdef FEAT_GUI
++ 			    || (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI)
++ # endif
++ 			    ))
++ 		{
++ 		    /* K_SPECIAL han been put in the buffer as K_SPECIAL
++ 		     * KS_SPECIAL KE_FILLER, like for mappings, but
++ 		     * do_cmdline() doesn't handle that, so convert it back.
++ 		     * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */
++ 		    len = ksp - p;
++ 		    if (len > 0)
++ 		    {
++ 			mch_memmove(q, p, len);
++ 			q += len;
++ 		    }
++ 		    *q++ = ksp[1] == KS_SPECIAL ? K_SPECIAL : CSI;
++ 		    p = ksp + 3;
++ 		    continue;
++ 		}
++ 	    }
++ 
++ 	    /* break if there no <item> is found */
++ 	    if (start == NULL || end == NULL)
++ 		break;
++ 
+  	    /* Include the '>' */
+  	    ++end;
+  
+*** ../vim-7.2.089/src/version.c	Wed Jan 28 14:17:21 2009
+--- src/version.c	Wed Jan 28 15:37:40 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     90,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+17. When the money comes out the ATM, scream "I won!, I won! 3rd
+    time this week!!!!!"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.091 b/source/ap/vim/patches/7.2.091
new file mode 100644
index 000000000..766a155e1
--- /dev/null
+++ b/source/ap/vim/patches/7.2.091
@@ -0,0 +1,63 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.091
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.091
+Problem:    ":cs help" output is not aligned for some languages.
+Solution:   Compute character size instead of byte size. (Dominique Pelle)
+Files:	    src/if_cscope.c
+
+
+*** ../vim-7.2.090/src/if_cscope.c	Mon Aug 25 04:35:13 2008
+--- src/if_cscope.c	Thu Jan 22 18:44:46 2009
+***************
+*** 1177,1184 ****
+      (void)MSG_PUTS(_("cscope commands:\n"));
+      while (cmdp->name != NULL)
+      {
+! 	(void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
+! 				      cmdp->name, _(cmdp->help), cmdp->usage);
+  	if (strcmp(cmdp->name, "find") == 0)
+  	    MSG_PUTS(_("\n"
+  		       "       c: Find functions calling this function\n"
+--- 1177,1192 ----
+      (void)MSG_PUTS(_("cscope commands:\n"));
+      while (cmdp->name != NULL)
+      {
+! 	char *help = _(cmdp->help);
+! 	int  space_cnt = 30 - vim_strsize((char_u *)help);
+! 
+! 	/* Use %*s rather than %30s to ensure proper alignment in utf-8 */
+! 	if (space_cnt < 0)
+! 	    space_cnt = 0;
+! 	(void)smsg((char_u *)_("%-5s: %s%*s (Usage: %s)"),
+! 				      cmdp->name,
+! 				      help, space_cnt, " ",
+! 				      cmdp->usage);
+  	if (strcmp(cmdp->name, "find") == 0)
+  	    MSG_PUTS(_("\n"
+  		       "       c: Find functions calling this function\n"
+*** ../vim-7.2.090/src/version.c	Wed Jan 28 15:42:07 2009
+--- src/version.c	Wed Jan 28 16:02:25 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     91,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+18. When leaving the zoo, start running towards the parking lot,
+    yelling "run for your lives, they're loose!!"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.092 b/source/ap/vim/patches/7.2.092
new file mode 100644
index 000000000..633903ee7
--- /dev/null
+++ b/source/ap/vim/patches/7.2.092
@@ -0,0 +1,164 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.092
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.092
+Problem:    Some error messages are not translated.
+Solution:   Add _() around the messages. (Dominique Pelle)
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.091/src/eval.c	Sun Dec 21 13:02:47 2008
+--- src/eval.c	Sat Jan 24 12:22:47 2009
+***************
+*** 7918,7926 ****
+      else if (!aborting())
+      {
+  	if (argcount == MAX_FUNC_ARGS)
+! 	    emsg_funcname("E740: Too many arguments for function %s", name);
+  	else
+! 	    emsg_funcname("E116: Invalid arguments for function %s", name);
+      }
+  
+      while (--argcount >= 0)
+--- 7918,7926 ----
+      else if (!aborting())
+      {
+  	if (argcount == MAX_FUNC_ARGS)
+! 	    emsg_funcname(N_("E740: Too many arguments for function %s"), name);
+  	else
+! 	    emsg_funcname(N_("E116: Invalid arguments for function %s"), name);
+      }
+  
+      while (--argcount >= 0)
+***************
+*** 8153,8158 ****
+--- 8153,8159 ----
+  
+  /*
+   * Give an error message with a function name.  Handle <SNR> things.
++  * "ermsg" is to be passed without translation, use N_() instead of _().
+   */
+      static void
+  emsg_funcname(ermsg, name)
+***************
+*** 19867,19873 ****
+  		}
+  	    }
+  	    else
+! 		emsg_funcname("E123: Undefined function: %s", name);
+  	}
+  	goto ret_free;
+      }
+--- 19868,19874 ----
+  		}
+  	    }
+  	    else
+! 		emsg_funcname(N_("E123: Undefined function: %s"), name);
+  	}
+  	goto ret_free;
+      }
+***************
+*** 19911,19917 ****
+  						      : eval_isnamec(arg[j])))
+  		++j;
+  	    if (arg[j] != NUL)
+! 		emsg_funcname(_(e_invarg2), arg);
+  	}
+      }
+  
+--- 19912,19918 ----
+  						      : eval_isnamec(arg[j])))
+  		++j;
+  	    if (arg[j] != NUL)
+! 		emsg_funcname(e_invarg2, arg);
+  	}
+      }
+  
+***************
+*** 20183,20189 ****
+  	v = find_var(name, &ht);
+  	if (v != NULL && v->di_tv.v_type == VAR_FUNC)
+  	{
+! 	    emsg_funcname("E707: Function name conflicts with variable: %s",
+  									name);
+  	    goto erret;
+  	}
+--- 20184,20190 ----
+  	v = find_var(name, &ht);
+  	if (v != NULL && v->di_tv.v_type == VAR_FUNC)
+  	{
+! 	    emsg_funcname(N_("E707: Function name conflicts with variable: %s"),
+  									name);
+  	    goto erret;
+  	}
+***************
+*** 20198,20204 ****
+  	    }
+  	    if (fp->uf_calls > 0)
+  	    {
+! 		emsg_funcname("E127: Cannot redefine function %s: It is in use",
+  									name);
+  		goto erret;
+  	    }
+--- 20199,20205 ----
+  	    }
+  	    if (fp->uf_calls > 0)
+  	    {
+! 		emsg_funcname(N_("E127: Cannot redefine function %s: It is in use"),
+  									name);
+  		goto erret;
+  	    }
+***************
+*** 21477,21483 ****
+  
+  /*
+   * Return TRUE if items in "fc" do not have "copyID".  That means they are not
+!  * referenced from anywyere.
+   */
+      static int
+  can_free_funccal(fc, copyID)
+--- 21478,21484 ----
+  
+  /*
+   * Return TRUE if items in "fc" do not have "copyID".  That means they are not
+!  * referenced from anywhere.
+   */
+      static int
+  can_free_funccal(fc, copyID)
+*** ../vim-7.2.091/src/version.c	Wed Jan 28 16:03:51 2009
+--- src/version.c	Wed Jan 28 19:05:47 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     92,
+  /**/
+
+
+-- 
+Now it is such a bizarrely improbable coincidence that anything as
+mind-bogglingly useful as the Babel fish could have evolved purely by chance
+that some thinkers have chosen to see it as a final and clinching proof of the
+NON-existence of God.
+The argument goes something like this: 'I refuse to prove that I exist,' says
+God, 'for proof denies faith, and without faith I am nothing.'
+'But,' says Man, 'the Babel fish is a dead giveaway, isn't it?  It could not
+have evolved by chance.  It proves you exist, and so therefore, by your own
+arguments, you don't.  QED.'
+'Oh dear,' says God, 'I hadn't thought of that,' and promptly vanishes in a
+puff of logic.
+'Oh, that was easy,' says Man, and for an encore goes on to prove that black
+is white and gets himself killed on the next pedestrian crossing.
+		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.093 b/source/ap/vim/patches/7.2.093
new file mode 100644
index 000000000..b0f44909b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.093
@@ -0,0 +1,234 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.093 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.093 (extra)
+Problem:    Win32: inputdialog() and find/replace dialogs can't handle
+	    multi-byte text.
+Solution:   Use the wide version of dialog functions when available. (Yanwei
+	    Jia)
+Files:	    src/gui_w32.c, src/gui_w48.c
+
+
+*** ../vim-7.2.092/src/gui_w32.c	Thu Nov 20 17:09:09 2008
+--- src/gui_w32.c	Wed Jan 28 21:15:29 2009
+***************
+*** 1582,1587 ****
+--- 1582,1598 ----
+      s_findrep_struct.lpstrReplaceWith[0] = NUL;
+      s_findrep_struct.wFindWhatLen = MSWIN_FR_BUFSIZE;
+      s_findrep_struct.wReplaceWithLen = MSWIN_FR_BUFSIZE;
++ # if defined(FEAT_MBYTE) && defined(WIN3264)
++     s_findrep_struct_w.lStructSize = sizeof(s_findrep_struct_w);
++     s_findrep_struct_w.lpstrFindWhat =
++ 			      (LPWSTR)alloc(MSWIN_FR_BUFSIZE * sizeof(WCHAR));
++     s_findrep_struct_w.lpstrFindWhat[0] = NUL;
++     s_findrep_struct_w.lpstrReplaceWith =
++ 			      (LPWSTR)alloc(MSWIN_FR_BUFSIZE * sizeof(WCHAR));
++     s_findrep_struct_w.lpstrReplaceWith[0] = NUL;
++     s_findrep_struct_w.wFindWhatLen = MSWIN_FR_BUFSIZE;
++     s_findrep_struct_w.wReplaceWithLen = MSWIN_FR_BUFSIZE;
++ # endif
+  #endif
+  
+  theend:
+***************
+*** 2938,2945 ****
+  
+  	/* If the edit box exists, copy the string. */
+  	if (s_textfield != NULL)
+! 	    GetDlgItemText(hwnd, DLG_NONBUTTON_CONTROL + 2,
+  							 s_textfield, IOSIZE);
+  
+  	/*
+  	 * Need to check for IDOK because if the user just hits Return to
+--- 2949,2975 ----
+  
+  	/* If the edit box exists, copy the string. */
+  	if (s_textfield != NULL)
+! 	{
+! # if defined(FEAT_MBYTE) && defined(WIN3264)
+! 	    /* If the OS is Windows NT, and 'encoding' differs from active
+! 	     * codepage: use wide function and convert text. */
+! 	    if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT
+! 		    && enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+!             {
+! 	       WCHAR  *wp = (WCHAR *)alloc(IOSIZE * sizeof(WCHAR));
+! 	       char_u *p;
+! 
+! 	       GetDlgItemTextW(hwnd, DLG_NONBUTTON_CONTROL + 2, wp, IOSIZE);
+! 	       p = utf16_to_enc(wp, NULL);
+! 	       vim_strncpy(s_textfield, p, IOSIZE);
+! 	       vim_free(p);
+! 	       vim_free(wp);
+! 	    }
+! 	    else
+! # endif
+! 		GetDlgItemText(hwnd, DLG_NONBUTTON_CONTROL + 2,
+  							 s_textfield, IOSIZE);
++ 	}
+  
+  	/*
+  	 * Need to check for IDOK because if the user just hits Return to
+*** ../vim-7.2.092/src/gui_w48.c	Wed Jan 28 14:17:21 2009
+--- src/gui_w48.c	Wed Jan 28 21:10:26 2009
+***************
+*** 153,158 ****
+--- 153,161 ----
+  #ifdef MSWIN_FIND_REPLACE
+  static UINT		s_findrep_msg = 0;	/* set in gui_w[16/32].c */
+  static FINDREPLACE	s_findrep_struct;
++ # if defined(FEAT_MBYTE) && defined(WIN3264)
++ static FINDREPLACEW	s_findrep_struct_w;
++ # endif
+  static HWND		s_findrep_hwnd = NULL;
+  static int		s_findrep_is_find;	/* TRUE for find dialog, FALSE
+  						   for find/replace dialog */
+***************
+*** 884,889 ****
+--- 887,931 ----
+  #endif
+  
+  #ifdef MSWIN_FIND_REPLACE
++ # if defined(FEAT_MBYTE) && defined(WIN3264)
++ /*
++  * copy useful data from structure LPFINDREPLACE to structure LPFINDREPLACEW
++  */
++     static void
++ findrep_atow(LPFINDREPLACEW lpfrw, LPFINDREPLACE lpfr)
++ {
++     WCHAR *wp;
++ 
++     lpfrw->hwndOwner = lpfr->hwndOwner;
++     lpfrw->Flags = lpfr->Flags;
++ 
++     wp = enc_to_utf16(lpfr->lpstrFindWhat, NULL);
++     wcsncpy(lpfrw->lpstrFindWhat, wp, lpfrw->wFindWhatLen - 1);
++     vim_free(wp);
++ 
++     /* the field "lpstrReplaceWith" doesn't need to be copied */
++ }
++ 
++ /*
++  * copy useful data from structure LPFINDREPLACEW to structure LPFINDREPLACE
++  */
++     static void
++ findrep_wtoa(LPFINDREPLACE lpfr, LPFINDREPLACEW lpfrw)
++ {
++     char_u *p;
++ 
++     lpfr->Flags = lpfrw->Flags;
++ 
++     p = utf16_to_enc(lpfrw->lpstrFindWhat, NULL);
++     vim_strncpy(lpfr->lpstrFindWhat, p, lpfr->wFindWhatLen - 1);
++     vim_free(p);
++ 
++     p = utf16_to_enc(lpfrw->lpstrReplaceWith, NULL);
++     vim_strncpy(lpfr->lpstrReplaceWith, p, lpfr->wReplaceWithLen - 1);
++     vim_free(p);
++ }
++ # endif
++ 
+  /*
+   * Handle a Find/Replace window message.
+   */
+***************
+*** 893,898 ****
+--- 935,950 ----
+      int	    flags = 0;
+      int	    down;
+  
++ # if defined(FEAT_MBYTE) && defined(WIN3264)
++     /* If the OS is Windows NT, and 'encoding' differs from active codepage:
++      * convert text from wide string. */
++     if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT
++ 			&& enc_codepage >= 0 && (int)GetACP() != enc_codepage)
++     {
++         findrep_wtoa(&s_findrep_struct, &s_findrep_struct_w);
++     }
++ # endif
++ 
+      if (s_findrep_struct.Flags & FR_DIALOGTERM)
+  	/* Give main window the focus back. */
+  	(void)SetFocus(s_hwnd);
+***************
+*** 2562,2568 ****
+  	if (!IsWindow(s_findrep_hwnd))
+  	{
+  	    initialise_findrep(eap->arg);
+! 	    s_findrep_hwnd = FindText((LPFINDREPLACE) &s_findrep_struct);
+  	}
+  
+  	set_window_title(s_findrep_hwnd,
+--- 2614,2632 ----
+  	if (!IsWindow(s_findrep_hwnd))
+  	{
+  	    initialise_findrep(eap->arg);
+! # if defined(FEAT_MBYTE) && defined(WIN3264)
+! 	    /* If the OS is Windows NT, and 'encoding' differs from active
+! 	     * codepage: convert text and use wide function. */
+! 	    if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT
+! 		    && enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+! 	    {
+! 	        findrep_atow(&s_findrep_struct_w, &s_findrep_struct);
+! 		s_findrep_hwnd = FindTextW(
+! 					(LPFINDREPLACEW) &s_findrep_struct_w);
+! 	    }
+! 	    else
+! # endif
+! 		s_findrep_hwnd = FindText((LPFINDREPLACE) &s_findrep_struct);
+  	}
+  
+  	set_window_title(s_findrep_hwnd,
+***************
+*** 2587,2593 ****
+  	if (!IsWindow(s_findrep_hwnd))
+  	{
+  	    initialise_findrep(eap->arg);
+! 	    s_findrep_hwnd = ReplaceText((LPFINDREPLACE) &s_findrep_struct);
+  	}
+  
+  	set_window_title(s_findrep_hwnd,
+--- 2651,2668 ----
+  	if (!IsWindow(s_findrep_hwnd))
+  	{
+  	    initialise_findrep(eap->arg);
+! # if defined(FEAT_MBYTE) && defined(WIN3264)
+! 	    if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT
+! 		    && enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+! 	    {
+! 		findrep_atow(&s_findrep_struct_w, &s_findrep_struct);
+! 		s_findrep_hwnd = ReplaceTextW(
+! 					(LPFINDREPLACEW) &s_findrep_struct_w);
+! 	    }
+! 	    else
+! # endif
+! 		s_findrep_hwnd = ReplaceText(
+! 					   (LPFINDREPLACE) &s_findrep_struct);
+  	}
+  
+  	set_window_title(s_findrep_hwnd,
+*** ../vim-7.2.092/src/version.c	Wed Jan 28 19:08:31 2009
+--- src/version.c	Wed Jan 28 21:19:56 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     93,
+  /**/
+
+-- 
+I'm not familiar with this proof, but I'm aware of a significant
+following of toddlers who believe that peanut butter is the solution
+to all of life's problems... 		-- Tim Hammerquist
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.094 b/source/ap/vim/patches/7.2.094
new file mode 100644
index 000000000..bc79fa564
--- /dev/null
+++ b/source/ap/vim/patches/7.2.094
@@ -0,0 +1,112 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.094
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.094
+Problem:    Compiler warning for signed/unsigned compare.
+Solution:   Add type cast.  Also fix a few typos.
+Files:	    src/edit.c
+
+
+*** ../vim-7.2.093/src/edit.c	Tue Jan 13 12:29:03 2009
+--- src/edit.c	Wed Jan 28 21:13:51 2009
+***************
+*** 1958,1963 ****
+--- 1958,1964 ----
+   * Only matters when there are composing characters.
+   * Return TRUE when something was deleted.
+   */
++ /*ARGSUSED*/
+     static int
+  del_char_after_col(limit_col)
+      int limit_col;
+***************
+*** 1971,1977 ****
+  	 * skip forward again when going too far back because of a
+  	 * composing character. */
+  	mb_adjust_cursor();
+! 	while (curwin->w_cursor.col < limit_col)
+  	{
+  	    int l = utf_ptr2len(ml_get_cursor());
+  
+--- 1972,1978 ----
+  	 * skip forward again when going too far back because of a
+  	 * composing character. */
+  	mb_adjust_cursor();
+! 	while (curwin->w_cursor.col < (colnr_T)limit_col)
+  	{
+  	    int l = utf_ptr2len(ml_get_cursor());
+  
+***************
+*** 4240,4246 ****
+  	}
+  
+  	/* check if compl_curr_match has changed, (e.g. other type of
+! 	 * expansion added somenthing) */
+  	if (type != 0 && compl_curr_match != old_match)
+  	    found_new_match = OK;
+  
+--- 4241,4247 ----
+  	}
+  
+  	/* check if compl_curr_match has changed, (e.g. other type of
+! 	 * expansion added something) */
+  	if (type != 0 && compl_curr_match != old_match)
+  	    found_new_match = OK;
+  
+***************
+*** 4741,4747 ****
+  		}
+  		compl_length = curwin->w_cursor.col - (int)compl_col;
+  		/* IObuff is used to add a "word from the next line" would we
+! 		 * have enough space?  just being paranoic */
+  #define	MIN_SPACE 75
+  		if (compl_length > (IOSIZE - MIN_SPACE))
+  		{
+--- 4742,4748 ----
+  		}
+  		compl_length = curwin->w_cursor.col - (int)compl_col;
+  		/* IObuff is used to add a "word from the next line" would we
+! 		 * have enough space?  just being paranoid */
+  #define	MIN_SPACE 75
+  		if (compl_length > (IOSIZE - MIN_SPACE))
+  		{
+***************
+*** 8206,8212 ****
+  /*
+   * If the cursor is on an indent, ^T/^D insert/delete one
+   * shiftwidth.	Otherwise ^T/^D behave like a "<<" or ">>".
+!  * Always round the indent to 'shiftwith', this is compatible
+   * with vi.  But vi only supports ^T and ^D after an
+   * autoindent, we support it everywhere.
+   */
+--- 8207,8213 ----
+  /*
+   * If the cursor is on an indent, ^T/^D insert/delete one
+   * shiftwidth.	Otherwise ^T/^D behave like a "<<" or ">>".
+!  * Always round the indent to 'shiftwidth', this is compatible
+   * with vi.  But vi only supports ^T and ^D after an
+   * autoindent, we support it everywhere.
+   */
+*** ../vim-7.2.093/src/version.c	Wed Jan 28 21:22:20 2009
+--- src/version.c	Wed Feb  4 11:17:02 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     94,
+  /**/
+
+-- 
+Despite the cost of living, have you noticed how it remains so popular?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.095 b/source/ap/vim/patches/7.2.095
new file mode 100644
index 000000000..c69cadb31
--- /dev/null
+++ b/source/ap/vim/patches/7.2.095
@@ -0,0 +1,63 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.095
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.095
+Problem:    With Visual selection, "r" and then CTRL-C Visual mode is stopped
+	    but the highlighting is not removed.
+Solution:   Call reset_VIsual().
+Files:	    src/normal.c
+
+
+*** ../vim-7.2.094/src/normal.c	Thu Nov 20 16:11:03 2008
+--- src/normal.c	Fri Jan 30 20:37:01 2009
+***************
+*** 6783,6788 ****
+--- 6783,6790 ----
+      /* Visual mode "r" */
+      if (VIsual_active)
+      {
++ 	if (got_int)
++ 	    reset_VIsual();
+  	nv_operator(cap);
+  	return;
+      }
+***************
+*** 7839,7845 ****
+  	else
+  	    i = curwin->w_leftcol;
+  	/* Go to the middle of the screen line.  When 'number' is on and lines
+! 	 * are wrapping the middle can be more to the left.*/
+  	if (cap->nchar == 'm')
+  	    i += (W_WIDTH(curwin) - curwin_col_off()
+  		    + ((curwin->w_p_wrap && i > 0)
+--- 7841,7847 ----
+  	else
+  	    i = curwin->w_leftcol;
+  	/* Go to the middle of the screen line.  When 'number' is on and lines
+! 	 * are wrapping the middle can be more to the left. */
+  	if (cap->nchar == 'm')
+  	    i += (W_WIDTH(curwin) - curwin_col_off()
+  		    + ((curwin->w_p_wrap && i > 0)
+*** ../vim-7.2.094/src/version.c	Wed Feb  4 11:19:40 2009
+--- src/version.c	Wed Feb  4 11:43:28 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     95,
+  /**/
+
+-- 
+Nothing is fool-proof to a sufficiently talented fool.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.096 b/source/ap/vim/patches/7.2.096
new file mode 100644
index 000000000..e286ca9c8
--- /dev/null
+++ b/source/ap/vim/patches/7.2.096
@@ -0,0 +1,54 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.096
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.096
+Problem:    After ":number" the "Press Enter" message may be on the wrong
+	    screen, if switching screens for shell commands.
+Solution:   Reset info_message. (James Vega)
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-7.2.095/src/ex_cmds.c	Tue Jan 13 16:57:09 2009
+--- src/ex_cmds.c	Fri Jan 30 21:01:54 2009
+***************
+*** 2417,2424 ****
+  	cursor_on();		/* msg_start() switches it off */
+  	out_flush();
+  	silent_mode = save_silent;
+- 	info_message = FALSE;
+      }
+  }
+  
+  /*
+--- 2417,2424 ----
+  	cursor_on();		/* msg_start() switches it off */
+  	out_flush();
+  	silent_mode = save_silent;
+      }
++     info_message = FALSE;
+  }
+  
+  /*
+*** ../vim-7.2.095/src/version.c	Wed Feb  4 11:45:28 2009
+--- src/version.c	Wed Feb  4 13:12:55 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     96,
+  /**/
+
+-- 
+A fine is a tax for doing wrong.  A tax is a fine for doing well.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.097 b/source/ap/vim/patches/7.2.097
new file mode 100644
index 000000000..ac72d5d9e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.097
@@ -0,0 +1,54 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.097
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.097
+Problem:    "!xterm&" doesn't work when 'shell' is "bash".
+Solution:   Ignore SIGHUP after calling setsid(). (Simon Schubert) 
+Files:	    src/os_unix.c
+
+
+*** ../vim-7.2.096/src/os_unix.c	Fri Nov 28 21:26:50 2008
+--- src/os_unix.c	Wed Feb  4 12:09:55 2009
+***************
+*** 3950,3956 ****
+--- 3950,3966 ----
+  		 * children can be kill()ed.  Don't do this when using pipes,
+  		 * because stdin is not a tty, we would lose /dev/tty. */
+  		if (p_stmp)
++ 		{
+  		    (void)setsid();
++ #  if defined(SIGHUP)
++ 		    /* When doing "!xterm&" and 'shell' is bash: the shell
++ 		     * will exit and send SIGHUP to all processes in its
++ 		     * group, killing the just started process.  Ignore SIGHUP
++ 		     * to avoid that. (suggested by Simon Schubert)
++ 		     */
++ 		    signal(SIGHUP, SIG_IGN);
++ #  endif
++ 		}
+  # endif
+  # ifdef FEAT_GUI
+  		if (pty_slave_fd >= 0)
+*** ../vim-7.2.096/src/version.c	Wed Feb  4 13:13:42 2009
+--- src/version.c	Wed Feb  4 14:16:37 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     97,
+  /**/
+
+-- 
+It was recently discovered that research causes cancer in rats.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.098 b/source/ap/vim/patches/7.2.098
new file mode 100644
index 000000000..eed0a65d8
--- /dev/null
+++ b/source/ap/vim/patches/7.2.098
@@ -0,0 +1,69 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.098
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.098
+Problem:    Warning for signed/unsigned pointer.
+Solution:   Add type cast.
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.097/src/eval.c	Wed Jan 28 19:08:31 2009
+--- src/eval.c	Wed Feb  4 13:09:01 2009
+***************
+*** 3928,3934 ****
+  
+  /*
+   * Handle top level expression:
+!  *	expr1 ? expr0 : expr0
+   *
+   * "arg" must point to the first non-white of the expression.
+   * "arg" is advanced to the next non-white after the recognized expression.
+--- 3928,3934 ----
+  
+  /*
+   * Handle top level expression:
+!  *	expr2 ? expr1 : expr1
+   *
+   * "arg" must point to the first non-white of the expression.
+   * "arg" is advanced to the next non-white after the recognized expression.
+***************
+*** 19912,19918 ****
+  						      : eval_isnamec(arg[j])))
+  		++j;
+  	    if (arg[j] != NUL)
+! 		emsg_funcname(e_invarg2, arg);
+  	}
+      }
+  
+--- 19912,19918 ----
+  						      : eval_isnamec(arg[j])))
+  		++j;
+  	    if (arg[j] != NUL)
+! 		emsg_funcname((char *)e_invarg2, arg);
+  	}
+      }
+  
+*** ../vim-7.2.097/src/version.c	Wed Feb  4 14:18:44 2009
+--- src/version.c	Wed Feb  4 16:24:06 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     98,
+  /**/
+
+-- 
+Everybody lies, but it doesn't matter since nobody listens.
+                                -- Lieberman's Law
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.099 b/source/ap/vim/patches/7.2.099
new file mode 100644
index 000000000..6f5dae5d5
--- /dev/null
+++ b/source/ap/vim/patches/7.2.099
@@ -0,0 +1,127 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.099
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.099
+Problem:    Changing GUI options causes an unnecessary redraw when the GUI
+	    isn't active.
+Solution:   Avoid the redraw. (Lech Lorens)
+Files:	    src/option.c
+
+
+*** ../vim-7.2.098/src/option.c	Wed Dec 24 12:53:33 2008
+--- src/option.c	Wed Feb  4 16:59:56 2009
+***************
+*** 5407,5412 ****
+--- 5407,5416 ----
+      int		did_chartab = FALSE;
+      char_u	**gvarp;
+      long_u	free_oldval = (options[opt_idx].flags & P_ALLOCED);
++ #ifdef FEAT_GUI
++     /* set when changing an option that only requires a redraw in the GUI */
++     int		redraw_gui_only = FALSE;
++ #endif
+  
+      /* Get the global option to compare with, otherwise we would have to check
+       * two values for all local options. */
+***************
+*** 6055,6060 ****
+--- 6059,6065 ----
+  		    errmsg = (char_u *)N_("E596: Invalid font(s)");
+  	    }
+  	}
++ 	redraw_gui_only = TRUE;
+      }
+  # ifdef FEAT_XFONTSET
+      else if (varp == &p_guifontset)
+***************
+*** 6063,6068 ****
+--- 6068,6074 ----
+  	    errmsg = (char_u *)N_("E597: can't select fontset");
+  	else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK)
+  	    errmsg = (char_u *)N_("E598: Invalid fontset");
++ 	redraw_gui_only = TRUE;
+      }
+  # endif
+  # ifdef FEAT_MBYTE
+***************
+*** 6072,6077 ****
+--- 6078,6084 ----
+  	    errmsg = (char_u *)N_("E533: can't select wide font");
+  	else if (gui_get_wide_font() == FAIL)
+  	    errmsg = (char_u *)N_("E534: Invalid wide font");
++ 	redraw_gui_only = TRUE;
+      }
+  # endif
+  #endif
+***************
+*** 6133,6145 ****
+--- 6140,6163 ----
+  #ifdef FEAT_GUI
+      /* 'guioptions' */
+      else if (varp == &p_go)
++     {
+  	gui_init_which_components(oldval);
++ 	redraw_gui_only = TRUE;
++     }
+  #endif
+  
+  #if defined(FEAT_GUI_TABLINE)
+      /* 'guitablabel' */
+      else if (varp == &p_gtl)
++     {
+  	redraw_tabline = TRUE;
++ 	redraw_gui_only = TRUE;
++     }
++     /* 'guitabtooltip' */
++     else if (varp == &p_gtt)
++     {
++ 	redraw_gui_only = TRUE;
++     }
+  #endif
+  
+  #if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS))
+***************
+*** 6717,6723 ****
+  
+      if (curwin->w_curswant != MAXCOL)
+  	curwin->w_set_curswant = TRUE;  /* in case 'showbreak' changed */
+!     check_redraw(options[opt_idx].flags);
+  
+      return errmsg;
+  }
+--- 6735,6745 ----
+  
+      if (curwin->w_curswant != MAXCOL)
+  	curwin->w_set_curswant = TRUE;  /* in case 'showbreak' changed */
+! #ifdef FEAT_GUI
+!     /* check redraw when it's not a GUI option or the GUI is active. */
+!     if (!redraw_gui_only || gui.in_use)
+! #endif
+! 	check_redraw(options[opt_idx].flags);
+  
+      return errmsg;
+  }
+*** ../vim-7.2.098/src/version.c	Wed Feb  4 16:25:53 2009
+--- src/version.c	Wed Feb  4 17:24:11 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     99,
+  /**/
+
+-- 
+I started out with nothing, and I still have most of it.
+                                -- Michael Davis -- "Tonight Show"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.100 b/source/ap/vim/patches/7.2.100
new file mode 100644
index 000000000..0099edb1f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.100
@@ -0,0 +1,132 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.100
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.100
+Problem:    When using ":source" on a FIFO or something else that can't rewind
+	    the first three bytes are skipped.
+Solution:   Instead of rewinding read the first line and detect a BOM in that.
+	    (mostly by James Vega)
+Files:	    src/ex_cmds2.c
+
+
+*** ../vim-7.2.099/src/ex_cmds2.c	Sat Nov 15 14:10:23 2008
+--- src/ex_cmds2.c	Wed Feb  4 16:05:51 2009
+***************
+*** 2842,2847 ****
+--- 2842,2848 ----
+      linenr_T		    save_sourcing_lnum;
+      char_u		    *p;
+      char_u		    *fname_exp;
++     char_u		    *firstline = NULL;
+      int			    retval = FAIL;
+  #ifdef FEAT_EVAL
+      scid_T		    save_current_SID;
+***************
+*** 2992,3014 ****
+  
+      cookie.level = ex_nesting_level;
+  #endif
+- #ifdef FEAT_MBYTE
+-     cookie.conv.vc_type = CONV_NONE;		/* no conversion */
+- 
+-     /* Try reading the first few bytes to check for a UTF-8 BOM. */
+-     {
+- 	char_u	    buf[3];
+- 
+- 	if (fread((char *)buf, sizeof(char_u), (size_t)3, cookie.fp)
+- 								  == (size_t)3
+- 		&& buf[0] == 0xef && buf[1] == 0xbb && buf[2] == 0xbf)
+- 	    /* Found BOM, setup conversion and skip over it. */
+- 	    convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
+- 	else
+- 	    /* No BOM found, rewind. */
+- 	    fseek(cookie.fp, 0L, SEEK_SET);
+-     }
+- #endif
+  
+      /*
+       * Keep the sourcing name/lnum, for recursive calls.
+--- 2993,2998 ----
+***************
+*** 3018,3023 ****
+--- 3002,3026 ----
+      save_sourcing_lnum = sourcing_lnum;
+      sourcing_lnum = 0;
+  
++ #ifdef FEAT_MBYTE
++     cookie.conv.vc_type = CONV_NONE;		/* no conversion */
++ 
++     /* Read the first line so we can check for a UTF-8 BOM. */
++     firstline = getsourceline(0, (void *)&cookie, 0);
++     if (firstline != NULL && STRLEN(firstline) >= 3 && firstline[0] == 0xef
++ 			      && firstline[1] == 0xbb && firstline[2] == 0xbf)
++     {
++ 	/* Found BOM; setup conversion, skip over BOM and recode the line. */
++ 	convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
++ 	p = string_convert(&cookie.conv, firstline + 3, NULL);
++ 	if (p != NULL)
++ 	{
++ 	    vim_free(firstline);
++ 	    firstline = p;
++ 	}
++     }
++ #endif
++ 
+  #ifdef STARTUPTIME
+      time_push(&tv_rel, &tv_start);
+  #endif
+***************
+*** 3111,3119 ****
+      /*
+       * Call do_cmdline, which will call getsourceline() to get the lines.
+       */
+!     do_cmdline(NULL, getsourceline, (void *)&cookie,
+  				     DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT);
+- 
+      retval = OK;
+  
+  #ifdef FEAT_PROFILE
+--- 3114,3121 ----
+      /*
+       * Call do_cmdline, which will call getsourceline() to get the lines.
+       */
+!     do_cmdline(firstline, getsourceline, (void *)&cookie,
+  				     DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT);
+      retval = OK;
+  
+  #ifdef FEAT_PROFILE
+***************
+*** 3171,3176 ****
+--- 3173,3179 ----
+  #endif
+      fclose(cookie.fp);
+      vim_free(cookie.nextline);
++     vim_free(firstline);
+  #ifdef FEAT_MBYTE
+      convert_setup(&cookie.conv, NULL, NULL);
+  #endif
+*** ../vim-7.2.099/src/version.c	Wed Feb  4 17:27:50 2009
+--- src/version.c	Wed Feb  4 17:48:47 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     100,
+  /**/
+
+-- 
+Well, you come from nothing, you go back to nothing...  What have you
+lost?  Nothing!
+				-- Monty Python: The life of Brian
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.101 b/source/ap/vim/patches/7.2.101
new file mode 100644
index 000000000..e3526ca88
--- /dev/null
+++ b/source/ap/vim/patches/7.2.101
@@ -0,0 +1,47 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.101 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.101 (extra)
+Problem:    MSVC version not recognized.
+Solution:   Add the version number to the list.  (Zhong Zhang)
+Files:	    src/Make_mvc.mak
+
+
+*** ../vim-7.2.100/src/Make_mvc.mak	Thu Jul 24 20:49:58 2008
+--- src/Make_mvc.mak	Wed Feb  4 18:32:47 2009
+***************
+*** 354,359 ****
+--- 354,362 ----
+  !if "$(_NMAKE_VER)" == "9.00.21022.08"
+  MSVCVER = 9.0
+  !endif
++ !if "$(_NMAKE_VER)" == "9.00.30729.01"
++ MSVCVER = 9.0
++ !endif
+  !endif
+  
+  # Abort bulding VIM if version of VC is unrecognised.
+*** ../vim-7.2.100/src/version.c	Wed Feb  4 17:49:46 2009
+--- src/version.c	Wed Feb  4 18:34:12 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     101,
+  /**/
+
+-- 
+Light travels faster than sound.  This is why some people
+appear bright until you hear them speak
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.102 b/source/ap/vim/patches/7.2.102
new file mode 100644
index 000000000..316c32bde
--- /dev/null
+++ b/source/ap/vim/patches/7.2.102
@@ -0,0 +1,47 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.102
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.102 (after 7.2.100)
+Problem:    When 'encoding' is "utf-8" a BOM at the start of a Vim script is
+	    not removed. (Tony Mechelynck)
+Solution:   When no conversion is taking place make a copy of the line without
+	    the BOM.
+Files:	    src/ex_cmds2.c
+
+
+*** ../vim-7.2.101/src/ex_cmds2.c	Wed Feb  4 17:49:46 2009
+--- src/ex_cmds2.c	Thu Feb  5 20:41:56 2009
+***************
+*** 3013,3018 ****
+--- 3013,3020 ----
+  	/* Found BOM; setup conversion, skip over BOM and recode the line. */
+  	convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
+  	p = string_convert(&cookie.conv, firstline + 3, NULL);
++ 	if (p == NULL)
++ 	    p = vim_strsave(firstline + 3);
+  	if (p != NULL)
+  	{
+  	    vim_free(firstline);
+*** ../vim-7.2.101/src/version.c	Wed Feb  4 18:34:54 2009
+--- src/version.c	Thu Feb  5 20:44:55 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     102,
+  /**/
+
+-- 
+CVS sux, men don't like commitment
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.103 b/source/ap/vim/patches/7.2.103
new file mode 100644
index 000000000..25a513a75
--- /dev/null
+++ b/source/ap/vim/patches/7.2.103
@@ -0,0 +1,216 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.103
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.103
+Problem:    When 'bomb' is changed the window title is updated to show/hide a
+	    "+", but the tab page label isn't. (Patrick Texier)
+Solution:   Set "redraw_tabline" in most places where "need_maketitle" is set.
+	    (partly by Lech Lorens)
+Files:	    src/option.c
+
+
+*** ../vim-7.2.102/src/option.c	Wed Feb  4 17:27:50 2009
+--- src/option.c	Wed Feb  4 17:40:02 2009
+***************
+*** 5268,5273 ****
+--- 5268,5288 ----
+  }
+  #endif
+  
++ #ifdef FEAT_TITLE
++ static void redraw_titles __ARGS((void));
++ 
++ /*
++  * Redraw the window title and/or tab page text later.
++  */
++ static void redraw_titles()
++ {
++     need_maketitle = TRUE;
++ # ifdef FEAT_WINDOWS
++     redraw_tabline = TRUE;
++ # endif
++ }
++ #endif
++ 
+  /*
+   * Set a string option to a new value (without checking the effect).
+   * The string is copied into allocated memory.
+***************
+*** 5672,5678 ****
+  	    {
+  # ifdef FEAT_TITLE
+  		/* May show a "+" in the title now. */
+! 		need_maketitle = TRUE;
+  # endif
+  		/* Add 'fileencoding' to the swap file. */
+  		ml_setflags(curbuf);
+--- 5687,5693 ----
+  	    {
+  # ifdef FEAT_TITLE
+  		/* May show a "+" in the title now. */
+! 		redraw_titles();
+  # endif
+  		/* Add 'fileencoding' to the swap file. */
+  		ml_setflags(curbuf);
+***************
+*** 5691,5697 ****
+  	    {
+  		errmsg = mb_init();
+  # ifdef FEAT_TITLE
+! 		need_maketitle = TRUE;
+  # endif
+  	    }
+  	}
+--- 5706,5712 ----
+  	    {
+  		errmsg = mb_init();
+  # ifdef FEAT_TITLE
+! 		redraw_titles();
+  # endif
+  	    }
+  	}
+***************
+*** 5800,5806 ****
+  	    else
+  		curbuf->b_p_tx = FALSE;
+  #ifdef FEAT_TITLE
+! 	    need_maketitle = TRUE;
+  #endif
+  	    /* update flag in swap file */
+  	    ml_setflags(curbuf);
+--- 5815,5821 ----
+  	    else
+  		curbuf->b_p_tx = FALSE;
+  #ifdef FEAT_TITLE
+! 	    redraw_titles();
+  #endif
+  	    /* update flag in swap file */
+  	    ml_setflags(curbuf);
+***************
+*** 7127,7148 ****
+  	    curbuf->b_did_warn = FALSE;
+  
+  #ifdef FEAT_TITLE
+! 	need_maketitle = TRUE;
+  #endif
+      }
+  
+  #ifdef FEAT_TITLE
+      /* when 'modifiable' is changed, redraw the window title */
+      else if ((int *)varp == &curbuf->b_p_ma)
+! 	need_maketitle = TRUE;
+      /* when 'endofline' is changed, redraw the window title */
+      else if ((int *)varp == &curbuf->b_p_eol)
+! 	need_maketitle = TRUE;
+! #ifdef FEAT_MBYTE
+!     /* when 'bomb' is changed, redraw the window title */
+      else if ((int *)varp == &curbuf->b_p_bomb)
+! 	need_maketitle = TRUE;
+! #endif
+  #endif
+  
+      /* when 'bin' is set also set some other options */
+--- 7142,7169 ----
+  	    curbuf->b_did_warn = FALSE;
+  
+  #ifdef FEAT_TITLE
+! 	redraw_titles();
+  #endif
+      }
+  
+  #ifdef FEAT_TITLE
+      /* when 'modifiable' is changed, redraw the window title */
+      else if ((int *)varp == &curbuf->b_p_ma)
+!     {
+! 	redraw_titles();
+!     }
+      /* when 'endofline' is changed, redraw the window title */
+      else if ((int *)varp == &curbuf->b_p_eol)
+!     {
+! 	redraw_titles();
+!     }
+! # ifdef FEAT_MBYTE
+!     /* when 'bomb' is changed, redraw the window title and tab page text */
+      else if ((int *)varp == &curbuf->b_p_bomb)
+!     {
+! 	redraw_titles();
+!     }
+! # endif
+  #endif
+  
+      /* when 'bin' is set also set some other options */
+***************
+*** 7150,7156 ****
+      {
+  	set_options_bin(old_value, curbuf->b_p_bin, opt_flags);
+  #ifdef FEAT_TITLE
+! 	need_maketitle = TRUE;
+  #endif
+      }
+  
+--- 7171,7177 ----
+      {
+  	set_options_bin(old_value, curbuf->b_p_bin, opt_flags);
+  #ifdef FEAT_TITLE
+! 	redraw_titles();
+  #endif
+      }
+  
+***************
+*** 7301,7307 ****
+  	if (!value)
+  	    save_file_ff(curbuf);	/* Buffer is unchanged */
+  #ifdef FEAT_TITLE
+! 	need_maketitle = TRUE;
+  #endif
+  #ifdef FEAT_AUTOCMD
+  	modified_was_set = value;
+--- 7322,7328 ----
+  	if (!value)
+  	    save_file_ff(curbuf);	/* Buffer is unchanged */
+  #ifdef FEAT_TITLE
+! 	redraw_titles();
+  #endif
+  #ifdef FEAT_AUTOCMD
+  	modified_was_set = value;
+***************
+*** 7736,7742 ****
+  	newFoldLevel();
+      }
+  
+!     /* 'foldminlevel' */
+      else if (pp == &curwin->w_p_fml)
+      {
+  	foldUpdateAll(curwin);
+--- 7757,7763 ----
+  	newFoldLevel();
+      }
+  
+!     /* 'foldminlines' */
+      else if (pp == &curwin->w_p_fml)
+      {
+  	foldUpdateAll(curwin);
+*** ../vim-7.2.102/src/version.c	Thu Feb  5 20:47:14 2009
+--- src/version.c	Wed Feb 11 11:32:20 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     103,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+73. You give your dog used motherboards instead of bones
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.104 b/source/ap/vim/patches/7.2.104
new file mode 100644
index 000000000..51c0e097d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.104
@@ -0,0 +1,51 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.104
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.104
+Problem:    When using ":saveas bar.c" the tab label isn't updated right away.
+Solution:   Set redraw_tabline. (Francois Ingelrest)
+Files:      src/ex_cmds.c
+
+
+*** ../vim-7.2.103/src/ex_cmds.c	Wed Feb  4 13:13:42 2009
+--- src/ex_cmds.c	Wed Feb 11 15:58:06 2009
+***************
+*** 2707,2713 ****
+--- 2707,2718 ----
+  	if (eap->cmdidx == CMD_saveas)
+  	{
+  	    if (retval == OK)
++ 	    {
+  		curbuf->b_p_ro = FALSE;
++ #ifdef FEAT_WINDOWS
++ 		redraw_tabline = TRUE;
++ #endif
++ 	    }
+  	    /* Change directories when the 'acd' option is set. */
+  	    DO_AUTOCHDIR
+  	}
+*** ../vim-7.2.103/src/version.c	Wed Feb 11 11:34:24 2009
+--- src/version.c	Wed Feb 11 16:02:19 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     104,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+75. You start wondering whether you could actually upgrade your brain
+    with a Pentium Pro microprocessor 80.  The upgrade works just fine.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.105 b/source/ap/vim/patches/7.2.105
new file mode 100644
index 000000000..486ffb3fc
--- /dev/null
+++ b/source/ap/vim/patches/7.2.105
@@ -0,0 +1,72 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.105
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.105
+Problem:    Modeline setting for 'foldmethod' overrules diff options. (Ingo
+	    Karkat)
+Solution:   Don't set 'foldmethod' and 'wrap' from a modeline when 'diff' is
+	    on.
+Files:	    src/option.c
+
+
+*** ../vim-7.2.104/src/option.c	Wed Feb 11 11:34:24 2009
+--- src/option.c	Wed Feb 11 16:29:56 2009
+***************
+*** 4119,4129 ****
+  					   && options[opt_idx].var == VAR_WIN)
+  		goto skip;
+  
+! 	    /* Disallow changing some options from modelines */
+! 	    if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE))
+  	    {
+! 		errmsg = (char_u *)_("E520: Not allowed in a modeline");
+! 		goto skip;
+  	    }
+  
+  #ifdef HAVE_SANDBOX
+--- 4119,4139 ----
+  					   && options[opt_idx].var == VAR_WIN)
+  		goto skip;
+  
+! 	    /* Disallow changing some options from modelines. */
+! 	    if (opt_flags & OPT_MODELINE)
+  	    {
+! 		if (flags & P_SECURE)
+! 		{
+! 		    errmsg = (char_u *)_("E520: Not allowed in a modeline");
+! 		    goto skip;
+! 		}
+! 		/* In diff mode some options are overruled.  This avoids that
+! 		 * 'foldmethod' becomes "marker" instead of "diff" and that
+! 		 * "wrap" gets set. */
+! 		if (curwin->w_p_diff
+! 			&& (options[opt_idx].indir == PV_FDM
+! 			    || options[opt_idx].indir == PV_WRAP))
+! 		    goto skip;
+  	    }
+  
+  #ifdef HAVE_SANDBOX
+*** ../vim-7.2.104/src/version.c	Wed Feb 11 16:02:29 2009
+--- src/version.c	Wed Feb 11 16:40:35 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     105,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+76. Your ISP regards you as a business partner rather than as a customer.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.106 b/source/ap/vim/patches/7.2.106
new file mode 100644
index 000000000..2c547973b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.106
@@ -0,0 +1,103 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.106
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.106
+Problem:    Endless loop when using "]s" in HTML when there are no
+	    misspellings. (Ingo Karkat)
+Solution:   Break the search loop.  Also fix pointer alignment for systems
+	    with pointers larger than int.
+Files:	    src/spell.c
+
+
+*** ../vim-7.2.105/src/spell.c	Tue Dec  9 22:34:02 2008
+--- src/spell.c	Wed Feb 11 17:54:50 2009
+***************
+*** 2376,2382 ****
+  
+  	    /* If we are back at the starting line and there is no match then
+  	     * give up. */
+! 	    if (lnum == wp->w_cursor.lnum && !found_one)
+  		break;
+  
+  	    /* Skip the characters at the start of the next line that were
+--- 2376,2382 ----
+  
+  	    /* If we are back at the starting line and there is no match then
+  	     * give up. */
+! 	    if (lnum == wp->w_cursor.lnum && (!found_one || wrapped))
+  		break;
+  
+  	    /* Skip the characters at the start of the next line that were
+***************
+*** 4956,4968 ****
+   * Structure that is used to store the items in the word tree.  This avoids
+   * the need to keep track of each allocated thing, everything is freed all at
+   * once after ":mkspell" is done.
+   */
+  #define  SBLOCKSIZE 16000	/* size of sb_data */
+  typedef struct sblock_S sblock_T;
+  struct sblock_S
+  {
+-     sblock_T	*sb_next;	/* next block in list */
+      int		sb_used;	/* nr of bytes already in use */
+      char_u	sb_data[1];	/* data, actually longer */
+  };
+  
+--- 4956,4971 ----
+   * Structure that is used to store the items in the word tree.  This avoids
+   * the need to keep track of each allocated thing, everything is freed all at
+   * once after ":mkspell" is done.
++  * Note: "sb_next" must be just before "sb_data" to make sure the alignment of
++  * "sb_data" is correct for systems where pointers must be aligned on
++  * pointer-size boundaries and sizeof(pointer) > sizeof(int) (e.g., Sparc).
+   */
+  #define  SBLOCKSIZE 16000	/* size of sb_data */
+  typedef struct sblock_S sblock_T;
+  struct sblock_S
+  {
+      int		sb_used;	/* nr of bytes already in use */
++     sblock_T	*sb_next;	/* next block in list */
+      char_u	sb_data[1];	/* data, actually longer */
+  };
+  
+***************
+*** 15011,15017 ****
+  
+  	case 0:
+  	    /*
+! 	     * Lenghts are equal, thus changes must result in same length: An
+  	     * insert is only possible in combination with a delete.
+  	     * 1: check if for identical strings
+  	     */
+--- 15014,15020 ----
+  
+  	case 0:
+  	    /*
+! 	     * Lengths are equal, thus changes must result in same length: An
+  	     * insert is only possible in combination with a delete.
+  	     * 1: check if for identical strings
+  	     */
+*** ../vim-7.2.105/src/version.c	Wed Feb 11 16:45:56 2009
+--- src/version.c	Wed Feb 11 17:56:34 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     106,
+  /**/
+
+-- 
+If bankers can count, how come they have eight windows and
+only four tellers?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.107 b/source/ap/vim/patches/7.2.107
new file mode 100644
index 000000000..956737541
--- /dev/null
+++ b/source/ap/vim/patches/7.2.107
@@ -0,0 +1,56 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.107
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.107
+Problem:    When using a GUI dialog and ":echo" commands the messages are
+	    deleted after the dialog. (Vicent Birebent)
+Solution:   Don't call msg_end_prompt() since there was no prompt.
+Files:	    src/message.c
+
+
+*** ../vim-7.2.106/src/message.c	Tue Jan 13 16:37:31 2009
+--- src/message.c	Wed Feb 11 18:38:14 2009
+***************
+*** 3309,3315 ****
+      {
+  	c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
+  								   textfield);
+! 	msg_end_prompt();
+  
+  	/* Flush output to avoid that further messages and redrawing is done
+  	 * in the wrong order. */
+--- 3309,3318 ----
+      {
+  	c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
+  								   textfield);
+! 	/* avoid a hit-enter prompt without clearing the cmdline */
+! 	need_wait_return = FALSE;
+! 	emsg_on_display = FALSE;
+! 	cmdline_row = msg_row;
+  
+  	/* Flush output to avoid that further messages and redrawing is done
+  	 * in the wrong order. */
+*** ../vim-7.2.106/src/version.c	Wed Feb 11 17:57:43 2009
+--- src/version.c	Wed Feb 11 18:46:12 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     107,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+79. All of your most erotic dreams have a scrollbar at the right side.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.108 b/source/ap/vim/patches/7.2.108
new file mode 100644
index 000000000..5164b83c6
--- /dev/null
+++ b/source/ap/vim/patches/7.2.108
@@ -0,0 +1,55 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.108
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.108 (after 7.2.105)
+Problem:    Can't build without the diff feature.
+Solution:   Add #ifdef.
+Files:	    src/option.c
+
+
+*** ../vim-7.2.107/src/option.c	Wed Feb 11 16:45:56 2009
+--- src/option.c	Wed Feb 11 22:21:16 2009
+***************
+*** 4127,4132 ****
+--- 4127,4133 ----
+  		    errmsg = (char_u *)_("E520: Not allowed in a modeline");
+  		    goto skip;
+  		}
++ #ifdef FEAT_DIFF
+  		/* In diff mode some options are overruled.  This avoids that
+  		 * 'foldmethod' becomes "marker" instead of "diff" and that
+  		 * "wrap" gets set. */
+***************
+*** 4134,4139 ****
+--- 4135,4141 ----
+  			&& (options[opt_idx].indir == PV_FDM
+  			    || options[opt_idx].indir == PV_WRAP))
+  		    goto skip;
++ #endif
+  	    }
+  
+  #ifdef HAVE_SANDBOX
+*** ../vim-7.2.107/src/version.c	Wed Feb 11 18:46:48 2009
+--- src/version.c	Wed Feb 11 22:46:40 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     108,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+80. At parties, you introduce your spouse as your "service provider."
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.109 b/source/ap/vim/patches/7.2.109
new file mode 100644
index 000000000..8c3866cf9
--- /dev/null
+++ b/source/ap/vim/patches/7.2.109
@@ -0,0 +1,423 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.109
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.109
+Problem:    'langmap' does not work for multi-byte characters.
+Solution:   Add a list of mapped multi-byte characters. (based on work by
+            Konstantin Korikov, Agathoklis Hatzimanikas)
+Files:      runtime/doc/options.txt, src/edit.c, src/getchar.c, src/macros.h,
+            src/normal.c, src/option.c, src/proto/option.pro, src/window.c
+    
+
+*** ../vim-7.2.108/runtime/doc/options.txt	Fri Nov 28 10:59:57 2008
+--- runtime/doc/options.txt	Wed Feb 11 18:59:34 2009
+***************
+*** 4175,4183 ****
+  	be able to execute Normal mode commands.
+  	This is the opposite of the 'keymap' option, where characters are
+  	mapped in Insert mode.
+- 	This only works for 8-bit characters.  The value of 'langmap' may be
+- 	specified with multi-byte characters (e.g., UTF-8), but only the lower
+- 	8 bits of each character will be used.
+  
+  	Example (for Greek, in UTF-8):				*greek*  >
+  	    :set langmap=ΑA,ΒB,ΨC,ΔD,ΕE,ΦF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,�N,ΟO,ΠP,QQ,ΡR,ΣS,ΤT,ΘU,ΩV,WW,ΧX,ΥY,ΖZ,αa,βb,ψc,δd,εe,φf,γg,ηh,ιi,ξj,κk,λl,μm,νn,οo,πp,qq,�r,σs,τt,θu,ωv,ςw,χx,υy,ζz
+--- 4188,4193 ----
+*** ../vim-7.2.108/src/edit.c	Wed Feb  4 11:19:40 2009
+--- src/edit.c	Sat Feb 21 19:54:03 2009
+***************
+*** 7703,7711 ****
+       */
+      ++no_mapping;
+      regname = plain_vgetc();
+- #ifdef FEAT_LANGMAP
+      LANGMAP_ADJUST(regname, TRUE);
+- #endif
+      if (regname == Ctrl_R || regname == Ctrl_O || regname == Ctrl_P)
+      {
+  	/* Get a third key for literal register insertion */
+--- 7703,7709 ----
+***************
+*** 7714,7722 ****
+  	add_to_showcmd_c(literally);
+  #endif
+  	regname = plain_vgetc();
+- #ifdef FEAT_LANGMAP
+  	LANGMAP_ADJUST(regname, TRUE);
+- #endif
+      }
+      --no_mapping;
+  
+--- 7712,7718 ----
+*** ../vim-7.2.108/src/macros.h	Wed Aug 15 20:41:07 2007
+--- src/macros.h	Sat Feb 21 19:55:38 2009
+***************
+*** 127,141 ****
+  #ifdef FEAT_LANGMAP
+  /*
+   * Adjust chars in a language according to 'langmap' option.
+!  * NOTE that there is NO overhead if 'langmap' is not set; but even
+!  * when set we only have to do 2 ifs and an array lookup.
+   * Don't apply 'langmap' if the character comes from the Stuff buffer.
+   * The do-while is just to ignore a ';' after the macro.
+   */
+! # define LANGMAP_ADJUST(c, condition) do { \
+! 	if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0 && (c) < 256) \
+! 	    c = langmap_mapchar[c]; \
+      } while (0)
+  #endif
+  
+  /*
+--- 127,157 ----
+  #ifdef FEAT_LANGMAP
+  /*
+   * Adjust chars in a language according to 'langmap' option.
+!  * NOTE that there is no noticeable overhead if 'langmap' is not set.
+!  * When set the overhead for characters < 256 is small.
+   * Don't apply 'langmap' if the character comes from the Stuff buffer.
+   * The do-while is just to ignore a ';' after the macro.
+   */
+! # ifdef FEAT_MBYTE
+! #  define LANGMAP_ADJUST(c, condition) \
+!     do { \
+!         if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0) \
+! 	{ \
+! 	    if ((c) < 256) \
+! 		c = langmap_mapchar[c]; \
+! 	    else \
+! 		c = langmap_adjust_mb(c); \
+! 	} \
+      } while (0)
++ # else
++ #  define LANGMAP_ADJUST(c, condition) \
++     do { \
++         if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0 && (c) < 256) \
++             c = langmap_mapchar[c]; \
++     } while (0)
++ # endif
++ #else
++ # define LANGMAP_ADJUST(c, condition) /* nop */
+  #endif
+  
+  /*
+*** ../vim-7.2.108/src/normal.c	Wed Feb  4 11:45:28 2009
+--- src/normal.c	Sat Feb 21 19:55:17 2009
+***************
+*** 651,660 ****
+       * Get the command character from the user.
+       */
+      c = safe_vgetc();
+- 
+- #ifdef FEAT_LANGMAP
+      LANGMAP_ADJUST(c, TRUE);
+- #endif
+  
+  #ifdef FEAT_VISUAL
+      /*
+--- 651,657 ----
+***************
+*** 744,752 ****
+  	    }
+  	    ++no_zero_mapping;		/* don't map zero here */
+  	    c = plain_vgetc();
+- #ifdef FEAT_LANGMAP
+  	    LANGMAP_ADJUST(c, TRUE);
+- #endif
+  	    --no_zero_mapping;
+  	    if (ctrl_w)
+  	    {
+--- 741,747 ----
+***************
+*** 769,777 ****
+  	    ++no_mapping;
+  	    ++allow_keys;		/* no mapping for nchar, but keys */
+  	    c = plain_vgetc();		/* get next character */
+- #ifdef FEAT_LANGMAP
+  	    LANGMAP_ADJUST(c, TRUE);
+- #endif
+  	    --no_mapping;
+  	    --allow_keys;
+  #ifdef FEAT_CMDL_INFO
+--- 764,770 ----
+***************
+*** 959,967 ****
+  	     * "gr", "g'" and "g`".
+  	     */
+  	    ca.nchar = plain_vgetc();
+- #ifdef FEAT_LANGMAP
+  	    LANGMAP_ADJUST(ca.nchar, TRUE);
+- #endif
+  #ifdef FEAT_CMDL_INFO
+  	    need_flushbuf |= add_to_showcmd(ca.nchar);
+  #endif
+--- 952,958 ----
+***************
+*** 1062,1071 ****
+  		}
+  #endif
+  
+- #ifdef FEAT_LANGMAP
+  		/* adjust chars > 127, except after "tTfFr" commands */
+  		LANGMAP_ADJUST(*cp, !lang);
+- #endif
+  #ifdef FEAT_RIGHTLEFT
+  		/* adjust Hebrew mapped char */
+  		if (p_hkmap && lang && KeyTyped)
+--- 1053,1060 ----
+***************
+*** 4630,4638 ****
+  	    ++no_mapping;
+  	    ++allow_keys;   /* no mapping for nchar, but allow key codes */
+  	    nchar = plain_vgetc();
+- #ifdef FEAT_LANGMAP
+  	    LANGMAP_ADJUST(nchar, TRUE);
+- #endif
+  	    --no_mapping;
+  	    --allow_keys;
+  #ifdef FEAT_CMDL_INFO
+--- 4619,4625 ----
+***************
+*** 4988,4996 ****
+  		++no_mapping;
+  		++allow_keys;   /* no mapping for nchar, but allow key codes */
+  		nchar = plain_vgetc();
+- #ifdef FEAT_LANGMAP
+  		LANGMAP_ADJUST(nchar, TRUE);
+- #endif
+  		--no_mapping;
+  		--allow_keys;
+  #ifdef FEAT_CMDL_INFO
+--- 4975,4981 ----
+*** ../vim-7.2.108/src/option.c	Wed Feb 11 22:47:32 2009
+--- src/option.c	Sat Feb 21 19:46:13 2009
+***************
+*** 10153,10177 ****
+  
+  #ifdef FEAT_LANGMAP
+  /*
+!  * Any character has an equivalent character.  This is used for keyboards that
+!  * have a special language mode that sends characters above 128 (although
+!  * other characters can be translated too).
+   */
+  
+  /*
+!  * char_u langmap_mapchar[256];
+!  * Normally maps each of the 128 upper chars to an <128 ascii char; used to
+!  * "translate" native lang chars in normal mode or some cases of
+!  * insert mode without having to tediously switch lang mode back&forth.
+   */
+  
+      static void
+  langmap_init()
+  {
+      int i;
+  
+!     for (i = 0; i < 256; i++)		/* we init with a-one-to one map */
+! 	langmap_mapchar[i] = i;
+  }
+  
+  /*
+--- 10153,10262 ----
+  
+  #ifdef FEAT_LANGMAP
+  /*
+!  * Any character has an equivalent 'langmap' character.  This is used for
+!  * keyboards that have a special language mode that sends characters above
+!  * 128 (although other characters can be translated too).  The "to" field is a
+!  * Vim command character.  This avoids having to switch the keyboard back to
+!  * ASCII mode when leaving Insert mode.
+!  *
+!  * langmap_mapchar[] maps any of 256 chars to an ASCII char used for Vim
+!  * commands.
+!  * When FEAT_MBYTE is defined langmap_mapga.ga_data is a sorted table of
+!  * langmap_entry_T.  This does the same as langmap_mapchar[] for characters >=
+!  * 256.
+!  */
+! # ifdef FEAT_MBYTE
+! /*
+!  * With multi-byte support use growarray for 'langmap' chars >= 256
+   */
++ typedef struct
++ {
++     int	    from;
++     int     to;
++ } langmap_entry_T;
++ 
++ static garray_T langmap_mapga;
++ static void langmap_set_entry __ARGS((int from, int to));
++ 
++ /*
++  * Search for an entry in "langmap_mapga" for "from".  If found set the "to"
++  * field.  If not found insert a new entry at the appropriate location.
++  */
++     static void
++ langmap_set_entry(from, to)
++     int    from;
++     int    to;
++ {
++     langmap_entry_T *entries = (langmap_entry_T *)(langmap_mapga.ga_data);
++     int             a = 0;
++     int             b = langmap_mapga.ga_len;
++ 
++     /* Do a binary search for an existing entry. */
++     while (a != b)
++     {
++ 	int i = (a + b) / 2;
++ 	int d = entries[i].from - from;
++ 
++ 	if (d == 0)
++ 	{
++ 	    entries[i].to = to;
++ 	    return;
++ 	}
++ 	if (d < 0)
++ 	    a = i + 1;
++ 	else
++ 	    b = i;
++     }
++ 
++     if (ga_grow(&langmap_mapga, 1) != OK)
++ 	return;  /* out of memory */
++ 
++     /* insert new entry at position "a" */
++     entries = (langmap_entry_T *)(langmap_mapga.ga_data) + a;
++     mch_memmove(entries + 1, entries,
++ 			(langmap_mapga.ga_len - a) * sizeof(langmap_entry_T));
++     ++langmap_mapga.ga_len;
++     entries[0].from = from;
++     entries[0].to = to;
++ }
+  
+  /*
+!  * Apply 'langmap' to multi-byte character "c" and return the result.
+   */
++     int
++ langmap_adjust_mb(c)
++     int c;
++ {
++     langmap_entry_T *entries = (langmap_entry_T *)(langmap_mapga.ga_data);
++     int a = 0;
++     int b = langmap_mapga.ga_len;
++ 
++     while (a != b)
++     {
++ 	int i = (a + b) / 2;
++ 	int d = entries[i].from - c;
++ 
++ 	if (d == 0)
++ 	    return entries[i].to;  /* found matching entry */
++ 	if (d < 0)
++ 	    a = i + 1;
++ 	else
++ 	    b = i;
++     }
++     return c;  /* no entry found, return "c" unmodified */
++ }
++ # endif
+  
+      static void
+  langmap_init()
+  {
+      int i;
+  
+!     for (i = 0; i < 256; i++)
+! 	langmap_mapchar[i] = i;	 /* we init with a one-to-one map */
+! # ifdef FEAT_MBYTE
+!     ga_init2(&langmap_mapga, sizeof(langmap_entry_T), 8);
+! # endif
+  }
+  
+  /*
+***************
+*** 10185,10191 ****
+      char_u  *p2;
+      int	    from, to;
+  
+!     langmap_init();			    /* back to one-to-one map first */
+  
+      for (p = p_langmap; p[0] != NUL; )
+      {
+--- 10270,10279 ----
+      char_u  *p2;
+      int	    from, to;
+  
+! #ifdef FEAT_MBYTE
+!     ga_clear(&langmap_mapga);		    /* clear the previous map first */
+! #endif
+!     langmap_init();			    /* back to one-to-one map */
+  
+      for (p = p_langmap; p[0] != NUL; )
+      {
+***************
+*** 10235,10241 ****
+  							     transchar(from));
+  		return;
+  	    }
+! 	    langmap_mapchar[from & 255] = to;
+  
+  	    /* Advance to next pair */
+  	    mb_ptr_adv(p);
+--- 10323,10335 ----
+  							     transchar(from));
+  		return;
+  	    }
+! 
+! #ifdef FEAT_MBYTE
+! 	    if (from >= 256)
+! 		langmap_set_entry(from, to);
+! 	    else
+! #endif
+! 		langmap_mapchar[from & 255] = to;
+  
+  	    /* Advance to next pair */
+  	    mb_ptr_adv(p);
+*** ../vim-7.2.108/src/proto/option.pro	Sat May  5 19:28:04 2007
+--- src/proto/option.pro	Wed Feb 11 21:21:05 2009
+***************
+*** 44,49 ****
+--- 44,50 ----
+  void set_context_in_set_cmd __ARGS((expand_T *xp, char_u *arg, int opt_flags));
+  int ExpandSettings __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file));
+  int ExpandOldSetting __ARGS((int *num_file, char_u ***file));
++ int langmap_adjust_mb __ARGS((int c));
+  int has_format_option __ARGS((int x));
+  int shortmess __ARGS((int x));
+  void vimrc_found __ARGS((char_u *fname, char_u *envname));
+*** ../vim-7.2.108/src/window.c	Fri Nov 28 21:26:50 2008
+--- src/window.c	Sat Feb 21 19:55:25 2009
+***************
+*** 594,602 ****
+  		++allow_keys;   /* no mapping for xchar, but allow key codes */
+  		if (xchar == NUL)
+  		    xchar = plain_vgetc();
+- #ifdef FEAT_LANGMAP
+  		LANGMAP_ADJUST(xchar, TRUE);
+- #endif
+  		--no_mapping;
+  		--allow_keys;
+  #ifdef FEAT_CMDL_INFO
+--- 594,600 ----
+*** ../vim-7.2.108/src/version.c	Wed Feb 11 22:47:32 2009
+--- src/version.c	Sat Feb 21 19:34:28 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     109,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+99. The hum of a cooling fan and the click of keys is comforting to you.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.110 b/source/ap/vim/patches/7.2.110
new file mode 100644
index 000000000..4594e78c3
--- /dev/null
+++ b/source/ap/vim/patches/7.2.110
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.110
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.110
+Problem:    Compiler warning for unused variable.
+Solution:   Init the variable.
+Files:      src/ex_docmd.c
+    
+
+*** ../vim-7.2.109/src/ex_docmd.c	Wed Jan 28 15:42:07 2009
+--- src/ex_docmd.c	Tue Feb 17 03:47:13 2009
+***************
+*** 5916,5922 ****
+      char_u	*q;
+  
+      char_u	*start;
+!     char_u	*end;
+      char_u	*ksp;
+      size_t	len, totlen;
+  
+--- 5916,5922 ----
+      char_u	*q;
+  
+      char_u	*start;
+!     char_u	*end = NULL;
+      char_u	*ksp;
+      size_t	len, totlen;
+  
+*** ../vim-7.2.109/src/version.c	Sat Feb 21 20:27:00 2009
+--- src/version.c	Sat Feb 21 20:35:50 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     110,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+100. The most exciting sporting events you noticed during summer 1996
+    was Netscape vs. Microsoft.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.111 b/source/ap/vim/patches/7.2.111
new file mode 100644
index 000000000..acc0be423
--- /dev/null
+++ b/source/ap/vim/patches/7.2.111
@@ -0,0 +1,88 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.111
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.111
+Problem:    When using Visual block mode with 'cursorcolumn' it's unclear what
+            is selected.
+Solution:   Don't use 'cursorcolumn' highlighting inside the Visual selection.
+            (idea by Dominique Pelle)
+Files:      src/screen.c
+    
+
+*** ../vim-7.2.110/src/screen.c	Wed Oct  1 21:09:02 2008
+--- src/screen.c	Sat Feb 21 21:04:19 2009
+***************
+*** 2596,2601 ****
+--- 2596,2602 ----
+      int		noinvcur = FALSE;	/* don't invert the cursor */
+  #ifdef FEAT_VISUAL
+      pos_T	*top, *bot;
++     int		lnum_in_visual_area = FALSE;
+  #endif
+      pos_T	pos;
+      long	v;
+***************
+*** 2792,2800 ****
+  	    top = &VIsual;
+  	    bot = &curwin->w_cursor;
+  	}
+  	if (VIsual_mode == Ctrl_V)	/* block mode */
+  	{
+! 	    if (lnum >= top->lnum && lnum <= bot->lnum)
+  	    {
+  		fromcol = wp->w_old_cursor_fcol;
+  		tocol = wp->w_old_cursor_lcol;
+--- 2793,2802 ----
+  	    top = &VIsual;
+  	    bot = &curwin->w_cursor;
+  	}
++ 	lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum);
+  	if (VIsual_mode == Ctrl_V)	/* block mode */
+  	{
+! 	    if (lnum_in_visual_area)
+  	    {
+  		fromcol = wp->w_old_cursor_fcol;
+  		tocol = wp->w_old_cursor_lcol;
+***************
+*** 4557,4563 ****
+  	 * highlight the cursor position itself. */
+  	if (wp->w_p_cuc && vcol == (long)wp->w_virtcol
+  		&& lnum != wp->w_cursor.lnum
+! 		&& draw_state == WL_LINE)
+  	{
+  	    vcol_save_attr = char_attr;
+  	    char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC));
+--- 4560,4567 ----
+  	 * highlight the cursor position itself. */
+  	if (wp->w_p_cuc && vcol == (long)wp->w_virtcol
+  		&& lnum != wp->w_cursor.lnum
+! 		&& draw_state == WL_LINE
+! 		&& !lnum_in_visual_area)
+  	{
+  	    vcol_save_attr = char_attr;
+  	    char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC));
+*** ../vim-7.2.110/src/version.c	Sat Feb 21 20:36:30 2009
+--- src/version.c	Sat Feb 21 21:08:14 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     111,
+  /**/
+
+-- 
+Contrary to popular belief, Unix is user friendly.
+It just happens to be selective about who it makes friends with.
+                                               -- Dave Parnas
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.112 b/source/ap/vim/patches/7.2.112
new file mode 100644
index 000000000..6611999e1
--- /dev/null
+++ b/source/ap/vim/patches/7.2.112
@@ -0,0 +1,47 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.112
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.112 
+Problem:    Cursor invisible in Visual mode when 'number' is set and cursor in 
+            first column. (Matti Niemenmaa, Renato Alves) 
+Solution:   Check that vcol_prev is smaller than vcol. 
+Files:      src/screen.c 
+
+
+*** ../vim-7.2.111/src/screen.c	Sat Feb 21 21:10:24 2009
+--- src/screen.c	Sat Feb 21 21:04:19 2009
+***************
+*** 3422,3427 ****
+--- 3422,3428 ----
+  			&& (*mb_ptr2cells)(ptr) > 1)
+  #endif
+  		    || ((int)vcol_prev == fromcol_prev
++ 			&& vcol_prev < vcol	/* not at margin */
+  			&& vcol < tocol))
+  		area_attr = attr;		/* start highlighting */
+  	    else if (area_attr != 0
+*** ../vim-7.2.111/src/version.c	Sat Feb 21 21:10:24 2009
+--- src/version.c	Sat Feb 21 21:20:51 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     112,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+102. When filling out your driver's license application, you give
+     your IP address.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.113 b/source/ap/vim/patches/7.2.113
new file mode 100644
index 000000000..f0e4ebf31
--- /dev/null
+++ b/source/ap/vim/patches/7.2.113
@@ -0,0 +1,99 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.113
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.113
+Problem:    Crash for substitute() call using submatch(1) while there is no
+            such submatch. (Yukihiro Nakadaira)
+Solution:   Also check the start of the submatch is set, it can be NULL when
+            an attempted match didn't work out.
+Files:      src/regexp.c
+
+
+*** ../vim-7.2.112/src/regexp.c	Fri Aug  8 13:45:31 2008
+--- src/regexp.c	Sat Feb 21 21:46:49 2009
+***************
+*** 4532,4538 ****
+  		cleanup_subexpr();
+  		if (!REG_MULTI)		/* Single-line regexp */
+  		{
+! 		    if (reg_endp[no] == NULL)
+  		    {
+  			/* Backref was not set: Match an empty string. */
+  			len = 0;
+--- 4532,4538 ----
+  		cleanup_subexpr();
+  		if (!REG_MULTI)		/* Single-line regexp */
+  		{
+! 		    if (reg_startp[no] == NULL || reg_endp[no] == NULL)
+  		    {
+  			/* Backref was not set: Match an empty string. */
+  			len = 0;
+***************
+*** 4548,4554 ****
+  		}
+  		else				/* Multi-line regexp */
+  		{
+! 		    if (reg_endpos[no].lnum < 0)
+  		    {
+  			/* Backref was not set: Match an empty string. */
+  			len = 0;
+--- 4548,4554 ----
+  		}
+  		else				/* Multi-line regexp */
+  		{
+! 		    if (reg_startpos[no].lnum < 0 || reg_endpos[no].lnum < 0)
+  		    {
+  			/* Backref was not set: Match an empty string. */
+  			len = 0;
+***************
+*** 7279,7291 ****
+      }
+      else
+      {
+! 	if (submatch_match->endp[no] == NULL)
+  	    retval = NULL;
+  	else
+- 	{
+- 	    s = submatch_match->startp[no];
+  	    retval = vim_strnsave(s, (int)(submatch_match->endp[no] - s));
+- 	}
+      }
+  
+      return retval;
+--- 7279,7289 ----
+      }
+      else
+      {
+! 	s = submatch_match->startp[no];
+! 	if (s == NULL || submatch_match->endp[no] == NULL)
+  	    retval = NULL;
+  	else
+  	    retval = vim_strnsave(s, (int)(submatch_match->endp[no] - s));
+      }
+  
+      return retval;
+*** ../vim-7.2.112/src/version.c	Sat Feb 21 21:22:44 2009
+--- src/version.c	Sat Feb 21 22:01:56 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     113,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+103. When you find yourself in the "Computer" section of Barnes & Noble
+     enjoying yourself.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.114 b/source/ap/vim/patches/7.2.114
new file mode 100644
index 000000000..9742b52d7
--- /dev/null
+++ b/source/ap/vim/patches/7.2.114
@@ -0,0 +1,86 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.114
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.114
+Problem:    Using wrong printf format.
+Solution:   Use "%ld" instead of "%d". (Dominique Pelle)
+Files:      src/netbeans.c
+
+
+*** ../vim-7.2.113/src/netbeans.c	Tue Jan  6 16:13:42 2009
+--- src/netbeans.c	Tue Feb 17 03:21:33 2009
+***************
+*** 1924,1930 ****
+  	    vim_free(path);
+  	    if (bufp == NULL)
+  	    {
+! 	    	nbdebug(("    File %s not found in setBufferNumber\n", args));
+  		EMSG2("E642: File %s not found in setBufferNumber", args);
+  		return FAIL;
+  	    }
+--- 1924,1930 ----
+  	    vim_free(path);
+  	    if (bufp == NULL)
+  	    {
+! 		nbdebug(("    File %s not found in setBufferNumber\n", args));
+  		EMSG2("E642: File %s not found in setBufferNumber", args);
+  		return FAIL;
+  	    }
+***************
+*** 2318,2324 ****
+  	    }
+  	    if (pos)
+  	    {
+! 		coloncmd(":sign place %d line=%d name=%d buffer=%d",
+  			   serNum, pos->lnum, typeNum, buf->bufp->b_fnum);
+  		if (typeNum == curPCtype)
+  		    coloncmd(":sign jump %d buffer=%d", serNum,
+--- 2318,2324 ----
+  	    }
+  	    if (pos)
+  	    {
+! 		coloncmd(":sign place %d line=%ld name=%d buffer=%d",
+  			   serNum, pos->lnum, typeNum, buf->bufp->b_fnum);
+  		if (typeNum == curPCtype)
+  		    coloncmd(":sign jump %d buffer=%d", serNum,
+***************
+*** 2422,2428 ****
+  				GUARDED) == 0)
+  			    {
+  				coloncmd(
+! 				    ":sign place %d line=%d name=%d buffer=%d",
+  				     guardId++, lnum, GUARDED,
+  				     buf->bufp->b_fnum);
+  			    }
+--- 2422,2428 ----
+  				GUARDED) == 0)
+  			    {
+  				coloncmd(
+! 				    ":sign place %d line=%ld name=%d buffer=%d",
+  				     guardId++, lnum, GUARDED,
+  				     buf->bufp->b_fnum);
+  			    }
+*** ../vim-7.2.113/src/version.c	Sat Feb 21 22:03:06 2009
+--- src/version.c	Sat Feb 21 22:11:21 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     114,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+104. When people ask about the Presidential Election you ask "Which country?"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.115 b/source/ap/vim/patches/7.2.115
new file mode 100644
index 000000000..b51a1f503
--- /dev/null
+++ b/source/ap/vim/patches/7.2.115
@@ -0,0 +1,133 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.115
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.115
+Problem:    Some debugging code is never used.
+Solution:   Remove nbtrace() and nbprt(). (Dominique Pelle)
+Files:      src/nbdebug.c, src/nbdebug.h
+
+*** ../vim-7.2.114/src/nbdebug.c	Tue Jun 24 23:54:30 2008
+--- src/nbdebug.c	Tue Feb 17 03:26:07 2009
+***************
+*** 33,39 ****
+  u_int		 nb_dlevel = 0;		/* nb_debug verbosity level */
+  
+  void		 nbdb(char *, ...);
+- void		 nbtrace(char *, ...);
+  
+  static int	 lookup(char *);
+  #ifdef USE_NB_ERRORHANDLER
+--- 33,38 ----
+***************
+*** 100,124 ****
+  }    /* end nbdebug_log_init */
+  
+  
+- 
+- 
+- void
+- nbtrace(
+- 	char		*fmt,
+- 	...)
+- {
+- 	va_list		 ap;
+- 
+- 	if (nb_debug!= NULL && (nb_dlevel & (NB_TRACE | NB_TRACE_VERBOSE))) {
+- 		va_start(ap, fmt);
+- 		vfprintf(nb_debug, fmt, ap);
+- 		va_end(ap);
+- 		fflush(nb_debug);
+- 	}
+- 
+- }    /* end nbtrace */
+- 
+- 
+  void
+  nbdbg(
+  	char		*fmt,
+--- 99,104 ----
+***************
+*** 136,158 ****
+  }    /* end nbdbg */
+  
+  
+- void
+- nbprt(
+- 	char		*fmt,
+- 	...)
+- {
+- 	va_list		 ap;
+- 
+- 	if (nb_debug != NULL && nb_dlevel & NB_PRINT) {
+- 		va_start(ap, fmt);
+- 		vfprintf(nb_debug, fmt, ap);
+- 		va_end(ap);
+- 		fflush(nb_debug);
+- 	}
+- 
+- }    /* end nbprt */
+- 
+- 
+  static int
+  lookup(
+  	char		*file)
+--- 116,121 ----
+*** ../vim-7.2.114/src/nbdebug.h	Wed Jun 25 00:47:21 2008
+--- src/nbdebug.h	Tue Feb 17 03:26:38 2009
+***************
+*** 43,50 ****
+  
+  
+  void		 nbdbg(char *, ...);
+- void		 nbprt(char *, ...);
+- void		 nbtrace(char *, ...);
+  
+  void nbdebug_wait __ARGS((u_int wait_flags, char *wait_var, u_int wait_secs));
+  void nbdebug_log_init __ARGS((char *log_var, char *level_var));
+--- 43,48 ----
+***************
+*** 70,88 ****
+  {
+  }
+  
+- void
+- nbprt(
+- 	char		*fmt,
+- 	...)
+- {
+- }
+- 
+- void
+- nbtrace(
+- 	char		*fmt,
+- 	...)
+- {
+- }
+- 
+  #endif /* NBDEBUG */
+  #endif /* NBDEBUG_H */
+--- 68,72 ----
+*** ../vim-7.2.114/src/version.c	Sat Feb 21 22:12:43 2009
+--- src/version.c	Sat Feb 21 22:28:21 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     115,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+105. When someone asks you for your address, you tell them your URL.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.116 b/source/ap/vim/patches/7.2.116
new file mode 100644
index 000000000..edd2bd145
--- /dev/null
+++ b/source/ap/vim/patches/7.2.116
@@ -0,0 +1,55 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.116
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.116 
+Problem:    Not all memory is freed when EXITFREE is defined. 
+Solution:   Free allocated memory on exit. (Dominique Pelle) 
+Files:      src/ex_docmd.c, src/gui_gtk_x11.c, src/misc2.c, src/search.c, 
+            src/tag.c 
+    
+
+*** ../vim-7.2.115/src/tag.c	Tue Jan 13 17:27:18 2009
+--- src/tag.c	Tue Feb 17 03:43:32 2009
+***************
+*** 2542,2547 ****
+--- 2542,2556 ----
+  {
+      ga_clear_strings(&tag_fnames);
+      do_tag(NULL, DT_FREE, 0, 0, 0);
++     tag_freematch();
++ 
++ # if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
++     if (ptag_entry.tagname)
++     {
++         vim_free(ptag_entry.tagname);
++         ptag_entry.tagname = NULL;
++     }
++ # endif
+  }
+  #endif
+  
+*** ../vim-7.2.115/src/version.c	Sat Feb 21 22:29:12 2009
+--- src/version.c	Sat Feb 21 22:56:14 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     116,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+106. When told to "go to your room" you inform your parents that you
+     can't...because you were kicked out and banned.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.117 b/source/ap/vim/patches/7.2.117
new file mode 100644
index 000000000..4c4e66a09
--- /dev/null
+++ b/source/ap/vim/patches/7.2.117
@@ -0,0 +1,107 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.117
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.117
+Problem:    Location list incorrectly labelled "Quickfix List".
+Solution:   Break out of both loops for finding window for location list
+            buffer. (Lech Lorens)
+Files:      src/buffer.c, src/quickfix.c, src/screen.c
+
+
+*** ../vim-7.2.116/src/buffer.c	Tue Jan  6 16:13:42 2009
+--- src/buffer.c	Tue Feb 17 04:00:51 2009
+***************
+*** 5098,5104 ****
+  	 */
+  	FOR_ALL_TAB_WINDOWS(tp, win)
+  	    if (win->w_buffer == buf)
+! 		break;
+  	if (win != NULL && win->w_llist_ref != NULL)
+  	    return _("[Location List]");
+  	else
+--- 5098,5105 ----
+  	 */
+  	FOR_ALL_TAB_WINDOWS(tp, win)
+  	    if (win->w_buffer == buf)
+! 		goto win_found;
+! win_found:
+  	if (win != NULL && win->w_llist_ref != NULL)
+  	    return _("[Location List]");
+  	else
+*** ../vim-7.2.116/src/quickfix.c	Sat Nov 15 14:10:23 2008
+--- src/quickfix.c	Sat Feb 21 22:54:25 2009
+***************
+*** 1610,1619 ****
+  		{
+  		    goto_tabpage_win(tp, wp);
+  		    usable_win = 1;
+! 		    break;
+  		}
+  	    }
+  	}
+  
+  	/*
+  	 * If there is only one window and it is the quickfix window, create a
+--- 1612,1622 ----
+  		{
+  		    goto_tabpage_win(tp, wp);
+  		    usable_win = 1;
+! 		    goto win_found;
+  		}
+  	    }
+  	}
++ win_found:
+  
+  	/*
+  	 * If there is only one window and it is the quickfix window, create a
+*** ../vim-7.2.116/src/screen.c	Sat Feb 21 21:22:44 2009
+--- src/screen.c	Sat Feb 21 21:04:19 2009
+***************
+*** 7452,7461 ****
+  	{
+  	    outofmem = TRUE;
+  #ifdef FEAT_WINDOWS
+! 	    break;
+  #endif
+  	}
+      }
+  
+  #ifdef FEAT_MBYTE
+      for (i = 0; i < p_mco; ++i)
+--- 7452,7464 ----
+  	{
+  	    outofmem = TRUE;
+  #ifdef FEAT_WINDOWS
+! 	    goto give_up;
+  #endif
+  	}
+      }
++ #ifdef FEAT_WINDOWS
++ give_up:
++ #endif
+  
+  #ifdef FEAT_MBYTE
+      for (i = 0; i < p_mco; ++i)
+*** ../vim-7.2.116/src/version.c	Sat Feb 21 22:57:10 2009
+--- src/version.c	Sat Feb 21 23:58:24 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     117,
+  /**/
+
+-- 
+Laughing helps. It's like jogging on the inside.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.118 b/source/ap/vim/patches/7.2.118
new file mode 100644
index 000000000..73b6cbbbc
--- /dev/null
+++ b/source/ap/vim/patches/7.2.118
@@ -0,0 +1,78 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.118
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.118
+Problem:    <PageUp> at the more prompt only does half a page.
+Solution:   Make <PageUp> go up a whole page.  Also make 'f' go a page
+            forward, but not quit the more prompt. (Markus Heidelberg)
+Files:      src/message.c
+
+
+*** ../vim-7.2.117/src/message.c	Wed Feb 11 18:46:48 2009
+--- src/message.c	Fri Feb 20 05:20:15 2009
+***************
+*** 976,982 ****
+  		    }
+  		}
+  		else if (msg_scrolled > Rows - 2
+! 				     && (c == 'j' || c == K_DOWN || c == 'd'))
+  		    c = K_IGNORE;
+  	    }
+  	} while ((had_got_int && c == Ctrl_C)
+--- 976,982 ----
+  		    }
+  		}
+  		else if (msg_scrolled > Rows - 2
+! 			 && (c == 'j' || c == K_DOWN || c == 'd' || c == 'f'))
+  		    c = K_IGNORE;
+  	    }
+  	} while ((had_got_int && c == Ctrl_C)
+***************
+*** 2504,2510 ****
+  	    break;
+  
+  	case 'u':		/* Up half a page */
+- 	case K_PAGEUP:
+  	    scroll = -(Rows / 2);
+  	    break;
+  
+--- 2504,2509 ----
+***************
+*** 2513,2522 ****
+--- 2512,2523 ----
+  	    break;
+  
+  	case 'b':		/* one page back */
++ 	case K_PAGEUP:
+  	    scroll = -(Rows - 1);
+  	    break;
+  
+  	case ' ':		/* one extra page */
++ 	case 'f':
+  	case K_PAGEDOWN:
+  	case K_LEFTMOUSE:
+  	    scroll = Rows - 1;
+*** ../vim-7.2.117/src/version.c	Sun Feb 22 00:01:42 2009
+--- src/version.c	Sun Feb 22 00:57:16 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     118,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+109. You actually read -- and enjoy -- lists like this.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.119 b/source/ap/vim/patches/7.2.119
new file mode 100644
index 000000000..f31f2e660
--- /dev/null
+++ b/source/ap/vim/patches/7.2.119
@@ -0,0 +1,51 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.119
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.119
+Problem:    Status line is redrawn too often.
+Solution:   Check ScreeenLinesUC[] properly. (Yukihiro Nakadaira)
+Files:      src/screen.c
+
+
+*** ../vim-7.2.118/src/screen.c	Sun Feb 22 00:01:42 2009
+--- src/screen.c	Sun Feb 22 01:07:38 2009
+***************
+*** 6362,6368 ****
+  		    && c == 0x8e
+  		    && ScreenLines2[off] != ptr[1])
+  		|| (enc_utf8
+! 		    && (ScreenLinesUC[off] != (u8char_T)u8c
+  			|| screen_comp_differs(off, u8cc)))
+  #endif
+  		|| ScreenAttrs[off] != attr
+--- 6362,6368 ----
+  		    && c == 0x8e
+  		    && ScreenLines2[off] != ptr[1])
+  		|| (enc_utf8
+! 		    && (ScreenLinesUC[off] != (u8char_T)(c >= 0x80 ? u8c : 0)
+  			|| screen_comp_differs(off, u8cc)))
+  #endif
+  		|| ScreenAttrs[off] != attr
+*** ../vim-7.2.118/src/version.c	Sun Feb 22 00:58:03 2009
+--- src/version.c	Sun Feb 22 01:09:54 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     119,
+  /**/
+
+-- 
+In a world without walls and borders, who needs windows and gates?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.120 b/source/ap/vim/patches/7.2.120
new file mode 100644
index 000000000..cf687f3ed
--- /dev/null
+++ b/source/ap/vim/patches/7.2.120
@@ -0,0 +1,277 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.120
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.120
+Problem:    When opening the quickfix window or splitting the window and
+            setting the location list, the location list is copied and then
+            deleted, which is inefficient.
+Solution:   Don't copy the location list when not needed. (Lech Lorens)
+Files:      src/quickfix.c, src/vim.h, src/window.c
+
+
+*** ../vim-7.2.119/src/quickfix.c	Sun Feb 22 00:01:42 2009
+--- src/quickfix.c	Sat Feb 21 22:54:25 2009
+***************
+*** 1419,1424 ****
+--- 1419,1425 ----
+      int			opened_window = FALSE;
+      win_T		*win;
+      win_T		*altwin;
++     int			flags;
+  #endif
+      win_T		*oldwin = curwin;
+      int			print_message = TRUE;
+***************
+*** 1531,1537 ****
+      if (qf_ptr->qf_type == 1 && (!curwin->w_buffer->b_help || cmdmod.tab != 0))
+      {
+  	win_T	*wp;
+- 	int	n;
+  
+  	if (cmdmod.tab != 0)
+  	    wp = NULL;
+--- 1532,1537 ----
+***************
+*** 1547,1559 ****
+  	     * Split off help window; put it at far top if no position
+  	     * specified, the current window is vertically split and narrow.
+  	     */
+! 	    n = WSP_HELP;
+  # ifdef FEAT_VERTSPLIT
+  	    if (cmdmod.split == 0 && curwin->w_width != Columns
+  						      && curwin->w_width < 80)
+! 		n |= WSP_TOP;
+  # endif
+! 	    if (win_split(0, n) == FAIL)
+  		goto theend;
+  	    opened_window = TRUE;	/* close it when fail */
+  
+--- 1547,1562 ----
+  	     * Split off help window; put it at far top if no position
+  	     * specified, the current window is vertically split and narrow.
+  	     */
+! 	    flags = WSP_HELP;
+  # ifdef FEAT_VERTSPLIT
+  	    if (cmdmod.split == 0 && curwin->w_width != Columns
+  						      && curwin->w_width < 80)
+! 		flags |= WSP_TOP;
+  # endif
+! 	    if (qi != &ql_info)
+! 		flags |= WSP_NEWLOC;  /* don't copy the location list */
+! 
+! 	    if (win_split(0, flags) == FAIL)
+  		goto theend;
+  	    opened_window = TRUE;	/* close it when fail */
+  
+***************
+*** 1563,1569 ****
+  	    if (qi != &ql_info)	    /* not a quickfix list */
+  	    {
+  		/* The new window should use the supplied location list */
+- 		qf_free_all(curwin);
+  		curwin->w_llist = qi;
+  		qi->qf_refcount++;
+  	    }
+--- 1566,1571 ----
+***************
+*** 1624,1630 ****
+  	{
+  	    ll_ref = curwin->w_llist_ref;
+  
+! 	    if (win_split(0, WSP_ABOVE) == FAIL)
+  		goto failed;		/* not enough room for window */
+  	    opened_window = TRUE;	/* close it when fail */
+  	    p_swb = empty_option;	/* don't split again */
+--- 1626,1635 ----
+  	{
+  	    ll_ref = curwin->w_llist_ref;
+  
+! 	    flags = WSP_ABOVE;
+! 	    if (ll_ref != NULL)
+! 		flags |= WSP_NEWLOC;
+! 	    if (win_split(0, flags) == FAIL)
+  		goto failed;		/* not enough room for window */
+  	    opened_window = TRUE;	/* close it when fail */
+  	    p_swb = empty_option;	/* don't split again */
+***************
+*** 1636,1642 ****
+  	    {
+  		/* The new window should use the location list from the
+  		 * location list window */
+- 		qf_free_all(curwin);
+  		curwin->w_llist = ll_ref;
+  		ll_ref->qf_refcount++;
+  	    }
+--- 1641,1646 ----
+***************
+*** 2311,2325 ****
+  	if (eap->cmdidx == CMD_copen || eap->cmdidx == CMD_cwindow)
+  	    /* Create the new window at the very bottom. */
+  	    win_goto(lastwin);
+! 	if (win_split(height, WSP_BELOW) == FAIL)
+  	    return;		/* not enough room for window */
+  #ifdef FEAT_SCROLLBIND
+  	curwin->w_p_scb = FALSE;
+  #endif
+  
+- 	/* Remove the location list for the quickfix window */
+- 	qf_free_all(curwin);
+- 
+  	if (eap->cmdidx == CMD_lopen || eap->cmdidx == CMD_lwindow)
+  	{
+  	    /*
+--- 2315,2326 ----
+  	if (eap->cmdidx == CMD_copen || eap->cmdidx == CMD_cwindow)
+  	    /* Create the new window at the very bottom. */
+  	    win_goto(lastwin);
+! 	if (win_split(height, WSP_BELOW | WSP_NEWLOC) == FAIL)
+  	    return;		/* not enough room for window */
+  #ifdef FEAT_SCROLLBIND
+  	curwin->w_p_scb = FALSE;
+  #endif
+  
+  	if (eap->cmdidx == CMD_lopen || eap->cmdidx == CMD_lwindow)
+  	{
+  	    /*
+*** ../vim-7.2.119/src/vim.h	Thu Nov 20 14:11:47 2008
+--- src/vim.h	Sat Feb 21 22:53:03 2009
+***************
+*** 1057,1062 ****
+--- 1057,1063 ----
+  #define WSP_HELP	16	/* creating the help window */
+  #define WSP_BELOW	32	/* put new window below/right */
+  #define WSP_ABOVE	64	/* put new window above/left */
++ #define WSP_NEWLOC	128	/* don't copy location list */
+  
+  /*
+   * arguments for gui_set_shellsize()
+*** ../vim-7.2.119/src/window.c	Sat Feb 21 20:27:00 2009
+--- src/window.c	Sat Feb 21 23:56:41 2009
+***************
+*** 12,18 ****
+  static int path_is_url __ARGS((char_u *p));
+  #if defined(FEAT_WINDOWS) || defined(PROTO)
+  static int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
+! static void win_init __ARGS((win_T *newp, win_T *oldp));
+  static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
+  static void frame_setheight __ARGS((frame_T *curfrp, int height));
+  #ifdef FEAT_VERTSPLIT
+--- 12,18 ----
+  static int path_is_url __ARGS((char_u *p));
+  #if defined(FEAT_WINDOWS) || defined(PROTO)
+  static int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
+! static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
+  static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
+  static void frame_setheight __ARGS((frame_T *curfrp, int height));
+  #ifdef FEAT_VERTSPLIT
+***************
+*** 911,917 ****
+  	    return FAIL;
+  
+  	/* make the contents of the new window the same as the current one */
+! 	win_init(wp, curwin);
+      }
+  
+      /*
+--- 911,917 ----
+  	    return FAIL;
+  
+  	/* make the contents of the new window the same as the current one */
+! 	win_init(wp, curwin, flags);
+      }
+  
+      /*
+***************
+*** 1160,1170 ****
+   * Initialize window "newp" from window "oldp".
+   * Used when splitting a window and when creating a new tab page.
+   * The windows will both edit the same buffer.
+   */
+      static void
+! win_init(newp, oldp)
+      win_T	*newp;
+      win_T	*oldp;
+  {
+      int		i;
+  
+--- 1160,1174 ----
+   * Initialize window "newp" from window "oldp".
+   * Used when splitting a window and when creating a new tab page.
+   * The windows will both edit the same buffer.
++  * WSP_NEWLOC may be specified in flags to prevent the location list from
++  * being copied.
+   */
++ /*ARGSUSED*/
+      static void
+! win_init(newp, oldp, flags)
+      win_T	*newp;
+      win_T	*oldp;
++     int		 flags;
+  {
+      int		i;
+  
+***************
+*** 1189,1195 ****
+      copy_jumplist(oldp, newp);
+  #endif
+  #ifdef FEAT_QUICKFIX
+!     copy_loclist(oldp, newp);
+  #endif
+      if (oldp->w_localdir != NULL)
+  	newp->w_localdir = vim_strsave(oldp->w_localdir);
+--- 1193,1206 ----
+      copy_jumplist(oldp, newp);
+  #endif
+  #ifdef FEAT_QUICKFIX
+!     if (flags & WSP_NEWLOC)
+!     {
+! 	/* Don't copy the location list.  */
+! 	newp->w_llist = NULL;
+! 	newp->w_llist_ref = NULL;
+!     }
+!     else
+! 	copy_loclist(oldp, newp);
+  #endif
+      if (oldp->w_localdir != NULL)
+  	newp->w_localdir = vim_strsave(oldp->w_localdir);
+***************
+*** 3219,3225 ****
+      else
+      {
+  	/* First window in new tab page, initialize it from "oldwin". */
+! 	win_init(curwin, oldwin);
+  
+  # ifdef FEAT_SCROLLBIND
+  	/* We don't want scroll-binding in the first window. */
+--- 3230,3236 ----
+      else
+      {
+  	/* First window in new tab page, initialize it from "oldwin". */
+! 	win_init(curwin, oldwin, 0);
+  
+  # ifdef FEAT_SCROLLBIND
+  	/* We don't want scroll-binding in the first window. */
+*** ../vim-7.2.119/src/version.c	Sun Feb 22 01:13:45 2009
+--- src/version.c	Sun Feb 22 02:32:14 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     120,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+110. You actually volunteer to become your employer's webmaster.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.121 b/source/ap/vim/patches/7.2.121
new file mode 100644
index 000000000..ea5306f70
--- /dev/null
+++ b/source/ap/vim/patches/7.2.121
@@ -0,0 +1,180 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.121
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.121
+Problem:    In gvim "!grep a *.c" spews out a lot of text that can't be
+            stopped with CTRL-C.
+Solution:   When looping to read and show text, do check for typed characters
+            every two seconds.
+Files:      src/os_unix.c
+
+
+*** ../vim-7.2.120/src/os_unix.c	Wed Feb  4 14:18:44 2009
+--- src/os_unix.c	Sun Feb 22 00:54:05 2009
+***************
+*** 4092,4097 ****
+--- 4092,4100 ----
+  		int	    fromshell_fd;
+  		garray_T    ga;
+  		int	    noread_cnt;
++ # if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)
++ 		struct timeval  start_tv;
++ # endif
+  
+  # ifdef FEAT_GUI
+  		if (pty_master_fd >= 0)
+***************
+*** 4201,4207 ****
+  		    ga_init2(&ga, 1, BUFLEN);
+  
+  		noread_cnt = 0;
+! 
+  		for (;;)
+  		{
+  		    /*
+--- 4204,4212 ----
+  		    ga_init2(&ga, 1, BUFLEN);
+  
+  		noread_cnt = 0;
+! # if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)
+! 		gettimeofday(&start_tv, NULL);
+! # endif
+  		for (;;)
+  		{
+  		    /*
+***************
+*** 4214,4238 ****
+  		     * that a typed password is echoed for ssh or gpg command.
+  		     * Don't get characters when the child has already
+  		     * finished (wait_pid == 0).
+- 		     * Don't get extra characters when we already have one.
+  		     * Don't read characters unless we didn't get output for a
+! 		     * while, avoids that ":r !ls" eats typeahead.
+  		     */
+  		    len = 0;
+  		    if (!(options & SHELL_EXPAND)
+  			    && ((options &
+  					 (SHELL_READ|SHELL_WRITE|SHELL_COOKED))
+  				      != (SHELL_READ|SHELL_WRITE|SHELL_COOKED)
+! #ifdef FEAT_GUI
+  						    || gui.in_use
+! #endif
+  						    )
+  			    && wait_pid == 0
+! 			    && (ta_len > 0
+! 				|| (noread_cnt > 4
+! 				    && (len = ui_inchar(ta_buf,
+! 						       BUFLEN, 10L, 0)) > 0)))
+  		    {
+  			/*
+  			 * For pipes:
+  			 * Check for CTRL-C: send interrupt signal to child.
+--- 4219,4252 ----
+  		     * that a typed password is echoed for ssh or gpg command.
+  		     * Don't get characters when the child has already
+  		     * finished (wait_pid == 0).
+  		     * Don't read characters unless we didn't get output for a
+! 		     * while (noread_cnt > 4), avoids that ":r !ls" eats
+! 		     * typeahead.
+  		     */
+  		    len = 0;
+  		    if (!(options & SHELL_EXPAND)
+  			    && ((options &
+  					 (SHELL_READ|SHELL_WRITE|SHELL_COOKED))
+  				      != (SHELL_READ|SHELL_WRITE|SHELL_COOKED)
+! # ifdef FEAT_GUI
+  						    || gui.in_use
+! # endif
+  						    )
+  			    && wait_pid == 0
+! 			    && (ta_len > 0 || noread_cnt > 4))
+  		    {
++ 		      if (ta_len == 0)
++ 		      {
++ 			  /* Get extra characters when we don't have any.
++ 			   * Reset the counter and timer. */
++ 			  noread_cnt = 0;
++ # if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)
++ 			  gettimeofday(&start_tv, NULL);
++ # endif
++ 			  len = ui_inchar(ta_buf, BUFLEN, 10L, 0);
++ 		      }
++ 		      if (ta_len > 0 || len > 0)
++ 		      {
+  			/*
+  			 * For pipes:
+  			 * Check for CTRL-C: send interrupt signal to child.
+***************
+*** 4334,4342 ****
+  			    {
+  				ta_len -= len;
+  				mch_memmove(ta_buf, ta_buf + len, ta_len);
+- 				noread_cnt = 0;
+  			    }
+  			}
+  		    }
+  
+  		    if (got_int)
+--- 4348,4356 ----
+  			    {
+  				ta_len -= len;
+  				mch_memmove(ta_buf, ta_buf + len, ta_len);
+  			    }
+  			}
++ 		      }
+  		    }
+  
+  		    if (got_int)
+***************
+*** 4444,4449 ****
+--- 4458,4482 ----
+  			out_flush();
+  			if (got_int)
+  			    break;
++ 
++ # if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)
++ 			{
++ 			    struct timeval  now_tv;
++ 			    long	    msec;
++ 
++ 			    /* Avoid that we keep looping here without
++ 			     * checking for a CTRL-C for a long time.  Don't
++ 			     * break out too often to avoid losing typeahead. */
++ 			    gettimeofday(&now_tv, NULL);
++ 			    msec = (now_tv.tv_sec - start_tv.tv_sec) * 1000L
++ 				+ (now_tv.tv_usec - start_tv.tv_usec) / 1000L;
++ 			    if (msec > 2000)
++ 			    {
++ 				noread_cnt = 5;
++ 				break;
++ 			    }
++ 			}
++ # endif
+  		    }
+  
+  		    /* If we already detected the child has finished break the
+*** ../vim-7.2.120/src/version.c	Sun Feb 22 02:36:36 2009
+--- src/version.c	Sun Feb 22 02:48:03 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     121,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+111. You and your friends get together regularly on IRC, even though
+     all of you live in the same city.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.122 b/source/ap/vim/patches/7.2.122
new file mode 100644
index 000000000..18f69898b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.122
@@ -0,0 +1,80 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.122
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.122
+Problem:    Invalid memory access when the VimResized autocommand changes
+            'columns' and/or 'lines'.
+Solution:   After VimResized check for changed values. (Dominique Pelle)
+Files:      src/screen.c
+
+
+*** ../vim-7.2.121/src/screen.c	Sun Feb 22 01:13:45 2009
+--- src/screen.c	Sun Feb 22 01:07:38 2009
+***************
+*** 7368,7374 ****
+--- 7368,7378 ----
+  #endif
+      static int	    entered = FALSE;		/* avoid recursiveness */
+      static int	    done_outofmem_msg = FALSE;	/* did outofmem message */
++ #ifdef FEAT_AUTOCMD
++     int		    retry_count = 0;
+  
++ retry:
++ #endif
+      /*
+       * Allocation of the screen buffers is done only when the size changes and
+       * when Rows and Columns have been set and we have started doing full
+***************
+*** 7643,7650 ****
+      --RedrawingDisabled;
+  
+  #ifdef FEAT_AUTOCMD
+!     if (starting == 0)
+  	apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf);
+  #endif
+  }
+  
+--- 7647,7663 ----
+      --RedrawingDisabled;
+  
+  #ifdef FEAT_AUTOCMD
+!     /*
+!      * Do not apply autocommands more than 3 times to avoid an endless loop
+!      * in case applying autocommands always changes Rows or Columns.
+!      */
+!     if (starting == 0 && ++retry_count <= 3)
+!     {
+  	apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf);
++ 	/* In rare cases, autocommands may have altered Rows or Columns,
++ 	 * jump back to check if we need to allocate the screen again. */
++ 	goto retry;
++     }
+  #endif
+  }
+  
+*** ../vim-7.2.121/src/version.c	Sun Feb 22 02:51:37 2009
+--- src/version.c	Sun Feb 22 21:11:14 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     122,
+  /**/
+
+-- 
+FIXME and XXX are two common keywords used to mark broken or incomplete code
+not only since XXX as a sex reference would grab everbodys attention but
+simply due to the fact that Vim would highlight these words.
+					-- Hendrik Scholz
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.123 b/source/ap/vim/patches/7.2.123
new file mode 100644
index 000000000..4cf9b810b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.123
@@ -0,0 +1,50 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.123
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.123
+Problem:    Typing 'q' at more prompt for ":map" output still displays another
+            line, causing another more prompt. (Markus Heidelberg)
+Solution:   Quit listing maps when 'q' typed.
+Files:      src/getchar.c
+
+
+*** ../vim-7.2.122/src/getchar.c	Fri Nov 28 12:05:07 2008
+--- src/getchar.c	Sun Feb 22 23:10:45 2009
+***************
+*** 3816,3822 ****
+--- 3816,3826 ----
+      int len = 1;
+  
+      if (msg_didout || msg_silent != 0)
++     {
+  	msg_putchar('\n');
++ 	if (got_int)	    /* 'q' typed at MORE prompt */
++ 	    return;
++     }
+      if ((mp->m_mode & (INSERT + CMDLINE)) == INSERT + CMDLINE)
+  	msg_putchar('!');			/* :map! */
+      else if (mp->m_mode & INSERT)
+*** ../vim-7.2.122/src/version.c	Sun Feb 22 21:12:22 2009
+--- src/version.c	Sun Feb 22 23:16:29 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     123,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+120. You ask a friend, "What's that big shiny thing?" He says, "It's the sun."
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.124 b/source/ap/vim/patches/7.2.124
new file mode 100644
index 000000000..eca6bec1e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.124
@@ -0,0 +1,122 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.124
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.124
+Problem:    Typing 'q' at more prompt for ":tselect" output still displays
+            more lines, causing another more prompt. (Markus Heidelberg)
+Solution:   Quit listing tags when 'q' typed.
+Files:      src/tag.c
+
+
+*** ../vim-7.2.123/src/tag.c	Sat Feb 21 22:57:10 2009
+--- src/tag.c	Mon Feb 23 00:07:24 2009
+***************
+*** 618,624 ****
+  		taglen_advance(taglen);
+  		MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T));
+  
+! 		for (i = 0; i < num_matches; ++i)
+  		{
+  		    parse_match(matches[i], &tagp);
+  		    if (!new_tag && (
+--- 618,624 ----
+  		taglen_advance(taglen);
+  		MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T));
+  
+! 		for (i = 0; i < num_matches && !got_int; ++i)
+  		{
+  		    parse_match(matches[i], &tagp);
+  		    if (!new_tag && (
+***************
+*** 655,660 ****
+--- 655,662 ----
+  		    }
+  		    if (msg_col > 0)
+  			msg_putchar('\n');
++ 		    if (got_int)
++ 			break;
+  		    msg_advance(15);
+  
+  		    /* print any extra fields */
+***************
+*** 689,694 ****
+--- 691,698 ----
+  				if (msg_col + ptr2cells(p) >= Columns)
+  				{
+  				    msg_putchar('\n');
++ 				    if (got_int)
++ 					break;
+  				    msg_advance(15);
+  				}
+  				p = msg_outtrans_one(p, attr);
+***************
+*** 704,709 ****
+--- 708,715 ----
+  			if (msg_col > 15)
+  			{
+  			    msg_putchar('\n');
++ 			    if (got_int)
++ 				break;
+  			    msg_advance(15);
+  			}
+  		    }
+***************
+*** 734,739 ****
+--- 740,747 ----
+  		    {
+  			if (msg_col + (*p == TAB ? 1 : ptr2cells(p)) > Columns)
+  			    msg_putchar('\n');
++ 			if (got_int)
++ 			    break;
+  			msg_advance(15);
+  
+  			/* skip backslash used for escaping command char */
+***************
+*** 760,771 ****
+  		    if (msg_col)
+  			msg_putchar('\n');
+  		    ui_breakcheck();
+- 		    if (got_int)
+- 		    {
+- 			got_int = FALSE;	/* only stop the listing */
+- 			break;
+- 		    }
+  		}
+  		ask_for_selection = TRUE;
+  	    }
+  #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL)
+--- 768,776 ----
+  		    if (msg_col)
+  			msg_putchar('\n');
+  		    ui_breakcheck();
+  		}
++ 		if (got_int)
++ 		    got_int = FALSE;	/* only stop the listing */
+  		ask_for_selection = TRUE;
+  	    }
+  #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL)
+*** ../vim-7.2.123/src/version.c	Sun Feb 22 23:42:08 2009
+--- src/version.c	Mon Feb 23 00:51:57 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     124,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+123. You ask the car dealer to install an extra cigarette lighter
+     on your new car to power your notebook.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.125 b/source/ap/vim/patches/7.2.125
new file mode 100644
index 000000000..460bdea58
--- /dev/null
+++ b/source/ap/vim/patches/7.2.125
@@ -0,0 +1,161 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.125
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.125
+Problem:    Leaking memory when reading XPM bitmap for a sign.
+Solution:   Don't allocate the memory twice. (Dominique Pelle)
+Files:      src/gui_x11.c
+
+
+*** ../vim-7.2.124/src/gui_x11.c	Wed Nov 12 13:07:48 2008
+--- src/gui_x11.c	Sun Feb 22 21:58:19 2009
+***************
+*** 1587,1592 ****
+--- 1587,1594 ----
+      XtCloseDisplay(gui.dpy);
+      gui.dpy = NULL;
+      vimShell = (Widget)0;
++     vim_free(gui_argv);
++     gui_argv = NULL;
+  }
+  
+  /*
+***************
+*** 1761,1766 ****
+--- 1763,1770 ----
+       * says that this isn't needed when exiting, so just skip it. */
+      XtCloseDisplay(gui.dpy);
+  #endif
++     vim_free(gui_argv);
++     gui_argv = NULL;
+  }
+  
+  /*
+***************
+*** 3439,3485 ****
+      char_u	    *signfile;
+  {
+      XpmAttributes   attrs;
+!     XImage	    *sign;
+      int		    status;
+  
+      /*
+       * Setup the color substitution table.
+       */
+-     sign = NULL;
+      if (signfile[0] != NUL && signfile[0] != '-')
+      {
+! 	sign = (XImage *)alloc(sizeof(XImage));
+! 	if (sign != NULL)
+  	{
+! 	    XpmColorSymbol color[5] =
+! 	    {
+! 		{"none", NULL, 0},
+! 		{"iconColor1", NULL, 0},
+! 		{"bottomShadowColor", NULL, 0},
+! 		{"topShadowColor", NULL, 0},
+! 		{"selectColor", NULL, 0}
+! 	    };
+! 	    attrs.valuemask = XpmColorSymbols;
+! 	    attrs.numsymbols = 2;
+! 	    attrs.colorsymbols = color;
+! 	    attrs.colorsymbols[0].pixel = gui.back_pixel;
+! 	    attrs.colorsymbols[1].pixel = gui.norm_pixel;
+! 	    status = XpmReadFileToImage(gui.dpy, (char *)signfile,
+  							 &sign, NULL, &attrs);
+! 
+! 	    if (status == 0)
+! 	    {
+! 		/* Sign width is fixed at two columns now.
+! 		if (sign->width > gui.sign_width)
+! 		    gui.sign_width = sign->width + 8; */
+! 	    }
+! 	    else
+! 	    {
+! 		vim_free(sign);
+! 		sign = NULL;
+! 		EMSG(_(e_signdata));
+! 	    }
+  	}
+      }
+  
+      return (void *)sign;
+--- 3443,3479 ----
+      char_u	    *signfile;
+  {
+      XpmAttributes   attrs;
+!     XImage	    *sign = NULL;
+      int		    status;
+  
+      /*
+       * Setup the color substitution table.
+       */
+      if (signfile[0] != NUL && signfile[0] != '-')
+      {
+! 	XpmColorSymbol color[5] =
+  	{
+! 	    {"none", NULL, 0},
+! 	    {"iconColor1", NULL, 0},
+! 	    {"bottomShadowColor", NULL, 0},
+! 	    {"topShadowColor", NULL, 0},
+! 	    {"selectColor", NULL, 0}
+! 	};
+! 	attrs.valuemask = XpmColorSymbols;
+! 	attrs.numsymbols = 2;
+! 	attrs.colorsymbols = color;
+! 	attrs.colorsymbols[0].pixel = gui.back_pixel;
+! 	attrs.colorsymbols[1].pixel = gui.norm_pixel;
+! 	status = XpmReadFileToImage(gui.dpy, (char *)signfile,
+  							 &sign, NULL, &attrs);
+! 	if (status == 0)
+! 	{
+! 	    /* Sign width is fixed at two columns now.
+! 	    if (sign->width > gui.sign_width)
+! 	        gui.sign_width = sign->width + 8; */
+  	}
++ 	else
++ 	    EMSG(_(e_signdata));
+      }
+  
+      return (void *)sign;
+***************
+*** 3489,3496 ****
+  gui_mch_destroy_sign(sign)
+      void *sign;
+  {
+!     XFree(((XImage *)sign)->data);
+!     vim_free(sign);
+  }
+  #endif
+  
+--- 3483,3489 ----
+  gui_mch_destroy_sign(sign)
+      void *sign;
+  {
+!     XDestroyImage((XImage*)sign);
+  }
+  #endif
+  
+*** ../vim-7.2.124/src/version.c	Mon Feb 23 00:53:35 2009
+--- src/version.c	Tue Feb 24 04:09:33 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     125,
+  /**/
+
+-- 
+I have a watch cat! Just break in and she'll watch.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.126 b/source/ap/vim/patches/7.2.126
new file mode 100644
index 000000000..fe2dd6576
--- /dev/null
+++ b/source/ap/vim/patches/7.2.126
@@ -0,0 +1,174 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.126
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.126
+Problem:    When EXITFREE is defined signs are not freed.
+Solution:   Free all signs on exit.  Also free keymaps. (Dominique Pelle)
+Files:      src/misc2.c, src/ex_cmds.c, src/proto/ex_cmds.pro
+
+
+*** ../vim-7.2.125/src/misc2.c	Thu Jan 22 21:31:24 2009
+--- src/misc2.c	Sun Feb 22 22:04:53 2009
+***************
+*** 1010,1015 ****
+--- 1010,1018 ----
+  # if defined(FEAT_PROFILE)
+      do_cmdline_cmd((char_u *)"profdel *");
+  # endif
++ # if defined(FEAT_KEYMAP)
++     do_cmdline_cmd((char_u *)"set keymap=");
++ #endif
+  
+  # ifdef FEAT_TITLE
+      free_titles();
+***************
+*** 1034,1039 ****
+--- 1037,1045 ----
+      free_regexp_stuff();
+      free_tag_stuff();
+      free_cd_dir();
++ # ifdef FEAT_SIGNS
++     free_signs();
++ # endif
+  # ifdef FEAT_EVAL
+      set_expr_line(NULL);
+  # endif
+*** ../vim-7.2.125/src/ex_cmds.c	Wed Feb 11 16:02:29 2009
+--- src/ex_cmds.c	Sun Feb 22 22:07:08 2009
+***************
+*** 6541,6546 ****
+--- 6541,6547 ----
+  static int	last_sign_typenr = MAX_TYPENR;	/* is decremented */
+  
+  static void sign_list_defined __ARGS((sign_T *sp));
++ static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
+  
+  /*
+   * ":sign" command
+***************
+*** 6749,6772 ****
+  		/* ":sign list {name}" */
+  		sign_list_defined(sp);
+  	    else
+- 	    {
+  		/* ":sign undefine {name}" */
+! 		vim_free(sp->sn_name);
+! 		vim_free(sp->sn_icon);
+! #ifdef FEAT_SIGN_ICONS
+! 		if (sp->sn_image != NULL)
+! 		{
+! 		    out_flush();
+! 		    gui_mch_destroy_sign(sp->sn_image);
+! 		}
+! #endif
+! 		vim_free(sp->sn_text);
+! 		if (sp_prev == NULL)
+! 		    first_sign = sp->sn_next;
+! 		else
+! 		    sp_prev->sn_next = sp->sn_next;
+! 		vim_free(sp);
+! 	    }
+  	}
+      }
+      else
+--- 6750,6757 ----
+  		/* ":sign list {name}" */
+  		sign_list_defined(sp);
+  	    else
+  		/* ":sign undefine {name}" */
+! 		sign_undefine(sp, sp_prev);
+  	}
+      }
+      else
+***************
+*** 7015,7020 ****
+--- 7000,7030 ----
+  }
+  
+  /*
++  * Undefine a sign and free its memory.
++  */
++     static void
++ sign_undefine(sp, sp_prev)
++     sign_T	*sp;
++     sign_T	*sp_prev;
++ {
++     vim_free(sp->sn_name);
++     vim_free(sp->sn_icon);
++ #ifdef FEAT_SIGN_ICONS
++     if (sp->sn_image != NULL)
++     {
++ 	out_flush();
++ 	gui_mch_destroy_sign(sp->sn_image);
++     }
++ #endif
++     vim_free(sp->sn_text);
++     if (sp_prev == NULL)
++ 	first_sign = sp->sn_next;
++     else
++ 	sp_prev->sn_next = sp->sn_next;
++     vim_free(sp);
++ }
++ 
++ /*
+   * Get highlighting attribute for sign "typenr".
+   * If "line" is TRUE: line highl, if FALSE: text highl.
+   */
+***************
+*** 7088,7093 ****
+--- 7098,7115 ----
+      return (char_u *)_("[Deleted]");
+  }
+  
++ #if defined(EXITFREE) || defined(PROTO)
++ /*
++  * Undefine/free all signs.
++  */
++     void
++ free_signs()
++ {
++     while (first_sign != NULL)
++ 	sign_undefine(first_sign, NULL);
++ }
++ #endif
++ 
+  #endif
+  
+  #if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO)
+*** ../vim-7.2.125/src/proto/ex_cmds.pro	Sat Nov 15 14:10:23 2008
+--- src/proto/ex_cmds.pro	Sun Feb 22 22:04:53 2009
+***************
+*** 40,45 ****
+--- 40,46 ----
+  int read_viminfo_sub_string __ARGS((vir_T *virp, int force));
+  void write_viminfo_sub_string __ARGS((FILE *fp));
+  void free_old_sub __ARGS((void));
++ void free_signs __ARGS((void));
+  int prepare_tagpreview __ARGS((int undo_sync));
+  void ex_help __ARGS((exarg_T *eap));
+  char_u *check_help_lang __ARGS((char_u *arg));
+*** ../vim-7.2.125/src/version.c	Tue Feb 24 04:11:07 2009
+--- src/version.c	Tue Feb 24 04:24:46 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     126,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+125. You begin to wonder how often it REALLY is necessary to get up
+     and shower or bathe.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.127 b/source/ap/vim/patches/7.2.127
new file mode 100644
index 000000000..662fe0fa1
--- /dev/null
+++ b/source/ap/vim/patches/7.2.127
@@ -0,0 +1,59 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.127
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.127
+Problem:    When listing mappings and a wrapping line causes the more prompt,
+            after typing 'q' there can be another more prompt. (Markus 
+            Heidelberg)
+Solution:   Set "lines_left" to allow more lines to be displayed.
+Files:      src/message.c
+
+
+*** ../vim-7.2.126/src/message.c	Sun Feb 22 00:58:03 2009
+--- src/message.c	Mon Feb 23 04:17:39 2009
+***************
+*** 2553,2559 ****
+  	    {
+  		/* Jump to the choices of the dialog. */
+  		retval = TRUE;
+- 		lines_left = Rows - 1;
+  	    }
+  	    else
+  #endif
+--- 2553,2558 ----
+***************
+*** 2561,2566 ****
+--- 2560,2568 ----
+  		got_int = TRUE;
+  		quit_more = TRUE;
+  	    }
++ 	    /* When there is some more output (wrapping line) display that
++ 	     * without another prompt. */
++ 	    lines_left = Rows - 1;
+  	    break;
+  
+  #ifdef FEAT_CLIPBOARD
+*** ../vim-7.2.126/src/version.c	Tue Feb 24 04:28:40 2009
+--- src/version.c	Tue Feb 24 04:35:38 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     127,
+  /**/
+
+-- 
+The difference between theory and practice, is that in theory, there
+is no difference between theory and practice.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.128 b/source/ap/vim/patches/7.2.128
new file mode 100644
index 000000000..0c17f1852
--- /dev/null
+++ b/source/ap/vim/patches/7.2.128
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.128
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.128 (after 7.2.055)
+Problem:    Using ":lcd" makes session files not work.
+Solution:   Compare return value of mch_chdir() properly. (Andreas Bernauer)
+Files:      src/ex_docmd.c
+
+
+*** ../vim-7.2.127/src/ex_docmd.c	Sat Feb 21 20:36:30 2009
+--- src/ex_docmd.c	Sun Mar  1 02:39:38 2009
+***************
+*** 8792,8798 ****
+  		else if (*dirnow != NUL
+  			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
+  		{
+! 		    if (mch_chdir((char *)globaldir) == OK)
+  			shorten_fnames(TRUE);
+  		}
+  
+--- 8799,8805 ----
+  		else if (*dirnow != NUL
+  			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
+  		{
+! 		    if (mch_chdir((char *)globaldir) == 0)
+  			shorten_fnames(TRUE);
+  		}
+  
+*** ../vim-7.2.127/src/version.c	Tue Feb 24 04:36:50 2009
+--- src/version.c	Sun Mar  1 02:42:47 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     128,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+138. You develop a liking for cold coffee.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.129 b/source/ap/vim/patches/7.2.129
new file mode 100644
index 000000000..ca756cfa9
--- /dev/null
+++ b/source/ap/vim/patches/7.2.129
@@ -0,0 +1,73 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.129
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.129
+Problem:    When opening a command window from input() it uses the search
+            history.
+Solution:   Use get_cmdline_type(). (James Vega)
+Files:      src/ex_getln.c
+
+
+*** ../vim-7.2.128/src/ex_getln.c	Fri Nov 28 10:59:57 2008
+--- src/ex_getln.c	Mon Mar  2 00:53:39 2009
+***************
+*** 6047,6055 ****
+  # endif
+  	return K_IGNORE;
+      }
+!     cmdwin_type = ccline.cmdfirstc;
+!     if (cmdwin_type == NUL)
+! 	cmdwin_type = '-';
+  
+      /* Create the command-line buffer empty. */
+      (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL);
+--- 6062,6068 ----
+  # endif
+  	return K_IGNORE;
+      }
+!     cmdwin_type = get_cmdline_type();
+  
+      /* Create the command-line buffer empty. */
+      (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL);
+***************
+*** 6073,6079 ****
+      /* Showing the prompt may have set need_wait_return, reset it. */
+      need_wait_return = FALSE;
+  
+!     histtype = hist_char2type(ccline.cmdfirstc);
+      if (histtype == HIST_CMD || histtype == HIST_DEBUG)
+      {
+  	if (p_wc == TAB)
+--- 6086,6092 ----
+      /* Showing the prompt may have set need_wait_return, reset it. */
+      need_wait_return = FALSE;
+  
+!     histtype = hist_char2type(cmdwin_type);
+      if (histtype == HIST_CMD || histtype == HIST_DEBUG)
+      {
+  	if (p_wc == TAB)
+*** ../vim-7.2.128/src/version.c	Sun Mar  1 02:43:50 2009
+--- src/version.c	Mon Mar  2 02:10:11 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     129,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+146. You experience ACTUAL physical withdrawal symptoms when away
+     from your 'puter and the net.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.130 b/source/ap/vim/patches/7.2.130
new file mode 100644
index 000000000..8d6546820
--- /dev/null
+++ b/source/ap/vim/patches/7.2.130
@@ -0,0 +1,413 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.130
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.130
+Problem:    Vim may haing until CTRL-C is typed when using CTRL-Z.
+Solution:   Avoid using pause().  Also use "volatile" for variables used in
+            signal functions. (Dominique Pelle)
+Files:      src/auto/configure, src/configure.in, src/config.h.in,
+            src/globals.h, src/os_unix.c
+    
+
+*** ../vim-7.2.129/src/auto/configure	Thu Nov 20 10:36:04 2008
+--- src/auto/configure	Mon Mar  2 02:36:52 2009
+***************
+*** 11565,11570 ****
+--- 11565,11631 ----
+  
+  fi
+  
++ { $as_echo "$as_me:$LINENO: checking for working volatile" >&5
++ $as_echo_n "checking for working volatile... " >&6; }
++ if test "${ac_cv_c_volatile+set}" = set; then
++   $as_echo_n "(cached) " >&6
++ else
++   cat >conftest.$ac_ext <<_ACEOF
++ /* confdefs.h.  */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h.  */
++ 
++ int
++ main ()
++ {
++ 
++ volatile int x;
++ int * volatile y = (int *) 0;
++ return !x && !y;
++   ;
++   return 0;
++ }
++ _ACEOF
++ rm -f conftest.$ac_objext
++ if { (ac_try="$ac_compile"
++ case "(($ac_try" in
++   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++   *) ac_try_echo=$ac_try;;
++ esac
++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++ $as_echo "$ac_try_echo") >&5
++   (eval "$ac_compile") 2>conftest.er1
++   ac_status=$?
++   grep -v '^ *+' conftest.er1 >conftest.err
++   rm -f conftest.er1
++   cat conftest.err >&5
++   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); } && {
++ 	 test -z "$ac_c_werror_flag" ||
++ 	 test ! -s conftest.err
++        } && test -s conftest.$ac_objext; then
++   ac_cv_c_volatile=yes
++ else
++   $as_echo "$as_me: failed program was:" >&5
++ sed 's/^/| /' conftest.$ac_ext >&5
++ 
++ 	ac_cv_c_volatile=no
++ fi
++ 
++ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ fi
++ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
++ $as_echo "$ac_cv_c_volatile" >&6; }
++ if test $ac_cv_c_volatile = no; then
++ 
++ cat >>confdefs.h <<\_ACEOF
++ #define volatile /**/
++ _ACEOF
++ 
++ fi
++ 
+  { $as_echo "$as_me:$LINENO: checking for mode_t" >&5
+  $as_echo_n "checking for mode_t... " >&6; }
+  if test "${ac_cv_type_mode_t+set}" = set; then
+*** ../vim-7.2.129/src/configure.in	Thu Nov 20 10:36:04 2008
+--- src/configure.in	Sun Feb 22 21:47:44 2009
+***************
+*** 2148,2153 ****
+--- 2148,2154 ----
+  dnl Checks for typedefs, structures, and compiler characteristics.
+  AC_PROG_GCC_TRADITIONAL
+  AC_C_CONST
++ AC_C_VOLATILE
+  AC_TYPE_MODE_T
+  AC_TYPE_OFF_T
+  AC_TYPE_PID_T
+*** ../vim-7.2.129/src/config.h.in	Tue Jun 24 23:47:46 2008
+--- src/config.h.in	Mon Feb 23 00:13:17 2009
+***************
+*** 50,55 ****
+--- 50,58 ----
+  /* Define to empty if the keyword does not work.  */
+  #undef const
+  
++ /* Define to empty if the keyword does not work.  */
++ #undef volatile
++ 
+  /* Define to `int' if <sys/types.h> doesn't define.  */
+  #undef mode_t
+  
+*** ../vim-7.2.129/src/globals.h	Tue Jan  6 16:13:42 2009
+--- src/globals.h	Mon Mar  2 02:40:16 2009
+***************
+*** 482,489 ****
+  /*
+   * While executing external commands or in Ex mode, should not insert GUI
+   * events in the input buffer: Set hold_gui_events to non-zero.
+   */
+! EXTERN int	hold_gui_events INIT(= 0);
+  
+  /*
+   * When resizing the shell is postponed, remember the new size, and call
+--- 482,491 ----
+  /*
+   * While executing external commands or in Ex mode, should not insert GUI
+   * events in the input buffer: Set hold_gui_events to non-zero.
++  *
++  * volatile because it is used in signal handler sig_sysmouse().
+   */
+! EXTERN volatile int hold_gui_events INIT(= 0);
+  
+  /*
+   * When resizing the shell is postponed, remember the new size, and call
+***************
+*** 597,603 ****
+  EXTERN int	really_exiting INIT(= FALSE);
+  				/* TRUE when we are sure to exit, e.g., after
+  				 * a deadly signal */
+! EXTERN int	full_screen INIT(= FALSE);
+  				/* TRUE when doing full-screen output
+  				 * otherwise only writing some messages */
+  
+--- 599,606 ----
+  EXTERN int	really_exiting INIT(= FALSE);
+  				/* TRUE when we are sure to exit, e.g., after
+  				 * a deadly signal */
+! /* volatile because it is used in signal handler deathtrap(). */
+! EXTERN volatile int full_screen INIT(= FALSE);
+  				/* TRUE when doing full-screen output
+  				 * otherwise only writing some messages */
+  
+***************
+*** 739,748 ****
+   */
+  EXTERN JMP_BUF lc_jump_env;	/* argument to SETJMP() */
+  # ifdef SIGHASARG
+! EXTERN int lc_signal;		/* catched signal number, 0 when no was signal
+! 				   catched; used for mch_libcall() */
+  # endif
+! EXTERN int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */
+  #endif
+  
+  #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT)
+--- 747,758 ----
+   */
+  EXTERN JMP_BUF lc_jump_env;	/* argument to SETJMP() */
+  # ifdef SIGHASARG
+! /* volatile because it is used in signal handlers. */
+! EXTERN volatile int lc_signal;	/* caught signal number, 0 when no was signal
+! 				   caught; used for mch_libcall() */
+  # endif
+! /* volatile because it is used in signal handler deathtrap(). */
+! EXTERN volatile int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */
+  #endif
+  
+  #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT)
+***************
+*** 986,992 ****
+  EXTERN FILE	*scriptout  INIT(= NULL);   /* stream to write script to */
+  EXTERN int	read_cmd_fd INIT(= 0);	    /* fd to read commands from */
+  
+! EXTERN int	got_int INIT(= FALSE);	    /* set to TRUE when interrupt
+  						signal occurred */
+  #ifdef USE_TERM_CONSOLE
+  EXTERN int	term_console INIT(= FALSE); /* set to TRUE when console used */
+--- 996,1003 ----
+  EXTERN FILE	*scriptout  INIT(= NULL);   /* stream to write script to */
+  EXTERN int	read_cmd_fd INIT(= 0);	    /* fd to read commands from */
+  
+! /* volatile because it is used in signal handler catch_sigint(). */
+! EXTERN volatile int got_int INIT(= FALSE);    /* set to TRUE when interrupt
+  						signal occurred */
+  #ifdef USE_TERM_CONSOLE
+  EXTERN int	term_console INIT(= FALSE); /* set to TRUE when console used */
+*** ../vim-7.2.129/src/os_unix.c	Sun Feb 22 02:51:37 2009
+--- src/os_unix.c	Mon Mar  2 01:05:50 2009
+***************
+*** 181,187 ****
+  	&& defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK)
+  # define SET_SIG_ALARM
+  static RETSIGTYPE sig_alarm __ARGS(SIGPROTOARG);
+! static int sig_alarm_called;
+  #endif
+  static RETSIGTYPE deathtrap __ARGS(SIGPROTOARG);
+  
+--- 181,188 ----
+  	&& defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK)
+  # define SET_SIG_ALARM
+  static RETSIGTYPE sig_alarm __ARGS(SIGPROTOARG);
+! /* volatile because it is used in signal handler sig_alarm(). */
+! static volatile int sig_alarm_called;
+  #endif
+  static RETSIGTYPE deathtrap __ARGS(SIGPROTOARG);
+  
+***************
+*** 201,213 ****
+  # define SIG_ERR	((RETSIGTYPE (*)())-1)
+  #endif
+  
+! static int	do_resize = FALSE;
+  #ifndef __EMX__
+  static char_u	*extra_shell_arg = NULL;
+  static int	show_shell_mess = TRUE;
+  #endif
+! static int	deadly_signal = 0;	    /* The signal we caught */
+! static int	in_mch_delay = FALSE;	    /* sleeping in mch_delay() */
+  
+  static int curr_tmode = TMODE_COOK;	/* contains current terminal mode */
+  
+--- 202,217 ----
+  # define SIG_ERR	((RETSIGTYPE (*)())-1)
+  #endif
+  
+! /* volatile because it is used in signal handler sig_winch(). */
+! static volatile int do_resize = FALSE;
+  #ifndef __EMX__
+  static char_u	*extra_shell_arg = NULL;
+  static int	show_shell_mess = TRUE;
+  #endif
+! /* volatile because it is used in signal handler deathtrap(). */
+! static volatile int deadly_signal = 0;	    /* The signal we caught */
+! /* volatile because it is used in signal handler deathtrap(). */
+! static volatile int in_mch_delay = FALSE;    /* sleeping in mch_delay() */
+  
+  static int curr_tmode = TMODE_COOK;	/* contains current terminal mode */
+  
+***************
+*** 802,808 ****
+  #endif
+  
+  /*
+!  * We need correct potatotypes for a signal function, otherwise mean compilers
+   * will barf when the second argument to signal() is ``wrong''.
+   * Let me try it with a few tricky defines from my own osdef.h	(jw).
+   */
+--- 806,812 ----
+  #endif
+  
+  /*
+!  * We need correct prototypes for a signal function, otherwise mean compilers
+   * will barf when the second argument to signal() is ``wrong''.
+   * Let me try it with a few tricky defines from my own osdef.h	(jw).
+   */
+***************
+*** 1068,1080 ****
+      SIGRETURN;
+  }
+  
+! #ifdef _REENTRANT
+  /*
+   * On Solaris with multi-threading, suspending might not work immediately.
+   * Catch the SIGCONT signal, which will be used as an indication whether the
+   * suspending has been done or not.
+   */
+! static int sigcont_received;
+  static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG);
+  
+  /*
+--- 1072,1089 ----
+      SIGRETURN;
+  }
+  
+! #if defined(_REENTRANT) && defined(SIGCONT)
+  /*
+   * On Solaris with multi-threading, suspending might not work immediately.
+   * Catch the SIGCONT signal, which will be used as an indication whether the
+   * suspending has been done or not.
++  *
++  * On Linux, signal is not always handled immediately either.
++  * See https://bugs.launchpad.net/bugs/291373
++  *
++  * volatile because it is used in in signal handler sigcont_handler().
+   */
+! static volatile int sigcont_received;
+  static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG);
+  
+  /*
+***************
+*** 1118,1132 ****
+      }
+  # endif
+  
+! # ifdef _REENTRANT
+      sigcont_received = FALSE;
+  # endif
+      kill(0, SIGTSTP);	    /* send ourselves a STOP signal */
+! # ifdef _REENTRANT
+!     /* When we didn't suspend immediately in the kill(), do it now.  Happens
+!      * on multi-threaded Solaris. */
+!     if (!sigcont_received)
+! 	pause();
+  # endif
+  
+  # ifdef FEAT_TITLE
+--- 1127,1154 ----
+      }
+  # endif
+  
+! # if defined(_REENTRANT) && defined(SIGCONT)
+      sigcont_received = FALSE;
+  # endif
+      kill(0, SIGTSTP);	    /* send ourselves a STOP signal */
+! # if defined(_REENTRANT) && defined(SIGCONT)
+!     /*
+!      * Wait for the SIGCONT signal to be handled. It generally happens
+!      * immediately, but somehow not all the time. Do not call pause()
+!      * because there would be race condition which would hang Vim if
+!      * signal happened in between the test of sigcont_received and the
+!      * call to pause(). If signal is not yet received, call sleep(0)
+!      * to just yield CPU. Signal should then be received. If somehow
+!      * it's still not received, sleep 1, 2, 3 ms. Don't bother waiting
+!      * further if signal is not received after 1+2+3+4 ms (not expected
+!      * to happen).
+!      */
+!     {
+! 	long wait;
+! 	for (wait = 0; !sigcont_received && wait <= 3L; wait++)
+! 	    /* Loop is not entered most of the time */
+! 	    mch_delay(wait, FALSE);
+!     }
+  # endif
+  
+  # ifdef FEAT_TITLE
+***************
+*** 1175,1181 ****
+  #ifdef SIGTSTP
+      signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
+  #endif
+! #ifdef _REENTRANT
+      signal(SIGCONT, sigcont_handler);
+  #endif
+  
+--- 1197,1203 ----
+  #ifdef SIGTSTP
+      signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
+  #endif
+! #if defined(_REENTRANT) && defined(SIGCONT)
+      signal(SIGCONT, sigcont_handler);
+  #endif
+  
+***************
+*** 1234,1240 ****
+  reset_signals()
+  {
+      catch_signals(SIG_DFL, SIG_DFL);
+! #ifdef _REENTRANT
+      /* SIGCONT isn't in the list, because its default action is ignore */
+      signal(SIGCONT, SIG_DFL);
+  #endif
+--- 1256,1262 ----
+  reset_signals()
+  {
+      catch_signals(SIG_DFL, SIG_DFL);
+! #if defined(_REENTRANT) && defined(SIGCONT)
+      /* SIGCONT isn't in the list, because its default action is ignore */
+      signal(SIGCONT, SIG_DFL);
+  #endif
+***************
+*** 5899,5905 ****
+--- 5921,5929 ----
+  	     * we are going to suspend or starting an external process
+  	     * so we shouldn't  have problem with this
+  	     */
++ # ifdef SIGTSTP
+  	    signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
++ # endif
+  	    return 1; /* succeed */
+  	}
+  	if (gpm_fd == -2)
+*** ../vim-7.2.129/src/version.c	Mon Mar  2 02:11:09 2009
+--- src/version.c	Mon Mar  2 02:36:00 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     130,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+148. You find it easier to dial-up the National Weather Service
+     Weather/your_town/now.html than to simply look out the window.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.131 b/source/ap/vim/patches/7.2.131
new file mode 100644
index 000000000..fec2b5e15
--- /dev/null
+++ b/source/ap/vim/patches/7.2.131
@@ -0,0 +1,83 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.131
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.131
+Problem:    When 'keymap' is cleared may still use the cursor highlighting for
+            when it's enabled.
+Solution:   Reset 'iminsert' and 'imsearch'. (partly by Dominique Pelle)
+            Also avoid ":setlocal" for these options have a global effect.
+Files:      src/option.c
+
+
+*** ../vim-7.2.130/src/option.c	Sat Feb 21 20:27:00 2009
+--- src/option.c	Wed Mar  4 04:09:51 2009
+***************
+*** 5797,5810 ****
+  	/* load or unload key mapping tables */
+  	errmsg = keymap_init();
+  
+! 	/* When successfully installed a new keymap switch on using it. */
+! 	if (*curbuf->b_p_keymap != NUL && errmsg == NULL)
+  	{
+! 	    curbuf->b_p_iminsert = B_IMODE_LMAP;
+! 	    if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
+! 		curbuf->b_p_imsearch = B_IMODE_LMAP;
+! 	    set_iminsert_global();
+! 	    set_imsearch_global();
+  # ifdef FEAT_WINDOWS
+  	    status_redraw_curbuf();
+  # endif
+--- 5797,5824 ----
+  	/* load or unload key mapping tables */
+  	errmsg = keymap_init();
+  
+! 	if (errmsg == NULL)
+  	{
+! 	    if (*curbuf->b_p_keymap != NUL)
+! 	    {
+! 		/* Installed a new keymap, switch on using it. */
+! 		curbuf->b_p_iminsert = B_IMODE_LMAP;
+! 		if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
+! 		    curbuf->b_p_imsearch = B_IMODE_LMAP;
+! 	    }
+! 	    else
+! 	    {
+! 		/* Cleared the keymap, may reset 'iminsert' and 'imsearch'. */
+! 		if (curbuf->b_p_iminsert == B_IMODE_LMAP)
+! 		    curbuf->b_p_iminsert = B_IMODE_NONE;
+! 		if (curbuf->b_p_imsearch == B_IMODE_LMAP)
+! 		    curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
+! 	    }
+! 	    if ((opt_flags & OPT_LOCAL) == 0)
+! 	    {
+! 		set_iminsert_global();
+! 		set_imsearch_global();
+! 	    }
+  # ifdef FEAT_WINDOWS
+  	    status_redraw_curbuf();
+  # endif
+*** ../vim-7.2.130/src/version.c	Mon Mar  2 02:44:54 2009
+--- src/version.c	Wed Mar  4 04:10:32 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     131,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+157. You fum through a magazine, you first check to see if it has a web
+     address.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.132 b/source/ap/vim/patches/7.2.132
new file mode 100644
index 000000000..69e19ee45
--- /dev/null
+++ b/source/ap/vim/patches/7.2.132
@@ -0,0 +1,268 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.132
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.132
+Problem:    When changing directory during a SwapExists autocmd freed memory
+            may be accessed. (Dominique Pelle)
+Solution:   Add the allbuf_lock flag.
+Files:      src/ex_getln.c, src/globals.h, src/fileio.c,
+            src/proto/ex_getln.pro
+    
+
+*** ../vim-7.2.131/src/ex_getln.c	Mon Mar  2 02:11:09 2009
+--- src/ex_getln.c	Mon Mar  2 00:53:39 2009
+***************
+*** 2000,2007 ****
+  
+  #if defined(FEAT_AUTOCMD) || defined(PROTO)
+  /*
+!  * Check if "curbuf_lock" is set and return TRUE when it is and give an error
+!  * message.
+   */
+      int
+  curbuf_locked()
+--- 2000,2007 ----
+  
+  #if defined(FEAT_AUTOCMD) || defined(PROTO)
+  /*
+!  * Check if "curbuf_lock" or "allbuf_lock" is set and return TRUE when it is
+!  * and give an error message.
+   */
+      int
+  curbuf_locked()
+***************
+*** 2011,2016 ****
+--- 2011,2031 ----
+  	EMSG(_("E788: Not allowed to edit another buffer now"));
+  	return TRUE;
+      }
++     return allbuf_locked();
++ }
++ 
++ /*
++  * Check if "allbuf_lock" is set and return TRUE when it is and give an error
++  * message.
++  */
++     int
++ allbuf_locked()
++ {
++     if (allbuf_lock > 0)
++     {
++ 	EMSG(_("E811: Not allowed to change buffer information now"));
++ 	return TRUE;
++     }
+      return FALSE;
+  }
+  #endif
+*** ../vim-7.2.131/src/globals.h	Mon Mar  2 02:44:54 2009
+--- src/globals.h	Mon Mar  2 02:40:16 2009
+***************
+*** 619,624 ****
+--- 619,629 ----
+  EXTERN int	curbuf_lock INIT(= 0);
+  				/* non-zero when the current buffer can't be
+  				 * changed.  Used for FileChangedRO. */
++ EXTERN int	allbuf_lock INIT(= 0);
++ 				/* non-zero when no buffer name can be
++ 				 * changed, no buffer can be deleted and
++ 				 * current directory can't be changed.
++ 				 * Used for SwapExists et al. */
+  #endif
+  #ifdef FEAT_EVAL
+  # define HAVE_SANDBOX
+*** ../vim-7.2.131/src/fileio.c	Wed Dec 31 16:20:54 2008
+--- src/fileio.c	Sun Mar  1 23:37:10 2009
+***************
+*** 69,75 ****
+  static int au_find_group __ARGS((char_u *name));
+  
+  # define AUGROUP_DEFAULT    -1	    /* default autocmd group */
+! # define AUGROUP_ERROR	    -2	    /* errornouse autocmd group */
+  # define AUGROUP_ALL	    -3	    /* all autocmd groups */
+  #endif
+  
+--- 69,75 ----
+  static int au_find_group __ARGS((char_u *name));
+  
+  # define AUGROUP_DEFAULT    -1	    /* default autocmd group */
+! # define AUGROUP_ERROR	    -2	    /* erroneous autocmd group */
+  # define AUGROUP_ALL	    -3	    /* all autocmd groups */
+  #endif
+  
+***************
+*** 144,150 ****
+  # endif
+  #endif
+  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+! 
+  
+      void
+  filemess(buf, name, s, attr)
+--- 144,152 ----
+  # endif
+  #endif
+  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+! #ifdef FEAT_AUTOCMD
+! static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
+! #endif
+  
+      void
+  filemess(buf, name, s, attr)
+***************
+*** 295,300 ****
+--- 297,315 ----
+      int		conv_restlen = 0;	/* nr of bytes in conv_rest[] */
+  #endif
+  
++ #ifdef FEAT_AUTOCMD
++     /* Remember the initial values of curbuf, curbuf->b_ffname and
++      * curbuf->b_fname to detect whether they are altered as a result of
++      * executing nasty autocommands.  Also check if "fname" and "sfname"
++      * point to one of these values. */
++     buf_T   *old_curbuf = curbuf;
++     char_u  *old_b_ffname = curbuf->b_ffname;
++     char_u  *old_b_fname = curbuf->b_fname;
++     int     using_b_ffname = (fname == curbuf->b_ffname)
++ 					      || (sfname == curbuf->b_ffname);
++     int     using_b_fname = (fname == curbuf->b_fname)
++ 					       || (sfname == curbuf->b_fname);
++ #endif
+      write_no_eol_lnum = 0;	/* in case it was set by the previous read */
+  
+      /*
+***************
+*** 589,595 ****
+--- 604,624 ----
+  #ifdef FEAT_QUICKFIX
+  		    if (!bt_dontwrite(curbuf))
+  #endif
++ 		    {
+  			check_need_swap(newfile);
++ #ifdef FEAT_AUTOCMD
++ 			/* SwapExists autocommand may mess things up */
++ 			if (curbuf != old_curbuf
++ 				|| (using_b_ffname
++ 					&& (old_b_ffname != curbuf->b_ffname))
++ 				|| (using_b_fname
++ 					 && (old_b_fname != curbuf->b_fname)))
++ 			{
++ 			    EMSG(_(e_auchangedbuf));
++ 			    return FAIL;
++ 			}
++ #endif
++ 		    }
+  		    if (dir_of_file_exists(fname))
+  			filemess(curbuf, sfname, (char_u *)_("[New File]"), 0);
+  		    else
+***************
+*** 668,673 ****
+--- 697,713 ----
+  #endif
+      {
+  	check_need_swap(newfile);
++ #ifdef FEAT_AUTOCMD
++ 	if (!read_stdin && (curbuf != old_curbuf
++ 		|| (using_b_ffname && (old_b_ffname != curbuf->b_ffname))
++ 		|| (using_b_fname && (old_b_fname != curbuf->b_fname))))
++ 	{
++ 	    EMSG(_(e_auchangedbuf));
++ 	    if (!read_buffer)
++ 		close(fd);
++ 	    return FAIL;
++ 	}
++ #endif
+  #ifdef UNIX
+  	/* Set swap file protection bits after creating it. */
+  	if (swap_mode > 0 && curbuf->b_ml.ml_mfp->mf_fname != NULL)
+***************
+*** 698,704 ****
+      {
+  	int	m = msg_scroll;
+  	int	n = msg_scrolled;
+- 	buf_T	*old_curbuf = curbuf;
+  
+  	/*
+  	 * The file must be closed again, the autocommands may want to change
+--- 738,743 ----
+***************
+*** 740,747 ****
+--- 779,791 ----
+  	/*
+  	 * Don't allow the autocommands to change the current buffer.
+  	 * Try to re-open the file.
++ 	 *
++ 	 * Don't allow the autocommands to change the buffer name either
++ 	 * (cd for example) if it invalidates fname or sfname.
+  	 */
+  	if (!read_stdin && (curbuf != old_curbuf
++ 		|| (using_b_ffname && (old_b_ffname != curbuf->b_ffname))
++ 		|| (using_b_fname && (old_b_fname != curbuf->b_fname))
+  		|| (fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0)) < 0))
+  	{
+  	    --no_wait_return;
+***************
+*** 6320,6326 ****
+  
+      if (!stuff_empty() || global_busy || !typebuf_typed()
+  #ifdef FEAT_AUTOCMD
+! 			|| autocmd_busy || curbuf_lock > 0
+  #endif
+  					)
+  	need_check_timestamps = TRUE;		/* check later */
+--- 6364,6370 ----
+  
+      if (!stuff_empty() || global_busy || !typebuf_typed()
+  #ifdef FEAT_AUTOCMD
+! 			|| autocmd_busy || curbuf_lock > 0 || allbuf_lock > 0
+  #endif
+  					)
+  	need_check_timestamps = TRUE;		/* check later */
+***************
+*** 6522,6529 ****
+--- 6566,6575 ----
+  	    set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1);
+  	    set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1);
+  # endif
++ 	    ++allbuf_lock;
+  	    n = apply_autocmds(EVENT_FILECHANGEDSHELL,
+  				      buf->b_fname, buf->b_fname, FALSE, buf);
++ 	    --allbuf_lock;
+  	    busy = FALSE;
+  	    if (n)
+  	    {
+*** ../vim-7.2.131/src/proto/ex_getln.pro	Fri Nov 28 10:59:57 2008
+--- src/proto/ex_getln.pro	Sun Mar  1 00:27:12 2009
+***************
+*** 4,9 ****
+--- 4,10 ----
+  int text_locked __ARGS((void));
+  void text_locked_msg __ARGS((void));
+  int curbuf_locked __ARGS((void));
++ int allbuf_locked __ARGS((void));
+  char_u *getexline __ARGS((int c, void *dummy, int indent));
+  char_u *getexmodeline __ARGS((int promptc, void *dummy, int indent));
+  int cmdline_overstrike __ARGS((void));
+*** ../vim-7.2.131/src/version.c	Wed Mar  4 04:11:56 2009
+--- src/version.c	Thu Mar  5 03:08:54 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     132,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+168. You have your own domain name.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.133 b/source/ap/vim/patches/7.2.133
new file mode 100644
index 000000000..ffb19d71b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.133
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.133
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.133
+Problem:    ":diffoff!" changes settings in windows not in diff mode.
+Solution:   Only change settings in other windows when 'diff' is set, always
+	    do it for the current window. (Lech Lorens)
+Files:	    src/diff.c
+
+
+*** ../vim-7.2.132/src/diff.c	Thu Jan 22 20:48:07 2009
+--- src/diff.c	Fri Mar  6 04:17:41 2009
+***************
+*** 1153,1159 ****
+  
+      for (wp = firstwin; wp != NULL; wp = wp->w_next)
+      {
+! 	if (wp == curwin || eap->forceit)
+  	{
+  	    /* Set 'diff', 'scrollbind' off and 'wrap' on. */
+  	    wp->w_p_diff = FALSE;
+--- 1153,1159 ----
+  
+      for (wp = firstwin; wp != NULL; wp = wp->w_next)
+      {
+! 	if (wp == curwin || (eap->forceit && wp->w_p_diff))
+  	{
+  	    /* Set 'diff', 'scrollbind' off and 'wrap' on. */
+  	    wp->w_p_diff = FALSE;
+*** ../vim-7.2.132/src/version.c	Thu Mar  5 03:13:51 2009
+--- src/version.c	Wed Mar 11 12:45:10 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     133,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+192. Your boss asks you to "go fer" coffee and you come up with 235 FTP sites.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.134 b/source/ap/vim/patches/7.2.134
new file mode 100644
index 000000000..fee2789a5
--- /dev/null
+++ b/source/ap/vim/patches/7.2.134
@@ -0,0 +1,68 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.134
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.134
+Problem:    Warning for discarding "const" from pointer.
+Solution:   Don't pass const pointer to mch_memmove().
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.133/src/fileio.c	Thu Mar  5 03:13:51 2009
+--- src/fileio.c	Wed Mar 11 12:59:35 2009
+***************
+*** 5288,5300 ****
+  	    /* Convert with iconv(). */
+  	    if (ip->bw_restlen > 0)
+  	    {
+  		/* Need to concatenate the remainder of the previous call and
+  		 * the bytes of the current call.  Use the end of the
+  		 * conversion buffer for this. */
+  		fromlen = len + ip->bw_restlen;
+! 		from = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen;
+! 		mch_memmove((void *)from, ip->bw_rest, (size_t)ip->bw_restlen);
+! 		mch_memmove((void *)(from + ip->bw_restlen), buf, (size_t)len);
+  		tolen = ip->bw_conv_buflen - fromlen;
+  	    }
+  	    else
+--- 5288,5303 ----
+  	    /* Convert with iconv(). */
+  	    if (ip->bw_restlen > 0)
+  	    {
++ 		char *fp;
++ 
+  		/* Need to concatenate the remainder of the previous call and
+  		 * the bytes of the current call.  Use the end of the
+  		 * conversion buffer for this. */
+  		fromlen = len + ip->bw_restlen;
+! 		fp = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen;
+! 		mch_memmove(fp, ip->bw_rest, (size_t)ip->bw_restlen);
+! 		mch_memmove(fp + ip->bw_restlen, buf, (size_t)len);
+! 		from = fp;
+  		tolen = ip->bw_conv_buflen - fromlen;
+  	    }
+  	    else
+*** ../vim-7.2.133/src/version.c	Wed Mar 11 12:45:44 2009
+--- src/version.c	Wed Mar 11 13:08:25 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     134,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+193. You ask your girlfriend to drive home so you can sit back with
+     your PDA and download the information to your laptop
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.135 b/source/ap/vim/patches/7.2.135
new file mode 100644
index 000000000..a58e6bb21
--- /dev/null
+++ b/source/ap/vim/patches/7.2.135
@@ -0,0 +1,85 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.135
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.135
+Problem:    Memory leak when redefining user command with complete argument.
+Solution:   Free the old complete argument. (Dominique Pelle)
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.2.134/src/ex_docmd.c	Sun Mar  1 02:43:50 2009
+--- src/ex_docmd.c	Wed Mar 11 11:13:31 2009
+***************
+*** 5124,5130 ****
+  	    }
+  
+  	    vim_free(cmd->uc_rep);
+! 	    cmd->uc_rep = 0;
+  	    break;
+  	}
+  
+--- 5124,5134 ----
+  	    }
+  
+  	    vim_free(cmd->uc_rep);
+! 	    cmd->uc_rep = NULL;
+! #if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
+! 	    vim_free(cmd->uc_compl_arg);
+! 	    cmd->uc_compl_arg = NULL;
+! #endif
+  	    break;
+  	}
+  
+***************
+*** 5941,5947 ****
+      for (;;)
+      {
+  	p = cmd->uc_rep;    /* source */
+! 	q = buf;	    /* destinateion */
+  	totlen = 0;
+  
+  	for (;;)
+--- 5945,5951 ----
+      for (;;)
+      {
+  	p = cmd->uc_rep;    /* source */
+! 	q = buf;	    /* destination */
+  	totlen = 0;
+  
+  	for (;;)
+***************
+*** 7846,7851 ****
+--- 7850,7858 ----
+  {
+      vim_free(prev_dir);
+      prev_dir = NULL;
++ 
++     vim_free(globaldir);
++     globaldir = NULL;
+  }
+  #endif
+  
+*** ../vim-7.2.134/src/version.c	Wed Mar 11 13:09:30 2009
+--- src/version.c	Wed Mar 11 15:06:23 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     135,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+194. Your business cards contain your e-mail and home page address.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.136 b/source/ap/vim/patches/7.2.136
new file mode 100644
index 000000000..b0045eb9a
--- /dev/null
+++ b/source/ap/vim/patches/7.2.136
@@ -0,0 +1,47 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.136
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.136 (after 7.2.132)
+Problem:    ":cd" is still possible in a SwapExists autocmd.
+Solution:   Check the allbuf_lock flag in ex_cd().
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.2.135/src/ex_docmd.c	Wed Mar 11 15:09:07 2009
+--- src/ex_docmd.c	Wed Mar 11 11:13:31 2009
+***************
+*** 7875,7880 ****
+--- 7875,7884 ----
+      else
+  #endif
+      {
++ #ifdef FEAT_AUTOCMD
++ 	if (allbuf_locked())
++ 	    return;
++ #endif
+  	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
+  							     && !eap->forceit)
+  	{
+*** ../vim-7.2.135/src/version.c	Wed Mar 11 15:09:07 2009
+--- src/version.c	Wed Mar 11 15:35:36 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     136,
+  /**/
+
+-- 
+Press any key to continue, press any other key to quit.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.137 b/source/ap/vim/patches/7.2.137
new file mode 100644
index 000000000..706b046bb
--- /dev/null
+++ b/source/ap/vim/patches/7.2.137
@@ -0,0 +1,343 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.137
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Note: The special characters in the patch may cause problems.
+
+Patch 7.2.137
+Problem:    When 'virtualedit' is set, a left shift of a blockwise selection
+	    that starts and ends inside a tab shifts too much. (Helmut
+	    Stiegler)
+Solution:   Redo the block left shift code. (Lech Lorens)
+Files:	    src/ops.c, src/testdir/Makefile, src/testdir/test66.in,
+	    src/testdir/test66.ok
+
+
+*** ../vim-7.2.136/src/ops.c	Wed Dec  3 13:38:00 2008
+--- src/ops.c	Thu Mar  5 04:47:09 2009
+***************
+*** 72,82 ****
+   */
+  struct block_def
+  {
+!     int		startspaces;	/* 'extra' cols of first char */
+!     int		endspaces;	/* 'extra' cols of first char */
+      int		textlen;	/* chars in block */
+!     char_u	*textstart;	/* pointer to 1st char in block */
+!     colnr_T	textcol;	/* cols of chars (at least part.) in block */
+      colnr_T	start_vcol;	/* start col of 1st char wholly inside block */
+      colnr_T	end_vcol;	/* start col of 1st char wholly after block */
+  #ifdef FEAT_VISUALEXTRA
+--- 72,82 ----
+   */
+  struct block_def
+  {
+!     int		startspaces;	/* 'extra' cols before first char */
+!     int		endspaces;	/* 'extra' cols after last char */
+      int		textlen;	/* chars in block */
+!     char_u	*textstart;	/* pointer to 1st char (partially) in block */
+!     colnr_T	textcol;	/* index of chars (partially) in block */
+      colnr_T	start_vcol;	/* start col of 1st char wholly inside block */
+      colnr_T	end_vcol;	/* start col of 1st char wholly after block */
+  #ifdef FEAT_VISUALEXTRA
+***************
+*** 382,396 ****
+  {
+      int			left = (oap->op_type == OP_LSHIFT);
+      int			oldstate = State;
+!     int			total, split;
+!     char_u		*newp, *oldp, *midp, *ptr;
+      int			oldcol = curwin->w_cursor.col;
+      int			p_sw = (int)curbuf->b_p_sw;
+      int			p_ts = (int)curbuf->b_p_ts;
+      struct block_def	bd;
+-     int			internal = 0;
+      int			incr;
+!     colnr_T		vcol, col = 0, ws_vcol;
+      int			i = 0, j = 0;
+      int			len;
+  
+--- 382,395 ----
+  {
+      int			left = (oap->op_type == OP_LSHIFT);
+      int			oldstate = State;
+!     int			total;
+!     char_u		*newp, *oldp;
+      int			oldcol = curwin->w_cursor.col;
+      int			p_sw = (int)curbuf->b_p_sw;
+      int			p_ts = (int)curbuf->b_p_ts;
+      struct block_def	bd;
+      int			incr;
+!     colnr_T		ws_vcol;
+      int			i = 0, j = 0;
+      int			len;
+  
+***************
+*** 456,522 ****
+      }
+      else /* left */
+      {
+! 	vcol = oap->start_vcol;
+! 	/* walk vcol past ws to be removed */
+! 	for (midp = oldp + bd.textcol;
+! 	      vcol < (oap->start_vcol + total) && vim_iswhite(*midp); )
+! 	{
+! 	    incr = lbr_chartabsize_adv(&midp, (colnr_T)vcol);
+! 	    vcol += incr;
+! 	}
+! 	/* internal is the block-internal ws replacing a split TAB */
+! 	if (vcol > (oap->start_vcol + total))
+! 	{
+! 	    /* we have to split the TAB *(midp-1) */
+! 	    internal = vcol - (oap->start_vcol + total);
+! 	}
+! 	/* if 'expandtab' is not set, use TABs */
+  
+! 	split = bd.startspaces + internal;
+! 	if (split > 0)
+! 	{
+! 	    if (!curbuf->b_p_et)
+! 	    {
+! 		for (ptr = oldp, col = 0; ptr < oldp+bd.textcol; )
+! 		    col += lbr_chartabsize_adv(&ptr, (colnr_T)col);
+  
+! 		/* col+1 now equals the start col of the first char of the
+! 		 * block (may be < oap.start_vcol if we're splitting a TAB) */
+! 		i = ((col % p_ts) + split) / p_ts; /* number of tabs */
+! 	    }
+! 	    if (i)
+! 		j = ((col % p_ts) + split) % p_ts; /* number of spp */
+! 	    else
+! 		j = split;
+! 	}
+  
+! 	newp = alloc_check(bd.textcol + i + j + (unsigned)STRLEN(midp) + 1);
+! 	if (newp == NULL)
+! 	    return;
+! 	vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + STRLEN(midp) + 1));
+  
+! 	/* copy first part we want to keep */
+! 	mch_memmove(newp, oldp, (size_t)bd.textcol);
+! 	/* Now copy any TABS and spp to ensure correct alignment! */
+! 	while (vim_iswhite(*midp))
+  	{
+! 	    if (*midp == TAB)
+! 		i++;
+! 	    else /*space */
+! 		j++;
+! 	    midp++;
+  	}
+! 	/* We might have an extra TAB worth of spp now! */
+! 	if (j / p_ts && !curbuf->b_p_et)
+  	{
+! 	    i++;
+! 	    j -= p_ts;
+  	}
+- 	copy_chars(newp + bd.textcol, (size_t)i, TAB);
+- 	copy_spaces(newp + bd.textcol + i, (size_t)j);
+  
+! 	/* the end */
+! 	STRMOVE(newp + STRLEN(newp), midp);
+      }
+      /* replace the line */
+      ml_replace(curwin->w_cursor.lnum, newp, FALSE);
+--- 455,543 ----
+      }
+      else /* left */
+      {
+! 	colnr_T	    destination_col;	/* column to which text in block will
+! 					   be shifted */
+! 	char_u	    *verbatim_copy_end;	/* end of the part of the line which is
+! 					   copied verbatim */
+! 	colnr_T	    verbatim_copy_width;/* the (displayed) width of this part
+! 					   of line */
+! 	unsigned    fill;		/* nr of spaces that replace a TAB */
+! 	unsigned    new_line_len;	/* the length of the line after the
+! 					   block shift */
+! 	size_t	    block_space_width;
+! 	size_t	    shift_amount;
+! 	char_u	    *non_white = bd.textstart;
+! 	colnr_T	    non_white_col;
+  
+! 	/*
+! 	 * Firstly, let's find the first non-whitespace character that is
+! 	 * displayed after the block's start column and the character's column
+! 	 * number. Also, let's calculate the width of all the whitespace
+! 	 * characters that are displayed in the block and precede the searched
+! 	 * non-whitespace character.
+! 	 */
+  
+! 	/* If "bd.startspaces" is set, "bd.textstart" points to the character,
+! 	 * the part of which is displayed at the block's beginning. Let's start
+! 	 * searching from the next character. */
+! 	if (bd.startspaces)
+! 	    mb_ptr_adv(non_white);
+  
+! 	/* The character's column is in "bd.start_vcol".  */
+! 	non_white_col = bd.start_vcol;
+  
+! 	while (vim_iswhite(*non_white))
+  	{
+! 	    incr = lbr_chartabsize_adv(&non_white, non_white_col);
+! 	    non_white_col += incr;
+  	}
+! 
+! 	block_space_width = non_white_col - oap->start_vcol;
+! 	/* We will shift by "total" or "block_space_width", whichever is less.
+! 	 */
+! 	shift_amount = (block_space_width < total? block_space_width: total);
+! 
+! 	/* The column to which we will shift the text.  */
+! 	destination_col = non_white_col - shift_amount;
+! 
+! 	/* Now let's find out how much of the beginning of the line we can
+! 	 * reuse without modification.  */
+! 	verbatim_copy_end = bd.textstart;
+! 	verbatim_copy_width = bd.start_vcol;
+! 
+! 	/* If "bd.startspaces" is set, "bd.textstart" points to the character
+! 	 * preceding the block. We have to subtract its width to obtain its
+! 	 * column number.  */
+! 	if (bd.startspaces)
+! 	    verbatim_copy_width -= bd.start_char_vcols;
+! 	while (verbatim_copy_width < destination_col)
+  	{
+! 	    incr = lbr_chartabsize(verbatim_copy_end, verbatim_copy_width);
+! 	    if (verbatim_copy_width + incr > destination_col)
+! 		break;
+! 	    verbatim_copy_width += incr;
+! 	    mb_ptr_adv(verbatim_copy_end);
+  	}
+  
+! 	/* If "destination_col" is different from the width of the initial
+! 	 * part of the line that will be copied, it means we encountered a tab
+! 	 * character, which we will have to partly replace with spaces.  */
+! 	fill = destination_col - verbatim_copy_width;
+! 
+! 	/* The replacement line will consist of:
+! 	 * - the beginning of the original line up to "verbatim_copy_end",
+! 	 * - "fill" number of spaces,
+! 	 * - the rest of the line, pointed to by non_white.  */
+! 	new_line_len = (unsigned)(verbatim_copy_end - oldp)
+! 		       + fill
+! 		       + (unsigned)STRLEN(non_white) + 1;
+! 
+! 	newp = alloc_check(new_line_len);
+! 	if (newp == NULL)
+! 	    return;
+! 	mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp));
+! 	copy_spaces(newp + (verbatim_copy_end - oldp), (size_t)fill);
+! 	STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white);
+      }
+      /* replace the line */
+      ml_replace(curwin->w_cursor.lnum, newp, FALSE);
+***************
+*** 4851,4857 ****
+   * - textlen includes the first/last char to be (partly) deleted
+   * - start/endspaces is the number of columns that are taken by the
+   *   first/last deleted char minus the number of columns that have to be
+!  *   deleted.  for yank and tilde:
+   * - textlen includes the first/last char to be wholly yanked
+   * - start/endspaces is the number of columns of the first/last yanked char
+   *   that are to be yanked.
+--- 4872,4879 ----
+   * - textlen includes the first/last char to be (partly) deleted
+   * - start/endspaces is the number of columns that are taken by the
+   *   first/last deleted char minus the number of columns that have to be
+!  *   deleted.
+!  * for yank and tilde:
+   * - textlen includes the first/last char to be wholly yanked
+   * - start/endspaces is the number of columns of the first/last yanked char
+   *   that are to be yanked.
+*** ../vim-7.2.136/src/testdir/Makefile	Wed Sep 10 18:25:18 2008
+--- src/testdir/Makefile	Thu Mar  5 04:53:58 2009
+***************
+*** 20,26 ****
+  		test48.out test49.out test51.out test52.out test53.out \
+  		test54.out test55.out test56.out test57.out test58.out \
+  		test59.out test60.out test61.out test62.out test63.out \
+! 		test64.out test65.out
+  
+  SCRIPTS_GUI = test16.out
+  
+--- 20,26 ----
+  		test48.out test49.out test51.out test52.out test53.out \
+  		test54.out test55.out test56.out test57.out test58.out \
+  		test59.out test60.out test61.out test62.out test63.out \
+! 		test64.out test65.out test66.out
+  
+  SCRIPTS_GUI = test16.out
+  
+*** ../vim-7.2.136/src/testdir/test66.in	Wed Mar 11 16:24:44 2009
+--- src/testdir/test66.in	Wed Mar 11 11:52:57 2009
+***************
+*** 0 ****
+--- 1,25 ----
++ 
++ Test for visual block shift and tab characters.
++ 
++ STARTTEST
++ :so small.vim
++ /^abcdefgh
++ 4jI    j<<11|D
++ 7|a		
++ 7|a		   
++ 7|a	       	4k13|4j<
++ :$-4,$w! test.out
++ :$-4,$s/\s\+//g
++ 4kI    j<<
++ 7|a		
++ 7|a					
++ 7|a	       		4k13|4j3<
++ :$-4,$w >> test.out
++ :qa!
++ ENDTEST
++ 
++ abcdefghijklmnopqrstuvwxyz
++ abcdefghijklmnopqrstuvwxyz
++ abcdefghijklmnopqrstuvwxyz
++ abcdefghijklmnopqrstuvwxyz
++ abcdefghijklmnopqrstuvwxyz
+*** ../vim-7.2.136/src/testdir/test66.ok	Wed Mar 11 16:24:44 2009
+--- src/testdir/test66.ok	Thu Mar  5 04:39:36 2009
+***************
+*** 0 ****
+--- 1,10 ----
++     abcdefghijklmnopqrstuvwxyz
++ abcdefghij
++     abc	    defghijklmnopqrstuvwxyz
++     abc	    defghijklmnopqrstuvwxyz
++     abc	    defghijklmnopqrstuvwxyz
++     abcdefghijklmnopqrstuvwxyz
++ abcdefghij
++     abc	    defghijklmnopqrstuvwxyz
++     abc		defghijklmnopqrstuvwxyz
++     abc	    defghijklmnopqrstuvwxyz
+*** ../vim-7.2.136/src/version.c	Wed Mar 11 15:36:01 2009
+--- src/version.c	Wed Mar 11 16:23:07 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     137,
+  /**/
+
+-- 
+% cat /usr/include/sys/errno.h
+#define	EPERM		1		/* Operation not permitted */
+#define	ENOENT		2		/* No such file or directory */
+#define	ESRCH		3		/* No such process */
+[...]
+#define EMACS		666		/* Too many macros */
+%
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.138 b/source/ap/vim/patches/7.2.138
new file mode 100644
index 000000000..faa7e7a63
--- /dev/null
+++ b/source/ap/vim/patches/7.2.138
@@ -0,0 +1,160 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.138 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.138 (extra part of 7.2.137)
+Problem:    See 7.2.137.
+Solution:   See 7.2.137.
+Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
+	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
+	    src/testdir/Make_vms.mms
+
+
+*** ../vim-7.2.137/src/testdir/Make_amiga.mak	Tue Jun 24 23:46:42 2008
+--- src/testdir/Make_amiga.mak	Thu Mar  5 04:49:38 2009
+***************
+*** 25,31 ****
+  		test43.out test44.out test45.out test46.out test47.out \
+  		test48.out test51.out test53.out test54.out test55.out \
+  		test56.out test57.out test58.out test59.out test60.out \
+! 		test61.out test62.out test63.out test64.out test65.out
+  
+  .SUFFIXES: .in .out
+  
+--- 25,32 ----
+  		test43.out test44.out test45.out test46.out test47.out \
+  		test48.out test51.out test53.out test54.out test55.out \
+  		test56.out test57.out test58.out test59.out test60.out \
+! 		test61.out test62.out test63.out test64.out test65.out \
+! 		test66.out
+  
+  .SUFFIXES: .in .out
+  
+***************
+*** 110,112 ****
+--- 111,114 ----
+  test63.out: test63.in
+  test64.out: test64.in
+  test65.out: test65.in
++ test66.out: test66.in
+*** ../vim-7.2.137/src/testdir/Make_dos.mak	Tue Jun 24 23:39:51 2008
+--- src/testdir/Make_dos.mak	Thu Mar  5 04:52:47 2009
+***************
+*** 26,32 ****
+  		test15.out test17.out test18.out test21.out test26.out \
+  		test30.out test31.out test32.out test33.out test34.out \
+  		test37.out test38.out test39.out test40.out test41.out \
+! 		test42.out test52.out test65.out
+  
+  SCRIPTS32 =	test50.out
+  
+--- 26,32 ----
+  		test15.out test17.out test18.out test21.out test26.out \
+  		test30.out test31.out test32.out test33.out test34.out \
+  		test37.out test38.out test39.out test40.out test41.out \
+! 		test42.out test52.out test65.out test66.out
+  
+  SCRIPTS32 =	test50.out
+  
+*** ../vim-7.2.137/src/testdir/Make_ming.mak	Sat Sep 20 16:26:10 2008
+--- src/testdir/Make_ming.mak	Thu Mar  5 04:53:16 2009
+***************
+*** 45,51 ****
+  		test15.out test17.out test18.out test21.out test26.out \
+  		test30.out test31.out test32.out test33.out test34.out \
+  		test37.out test38.out test39.out test40.out test41.out \
+! 		test42.out test52.out test65.out
+  
+  SCRIPTS32 =	test50.out
+  
+--- 45,51 ----
+  		test15.out test17.out test18.out test21.out test26.out \
+  		test30.out test31.out test32.out test33.out test34.out \
+  		test37.out test38.out test39.out test40.out test41.out \
+! 		test42.out test52.out test65.out test66.out
+  
+  SCRIPTS32 =	test50.out
+  
+*** ../vim-7.2.137/src/testdir/Make_os2.mak	Tue Jun 24 22:37:41 2008
+--- src/testdir/Make_os2.mak	Thu Mar  5 04:53:31 2009
+***************
+*** 25,31 ****
+  		test43.out test44.out test45.out test46.out test47.out \
+  		test48.out test51.out test53.out test54.out test55.out \
+  		test56.out test57.out test58.out test59.out test60.out \
+! 		test61.out test62.out test63.out test64.out test65.out
+  
+  .SUFFIXES: .in .out
+  
+--- 25,32 ----
+  		test43.out test44.out test45.out test46.out test47.out \
+  		test48.out test51.out test53.out test54.out test55.out \
+  		test56.out test57.out test58.out test59.out test60.out \
+! 		test61.out test62.out test63.out test64.out test65.out \
+! 		test66.out
+  
+  .SUFFIXES: .in .out
+  
+*** ../vim-7.2.137/src/testdir/Make_vms.mms	Mon Sep  1 16:50:09 2008
+--- src/testdir/Make_vms.mms	Thu Mar  5 04:53:42 2009
+***************
+*** 4,10 ****
+  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
+  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
+  #
+! # Last change:  2008 Aug 19
+  #
+  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
+  # Edit the lines in the Configuration section below to select.
+--- 4,10 ----
+  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
+  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
+  #
+! # Last change:  2009 Mar 05
+  #
+  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
+  # Edit the lines in the Configuration section below to select.
+***************
+*** 68,74 ****
+  	 test43.out test44.out test45.out test46.out \
+  	 test48.out test51.out test53.out test54.out test55.out \
+  	 test56.out test57.out test60.out \
+! 	 test61.out test62.out test63.out test64.out test65.out
+  
+  .IFDEF WANT_GUI
+  SCRIPT_GUI = test16.out
+--- 68,75 ----
+  	 test43.out test44.out test45.out test46.out \
+  	 test48.out test51.out test53.out test54.out test55.out \
+  	 test56.out test57.out test60.out \
+! 	 test61.out test62.out test63.out test64.out test65.out \
+! 	 test66.out
+  
+  .IFDEF WANT_GUI
+  SCRIPT_GUI = test16.out
+*** ../vim-7.2.137/src/version.c	Wed Mar 11 16:26:01 2009
+--- src/version.c	Wed Mar 11 16:35:06 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     138,
+  /**/
+
+-- 
+Some of the well know MS-Windows errors:
+	ESLEEP		Operator fell asleep
+	ENOERR		No error yet
+	EDOLLAR		OS too expensive
+	EWINDOWS	MS-Windows loaded, system in danger
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.139 b/source/ap/vim/patches/7.2.139
new file mode 100644
index 000000000..3366acb72
--- /dev/null
+++ b/source/ap/vim/patches/7.2.139
@@ -0,0 +1,79 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.139
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.139
+Problem:    Crash when 'virtualedit' is "all". (James Vega)
+Solution:   Avoid overflow when column is MAXCOL. (Dominique Pelle)
+Files:	    src/misc2.c
+
+
+*** ../vim-7.2.138/src/misc2.c	Tue Feb 24 04:28:40 2009
+--- src/misc2.c	Wed Mar 11 16:45:05 2009
+***************
+*** 496,502 ****
+  {
+      colnr_T len;
+  #ifdef FEAT_VIRTUALEDIT
+!     colnr_T oldcol = curwin->w_cursor.col + curwin->w_cursor.coladd;
+  #endif
+  
+      len = (colnr_T)STRLEN(ml_get_curline());
+--- 496,503 ----
+  {
+      colnr_T len;
+  #ifdef FEAT_VIRTUALEDIT
+!     colnr_T oldcol = curwin->w_cursor.col;
+!     colnr_T oldcoladd = curwin->w_cursor.col + curwin->w_cursor.coladd;
+  #endif
+  
+      len = (colnr_T)STRLEN(ml_get_curline());
+***************
+*** 535,541 ****
+      if (oldcol == MAXCOL)
+  	curwin->w_cursor.coladd = 0;
+      else if (ve_flags == VE_ALL)
+! 	curwin->w_cursor.coladd = oldcol - curwin->w_cursor.col;
+  #endif
+  }
+  
+--- 536,548 ----
+      if (oldcol == MAXCOL)
+  	curwin->w_cursor.coladd = 0;
+      else if (ve_flags == VE_ALL)
+!     {
+! 	if (oldcoladd > curwin->w_cursor.col)
+! 	    curwin->w_cursor.coladd = oldcoladd - curwin->w_cursor.col;
+! 	else
+! 	    /* avoid weird number when there is a miscalculation or overflow */
+! 	    curwin->w_cursor.coladd = 0;
+!     }
+  #endif
+  }
+  
+*** ../vim-7.2.138/src/version.c	Wed Mar 11 16:36:04 2009
+--- src/version.c	Wed Mar 11 17:26:50 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     139,
+  /**/
+
+-- 
+Some of the well know MS-Windows errors:
+	EHUH		Unexpected error
+	EUSER		User error, not our fault!
+	EGOD		Horrible problem, god knows what has happened
+	EERR		Errornous error: nothing wrong
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.140 b/source/ap/vim/patches/7.2.140
new file mode 100644
index 000000000..98c127966
--- /dev/null
+++ b/source/ap/vim/patches/7.2.140
@@ -0,0 +1,58 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.140
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.140
+Problem:    Diff highlighting isn't displayed before the Visual area if it
+	    starts at the cursor position. (Markus Heidelberg)
+Solution:   Also check fromcol_prev.
+Files:	    src/screen.c
+
+
+*** ../vim-7.2.139/src/screen.c	Sun Feb 22 21:12:22 2009
+--- src/screen.c	Wed Mar 11 13:59:24 2009
+***************
+*** 3555,3561 ****
+  		/* Use line_attr when not in the Visual or 'incsearch' area
+  		 * (area_attr may be 0 when "noinvcur" is set). */
+  	    else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)
+! 					|| (vcol < fromcol || vcol >= tocol)))
+  		char_attr = line_attr;
+  #endif
+  	    else
+--- 3555,3562 ----
+  		/* Use line_attr when not in the Visual or 'incsearch' area
+  		 * (area_attr may be 0 when "noinvcur" is set). */
+  	    else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)
+! 				|| vcol < fromcol || vcol_prev < fromcol_prev
+! 				|| vcol >= tocol))
+  		char_attr = line_attr;
+  #endif
+  	    else
+*** ../vim-7.2.139/src/version.c	Wed Mar 11 17:27:46 2009
+--- src/version.c	Wed Mar 11 17:42:19 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     140,
+  /**/
+
+-- 
+Some of the well know MS-Windows errors:
+	EMEMORY		Memory error caused by..., eh...
+	ELICENSE	Your license has expired, give us more money!
+	EMOUSE		Mouse moved, reinstall Windows
+	EILLEGAL	Illegal error, you are not allowed to see this
+	EVIRUS		Undetectable virus found
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.141 b/source/ap/vim/patches/7.2.141
new file mode 100644
index 000000000..395d210de
--- /dev/null
+++ b/source/ap/vim/patches/7.2.141
@@ -0,0 +1,239 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.141
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.141
+Problem:    When redrawing a character for bold spill this causes the next
+	    character to be redrawn as well.
+Solution:   Only redraw one extra character. (Yukihiro Nakadaira)
+Files:	    src/screen.c
+
+
+*** ../vim-7.2.140/src/screen.c	Wed Mar 11 17:44:38 2009
+--- src/screen.c	Wed Mar 11 13:59:24 2009
+***************
+*** 5132,5139 ****
+  #endif
+  
+  #if defined(FEAT_GUI) || defined(UNIX)
+! 	    /* The bold trick makes a single row of pixels appear in the next
+! 	     * character.  When a bold character is removed, the next
+  	     * character should be redrawn too.  This happens for our own GUI
+  	     * and for some xterms. */
+  	    if (
+--- 5132,5139 ----
+  #endif
+  
+  #if defined(FEAT_GUI) || defined(UNIX)
+! 	    /* The bold trick makes a single column of pixels appear in the
+! 	     * next character.  When a bold character is removed, the next
+  	     * character should be redrawn too.  This happens for our own GUI
+  	     * and for some xterms. */
+  	    if (
+***************
+*** 6276,6284 ****
+--- 6276,6290 ----
+      int		pcc[MAX_MCO];
+  # endif
+  #endif
++ #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX)
++     int		force_redraw_this;
++     int		force_redraw_next = FALSE;
++ #endif
++     int		need_redraw;
+  
+      if (ScreenLines == NULL || row >= screen_Rows)	/* safety check */
+  	return;
++     off = LineOffset[row] + col;
+  
+  #ifdef FEAT_MBYTE
+      /* When drawing over the right halve of a double-wide char clear out the
+***************
+*** 6288,6297 ****
+  	    && !gui.in_use
+  # endif
+  	    && mb_fix_col(col, row) != col)
+! 	screen_puts_len((char_u *)" ", 1, row, col - 1, 0);
+  #endif
+  
+-     off = LineOffset[row] + col;
+  #ifdef FEAT_MBYTE
+      max_off = LineOffset[row] + screen_Columns;
+  #endif
+--- 6294,6314 ----
+  	    && !gui.in_use
+  # endif
+  	    && mb_fix_col(col, row) != col)
+!     {
+! 	ScreenLines[off - 1] = ' ';
+! 	ScreenAttrs[off - 1] = 0;
+! 	if (enc_utf8)
+! 	{
+! 	    ScreenLinesUC[off - 1] = 0;
+! 	    ScreenLinesC[0][off - 1] = 0;
+! 	}
+! 	/* redraw the previous cell, make it empty */
+! 	screen_char(off - 1, row, col - 1);
+! 	/* force the cell at "col" to be redrawn */
+! 	force_redraw_next = TRUE;
+!     }
+  #endif
+  
+  #ifdef FEAT_MBYTE
+      max_off = LineOffset[row] + screen_Columns;
+  #endif
+***************
+*** 6355,6361 ****
+  	}
+  #endif
+  
+! 	if (ScreenLines[off] != c
+  #ifdef FEAT_MBYTE
+  		|| (mbyte_cells == 2
+  		    && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0))
+--- 6372,6383 ----
+  	}
+  #endif
+  
+! #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX)
+! 	force_redraw_this = force_redraw_next;
+! 	force_redraw_next = FALSE;
+! #endif
+! 
+! 	need_redraw = ScreenLines[off] != c
+  #ifdef FEAT_MBYTE
+  		|| (mbyte_cells == 2
+  		    && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0))
+***************
+*** 6367,6386 ****
+  			|| screen_comp_differs(off, u8cc)))
+  #endif
+  		|| ScreenAttrs[off] != attr
+! 		|| exmode_active
+  		)
+  	{
+  #if defined(FEAT_GUI) || defined(UNIX)
+  	    /* The bold trick makes a single row of pixels appear in the next
+  	     * character.  When a bold character is removed, the next
+  	     * character should be redrawn too.  This happens for our own GUI
+! 	     * and for some xterms.
+! 	     * Force the redraw by setting the attribute to a different value
+! 	     * than "attr", the contents of ScreenLines[] may be needed by
+! 	     * mb_off2cells() further on.
+! 	     * Don't do this for the last drawn character, because the next
+! 	     * character may not be redrawn. */
+! 	    if (
+  # ifdef FEAT_GUI
+  		    gui.in_use
+  # endif
+--- 6389,6408 ----
+  			|| screen_comp_differs(off, u8cc)))
+  #endif
+  		|| ScreenAttrs[off] != attr
+! 		|| exmode_active;
+! 
+! 	if (need_redraw
+! #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX)
+! 		|| force_redraw_this
+! #endif
+  		)
+  	{
+  #if defined(FEAT_GUI) || defined(UNIX)
+  	    /* The bold trick makes a single row of pixels appear in the next
+  	     * character.  When a bold character is removed, the next
+  	     * character should be redrawn too.  This happens for our own GUI
+! 	     * and for some xterms. */
+! 	    if (need_redraw && ScreenLines[off] != ' ' && (
+  # ifdef FEAT_GUI
+  		    gui.in_use
+  # endif
+***************
+*** 6390,6412 ****
+  # ifdef UNIX
+  		    term_is_xterm
+  # endif
+! 	       )
+  	    {
+! 		int		n;
+  
+! 		n = ScreenAttrs[off];
+! # ifdef FEAT_MBYTE
+! 		if (col + mbyte_cells < screen_Columns
+! 			&& (n > HL_ALL || (n & HL_BOLD))
+! 			&& (len < 0 ? ptr[mbyte_blen] != NUL
+! 					     : ptr + mbyte_blen < text + len))
+! 		    ScreenAttrs[off + mbyte_cells] = attr + 1;
+! # else
+! 		if (col + 1 < screen_Columns
+! 			&& (n > HL_ALL || (n & HL_BOLD))
+! 			&& (len < 0 ? ptr[1] != NUL : ptr + 1 < text + len))
+! 		    ScreenLines[off + 1] = 0;
+! # endif
+  	    }
+  #endif
+  #ifdef FEAT_MBYTE
+--- 6412,6425 ----
+  # ifdef UNIX
+  		    term_is_xterm
+  # endif
+! 		    ))
+  	    {
+! 		int	n = ScreenAttrs[off];
+  
+! 		if (n > HL_ALL)
+! 		    n = syn_attr2attr(n);
+! 		if (n & HL_BOLD)
+! 		    force_redraw_next = TRUE;
+  	    }
+  #endif
+  #ifdef FEAT_MBYTE
+***************
+*** 6493,6498 ****
+--- 6506,6525 ----
+  	    ++ptr;
+  	}
+      }
++ 
++ #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX)
++     /* If we detected the next character needs to be redrawn, but the text
++      * doesn't extend up to there, update the character here. */
++     if (force_redraw_next && col < screen_Columns)
++     {
++ # ifdef FEAT_MBYTE
++ 	if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1)
++ 	    screen_char_2(off, row, col);
++ 	else
++ # endif
++ 	    screen_char(off, row, col);
++     }
++ #endif
+  }
+  
+  #ifdef FEAT_SEARCH_EXTRA
+*** ../vim-7.2.140/src/version.c	Wed Mar 11 17:44:38 2009
+--- src/version.c	Wed Mar 11 17:55:22 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     141,
+  /**/
+
+-- 
+Some of the well know MS-Windows errors:
+	ETIME		Wrong time, wait a little while
+	ECRASH		Try again...
+	EDETECT		Unable to detect errors
+	EOVER		You lost!  Play another game?
+	ENOCLUE		Eh, what did you want?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.142 b/source/ap/vim/patches/7.2.142
new file mode 100644
index 000000000..adfaab615
--- /dev/null
+++ b/source/ap/vim/patches/7.2.142
@@ -0,0 +1,61 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.142
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.142
+Problem:    Motif and Athena balloons don't use tooltip colors.
+Solution:   Set the colors. (Matt Wozniski)
+Files:	    src/gui_beval.c
+
+
+*** ../vim-7.2.141/src/gui_beval.c	Thu May 10 21:29:20 2007
+--- src/gui_beval.c	Wed Mar 11 15:20:36 2009
+***************
+*** 1291,1296 ****
+--- 1291,1313 ----
+  		XtNy, ty,
+  		NULL);
+  #endif
++ 	/* Set tooltip colors */
++ 	{
++ 	    Arg args[2];
++ 
++ #ifdef FEAT_GUI_MOTIF
++ 	    args[0].name = XmNbackground;
++ 	    args[0].value = gui.tooltip_bg_pixel;
++ 	    args[1].name = XmNforeground;
++ 	    args[1].value = gui.tooltip_fg_pixel;
++ #else /* Athena */
++ 	    args[0].name = XtNbackground;
++ 	    args[0].value = gui.tooltip_bg_pixel;
++ 	    args[1].name = XtNforeground;
++ 	    args[1].value = gui.tooltip_fg_pixel;
++ #endif
++ 	    XtSetValues(beval->balloonLabel, &args[0], XtNumber(args));
++ 	}
+  
+  	XtPopup(beval->balloonShell, XtGrabNone);
+  
+*** ../vim-7.2.141/src/version.c	Wed Mar 11 17:57:05 2009
+--- src/version.c	Wed Mar 18 12:20:01 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     142,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+233. You start dreaming about web pages...in html.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.143 b/source/ap/vim/patches/7.2.143
new file mode 100644
index 000000000..905f15995
--- /dev/null
+++ b/source/ap/vim/patches/7.2.143
@@ -0,0 +1,234 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.143
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.143
+Problem:    No command line completion for ":cscope" command.
+Solution:   Add the completion for ":cscope". (Dominique Pelle)
+Files:	    src/ex_docmd.c, src/ex_getln.c, src/if_cscope.c,
+	    src/proto/if_cscope.pro, src/vim.h
+
+
+*** ../vim-7.2.142/src/ex_docmd.c	Wed Mar 11 15:36:01 2009
+--- src/ex_docmd.c	Wed Mar 11 15:45:04 2009
+***************
+*** 3683,3688 ****
+--- 3683,3693 ----
+  	case CMD_highlight:
+  	    set_context_in_highlight_cmd(xp, arg);
+  	    break;
++ #ifdef FEAT_CSCOPE
++ 	case CMD_cscope:
++ 	    set_context_in_cscope_cmd(xp, arg);
++ 	    break;
++ #endif
+  #ifdef FEAT_LISTCMDS
+  	case CMD_bdelete:
+  	case CMD_bwipeout:
+***************
+*** 5187,5192 ****
+--- 5192,5200 ----
+      {EXPAND_AUGROUP, "augroup"},
+      {EXPAND_BUFFERS, "buffer"},
+      {EXPAND_COMMANDS, "command"},
++ #if defined(FEAT_CSCOPE)
++     {EXPAND_CSCOPE, "cscope"},
++ #endif
+  #if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
+      {EXPAND_USER_DEFINED, "custom"},
+      {EXPAND_USER_LIST, "customlist"},
+*** ../vim-7.2.142/src/ex_getln.c	Thu Mar  5 03:13:51 2009
+--- src/ex_getln.c	Wed Mar 11 15:45:04 2009
+***************
+*** 4518,4523 ****
+--- 4518,4526 ----
+  	    {EXPAND_EVENTS, get_event_name, TRUE},
+  	    {EXPAND_AUGROUP, get_augroup_name, TRUE},
+  #endif
++ #ifdef FEAT_CSCOPE
++ 	    {EXPAND_CSCOPE, get_cscope_name, TRUE},
++ #endif
+  #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
+  	&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
+  	    {EXPAND_LANGUAGE, get_lang_arg, TRUE},
+*** ../vim-7.2.142/src/if_cscope.c	Wed Jan 28 16:03:51 2009
+--- src/if_cscope.c	Wed Mar 11 15:56:07 2009
+***************
+*** 93,104 ****
+      (void)EMSG2(_("E560: Usage: cs[cope] %s"), cs_cmds[(int)x].usage);
+  }
+  
+  /*
+   * PRIVATE: do_cscope_general
+   *
+!  * find the command, print help if invalid, and the then call the
+!  * corresponding command function,
+!  * called from do_cscope and do_scscope
+   */
+      static void
+  do_cscope_general(eap, make_split)
+--- 93,209 ----
+      (void)EMSG2(_("E560: Usage: cs[cope] %s"), cs_cmds[(int)x].usage);
+  }
+  
++ #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
++ 
++ static enum
++ {
++     EXP_CSCOPE_SUBCMD,	/* expand ":cscope" sub-commands */
++     EXP_CSCOPE_FIND,	/* expand ":cscope find" arguments */
++     EXP_CSCOPE_KILL	/* expand ":cscope kill" arguments */
++ } expand_what;
++ 
++ /*
++  * Function given to ExpandGeneric() to obtain the cscope command
++  * expansion.
++  */
++ /*ARGSUSED*/
++     char_u *
++ get_cscope_name(xp, idx)
++     expand_T	*xp;
++     int		idx;
++ {
++     switch (expand_what)
++     {
++     case EXP_CSCOPE_SUBCMD:
++ 	/* Complete with sub-commands of ":cscope":
++ 	 * add, find, help, kill, reset, show */
++ 	return (char_u *)cs_cmds[idx].name;
++     case EXP_CSCOPE_FIND:
++ 	{
++ 	    const char *query_type[] =
++ 	    {
++ 		"c", "d", "e", "f", "g", "i", "s", "t", NULL
++ 	    };
++ 
++ 	    /* Complete with query type of ":cscope find {query_type}".
++ 	     * {query_type} can be letters (c, d, ... t) or numbers (0, 1,
++ 	     * ..., 8) but only complete with letters, since numbers are
++ 	     * redundant. */
++ 	    return (char_u *)query_type[idx];
++ 	}
++     case EXP_CSCOPE_KILL:
++ 	{
++ 	    int			i;
++ 	    int			current_idx = 0;
++ 	    static char_u	connection[2];
++ 
++ 	    /* ":cscope kill" accepts connection numbers or partial names of
++ 	     * the pathname of the cscope database as argument.  Only complete
++ 	     * with connection numbers. -1 can also be used to kill all
++ 	     * connections. */
++ 	    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++ 	    {
++ 		if (csinfo[i].fname == NULL)
++ 		    continue;
++ 		if (current_idx++ == idx)
++ 		{
++ 		    /* Connection number fits in one character since
++ 		     * CSCOPE_MAX_CONNECTIONS is < 10 */
++ 		    connection[0] = i + '0';
++ 		    connection[1] = NUL;
++ 		    return connection;
++ 		}
++ 	    }
++ 	    return (current_idx == idx && idx > 0) ? (char_u *)"-1" : NULL;
++ 	}
++     default:
++ 	return NULL;
++     }
++ }
++ 
++ /*
++  * Handle command line completion for :cscope command.
++  */
++     void
++ set_context_in_cscope_cmd(xp, arg)
++     expand_T	*xp;
++     char_u	*arg;
++ {
++     char_u	*p;
++ 
++     /* Default: expand subcommands */
++     xp->xp_context = EXPAND_CSCOPE;
++     expand_what = EXP_CSCOPE_SUBCMD;
++     xp->xp_pattern = arg;
++ 
++     /* (part of) subcommand already typed */
++     if (*arg != NUL)
++     {
++ 	p = skiptowhite(arg);
++ 	if (*p != NUL)		    /* past first word */
++ 	{
++ 	    xp->xp_pattern = skipwhite(p);
++ 	    if (*skiptowhite(xp->xp_pattern) != NUL)
++ 		xp->xp_context = EXPAND_NOTHING;
++ 	    else if (STRNICMP(arg, "add", p - arg) == 0)
++ 		xp->xp_context = EXPAND_FILES;
++ 	    else if (STRNICMP(arg, "kill", p - arg) == 0)
++ 		expand_what = EXP_CSCOPE_KILL;
++ 	    else if (STRNICMP(arg, "find", p - arg) == 0)
++ 		expand_what = EXP_CSCOPE_FIND;
++ 	    else
++ 		xp->xp_context = EXPAND_NOTHING;
++ 	}
++     }
++ }
++ 
++ #endif /* FEAT_CMDL_COMPL */
++ 
+  /*
+   * PRIVATE: do_cscope_general
+   *
+!  * Find the command, print help if invalid, and then call the corresponding
+!  * command function.
+   */
+      static void
+  do_cscope_general(eap, make_split)
+*** ../vim-7.2.142/src/proto/if_cscope.pro	Thu Sep  6 17:38:21 2007
+--- src/proto/if_cscope.pro	Wed Mar 11 15:57:03 2009
+***************
+*** 1,4 ****
+--- 1,6 ----
+  /* if_cscope.c */
++ char_u *get_cscope_name __ARGS((expand_T *xp, int idx));
++ void set_context_in_cscope_cmd __ARGS((expand_T *xp, char_u *arg));
+  void do_cscope __ARGS((exarg_T *eap));
+  void do_scscope __ARGS((exarg_T *eap));
+  void do_cstag __ARGS((exarg_T *eap));
+*** ../vim-7.2.142/src/vim.h	Sun Feb 22 02:36:36 2009
+--- src/vim.h	Wed Mar 11 15:45:04 2009
+***************
+*** 708,713 ****
+--- 708,714 ----
+  #define EXPAND_USER_DEFINED	30
+  #define EXPAND_USER_LIST	31
+  #define EXPAND_SHELLCMD		32
++ #define EXPAND_CSCOPE		33
+  
+  /* Values for exmode_active (0 is no exmode) */
+  #define EXMODE_NORMAL		1
+*** ../vim-7.2.142/src/version.c	Wed Mar 18 12:20:35 2009
+--- src/version.c	Wed Mar 18 12:48:08 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     143,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+234. You started college as a chemistry major, and walk out four years
+     later as an Internet provider.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.144 b/source/ap/vim/patches/7.2.144
new file mode 100644
index 000000000..3a219bd4b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.144
@@ -0,0 +1,78 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.144
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.144
+Problem:    When 't_Co' is set to the value it already had the color scheme is
+            reloaded anyway.
+Solution:   Only load the colorscheme when the t_Co value changes. (Dominique
+            Pelle)
+Files:      src/option.c
+
+
+*** ../vim-7.2.143/src/option.c	Wed Mar  4 04:11:56 2009
+--- src/option.c	Wed Mar 18 12:00:28 2009
+***************
+*** 6022,6036 ****
+  	/* ":set t_Co=0" and ":set t_Co=1" do ":set t_Co=" */
+  	if (varp == &T_CCO)
+  	{
+! 	    t_colors = atoi((char *)T_CCO);
+! 	    if (t_colors <= 1)
+  	    {
+! 		if (new_value_alloced)
+! 		    vim_free(T_CCO);
+! 		T_CCO = empty_option;
+  	    }
+- 	    /* We now have a different color setup, initialize it again. */
+- 	    init_highlight(TRUE, FALSE);
+  	}
+  	ttest(FALSE);
+  	if (varp == &T_ME)
+--- 6022,6044 ----
+  	/* ":set t_Co=0" and ":set t_Co=1" do ":set t_Co=" */
+  	if (varp == &T_CCO)
+  	{
+! 	    int colors = atoi((char *)T_CCO);
+! 
+! 	    /* Only reinitialize colors if t_Co value has really changed to
+! 	     * avoid expensive reload of colorscheme if t_Co is set to the
+! 	     * same value multiple times. */
+! 	    if (colors != t_colors)
+  	    {
+! 		t_colors = colors;
+! 		if (t_colors <= 1)
+! 		{
+! 		    if (new_value_alloced)
+! 			vim_free(T_CCO);
+! 		    T_CCO = empty_option;
+! 		}
+! 		/* We now have a different color setup, initialize it again. */
+! 		init_highlight(TRUE, FALSE);
+  	    }
+  	}
+  	ttest(FALSE);
+  	if (varp == &T_ME)
+*** ../vim-7.2.143/src/version.c	Wed Mar 18 12:50:58 2009
+--- src/version.c	Wed Mar 18 14:16:48 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     144,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+235. You start naming your kids Pascal, COBOL, Algol and Fortran.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.145 b/source/ap/vim/patches/7.2.145
new file mode 100644
index 000000000..0f328170f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.145
@@ -0,0 +1,125 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.145
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.145
+Problem:    White space in ":cscope find" is not ignored.
+Solution:   Ignore the white space, but not when the leading white space is
+	    useful for the argument.
+Files:	    runtime/doc/if_cscop.txt, src/if_cscope.c
+
+
+*** ../vim-7.2.144/runtime/doc/if_cscop.txt	Sat Aug  9 19:36:48 2008
+--- runtime/doc/if_cscop.txt	Wed Mar 18 14:30:09 2009
+***************
+*** 1,4 ****
+! *if_cscop.txt*  For Vim version 7.2.  Last change: 2005 Mar 29
+  
+  
+  		  VIM REFERENCE MANUAL    by Andy Kahn
+--- 1,4 ----
+! *if_cscop.txt*  For Vim version 7.2.  Last change: 2009 Mar 18
+  
+  
+  		  VIM REFERENCE MANUAL    by Andy Kahn
+***************
+*** 131,141 ****
+  		7 or f: Find this file
+  		8 or i: Find files #including this file
+  
+  	EXAMPLES >
+  	    :cscope find c vim_free
+! 	    :cscope find 3 vim_free
+  <
+! 	    These two examples perform the same query. >
+  
+  	    :cscope find 0 DEFAULT_TERM
+  <
+--- 131,152 ----
+  		7 or f: Find this file
+  		8 or i: Find files #including this file
+  
++ 	For all types, except 4 and 6, leading white space for {name} is
++ 	removed.  For 4 and 6 there is exactly one space between {querytype}
++ 	and {name}.  Further white space is included in {name}.
++ 
+  	EXAMPLES >
+  	    :cscope find c vim_free
+! 	    :cscope find 3  vim_free
+! <
+! 	    These two examples perform the same query: functions calling
+! 	    "vim_free". >
+! 
+! 	    :cscope find t initOnce
+! 	    :cscope find t  initOnce
+  <
+! 	    The first one searches for the text "initOnce", the second one for
+! 	    " initOnce". >
+  
+  	    :cscope find 0 DEFAULT_TERM
+  <
+*** ../vim-7.2.144/src/if_cscope.c	Wed Mar 18 12:50:58 2009
+--- src/if_cscope.c	Wed Mar 18 13:23:53 2009
+***************
+*** 764,769 ****
+--- 764,770 ----
+  {
+      char *cmd;
+      short search;
++     char *pat;
+  
+      switch (csoption[0])
+      {
+***************
+*** 797,806 ****
+  	return NULL;
+      }
+  
+!     if ((cmd = (char *)alloc((unsigned)(strlen(pattern) + 2))) == NULL)
+  	return NULL;
+  
+!     (void)sprintf(cmd, "%d%s", search, pattern);
+  
+      return cmd;
+  } /* cs_create_cmd */
+--- 798,814 ----
+  	return NULL;
+      }
+  
+!     /* Skip white space before the patter, except for text and pattern search,
+!      * they may want to use the leading white space. */
+!     pat = pattern;
+!     if (search != 4 && search != 6)
+! 	while vim_iswhite(*pat)
+! 	    ++pat;
+! 
+!     if ((cmd = (char *)alloc((unsigned)(strlen(pat) + 2))) == NULL)
+  	return NULL;
+  
+!     (void)sprintf(cmd, "%d%s", search, pat);
+  
+      return cmd;
+  } /* cs_create_cmd */
+*** ../vim-7.2.144/src/version.c	Wed Mar 18 14:19:28 2009
+--- src/version.c	Wed Mar 18 14:28:46 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     145,
+  /**/
+
+-- 
+Google is kind of like Dr. Who's Tardis; it's weirder on the
+inside than on the outside...
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.146 b/source/ap/vim/patches/7.2.146
new file mode 100644
index 000000000..96852fbef
--- /dev/null
+++ b/source/ap/vim/patches/7.2.146
@@ -0,0 +1,110 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.146
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.146
+Problem:    v:warningmsg isn't used for all warnings.
+Solution:   Set v:warningmsg for relevant warnings. (Ingo Karkat)
+Files:	    src/fileio.c, src/misc1.c, src/option.c
+
+
+*** ../vim-7.2.145/src/fileio.c	Wed Mar 11 13:09:30 2009
+--- src/fileio.c	Wed Mar 18 15:03:46 2009
+***************
+*** 6647,6652 ****
+--- 6647,6657 ----
+  	    tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg)
+  							+ STRLEN(mesg2) + 2));
+  	    sprintf((char *)tbuf, mesg, path);
++ #ifdef FEAT_EVAL
++ 	    /* Set warningmsg here, before the unimportant and output-specific
++ 	     * mesg2 has been appended. */
++ 	    set_vim_var_string(VV_WARNINGMSG, tbuf, -1);
++ #endif
+  #if defined(FEAT_CON_DIALOG) || defined(FEAT_GUI_DIALOG)
+  	    if (can_reload)
+  	    {
+*** ../vim-7.2.145/src/misc1.c	Thu Nov 20 17:09:09 2008
+--- src/misc1.c	Wed Mar 18 15:06:59 2009
+***************
+*** 2955,2960 ****
+--- 2955,2962 ----
+      int	    col;		/* column for message; non-zero when in insert
+  				   mode and 'showmode' is on */
+  {
++     static char *w_readonly = N_("W10: Warning: Changing a readonly file");
++ 
+      if (curbuf->b_did_warn == FALSE
+  	    && curbufIsChanged() == 0
+  #ifdef FEAT_AUTOCMD
+***************
+*** 2977,2984 ****
+  	if (msg_row == Rows - 1)
+  	    msg_col = col;
+  	msg_source(hl_attr(HLF_W));
+! 	MSG_PUTS_ATTR(_("W10: Warning: Changing a readonly file"),
+! 						   hl_attr(HLF_W) | MSG_HIST);
+  	msg_clr_eos();
+  	(void)msg_end();
+  	if (msg_silent == 0 && !silent_mode)
+--- 2979,2988 ----
+  	if (msg_row == Rows - 1)
+  	    msg_col = col;
+  	msg_source(hl_attr(HLF_W));
+! 	MSG_PUTS_ATTR(_(w_readonly), hl_attr(HLF_W) | MSG_HIST);
+! #ifdef FEAT_EVAL
+! 	set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_readonly), -1);
+! #endif
+  	msg_clr_eos();
+  	(void)msg_end();
+  	if (msg_silent == 0 && !silent_mode)
+*** ../vim-7.2.145/src/option.c	Wed Mar 18 14:19:28 2009
+--- src/option.c	Wed Mar 18 15:06:11 2009
+***************
+*** 7563,7571 ****
+  	     * set. */
+  	    if (STRCMP(p_enc, "utf-8") != 0)
+  	    {
+  		msg_source(hl_attr(HLF_W));
+! 		MSG_ATTR(_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"),
+! 			hl_attr(HLF_W));
+  	    }
+  
+  # ifdef FEAT_MBYTE
+--- 7563,7575 ----
+  	     * set. */
+  	    if (STRCMP(p_enc, "utf-8") != 0)
+  	    {
++ 		static char *w_arabic = N_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'");
++ 
+  		msg_source(hl_attr(HLF_W));
+! 		MSG_ATTR(_(w_arabic), hl_attr(HLF_W));
+! #ifdef FEAT_EVAL
+! 		set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_arabic), -1);
+! #endif
+  	    }
+  
+  # ifdef FEAT_MBYTE
+*** ../vim-7.2.145/src/version.c	Wed Mar 18 14:30:46 2009
+--- src/version.c	Wed Mar 18 15:38:27 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     146,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+238. You think faxes are old-fashioned.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.147 b/source/ap/vim/patches/7.2.147
new file mode 100644
index 000000000..82a43eeaa
--- /dev/null
+++ b/source/ap/vim/patches/7.2.147
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.147
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.147
+Problem:    When compiled as small version and 'number' is on the cursor is
+	    displayed in the wrong position after a tab. (James Vega)
+Solution:   Don't increment vcol when still displaying the line number.
+Files:	    src/screen.c
+
+
+*** ../vim-7.2.146/src/screen.c	Wed Mar 11 17:57:05 2009
+--- src/screen.c	Wed Mar 18 16:18:00 2009
+***************
+*** 4665,4671 ****
+  	    --n_skip;
+  
+  	/* Only advance the "vcol" when after the 'number' column. */
+! 	if (draw_state >= WL_SBR
+  #ifdef FEAT_DIFF
+  		&& filler_todo <= 0
+  #endif
+--- 4665,4671 ----
+  	    --n_skip;
+  
+  	/* Only advance the "vcol" when after the 'number' column. */
+! 	if (draw_state > WL_NR
+  #ifdef FEAT_DIFF
+  		&& filler_todo <= 0
+  #endif
+*** ../vim-7.2.146/src/version.c	Wed Mar 18 15:40:03 2009
+--- src/version.c	Wed Mar 18 16:26:00 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     147,
+  /**/
+
+-- 
+You can tune a file system, but you can't tuna fish
+							-- man tunefs
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.148 b/source/ap/vim/patches/7.2.148
new file mode 100644
index 000000000..32504997c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.148
@@ -0,0 +1,145 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.148
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.148
+Problem:    When searching for "$" while 'hlsearch' is set, highlighting the
+	    character after the line does not work in the cursor column.
+	    Also highlighting for Visual mode after the line end when this
+	    isn't needed.  (Markus Heidelberg)
+Solution:   Only compare the cursor column in the cursor line.  Only highlight
+	    for Visual selection after the last character when it's needed to
+	    see where the Visual selection ends.
+Files:	    src/screen.c
+
+
+*** ../vim-7.2.147/src/screen.c	Wed Mar 18 16:26:31 2009
+--- src/screen.c	Wed Mar 18 17:24:56 2009
+***************
+*** 2889,2896 ****
+  	}
+  	else
+  	    tocol = MAXCOL;
+! 	if (fromcol == tocol)		/* do at least one character */
+! 	    tocol = fromcol + 1;	/* happens when past end of line */
+  	area_highlighting = TRUE;
+  	attr = hl_attr(HLF_I);
+      }
+--- 2889,2897 ----
+  	}
+  	else
+  	    tocol = MAXCOL;
+! 	/* do at least one character; happens when past end of line */
+! 	if (fromcol == tocol)
+! 	    tocol = fromcol + 1;
+  	area_highlighting = TRUE;
+  	attr = hl_attr(HLF_I);
+      }
+***************
+*** 4118,4123 ****
+--- 4119,4125 ----
+  # endif
+  				    (col < W_WIDTH(wp)))
+  				&& !(noinvcur
++ 				    && lnum == wp->w_cursor.lnum
+  				    && (colnr_T)vcol == wp->w_virtcol)))
+  			&& lcs_eol_one >= 0)
+  		{
+***************
+*** 4259,4265 ****
+  	 * preedit_changed and commit.  Thus Vim can't set "im_is_active", use
+  	 * im_is_preediting() here. */
+  	if (xic != NULL
+! 		&& lnum == curwin->w_cursor.lnum
+  		&& (State & INSERT)
+  		&& !p_imdisable
+  		&& im_is_preediting()
+--- 4261,4267 ----
+  	 * preedit_changed and commit.  Thus Vim can't set "im_is_active", use
+  	 * im_is_preediting() here. */
+  	if (xic != NULL
+! 		&& lnum == wp->w_cursor.lnum
+  		&& (State & INSERT)
+  		&& !p_imdisable
+  		&& im_is_preediting()
+***************
+*** 4268,4274 ****
+  	    colnr_T tcol;
+  
+  	    if (preedit_end_col == MAXCOL)
+! 		getvcol(curwin, &(curwin->w_cursor), &tcol, NULL, NULL);
+  	    else
+  		tcol = preedit_end_col;
+  	    if ((long)preedit_start_col <= vcol && vcol < (long)tcol)
+--- 4270,4276 ----
+  	    colnr_T tcol;
+  
+  	    if (preedit_end_col == MAXCOL)
+! 		getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL);
+  	    else
+  		tcol = preedit_end_col;
+  	    if ((long)preedit_start_col <= vcol && vcol < (long)tcol)
+***************
+*** 4365,4371 ****
+  	    }
+  #endif
+  	    if (lcs_eol == lcs_eol_one
+! 		    && ((area_attr != 0 && vcol == fromcol && c == NUL)
+  #ifdef FEAT_SEARCH_EXTRA
+  			/* highlight 'hlsearch' match at end of line */
+  			|| (prevcol_hl_flag == TRUE
+--- 4367,4379 ----
+  	    }
+  #endif
+  	    if (lcs_eol == lcs_eol_one
+! 		    && ((area_attr != 0 && vcol == fromcol
+! #ifdef FEAT_VISUAL
+! 			    && (VIsual_mode != Ctrl_V
+! 				|| lnum == VIsual.lnum
+! 				|| lnum == curwin->w_cursor.lnum)
+! #endif
+! 			    && c == NUL)
+  #ifdef FEAT_SEARCH_EXTRA
+  			/* highlight 'hlsearch' match at end of line */
+  			|| (prevcol_hl_flag == TRUE
+***************
+*** 4459,4465 ****
+  	if (c == NUL)
+  	{
+  #ifdef FEAT_SYN_HL
+! 	    if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol)
+  	    {
+  		/* highlight last char after line */
+  		--col;
+--- 4467,4474 ----
+  	if (c == NUL)
+  	{
+  #ifdef FEAT_SYN_HL
+! 	    if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol
+! 		    && lnum == wp->w_cursor.lnum)
+  	    {
+  		/* highlight last char after line */
+  		--col;
+*** ../vim-7.2.147/src/version.c	Wed Mar 18 16:26:31 2009
+--- src/version.c	Wed Mar 18 19:05:37 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     148,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+239. You think "surfing" is something you do on dry land.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.149 b/source/ap/vim/patches/7.2.149
new file mode 100644
index 000000000..7b51a571e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.149
@@ -0,0 +1,672 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.149
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.149
+Problem:    Using return value of function that doesn't return a value results
+	    in reading uninitialized memory.
+Solution:   Set the default to return zero.  Make cursor() return -1 on
+	    failure.  Let complete() return an empty string in case of an
+	    error.  (partly by Dominique Pelle)
+Files:	    runtime/doc/eval.txt, src/eval.c
+
+
+*** ../vim-7.2.148/runtime/doc/eval.txt	Tue Dec  9 10:56:50 2008
+--- runtime/doc/eval.txt	Sun Mar 22 14:28:49 2009
+***************
+*** 2414,2419 ****
+--- 2419,2425 ----
+  		When 'virtualedit' is used {off} specifies the offset in
+  		screen columns from the start of the character.  E.g., a
+  		position within a <Tab> or after the last character.
++ 		Returns 0 when the position could be set, -1 otherwise.
+  
+  
+  deepcopy({expr}[, {noref}])				*deepcopy()* *E698*
+***************
+*** 4516,4521 ****
+--- 4526,4532 ----
+  		should also work to move files across file systems.  The
+  		result is a Number, which is 0 if the file was renamed
+  		successfully, and non-zero when the renaming failed.
++ 		NOTE: If {to} exists it is overwritten without warning.
+  		This function is not available in the |sandbox|.
+  
+  repeat({expr}, {count})					*repeat()*
+*** ../vim-7.2.148/src/eval.c	Wed Feb  4 16:25:53 2009
+--- src/eval.c	Sun Mar 22 20:45:18 2009
+***************
+*** 1285,1291 ****
+--- 1285,1293 ----
+      typval_T	tv;
+      char_u	*retval;
+      garray_T	ga;
++ #ifdef FEAT_FLOAT
+      char_u	numbuf[NUMBUFLEN];
++ #endif
+  
+      if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
+  	retval = NULL;
+***************
+*** 8018,8024 ****
+      /* execute the function if no errors detected and executing */
+      if (evaluate && error == ERROR_NONE)
+      {
+! 	rettv->v_type = VAR_NUMBER;	/* default is number rettv */
+  	error = ERROR_UNKNOWN;
+  
+  	if (!builtin_function(fname))
+--- 8020,8027 ----
+      /* execute the function if no errors detected and executing */
+      if (evaluate && error == ERROR_NONE)
+      {
+! 	rettv->v_type = VAR_NUMBER;	/* default rettv is number zero */
+! 	rettv->vval.v_number = 0;
+  	error = ERROR_UNKNOWN;
+  
+  	if (!builtin_function(fname))
+***************
+*** 8268,8274 ****
+  		return;
+  	    li = l->lv_first;
+  	}
+- 	rettv->vval.v_number = 0;	/* Default: Success */
+  	for (;;)
+  	{
+  	    if (l == NULL)
+--- 8271,8276 ----
+***************
+*** 8728,8734 ****
+      int		dummy;
+      dict_T	*selfdict = NULL;
+  
+-     rettv->vval.v_number = 0;
+      if (argvars[1].v_type != VAR_LIST)
+      {
+  	EMSG(_(e_listreq));
+--- 8730,8735 ----
+***************
+*** 9036,9048 ****
+      if (buttons == NULL || *buttons == NUL)
+  	buttons = (char_u *)_("&Ok");
+  
+!     if (error)
+! 	rettv->vval.v_number = 0;
+!     else
+  	rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
+  								   def, NULL);
+- #else
+-     rettv->vval.v_number = 0;
+  #endif
+  }
+  
+--- 9037,9045 ----
+      if (buttons == NULL || *buttons == NUL)
+  	buttons = (char_u *)_("&Ok");
+  
+!     if (!error)
+  	rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
+  								   def, NULL);
+  #endif
+  }
+  
+***************
+*** 9181,9195 ****
+      }
+  
+      rettv->vval.v_number = cs_connection(num, dbpath, prepend);
+- #else
+-     rettv->vval.v_number = 0;
+  #endif
+  }
+  
+  /*
+   * "cursor(lnum, col)" function
+   *
+!  * Moves the cursor to the specified line and column
+   */
+  /*ARGSUSED*/
+      static void
+--- 9178,9191 ----
+      }
+  
+      rettv->vval.v_number = cs_connection(num, dbpath, prepend);
+  #endif
+  }
+  
+  /*
+   * "cursor(lnum, col)" function
+   *
+!  * Moves the cursor to the specified line and column.
+!  * Returns 0 when the position could be set, -1 otherwise.
+   */
+  /*ARGSUSED*/
+      static void
+***************
+*** 9202,9207 ****
+--- 9198,9204 ----
+      long	coladd = 0;
+  #endif
+  
++     rettv->vval.v_number = -1;
+      if (argvars[1].v_type == VAR_UNKNOWN)
+      {
+  	pos_T	    pos;
+***************
+*** 9246,9251 ****
+--- 9243,9249 ----
+  #endif
+  
+      curwin->w_set_curswant = TRUE;
++     rettv->vval.v_number = 0;
+  }
+  
+  /*
+***************
+*** 9291,9298 ****
+  {
+  #ifdef FEAT_AUTOCMD
+      rettv->vval.v_number = did_filetype;
+- #else
+-     rettv->vval.v_number = 0;
+  #endif
+  }
+  
+--- 9289,9294 ----
+***************
+*** 9605,9611 ****
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+-     rettv->vval.v_number = 0;
+      if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST)
+      {
+  	list_T		*l1, *l2;
+--- 9601,9606 ----
+***************
+*** 9733,9739 ****
+      if (check_secure())
+  	return;
+  
+-     rettv->vval.v_number = 0;
+      keys = get_tv_string(&argvars[0]);
+      if (*keys != NUL)
+      {
+--- 9728,9733 ----
+***************
+*** 9901,9907 ****
+      char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
+      int		save_did_emsg;
+  
+-     rettv->vval.v_number = 0;
+      if (argvars[0].v_type == VAR_LIST)
+      {
+  	if ((l = argvars[0].vval.v_list) == NULL
+--- 9895,9900 ----
+***************
+*** 10084,10091 ****
+  	else
+  	    rettv->vval.v_number = (varnumber_T)f;
+      }
+-     else
+- 	rettv->vval.v_number = 0;
+  }
+  
+  /*
+--- 10077,10082 ----
+***************
+*** 10219,10227 ****
+      lnum = get_tv_lnum(argvars);
+      if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count)
+  	rettv->vval.v_number = foldLevel(lnum);
+-     else
+  #endif
+- 	rettv->vval.v_number = 0;
+  }
+  
+  /*
+--- 10210,10216 ----
+***************
+*** 10337,10343 ****
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+-     rettv->vval.v_number = 0;
+  #ifdef FEAT_GUI
+      if (gui.in_use)
+  	gui_mch_set_foreground();
+--- 10326,10331 ----
+***************
+*** 10359,10365 ****
+  {
+      char_u	*s;
+  
+-     rettv->vval.v_number = 0;
+      s = get_tv_string(&argvars[0]);
+      if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
+  	EMSG2(_(e_invarg2), s);
+--- 10347,10352 ----
+***************
+*** 10429,10437 ****
+  
+      if (tv == NULL)
+      {
+! 	if (argvars[2].v_type == VAR_UNKNOWN)
+! 	    rettv->vval.v_number = 0;
+! 	else
+  	    copy_tv(&argvars[2], rettv);
+      }
+      else
+--- 10416,10422 ----
+  
+      if (tv == NULL)
+      {
+! 	if (argvars[2].v_type != VAR_UNKNOWN)
+  	    copy_tv(&argvars[2], rettv);
+      }
+      else
+***************
+*** 10456,10468 ****
+  {
+      char_u	*p;
+  
+!     if (retlist)
+!     {
+! 	if (rettv_list_alloc(rettv) == FAIL)
+! 	    return;
+!     }
+!     else
+! 	rettv->vval.v_number = 0;
+  
+      if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0)
+  	return;
+--- 10441,10448 ----
+  {
+      char_u	*p;
+  
+!     if (retlist && rettv_list_alloc(rettv) == FAIL)
+! 	return;
+  
+      if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0)
+  	return;
+***************
+*** 11009,11016 ****
+      dict_T	*dict;
+      matchitem_T	*cur = curwin->w_match_head;
+  
+-     rettv->vval.v_number = 0;
+- 
+      if (rettv_list_alloc(rettv) == OK)
+      {
+  	while (cur != NULL)
+--- 10989,10994 ----
+***************
+*** 11089,11095 ****
+      win_T	*wp;
+  #endif
+  
+-     rettv->vval.v_number = 0;
+  #ifdef FEAT_QUICKFIX
+      if (rettv_list_alloc(rettv) == OK)
+      {
+--- 11067,11072 ----
+***************
+*** 11935,11941 ****
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+-     rettv->vval.v_number = 0;
+      if (argvars[0].v_type != VAR_DICT)
+      {
+  	EMSG(_(e_dictreq));
+--- 11912,11917 ----
+***************
+*** 12052,12059 ****
+  	n = del_history_entry(get_histtype(str),
+  				      get_tv_string_buf(&argvars[1], buf));
+      rettv->vval.v_number = n;
+- #else
+-     rettv->vval.v_number = 0;
+  #endif
+  }
+  
+--- 12028,12033 ----
+***************
+*** 12415,12421 ****
+      int		selected;
+      int		mouse_used;
+  
+-     rettv->vval.v_number = 0;
+  #ifdef NO_CONSOLE_INPUT
+      /* While starting up, there is no place to enter text. */
+      if (no_console_input())
+--- 12389,12394 ----
+***************
+*** 12464,12470 ****
+  	--ga_userinput.ga_len;
+  	restore_typeahead((tasave_T *)(ga_userinput.ga_data)
+  						       + ga_userinput.ga_len);
+! 	rettv->vval.v_number = 0; /* OK */
+      }
+      else if (p_verbose > 1)
+      {
+--- 12437,12443 ----
+  	--ga_userinput.ga_len;
+  	restore_typeahead((tasave_T *)(ga_userinput.ga_data)
+  						       + ga_userinput.ga_len);
+! 	/* default return is zero == OK */
+      }
+      else if (p_verbose > 1)
+      {
+***************
+*** 12488,12494 ****
+  	save_typeahead((tasave_T *)(ga_userinput.ga_data)
+  						       + ga_userinput.ga_len);
+  	++ga_userinput.ga_len;
+! 	rettv->vval.v_number = 0; /* OK */
+      }
+      else
+  	rettv->vval.v_number = 1; /* Failed */
+--- 12461,12467 ----
+  	save_typeahead((tasave_T *)(ga_userinput.ga_data)
+  						       + ga_userinput.ga_len);
+  	++ga_userinput.ga_len;
+! 	/* default return is zero == OK */
+      }
+      else
+  	rettv->vval.v_number = 1; /* Failed */
+***************
+*** 12522,12528 ****
+      list_T	*l;
+      int		error = FALSE;
+  
+-     rettv->vval.v_number = 0;
+      if (argvars[0].v_type != VAR_LIST)
+  	EMSG2(_(e_listarg), "insert()");
+      else if ((l = argvars[0].vval.v_list) != NULL
+--- 12495,12500 ----
+***************
+*** 12641,12647 ****
+      dict_T	*d;
+      int		todo;
+  
+-     rettv->vval.v_number = 0;
+      if (argvars[0].v_type != VAR_DICT)
+      {
+  	EMSG(_(e_dictreq));
+--- 12613,12618 ----
+***************
+*** 12729,12735 ****
+      garray_T	ga;
+      char_u	*sep;
+  
+-     rettv->vval.v_number = 0;
+      if (argvars[0].v_type != VAR_LIST)
+      {
+  	EMSG(_(e_listreq));
+--- 12700,12705 ----
+***************
+*** 12827,12835 ****
+  #endif
+  
+      rettv->v_type = type;
+!     if (type == VAR_NUMBER)
+! 	rettv->vval.v_number = 0;
+!     else
+  	rettv->vval.v_string = NULL;
+  
+      if (check_restricted() || check_secure())
+--- 12797,12803 ----
+  #endif
+  
+      rettv->v_type = type;
+!     if (type != VAR_NUMBER)
+  	rettv->vval.v_string = NULL;
+  
+      if (check_restricted() || check_secure())
+***************
+*** 13770,13776 ****
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+-     rettv->vval.v_number = 0;
+  #ifdef FEAT_INS_EXPAND
+      if (pum_visible())
+  	rettv->vval.v_number = 1;
+--- 13738,13743 ----
+***************
+*** 13804,13810 ****
+  	    stride = get_tv_number_chk(&argvars[2], &error);
+      }
+  
+-     rettv->vval.v_number = 0;
+      if (error)
+  	return;		/* type error; errmsg already given */
+      if (stride == 0)
+--- 13771,13776 ----
+***************
+*** 14193,14199 ****
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+-     rettv->vval.v_number = 0;
+  #ifdef FEAT_CLIENTSERVER
+  # ifdef WIN32
+      /* On Win32 it's done in this application. */
+--- 14159,14164 ----
+***************
+*** 14249,14255 ****
+  	rettv->vval.v_number = (s != NULL);
+      }
+  # else
+-     rettv->vval.v_number = 0;
+      if (check_connection() == FAIL)
+  	return;
+  
+--- 14214,14219 ----
+***************
+*** 14338,14344 ****
+      dict_T	*d;
+      dictitem_T	*di;
+  
+-     rettv->vval.v_number = 0;
+      if (argvars[0].v_type == VAR_DICT)
+      {
+  	if (argvars[2].v_type != VAR_UNKNOWN)
+--- 14302,14307 ----
+***************
+*** 14696,14702 ****
+      list_T	*l;
+      listitem_T	*li, *ni;
+  
+-     rettv->vval.v_number = 0;
+      if (argvars[0].v_type != VAR_LIST)
+  	EMSG2(_(e_listarg), "reverse()");
+      else if ((l = argvars[0].vval.v_list) != NULL
+--- 14659,14664 ----
+***************
+*** 15048,15055 ****
+      int		lnum = 0;
+      int		col = 0;
+  
+-     rettv->vval.v_number = 0;
+- 
+      if (rettv_list_alloc(rettv) == FAIL)
+  	return;
+  
+--- 15010,15015 ----
+***************
+*** 15236,15243 ****
+      int		n;
+      int		flags = 0;
+  
+-     rettv->vval.v_number = 0;
+- 
+      if (rettv_list_alloc(rettv) == FAIL)
+  	return;
+  
+--- 15196,15201 ----
+***************
+*** 15323,15330 ****
+      typval_T	*varp;
+      char_u	nbuf[NUMBUFLEN];
+  
+-     rettv->vval.v_number = 0;
+- 
+      if (check_restricted() || check_secure())
+  	return;
+      (void)get_tv_number(&argvars[0]);	    /* issue errmsg if type error */
+--- 15281,15286 ----
+***************
+*** 15404,15410 ****
+      else
+  	line = get_tv_string_chk(&argvars[1]);
+  
+!     rettv->vval.v_number = 0;		/* OK */
+      for (;;)
+      {
+  	if (l != NULL)
+--- 15360,15366 ----
+      else
+  	line = get_tv_string_chk(&argvars[1]);
+  
+!     /* default result is zero == OK */
+      for (;;)
+      {
+  	if (l != NULL)
+***************
+*** 15717,15722 ****
+--- 15673,15679 ----
+  /*
+   * "setwinvar()" and "settabwinvar()" functions
+   */
++ /*ARGSUSED*/
+      static void
+  setwinvar(argvars, rettv, off)
+      typval_T	*argvars;
+***************
+*** 15733,15740 ****
+      char_u	nbuf[NUMBUFLEN];
+      tabpage_T	*tp;
+  
+-     rettv->vval.v_number = 0;
+- 
+      if (check_restricted() || check_secure())
+  	return;
+  
+--- 15690,15695 ----
+***************
+*** 15947,15953 ****
+      long	len;
+      long	i;
+  
+-     rettv->vval.v_number = 0;
+      if (argvars[0].v_type != VAR_LIST)
+  	EMSG2(_(e_listarg), "sort()");
+      else
+--- 15902,15907 ----
+***************
+*** 16870,16878 ****
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+! #ifndef FEAT_WINDOWS
+!     rettv->vval.v_number = 0;
+! #else
+      tabpage_T	*tp;
+      win_T	*wp = NULL;
+  
+--- 16824,16830 ----
+      typval_T	*argvars;
+      typval_T	*rettv;
+  {
+! #ifdef FEAT_WINDOWS
+      tabpage_T	*tp;
+      win_T	*wp = NULL;
+  
+***************
+*** 16884,16902 ****
+  	if (tp != NULL)
+  	    wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
+      }
+!     if (wp == NULL)
+! 	rettv->vval.v_number = 0;
+!     else
+      {
+! 	if (rettv_list_alloc(rettv) == FAIL)
+! 	    rettv->vval.v_number = 0;
+! 	else
+! 	{
+! 	    for (; wp != NULL; wp = wp->w_next)
+! 		if (list_append_number(rettv->vval.v_list,
+  						wp->w_buffer->b_fnum) == FAIL)
+! 		    break;
+! 	}
+      }
+  #endif
+  }
+--- 16836,16847 ----
+  	if (tp != NULL)
+  	    wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
+      }
+!     if (wp != NULL && rettv_list_alloc(rettv) != FAIL)
+      {
+! 	for (; wp != NULL; wp = wp->w_next)
+! 	    if (list_append_number(rettv->vval.v_list,
+  						wp->w_buffer->b_fnum) == FAIL)
+! 		break;
+      }
+  #endif
+  }
+***************
+*** 17024,17033 ****
+      int		first;
+  
+      if (rettv_list_alloc(rettv) == FAIL)
+-     {
+- 	rettv->vval.v_number = 0;
+  	return;
+-     }
+  
+      for (first = TRUE; ; first = FALSE)
+  	if (get_tagfname(&tn, first, fname) == FAIL
+--- 16969,16975 ----
+***************
+*** 17401,17408 ****
+      /* A non-zero number or non-empty string argument: reset mode. */
+      if (non_zero_arg(&argvars[0]))
+  	curbuf->b_visual_mode_eval = NUL;
+- #else
+-     rettv->vval.v_number = 0; /* return anything, it won't work anyway */
+  #endif
+  }
+  
+--- 17343,17348 ----
+*** ../vim-7.2.148/src/version.c	Wed Mar 18 19:07:09 2009
+--- src/version.c	Wed Apr 22 12:44:05 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     149,
+  /**/
+
+
+-- 
+WOMAN:   Well, 'ow did you become king then?
+ARTHUR:  The Lady of the Lake, [angels sing] her arm clad in the purest
+         shimmering samite, held aloft Excalibur from the bosom of the water
+         signifying by Divine Providence that I, Arthur, was to carry
+         Excalibur.  [singing stops] That is why I am your king!
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.150 b/source/ap/vim/patches/7.2.150
new file mode 100644
index 000000000..f2b1174ee
--- /dev/null
+++ b/source/ap/vim/patches/7.2.150
@@ -0,0 +1,1325 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.150 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Note: I haven't tested this myself, since I don't have a compiler that
+works for this code.
+
+Patch 7.2.150 (extra)
+Problem:    Can't use tab pages from VisVim.
+Solution:   Add tab page support to VisVim. (Adam Slater)
+Files:	    src/VisVim/Commands.cpp, src/VisVim/Resource.h,
+	    src/VisVim/VisVim.rc
+
+
+*** ../vim-7.2.149/src/VisVim/Commands.cpp	Thu May 10 20:45:34 2007
+--- src/VisVim/Commands.cpp	Mon Mar  2 00:52:15 2009
+***************
+*** 20,39 ****
+  
+  static BOOL g_bEnableVim = TRUE;	// Vim enabled
+  static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously
+  static int g_ChangeDir = CD_NONE;	// CD after file open?
+  
+! static void VimSetEnableState (BOOL bEnableState);
+! static BOOL VimOpenFile (BSTR& FileName, long LineNr);
+! static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method);
+! static void VimErrDiag (COleAutomationControl& VimOle);
+! static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);
+! static void DebugMsg (char* Msg, char* Arg = NULL);
+  
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // CCommands
+  
+! CCommands::CCommands ()
+  {
+  	// m_pApplication == NULL; M$ Code generation bug!!!
+  	m_pApplication = NULL;
+--- 20,40 ----
+  
+  static BOOL g_bEnableVim = TRUE;	// Vim enabled
+  static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously
++ static BOOL g_bNewTabs = FALSE;
+  static int g_ChangeDir = CD_NONE;	// CD after file open?
+  
+! static void VimSetEnableState(BOOL bEnableState);
+! static BOOL VimOpenFile(BSTR& FileName, long LineNr);
+! static DISPID VimGetDispatchId(COleAutomationControl& VimOle, char* Method);
+! static void VimErrDiag(COleAutomationControl& VimOle);
+! static void VimChangeDir(COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);
+! static void DebugMsg(char* Msg, char* Arg = NULL);
+  
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // CCommands
+  
+! CCommands::CCommands()
+  {
+  	// m_pApplication == NULL; M$ Code generation bug!!!
+  	m_pApplication = NULL;
+***************
+*** 41,57 ****
+  	m_pDebuggerEventsObj = NULL;
+  }
+  
+! CCommands::~CCommands ()
+  {
+! 	ASSERT (m_pApplication != NULL);
+  	if (m_pApplication)
+  	{
+! 		m_pApplication->Release ();
+  		m_pApplication = NULL;
+  	}
+  }
+  
+! void CCommands::SetApplicationObject (IApplication * pApplication)
+  {
+  	// This function assumes pApplication has already been AddRef'd
+  	// for us, which CDSAddIn did in it's QueryInterface call
+--- 42,58 ----
+  	m_pDebuggerEventsObj = NULL;
+  }
+  
+! CCommands::~CCommands()
+  {
+! 	ASSERT(m_pApplication != NULL);
+  	if (m_pApplication)
+  	{
+! 		m_pApplication->Release();
+  		m_pApplication = NULL;
+  	}
+  }
+  
+! void CCommands::SetApplicationObject(IApplication * pApplication)
+  {
+  	// This function assumes pApplication has already been AddRef'd
+  	// for us, which CDSAddIn did in it's QueryInterface call
+***************
+*** 61,115 ****
+  		return;
+  
+  	// Create Application event handlers
+! 	XApplicationEventsObj::CreateInstance (&m_pApplicationEventsObj);
+  	if (! m_pApplicationEventsObj)
+  	{
+! 		ReportInternalError ("XApplicationEventsObj::CreateInstance");
+  		return;
+  	}
+! 	m_pApplicationEventsObj->AddRef ();
+! 	m_pApplicationEventsObj->Connect (m_pApplication);
+  	m_pApplicationEventsObj->m_pCommands = this;
+  
+  #ifdef NEVER
+  	// Create Debugger event handler
+  	CComPtr < IDispatch > pDebugger;
+! 	if (SUCCEEDED (m_pApplication->get_Debugger (&pDebugger))
+  	    && pDebugger != NULL)
+  	{
+! 		XDebuggerEventsObj::CreateInstance (&m_pDebuggerEventsObj);
+! 		m_pDebuggerEventsObj->AddRef ();
+! 		m_pDebuggerEventsObj->Connect (pDebugger);
+  		m_pDebuggerEventsObj->m_pCommands = this;
+  	}
+  #endif
+  
+  	// Get settings from registry HKEY_CURRENT_USER\Software\Vim\VisVim
+! 	HKEY hAppKey = GetAppKey ("Vim");
+  	if (hAppKey)
+  	{
+! 		HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
+  		if (hSectionKey)
+  		{
+! 			g_bEnableVim = GetRegistryInt (hSectionKey, "EnableVim",
+  						       g_bEnableVim);
+! 			g_bDevStudioEditor = GetRegistryInt(hSectionKey,"DevStudioEditor",
+! 							    g_bDevStudioEditor);
+! 			g_ChangeDir = GetRegistryInt (hSectionKey, "ChangeDir",
+  						      g_ChangeDir);
+! 			RegCloseKey (hSectionKey);
+  		}
+! 		RegCloseKey (hAppKey);
+  	}
+  }
+  
+! void CCommands::UnadviseFromEvents ()
+  {
+! 	ASSERT (m_pApplicationEventsObj != NULL);
+  	if (m_pApplicationEventsObj)
+  	{
+! 		m_pApplicationEventsObj->Disconnect (m_pApplication);
+! 		m_pApplicationEventsObj->Release ();
+  		m_pApplicationEventsObj = NULL;
+  	}
+  
+--- 62,118 ----
+  		return;
+  
+  	// Create Application event handlers
+! 	XApplicationEventsObj::CreateInstance(&m_pApplicationEventsObj);
+  	if (! m_pApplicationEventsObj)
+  	{
+! 		ReportInternalError("XApplicationEventsObj::CreateInstance");
+  		return;
+  	}
+! 	m_pApplicationEventsObj->AddRef();
+! 	m_pApplicationEventsObj->Connect(m_pApplication);
+  	m_pApplicationEventsObj->m_pCommands = this;
+  
+  #ifdef NEVER
+  	// Create Debugger event handler
+  	CComPtr < IDispatch > pDebugger;
+! 	if (SUCCEEDED(m_pApplication->get_Debugger(&pDebugger))
+  	    && pDebugger != NULL)
+  	{
+! 		XDebuggerEventsObj::CreateInstance(&m_pDebuggerEventsObj);
+! 		m_pDebuggerEventsObj->AddRef();
+! 		m_pDebuggerEventsObj->Connect(pDebugger);
+  		m_pDebuggerEventsObj->m_pCommands = this;
+  	}
+  #endif
+  
+  	// Get settings from registry HKEY_CURRENT_USER\Software\Vim\VisVim
+! 	HKEY hAppKey = GetAppKey("Vim");
+  	if (hAppKey)
+  	{
+! 		HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
+  		if (hSectionKey)
+  		{
+! 			g_bEnableVim = GetRegistryInt(hSectionKey, "EnableVim",
+  						       g_bEnableVim);
+! 			g_bDevStudioEditor = GetRegistryInt(hSectionKey,
+! 					"DevStudioEditor", g_bDevStudioEditor);
+! 			g_bNewTabs = GetRegistryInt(hSectionKey, "NewTabs",
+! 						    g_bNewTabs);
+! 			g_ChangeDir = GetRegistryInt(hSectionKey, "ChangeDir",
+  						      g_ChangeDir);
+! 			RegCloseKey(hSectionKey);
+  		}
+! 		RegCloseKey(hAppKey);
+  	}
+  }
+  
+! void CCommands::UnadviseFromEvents()
+  {
+! 	ASSERT(m_pApplicationEventsObj != NULL);
+  	if (m_pApplicationEventsObj)
+  	{
+! 		m_pApplicationEventsObj->Disconnect(m_pApplication);
+! 		m_pApplicationEventsObj->Release();
+  		m_pApplicationEventsObj = NULL;
+  	}
+  
+***************
+*** 121,130 ****
+  		// unadvise from its events (thus the VERIFY_OK below--see
+  		// stdafx.h).
+  		CComPtr < IDispatch > pDebugger;
+! 		VERIFY_OK (m_pApplication->get_Debugger (&pDebugger));
+! 		ASSERT (pDebugger != NULL);
+! 		m_pDebuggerEventsObj->Disconnect (pDebugger);
+! 		m_pDebuggerEventsObj->Release ();
+  		m_pDebuggerEventsObj = NULL;
+  	}
+  #endif
+--- 124,133 ----
+  		// unadvise from its events (thus the VERIFY_OK below--see
+  		// stdafx.h).
+  		CComPtr < IDispatch > pDebugger;
+! 		VERIFY_OK(m_pApplication->get_Debugger(&pDebugger));
+! 		ASSERT(pDebugger != NULL);
+! 		m_pDebuggerEventsObj->Disconnect(pDebugger);
+! 		m_pDebuggerEventsObj->Release();
+  		m_pDebuggerEventsObj = NULL;
+  	}
+  #endif
+***************
+*** 136,156 ****
+  
+  // Application events
+  
+! HRESULT CCommands::XApplicationEvents::BeforeBuildStart ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::BuildFinish (long nNumErrors, long nNumWarnings)
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+--- 139,159 ----
+  
+  // Application events
+  
+! HRESULT CCommands::XApplicationEvents::BeforeBuildStart()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::BuildFinish(long nNumErrors, long nNumWarnings)
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+***************
+*** 158,166 ****
+  // is done.
+  // Vim gets called from here.
+  //
+! HRESULT CCommands::XApplicationEvents::DocumentOpen (IDispatch * theDocument)
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  
+  	if (! g_bEnableVim)
+  		// Vim not enabled or empty command line entered
+--- 161,169 ----
+  // is done.
+  // Vim gets called from here.
+  //
+! HRESULT CCommands::XApplicationEvents::DocumentOpen(IDispatch * theDocument)
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  
+  	if (! g_bEnableVim)
+  		// Vim not enabled or empty command line entered
+***************
+*** 169,175 ****
+  	// First get the current file name and line number
+  
+  	// Get the document object
+! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);
+  	if (! pDoc)
+  		return S_OK;
+  
+--- 172,178 ----
+  	// First get the current file name and line number
+  
+  	// Get the document object
+! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);
+  	if (! pDoc)
+  		return S_OK;
+  
+***************
+*** 177,202 ****
+  	long LineNr = -1;
+  
+  	// Get the document name
+! 	if (FAILED (pDoc->get_FullName (&FileName)))
+  		return S_OK;
+  
+  	LPDISPATCH pDispSel;
+  
+  	// Get a selection object dispatch pointer
+! 	if (SUCCEEDED (pDoc->get_Selection (&pDispSel)))
+  	{
+  		// Get the selection object
+! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel (pDispSel);
+  
+  		if (pSel)
+  			// Get the selection line number
+! 			pSel->get_CurrentLine (&LineNr);
+  
+! 		pDispSel->Release ();
+  	}
+  
+  	// Open the file in Vim and position to the current line
+! 	if (VimOpenFile (FileName, LineNr))
+  	{
+  		if (! g_bDevStudioEditor)
+  		{
+--- 180,205 ----
+  	long LineNr = -1;
+  
+  	// Get the document name
+! 	if (FAILED(pDoc->get_FullName(&FileName)))
+  		return S_OK;
+  
+  	LPDISPATCH pDispSel;
+  
+  	// Get a selection object dispatch pointer
+! 	if (SUCCEEDED(pDoc->get_Selection(&pDispSel)))
+  	{
+  		// Get the selection object
+! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel(pDispSel);
+  
+  		if (pSel)
+  			// Get the selection line number
+! 			pSel->get_CurrentLine(&LineNr);
+  
+! 		pDispSel->Release();
+  	}
+  
+  	// Open the file in Vim and position to the current line
+! 	if (VimOpenFile(FileName, LineNr))
+  	{
+  		if (! g_bDevStudioEditor)
+  		{
+***************
+*** 204,233 ****
+  			CComVariant vSaveChanges = dsSaveChangesPrompt;
+  			DsSaveStatus Saved;
+  
+! 			pDoc->Close (vSaveChanges, &Saved);
+  		}
+  	}
+  
+  	// We're done here
+! 	SysFreeString (FileName);
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::BeforeDocumentClose (IDispatch * theDocument)
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::DocumentSave (IDispatch * theDocument)
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::NewDocument (IDispatch * theDocument)
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  
+  	if (! g_bEnableVim)
+  		// Vim not enabled or empty command line entered
+--- 207,236 ----
+  			CComVariant vSaveChanges = dsSaveChangesPrompt;
+  			DsSaveStatus Saved;
+  
+! 			pDoc->Close(vSaveChanges, &Saved);
+  		}
+  	}
+  
+  	// We're done here
+! 	SysFreeString(FileName);
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::BeforeDocumentClose(IDispatch * theDocument)
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::DocumentSave(IDispatch * theDocument)
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::NewDocument(IDispatch * theDocument)
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  
+  	if (! g_bEnableVim)
+  		// Vim not enabled or empty command line entered
+***************
+*** 235,253 ****
+  
+  	// First get the current file name and line number
+  
+! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);
+  	if (! pDoc)
+  		return S_OK;
+  
+  	BSTR FileName;
+  	HRESULT hr;
+  
+! 	hr = pDoc->get_FullName (&FileName);
+! 	if (FAILED (hr))
+  		return S_OK;
+  
+  	// Open the file in Vim and position to the current line
+! 	if (VimOpenFile (FileName, 0))
+  	{
+  		if (! g_bDevStudioEditor)
+  		{
+--- 238,256 ----
+  
+  	// First get the current file name and line number
+  
+! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);
+  	if (! pDoc)
+  		return S_OK;
+  
+  	BSTR FileName;
+  	HRESULT hr;
+  
+! 	hr = pDoc->get_FullName(&FileName);
+! 	if (FAILED(hr))
+  		return S_OK;
+  
+  	// Open the file in Vim and position to the current line
+! 	if (VimOpenFile(FileName, 0))
+  	{
+  		if (! g_bDevStudioEditor)
+  		{
+***************
+*** 255,303 ****
+  			CComVariant vSaveChanges = dsSaveChangesPrompt;
+  			DsSaveStatus Saved;
+  
+! 			pDoc->Close (vSaveChanges, &Saved);
+  		}
+  	}
+  
+! 	SysFreeString (FileName);
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::WindowActivate (IDispatch * theWindow)
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::WindowDeactivate (IDispatch * theWindow)
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::WorkspaceOpen ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::WorkspaceClose ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::NewWorkspace ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+  // Debugger event
+  
+! HRESULT CCommands::XDebuggerEvents::BreakpointHit (IDispatch * pBreakpoint)
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  	return S_OK;
+  }
+  
+--- 258,306 ----
+  			CComVariant vSaveChanges = dsSaveChangesPrompt;
+  			DsSaveStatus Saved;
+  
+! 			pDoc->Close(vSaveChanges, &Saved);
+  		}
+  	}
+  
+! 	SysFreeString(FileName);
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::WindowActivate(IDispatch * theWindow)
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::WindowDeactivate(IDispatch * theWindow)
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::WorkspaceOpen()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::WorkspaceClose()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+! HRESULT CCommands::XApplicationEvents::NewWorkspace()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+  // Debugger event
+  
+! HRESULT CCommands::XDebuggerEvents::BreakpointHit(IDispatch * pBreakpoint)
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  	return S_OK;
+  }
+  
+***************
+*** 308,324 ****
+  class CMainDialog : public CDialog
+  {
+      public:
+! 	CMainDialog (CWnd * pParent = NULL);	// Standard constructor
+  
+  	//{{AFX_DATA(CMainDialog)
+  	enum { IDD = IDD_ADDINMAIN };
+  	int	m_ChangeDir;
+  	BOOL	m_bDevStudioEditor;
+  	//}}AFX_DATA
+  
+  	//{{AFX_VIRTUAL(CMainDialog)
+      protected:
+! 	virtual void DoDataExchange (CDataExchange * pDX);	// DDX/DDV support
+  	//}}AFX_VIRTUAL
+  
+      protected:
+--- 311,328 ----
+  class CMainDialog : public CDialog
+  {
+      public:
+! 	CMainDialog(CWnd * pParent = NULL);	// Standard constructor
+  
+  	//{{AFX_DATA(CMainDialog)
+  	enum { IDD = IDD_ADDINMAIN };
+  	int	m_ChangeDir;
+  	BOOL	m_bDevStudioEditor;
++ 	BOOL	m_bNewTabs;
+  	//}}AFX_DATA
+  
+  	//{{AFX_VIRTUAL(CMainDialog)
+      protected:
+! 	virtual void DoDataExchange(CDataExchange * pDX);	// DDX/DDV support
+  	//}}AFX_VIRTUAL
+  
+      protected:
+***************
+*** 326,425 ****
+  	afx_msg void OnEnable();
+  	afx_msg void OnDisable();
+  	//}}AFX_MSG
+! 	DECLARE_MESSAGE_MAP ()
+  };
+  
+! CMainDialog::CMainDialog (CWnd * pParent /* =NULL */ )
+! 	: CDialog (CMainDialog::IDD, pParent)
+  {
+  	//{{AFX_DATA_INIT(CMainDialog)
+  	m_ChangeDir = -1;
+  	m_bDevStudioEditor = FALSE;
+  	//}}AFX_DATA_INIT
+  }
+  
+! void CMainDialog::DoDataExchange (CDataExchange * pDX)
+  {
+! 	CDialog::DoDataExchange (pDX);
+  	//{{AFX_DATA_MAP(CMainDialog)
+  	DDX_Radio(pDX, IDC_CD_SOURCE_PATH, m_ChangeDir);
+! 	DDX_Check (pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);
+  	//}}AFX_DATA_MAP
+  }
+  
+! BEGIN_MESSAGE_MAP (CMainDialog, CDialog)
+  	//{{AFX_MSG_MAP(CMainDialog)
+  	//}}AFX_MSG_MAP
+! END_MESSAGE_MAP ()
+  
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // CCommands methods
+  
+! STDMETHODIMP CCommands::VisVimDialog ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  
+  	// Use m_pApplication to access the Developer Studio Application
+  	// object,
+  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
+  	// (see stdafx.h)
+  
+! 	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_FALSE));
+  
+  	CMainDialog Dlg;
+  
+  	Dlg.m_bDevStudioEditor = g_bDevStudioEditor;
+  	Dlg.m_ChangeDir = g_ChangeDir;
+! 	if (Dlg.DoModal () == IDOK)
+  	{
+  		g_bDevStudioEditor = Dlg.m_bDevStudioEditor;
+  		g_ChangeDir = Dlg.m_ChangeDir;
+  
+  		// Save settings to registry HKEY_CURRENT_USER\Software\Vim\VisVim
+! 		HKEY hAppKey = GetAppKey ("Vim");
+  		if (hAppKey)
+  		{
+! 			HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
+  			if (hSectionKey)
+  			{
+! 				WriteRegistryInt (hSectionKey, "DevStudioEditor",
+  						  g_bDevStudioEditor);
+! 				WriteRegistryInt (hSectionKey, "ChangeDir", g_ChangeDir);
+! 				RegCloseKey (hSectionKey);
+  			}
+! 			RegCloseKey (hAppKey);
+  		}
+  	}
+  
+! 	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_TRUE));
+  	return S_OK;
+  }
+  
+! STDMETHODIMP CCommands::VisVimEnable ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+! 	VimSetEnableState (true);
+  	return S_OK;
+  }
+  
+! STDMETHODIMP CCommands::VisVimDisable ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+! 	VimSetEnableState (false);
+  	return S_OK;
+  }
+  
+! STDMETHODIMP CCommands::VisVimToggle ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+! 	VimSetEnableState (! g_bEnableVim);
+  	return S_OK;
+  }
+  
+! STDMETHODIMP CCommands::VisVimLoad ()
+  {
+! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+  
+  	// Use m_pApplication to access the Developer Studio Application object,
+  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
+--- 330,435 ----
+  	afx_msg void OnEnable();
+  	afx_msg void OnDisable();
+  	//}}AFX_MSG
+! 	DECLARE_MESSAGE_MAP()
+  };
+  
+! CMainDialog::CMainDialog(CWnd * pParent /* =NULL */ )
+! 	: CDialog(CMainDialog::IDD, pParent)
+  {
+  	//{{AFX_DATA_INIT(CMainDialog)
+  	m_ChangeDir = -1;
+  	m_bDevStudioEditor = FALSE;
++ 	m_bNewTabs = FALSE;
+  	//}}AFX_DATA_INIT
+  }
+  
+! void CMainDialog::DoDataExchange(CDataExchange * pDX)
+  {
+! 	CDialog::DoDataExchange(pDX);
+  	//{{AFX_DATA_MAP(CMainDialog)
+  	DDX_Radio(pDX, IDC_CD_SOURCE_PATH, m_ChangeDir);
+! 	DDX_Check(pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);
+! 	DDX_Check(pDX, IDC_NEW_TABS, m_bNewTabs);
+  	//}}AFX_DATA_MAP
+  }
+  
+! BEGIN_MESSAGE_MAP(CMainDialog, CDialog)
+  	//{{AFX_MSG_MAP(CMainDialog)
+  	//}}AFX_MSG_MAP
+! END_MESSAGE_MAP()
+  
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // CCommands methods
+  
+! STDMETHODIMP CCommands::VisVimDialog()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  
+  	// Use m_pApplication to access the Developer Studio Application
+  	// object,
+  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
+  	// (see stdafx.h)
+  
+! 	VERIFY_OK(m_pApplication->EnableModeless(VARIANT_FALSE));
+  
+  	CMainDialog Dlg;
+  
+  	Dlg.m_bDevStudioEditor = g_bDevStudioEditor;
++ 	Dlg.m_bNewTabs = g_bNewTabs;
+  	Dlg.m_ChangeDir = g_ChangeDir;
+! 	if (Dlg.DoModal() == IDOK)
+  	{
+  		g_bDevStudioEditor = Dlg.m_bDevStudioEditor;
++ 		g_bNewTabs = Dlg.m_bNewTabs;
+  		g_ChangeDir = Dlg.m_ChangeDir;
+  
+  		// Save settings to registry HKEY_CURRENT_USER\Software\Vim\VisVim
+! 		HKEY hAppKey = GetAppKey("Vim");
+  		if (hAppKey)
+  		{
+! 			HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
+  			if (hSectionKey)
+  			{
+! 				WriteRegistryInt(hSectionKey, "DevStudioEditor",
+  						  g_bDevStudioEditor);
+! 				WriteRegistryInt(hSectionKey, "NewTabs",
+! 						  g_bNewTabs);
+! 				WriteRegistryInt(hSectionKey, "ChangeDir", g_ChangeDir);
+! 				RegCloseKey(hSectionKey);
+  			}
+! 			RegCloseKey(hAppKey);
+  		}
+  	}
+  
+! 	VERIFY_OK(m_pApplication->EnableModeless(VARIANT_TRUE));
+  	return S_OK;
+  }
+  
+! STDMETHODIMP CCommands::VisVimEnable()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+! 	VimSetEnableState(true);
+  	return S_OK;
+  }
+  
+! STDMETHODIMP CCommands::VisVimDisable()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+! 	VimSetEnableState(false);
+  	return S_OK;
+  }
+  
+! STDMETHODIMP CCommands::VisVimToggle()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+! 	VimSetEnableState(! g_bEnableVim);
+  	return S_OK;
+  }
+  
+! STDMETHODIMP CCommands::VisVimLoad()
+  {
+! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+  
+  	// Use m_pApplication to access the Developer Studio Application object,
+  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
+***************
+*** 430,436 ****
+  	CComPtr < IDispatch > pDispDoc, pDispSel;
+  
+  	// Get a document object dispatch pointer
+! 	VERIFY_OK (m_pApplication->get_ActiveDocument (&pDispDoc));
+  	if (! pDispDoc)
+  		return S_OK;
+  
+--- 440,446 ----
+  	CComPtr < IDispatch > pDispDoc, pDispSel;
+  
+  	// Get a document object dispatch pointer
+! 	VERIFY_OK(m_pApplication->get_ActiveDocument(&pDispDoc));
+  	if (! pDispDoc)
+  		return S_OK;
+  
+***************
+*** 438,467 ****
+  	long LineNr = -1;
+  
+  	// Get the document object
+! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (pDispDoc);
+  
+  	if (! pDoc)
+  		return S_OK;
+  
+  	// Get the document name
+! 	if (FAILED (pDoc->get_FullName (&FileName)))
+  		return S_OK;
+  
+  	// Get a selection object dispatch pointer
+! 	if (SUCCEEDED (pDoc->get_Selection (&pDispSel)))
+  	{
+  		// Get the selection object
+! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel (pDispSel);
+  
+  		if (pSel)
+  			// Get the selection line number
+! 			pSel->get_CurrentLine (&LineNr);
+  	}
+  
+  	// Open the file in Vim
+! 	VimOpenFile (FileName, LineNr);
+  
+! 	SysFreeString (FileName);
+  	return S_OK;
+  }
+  
+--- 448,477 ----
+  	long LineNr = -1;
+  
+  	// Get the document object
+! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(pDispDoc);
+  
+  	if (! pDoc)
+  		return S_OK;
+  
+  	// Get the document name
+! 	if (FAILED(pDoc->get_FullName(&FileName)))
+  		return S_OK;
+  
+  	// Get a selection object dispatch pointer
+! 	if (SUCCEEDED(pDoc->get_Selection(&pDispSel)))
+  	{
+  		// Get the selection object
+! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel(pDispSel);
+  
+  		if (pSel)
+  			// Get the selection line number
+! 			pSel->get_CurrentLine(&LineNr);
+  	}
+  
+  	// Open the file in Vim
+! 	VimOpenFile(FileName, LineNr);
+  
+! 	SysFreeString(FileName);
+  	return S_OK;
+  }
+  
+***************
+*** 472,487 ****
+  
+  // Set the enable state and save to registry
+  //
+! static void VimSetEnableState (BOOL bEnableState)
+  {
+  	g_bEnableVim = bEnableState;
+! 	HKEY hAppKey = GetAppKey ("Vim");
+  	if (hAppKey)
+  	{
+! 		HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
+  		if (hSectionKey)
+! 			WriteRegistryInt (hSectionKey, "EnableVim", g_bEnableVim);
+! 		RegCloseKey (hAppKey);
+  	}
+  }
+  
+--- 482,497 ----
+  
+  // Set the enable state and save to registry
+  //
+! static void VimSetEnableState(BOOL bEnableState)
+  {
+  	g_bEnableVim = bEnableState;
+! 	HKEY hAppKey = GetAppKey("Vim");
+  	if (hAppKey)
+  	{
+! 		HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
+  		if (hSectionKey)
+! 			WriteRegistryInt(hSectionKey, "EnableVim", g_bEnableVim);
+! 		RegCloseKey(hAppKey);
+  	}
+  }
+  
+***************
+*** 490,496 ****
+  // letter.
+  // 'LineNr' must contain a valid line number or 0, e. g. for a new file
+  //
+! static BOOL VimOpenFile (BSTR& FileName, long LineNr)
+  {
+  
+  	// OLE automation object for com. with Vim
+--- 500,506 ----
+  // letter.
+  // 'LineNr' must contain a valid line number or 0, e. g. for a new file
+  //
+! static BOOL VimOpenFile(BSTR& FileName, long LineNr)
+  {
+  
+  	// OLE automation object for com. with Vim
+***************
+*** 507,513 ****
+  	// Get a dispatch id for the SendKeys method of Vim;
+  	// enables connection to Vim if necessary
+  	DISPID DispatchId;
+! 	DispatchId = VimGetDispatchId (VimOle, "SendKeys");
+  	if (! DispatchId)
+  		// OLE error, can't obtain dispatch id
+  		goto OleError;
+--- 517,523 ----
+  	// Get a dispatch id for the SendKeys method of Vim;
+  	// enables connection to Vim if necessary
+  	DISPID DispatchId;
+! 	DispatchId = VimGetDispatchId(VimOle, "SendKeys");
+  	if (! DispatchId)
+  		// OLE error, can't obtain dispatch id
+  		goto OleError;
+***************
+*** 525,544 ****
+  #ifdef SINGLE_WINDOW
+  	// Update the current file in Vim if it has been modified.
+  	// Disabled, because it could write the file when you don't want to.
+! 	sprintf (VimCmd + 2, ":up\n");
+  #endif
+! 	if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
+  		goto OleError;
+  
+  	// Change Vim working directory to where the file is if desired
+  	if (g_ChangeDir != CD_NONE)
+! 		VimChangeDir (VimOle, DispatchId, FileName);
+  
+  	// Make Vim open the file.
+  	// In the filename convert all \ to /, put a \ before a space.
+! 	sprintf(VimCmd, ":drop ");
+  	sprintf(FileNameTmp, "%S", (char *)FileName);
+- 	s = VimCmd + 6;
+  	for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
+  									  ++p)
+  		if (*p == '\\')
+--- 535,562 ----
+  #ifdef SINGLE_WINDOW
+  	// Update the current file in Vim if it has been modified.
+  	// Disabled, because it could write the file when you don't want to.
+! 	sprintf(VimCmd + 2, ":up\n");
+  #endif
+! 	if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
+  		goto OleError;
+  
+  	// Change Vim working directory to where the file is if desired
+  	if (g_ChangeDir != CD_NONE)
+! 		VimChangeDir(VimOle, DispatchId, FileName);
+  
+  	// Make Vim open the file.
+  	// In the filename convert all \ to /, put a \ before a space.
+! 	if (g_bNewTabs)
+! 	{
+! 		sprintf(VimCmd, ":tab drop ");
+! 		s = VimCmd + 11;
+! 	}
+! 	else
+! 	{
+! 		sprintf(VimCmd, ":drop ");
+! 		s = VimCmd + 6;
+! 	}
+  	sprintf(FileNameTmp, "%S", (char *)FileName);
+  	for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
+  									  ++p)
+  		if (*p == '\\')
+***************
+*** 552,571 ****
+  	*s++ = '\n';
+  	*s = '\0';
+  
+! 	if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
+  		goto OleError;
+  
+  	if (LineNr > 0)
+  	{
+  		// Goto line
+! 		sprintf (VimCmd, ":%d\n", LineNr);
+! 		if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
+  			goto OleError;
+  	}
+  
+  	// Make Vim come to the foreground
+! 	if (! VimOle.Method ("SetForeground"))
+! 		VimOle.ErrDiag ();
+  
+  	// We're done
+  	return true;
+--- 570,589 ----
+  	*s++ = '\n';
+  	*s = '\0';
+  
+! 	if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
+  		goto OleError;
+  
+  	if (LineNr > 0)
+  	{
+  		// Goto line
+! 		sprintf(VimCmd, ":%d\n", LineNr);
+! 		if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
+  			goto OleError;
+  	}
+  
+  	// Make Vim come to the foreground
+! 	if (! VimOle.Method("SetForeground"))
+! 		VimOle.ErrDiag();
+  
+  	// We're done
+  	return true;
+***************
+*** 573,579 ****
+      OleError:
+  	// There was an OLE error
+  	// Check if it's the "unknown class string" error
+! 	VimErrDiag (VimOle);
+  	return false;
+  }
+  
+--- 591,597 ----
+      OleError:
+  	// There was an OLE error
+  	// Check if it's the "unknown class string" error
+! 	VimErrDiag(VimOle);
+  	return false;
+  }
+  
+***************
+*** 581,598 ****
+  // Create the Vim OLE object if necessary
+  // Returns a valid dispatch id or null on error
+  //
+! static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method)
+  {
+  	// Initialize Vim OLE connection if not already done
+! 	if (! VimOle.IsCreated ())
+  	{
+! 		if (! VimOle.CreateObject ("Vim.Application"))
+  			return NULL;
+  	}
+  
+  	// Get the dispatch id for the SendKeys method.
+  	// By doing this, we are checking if Vim is still there...
+! 	DISPID DispatchId = VimOle.GetDispatchId ("SendKeys");
+  	if (! DispatchId)
+  	{
+  		// We can't get a dispatch id.
+--- 599,616 ----
+  // Create the Vim OLE object if necessary
+  // Returns a valid dispatch id or null on error
+  //
+! static DISPID VimGetDispatchId(COleAutomationControl& VimOle, char* Method)
+  {
+  	// Initialize Vim OLE connection if not already done
+! 	if (! VimOle.IsCreated())
+  	{
+! 		if (! VimOle.CreateObject("Vim.Application"))
+  			return NULL;
+  	}
+  
+  	// Get the dispatch id for the SendKeys method.
+  	// By doing this, we are checking if Vim is still there...
+! 	DISPID DispatchId = VimOle.GetDispatchId("SendKeys");
+  	if (! DispatchId)
+  	{
+  		// We can't get a dispatch id.
+***************
+*** 604,615 ****
+  		// should not be kept long enough to allow the user to terminate Vim
+  		// to avoid memory corruption (why the heck is there no system garbage
+  		// collection for those damned OLE memory chunks???).
+! 		VimOle.DeleteObject ();
+! 		if (! VimOle.CreateObject ("Vim.Application"))
+  			// If this create fails, it's time for an error msg
+  			return NULL;
+  
+! 		if (! (DispatchId = VimOle.GetDispatchId ("SendKeys")))
+  			// There is something wrong...
+  			return NULL;
+  	}
+--- 622,633 ----
+  		// should not be kept long enough to allow the user to terminate Vim
+  		// to avoid memory corruption (why the heck is there no system garbage
+  		// collection for those damned OLE memory chunks???).
+! 		VimOle.DeleteObject();
+! 		if (! VimOle.CreateObject("Vim.Application"))
+  			// If this create fails, it's time for an error msg
+  			return NULL;
+  
+! 		if (! (DispatchId = VimOle.GetDispatchId("SendKeys")))
+  			// There is something wrong...
+  			return NULL;
+  	}
+***************
+*** 620,639 ****
+  // Output an error message for an OLE error
+  // Check on the classstring error, which probably means Vim wasn't registered.
+  //
+! static void VimErrDiag (COleAutomationControl& VimOle)
+  {
+! 	SCODE sc = GetScode (VimOle.GetResult ());
+  	if (sc == CO_E_CLASSSTRING)
+  	{
+  		char Buf[256];
+! 		sprintf (Buf, "There is no registered OLE automation server named "
+  			 "\"Vim.Application\".\n"
+  			 "Use the OLE-enabled version of Vim with VisVim and "
+  			 "make sure to register Vim by running \"vim -register\".");
+! 		MessageBox (NULL, Buf, "OLE Error", MB_OK);
+  	}
+  	else
+! 		VimOle.ErrDiag ();
+  }
+  
+  // Change directory to the directory the file 'FileName' is in or it's parent
+--- 638,657 ----
+  // Output an error message for an OLE error
+  // Check on the classstring error, which probably means Vim wasn't registered.
+  //
+! static void VimErrDiag(COleAutomationControl& VimOle)
+  {
+! 	SCODE sc = GetScode(VimOle.GetResult());
+  	if (sc == CO_E_CLASSSTRING)
+  	{
+  		char Buf[256];
+! 		sprintf(Buf, "There is no registered OLE automation server named "
+  			 "\"Vim.Application\".\n"
+  			 "Use the OLE-enabled version of Vim with VisVim and "
+  			 "make sure to register Vim by running \"vim -register\".");
+! 		MessageBox(NULL, Buf, "OLE Error", MB_OK);
+  	}
+  	else
+! 		VimOle.ErrDiag();
+  }
+  
+  // Change directory to the directory the file 'FileName' is in or it's parent
+***************
+*** 644,650 ****
+  //	CD_SOURCE_PATH
+  //	CD_SOURCE_PARENT
+  //
+! static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName)
+  {
+  	// Do a :cd first
+  
+--- 662,668 ----
+  //	CD_SOURCE_PATH
+  //	CD_SOURCE_PARENT
+  //
+! static void VimChangeDir(COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName)
+  {
+  	// Do a :cd first
+  
+***************
+*** 655,661 ****
+  	char DirUnix[_MAX_DIR * 2];
+  	char *s, *t;
+  
+! 	_splitpath (StrFileName, Drive, Dir, NULL, NULL);
+  
+  	// Convert to Unix path name format, escape spaces.
+  	t = DirUnix;
+--- 673,679 ----
+  	char DirUnix[_MAX_DIR * 2];
+  	char *s, *t;
+  
+! 	_splitpath(StrFileName, Drive, Dir, NULL, NULL);
+  
+  	// Convert to Unix path name format, escape spaces.
+  	t = DirUnix;
+***************
+*** 676,694 ****
+  	OLECHAR Buf[MAX_OLE_STR];
+  	char VimCmd[MAX_OLE_STR];
+  
+! 	sprintf (VimCmd, ":cd %s%s%s\n", Drive, DirUnix,
+  		 g_ChangeDir == CD_SOURCE_PARENT && DirUnix[1] ? ".." : "");
+! 	VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf));
+  }
+  
+  #ifdef _DEBUG
+  // Print out a debug message
+  //
+! static void DebugMsg (char* Msg, char* Arg)
+  {
+  	char Buf[400];
+! 	sprintf (Buf, Msg, Arg);
+! 	AfxMessageBox (Buf);
+  }
+  #endif
+- 
+--- 694,711 ----
+  	OLECHAR Buf[MAX_OLE_STR];
+  	char VimCmd[MAX_OLE_STR];
+  
+! 	sprintf(VimCmd, ":cd %s%s%s\n", Drive, DirUnix,
+  		 g_ChangeDir == CD_SOURCE_PARENT && DirUnix[1] ? ".." : "");
+! 	VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf));
+  }
+  
+  #ifdef _DEBUG
+  // Print out a debug message
+  //
+! static void DebugMsg(char* Msg, char* Arg)
+  {
+  	char Buf[400];
+! 	sprintf(Buf, Msg, Arg);
+! 	AfxMessageBox(Buf);
+  }
+  #endif
+*** ../vim-7.2.149/src/VisVim/Resource.h	Sun Jun 13 19:17:32 2004
+--- src/VisVim/Resource.h	Mon Mar  2 00:39:21 2009
+***************
+*** 16,21 ****
+--- 16,22 ----
+  #define IDC_CD_SOURCE_PATH		1001
+  #define IDC_CD_SOURCE_PARENT		1002
+  #define IDC_CD_NONE			1003
++ #define IDC_NEW_TABS			1004
+  
+  // Next default values for new objects
+  //
+*** ../vim-7.2.149/src/VisVim/VisVim.rc	Sun Jun 13 19:38:03 2004
+--- src/VisVim/VisVim.rc	Mon Mar  2 00:40:19 2009
+***************
+*** 122,127 ****
+--- 122,130 ----
+      CONTROL         "&Open file in DevStudio editor simultaneously",
+                      IDC_DEVSTUDIO_EDITOR,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
+                      WS_TABSTOP,7,7,153,10
++     CONTROL         "Open files in new tabs",
++                     IDC_NEW_TABS,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
++                     WS_TABSTOP,7,21,153,10
+      GROUPBOX        "Current directory",IDC_STATIC,7,35,164,58,WS_GROUP
+      CONTROL         "Set to &source file path",IDC_CD_SOURCE_PATH,"Button",
+                      BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,49,85,10
+*** ../vim-7.2.149/src/version.c	Wed Apr 22 12:53:31 2009
+--- src/version.c	Wed Apr 22 13:04:32 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     150,
+  /**/
+
+-- 
+A poem:                read aloud:
+
+<> !*''#               Waka waka bang splat tick tick hash,
+^"`$$-                 Caret quote back-tick dollar dollar dash,
+!*=@$_                 Bang splat equal at dollar under-score,
+%*<> ~#4               Percent splat waka waka tilde number four,
+&[]../                 Ampersand bracket bracket dot dot slash,
+|{,,SYSTEM HALTED      Vertical-bar curly-bracket comma comma CRASH.
+
+Fred Bremmer and Steve Kroese (Calvin College & Seminary of Grand Rapids, MI.)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.151 b/source/ap/vim/patches/7.2.151
new file mode 100644
index 000000000..214b76091
--- /dev/null
+++ b/source/ap/vim/patches/7.2.151
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.151
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.151
+Problem:    ":hist a" doesn't work like ":hist all" as the docs suggest.
+Solution:   Make ":hist a" and ":hist al" work. (Dominique Pelle)
+Files:	    src/ex_getln.c
+
+
+*** ../vim-7.2.150/src/ex_getln.c	Wed Mar 18 12:50:58 2009
+--- src/ex_getln.c	Sun Apr 12 13:36:06 2009
+***************
+*** 5686,5692 ****
+  	histype1 = get_histtype(arg);
+  	if (histype1 == -1)
+  	{
+! 	    if (STRICMP(arg, "all") == 0)
+  	    {
+  		histype1 = 0;
+  		histype2 = HIST_COUNT-1;
+--- 5686,5692 ----
+  	histype1 = get_histtype(arg);
+  	if (histype1 == -1)
+  	{
+! 	    if (STRNICMP(arg, "all", STRLEN(arg)) == 0)
+  	    {
+  		histype1 = 0;
+  		histype2 = HIST_COUNT-1;
+*** ../vim-7.2.150/src/version.c	Wed Apr 22 13:06:11 2009
+--- src/version.c	Wed Apr 22 13:49:41 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     151,
+  /**/
+
+-- 
+I'm sure that I asked CBuilder to do a "full" install.  Looks like I got
+a "fool" install, instead.		Charles E Campbell, Jr, PhD
+
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.152 b/source/ap/vim/patches/7.2.152
new file mode 100644
index 000000000..107a0a4bf
--- /dev/null
+++ b/source/ap/vim/patches/7.2.152
@@ -0,0 +1,104 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.152
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.152
+Problem:    When using "silent echo x" inside ":redir" a next echo may start
+	    halfway the line. (Tony Mechelynck, Dennis Benzinger)
+Solution:   Reset msg_col after redirecting silently.
+Files:	    src/ex_docmd.c, src/message.c, src/proto/message.pro
+
+
+*** ../vim-7.2.151/src/ex_docmd.c	Wed Mar 18 12:50:58 2009
+--- src/ex_docmd.c	Wed Apr 22 11:57:49 2009
+***************
+*** 2699,2704 ****
+--- 2699,2709 ----
+  	/* Restore msg_scroll, it's set by file I/O commands, even when no
+  	 * message is actually displayed. */
+  	msg_scroll = save_msg_scroll;
++ 
++ 	/* "silent reg" or "silent echo x" inside "redir" leaves msg_col
++ 	 * somewhere in the line.  Put it back in the first column. */
++ 	if (redirecting())
++ 	    msg_col = 0;
+      }
+  
+  #ifdef HAVE_SANDBOX
+*** ../vim-7.2.151/src/message.c	Tue Feb 24 04:36:50 2009
+--- src/message.c	Sun Apr 12 14:08:25 2009
+***************
+*** 3023,3033 ****
+      if (*p_vfile != NUL)
+  	verbose_write(s, maxlen);
+  
+!     if (redir_fd != NULL
+! #ifdef FEAT_EVAL
+! 			  || redir_reg || redir_vname
+! #endif
+! 				       )
+      {
+  	/* If the string doesn't start with CR or NL, go to msg_col */
+  	if (*s != '\n' && *s != '\r')
+--- 3023,3029 ----
+      if (*p_vfile != NUL)
+  	verbose_write(s, maxlen);
+  
+!     if (redirecting())
+      {
+  	/* If the string doesn't start with CR or NL, go to msg_col */
+  	if (*s != '\n' && *s != '\r')
+***************
+*** 3074,3079 ****
+--- 3070,3085 ----
+      }
+  }
+  
++     int
++ redirecting()
++ {
++     return redir_fd != NULL
++ #ifdef FEAT_EVAL
++ 			  || redir_reg || redir_vname
++ #endif
++ 				       ;
++ }
++ 
+  /*
+   * Before giving verbose message.
+   * Must always be called paired with verbose_leave()!
+*** ../vim-7.2.151/src/proto/message.pro	Sat May  5 19:35:34 2007
+--- src/proto/message.pro	Sun Apr 12 14:08:50 2009
+***************
+*** 54,59 ****
+--- 54,60 ----
+  void msg_clr_cmdline __ARGS((void));
+  int msg_end __ARGS((void));
+  void msg_check __ARGS((void));
++ int redirecting __ARGS((void));
+  void verbose_enter __ARGS((void));
+  void verbose_leave __ARGS((void));
+  void verbose_enter_scroll __ARGS((void));
+*** ../vim-7.2.151/src/version.c	Wed Apr 22 13:50:14 2009
+--- src/version.c	Wed Apr 22 14:40:22 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     152,
+  /**/
+
+-- 
+Q: How does a UNIX Guru pick up a girl?
+A: look; grep; which; eval; nice; uname; talk; date;
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.153 b/source/ap/vim/patches/7.2.153
new file mode 100644
index 000000000..79b2a0778
--- /dev/null
+++ b/source/ap/vim/patches/7.2.153
@@ -0,0 +1,97 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.153
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.153
+Problem:    Memory leak for ":recover empty_dir/".
+Solution:   Free files[] when it becomes empty. (Dominique Pelle)
+Files:	    src/memline.c
+
+
+*** ../vim-7.2.152/src/memline.c	Sun Jul 13 19:40:43 2008
+--- src/memline.c	Wed Apr 22 11:48:35 2009
+***************
+*** 1554,1563 ****
+  	    for (i = 0; i < num_files; ++i)
+  		if (fullpathcmp(p, files[i], TRUE) & FPC_SAME)
+  		{
+  		    vim_free(files[i]);
+! 		    --num_files;
+! 		    for ( ; i < num_files; ++i)
+! 			files[i] = files[i + 1];
+  		}
+  	}
+  	if (nr > 0)
+--- 1554,1568 ----
+  	    for (i = 0; i < num_files; ++i)
+  		if (fullpathcmp(p, files[i], TRUE) & FPC_SAME)
+  		{
++ 		    /* Remove the name from files[i].  Move further entries
++ 		     * down.  When the array becomes empty free it here, since
++ 		     * FreeWild() won't be called below. */
+  		    vim_free(files[i]);
+! 		    if (--num_files == 0)
+! 			vim_free(files);
+! 		    else
+! 			for ( ; i < num_files; ++i)
+! 			    files[i] = files[i + 1];
+  		}
+  	}
+  	if (nr > 0)
+***************
+*** 3522,3528 ****
+  	    if (errno == EINVAL || errno == ENOENT)
+  	    {
+  		/* Found non-symlink or not existing file, stop here.
+! 		 * When at the first level use the unmodifed name, skip the
+  		 * call to vim_FullName(). */
+  		if (depth == 1)
+  		    return FAIL;
+--- 3527,3533 ----
+  	    if (errno == EINVAL || errno == ENOENT)
+  	    {
+  		/* Found non-symlink or not existing file, stop here.
+! 		 * When at the first level use the unmodified name, skip the
+  		 * call to vim_FullName(). */
+  		if (depth == 1)
+  		    return FAIL;
+***************
+*** 4560,4566 ****
+  			buf->b_ml.ml_chunksize + curix,
+  			(buf->b_ml.ml_usedchunks - curix) *
+  			sizeof(chunksize_T));
+! 	    /* Compute length of first half of lines in the splitted chunk */
+  	    size = 0;
+  	    linecnt = 0;
+  	    while (curline < buf->b_ml.ml_line_count
+--- 4568,4574 ----
+  			buf->b_ml.ml_chunksize + curix,
+  			(buf->b_ml.ml_usedchunks - curix) *
+  			sizeof(chunksize_T));
+! 	    /* Compute length of first half of lines in the split chunk */
+  	    size = 0;
+  	    linecnt = 0;
+  	    while (curline < buf->b_ml.ml_line_count
+*** ../vim-7.2.152/src/version.c	Wed Apr 22 14:42:26 2009
+--- src/version.c	Wed Apr 22 15:34:18 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     153,
+  /**/
+
+-- 
+Windows
+M!uqoms
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.154 b/source/ap/vim/patches/7.2.154
new file mode 100644
index 000000000..732890327
--- /dev/null
+++ b/source/ap/vim/patches/7.2.154
@@ -0,0 +1,71 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.154
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.154 (after 7.2.132)
+Problem:    ":cd" is still possible in a SwapExists autocmd.
+Solution:   Set allbuf_lock in do_swapexists().
+Files:	    src/memline.c
+
+
+*** ../vim-7.2.153/src/memline.c	Wed Apr 22 15:37:12 2009
+--- src/memline.c	Wed Apr 22 15:54:48 2009
+***************
+*** 3771,3778 ****
+      set_vim_var_string(VV_SWAPCHOICE, NULL, -1);
+  
+      /* Trigger SwapExists autocommands with <afile> set to the file being
+!      * edited. */
+      apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL);
+  
+      set_vim_var_string(VV_SWAPNAME, NULL, -1);
+  
+--- 3771,3780 ----
+      set_vim_var_string(VV_SWAPCHOICE, NULL, -1);
+  
+      /* Trigger SwapExists autocommands with <afile> set to the file being
+!      * edited.  Disallow changing directory here. */
+!     ++allbuf_lock;
+      apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL);
++     --allbuf_lock;
+  
+      set_vim_var_string(VV_SWAPNAME, NULL, -1);
+  
+***************
+*** 3798,3803 ****
+--- 3800,3806 ----
+   *
+   * Note: If BASENAMELEN is not correct, you will get error messages for
+   *	 not being able to open the swapfile
++  * Note: May trigger SwapExists autocmd, pointers may change!
+   */
+      static char_u *
+  findswapname(buf, dirp, old_fname)
+*** ../vim-7.2.153/src/version.c	Wed Apr 22 15:37:12 2009
+--- src/version.c	Wed Apr 22 15:55:48 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     154,
+  /**/
+
+-- 
+ARTHUR:  Be quiet!
+DENNIS:  Well you can't expect to wield supreme executive power just 'cause
+         some watery tart threw a sword at you!
+ARTHUR:  Shut up!
+DENNIS:  I mean, if I went around sayin' I was an empereror just because some
+         moistened bint had lobbed a scimitar at me they'd put me away!
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.155 b/source/ap/vim/patches/7.2.155
new file mode 100644
index 000000000..00b294df5
--- /dev/null
+++ b/source/ap/vim/patches/7.2.155
@@ -0,0 +1,45 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.155
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.155
+Problem:    Memory leak in ":function /pat".
+Solution:   Free the memory. (Dominique Pelle)
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.154/src/eval.c	Wed Apr 22 12:53:31 2009
+--- src/eval.c	Wed Apr 22 16:04:34 2009
+***************
+*** 19720,19725 ****
+--- 19720,19726 ----
+  			    list_func_head(fp, FALSE);
+  		    }
+  		}
++ 		vim_free(regmatch.regprog);
+  	    }
+  	}
+  	if (*p == '/')
+*** ../vim-7.2.154/src/version.c	Wed Apr 22 15:56:27 2009
+--- src/version.c	Wed Apr 22 16:07:27 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     155,
+  /**/
+
+-- 
+Q:   How many hardware engineers does it take to change a lightbulb?
+A:   None.  We'll fix it in software.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.156 b/source/ap/vim/patches/7.2.156
new file mode 100644
index 000000000..59bb2e9e1
--- /dev/null
+++ b/source/ap/vim/patches/7.2.156
@@ -0,0 +1,181 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.156
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.156 (after 7.2.143)
+Problem:    No completion for :scscope and :lcscope commands.
+Solution:   Implement the completion. (Dominique Pelle)
+Files:	    src/if_cscope.c, src/ex_docmd.c, src/proto/if_cscope.pro
+
+
+*** ../vim-7.2.155/src/if_cscope.c	Wed Mar 18 14:30:46 2009
+--- src/if_cscope.c	Wed Apr 22 11:57:49 2009
+***************
+*** 98,103 ****
+--- 98,104 ----
+  static enum
+  {
+      EXP_CSCOPE_SUBCMD,	/* expand ":cscope" sub-commands */
++     EXP_SCSCOPE_SUBCMD,	/* expand ":scscope" sub-commands */
+      EXP_CSCOPE_FIND,	/* expand ":cscope find" arguments */
+      EXP_CSCOPE_KILL	/* expand ":cscope kill" arguments */
+  } expand_what;
+***************
+*** 112,123 ****
+--- 113,135 ----
+      expand_T	*xp;
+      int		idx;
+  {
++     int		current_idx;
++     int		i;
++ 
+      switch (expand_what)
+      {
+      case EXP_CSCOPE_SUBCMD:
+  	/* Complete with sub-commands of ":cscope":
+  	 * add, find, help, kill, reset, show */
+  	return (char_u *)cs_cmds[idx].name;
++     case EXP_SCSCOPE_SUBCMD:
++ 	/* Complete with sub-commands of ":scscope": same sub-commands as
++ 	 * ":cscope" but skip commands which don't support split windows */
++ 	for (i = 0, current_idx = 0; cs_cmds[i].name != NULL; i++)
++ 	    if (cs_cmds[i].cansplit)
++ 		if (current_idx++ == idx)
++ 		    break;
++ 	return (char_u *)cs_cmds[i].name;
+      case EXP_CSCOPE_FIND:
+  	{
+  	    const char *query_type[] =
+***************
+*** 133,147 ****
+  	}
+      case EXP_CSCOPE_KILL:
+  	{
+- 	    int			i;
+- 	    int			current_idx = 0;
+  	    static char_u	connection[2];
+  
+  	    /* ":cscope kill" accepts connection numbers or partial names of
+  	     * the pathname of the cscope database as argument.  Only complete
+  	     * with connection numbers. -1 can also be used to kill all
+  	     * connections. */
+! 	    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+  	    {
+  		if (csinfo[i].fname == NULL)
+  		    continue;
+--- 145,157 ----
+  	}
+      case EXP_CSCOPE_KILL:
+  	{
+  	    static char_u	connection[2];
+  
+  	    /* ":cscope kill" accepts connection numbers or partial names of
+  	     * the pathname of the cscope database as argument.  Only complete
+  	     * with connection numbers. -1 can also be used to kill all
+  	     * connections. */
+! 	    for (i = 0, current_idx = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+  	    {
+  		if (csinfo[i].fname == NULL)
+  		    continue;
+***************
+*** 165,180 ****
+   * Handle command line completion for :cscope command.
+   */
+      void
+! set_context_in_cscope_cmd(xp, arg)
+      expand_T	*xp;
+      char_u	*arg;
+  {
+      char_u	*p;
+  
+      /* Default: expand subcommands */
+      xp->xp_context = EXPAND_CSCOPE;
+-     expand_what = EXP_CSCOPE_SUBCMD;
+      xp->xp_pattern = arg;
+  
+      /* (part of) subcommand already typed */
+      if (*arg != NUL)
+--- 175,192 ----
+   * Handle command line completion for :cscope command.
+   */
+      void
+! set_context_in_cscope_cmd(xp, arg, cmdidx)
+      expand_T	*xp;
+      char_u	*arg;
++     cmdidx_T	cmdidx;
+  {
+      char_u	*p;
+  
+      /* Default: expand subcommands */
+      xp->xp_context = EXPAND_CSCOPE;
+      xp->xp_pattern = arg;
++     expand_what = (cmdidx == CMD_scscope)
++ 			? EXP_SCSCOPE_SUBCMD : EXP_CSCOPE_SUBCMD;
+  
+      /* (part of) subcommand already typed */
+      if (*arg != NUL)
+*** ../vim-7.2.155/src/ex_docmd.c	Wed Apr 22 14:42:26 2009
+--- src/ex_docmd.c	Wed Apr 22 11:57:49 2009
+***************
+*** 3690,3696 ****
+  	    break;
+  #ifdef FEAT_CSCOPE
+  	case CMD_cscope:
+! 	    set_context_in_cscope_cmd(xp, arg);
+  	    break;
+  #endif
+  #ifdef FEAT_LISTCMDS
+--- 3690,3698 ----
+  	    break;
+  #ifdef FEAT_CSCOPE
+  	case CMD_cscope:
+! 	case CMD_lcscope:
+! 	case CMD_scscope:
+! 	    set_context_in_cscope_cmd(xp, arg, ea.cmdidx);
+  	    break;
+  #endif
+  #ifdef FEAT_LISTCMDS
+*** ../vim-7.2.155/src/proto/if_cscope.pro	Wed Mar 18 12:50:58 2009
+--- src/proto/if_cscope.pro	Wed Apr 22 11:57:49 2009
+***************
+*** 1,6 ****
+  /* if_cscope.c */
+  char_u *get_cscope_name __ARGS((expand_T *xp, int idx));
+! void set_context_in_cscope_cmd __ARGS((expand_T *xp, char_u *arg));
+  void do_cscope __ARGS((exarg_T *eap));
+  void do_scscope __ARGS((exarg_T *eap));
+  void do_cstag __ARGS((exarg_T *eap));
+--- 1,6 ----
+  /* if_cscope.c */
+  char_u *get_cscope_name __ARGS((expand_T *xp, int idx));
+! void set_context_in_cscope_cmd __ARGS((expand_T *xp, char_u *arg, cmdidx_T cmdidx));
+  void do_cscope __ARGS((exarg_T *eap));
+  void do_scscope __ARGS((exarg_T *eap));
+  void do_cstag __ARGS((exarg_T *eap));
+*** ../vim-7.2.155/src/version.c	Wed Apr 22 16:07:57 2009
+--- src/version.c	Wed Apr 22 16:21:43 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     156,
+  /**/
+
+-- 
+ARTHUR:  Shut up!  Will you shut up!
+DENNIS:  Ah, now we see the violence inherent in the system.
+ARTHUR:  Shut up!
+DENNIS:  Oh!  Come and see the violence inherent in the system!
+         HELP! HELP!  I'm being repressed!
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.157 b/source/ap/vim/patches/7.2.157
new file mode 100644
index 000000000..238431452
--- /dev/null
+++ b/source/ap/vim/patches/7.2.157
@@ -0,0 +1,144 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.157
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.157
+Problem:    Illegal memory access when searching in path.
+Solution:   Avoid looking at a byte after end of a string. (Dominique Pelle)
+Files:	    src/search.c
+
+
+*** ../vim-7.2.156/src/search.c	Fri Jul 18 12:05:58 2008
+--- src/search.c	Wed Apr 22 12:26:19 2009
+***************
+*** 2327,2334 ****
+  		    for (col = pos.col; check_prevcol(linep, col, '\\', &col);)
+  			bslcnt++;
+  		}
+! 		/* Only accept a match when 'M' is in 'cpo' or when ecaping is
+! 		 * what we expect. */
+  		if (cpo_bsl || (bslcnt & 1) == match_escaped)
+  		{
+  		    if (c == initc)
+--- 2336,2343 ----
+  		    for (col = pos.col; check_prevcol(linep, col, '\\', &col);)
+  			bslcnt++;
+  		}
+! 		/* Only accept a match when 'M' is in 'cpo' or when escaping
+! 		 * is what we expect. */
+  		if (cpo_bsl || (bslcnt & 1) == match_escaped)
+  		{
+  		    if (c == initc)
+***************
+*** 4663,4669 ****
+  			    msg_putchar('\n');	    /* cursor below last one */
+  			    if (!got_int)	    /* don't display if 'q'
+  						       typed at "--more--"
+! 						       mesage */
+  			    {
+  				msg_home_replace_hl(new_fname);
+  				MSG_PUTS(_(" (includes previously listed match)"));
+--- 4672,4678 ----
+  			    msg_putchar('\n');	    /* cursor below last one */
+  			    if (!got_int)	    /* don't display if 'q'
+  						       typed at "--more--"
+! 						       message */
+  			    {
+  				msg_home_replace_hl(new_fname);
+  				MSG_PUTS(_(" (includes previously listed match)"));
+***************
+*** 4975,4981 ****
+  					    || IObuff[i-2] == '!'))))
+  				IObuff[i++] = ' ';
+  			}
+! 			/* copy as much as posible of the new word */
+  			if (p - aux >= IOSIZE - i)
+  			    p = aux + IOSIZE - i - 1;
+  			STRNCPY(IObuff + i, aux, p - aux);
+--- 4984,4990 ----
+  					    || IObuff[i-2] == '!'))))
+  				IObuff[i++] = ' ';
+  			}
+! 			/* copy as much as possible of the new word */
+  			if (p - aux >= IOSIZE - i)
+  			    p = aux + IOSIZE - i - 1;
+  			STRNCPY(IObuff + i, aux, p - aux);
+***************
+*** 5010,5016 ****
+  		    if (did_show)
+  			msg_putchar('\n');	/* cursor below last one */
+  		    if (!got_int)		/* don't display if 'q' typed
+! 						    at "--more--" mesage */
+  			msg_home_replace_hl(curr_fname);
+  		    prev_fname = curr_fname;
+  		}
+--- 5019,5025 ----
+  		    if (did_show)
+  			msg_putchar('\n');	/* cursor below last one */
+  		    if (!got_int)		/* don't display if 'q' typed
+! 						    at "--more--" message */
+  			msg_home_replace_hl(curr_fname);
+  		    prev_fname = curr_fname;
+  		}
+***************
+*** 5092,5098 ****
+  		}
+  		if (action != ACTION_SHOW)
+  		{
+! 		    curwin->w_cursor.col = (colnr_T) (startp - line);
+  		    curwin->w_set_curswant = TRUE;
+  		}
+  
+--- 5101,5107 ----
+  		}
+  		if (action != ACTION_SHOW)
+  		{
+! 		    curwin->w_cursor.col = (colnr_T)(startp - line);
+  		    curwin->w_set_curswant = TRUE;
+  		}
+  
+***************
+*** 5119,5125 ****
+  		    && action == ACTION_EXPAND
+  		    && !(compl_cont_status & CONT_SOL)
+  #endif
+! 		    && *(p = startp + 1))
+  		goto search_line;
+  	}
+  	line_breakcheck();
+--- 5128,5135 ----
+  		    && action == ACTION_EXPAND
+  		    && !(compl_cont_status & CONT_SOL)
+  #endif
+! 		    && *startp != NUL
+! 		    && *(p = startp + 1) != NUL)
+  		goto search_line;
+  	}
+  	line_breakcheck();
+*** ../vim-7.2.156/src/version.c	Wed Apr 22 16:22:44 2009
+--- src/version.c	Wed Apr 22 16:39:59 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     157,
+  /**/
+
+
+-- 
+ARTHUR:  Bloody peasant!
+DENNIS:  Oh, what a give away.  Did you hear that, did you hear that, eh?
+         That's what I'm on about -- did you see him repressing me, you saw it
+         didn't you?
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.158 b/source/ap/vim/patches/7.2.158
new file mode 100644
index 000000000..87daf24df
--- /dev/null
+++ b/source/ap/vim/patches/7.2.158
@@ -0,0 +1,63 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.158
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.158
+Problem:    Warnings from VisualC compiler.
+Solution:   Add type casts. (George Reilly)
+Files:	    src/ops.c
+
+
+*** ../vim-7.2.157/src/ops.c	Wed Mar 11 16:26:01 2009
+--- src/ops.c	Wed Apr 22 13:01:46 2009
+***************
+*** 495,504 ****
+  	block_space_width = non_white_col - oap->start_vcol;
+  	/* We will shift by "total" or "block_space_width", whichever is less.
+  	 */
+! 	shift_amount = (block_space_width < total? block_space_width: total);
+  
+  	/* The column to which we will shift the text.  */
+! 	destination_col = non_white_col - shift_amount;
+  
+  	/* Now let's find out how much of the beginning of the line we can
+  	 * reuse without modification.  */
+--- 495,505 ----
+  	block_space_width = non_white_col - oap->start_vcol;
+  	/* We will shift by "total" or "block_space_width", whichever is less.
+  	 */
+! 	shift_amount = (block_space_width < (size_t)total
+! 					 ? block_space_width : (size_t)total);
+  
+  	/* The column to which we will shift the text.  */
+! 	destination_col = (colnr_T)(non_white_col - shift_amount);
+  
+  	/* Now let's find out how much of the beginning of the line we can
+  	 * reuse without modification.  */
+*** ../vim-7.2.157/src/version.c	Wed Apr 22 16:42:24 2009
+--- src/version.c	Wed Apr 22 17:42:19 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     158,
+  /**/
+
+-- 
+ARTHUR:        What?
+BLACK KNIGHT:  None shall pass.
+ARTHUR:        I have no quarrel with you, good Sir knight, but I must cross
+               this bridge.
+BLACK KNIGHT:  Then you shall die.
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.159 b/source/ap/vim/patches/7.2.159
new file mode 100644
index 000000000..8d496ad87
--- /dev/null
+++ b/source/ap/vim/patches/7.2.159
@@ -0,0 +1,71 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.159
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.159
+Problem:    When $x_includes ends up being "NONE" configure fails.
+Solution:   Check for $x_includes not to be "NONE" (Rainer)
+Files:	    src/auto/configure, src/configure.in
+
+
+*** ../vim-7.2.158/src/auto/configure	Mon Mar  2 02:44:54 2009
+--- src/auto/configure	Wed Apr 22 14:37:24 2009
+***************
+*** 15519,15525 ****
+  if test "$enable_multibyte" = "yes"; then
+    cflags_save=$CFLAGS
+    ldflags_save=$LDFLAGS
+!   if test -n "$x_includes" ; then
+      CFLAGS="$CFLAGS -I$x_includes"
+      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
+      { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
+--- 15519,15525 ----
+  if test "$enable_multibyte" = "yes"; then
+    cflags_save=$CFLAGS
+    ldflags_save=$LDFLAGS
+!   if test "x$x_includes" != "xNONE" ; then
+      CFLAGS="$CFLAGS -I$x_includes"
+      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
+      { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
+*** ../vim-7.2.158/src/configure.in	Mon Mar  2 02:44:54 2009
+--- src/configure.in	Wed Apr 22 14:35:57 2009
+***************
+*** 2952,2958 ****
+  if test "$enable_multibyte" = "yes"; then
+    cflags_save=$CFLAGS
+    ldflags_save=$LDFLAGS
+!   if test -n "$x_includes" ; then
+      CFLAGS="$CFLAGS -I$x_includes"
+      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
+      AC_MSG_CHECKING(whether X_LOCALE needed)
+--- 2952,2958 ----
+  if test "$enable_multibyte" = "yes"; then
+    cflags_save=$CFLAGS
+    ldflags_save=$LDFLAGS
+!   if test "x$x_includes" != "xNONE" ; then
+      CFLAGS="$CFLAGS -I$x_includes"
+      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
+      AC_MSG_CHECKING(whether X_LOCALE needed)
+*** ../vim-7.2.158/src/version.c	Wed Apr 22 17:42:53 2009
+--- src/version.c	Wed Apr 22 17:49:50 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     159,
+  /**/
+
+-- 
+"Hegel was right when he said that we learn from history that man can
+never learn anything from history."       (George Bernard Shaw)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.160 b/source/ap/vim/patches/7.2.160
new file mode 100644
index 000000000..9ef197d4e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.160
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.160
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.160
+Problem:    Search pattern not freed on exit when 'rightleft' set.
+Solution:   Free mr_pattern_alloced.
+Files:	    src/search.c
+
+
+*** ../vim-7.2.159/src/search.c	Wed Apr 22 16:42:24 2009
+--- src/search.c	Wed Apr 22 12:26:19 2009
+***************
+*** 345,350 ****
+--- 345,359 ----
+  {
+      vim_free(spats[0].pat);
+      vim_free(spats[1].pat);
++ 
++ # ifdef FEAT_RIGHTLEFT
++     if (mr_pattern_alloced)
++     {
++         vim_free(mr_pattern);
++         mr_pattern_alloced = FALSE;
++         mr_pattern = NULL;
++     }
++ # endif
+  }
+  #endif
+  
+*** ../vim-7.2.159/src/version.c	Wed Apr 22 17:50:53 2009
+--- src/version.c	Wed Apr 22 18:42:25 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     160,
+  /**/
+
+-- 
+    f y cn rd ths thn y cn hv grt jb n cmptr prgrmmng
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.161 b/source/ap/vim/patches/7.2.161
new file mode 100644
index 000000000..576a03da9
--- /dev/null
+++ b/source/ap/vim/patches/7.2.161
@@ -0,0 +1,205 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.161
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.161
+Problem:    Folds messed up in other tab page. (Vlad Irnov)
+Solution:   Instead of going over all windows in current tab page go over all
+	    windows in all tab pages.  Also free memory for location lists in
+	    other tab pages when exiting. (Lech Lorens)
+Files:	    src/fileio.c, src/mark.c, src/misc1.c, src/misc2.c
+
+
+*** ../vim-7.2.160/src/fileio.c	Wed Mar 18 15:40:03 2009
+--- src/fileio.c	Wed Apr 22 15:46:35 2009
+***************
+*** 6846,6855 ****
+  #endif
+  #ifdef FEAT_FOLDING
+  	{
+! 	    win_T *wp;
+  
+  	    /* Update folds unless they are defined manually. */
+! 	    FOR_ALL_WINDOWS(wp)
+  		if (wp->w_buffer == curwin->w_buffer
+  			&& !foldmethodIsManual(wp))
+  		    foldUpdateAll(wp);
+--- 6846,6856 ----
+  #endif
+  #ifdef FEAT_FOLDING
+  	{
+! 	    win_T	*wp;
+! 	    tabpage_T	*tp;
+  
+  	    /* Update folds unless they are defined manually. */
+! 	    FOR_ALL_TAB_WINDOWS(tp, wp)
+  		if (wp->w_buffer == curwin->w_buffer
+  			&& !foldmethodIsManual(wp))
+  		    foldUpdateAll(wp);
+*** ../vim-7.2.160/src/mark.c	Sun Nov  9 13:43:25 2008
+--- src/mark.c	Wed Apr 22 17:32:29 2009
+***************
+*** 1023,1028 ****
+--- 1023,1031 ----
+      int		fnum = curbuf->b_fnum;
+      linenr_T	*lp;
+      win_T	*win;
++ #ifdef FEAT_WINDOWS
++     tabpage_T	*tab;
++ #endif
+  
+      if (line2 < line1 && amount_after == 0L)	    /* nothing to do */
+  	return;
+***************
+*** 1064,1070 ****
+  	/* quickfix marks */
+  	qf_mark_adjust(NULL, line1, line2, amount, amount_after);
+  	/* location lists */
+! 	FOR_ALL_WINDOWS(win)
+  	    qf_mark_adjust(win, line1, line2, amount, amount_after);
+  #endif
+  
+--- 1067,1073 ----
+  	/* quickfix marks */
+  	qf_mark_adjust(NULL, line1, line2, amount, amount_after);
+  	/* location lists */
+! 	FOR_ALL_TAB_WINDOWS(tab, win)
+  	    qf_mark_adjust(win, line1, line2, amount, amount_after);
+  #endif
+  
+***************
+*** 1086,1092 ****
+      /*
+       * Adjust items in all windows related to the current buffer.
+       */
+!     FOR_ALL_WINDOWS(win)
+      {
+  #ifdef FEAT_JUMPLIST
+  	if (!cmdmod.lockmarks)
+--- 1089,1095 ----
+      /*
+       * Adjust items in all windows related to the current buffer.
+       */
+!     FOR_ALL_TAB_WINDOWS(tab, win)
+      {
+  #ifdef FEAT_JUMPLIST
+  	if (!cmdmod.lockmarks)
+*** ../vim-7.2.160/src/misc1.c	Wed Mar 18 15:40:03 2009
+--- src/misc1.c	Wed Apr 22 17:32:46 2009
+***************
+*** 2717,2722 ****
+--- 2717,2725 ----
+      long	xtra;
+  {
+      win_T	*wp;
++ #ifdef FEAT_WINDOWS
++     tabpage_T	*tp;
++ #endif
+      int		i;
+  #ifdef FEAT_JUMPLIST
+      int		cols;
+***************
+*** 2769,2775 ****
+  		    curbuf->b_changelistlen = JUMPLISTSIZE - 1;
+  		    mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
+  					  sizeof(pos_T) * (JUMPLISTSIZE - 1));
+! 		    FOR_ALL_WINDOWS(wp)
+  		    {
+  			/* Correct position in changelist for other windows on
+  			 * this buffer. */
+--- 2772,2778 ----
+  		    curbuf->b_changelistlen = JUMPLISTSIZE - 1;
+  		    mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
+  					  sizeof(pos_T) * (JUMPLISTSIZE - 1));
+! 		    FOR_ALL_TAB_WINDOWS(tp, wp)
+  		    {
+  			/* Correct position in changelist for other windows on
+  			 * this buffer. */
+***************
+*** 2777,2783 ****
+  			    --wp->w_changelistidx;
+  		    }
+  		}
+! 		FOR_ALL_WINDOWS(wp)
+  		{
+  		    /* For other windows, if the position in the changelist is
+  		     * at the end it stays at the end. */
+--- 2780,2786 ----
+  			    --wp->w_changelistidx;
+  		    }
+  		}
+! 		FOR_ALL_TAB_WINDOWS(tp, wp)
+  		{
+  		    /* For other windows, if the position in the changelist is
+  		     * at the end it stays at the end. */
+***************
+*** 2796,2802 ****
+  #endif
+      }
+  
+!     FOR_ALL_WINDOWS(wp)
+      {
+  	if (wp->w_buffer == curbuf)
+  	{
+--- 2799,2805 ----
+  #endif
+      }
+  
+!     FOR_ALL_TAB_WINDOWS(tp, wp)
+      {
+  	if (wp->w_buffer == curbuf)
+  	{
+*** ../vim-7.2.160/src/misc2.c	Wed Mar 11 17:27:46 2009
+--- src/misc2.c	Wed Apr 22 15:46:35 2009
+***************
+*** 1075,1085 ****
+  
+  #ifdef FEAT_QUICKFIX
+      {
+! 	win_T	*win;
+  
+  	qf_free_all(NULL);
+  	/* Free all location lists */
+! 	FOR_ALL_WINDOWS(win)
+  	    qf_free_all(win);
+      }
+  #endif
+--- 1075,1086 ----
+  
+  #ifdef FEAT_QUICKFIX
+      {
+! 	win_T	    *win;
+! 	tabpage_T   *tab;
+  
+  	qf_free_all(NULL);
+  	/* Free all location lists */
+! 	FOR_ALL_TAB_WINDOWS(tab, win)
+  	    qf_free_all(win);
+      }
+  #endif
+*** ../vim-7.2.160/src/version.c	Wed Apr 22 18:43:06 2009
+--- src/version.c	Wed Apr 29 10:59:01 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     161,
+  /**/
+
+-- 
+CONCORDE:  Quickly, sir, come this way!
+LAUNCELOT: No!  It's not right for my idiom.  I must escape more  ... more ...
+CONCORDE:  Dramatically, sir?
+LAUNCELOT: Dramatically.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.162 b/source/ap/vim/patches/7.2.162
new file mode 100644
index 000000000..f04d6e1b3
--- /dev/null
+++ b/source/ap/vim/patches/7.2.162
@@ -0,0 +1,75 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.162
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.162
+Problem:    The quickfix window may get wrong filetype.
+Solution:   Do not detect the filetype for the quickfix window. (Lech Lorens)
+Files:	    src/quickfix.c
+
+
+*** ../vim-7.2.161/src/quickfix.c	Sun Feb 22 02:36:36 2009
+--- src/quickfix.c	Wed Apr 22 17:34:57 2009
+***************
+*** 2346,2352 ****
+  	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
+  								   OPT_LOCAL);
+  	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
+! 	    set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL);
+  	}
+  
+  	/* Only set the height when still in the same tab page and there is no
+--- 2346,2358 ----
+  	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
+  								   OPT_LOCAL);
+  	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
+! #ifdef FEAT_DIFF
+! 	    curwin->w_p_diff = FALSE;
+! #endif
+! #ifdef FEAT_FOLDING
+! 	    set_option_value((char_u *)"fdm", 0L, (char_u *)"manual",
+! 								   OPT_LOCAL);
+! #endif
+  	}
+  
+  	/* Only set the height when still in the same tab page and there is no
+***************
+*** 2607,2616 ****
+--- 2613,2624 ----
+      curbuf->b_p_ma = FALSE;
+  
+  #ifdef FEAT_AUTOCMD
++     keep_filetype = TRUE;		/* don't detect 'filetype' */
+      apply_autocmds(EVENT_BUFREADPOST, (char_u *)"quickfix", NULL,
+  							       FALSE, curbuf);
+      apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL,
+  							       FALSE, curbuf);
++     keep_filetype = FALSE;
+  #endif
+  
+      /* make sure it will be redrawn */
+*** ../vim-7.2.161/src/version.c	Wed Apr 29 11:00:09 2009
+--- src/version.c	Wed Apr 29 11:49:09 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     162,
+  /**/
+
+-- 
+Yesterday is history.
+Tomorrow is a mystery.
+Today is a gift.
+That's why it is called 'present'.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.163 b/source/ap/vim/patches/7.2.163
new file mode 100644
index 000000000..6db9f0986
--- /dev/null
+++ b/source/ap/vim/patches/7.2.163
@@ -0,0 +1,51 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.163
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.163
+Problem:    The command line window may get folding.
+Solution:   Default to no/manual folding. (Lech Lorens)
+Files:	    src/ex_getln.c
+
+
+*** ../vim-7.2.162/src/ex_getln.c	Wed Apr 22 13:50:14 2009
+--- src/ex_getln.c	Wed Apr 22 16:12:54 2009
+***************
+*** 6073,6078 ****
+--- 6073,6081 ----
+      set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
+      set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
+      curbuf->b_p_ma = TRUE;
++ #ifdef FEAT_FOLDING
++     curwin->w_p_fen = FALSE;
++ #endif
+  # ifdef FEAT_RIGHTLEFT
+      curwin->w_p_rl = cmdmsg_rl;
+      cmdmsg_rl = FALSE;
+*** ../vim-7.2.162/src/version.c	Wed Apr 29 11:49:57 2009
+--- src/version.c	Wed Apr 29 12:02:56 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     163,
+  /**/
+
+-- 
+   [SIR LAUNCELOT runs back up the stairs, grabs a rope
+   of the wall and swings out over the heads of the CROWD in a
+   swashbuckling manner towards a large window.  He stops just short
+   of the window and is left swing pathetically back and forth.]
+LAUNCELOT: Excuse me ... could somebody give me a push ...
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.164 b/source/ap/vim/patches/7.2.164
new file mode 100644
index 000000000..f10bd210f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.164
@@ -0,0 +1,139 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.164
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.164
+Problem:    When 'showbreak' is set the size of the Visual block may be
+	    reported wrong. (Eduardo Daudt Flach)
+Solution:   Temporarily make 'sbr' empty.
+Files:	    src/normal.c, src/ops.c
+
+
+*** ../vim-7.2.163/src/normal.c	Sat Feb 21 20:27:00 2009
+--- src/normal.c	Wed Apr 22 18:30:20 2009
+***************
+*** 3709,3721 ****
+  #ifdef FEAT_VISUAL
+      if (VIsual_active && !char_avail())
+      {
+! 	int		i = lt(VIsual, curwin->w_cursor);
+  	long		lines;
+  	colnr_T		leftcol, rightcol;
+  	linenr_T	top, bot;
+  
+  	/* Show the size of the Visual area. */
+! 	if (i)
+  	{
+  	    top = VIsual.lnum;
+  	    bot = curwin->w_cursor.lnum;
+--- 3709,3721 ----
+  #ifdef FEAT_VISUAL
+      if (VIsual_active && !char_avail())
+      {
+! 	int		cursor_bot = lt(VIsual, curwin->w_cursor);
+  	long		lines;
+  	colnr_T		leftcol, rightcol;
+  	linenr_T	top, bot;
+  
+  	/* Show the size of the Visual area. */
+! 	if (cursor_bot)
+  	{
+  	    top = VIsual.lnum;
+  	    bot = curwin->w_cursor.lnum;
+***************
+*** 3734,3747 ****
+  
+  	if (VIsual_mode == Ctrl_V)
+  	{
+  	    getvcols(curwin, &curwin->w_cursor, &VIsual, &leftcol, &rightcol);
+  	    sprintf((char *)showcmd_buf, "%ldx%ld", lines,
+  					      (long)(rightcol - leftcol + 1));
+  	}
+  	else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum)
+  	    sprintf((char *)showcmd_buf, "%ld", lines);
+  	else
+! 	    sprintf((char *)showcmd_buf, "%ld", (long)(i
+  		    ? curwin->w_cursor.col - VIsual.col
+  		    : VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e'));
+  	showcmd_buf[SHOWCMD_COLS] = NUL;	/* truncate */
+--- 3734,3756 ----
+  
+  	if (VIsual_mode == Ctrl_V)
+  	{
++ #ifdef FEAT_LINEBREAK
++ 	    char_u *saved_sbr = p_sbr;
++ 
++ 	    /* Make 'sbr' empty for a moment to get the correct size. */
++ 	    p_sbr = empty_option;
++ #endif
+  	    getvcols(curwin, &curwin->w_cursor, &VIsual, &leftcol, &rightcol);
++ #ifdef FEAT_LINEBREAK
++ 	    p_sbr = saved_sbr;
++ #endif
+  	    sprintf((char *)showcmd_buf, "%ldx%ld", lines,
+  					      (long)(rightcol - leftcol + 1));
+  	}
+  	else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum)
+  	    sprintf((char *)showcmd_buf, "%ld", lines);
+  	else
+! 	    sprintf((char *)showcmd_buf, "%ld", (long)(cursor_bot
+  		    ? curwin->w_cursor.col - VIsual.col
+  		    : VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e'));
+  	showcmd_buf[SHOWCMD_COLS] = NUL;	/* truncate */
+*** ../vim-7.2.163/src/ops.c	Wed Apr 22 17:42:53 2009
+--- src/ops.c	Wed Apr 22 18:30:07 2009
+***************
+*** 392,398 ****
+      colnr_T		ws_vcol;
+      int			i = 0, j = 0;
+      int			len;
+- 
+  #ifdef FEAT_RIGHTLEFT
+      int			old_p_ri = p_ri;
+  
+--- 392,397 ----
+***************
+*** 6284,6294 ****
+--- 6283,6302 ----
+  
+  	    if (VIsual_mode == Ctrl_V)
+  	    {
++ #ifdef FEAT_LINEBREAK
++ 		char_u * saved_sbr = p_sbr;
++ 
++ 		/* Make 'sbr' empty for a moment to get the correct size. */
++ 		p_sbr = empty_option;
++ #endif
+  		oparg.is_VIsual = 1;
+  		oparg.block_mode = TRUE;
+  		oparg.op_type = OP_NOP;
+  		getvcols(curwin, &min_pos, &max_pos,
+  					  &oparg.start_vcol, &oparg.end_vcol);
++ #ifdef FEAT_LINEBREAK
++ 		p_sbr = saved_sbr;
++ #endif
+  		if (curwin->w_curswant == MAXCOL)
+  		    oparg.end_vcol = MAXCOL;
+  		/* Swap the start, end vcol if needed */
+*** ../vim-7.2.163/src/version.c	Wed Apr 29 12:03:35 2009
+--- src/version.c	Wed Apr 29 17:38:05 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     164,
+  /**/
+
+-- 
+There are 10 kinds of people: Those who understand binary and those who don't.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.165 b/source/ap/vim/patches/7.2.165
new file mode 100644
index 000000000..aeded0a0f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.165
@@ -0,0 +1,58 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.165
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.165
+Problem:    The argument for the FuncUndefined autocmd event is expanded like
+	    a file name.
+Solution:   Don't try expanding it. (Wang Xu)
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.164/src/fileio.c	Wed Apr 29 11:00:09 2009
+--- src/fileio.c	Wed Apr 29 18:01:06 2009
+***************
+*** 8785,8793 ****
+      else
+      {
+  	sfname = vim_strsave(fname);
+! 	/* Don't try expanding FileType, Syntax, WindowID or QuickFixCmd* */
+  	if (event == EVENT_FILETYPE
+  		|| event == EVENT_SYNTAX
+  		|| event == EVENT_REMOTEREPLY
+  		|| event == EVENT_SPELLFILEMISSING
+  		|| event == EVENT_QUICKFIXCMDPRE
+--- 8785,8795 ----
+      else
+      {
+  	sfname = vim_strsave(fname);
+! 	/* Don't try expanding FileType, Syntax, FuncUndefined, WindowID or
+! 	 * QuickFixCmd* */
+  	if (event == EVENT_FILETYPE
+  		|| event == EVENT_SYNTAX
++ 		|| event == EVENT_FUNCUNDEFINED
+  		|| event == EVENT_REMOTEREPLY
+  		|| event == EVENT_SPELLFILEMISSING
+  		|| event == EVENT_QUICKFIXCMDPRE
+*** ../vim-7.2.164/src/version.c	Wed Apr 29 17:39:17 2009
+--- src/version.c	Wed Apr 29 18:00:43 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     165,
+  /**/
+
+-- 
+Be nice to your kids...  they'll be the ones choosing your nursing home.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.166 b/source/ap/vim/patches/7.2.166
new file mode 100644
index 000000000..0461b31dd
--- /dev/null
+++ b/source/ap/vim/patches/7.2.166
@@ -0,0 +1,425 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.166
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.166
+Problem:    No completion for ":sign" command.
+Solution:   Add ":sign" completion. (Dominique Pelle)
+Files:	    src/ex_cmds.c, src/ex_docmd.c, src/ex_getln.c, src/vim.h,
+	    src/proto/ex_cmds.pro
+
+
+*** ../vim-7.2.165/src/ex_cmds.c	Tue Feb 24 04:28:40 2009
+--- src/ex_cmds.c	Wed Apr 29 17:08:27 2009
+***************
+*** 6543,6562 ****
+  static void sign_list_defined __ARGS((sign_T *sp));
+  static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
+  
+! /*
+!  * ":sign" command
+!  */
+!     void
+! ex_sign(eap)
+!     exarg_T	*eap;
+! {
+!     char_u	*arg = eap->arg;
+!     char_u	*p;
+!     int		idx;
+!     sign_T	*sp;
+!     sign_T	*sp_prev;
+!     buf_T	*buf;
+!     static char	*cmds[] = {
+  			"define",
+  #define SIGNCMD_DEFINE	0
+  			"undefine",
+--- 6543,6549 ----
+  static void sign_list_defined __ARGS((sign_T *sp));
+  static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
+  
+! static char *cmds[] = {
+  			"define",
+  #define SIGNCMD_DEFINE	0
+  			"undefine",
+***************
+*** 6569,6590 ****
+  #define SIGNCMD_UNPLACE	4
+  			"jump",
+  #define SIGNCMD_JUMP	5
+  #define SIGNCMD_LAST	6
+!     };
+  
+      /* Parse the subcommand. */
+      p = skiptowhite(arg);
+!     if (*p != NUL)
+! 	*p++ = NUL;
+!     for (idx = 0; ; ++idx)
+      {
+! 	if (idx == SIGNCMD_LAST)
+! 	{
+! 	    EMSG2(_("E160: Unknown sign command: %s"), arg);
+! 	    return;
+! 	}
+! 	if (STRCMP(arg, cmds[idx]) == 0)
+! 	    break;
+      }
+      arg = skipwhite(p);
+  
+--- 6556,6606 ----
+  #define SIGNCMD_UNPLACE	4
+  			"jump",
+  #define SIGNCMD_JUMP	5
++ 			NULL
+  #define SIGNCMD_LAST	6
+! };
+! 
+! /*
+!  * Find index of a ":sign" subcmd from its name.
+!  * "*end_cmd" must be writable.
+!  */
+!     static int
+! sign_cmd_idx(begin_cmd, end_cmd)
+!     char	*begin_cmd;	/* begin of sign subcmd */
+!     char	*end_cmd;	/* just after sign subcmd */
+! {
+!     int		idx;
+!     char	save = *end_cmd;
+! 
+!     *end_cmd = NUL;
+!     for (idx = 0; ; ++idx)
+! 	if (cmds[idx] == NULL || STRCMP(begin_cmd, cmds[idx]) == 0)
+! 	    break;
+!     *end_cmd = save;
+!     return idx;
+! }
+! 
+! /*
+!  * ":sign" command
+!  */
+!     void
+! ex_sign(eap)
+!     exarg_T	*eap;
+! {
+!     char_u	*arg = eap->arg;
+!     char_u	*p;
+!     int		idx;
+!     sign_T	*sp;
+!     sign_T	*sp_prev;
+!     buf_T	*buf;
+  
+      /* Parse the subcommand. */
+      p = skiptowhite(arg);
+!     idx = sign_cmd_idx(arg, p);
+!     if (idx == SIGNCMD_LAST)
+      {
+! 	EMSG2(_("E160: Unknown sign command: %s"), arg);
+! 	return;
+      }
+      arg = skipwhite(p);
+  
+***************
+*** 7110,7115 ****
+--- 7126,7311 ----
+  }
+  #endif
+  
++ #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
++ static enum
++ {
++     EXP_SUBCMD,		/* expand :sign sub-commands */
++     EXP_DEFINE,		/* expand :sign define {name} args */
++     EXP_PLACE,		/* expand :sign place {id} args */
++     EXP_UNPLACE,	/* expand :sign unplace" */
++     EXP_SIGN_NAMES	/* expand with name of placed signs */
++ } expand_what;
++ 
++ /*
++  * Function given to ExpandGeneric() to obtain the sign command
++  * expansion.
++  */
++ /*ARGSUSED*/
++     char_u *
++ get_sign_name(xp, idx)
++     expand_T	*xp;
++     int		idx;
++ {
++     sign_T	*sp;
++     int		current_idx;
++ 
++     switch (expand_what)
++     {
++     case EXP_SUBCMD:
++ 	return (char_u *)cmds[idx];
++     case EXP_DEFINE:
++ 	{
++ 	    char *define_arg[] =
++ 	    {
++ 		"icon=", "linehl=", "text=", "texthl=", NULL
++ 	    };
++ 	    return (char_u *)define_arg[idx];
++ 	}
++     case EXP_PLACE:
++ 	{
++ 	    char *place_arg[] =
++ 	    {
++ 		"line=", "name=", "file=", "buffer=", NULL
++ 	    };
++ 	    return (char_u *)place_arg[idx];
++ 	}
++     case EXP_UNPLACE:
++ 	{
++ 	    char *unplace_arg[] = { "file=", "buffer=", NULL };
++ 	    return (char_u *)unplace_arg[idx];
++ 	}
++     case EXP_SIGN_NAMES:
++ 	/* Complete with name of signs already defined */
++ 	current_idx = 0;
++ 	for (sp = first_sign; sp != NULL; sp = sp->sn_next)
++ 	    if (current_idx++ == idx)
++ 		return sp->sn_name;
++ 	return NULL;
++     default:
++ 	return NULL;
++     }
++ }
++ 
++ /*
++  * Handle command line completion for :sign command.
++  */
++     void
++ set_context_in_sign_cmd(xp, arg)
++     expand_T	*xp;
++     char_u	*arg;
++ {
++     char_u	*p;
++     char_u	*end_subcmd;
++     char_u	*last;
++     int		cmd_idx;
++     char_u	*begin_subcmd_args;
++ 
++     /* Default: expand subcommands. */
++     xp->xp_context = EXPAND_SIGN;
++     expand_what = EXP_SUBCMD;
++     xp->xp_pattern = arg;
++ 
++     end_subcmd = skiptowhite(arg);
++     if (*end_subcmd == NUL)
++ 	/* expand subcmd name
++ 	 * :sign {subcmd}<CTRL-D>*/
++ 	return;
++ 
++     cmd_idx = sign_cmd_idx(arg, end_subcmd);
++ 
++     /* :sign {subcmd} {subcmd_args}
++      *                |
++      *                begin_subcmd_args */
++     begin_subcmd_args = skipwhite(end_subcmd);
++     p = skiptowhite(begin_subcmd_args);
++     if (*p == NUL)
++     {
++ 	/*
++ 	 * Expand first argument of subcmd when possible.
++ 	 * For ":jump {id}" and ":unplace {id}", we could
++ 	 * possibly expand the ids of all signs already placed.
++ 	 */
++ 	xp->xp_pattern = begin_subcmd_args;
++ 	switch (cmd_idx)
++ 	{
++ 	    case SIGNCMD_LIST:
++ 	    case SIGNCMD_UNDEFINE:
++ 		/* :sign list <CTRL-D>
++ 		 * :sign undefine <CTRL-D> */
++ 		expand_what = EXP_SIGN_NAMES;
++ 		break;
++ 	    default:
++ 		xp->xp_context = EXPAND_NOTHING;
++ 	}
++ 	return;
++     }
++ 
++     /* expand last argument of subcmd */
++ 
++     /* :sign define {name} {args}...
++      *              |
++      *              p */
++ 
++     /* Loop until reaching last argument. */
++     do
++     {
++ 	p = skipwhite(p);
++ 	last = p;
++ 	p = skiptowhite(p);
++     } while (*p != NUL);
++ 
++     p = vim_strchr(last, '=');
++ 
++     /* :sign define {name} {args}... {last}=
++      *                               |     |
++      *                            last     p */
++     if (p == NUL)
++     {
++ 	/* Expand last argument name (before equal sign). */
++ 	xp->xp_pattern = last;
++ 	switch (cmd_idx)
++ 	{
++ 	    case SIGNCMD_DEFINE:
++ 		expand_what = EXP_DEFINE;
++ 		break;
++ 	    case SIGNCMD_PLACE:
++ 		expand_what = EXP_PLACE;
++ 		break;
++ 	    case SIGNCMD_JUMP:
++ 	    case SIGNCMD_UNPLACE:
++ 		expand_what = EXP_UNPLACE;
++ 		break;
++ 	    default:
++ 		xp->xp_context = EXPAND_NOTHING;
++ 	}
++     }
++     else
++     {
++ 	/* Expand last argument value (after equal sign). */
++ 	xp->xp_pattern = p + 1;
++ 	switch (cmd_idx)
++ 	{
++ 	    case SIGNCMD_DEFINE:
++ 		if (STRNCMP(last, "texthl", p - last) == 0 ||
++ 		    STRNCMP(last, "linehl", p - last) == 0)
++ 		    xp->xp_context = EXPAND_HIGHLIGHT;
++ 		else if (STRNCMP(last, "icon", p - last) == 0)
++ 		    xp->xp_context = EXPAND_FILES;
++ 		else
++ 		    xp->xp_context = EXPAND_NOTHING;
++ 		break;
++ 	    case SIGNCMD_PLACE:
++ 		if (STRNCMP(last, "name", p - last) == 0)
++ 		    expand_what = EXP_SIGN_NAMES;
++ 		else
++ 		    xp->xp_context = EXPAND_NOTHING;
++ 		break;
++ 	    default:
++ 		xp->xp_context = EXPAND_NOTHING;
++ 	}
++     }
++ }
++ #endif
+  #endif
+  
+  #if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO)
+*** ../vim-7.2.165/src/ex_docmd.c	Wed Apr 22 16:22:44 2009
+--- src/ex_docmd.c	Wed Apr 29 17:05:23 2009
+***************
+*** 3695,3700 ****
+--- 3695,3705 ----
+  	    set_context_in_cscope_cmd(xp, arg, ea.cmdidx);
+  	    break;
+  #endif
++ #ifdef FEAT_SIGNS
++ 	case CMD_sign:
++ 	    set_context_in_sign_cmd(xp, arg);
++ 	    break;
++ #endif
+  #ifdef FEAT_LISTCMDS
+  	case CMD_bdelete:
+  	case CMD_bwipeout:
+***************
+*** 5218,5223 ****
+--- 5223,5231 ----
+      {EXPAND_MENUS, "menu"},
+      {EXPAND_SETTINGS, "option"},
+      {EXPAND_SHELLCMD, "shellcmd"},
++ #if defined(FEAT_SIGNS)
++     {EXPAND_SIGN, "sign"},
++ #endif
+      {EXPAND_TAGS, "tag"},
+      {EXPAND_TAGS_LISTFILES, "tag_listfiles"},
+      {EXPAND_USER_VARS, "var"},
+*** ../vim-7.2.165/src/ex_getln.c	Wed Apr 29 12:03:35 2009
+--- src/ex_getln.c	Wed Apr 29 12:51:42 2009
+***************
+*** 325,331 ****
+  #endif
+  
+  #ifdef FEAT_DIGRAPHS
+!     do_digraph(-1);		/* init digraph typahead */
+  #endif
+  
+      /*
+--- 325,331 ----
+  #endif
+  
+  #ifdef FEAT_DIGRAPHS
+!     do_digraph(-1);		/* init digraph typeahead */
+  #endif
+  
+      /*
+***************
+*** 4521,4526 ****
+--- 4521,4529 ----
+  #ifdef FEAT_CSCOPE
+  	    {EXPAND_CSCOPE, get_cscope_name, TRUE},
+  #endif
++ #ifdef FEAT_SIGNS
++ 	    {EXPAND_SIGN, get_sign_name, TRUE},
++ #endif
+  #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
+  	&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
+  	    {EXPAND_LANGUAGE, get_lang_arg, TRUE},
+*** ../vim-7.2.165/src/vim.h	Wed Mar 18 12:50:58 2009
+--- src/vim.h	Wed Apr 29 12:51:42 2009
+***************
+*** 709,714 ****
+--- 709,715 ----
+  #define EXPAND_USER_LIST	31
+  #define EXPAND_SHELLCMD		32
+  #define EXPAND_CSCOPE		33
++ #define EXPAND_SIGN		34
+  
+  /* Values for exmode_active (0 is no exmode) */
+  #define EXMODE_NORMAL		1
+*** ../vim-7.2.165/src/proto/ex_cmds.pro	Tue Feb 24 04:28:40 2009
+--- src/proto/ex_cmds.pro	Wed Apr 29 17:10:29 2009
+***************
+*** 40,46 ****
+  int read_viminfo_sub_string __ARGS((vir_T *virp, int force));
+  void write_viminfo_sub_string __ARGS((FILE *fp));
+  void free_old_sub __ARGS((void));
+- void free_signs __ARGS((void));
+  int prepare_tagpreview __ARGS((int undo_sync));
+  void ex_help __ARGS((exarg_T *eap));
+  char_u *check_help_lang __ARGS((char_u *arg));
+--- 40,45 ----
+***************
+*** 56,60 ****
+--- 55,62 ----
+  char_u *sign_get_text __ARGS((int typenr));
+  void *sign_get_image __ARGS((int typenr));
+  char_u *sign_typenr2name __ARGS((int typenr));
++ void free_signs __ARGS((void));
++ char_u *get_sign_name __ARGS((expand_T *xp, int idx));
++ void set_context_in_sign_cmd __ARGS((expand_T *xp, char_u *arg));
+  void ex_drop __ARGS((exarg_T *eap));
+  /* vim: set ft=c : */
+*** ../vim-7.2.165/src/version.c	Wed Apr 29 18:01:23 2009
+--- src/version.c	Wed Apr 29 18:43:14 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     166,
+  /**/
+
+-- 
+Did you ever stop to think...  and forget to start again?
+                                  -- Steven Wright
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.167 b/source/ap/vim/patches/7.2.167
new file mode 100644
index 000000000..9bf08e625
--- /dev/null
+++ b/source/ap/vim/patches/7.2.167
@@ -0,0 +1,1873 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.167
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.167
+Problem:    Splint doesn't work well for checking the code.
+Solution:   Add splint arguments in the Makefile.  Exclude some code from
+	    splint that it can't handle.  Tune splint arguments to give
+	    reasonable errors.  Add a filter for removing false warnings from
+	    splint output.  Many small changes to avoid warnings.  More to
+	    follow...
+Files:	    Filelist, src/Makefile, src/buffer.c, src/charset.c,
+	    src/cleanlint.vim, src/digraph.c, src/edit.c, src/ex_cmds.c,
+	    src/globals.h, src/ops.c, src/os_unix.c, src/os_unix.h,
+	    src/proto/buffer.pro, src/proto/edit.pro, src/screen.c,
+	    src/structs.h
+
+*** ../vim-7.2.166/Filelist	2008-09-20 16:26:10.000000000 +0200
+--- Filelist	2009-05-05 21:45:49.000000000 +0200
+***************
+*** 139,144 ****
+--- 139,145 ----
+  		src/INSTALL \
+  		src/INSTALLx.txt \
+  		src/Makefile \
++ 		src/cleanlint.vim \
+  		src/auto/configure \
+  		src/config.aap.in \
+  		src/config.h.in \
+***************
+*** 683,691 ****
+  		runtime/spell/??/main.aap \
+  		runtime/spell/yi/README.txt \
+  		runtime/spell/main.aap \
+- 		runtime/spell/cleanadd.vim \
+  		runtime/spell/*.vim \
+- 		runtime/spell/fixdup \
+  
+  # generic language files, binary
+  LANG_GEN_BIN = \
+--- 684,690 ----
+*** ../vim-7.2.166/src/Makefile	2009-04-29 18:44:45.000000000 +0200
+--- src/Makefile	2009-05-06 00:23:15.000000000 +0200
+***************
+*** 551,557 ****
+  # }}}
+  
+  # LINT - for running lint
+! LINT_OPTIONS = -beprxzF
+  
+  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
+  # Might not work with GUI or Perl.
+--- 551,562 ----
+  # }}}
+  
+  # LINT - for running lint
+! #  For standard lint
+! #LINT = lint
+! #LINT_OPTIONS = -beprxzF
+! #  For splint  (see cleanlint.vim for filtering the output)
+! LINT = splint
+! LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999
+  
+  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
+  # Might not work with GUI or Perl.
+***************
+*** 1259,1274 ****
+  #     This is for cproto 3 patchlevel 8 or below
+  #     __inline, __attribute__ and __extension__ are not recognized by cproto
+  #     G_IMPLEMENT_INLINES is to avoid functions defined in glib/gutils.h.
+! NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \
+! 	  -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
+! 	  -D__extension__= -D__restrict="" \
+! 	  -D__gnuc_va_list=char -D__builtin_va_list=char
+  
+  #
+! #     This is for cproto 3 patchlevel 9 or above (currently 4.6)
+  #     __inline and __attribute__ are now recognized by cproto
+  #     -D"foo()=" is not supported by all compilers so do not use it
+! # NO_ATTR=
+  #
+  #     maybe the "/usr/bin/cc -E" has to be adjusted for some systems
+  # This is for cproto 3.5 patchlevel 3:
+--- 1264,1279 ----
+  #     This is for cproto 3 patchlevel 8 or below
+  #     __inline, __attribute__ and __extension__ are not recognized by cproto
+  #     G_IMPLEMENT_INLINES is to avoid functions defined in glib/gutils.h.
+! #NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \
+! #	  -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
+! #	  -D__extension__= -D__restrict="" \
+! #	  -D__gnuc_va_list=char -D__builtin_va_list=char
+  
+  #
+! #     This is for cproto 3 patchlevel 9 or above (currently 4.6, 4.7g)
+  #     __inline and __attribute__ are now recognized by cproto
+  #     -D"foo()=" is not supported by all compilers so do not use it
+! NO_ATTR=
+  #
+  #     maybe the "/usr/bin/cc -E" has to be adjusted for some systems
+  # This is for cproto 3.5 patchlevel 3:
+***************
+*** 1432,1437 ****
+--- 1437,1443 ----
+  	$(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) $(NETBEANS_SRC)
+  #LINT_SRC = $(SRC)
+  #LINT_SRC = $(ALL_SRC)
++ #LINT_SRC = $(BASIC_SRC)
+  
+  OBJ = \
+  	objects/buffer.o \
+***************
+*** 2272,2283 ****
+  
+  # Run lint.  Clean up the *.ln files that are sometimes left behind.
+  lint:
+! 	lint $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC)
+  	-rm -f *.ln
+  
+  # Check dosinst.c with lint.
+  lintinstall:
+! 	lint $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c
+  	-rm -f dosinst.ln
+  
+  ###########################################################################
+--- 2279,2290 ----
+  
+  # Run lint.  Clean up the *.ln files that are sometimes left behind.
+  lint:
+! 	$(LINT) $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC)
+  	-rm -f *.ln
+  
+  # Check dosinst.c with lint.
+  lintinstall:
+! 	$(LINT) $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c
+  	-rm -f dosinst.ln
+  
+  ###########################################################################
+*** ../vim-7.2.166/src/buffer.c	2009-02-22 00:01:42.000000000 +0100
+--- src/buffer.c	2009-05-13 12:25:29.000000000 +0200
+***************
+*** 44,49 ****
+--- 44,50 ----
+  #ifdef FEAT_TITLE
+  static int	ti_change __ARGS((char_u *str, char_u **last));
+  #endif
++ static int	append_arg_number __ARGS((win_T *wp, char_u *buf, int buflen, int add_file));
+  static void	free_buffer __ARGS((buf_T *));
+  static void	free_buffer_stuff __ARGS((buf_T *buf, int free_options));
+  static void	clear_wininfo __ARGS((buf_T *buf));
+***************
+*** 1453,1465 ****
+  
+  #ifdef FEAT_KEYMAP
+      if (curbuf->b_kmap_state & KEYMAP_INIT)
+! 	keymap_init();
+  #endif
+  #ifdef FEAT_SPELL
+      /* May need to set the spell language.  Can only do this after the buffer
+       * has been properly setup. */
+      if (!curbuf->b_help && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
+! 	did_set_spelllang(curbuf);
+  #endif
+  
+      redraw_later(NOT_VALID);
+--- 1454,1466 ----
+  
+  #ifdef FEAT_KEYMAP
+      if (curbuf->b_kmap_state & KEYMAP_INIT)
+! 	(void)keymap_init();
+  #endif
+  #ifdef FEAT_SPELL
+      /* May need to set the spell language.  Can only do this after the buffer
+       * has been properly setup. */
+      if (!curbuf->b_help && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
+! 	(void)did_set_spelllang(curbuf);
+  #endif
+  
+      redraw_later(NOT_VALID);
+***************
+*** 2516,2522 ****
+      buf_T	*buf;
+  {
+      wininfo_T	*wip;
+!     static pos_T no_position = {1, 0};
+  
+      wip = find_wininfo(buf, FALSE);
+      if (wip != NULL)
+--- 2517,2523 ----
+      buf_T	*buf;
+  {
+      wininfo_T	*wip;
+!     static pos_T no_position = INIT_POS_T(1, 0, 0);
+  
+      wip = find_wininfo(buf, FALSE);
+      if (wip != NULL)
+***************
+*** 2577,2584 ****
+  	{
+  	    IObuff[len++] = ' ';
+  	} while (--i > 0 && len < IOSIZE - 18);
+! 	vim_snprintf((char *)IObuff + len, IOSIZE - len, _("line %ld"),
+! 		buf == curbuf ? curwin->w_cursor.lnum
+  					       : (long)buflist_findlnum(buf));
+  	msg_outtrans(IObuff);
+  	out_flush();	    /* output one line at a time */
+--- 2578,2585 ----
+  	{
+  	    IObuff[len++] = ' ';
+  	} while (--i > 0 && len < IOSIZE - 18);
+! 	vim_snprintf((char *)IObuff + len, (size_t)(IOSIZE - len),
+! 		_("line %ld"), buf == curbuf ? curwin->w_cursor.lnum
+  					       : (long)buflist_findlnum(buf));
+  	msg_outtrans(IObuff);
+  	out_flush();	    /* output one line at a time */
+***************
+*** 2967,2973 ****
+  
+      if (fullname > 1)	    /* 2 CTRL-G: include buffer number */
+      {
+! 	sprintf((char *)buffer, "buf %d: ", curbuf->b_fnum);
+  	p = buffer + STRLEN(buffer);
+      }
+      else
+--- 2968,2974 ----
+  
+      if (fullname > 1)	    /* 2 CTRL-G: include buffer number */
+      {
+! 	vim_snprintf((char *)buffer, IOSIZE, "buf %d: ", curbuf->b_fnum);
+  	p = buffer + STRLEN(buffer);
+      }
+      else
+***************
+*** 3041,3051 ****
+  		(long)curbuf->b_ml.ml_line_count,
+  		n);
+  	validate_virtcol();
+! 	col_print(buffer + STRLEN(buffer),
+  		   (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1);
+      }
+  
+!     (void)append_arg_number(curwin, buffer, !shortmess(SHM_FILE), IOSIZE);
+  
+      if (dont_truncate)
+      {
+--- 3042,3053 ----
+  		(long)curbuf->b_ml.ml_line_count,
+  		n);
+  	validate_virtcol();
+! 	len = STRLEN(buffer);
+! 	col_print(buffer + len, IOSIZE - len,
+  		   (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1);
+      }
+  
+!     (void)append_arg_number(curwin, buffer, IOSIZE, !shortmess(SHM_FILE));
+  
+      if (dont_truncate)
+      {
+***************
+*** 3073,3087 ****
+  }
+  
+      void
+! col_print(buf, col, vcol)
+      char_u  *buf;
+      int	    col;
+      int	    vcol;
+  {
+      if (col == vcol)
+! 	sprintf((char *)buf, "%d", col);
+      else
+! 	sprintf((char *)buf, "%d-%d", col, vcol);
+  }
+  
+  #if defined(FEAT_TITLE) || defined(PROTO)
+--- 3075,3090 ----
+  }
+  
+      void
+! col_print(buf, buflen, col, vcol)
+      char_u  *buf;
++     size_t  buflen;
+      int	    col;
+      int	    vcol;
+  {
+      if (col == vcol)
+! 	vim_snprintf((char *)buf, buflen, "%d", col);
+      else
+! 	vim_snprintf((char *)buf, buflen, "%d-%d", col, vcol);
+  }
+  
+  #if defined(FEAT_TITLE) || defined(PROTO)
+***************
+*** 3194,3211 ****
+  		if (p == buf + off)
+  		    /* must be a help buffer */
+  		    vim_strncpy(buf + off, (char_u *)_("help"),
+! 							    IOSIZE - off - 1);
+  		else
+  		    *p = NUL;
+  
+  		/* translate unprintable chars */
+  		p = transstr(buf + off);
+! 		vim_strncpy(buf + off, p, IOSIZE - off - 1);
+  		vim_free(p);
+  		STRCAT(buf, ")");
+  	    }
+  
+! 	    append_arg_number(curwin, buf, FALSE, IOSIZE);
+  
+  #if defined(FEAT_CLIENTSERVER)
+  	    if (serverName != NULL)
+--- 3197,3214 ----
+  		if (p == buf + off)
+  		    /* must be a help buffer */
+  		    vim_strncpy(buf + off, (char_u *)_("help"),
+! 						  (size_t)(IOSIZE - off - 1));
+  		else
+  		    *p = NUL;
+  
+  		/* translate unprintable chars */
+  		p = transstr(buf + off);
+! 		vim_strncpy(buf + off, p, (size_t)(IOSIZE - off - 1));
+  		vim_free(p);
+  		STRCAT(buf, ")");
+  	    }
+  
+! 	    append_arg_number(curwin, buf, IOSIZE, FALSE);
+  
+  #if defined(FEAT_CLIENTSERVER)
+  	    if (serverName != NULL)
+***************
+*** 3520,3526 ****
+  		    n = (long)(p - t) - item[groupitem[groupdepth]].maxwid + 1;
+  
+  		*t = '<';
+! 		mch_memmove(t + 1, t + n, p - (t + n));
+  		p = p - n + 1;
+  #ifdef FEAT_MBYTE
+  		/* Fill up space left over by half a double-wide char. */
+--- 3523,3529 ----
+  		    n = (long)(p - t) - item[groupitem[groupdepth]].maxwid + 1;
+  
+  		*t = '<';
+! 		mch_memmove(t + 1, t + n, (size_t)(p - (t + n)));
+  		p = p - n + 1;
+  #ifdef FEAT_MBYTE
+  		/* Fill up space left over by half a double-wide char. */
+***************
+*** 3550,3556 ****
+  		else
+  		{
+  		    /* fill by inserting characters */
+! 		    mch_memmove(t + n - l, t, p - t);
+  		    l = n - l;
+  		    if (p + l >= out + outlen)
+  			l = (long)((out + outlen) - p - 1);
+--- 3553,3559 ----
+  		else
+  		{
+  		    /* fill by inserting characters */
+! 		    mch_memmove(t + n - l, t, (size_t)(p - t));
+  		    l = n - l;
+  		    if (p + l >= out + outlen)
+  			l = (long)((out + outlen) - p - 1);
+***************
+*** 3686,3692 ****
+  	    p = t;
+  
+  #ifdef FEAT_EVAL
+! 	    sprintf((char *)tmp, "%d", curbuf->b_fnum);
+  	    set_internal_string_var((char_u *)"actual_curbuf", tmp);
+  
+  	    o_curbuf = curbuf;
+--- 3689,3695 ----
+  	    p = t;
+  
+  #ifdef FEAT_EVAL
+! 	    vim_snprintf((char *)tmp, sizeof(tmp), "%d", curbuf->b_fnum);
+  	    set_internal_string_var((char_u *)"actual_curbuf", tmp);
+  
+  	    o_curbuf = curbuf;
+***************
+*** 3753,3765 ****
+  
+  	case STL_ALTPERCENT:
+  	    str = tmp;
+! 	    get_rel_pos(wp, str);
+  	    break;
+  
+  	case STL_ARGLISTSTAT:
+  	    fillable = FALSE;
+  	    tmp[0] = 0;
+! 	    if (append_arg_number(wp, tmp, FALSE, (int)sizeof(tmp)))
+  		str = tmp;
+  	    break;
+  
+--- 3756,3768 ----
+  
+  	case STL_ALTPERCENT:
+  	    str = tmp;
+! 	    get_rel_pos(wp, str, TMPLEN);
+  	    break;
+  
+  	case STL_ARGLISTSTAT:
+  	    fillable = FALSE;
+  	    tmp[0] = 0;
+! 	    if (append_arg_number(wp, tmp, (int)sizeof(tmp), FALSE))
+  		str = tmp;
+  	    break;
+  
+***************
+*** 3794,3800 ****
+  	case STL_BYTEVAL_X:
+  	    base = 'X';
+  	case STL_BYTEVAL:
+! 	    if (wp->w_cursor.col > STRLEN(linecont))
+  		num = 0;
+  	    else
+  	    {
+--- 3797,3803 ----
+  	case STL_BYTEVAL_X:
+  	    base = 'X';
+  	case STL_BYTEVAL:
+! 	    if (wp->w_cursor.col > (colnr_T)STRLEN(linecont))
+  		num = 0;
+  	    else
+  	    {
+***************
+*** 3967,3973 ****
+  	    if (zeropad)
+  		*t++ = '0';
+  	    *t++ = '*';
+! 	    *t++ = nbase == 16 ? base : (nbase == 8 ? 'o' : 'd');
+  	    *t = 0;
+  
+  	    for (n = num, l = 1; n >= nbase; n /= nbase)
+--- 3970,3976 ----
+  	    if (zeropad)
+  		*t++ = '0';
+  	    *t++ = '*';
+! 	    *t++ = nbase == 16 ? base : (char_u)(nbase == 8 ? 'o' : 'd');
+  	    *t = 0;
+  
+  	    for (n = num, l = 1; n >= nbase; n /= nbase)
+***************
+*** 4160,4172 ****
+  #if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \
+  	    || defined(FEAT_GUI_TABLINE) || defined(PROTO)
+  /*
+!  * Get relative cursor position in window into "str[]", in the form 99%, using
+!  * "Top", "Bot" or "All" when appropriate.
+   */
+      void
+! get_rel_pos(wp, str)
+      win_T	*wp;
+!     char_u	*str;
+  {
+      long	above; /* number of lines above window */
+      long	below; /* number of lines below window */
+--- 4163,4176 ----
+  #if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \
+  	    || defined(FEAT_GUI_TABLINE) || defined(PROTO)
+  /*
+!  * Get relative cursor position in window into "buf[buflen]", in the form 99%,
+!  * using "Top", "Bot" or "All" when appropriate.
+   */
+      void
+! get_rel_pos(wp, buf, buflen)
+      win_T	*wp;
+!     char_u	*buf;
+!     int		buflen;
+  {
+      long	above; /* number of lines above window */
+      long	below; /* number of lines below window */
+***************
+*** 4177,4210 ****
+  #endif
+      below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;
+      if (below <= 0)
+! 	STRCPY(str, above == 0 ? _("All") : _("Bot"));
+      else if (above <= 0)
+! 	STRCPY(str, _("Top"));
+      else
+! 	sprintf((char *)str, "%2d%%", above > 1000000L
+  				    ? (int)(above / ((above + below) / 100L))
+  				    : (int)(above * 100L / (above + below)));
+  }
+  #endif
+  
+  /*
+!  * Append (file 2 of 8) to 'buf', if editing more than one file.
+   * Return TRUE if it was appended.
+   */
+!     int
+! append_arg_number(wp, buf, add_file, maxlen)
+      win_T	*wp;
+      char_u	*buf;
+      int		add_file;	/* Add "file" before the arg number */
+-     int		maxlen;		/* maximum nr of chars in buf or zero*/
+  {
+      char_u	*p;
+  
+      if (ARGCOUNT <= 1)		/* nothing to do */
+  	return FALSE;
+  
+!     p = buf + STRLEN(buf);		/* go to the end of the buffer */
+!     if (maxlen && p - buf + 35 >= maxlen) /* getting too long */
+  	return FALSE;
+      *p++ = ' ';
+      *p++ = '(';
+--- 4181,4215 ----
+  #endif
+      below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;
+      if (below <= 0)
+! 	vim_strncpy(buf, (char_u *)(above == 0 ? _("All") : _("Bot")),
+! 							(size_t)(buflen - 1));
+      else if (above <= 0)
+! 	vim_strncpy(buf, (char_u *)_("Top"), (size_t)(buflen - 1));
+      else
+! 	vim_snprintf((char *)buf, (size_t)buflen, "%2d%%", above > 1000000L
+  				    ? (int)(above / ((above + below) / 100L))
+  				    : (int)(above * 100L / (above + below)));
+  }
+  #endif
+  
+  /*
+!  * Append (file 2 of 8) to "buf[buflen]", if editing more than one file.
+   * Return TRUE if it was appended.
+   */
+!     static int
+! append_arg_number(wp, buf, buflen, add_file)
+      win_T	*wp;
+      char_u	*buf;
++     int		buflen;
+      int		add_file;	/* Add "file" before the arg number */
+  {
+      char_u	*p;
+  
+      if (ARGCOUNT <= 1)		/* nothing to do */
+  	return FALSE;
+  
+!     p = buf + STRLEN(buf);	/* go to the end of the buffer */
+!     if (p - buf + 35 >= buflen)	/* getting too long */
+  	return FALSE;
+      *p++ = ' ';
+      *p++ = '(';
+***************
+*** 4213,4219 ****
+  	STRCPY(p, "file ");
+  	p += 5;
+      }
+!     sprintf((char *)p, wp->w_arg_idx_invalid ? "(%d) of %d)"
+  				  : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT);
+      return TRUE;
+  }
+--- 4218,4225 ----
+  	STRCPY(p, "file ");
+  	p += 5;
+      }
+!     vim_snprintf((char *)p, (size_t)(buflen - (p - buf)),
+! 		wp->w_arg_idx_invalid ? "(%d) of %d)"
+  				  : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT);
+      return TRUE;
+  }
+***************
+*** 4996,5002 ****
+  	if (tab != NULL)
+  	{
+  	    *tab++ = '\0';
+! 	    col = atoi((char *)tab);
+  	    tab = vim_strrchr(xline, '\t');
+  	    if (tab != NULL)
+  	    {
+--- 5002,5008 ----
+  	if (tab != NULL)
+  	{
+  	    *tab++ = '\0';
+! 	    col = (colnr_T)atoi((char *)tab);
+  	    tab = vim_strrchr(xline, '\t');
+  	    if (tab != NULL)
+  	    {
+***************
+*** 5034,5039 ****
+--- 5040,5046 ----
+  #endif
+      char_u	*line;
+      int		max_buffers;
++     size_t	len;
+  
+      if (find_viminfo_parameter('%') == NULL)
+  	return;
+***************
+*** 5042,5048 ****
+      max_buffers = get_viminfo_parameter('%');
+  
+      /* Allocate room for the file name, lnum and col. */
+!     line = alloc(MAXPATHL + 40);
+      if (line == NULL)
+  	return;
+  
+--- 5049,5056 ----
+      max_buffers = get_viminfo_parameter('%');
+  
+      /* Allocate room for the file name, lnum and col. */
+! #define LINE_BUF_LEN (MAXPATHL + 40)
+!     line = alloc(LINE_BUF_LEN);
+      if (line == NULL)
+  	return;
+  
+***************
+*** 5068,5074 ****
+  	    break;
+  	putc('%', fp);
+  	home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE);
+! 	sprintf((char *)line + STRLEN(line), "\t%ld\t%d",
+  			(long)buf->b_last_cursor.lnum,
+  			buf->b_last_cursor.col);
+  	viminfo_writestring(fp, line);
+--- 5076,5083 ----
+  	    break;
+  	putc('%', fp);
+  	home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE);
+! 	len = STRLEN(line);
+! 	vim_snprintf((char *)line + len, len - LINE_BUF_LEN, "\t%ld\t%d",
+  			(long)buf->b_last_cursor.lnum,
+  			buf->b_last_cursor.col);
+  	viminfo_writestring(fp, line);
+***************
+*** 5226,5232 ****
+      return;
+  }
+  
+!     int
+  buf_change_sign_type(buf, markId, typenr)
+      buf_T	*buf;		/* buffer to store sign in */
+      int		markId;		/* sign ID */
+--- 5235,5241 ----
+      return;
+  }
+  
+!     linenr_T
+  buf_change_sign_type(buf, markId, typenr)
+      buf_T	*buf;		/* buffer to store sign in */
+      int		markId;		/* sign ID */
+***************
+*** 5243,5252 ****
+  	}
+      }
+  
+!     return 0;
+  }
+  
+!     int_u
+  buf_getsigntype(buf, lnum, type)
+      buf_T	*buf;
+      linenr_T	lnum;
+--- 5252,5261 ----
+  	}
+      }
+  
+!     return (linenr_T)0;
+  }
+  
+!     int
+  buf_getsigntype(buf, lnum, type)
+      buf_T	*buf;
+      linenr_T	lnum;
+*** ../vim-7.2.166/src/charset.c	2008-07-24 21:30:44.000000000 +0200
+--- src/charset.c	2009-05-05 18:17:11.000000000 +0200
+***************
+*** 17,23 ****
+  static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));
+  #endif
+  
+! static int nr2hex __ARGS((int c));
+  
+  static int    chartab_initialized = FALSE;
+  
+--- 17,23 ----
+  static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));
+  #endif
+  
+! static unsigned nr2hex __ARGS((unsigned c));
+  
+  static int    chartab_initialized = FALSE;
+  
+***************
+*** 664,670 ****
+      }
+  #endif
+      buf[++i] = nr2hex((unsigned)c >> 4);
+!     buf[++i] = nr2hex(c);
+      buf[++i] = '>';
+      buf[++i] = NUL;
+  }
+--- 664,670 ----
+      }
+  #endif
+      buf[++i] = nr2hex((unsigned)c >> 4);
+!     buf[++i] = nr2hex((unsigned)c);
+      buf[++i] = '>';
+      buf[++i] = NUL;
+  }
+***************
+*** 674,682 ****
+   * Lower case letters are used to avoid the confusion of <F1> being 0xf1 or
+   * function key 1.
+   */
+!     static int
+  nr2hex(c)
+!     int		c;
+  {
+      if ((c & 0xf) <= 9)
+  	return (c & 0xf) + '0';
+--- 674,682 ----
+   * Lower case letters are used to avoid the confusion of <F1> being 0xf1 or
+   * function key 1.
+   */
+!     static unsigned
+  nr2hex(c)
+!     unsigned	c;
+  {
+      if ((c & 0xf) <= 9)
+  	return (c & 0xf) + '0';
+***************
+*** 884,890 ****
+      if (c >= 0x100)
+      {
+  	if (enc_dbcs != 0)
+! 	    return dbcs_class((unsigned)c >> 8, c & 0xff) >= 2;
+  	if (enc_utf8)
+  	    return utf_class(c) >= 2;
+      }
+--- 884,890 ----
+      if (c >= 0x100)
+      {
+  	if (enc_dbcs != 0)
+! 	    return dbcs_class((unsigned)c >> 8, (unsigned)(c & 0xff)) >= 2;
+  	if (enc_utf8)
+  	    return utf_class(c) >= 2;
+      }
+***************
+*** 1090,1096 ****
+  	 */
+  	numberextra = win_col_off(wp);
+  	col2 = col;
+! 	colmax = W_WIDTH(wp) - numberextra;
+  	if (col >= colmax)
+  	{
+  	    n = colmax + win_col_off2(wp);
+--- 1090,1096 ----
+  	 */
+  	numberextra = win_col_off(wp);
+  	col2 = col;
+! 	colmax = (colnr_T)(W_WIDTH(wp) - numberextra);
+  	if (col >= colmax)
+  	{
+  	    n = colmax + win_col_off2(wp);
+***************
+*** 1201,1217 ****
+      win_T	*wp;
+      colnr_T	vcol;
+  {
+!     colnr_T	width1;		/* width of first line (after line number) */
+!     colnr_T	width2;		/* width of further lines */
+  
+  #ifdef FEAT_VERTSPLIT
+      if (wp->w_width == 0)	/* there is no border */
+  	return FALSE;
+  #endif
+      width1 = W_WIDTH(wp) - win_col_off(wp);
+!     if (vcol < width1 - 1)
+  	return FALSE;
+!     if (vcol == width1 - 1)
+  	return TRUE;
+      width2 = width1 + win_col_off2(wp);
+      return ((vcol - width1) % width2 == width2 - 1);
+--- 1201,1217 ----
+      win_T	*wp;
+      colnr_T	vcol;
+  {
+!     int		width1;		/* width of first line (after line number) */
+!     int		width2;		/* width of further lines */
+  
+  #ifdef FEAT_VERTSPLIT
+      if (wp->w_width == 0)	/* there is no border */
+  	return FALSE;
+  #endif
+      width1 = W_WIDTH(wp) - win_col_off(wp);
+!     if ((int)vcol < width1 - 1)
+  	return FALSE;
+!     if ((int)vcol == width1 - 1)
+  	return TRUE;
+      width2 = width1 + win_col_off2(wp);
+      return ((vcol - width1) % width2 == width2 - 1);
+***************
+*** 1396,1408 ****
+  # ifdef FEAT_MBYTE
+  	/* Cannot put the cursor on part of a wide character. */
+  	ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
+! 	if (pos->col < STRLEN(ptr))
+  	{
+  	    int c = (*mb_ptr2char)(ptr + pos->col);
+  
+  	    if (c != TAB && vim_isprintc(c))
+  	    {
+! 		endadd = char2cells(c) - 1;
+  		if (coladd > endadd)	/* past end of line */
+  		    endadd = 0;
+  		else
+--- 1396,1408 ----
+  # ifdef FEAT_MBYTE
+  	/* Cannot put the cursor on part of a wide character. */
+  	ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
+! 	if (pos->col < (colnr_T)STRLEN(ptr))
+  	{
+  	    int c = (*mb_ptr2char)(ptr + pos->col);
+  
+  	    if (c != TAB && vim_isprintc(c))
+  	    {
+! 		endadd = (colnr_T)(char2cells(c) - 1);
+  		if (coladd > endadd)	/* past end of line */
+  		    endadd = 0;
+  		else
+*** ../vim-7.2.166/src/cleanlint.vim	2009-05-13 12:08:12.000000000 +0200
+--- src/cleanlint.vim	2009-05-05 21:34:01.000000000 +0200
+***************
+*** 0 ****
+--- 1,27 ----
++ " Vim tool: Filter output of splint
++ "
++ " Maintainer:	Bram Moolenaar <Bram@vim.org>
++ " Last Change:	2009 May 05
++ 
++ " Usage: redirect output of "make lint" to a file, edit that file with Vim and
++ " :call CleanLint()
++ " This deletes irrelevant messages.  What remains might be valid warnings.
++ 
++ fun! CleanLint()
++   g/^  Types are incompatible/lockmarks d
++   g/Assignment of dev_t to __dev_t:/lockmarks d
++   g/Assignment of __dev_t to dev_t:/lockmarks d
++   g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
++   g/Operands of == have incompatible types (unsigned int, int): /lockmarks d
++   g/Assignment of char to char_u: /lockmarks d
++   g/Assignment of unsigned int to int: /lockmarks d
++   g/Assignment of colnr_T to int: /lockmarks d
++   g/Assignment of int to char_u: /lockmarks d
++   g/Function .* expects arg . to be wint_t gets int: /lockmarks d
++   g/^digraph.c.*digraphdefault.*is type char, expects char_u:/lockmarks d
++   g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
++   g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
++   g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
++   g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
++   g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
++ endfun
+*** ../vim-7.2.166/src/digraph.c	2008-06-25 00:26:41.000000000 +0200
+--- src/digraph.c	2009-05-05 20:32:43.000000000 +0200
+***************
+*** 32,38 ****
+  static void printdigraph __ARGS((digr_T *));
+  
+  /* digraphs added by the user */
+! static garray_T	user_digraphs = {0, 0, sizeof(digr_T), 10, NULL};
+  
+  /*
+   * Note: Characters marked with XX are not included literally, because some
+--- 32,38 ----
+  static void printdigraph __ARGS((digr_T *));
+  
+  /* digraphs added by the user */
+! static garray_T	user_digraphs = {0, 0, (int)sizeof(digr_T), 10, NULL};
+  
+  /*
+   * Note: Characters marked with XX are not included literally, because some
+***************
+*** 2371,2380 ****
+  	}
+  	else
+  #endif
+! 	    *p++ = dp->result;
+  	if (char2cells(dp->result) == 1)
+  	    *p++ = ' ';
+! 	sprintf((char *)p, " %3d", dp->result);
+  	msg_outtrans(buf);
+      }
+  }
+--- 2371,2380 ----
+  	}
+  	else
+  #endif
+! 	    *p++ = (char_u)dp->result;
+  	if (char2cells(dp->result) == 1)
+  	    *p++ = ' ';
+! 	vim_snprintf((char *)p, sizeof(buf) - (p - buf), " %3d", dp->result);
+  	msg_outtrans(buf);
+      }
+  }
+***************
+*** 2395,2401 ****
+  static void keymap_unload __ARGS((void));
+  
+  /*
+!  * Set up key mapping tables for the 'keymap' option
+   */
+      char_u *
+  keymap_init()
+--- 2395,2404 ----
+  static void keymap_unload __ARGS((void));
+  
+  /*
+!  * Set up key mapping tables for the 'keymap' option.
+!  * Returns NULL if OK, an error message for failure.  This only needs to be
+!  * used when setting the option, not later when the value has already been
+!  * checked.
+   */
+      char_u *
+  keymap_init()
+***************
+*** 2412,2436 ****
+      else
+      {
+  	char_u	*buf;
+  
+  	/* Source the keymap file.  It will contain a ":loadkeymap" command
+  	 * which will call ex_loadkeymap() below. */
+! 	buf = alloc((unsigned)(STRLEN(curbuf->b_p_keymap)
+  # ifdef FEAT_MBYTE
+! 						       + STRLEN(p_enc)
+  # endif
+! 						       + 14));
+  	if (buf == NULL)
+  	    return e_outofmem;
+  
+  # ifdef FEAT_MBYTE
+  	/* try finding "keymap/'keymap'_'encoding'.vim"  in 'runtimepath' */
+! 	sprintf((char *)buf, "keymap/%s_%s.vim", curbuf->b_p_keymap, p_enc);
+  	if (source_runtime(buf, FALSE) == FAIL)
+  # endif
+  	{
+  	    /* try finding "keymap/'keymap'.vim" in 'runtimepath'  */
+! 	    sprintf((char *)buf, "keymap/%s.vim", curbuf->b_p_keymap);
+  	    if (source_runtime(buf, FALSE) == FAIL)
+  	    {
+  		vim_free(buf);
+--- 2415,2443 ----
+      else
+      {
+  	char_u	*buf;
++ 	size_t  buflen;
+  
+  	/* Source the keymap file.  It will contain a ":loadkeymap" command
+  	 * which will call ex_loadkeymap() below. */
+! 	buflen = STRLEN(curbuf->b_p_keymap)
+  # ifdef FEAT_MBYTE
+! 					   + STRLEN(p_enc)
+  # endif
+! 						       + 14;
+! 	buf = alloc((unsigned)buflen);
+  	if (buf == NULL)
+  	    return e_outofmem;
+  
+  # ifdef FEAT_MBYTE
+  	/* try finding "keymap/'keymap'_'encoding'.vim"  in 'runtimepath' */
+! 	vim_snprintf((char *)buf, buflen, "keymap/%s_%s.vim",
+! 						   curbuf->b_p_keymap, p_enc);
+  	if (source_runtime(buf, FALSE) == FAIL)
+  # endif
+  	{
+  	    /* try finding "keymap/'keymap'.vim" in 'runtimepath'  */
+! 	    vim_snprintf((char *)buf, buflen, "keymap/%s.vim",
+! 							  curbuf->b_p_keymap);
+  	    if (source_runtime(buf, FALSE) == FAIL)
+  	    {
+  		vim_free(buf);
+*** ../vim-7.2.166/src/edit.c	2009-02-21 20:27:00.000000000 +0100
+--- src/edit.c	2009-05-05 21:14:50.000000000 +0200
+***************
+*** 57,63 ****
+      N_(" Keyword Local completion (^N^P)"),
+  };
+  
+! static char_u e_hitend[] = N_("Hit end of paragraph");
+  
+  /*
+   * Structure used to store one match for insert completion.
+--- 57,63 ----
+      N_(" Keyword Local completion (^N^P)"),
+  };
+  
+! static char e_hitend[] = N_("Hit end of paragraph");
+  
+  /*
+   * Structure used to store one match for insert completion.
+***************
+*** 69,75 ****
+--- 69,79 ----
+      compl_T	*cp_prev;
+      char_u	*cp_str;	/* matched text */
+      char	cp_icase;	/* TRUE or FALSE: ignore case */
++ #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
++     char_u	**cp_text;	/* text for the menu */
++ #else
+      char_u	*(cp_text[CPT_COUNT]);	/* text for the menu */
++ #endif
+      char_u	*cp_fname;	/* file containing the match, allocated when
+  				 * cp_flags has FREE_FNAME */
+      int		cp_flags;	/* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */
+***************
+*** 306,312 ****
+      int		c = 0;
+      char_u	*ptr;
+      int		lastc;
+!     colnr_T	mincol;
+      static linenr_T o_lnum = 0;
+      int		i;
+      int		did_backspace = TRUE;	    /* previous char was backspace */
+--- 310,316 ----
+      int		c = 0;
+      char_u	*ptr;
+      int		lastc;
+!     int		mincol;
+      static linenr_T o_lnum = 0;
+      int		i;
+      int		did_backspace = TRUE;	    /* previous char was backspace */
+***************
+*** 387,393 ****
+  	if (startln)
+  	    Insstart.col = 0;
+      }
+!     Insstart_textlen = linetabsize(ml_get_curline());
+      Insstart_blank_vcol = MAXCOL;
+      if (!did_ai)
+  	ai_col = 0;
+--- 391,397 ----
+  	if (startln)
+  	    Insstart.col = 0;
+      }
+!     Insstart_textlen = (colnr_T)linetabsize(ml_get_curline());
+      Insstart_blank_vcol = MAXCOL;
+      if (!did_ai)
+  	ai_col = 0;
+***************
+*** 653,659 ****
+  	    mincol = curwin->w_wcol;
+  	    validate_cursor_col();
+  
+! 	    if ((int)curwin->w_wcol < (int)mincol - curbuf->b_p_ts
+  		    && curwin->w_wrow == W_WINROW(curwin)
+  						 + curwin->w_height - 1 - p_so
+  		    && (curwin->w_cursor.lnum != curwin->w_topline
+--- 657,663 ----
+  	    mincol = curwin->w_wcol;
+  	    validate_cursor_col();
+  
+! 	    if ((int)curwin->w_wcol < mincol - curbuf->b_p_ts
+  		    && curwin->w_wrow == W_WINROW(curwin)
+  						 + curwin->w_height - 1 - p_so
+  		    && (curwin->w_cursor.lnum != curwin->w_topline
+***************
+*** 1773,1779 ****
+  	 * Compute the screen column where the cursor should be.
+  	 */
+  	vcol = get_indent() - vcol;
+! 	curwin->w_virtcol = (vcol < 0) ? 0 : vcol;
+  
+  	/*
+  	 * Advance the cursor until we reach the right screen column.
+--- 1777,1783 ----
+  	 * Compute the screen column where the cursor should be.
+  	 */
+  	vcol = get_indent() - vcol;
+! 	curwin->w_virtcol = (colnr_T)((vcol < 0) ? 0 : vcol);
+  
+  	/*
+  	 * Advance the cursor until we reach the right screen column.
+***************
+*** 1800,1808 ****
+  	 */
+  	if (vcol != (int)curwin->w_virtcol)
+  	{
+! 	    curwin->w_cursor.col = new_cursor_col;
+  	    i = (int)curwin->w_virtcol - vcol;
+! 	    ptr = alloc(i + 1);
+  	    if (ptr != NULL)
+  	    {
+  		new_cursor_col += i;
+--- 1804,1812 ----
+  	 */
+  	if (vcol != (int)curwin->w_virtcol)
+  	{
+! 	    curwin->w_cursor.col = (colnr_T)new_cursor_col;
+  	    i = (int)curwin->w_virtcol - vcol;
+! 	    ptr = alloc((unsigned)(i + 1));
+  	    if (ptr != NULL)
+  	    {
+  		new_cursor_col += i;
+***************
+*** 1826,1832 ****
+      if (new_cursor_col <= 0)
+  	curwin->w_cursor.col = 0;
+      else
+! 	curwin->w_cursor.col = new_cursor_col;
+      curwin->w_set_curswant = TRUE;
+      changed_cline_bef_curs();
+  
+--- 1830,1836 ----
+      if (new_cursor_col <= 0)
+  	curwin->w_cursor.col = 0;
+      else
+! 	curwin->w_cursor.col = (colnr_T)new_cursor_col;
+      curwin->w_set_curswant = TRUE;
+      changed_cline_bef_curs();
+  
+***************
+*** 1966,1972 ****
+  #ifdef FEAT_MBYTE
+      if (enc_utf8 && limit_col >= 0)
+      {
+! 	int ecol = curwin->w_cursor.col + 1;
+  
+  	/* Make sure the cursor is at the start of a character, but
+  	 * skip forward again when going too far back because of a
+--- 1970,1976 ----
+  #ifdef FEAT_MBYTE
+      if (enc_utf8 && limit_col >= 0)
+      {
+! 	colnr_T ecol = curwin->w_cursor.col + 1;
+  
+  	/* Make sure the cursor is at the start of a character, but
+  	 * skip forward again when going too far back because of a
+***************
+*** 1982,1988 ****
+  	}
+  	if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
+  	    return FALSE;
+! 	del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE);
+      }
+      else
+  #endif
+--- 1986,1992 ----
+  	}
+  	if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
+  	    return FALSE;
+! 	del_bytes((long)((int)ecol - curwin->w_cursor.col), FALSE, TRUE);
+      }
+      else
+  #endif
+***************
+*** 2201,2207 ****
+  	    actual_compl_length = compl_length;
+  
+  	/* Allocate wide character array for the completion and fill it. */
+! 	wca = (int *)alloc(actual_len * sizeof(int));
+  	if (wca != NULL)
+  	{
+  	    p = str;
+--- 2205,2211 ----
+  	    actual_compl_length = compl_length;
+  
+  	/* Allocate wide character array for the completion and fill it. */
+! 	wca = (int *)alloc((unsigned)(actual_len * sizeof(int)));
+  	if (wca != NULL)
+  	{
+  	    p = str;
+***************
+*** 2580,2586 ****
+   */
+      void
+  set_completion(startcol, list)
+!     int	    startcol;
+      list_T  *list;
+  {
+      /* If already doing completions stop it. */
+--- 2584,2590 ----
+   */
+      void
+  set_completion(startcol, list)
+!     colnr_T startcol;
+      list_T  *list;
+  {
+      /* If already doing completions stop it. */
+***************
+*** 2591,2600 ****
+      if (stop_arrow() == FAIL)
+  	return;
+  
+!     if (startcol > (int)curwin->w_cursor.col)
+  	startcol = curwin->w_cursor.col;
+      compl_col = startcol;
+!     compl_length = curwin->w_cursor.col - startcol;
+      /* compl_pattern doesn't need to be set */
+      compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
+      if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
+--- 2595,2604 ----
+      if (stop_arrow() == FAIL)
+  	return;
+  
+!     if (startcol > curwin->w_cursor.col)
+  	startcol = curwin->w_cursor.col;
+      compl_col = startcol;
+!     compl_length = (int)curwin->w_cursor.col - (int)startcol;
+      /* compl_pattern doesn't need to be set */
+      compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
+      if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
+***************
+*** 2860,2866 ****
+      regmatch_T	regmatch;
+      char_u	**files;
+      int		count;
+-     int		i;
+      int		save_p_scs;
+      int		dir = compl_direction;
+  
+--- 2864,2869 ----
+***************
+*** 2892,2908 ****
+      if (ctrl_x_mode == CTRL_X_WHOLE_LINE)
+      {
+  	char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
+  
+  	if (pat_esc == NULL)
+  	    goto theend;
+! 	i = (int)STRLEN(pat_esc) + 10;
+! 	ptr = alloc(i);
+  	if (ptr == NULL)
+  	{
+  	    vim_free(pat_esc);
+  	    goto theend;
+  	}
+! 	vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc);
+  	regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);
+  	vim_free(pat_esc);
+  	vim_free(ptr);
+--- 2895,2912 ----
+      if (ctrl_x_mode == CTRL_X_WHOLE_LINE)
+      {
+  	char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
++ 	size_t len;
+  
+  	if (pat_esc == NULL)
+  	    goto theend;
+! 	len = STRLEN(pat_esc) + 10;
+! 	ptr = alloc((unsigned)len);
+  	if (ptr == NULL)
+  	{
+  	    vim_free(pat_esc);
+  	    goto theend;
+  	}
+! 	vim_snprintf((char *)ptr, len, "^\\s*\\zs\\V%s", pat_esc);
+  	regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);
+  	vim_free(pat_esc);
+  	vim_free(ptr);
+***************
+*** 2993,2999 ****
+  	{
+  	    vim_snprintf((char *)IObuff, IOSIZE,
+  			      _("Scanning dictionary: %s"), (char *)files[i]);
+! 	    msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
+  	}
+  
+  	if (fp != NULL)
+--- 2997,3003 ----
+  	{
+  	    vim_snprintf((char *)IObuff, IOSIZE,
+  			      _("Scanning dictionary: %s"), (char *)files[i]);
+! 	    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
+  	}
+  
+  	if (fp != NULL)
+***************
+*** 3311,3317 ****
+      static int
+  ins_compl_len()
+  {
+!     int off = curwin->w_cursor.col - compl_col;
+  
+      if (off < 0)
+  	return 0;
+--- 3315,3321 ----
+      static int
+  ins_compl_len()
+  {
+!     int off = (int)curwin->w_cursor.col - (int)compl_col;
+  
+      if (off < 0)
+  	return 0;
+***************
+*** 3347,3353 ****
+  
+      vim_free(compl_leader);
+      compl_leader = vim_strnsave(ml_get_curline() + compl_col,
+! 					    curwin->w_cursor.col - compl_col);
+      if (compl_leader != NULL)
+  	ins_compl_new_leader();
+  }
+--- 3351,3357 ----
+  
+      vim_free(compl_leader);
+      compl_leader = vim_strnsave(ml_get_curline() + compl_col,
+! 				     (int)(curwin->w_cursor.col - compl_col));
+      if (compl_leader != NULL)
+  	ins_compl_new_leader();
+  }
+***************
+*** 3395,3401 ****
+  ins_compl_addfrommatch()
+  {
+      char_u	*p;
+!     int		len = curwin->w_cursor.col - compl_col;
+      int		c;
+      compl_T	*cp;
+  
+--- 3399,3405 ----
+  ins_compl_addfrommatch()
+  {
+      char_u	*p;
+!     int		len = (int)curwin->w_cursor.col - (int)compl_col;
+      int		c;
+      compl_T	*cp;
+  
+***************
+*** 3961,3967 ****
+  			    : ins_buf->b_sfname == NULL
+  				? (char *)ins_buf->b_fname
+  				: (char *)ins_buf->b_sfname);
+! 		msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
+  	    }
+  	    else if (*e_cpt == NUL)
+  		break;
+--- 3965,3971 ----
+  			    : ins_buf->b_sfname == NULL
+  				? (char *)ins_buf->b_fname
+  				: (char *)ins_buf->b_sfname);
+! 		(void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
+  	    }
+  	    else if (*e_cpt == NUL)
+  		break;
+***************
+*** 3991,3997 ****
+  		{
+  		    type = CTRL_X_TAGS;
+  		    sprintf((char*)IObuff, _("Scanning tags."));
+! 		    msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
+  		}
+  		else
+  		    type = -1;
+--- 3995,4001 ----
+  		{
+  		    type = CTRL_X_TAGS;
+  		    sprintf((char*)IObuff, _("Scanning tags."));
+! 		    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
+  		}
+  		else
+  		    type = -1;
+***************
+*** 6320,6326 ****
+  	    ins_need_undo = FALSE;
+  	}
+  	Insstart = curwin->w_cursor;	/* new insertion starts here */
+! 	Insstart_textlen = linetabsize(ml_get_curline());
+  	ai_col = 0;
+  #ifdef FEAT_VREPLACE
+  	if (State & VREPLACE_FLAG)
+--- 6324,6330 ----
+  	    ins_need_undo = FALSE;
+  	}
+  	Insstart = curwin->w_cursor;	/* new insertion starts here */
+! 	Insstart_textlen = (colnr_T)linetabsize(ml_get_curline());
+  	ai_col = 0;
+  #ifdef FEAT_VREPLACE
+  	if (State & VREPLACE_FLAG)
+*** ../vim-7.2.166/src/ex_cmds.c	2009-04-29 18:44:38.000000000 +0200
+--- src/ex_cmds.c	2009-05-05 17:55:40.000000000 +0200
+***************
+*** 1789,1795 ****
+  	 * overwrite a user's viminfo file after a "su root", with a
+  	 * viminfo file that the user can't read.
+  	 */
+! 	st_old.st_dev = 0;
+  	st_old.st_ino = 0;
+  	st_old.st_mode = 0600;
+  	if (mch_stat((char *)fname, &st_old) == 0
+--- 1789,1795 ----
+  	 * overwrite a user's viminfo file after a "su root", with a
+  	 * viminfo file that the user can't read.
+  	 */
+! 	st_old.st_dev = (dev_t)0;
+  	st_old.st_ino = 0;
+  	st_old.st_mode = 0600;
+  	if (mch_stat((char *)fname, &st_old) == 0
+***************
+*** 3715,3721 ****
+      /* If the window options were changed may need to set the spell language.
+       * Can only do this after the buffer has been properly setup. */
+      if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
+! 	did_set_spelllang(curbuf);
+  #endif
+  
+      if (command == NULL)
+--- 3715,3721 ----
+      /* If the window options were changed may need to set the spell language.
+       * Can only do this after the buffer has been properly setup. */
+      if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
+! 	(void)did_set_spelllang(curbuf);
+  #endif
+  
+      if (command == NULL)
+***************
+*** 3788,3794 ****
+  
+  #ifdef FEAT_KEYMAP
+      if (curbuf->b_kmap_state & KEYMAP_INIT)
+! 	keymap_init();
+  #endif
+  
+      --RedrawingDisabled;
+--- 3788,3794 ----
+  
+  #ifdef FEAT_KEYMAP
+      if (curbuf->b_kmap_state & KEYMAP_INIT)
+! 	(void)keymap_init();
+  #endif
+  
+      --RedrawingDisabled;
+*** ../vim-7.2.166/src/globals.h	2009-03-05 03:13:51.000000000 +0100
+--- src/globals.h	2009-05-09 21:14:49.000000000 +0200
+***************
+*** 524,530 ****
+  EXTERN win_T	*prevwin INIT(= NULL);	/* previous window */
+  # define W_NEXT(wp) ((wp)->w_next)
+  # define FOR_ALL_WINDOWS(wp) for (wp = firstwin; wp != NULL; wp = wp->w_next)
+! #define FOR_ALL_TAB_WINDOWS(tp, wp) \
+      for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
+  	for ((wp) = ((tp) == curtab) \
+  		? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
+--- 524,530 ----
+  EXTERN win_T	*prevwin INIT(= NULL);	/* previous window */
+  # define W_NEXT(wp) ((wp)->w_next)
+  # define FOR_ALL_WINDOWS(wp) for (wp = firstwin; wp != NULL; wp = wp->w_next)
+! # define FOR_ALL_TAB_WINDOWS(tp, wp) \
+      for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
+  	for ((wp) = ((tp) == curtab) \
+  		? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
+***************
+*** 718,724 ****
+  
+  EXTERN pos_T	saved_cursor		/* w_cursor before formatting text. */
+  # ifdef DO_INIT
+! 	= INIT_POS_T
+  # endif
+  	;
+  
+--- 718,724 ----
+  
+  EXTERN pos_T	saved_cursor		/* w_cursor before formatting text. */
+  # ifdef DO_INIT
+! 	= INIT_POS_T(0, 0, 0)
+  # endif
+  	;
+  
+***************
+*** 1039,1045 ****
+  EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
+  EXTERN pos_T	last_cursormoved	    /* for CursorMoved event */
+  # ifdef DO_INIT
+! 			= INIT_POS_T
+  # endif
+  			;
+  #endif
+--- 1039,1045 ----
+  EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
+  EXTERN pos_T	last_cursormoved	    /* for CursorMoved event */
+  # ifdef DO_INIT
+! 			= INIT_POS_T(0, 0, 0)
+  # endif
+  			;
+  #endif
+*** ../vim-7.2.166/src/ops.c	2009-04-29 17:39:17.000000000 +0200
+--- src/ops.c	2009-05-13 12:41:02.000000000 +0200
+***************
+*** 6400,6406 ****
+  	    {
+  		getvcols(curwin, &min_pos, &max_pos, &min_pos.col,
+  								&max_pos.col);
+! 		sprintf((char *)buf1, _("%ld Cols; "),
+  			(long)(oparg.end_vcol - oparg.start_vcol + 1));
+  	    }
+  	    else
+--- 6400,6406 ----
+  	    {
+  		getvcols(curwin, &min_pos, &max_pos, &min_pos.col,
+  								&max_pos.col);
+! 		vim_snprintf((char *)buf1, sizeof(buf1), _("%ld Cols; "),
+  			(long)(oparg.end_vcol - oparg.start_vcol + 1));
+  	    }
+  	    else
+***************
+*** 6408,6420 ****
+  
+  	    if (char_count_cursor == byte_count_cursor
+  						  && char_count == byte_count)
+! 		sprintf((char *)IObuff, _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"),
+  			buf1, line_count_selected,
+  			(long)curbuf->b_ml.ml_line_count,
+  			word_count_cursor, word_count,
+  			byte_count_cursor, byte_count);
+  	    else
+! 		sprintf((char *)IObuff, _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"),
+  			buf1, line_count_selected,
+  			(long)curbuf->b_ml.ml_line_count,
+  			word_count_cursor, word_count,
+--- 6408,6422 ----
+  
+  	    if (char_count_cursor == byte_count_cursor
+  						  && char_count == byte_count)
+! 		vim_snprintf((char *)IObuff, IOSIZE,
+! 			_("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"),
+  			buf1, line_count_selected,
+  			(long)curbuf->b_ml.ml_line_count,
+  			word_count_cursor, word_count,
+  			byte_count_cursor, byte_count);
+  	    else
+! 		vim_snprintf((char *)IObuff, IOSIZE,
+! 			_("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"),
+  			buf1, line_count_selected,
+  			(long)curbuf->b_ml.ml_line_count,
+  			word_count_cursor, word_count,
+***************
+*** 6426,6445 ****
+  	{
+  	    p = ml_get_curline();
+  	    validate_virtcol();
+! 	    col_print(buf1, (int)curwin->w_cursor.col + 1,
+  		    (int)curwin->w_virtcol + 1);
+! 	    col_print(buf2, (int)STRLEN(p), linetabsize(p));
+  
+  	    if (char_count_cursor == byte_count_cursor
+  		    && char_count == byte_count)
+! 		sprintf((char *)IObuff, _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"),
+  		    (char *)buf1, (char *)buf2,
+  		    (long)curwin->w_cursor.lnum,
+  		    (long)curbuf->b_ml.ml_line_count,
+  		    word_count_cursor, word_count,
+  		    byte_count_cursor, byte_count);
+  	    else
+! 		sprintf((char *)IObuff, _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"),
+  		    (char *)buf1, (char *)buf2,
+  		    (long)curwin->w_cursor.lnum,
+  		    (long)curbuf->b_ml.ml_line_count,
+--- 6428,6449 ----
+  	{
+  	    p = ml_get_curline();
+  	    validate_virtcol();
+! 	    col_print(buf1, sizeof(buf1), (int)curwin->w_cursor.col + 1,
+  		    (int)curwin->w_virtcol + 1);
+! 	    col_print(buf2, sizeof(buf2), (int)STRLEN(p), linetabsize(p));
+  
+  	    if (char_count_cursor == byte_count_cursor
+  		    && char_count == byte_count)
+! 		vim_snprintf((char *)IObuff, IOSIZE,
+! 		    _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"),
+  		    (char *)buf1, (char *)buf2,
+  		    (long)curwin->w_cursor.lnum,
+  		    (long)curbuf->b_ml.ml_line_count,
+  		    word_count_cursor, word_count,
+  		    byte_count_cursor, byte_count);
+  	    else
+! 		vim_snprintf((char *)IObuff, IOSIZE,
+! 		    _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"),
+  		    (char *)buf1, (char *)buf2,
+  		    (long)curwin->w_cursor.lnum,
+  		    (long)curbuf->b_ml.ml_line_count,
+*** ../vim-7.2.166/src/os_unix.c	2009-03-02 02:44:54.000000000 +0100
+--- src/os_unix.c	2009-05-05 17:35:58.000000000 +0200
+***************
+*** 199,205 ****
+  #endif
+  
+  #ifndef SIG_ERR
+! # define SIG_ERR	((RETSIGTYPE (*)())-1)
+  #endif
+  
+  /* volatile because it is used in signal handler sig_winch(). */
+--- 199,207 ----
+  #endif
+  
+  #ifndef SIG_ERR
+! # ifndef S_SPLINT_S
+! #  define SIG_ERR	((RETSIGTYPE (*)())-1)
+! # endif
+  #endif
+  
+  /* volatile because it is used in signal handler sig_winch(). */
+***************
+*** 441,447 ****
+  
+  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
+  # ifdef HAVE_SYS_RESOURCE_H
+! #  include <sys/resource.h>
+  # endif
+  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
+  #  include <sys/sysctl.h>
+--- 443,451 ----
+  
+  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
+  # ifdef HAVE_SYS_RESOURCE_H
+! #  ifndef S_SPLINT_S  /* splint crashes on bits/resource.h */
+! #   include <sys/resource.h>
+! #  endif
+  # endif
+  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
+  #  include <sys/sysctl.h>
+*** ../vim-7.2.166/src/os_unix.h	2008-06-20 18:06:36.000000000 +0200
+--- src/os_unix.h	2009-05-05 17:07:45.000000000 +0200
+***************
+*** 53,59 ****
+  #endif
+  
+  #ifdef HAVE_UNISTD_H
+! # include <unistd.h>
+  #endif
+  
+  #ifdef HAVE_LIBC_H
+--- 53,61 ----
+  #endif
+  
+  #ifdef HAVE_UNISTD_H
+! # ifndef S_SPLINT_S  /* splint crashes on bits/confname.h */
+! #  include <unistd.h>
+! # endif
+  #endif
+  
+  #ifdef HAVE_LIBC_H
+*** ../vim-7.2.166/src/proto/buffer.pro	2008-11-15 14:10:23.000000000 +0100
+--- src/proto/buffer.pro	2009-05-13 12:23:41.000000000 +0200
+***************
+*** 37,49 ****
+  int otherfile __ARGS((char_u *ffname));
+  void buf_setino __ARGS((buf_T *buf));
+  void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate));
+! void col_print __ARGS((char_u *buf, int col, int vcol));
+  void maketitle __ARGS((void));
+  void resettitle __ARGS((void));
+  void free_titles __ARGS((void));
+  int build_stl_str_hl __ARGS((win_T *wp, char_u *out, size_t outlen, char_u *fmt, int use_sandbox, int fillchar, int maxwidth, struct stl_hlrec *hltab, struct stl_hlrec *tabtab));
+! void get_rel_pos __ARGS((win_T *wp, char_u *str));
+! int append_arg_number __ARGS((win_T *wp, char_u *buf, int add_file, int maxlen));
+  char_u *fix_fname __ARGS((char_u *fname));
+  void fname_expand __ARGS((buf_T *buf, char_u **ffname, char_u **sfname));
+  char_u *alist_name __ARGS((aentry_T *aep));
+--- 37,48 ----
+  int otherfile __ARGS((char_u *ffname));
+  void buf_setino __ARGS((buf_T *buf));
+  void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate));
+! void col_print __ARGS((char_u *buf, size_t buflen, int col, int vcol));
+  void maketitle __ARGS((void));
+  void resettitle __ARGS((void));
+  void free_titles __ARGS((void));
+  int build_stl_str_hl __ARGS((win_T *wp, char_u *out, size_t outlen, char_u *fmt, int use_sandbox, int fillchar, int maxwidth, struct stl_hlrec *hltab, struct stl_hlrec *tabtab));
+! void get_rel_pos __ARGS((win_T *wp, char_u *buf, int buflen));
+  char_u *fix_fname __ARGS((char_u *fname));
+  void fname_expand __ARGS((buf_T *buf, char_u **ffname, char_u **sfname));
+  char_u *alist_name __ARGS((aentry_T *aep));
+***************
+*** 54,61 ****
+  void write_viminfo_bufferlist __ARGS((FILE *fp));
+  char *buf_spname __ARGS((buf_T *buf));
+  void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr));
+! int buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr));
+! int_u buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type));
+  linenr_T buf_delsign __ARGS((buf_T *buf, int id));
+  int buf_findsign __ARGS((buf_T *buf, int id));
+  int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum));
+--- 53,60 ----
+  void write_viminfo_bufferlist __ARGS((FILE *fp));
+  char *buf_spname __ARGS((buf_T *buf));
+  void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr));
+! linenr_T buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr));
+! int buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type));
+  linenr_T buf_delsign __ARGS((buf_T *buf, int id));
+  int buf_findsign __ARGS((buf_T *buf, int id));
+  int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum));
+*** ../vim-7.2.166/src/proto/edit.pro	2008-01-16 20:03:13.000000000 +0100
+--- src/proto/edit.pro	2009-05-05 20:51:56.000000000 +0200
+***************
+*** 8,14 ****
+  void backspace_until_column __ARGS((int col));
+  int vim_is_ctrl_x_key __ARGS((int c));
+  int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags));
+! void set_completion __ARGS((int startcol, list_T *list));
+  void ins_compl_show_pum __ARGS((void));
+  char_u *find_word_start __ARGS((char_u *ptr));
+  char_u *find_word_end __ARGS((char_u *ptr));
+--- 8,14 ----
+  void backspace_until_column __ARGS((int col));
+  int vim_is_ctrl_x_key __ARGS((int c));
+  int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags));
+! void set_completion __ARGS((colnr_T startcol, list_T *list));
+  void ins_compl_show_pum __ARGS((void));
+  char_u *find_word_start __ARGS((char_u *ptr));
+  char_u *find_word_end __ARGS((char_u *ptr));
+*** ../vim-7.2.166/src/screen.c	2009-03-18 19:07:09.000000000 +0100
+--- src/screen.c	2009-05-05 17:42:45.000000000 +0200
+***************
+*** 9481,9493 ****
+      win_T	*wp;
+      int		always;
+  {
+!     char_u	buffer[70];
+      int		row;
+      int		fillchar;
+      int		attr;
+      int		empty_line = FALSE;
+      colnr_T	virtcol;
+      int		i;
+      int		o;
+  #ifdef FEAT_VERTSPLIT
+      int		this_ru_col;
+--- 9481,9495 ----
+      win_T	*wp;
+      int		always;
+  {
+! #define RULER_BUF_LEN 70
+!     char_u	buffer[RULER_BUF_LEN];
+      int		row;
+      int		fillchar;
+      int		attr;
+      int		empty_line = FALSE;
+      colnr_T	virtcol;
+      int		i;
++     size_t	len;
+      int		o;
+  #ifdef FEAT_VERTSPLIT
+      int		this_ru_col;
+***************
+*** 9602,9612 ****
+  	 * Some sprintfs return the length, some return a pointer.
+  	 * To avoid portability problems we use strlen() here.
+  	 */
+! 	sprintf((char *)buffer, "%ld,",
+  		(wp->w_buffer->b_ml.ml_flags & ML_EMPTY)
+  		    ? 0L
+  		    : (long)(wp->w_cursor.lnum));
+! 	col_print(buffer + STRLEN(buffer),
+  			empty_line ? 0 : (int)wp->w_cursor.col + 1,
+  			(int)virtcol + 1);
+  
+--- 9604,9615 ----
+  	 * Some sprintfs return the length, some return a pointer.
+  	 * To avoid portability problems we use strlen() here.
+  	 */
+! 	vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,",
+  		(wp->w_buffer->b_ml.ml_flags & ML_EMPTY)
+  		    ? 0L
+  		    : (long)(wp->w_cursor.lnum));
+! 	len = STRLEN(buffer);
+! 	col_print(buffer + len, RULER_BUF_LEN - len,
+  			empty_line ? 0 : (int)wp->w_cursor.col + 1,
+  			(int)virtcol + 1);
+  
+***************
+*** 9616,9622 ****
+  	 * screen up on some terminals).
+  	 */
+  	i = (int)STRLEN(buffer);
+! 	get_rel_pos(wp, buffer + i + 1);
+  	o = i + vim_strsize(buffer + i + 1);
+  #ifdef FEAT_WINDOWS
+  	if (wp->w_status_height == 0)	/* can't use last char of screen */
+--- 9619,9625 ----
+  	 * screen up on some terminals).
+  	 */
+  	i = (int)STRLEN(buffer);
+! 	get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1);
+  	o = i + vim_strsize(buffer + i + 1);
+  #ifdef FEAT_WINDOWS
+  	if (wp->w_status_height == 0)	/* can't use last char of screen */
+***************
+*** 9643,9649 ****
+  		    buffer[i++] = fillchar;
+  		++o;
+  	    }
+! 	    get_rel_pos(wp, buffer + i);
+  	}
+  	/* Truncate at window boundary. */
+  #ifdef FEAT_MBYTE
+--- 9646,9652 ----
+  		    buffer[i++] = fillchar;
+  		++o;
+  	    }
+! 	    get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i);
+  	}
+  	/* Truncate at window boundary. */
+  #ifdef FEAT_MBYTE
+*** ../vim-7.2.166/src/structs.h	2008-11-15 16:05:30.000000000 +0100
+--- src/structs.h	2009-05-05 18:20:36.000000000 +0200
+***************
+*** 33,41 ****
+  } pos_T;
+  
+  #ifdef FEAT_VIRTUALEDIT
+! # define INIT_POS_T {0, 0, 0}
+  #else
+! # define INIT_POS_T {0, 0}
+  #endif
+  
+  /*
+--- 33,41 ----
+  } pos_T;
+  
+  #ifdef FEAT_VIRTUALEDIT
+! # define INIT_POS_T(l, c, ca) {l, c, ca}
+  #else
+! # define INIT_POS_T(l, c, ca) {l, c}
+  #endif
+  
+  /*
+***************
+*** 1166,1172 ****
+      char_u	*b_fname;	/* current file name */
+  
+  #ifdef UNIX
+!     int		b_dev;		/* device number (-1 if not set) */
+      ino_t	b_ino;		/* inode number */
+  #endif
+  #ifdef FEAT_CW_EDITOR
+--- 1166,1172 ----
+      char_u	*b_fname;	/* current file name */
+  
+  #ifdef UNIX
+!     dev_t	b_dev;		/* device number (-1 if not set) */
+      ino_t	b_ino;		/* inode number */
+  #endif
+  #ifdef FEAT_CW_EDITOR
+***************
+*** 1645,1651 ****
+--- 1645,1655 ----
+  #endif
+  #ifdef FEAT_DIFF
+      diff_T	    *tp_first_diff;
++ # ifdef S_SPLINT_S  /* splint doesn't understand the array of pointers */
++     buf_T	    **tp_diffbuf;
++ # else
+      buf_T	    *(tp_diffbuf[DB_COUNT]);
++ # endif
+      int		    tp_diff_invalid;	/* list of diffs is outdated */
+  #endif
+      frame_T	    *tp_snapshot;    /* window layout snapshot */
+*** ../vim-7.2.166/src/version.c	2009-04-29 18:44:38.000000000 +0200
+--- src/version.c	2009-05-13 12:06:36.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     167,
+  /**/
+
+-- 
+Snoring is prohibited unless all bedroom windows are closed and securely
+locked.
+		[real standing law in Massachusetts, United States of America]
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.168 b/source/ap/vim/patches/7.2.168
new file mode 100644
index 000000000..29cafb613
--- /dev/null
+++ b/source/ap/vim/patches/7.2.168
@@ -0,0 +1,74 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.168
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.168
+Problem:    When no ctags program can be found, "make tags" attempts to
+	    execute the first C file.
+Solution:   Default to "ctags" when no ctags program can be found.
+Files:	    src/configure.in, src/auto/configure
+
+
+*** ../vim-7.2.167/src/configure.in	2009-04-22 17:50:53.000000000 +0200
+--- src/configure.in	2009-05-05 17:46:45.000000000 +0200
+***************
+*** 2968,2974 ****
+  dnl Link with xpg4, it is said to make Korean locale working
+  AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
+  
+! dnl Check how we can run ctags
+  dnl --version for Exuberant ctags (preferred)
+  dnl       Add --fields=+S to get function signatures for omni completion.
+  dnl -t for typedefs (many ctags have this)
+--- 2968,2974 ----
+  dnl Link with xpg4, it is said to make Korean locale working
+  AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
+  
+! dnl Check how we can run ctags.  Default to "ctags" when nothing works.
+  dnl --version for Exuberant ctags (preferred)
+  dnl       Add --fields=+S to get function signatures for omni completion.
+  dnl -t for typedefs (many ctags have this)
+***************
+*** 2980,2985 ****
+--- 2980,2986 ----
+  if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
+    TAGPRG="ctags -I INIT+ --fields=+S"
+  else
++   TAGPRG="ctags"
+    (eval etags	   /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags"
+    (eval etags -c   /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags -c"
+    (eval ctags	   /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="ctags"
+*** ../vim-7.2.167/src/auto/configure	2009-04-22 17:50:53.000000000 +0200
+--- src/auto/configure	2009-05-13 14:38:10.000000000 +0200
+***************
+*** 15707,15712 ****
+--- 15723,15729 ----
+  if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
+    TAGPRG="ctags -I INIT+ --fields=+S"
+  else
++   TAGPRG="ctags"
+    (eval etags	   /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags"
+    (eval etags -c   /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c"
+    (eval ctags	   /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="ctags"
+*** ../vim-7.2.167/src/version.c	2009-05-13 12:46:36.000000000 +0200
+--- src/version.c	2009-05-13 14:46:35.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     168,
+  /**/
+
+-- 
+Zen Microsystems: we're the om in .commmmmmmmm
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.169 b/source/ap/vim/patches/7.2.169
new file mode 100644
index 000000000..4ae90a51e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.169
@@ -0,0 +1,1214 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.169
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.169
+Problem:    Splint complains about a lot of things.
+Solution:   Add type casts, #ifdefs and other changes to avoid warnings.
+	    Change colnr_T from unsigned to int.  Avoids mistakes with
+	    subtracting columns.
+Files:	    src/cleanlint.vim, src/diff.c, src/edit.c, src/ex_cmds.c,
+	    src/ex_cmds2.c, src/ex_docmd.c, src/proto/ex_cmds.pro,
+	    src/proto/spell.pro, src/quickfix.c, src/spell.c, src/structs.h,
+	    src/term.h, src/vim.h
+
+
+*** ../vim-7.2.168/src/cleanlint.vim	2009-05-13 12:46:36.000000000 +0200
+--- src/cleanlint.vim	2009-05-13 18:03:11.000000000 +0200
+***************
+*** 1,27 ****
+  " Vim tool: Filter output of splint
+  "
+  " Maintainer:	Bram Moolenaar <Bram@vim.org>
+! " Last Change:	2009 May 05
+  
+  " Usage: redirect output of "make lint" to a file, edit that file with Vim and
+  " :call CleanLint()
+  " This deletes irrelevant messages.  What remains might be valid warnings.
+  
+  fun! CleanLint()
+-   g/^  Types are incompatible/lockmarks d
+    g/Assignment of dev_t to __dev_t:/lockmarks d
+    g/Assignment of __dev_t to dev_t:/lockmarks d
+    g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
+!   g/Operands of == have incompatible types (unsigned int, int): /lockmarks d
+    g/Assignment of char to char_u: /lockmarks d
+    g/Assignment of unsigned int to int: /lockmarks d
+!   g/Assignment of colnr_T to int: /lockmarks d
+    g/Assignment of int to char_u: /lockmarks d
+    g/Function .* expects arg . to be wint_t gets int: /lockmarks d
+!   g/^digraph.c.*digraphdefault.*is type char, expects char_u:/lockmarks d
+    g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
+    g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
+    g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
+    g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
+    g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
+  endfun
+--- 1,32 ----
+  " Vim tool: Filter output of splint
+  "
+  " Maintainer:	Bram Moolenaar <Bram@vim.org>
+! " Last Change:	2009 May 13
+  
+  " Usage: redirect output of "make lint" to a file, edit that file with Vim and
+  " :call CleanLint()
+  " This deletes irrelevant messages.  What remains might be valid warnings.
+  
+  fun! CleanLint()
+    g/Assignment of dev_t to __dev_t:/lockmarks d
+    g/Assignment of __dev_t to dev_t:/lockmarks d
+    g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
+!   g/Operands of == have incompatible types (char_u, int): /lockmarks d
+    g/Assignment of char to char_u: /lockmarks d
+    g/Assignment of unsigned int to int: /lockmarks d
+!   g/Assignment of int to unsigned int: /lockmarks d
+!   g/Assignment of unsigned int to long int: /lockmarks d
+    g/Assignment of int to char_u: /lockmarks d
+    g/Function .* expects arg . to be wint_t gets int: /lockmarks d
+!   g/Function .* expects arg . to be size_t gets int: /lockmarks d
+!   g/Initial value of .* is type char, expects char_u: /lockmarks d
+!   g/^ex_cmds.h:.* Function types are inconsistent. Parameter 1 is implicitly temp, but unqualified in assigned function:/lockmarks d
+!   g/^ex_docmd.c:.* nospec_str/lockmarks d
+    g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
+    g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
++   g/^  Types are incompatible/lockmarks d
+    g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
+    g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
+    g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
++   g+ A variable is declared but never used. Use /.@unused@./ in front of declaration to suppress message.+lockmarks d
+  endfun
+*** ../vim-7.2.168/src/diff.c	2009-03-11 12:45:44.000000000 +0100
+--- src/diff.c	2009-05-13 16:16:11.000000000 +0200
+***************
+*** 827,832 ****
+--- 827,833 ----
+      char_u	*tmp_diff;
+  {
+      char_u	*cmd;
++     size_t	len;
+  
+  #ifdef FEAT_EVAL
+      if (*p_dex != NUL)
+***************
+*** 835,842 ****
+      else
+  #endif
+      {
+! 	cmd = alloc((unsigned)(STRLEN(tmp_orig) + STRLEN(tmp_new)
+! 				+ STRLEN(tmp_diff) + STRLEN(p_srr) + 27));
+  	if (cmd != NULL)
+  	{
+  	    /* We don't want $DIFF_OPTIONS to get in the way. */
+--- 836,844 ----
+      else
+  #endif
+      {
+! 	len = STRLEN(tmp_orig) + STRLEN(tmp_new)
+! 				      + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
+! 	cmd = alloc((unsigned)len);
+  	if (cmd != NULL)
+  	{
+  	    /* We don't want $DIFF_OPTIONS to get in the way. */
+***************
+*** 846,852 ****
+  	    /* Build the diff command and execute it.  Always use -a, binary
+  	     * differences are of no use.  Ignore errors, diff returns
+  	     * non-zero when differences have been found. */
+! 	    sprintf((char *)cmd, "diff %s%s%s%s%s %s",
+  		    diff_a_works == FALSE ? "" : "-a ",
+  #if defined(MSWIN) || defined(MSDOS)
+  		    diff_bin_works == TRUE ? "--binary " : "",
+--- 848,854 ----
+  	    /* Build the diff command and execute it.  Always use -a, binary
+  	     * differences are of no use.  Ignore errors, diff returns
+  	     * non-zero when differences have been found. */
+! 	    vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s",
+  		    diff_a_works == FALSE ? "" : "-a ",
+  #if defined(MSWIN) || defined(MSDOS)
+  		    diff_bin_works == TRUE ? "--binary " : "",
+***************
+*** 856,862 ****
+  		    (diff_flags & DIFF_IWHITE) ? "-b " : "",
+  		    (diff_flags & DIFF_ICASE) ? "-i " : "",
+  		    tmp_orig, tmp_new);
+! 	    append_redir(cmd, p_srr, tmp_diff);
+  #ifdef FEAT_AUTOCMD
+  	    block_autocmds();	/* Avoid ShellCmdPost stuff */
+  #endif
+--- 858,864 ----
+  		    (diff_flags & DIFF_IWHITE) ? "-b " : "",
+  		    (diff_flags & DIFF_ICASE) ? "-i " : "",
+  		    tmp_orig, tmp_new);
+! 	    append_redir(cmd, (int)len, p_srr, tmp_diff);
+  #ifdef FEAT_AUTOCMD
+  	    block_autocmds();	/* Avoid ShellCmdPost stuff */
+  #endif
+***************
+*** 881,886 ****
+--- 883,889 ----
+      char_u	*tmp_orig;	/* name of original temp file */
+      char_u	*tmp_new;	/* name of patched temp file */
+      char_u	*buf = NULL;
++     size_t	buflen;
+      win_T	*old_curwin = curwin;
+      char_u	*newname = NULL;	/* name of patched file buffer */
+  #ifdef UNIX
+***************
+*** 920,930 ****
+      /* Get the absolute path of the patchfile, changing directory below. */
+      fullname = FullName_save(eap->arg, FALSE);
+  #endif
+!     buf = alloc((unsigned)(STRLEN(tmp_orig) + (
+  # ifdef UNIX
+  		    fullname != NULL ? STRLEN(fullname) :
+  # endif
+! 		    STRLEN(eap->arg)) + STRLEN(tmp_new) + 16));
+      if (buf == NULL)
+  	goto theend;
+  
+--- 923,934 ----
+      /* Get the absolute path of the patchfile, changing directory below. */
+      fullname = FullName_save(eap->arg, FALSE);
+  #endif
+!     buflen = STRLEN(tmp_orig) + (
+  # ifdef UNIX
+  		    fullname != NULL ? STRLEN(fullname) :
+  # endif
+! 		    STRLEN(eap->arg)) + STRLEN(tmp_new) + 16;
+!     buf = alloc((unsigned)buflen);
+      if (buf == NULL)
+  	goto theend;
+  
+***************
+*** 961,967 ****
+      {
+  	/* Build the patch command and execute it.  Ignore errors.  Switch to
+  	 * cooked mode to allow the user to respond to prompts. */
+! 	sprintf((char *)buf, "patch -o %s %s < \"%s\"", tmp_new, tmp_orig,
+  # ifdef UNIX
+  		fullname != NULL ? fullname :
+  # endif
+--- 965,972 ----
+      {
+  	/* Build the patch command and execute it.  Ignore errors.  Switch to
+  	 * cooked mode to allow the user to respond to prompts. */
+! 	vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",
+! 		tmp_new, tmp_orig,
+  # ifdef UNIX
+  		fullname != NULL ? fullname :
+  # endif
+*** ../vim-7.2.168/src/edit.c	2009-05-13 12:46:36.000000000 +0200
+--- src/edit.c	2009-05-13 18:29:21.000000000 +0200
+***************
+*** 169,175 ****
+  static int  ins_compl_key2count __ARGS((int c));
+  static int  ins_compl_use_match __ARGS((int c));
+  static int  ins_complete __ARGS((int c));
+! static int  quote_meta __ARGS((char_u *dest, char_u *str, int len));
+  #endif /* FEAT_INS_EXPAND */
+  
+  #define BACKSPACE_CHAR		    1
+--- 169,175 ----
+  static int  ins_compl_key2count __ARGS((int c));
+  static int  ins_compl_use_match __ARGS((int c));
+  static int  ins_complete __ARGS((int c));
+! static unsigned  quote_meta __ARGS((char_u *dest, char_u *str, int len));
+  #endif /* FEAT_INS_EXPAND */
+  
+  #define BACKSPACE_CHAR		    1
+***************
+*** 757,763 ****
+  		 * there is nothing to add, CTRL-L works like CTRL-P then. */
+  		if (c == Ctrl_L
+  			&& (ctrl_x_mode != CTRL_X_WHOLE_LINE
+! 			    || STRLEN(compl_shown_match->cp_str)
+  					  > curwin->w_cursor.col - compl_col))
+  		{
+  		    ins_compl_addfrommatch();
+--- 757,763 ----
+  		 * there is nothing to add, CTRL-L works like CTRL-P then. */
+  		if (c == Ctrl_L
+  			&& (ctrl_x_mode != CTRL_X_WHOLE_LINE
+! 			    || (int)STRLEN(compl_shown_match->cp_str)
+  					  > curwin->w_cursor.col - compl_col))
+  		{
+  		    ins_compl_addfrommatch();
+***************
+*** 3837,3843 ****
+--- 3837,3847 ----
+      char_u	*word;
+      int		icase = FALSE;
+      int		adup = FALSE;
++ #ifdef S_SPLINT_S  /* splint doesn't parse array of pointers correctly */
++     char_u	**cptext;
++ #else
+      char_u	*(cptext[CPT_COUNT]);
++ #endif
+  
+      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
+      {
+***************
+*** 3994,4000 ****
+  		else if (*e_cpt == ']' || *e_cpt == 't')
+  		{
+  		    type = CTRL_X_TAGS;
+! 		    sprintf((char*)IObuff, _("Scanning tags."));
+  		    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
+  		}
+  		else
+--- 3998,4004 ----
+  		else if (*e_cpt == ']' || *e_cpt == 't')
+  		{
+  		    type = CTRL_X_TAGS;
+! 		    vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags."));
+  		    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
+  		}
+  		else
+***************
+*** 4093,4099 ****
+  	case CTRL_X_SPELL:
+  #ifdef FEAT_SPELL
+  	    num_matches = expand_spelling(first_match_pos.lnum,
+! 				 first_match_pos.col, compl_pattern, &matches);
+  	    if (num_matches > 0)
+  		ins_compl_add_matches(num_matches, matches, p_ic);
+  #endif
+--- 4097,4103 ----
+  	case CTRL_X_SPELL:
+  #ifdef FEAT_SPELL
+  	    num_matches = expand_spelling(first_match_pos.lnum,
+! 						     compl_pattern, &matches);
+  	    if (num_matches > 0)
+  		ins_compl_add_matches(num_matches, matches, p_ic);
+  #endif
+***************
+*** 4803,4812 ****
+  	    {
+  		char_u	    *prefix = (char_u *)"\\<";
+  
+! 		/* we need 3 extra chars, 1 for the NUL and
+! 		 * 2 >= strlen(prefix)	-- Acevedo */
+  		compl_pattern = alloc(quote_meta(NULL, line + compl_col,
+! 							   compl_length) + 3);
+  		if (compl_pattern == NULL)
+  		    return FAIL;
+  		if (!vim_iswordp(line + compl_col)
+--- 4807,4815 ----
+  	    {
+  		char_u	    *prefix = (char_u *)"\\<";
+  
+! 		/* we need up to 2 extra chars for the prefix */
+  		compl_pattern = alloc(quote_meta(NULL, line + compl_col,
+! 							   compl_length) + 2);
+  		if (compl_pattern == NULL)
+  		    return FAIL;
+  		if (!vim_iswordp(line + compl_col)
+***************
+*** 4881,4887 ****
+  		else
+  		{
+  		    compl_pattern = alloc(quote_meta(NULL, line + compl_col,
+! 							   compl_length) + 3);
+  		    if (compl_pattern == NULL)
+  			return FAIL;
+  		    STRCPY((char *)compl_pattern, "\\<");
+--- 4884,4890 ----
+  		else
+  		{
+  		    compl_pattern = alloc(quote_meta(NULL, line + compl_col,
+! 							   compl_length) + 2);
+  		    if (compl_pattern == NULL)
+  			return FAIL;
+  		    STRCPY((char *)compl_pattern, "\\<");
+***************
+*** 4963,4969 ****
+  	    if (col < 0)
+  		col = curs_col;
+  	    compl_col = col;
+! 	    if ((colnr_T)compl_col > curs_col)
+  		compl_col = curs_col;
+  
+  	    /* Setup variables for completion.  Need to obtain "line" again,
+--- 4966,4972 ----
+  	    if (col < 0)
+  		col = curs_col;
+  	    compl_col = col;
+! 	    if (compl_col > curs_col)
+  		compl_col = curs_col;
+  
+  	    /* Setup variables for completion.  Need to obtain "line" again,
+***************
+*** 5236,5250 ****
+   * a backslash) the metachars, and dest would be NUL terminated.
+   * Returns the length (needed) of dest
+   */
+!     static int
+  quote_meta(dest, src, len)
+      char_u	*dest;
+      char_u	*src;
+      int		len;
+  {
+!     int	m;
+  
+!     for (m = len; --len >= 0; src++)
+      {
+  	switch (*src)
+  	{
+--- 5239,5253 ----
+   * a backslash) the metachars, and dest would be NUL terminated.
+   * Returns the length (needed) of dest
+   */
+!     static unsigned
+  quote_meta(dest, src, len)
+      char_u	*dest;
+      char_u	*src;
+      int		len;
+  {
+!     unsigned	m = (unsigned)len + 1;  /* one extra for the NUL */
+  
+!     for ( ; --len >= 0; src++)
+      {
+  	switch (*src)
+  	{
+***************
+*** 6073,6079 ****
+       * in 'formatoptions' and there is a single character before the cursor.
+       * Otherwise the line would be broken and when typing another non-white
+       * next they are not joined back together. */
+!     wasatend = (pos.col == STRLEN(old));
+      if (*old != NUL && !trailblank && wasatend)
+      {
+  	dec_cursor();
+--- 6076,6082 ----
+       * in 'formatoptions' and there is a single character before the cursor.
+       * Otherwise the line would be broken and when typing another non-white
+       * next they are not joined back together. */
+!     wasatend = (pos.col == (colnr_T)STRLEN(old));
+      if (*old != NUL && !trailblank && wasatend)
+      {
+  	dec_cursor();
+***************
+*** 6250,6256 ****
+       * three digits. */
+      if (VIM_ISDIGIT(c))
+      {
+! 	sprintf((char *)buf, "%03d", c);
+  	AppendToRedobuff(buf);
+      }
+      else
+--- 6253,6259 ----
+       * three digits. */
+      if (VIM_ISDIGIT(c))
+      {
+! 	vim_snprintf((char *)buf, sizeof(buf), "%03d", c);
+  	AppendToRedobuff(buf);
+      }
+      else
+***************
+*** 6453,6462 ****
+  	     * deleted characters. */
+  	    if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum)
+  	    {
+! 		cc = (int)STRLEN(ml_get_curline());
+! 		if (VIsual.col > (colnr_T)cc)
+  		{
+! 		    VIsual.col = cc;
+  # ifdef FEAT_VIRTUALEDIT
+  		    VIsual.coladd = 0;
+  # endif
+--- 6457,6467 ----
+  	     * deleted characters. */
+  	    if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum)
+  	    {
+! 		int len = (int)STRLEN(ml_get_curline());
+! 
+! 		if (VIsual.col > len)
+  		{
+! 		    VIsual.col = len;
+  # ifdef FEAT_VIRTUALEDIT
+  		    VIsual.coladd = 0;
+  # endif
+***************
+*** 8315,8320 ****
+--- 8320,8326 ----
+      linenr_T	lnum;
+      int		cc;
+      int		temp = 0;	    /* init for GCC */
++     colnr_T	save_col;
+      colnr_T	mincol;
+      int		did_backspace = FALSE;
+      int		in_indent;
+***************
+*** 8472,8484 ****
+  		 */
+  		while (cc > 0)
+  		{
+! 		    temp = curwin->w_cursor.col;
+  #ifdef FEAT_MBYTE
+  		    mb_replace_pop_ins(cc);
+  #else
+  		    ins_char(cc);
+  #endif
+! 		    curwin->w_cursor.col = temp;
+  		    cc = replace_pop();
+  		}
+  		/* restore the characters that NL replaced */
+--- 8478,8490 ----
+  		 */
+  		while (cc > 0)
+  		{
+! 		    save_col = curwin->w_cursor.col;
+  #ifdef FEAT_MBYTE
+  		    mb_replace_pop_ins(cc);
+  #else
+  		    ins_char(cc);
+  #endif
+! 		    curwin->w_cursor.col = save_col;
+  		    cc = replace_pop();
+  		}
+  		/* restore the characters that NL replaced */
+***************
+*** 8510,8520 ****
+  #endif
+  			    )
+  	{
+! 	    temp = curwin->w_cursor.col;
+  	    beginline(BL_WHITE);
+  	    if (curwin->w_cursor.col < (colnr_T)temp)
+  		mincol = curwin->w_cursor.col;
+! 	    curwin->w_cursor.col = temp;
+  	}
+  
+  	/*
+--- 8516,8526 ----
+  #endif
+  			    )
+  	{
+! 	    save_col = curwin->w_cursor.col;
+  	    beginline(BL_WHITE);
+  	    if (curwin->w_cursor.col < (colnr_T)temp)
+  		mincol = curwin->w_cursor.col;
+! 	    curwin->w_cursor.col = save_col;
+  	}
+  
+  	/*
+*** ../vim-7.2.168/src/ex_cmds.c	2009-05-13 12:46:36.000000000 +0200
+--- src/ex_cmds.c	2009-05-13 18:24:18.000000000 +0200
+***************
+*** 87,99 ****
+  			       ))
+  	{
+  	    transchar_nonprint(buf3, c);
+! 	    sprintf(buf1, "  <%s>", (char *)buf3);
+  	}
+  	else
+  	    buf1[0] = NUL;
+  #ifndef EBCDIC
+  	if (c >= 0x80)
+! 	    sprintf(buf2, "  <M-%s>", transchar(c & 0x7f));
+  	else
+  #endif
+  	    buf2[0] = NUL;
+--- 87,100 ----
+  			       ))
+  	{
+  	    transchar_nonprint(buf3, c);
+! 	    vim_snprintf(buf1, sizeof(buf1), "  <%s>", (char *)buf3);
+  	}
+  	else
+  	    buf1[0] = NUL;
+  #ifndef EBCDIC
+  	if (c >= 0x80)
+! 	    vim_snprintf(buf2, sizeof(buf2), "  <M-%s>",
+! 						 (char *)transchar(c & 0x7f));
+  	else
+  #endif
+  	    buf2[0] = NUL;
+***************
+*** 358,364 ****
+      linenr_T	lnum;
+      long	maxlen = 0;
+      sorti_T	*nrs;
+!     size_t	count = eap->line2 - eap->line1 + 1;
+      size_t	i;
+      char_u	*p;
+      char_u	*s;
+--- 359,365 ----
+      linenr_T	lnum;
+      long	maxlen = 0;
+      sorti_T	*nrs;
+!     size_t	count = (size_t)(eap->line2 - eap->line1 + 1);
+      size_t	i;
+      char_u	*p;
+      char_u	*s;
+***************
+*** 957,963 ****
+  	    }
+  	    len += (int)STRLEN(prevcmd);
+  	}
+! 	if ((t = alloc(len)) == NULL)
+  	{
+  	    vim_free(newcmd);
+  	    return;
+--- 958,964 ----
+  	    }
+  	    len += (int)STRLEN(prevcmd);
+  	}
+! 	if ((t = alloc((unsigned)len)) == NULL)
+  	{
+  	    vim_free(newcmd);
+  	    return;
+***************
+*** 1548,1554 ****
+       * redirecting input and/or output.
+       */
+      if (itmp != NULL || otmp != NULL)
+! 	sprintf((char *)buf, "(%s)", (char *)cmd);
+      else
+  	STRCPY(buf, cmd);
+      if (itmp != NULL)
+--- 1549,1555 ----
+       * redirecting input and/or output.
+       */
+      if (itmp != NULL || otmp != NULL)
+! 	vim_snprintf((char *)buf, len, "(%s)", (char *)cmd);
+      else
+  	STRCPY(buf, cmd);
+      if (itmp != NULL)
+***************
+*** 1597,1633 ****
+      }
+  #endif
+      if (otmp != NULL)
+! 	append_redir(buf, p_srr, otmp);
+  
+      return buf;
+  }
+  
+  /*
+!  * Append output redirection for file "fname" to the end of string buffer "buf"
+   * Works with the 'shellredir' and 'shellpipe' options.
+   * The caller should make sure that there is enough room:
+   *	STRLEN(opt) + STRLEN(fname) + 3
+   */
+      void
+! append_redir(buf, opt, fname)
+      char_u	*buf;
+      char_u	*opt;
+      char_u	*fname;
+  {
+      char_u	*p;
+  
+!     buf += STRLEN(buf);
+      /* find "%s", skipping "%%" */
+      for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p)
+  	if (p[1] == 's')
+  	    break;
+      if (p != NULL)
+      {
+! 	*buf = ' '; /* not really needed? Not with sh, ksh or bash */
+! 	sprintf((char *)buf + 1, (char *)opt, (char *)fname);
+      }
+      else
+! 	sprintf((char *)buf,
+  #ifdef FEAT_QUICKFIX
+  # ifndef RISCOS
+  		opt != p_sp ? " %s%s" :
+--- 1598,1638 ----
+      }
+  #endif
+      if (otmp != NULL)
+! 	append_redir(buf, (int)len, p_srr, otmp);
+  
+      return buf;
+  }
+  
+  /*
+!  * Append output redirection for file "fname" to the end of string buffer
+!  * "buf[buflen]"
+   * Works with the 'shellredir' and 'shellpipe' options.
+   * The caller should make sure that there is enough room:
+   *	STRLEN(opt) + STRLEN(fname) + 3
+   */
+      void
+! append_redir(buf, buflen, opt, fname)
+      char_u	*buf;
++     int		buflen;
+      char_u	*opt;
+      char_u	*fname;
+  {
+      char_u	*p;
++     char_u	*end;
+  
+!     end = buf + STRLEN(buf);
+      /* find "%s", skipping "%%" */
+      for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p)
+  	if (p[1] == 's')
+  	    break;
+      if (p != NULL)
+      {
+! 	*end = ' '; /* not really needed? Not with sh, ksh or bash */
+! 	vim_snprintf((char *)end + 1, (size_t)(buflen - (end + 1 - buf)),
+! 						  (char *)opt, (char *)fname);
+      }
+      else
+! 	vim_snprintf((char *)end, (size_t)(buflen - (end - buf)),
+  #ifdef FEAT_QUICKFIX
+  # ifndef RISCOS
+  		opt != p_sp ? " %s%s" :
+***************
+*** 2390,2396 ****
+  
+      if (curwin->w_p_nu || use_number)
+      {
+! 	sprintf((char *)numbuf, "%*ld ", number_width(curwin), (long)lnum);
+  	msg_puts_attr(numbuf, hl_attr(HLF_N));	/* Highlight line nrs */
+      }
+      msg_prt_line(ml_get(lnum), list);
+--- 2395,2402 ----
+  
+      if (curwin->w_p_nu || use_number)
+      {
+! 	vim_snprintf((char *)numbuf, sizeof(numbuf),
+! 				   "%*ld ", number_width(curwin), (long)lnum);
+  	msg_puts_attr(numbuf, hl_attr(HLF_N));	/* Highlight line nrs */
+      }
+      msg_prt_line(ml_get(lnum), list);
+***************
+*** 4486,4492 ****
+  	    char_u	*p1;
+  	    int		did_sub = FALSE;
+  	    int		lastone;
+! 	    unsigned	len, needed_len;
+  	    long	nmatch_tl = 0;	/* nr of lines matched below lnum */
+  	    int		do_again;	/* do it again after joining lines */
+  	    int		skip_match = FALSE;
+--- 4492,4498 ----
+  	    char_u	*p1;
+  	    int		did_sub = FALSE;
+  	    int		lastone;
+! 	    int		len, copy_len, needed_len;
+  	    long	nmatch_tl = 0;	/* nr of lines matched below lnum */
+  	    int		do_again;	/* do it again after joining lines */
+  	    int		skip_match = FALSE;
+***************
+*** 4631,4636 ****
+--- 4637,4644 ----
+  
+  		if (do_ask)
+  		{
++ 		    int typed;
++ 
+  		    /* change State to CONFIRM, so that the mouse works
+  		     * properly */
+  		    save_State = State;
+***************
+*** 4669,4675 ****
+  			    resp = getexmodeline('?', NULL, 0);
+  			    if (resp != NULL)
+  			    {
+! 				i = *resp;
+  				vim_free(resp);
+  			    }
+  			}
+--- 4677,4683 ----
+  			    resp = getexmodeline('?', NULL, 0);
+  			    if (resp != NULL)
+  			    {
+! 				typed = *resp;
+  				vim_free(resp);
+  			    }
+  			}
+***************
+*** 4721,4727 ****
+  #endif
+  			    ++no_mapping;	/* don't map this key */
+  			    ++allow_keys;	/* allow special keys */
+! 			    i = plain_vgetc();
+  			    --allow_keys;
+  			    --no_mapping;
+  
+--- 4729,4735 ----
+  #endif
+  			    ++no_mapping;	/* don't map this key */
+  			    ++allow_keys;	/* allow special keys */
+! 			    typed = plain_vgetc();
+  			    --allow_keys;
+  			    --no_mapping;
+  
+***************
+*** 4732,4766 ****
+  			}
+  
+  			need_wait_return = FALSE; /* no hit-return prompt */
+! 			if (i == 'q' || i == ESC || i == Ctrl_C
+  #ifdef UNIX
+! 				|| i == intr_char
+  #endif
+  				)
+  			{
+  			    got_quit = TRUE;
+  			    break;
+  			}
+! 			if (i == 'n')
+  			    break;
+! 			if (i == 'y')
+  			    break;
+! 			if (i == 'l')
+  			{
+  			    /* last: replace and then stop */
+  			    do_all = FALSE;
+  			    line2 = lnum;
+  			    break;
+  			}
+! 			if (i == 'a')
+  			{
+  			    do_ask = FALSE;
+  			    break;
+  			}
+  #ifdef FEAT_INS_EXPAND
+! 			if (i == Ctrl_E)
+  			    scrollup_clamp();
+! 			else if (i == Ctrl_Y)
+  			    scrolldown_clamp();
+  #endif
+  		    }
+--- 4740,4774 ----
+  			}
+  
+  			need_wait_return = FALSE; /* no hit-return prompt */
+! 			if (typed == 'q' || typed == ESC || typed == Ctrl_C
+  #ifdef UNIX
+! 				|| typed == intr_char
+  #endif
+  				)
+  			{
+  			    got_quit = TRUE;
+  			    break;
+  			}
+! 			if (typed == 'n')
+  			    break;
+! 			if (typed == 'y')
+  			    break;
+! 			if (typed == 'l')
+  			{
+  			    /* last: replace and then stop */
+  			    do_all = FALSE;
+  			    line2 = lnum;
+  			    break;
+  			}
+! 			if (typed == 'a')
+  			{
+  			    do_ask = FALSE;
+  			    break;
+  			}
+  #ifdef FEAT_INS_EXPAND
+! 			if (typed == Ctrl_E)
+  			    scrollup_clamp();
+! 			else if (typed == Ctrl_Y)
+  			    scrolldown_clamp();
+  #endif
+  		    }
+***************
+*** 4771,4777 ****
+  		    if (vim_strchr(p_cpo, CPO_UNDO) != NULL)
+  			--no_u_sync;
+  
+! 		    if (i == 'n')
+  		    {
+  			/* For a multi-line match, put matchcol at the NUL at
+  			 * the end of the line and set nmatch to one, so that
+--- 4779,4785 ----
+  		    if (vim_strchr(p_cpo, CPO_UNDO) != NULL)
+  			--no_u_sync;
+  
+! 		    if (typed == 'n')
+  		    {
+  			/* For a multi-line match, put matchcol at the NUL at
+  			 * the end of the line and set nmatch to one, so that
+***************
+*** 4822,4830 ****
+  		    p1 = ml_get(sub_firstlnum + nmatch - 1);
+  		    nmatch_tl += nmatch - 1;
+  		}
+! 		i = regmatch.startpos[0].col - copycol;
+! 		needed_len = i + ((unsigned)STRLEN(p1) - regmatch.endpos[0].col)
+! 								 + sublen + 1;
+  		if (new_start == NULL)
+  		{
+  		    /*
+--- 4830,4838 ----
+  		    p1 = ml_get(sub_firstlnum + nmatch - 1);
+  		    nmatch_tl += nmatch - 1;
+  		}
+! 		copy_len = regmatch.startpos[0].col - copycol;
+! 		needed_len = copy_len + ((unsigned)STRLEN(p1)
+! 				       - regmatch.endpos[0].col) + sublen + 1;
+  		if (new_start == NULL)
+  		{
+  		    /*
+***************
+*** 4847,4853 ****
+  		     */
+  		    len = (unsigned)STRLEN(new_start);
+  		    needed_len += len;
+! 		    if (needed_len > new_start_len)
+  		    {
+  			new_start_len = needed_len + 50;
+  			if ((p1 = alloc_check(new_start_len)) == NULL)
+--- 4855,4861 ----
+  		     */
+  		    len = (unsigned)STRLEN(new_start);
+  		    needed_len += len;
+! 		    if (needed_len > (int)new_start_len)
+  		    {
+  			new_start_len = needed_len + 50;
+  			if ((p1 = alloc_check(new_start_len)) == NULL)
+***************
+*** 4865,4872 ****
+  		/*
+  		 * copy the text up to the part that matched
+  		 */
+! 		mch_memmove(new_end, sub_firstline + copycol, (size_t)i);
+! 		new_end += i;
+  
+  		(void)vim_regsub_multi(&regmatch,
+  				    sub_firstlnum - regmatch.startpos[0].lnum,
+--- 4873,4880 ----
+  		/*
+  		 * copy the text up to the part that matched
+  		 */
+! 		mch_memmove(new_end, sub_firstline + copycol, (size_t)copy_len);
+! 		new_end += copy_len;
+  
+  		(void)vim_regsub_multi(&regmatch,
+  				    sub_firstlnum - regmatch.startpos[0].lnum,
+***************
+*** 5768,5773 ****
+--- 5776,5785 ----
+  {
+      char_u	*s, *d;
+      int		i;
++ #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
++     static char **mtable;
++     static char **rtable;
++ #else
+      static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
+  			       "/*", "/\\*", "\"*", "**",
+  			       "/\\(\\)",
+***************
+*** 5782,5787 ****
+--- 5794,5800 ----
+  			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
+  			       "\\[count]", "\\[quotex]", "\\[range]",
+  			       "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
++ #endif
+      int flags;
+  
+      d = IObuff;		    /* assume IObuff is long enough! */
+***************
+*** 5790,5796 ****
+       * Recognize a few exceptions to the rule.	Some strings that contain '*'
+       * with "star".  Otherwise '*' is recognized as a wildcard.
+       */
+!     for (i = sizeof(mtable) / sizeof(char *); --i >= 0; )
+  	if (STRCMP(arg, mtable[i]) == 0)
+  	{
+  	    STRCPY(d, rtable[i]);
+--- 5803,5809 ----
+       * Recognize a few exceptions to the rule.	Some strings that contain '*'
+       * with "star".  Otherwise '*' is recognized as a wildcard.
+       */
+!     for (i = (int)(sizeof(mtable) / sizeof(char *)); --i >= 0; )
+  	if (STRCMP(arg, mtable[i]) == 0)
+  	{
+  	    STRCPY(d, rtable[i]);
+*** ../vim-7.2.168/src/ex_cmds2.c	2009-02-05 20:47:14.000000000 +0100
+--- src/ex_cmds2.c	2009-05-13 16:22:33.000000000 +0200
+***************
+*** 3373,3379 ****
+  	    p = skipwhite(sp->nextline);
+  	    if (*p != '\\')
+  		break;
+! 	    s = alloc((int)(STRLEN(line) + STRLEN(p)));
+  	    if (s == NULL)	/* out of memory */
+  		break;
+  	    STRCPY(s, line);
+--- 3373,3379 ----
+  	    p = skipwhite(sp->nextline);
+  	    if (*p != '\\')
+  		break;
+! 	    s = alloc((unsigned)(STRLEN(line) + STRLEN(p)));
+  	    if (s == NULL)	/* out of memory */
+  		break;
+  	    STRCPY(s, line);
+*** ../vim-7.2.168/src/ex_docmd.c	2009-04-29 18:44:38.000000000 +0200
+--- src/ex_docmd.c	2009-05-13 17:56:44.000000000 +0200
+***************
+*** 2737,2743 ****
+      int		i;
+  
+      for (i = 0; cmd[i] != NUL; ++i)
+! 	if (cmd[i] != (*pp)[i])
+  	    break;
+      if (i >= len && !isalpha((*pp)[i]))
+      {
+--- 2737,2743 ----
+      int		i;
+  
+      for (i = 0; cmd[i] != NUL; ++i)
+! 	if (((char_u *)cmd)[i] != (*pp)[i])
+  	    break;
+      if (i >= len && !isalpha((*pp)[i]))
+      {
+***************
+*** 2803,2809 ****
+  	    /* Check for ":dl", ":dell", etc. to ":deletel": that's
+  	     * :delete with the 'l' flag.  Same for 'p'. */
+  	    for (i = 0; i < len; ++i)
+! 		if (eap->cmd[i] != "delete"[i])
+  		    break;
+  	    if (i == len - 1)
+  	    {
+--- 2803,2809 ----
+  	    /* Check for ":dl", ":dell", etc. to ":deletel": that's
+  	     * :delete with the 'l' flag.  Same for 'p'. */
+  	    for (i = 0; i < len; ++i)
+! 		if (eap->cmd[i] != ((char_u *)"delete")[i])
+  		    break;
+  	    if (i == len - 1)
+  	    {
+***************
+*** 3823,3829 ****
+      char_u	*cmd;
+      int		*ctx;	/* pointer to xp_context or NULL */
+  {
+!     int		delim;
+  
+      while (vim_strchr((char_u *)" \t0123456789.$%'/?-+,;", *cmd) != NULL)
+      {
+--- 3823,3829 ----
+      char_u	*cmd;
+      int		*ctx;	/* pointer to xp_context or NULL */
+  {
+!     unsigned	delim;
+  
+      while (vim_strchr((char_u *)" \t0123456789.$%'/?-+,;", *cmd) != NULL)
+      {
+***************
+*** 9417,9423 ****
+  {
+      int		len;
+      int		i;
+!     static char *(spec_str[]) = {
+  		    "%",
+  #define SPEC_PERC   0
+  		    "#",
+--- 9417,9429 ----
+  {
+      int		len;
+      int		i;
+! #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
+!     static char **spec_str;
+!     static char *(nospec_str[])
+! #else
+!     static char *(spec_str[])
+! #endif
+! 	= {
+  		    "%",
+  #define SPEC_PERC   0
+  		    "#",
+***************
+*** 9443,9451 ****
+  # define SPEC_CLIENT 9
+  #endif
+      };
+- #define SPEC_COUNT  (sizeof(spec_str) / sizeof(char *))
+  
+!     for (i = 0; i < SPEC_COUNT; ++i)
+      {
+  	len = (int)STRLEN(spec_str[i]);
+  	if (STRNCMP(src, spec_str[i], len) == 0)
+--- 9449,9456 ----
+  # define SPEC_CLIENT 9
+  #endif
+      };
+  
+!     for (i = 0; i < (int)(sizeof(spec_str) / sizeof(char *)); ++i)
+      {
+  	len = (int)STRLEN(spec_str[i]);
+  	if (STRNCMP(src, spec_str[i], len) == 0)
+***************
+*** 9796,9802 ****
+  	}
+  
+  	/* allocate memory */
+! 	retval = alloc(len + 1);
+  	if (retval == NULL)
+  	    break;
+      }
+--- 9801,9807 ----
+  	}
+  
+  	/* allocate memory */
+! 	retval = alloc((unsigned)len + 1);
+  	if (retval == NULL)
+  	    break;
+      }
+*** ../vim-7.2.168/src/proto/ex_cmds.pro	2009-04-29 18:44:38.000000000 +0200
+--- src/proto/ex_cmds.pro	2009-05-13 15:53:39.000000000 +0200
+***************
+*** 9,15 ****
+  void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
+  void do_shell __ARGS((char_u *cmd, int flags));
+  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
+! void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
+  int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
+  int read_viminfo __ARGS((char_u *file, int flags));
+  void write_viminfo __ARGS((char_u *file, int forceit));
+--- 9,15 ----
+  void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
+  void do_shell __ARGS((char_u *cmd, int flags));
+  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
+! void append_redir __ARGS((char_u *buf, int buflen, char_u *opt, char_u *fname));
+  int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
+  int read_viminfo __ARGS((char_u *file, int flags));
+  void write_viminfo __ARGS((char_u *file, int forceit));
+*** ../vim-7.2.168/src/proto/spell.pro	2007-05-05 19:19:19.000000000 +0200
+--- src/proto/spell.pro	2009-05-13 16:43:13.000000000 +0200
+***************
+*** 22,26 ****
+  char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf));
+  int spell_word_start __ARGS((int startcol));
+  void spell_expand_check_cap __ARGS((colnr_T col));
+! int expand_spelling __ARGS((linenr_T lnum, int col, char_u *pat, char_u ***matchp));
+  /* vim: set ft=c : */
+--- 22,26 ----
+  char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf));
+  int spell_word_start __ARGS((int startcol));
+  void spell_expand_check_cap __ARGS((colnr_T col));
+! int expand_spelling __ARGS((linenr_T lnum, char_u *pat, char_u ***matchp));
+  /* vim: set ft=c : */
+*** ../vim-7.2.168/src/quickfix.c	2009-04-29 11:49:57.000000000 +0200
+--- src/quickfix.c	2009-05-13 15:53:18.000000000 +0200
+***************
+*** 2774,2780 ****
+      sprintf((char *)cmd, "%s%s%s", (char *)p_shq, (char *)eap->arg,
+  							       (char *)p_shq);
+      if (*p_sp != NUL)
+! 	append_redir(cmd, p_sp, fname);
+      /*
+       * Output a newline if there's something else than the :make command that
+       * was typed (in which case the cursor is in column 0).
+--- 2774,2780 ----
+      sprintf((char *)cmd, "%s%s%s", (char *)p_shq, (char *)eap->arg,
+  							       (char *)p_shq);
+      if (*p_sp != NUL)
+! 	append_redir(cmd, len, p_sp, fname);
+      /*
+       * Output a newline if there's something else than the :make command that
+       * was typed (in which case the cursor is in column 0).
+*** ../vim-7.2.168/src/spell.c	2009-02-11 17:57:43.000000000 +0100
+--- src/spell.c	2009-05-13 16:31:15.000000000 +0200
+***************
+*** 16151,16161 ****
+   * Returns the number of matches.  The matches are in "matchp[]", array of
+   * allocated strings.
+   */
+- /*ARGSUSED*/
+      int
+! expand_spelling(lnum, col, pat, matchp)
+      linenr_T	lnum;
+-     int		col;
+      char_u	*pat;
+      char_u	***matchp;
+  {
+--- 16151,16159 ----
+   * Returns the number of matches.  The matches are in "matchp[]", array of
+   * allocated strings.
+   */
+      int
+! expand_spelling(lnum, pat, matchp)
+      linenr_T	lnum;
+      char_u	*pat;
+      char_u	***matchp;
+  {
+*** ../vim-7.2.168/src/structs.h	2009-05-13 12:46:36.000000000 +0200
+--- src/structs.h	2009-05-13 16:45:51.000000000 +0200
+***************
+*** 16,22 ****
+   */
+  #if defined(SASC) && SASC < 658
+  typedef long		linenr_T;
+! typedef unsigned	colnr_T;
+  typedef unsigned short	short_u;
+  #endif
+  
+--- 16,22 ----
+   */
+  #if defined(SASC) && SASC < 658
+  typedef long		linenr_T;
+! typedef int		colnr_T;
+  typedef unsigned short	short_u;
+  #endif
+  
+*** ../vim-7.2.168/src/term.h	2005-03-16 10:53:56.000000000 +0100
+--- src/term.h	2009-05-13 17:27:41.000000000 +0200
+***************
+*** 96,102 ****
+--- 96,106 ----
+   * - there should be code in term.c to obtain the value from the termcap
+   */
+  
++ #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
++ extern char_u **term_strings;    /* current terminal strings */
++ #else
+  extern char_u *(term_strings[]);    /* current terminal strings */
++ #endif
+  
+  /*
+   * strings used for terminal
+*** ../vim-7.2.168/src/vim.h	2009-04-29 18:44:38.000000000 +0200
+--- src/vim.h	2009-05-13 16:45:39.000000000 +0200
+***************
+*** 1460,1467 ****
+  # define PERROR(msg)		    perror(msg)
+  #endif
+  
+! typedef long	    linenr_T;		/* line number type */
+! typedef unsigned    colnr_T;		/* column number type */
+  typedef unsigned short disptick_T;	/* display tick type */
+  
+  #define MAXLNUM (0x7fffffffL)		/* maximum (invalid) line number */
+--- 1460,1467 ----
+  # define PERROR(msg)		    perror(msg)
+  #endif
+  
+! typedef long	linenr_T;		/* line number type */
+! typedef int	colnr_T;		/* column number type */
+  typedef unsigned short disptick_T;	/* display tick type */
+  
+  #define MAXLNUM (0x7fffffffL)		/* maximum (invalid) line number */
+*** ../vim-7.2.168/src/version.c	2009-05-13 14:48:55.000000000 +0200
+--- src/version.c	2009-05-13 18:44:28.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     169,
+  /**/
+
+-- 
+Females are strictly forbidden to appear unshaven in public.
+		[real standing law in New Mexico, United States of America]
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.170 b/source/ap/vim/patches/7.2.170
new file mode 100644
index 000000000..6790be14a
--- /dev/null
+++ b/source/ap/vim/patches/7.2.170
@@ -0,0 +1,179 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.170
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.170
+Problem:    Using b_dev while it was not set. (Dominique Pelle)
+Solution:   Add the b_dev_valid flag.
+Files:	    src/buffer.c, src/fileio.c, src/structs.h
+
+
+*** ../vim-7.2.169/src/buffer.c	2009-05-13 12:46:36.000000000 +0200
+--- src/buffer.c	2009-05-13 20:23:51.000000000 +0200
+***************
+*** 1678,1686 ****
+      buf->b_fname = buf->b_sfname;
+  #ifdef UNIX
+      if (st.st_dev == (dev_T)-1)
+! 	buf->b_dev = -1;
+      else
+      {
+  	buf->b_dev = st.st_dev;
+  	buf->b_ino = st.st_ino;
+      }
+--- 1678,1687 ----
+      buf->b_fname = buf->b_sfname;
+  #ifdef UNIX
+      if (st.st_dev == (dev_T)-1)
+! 	buf->b_dev_valid = FALSE;
+      else
+      {
++ 	buf->b_dev_valid = TRUE;
+  	buf->b_dev = st.st_dev;
+  	buf->b_ino = st.st_ino;
+      }
+***************
+*** 2693,2701 ****
+      buf->b_fname = buf->b_sfname;
+  #ifdef UNIX
+      if (st.st_dev == (dev_T)-1)
+! 	buf->b_dev = -1;
+      else
+      {
+  	buf->b_dev = st.st_dev;
+  	buf->b_ino = st.st_ino;
+      }
+--- 2694,2703 ----
+      buf->b_fname = buf->b_sfname;
+  #ifdef UNIX
+      if (st.st_dev == (dev_T)-1)
+! 	buf->b_dev_valid = FALSE;
+      else
+      {
++ 	buf->b_dev_valid = TRUE;
+  	buf->b_dev = st.st_dev;
+  	buf->b_ino = st.st_ino;
+      }
+***************
+*** 2889,2895 ****
+  	/* If no struct stat given, get it now */
+  	if (stp == NULL)
+  	{
+! 	    if (buf->b_dev < 0 || mch_stat((char *)ffname, &st) < 0)
+  		st.st_dev = (dev_T)-1;
+  	    stp = &st;
+  	}
+--- 2891,2897 ----
+  	/* If no struct stat given, get it now */
+  	if (stp == NULL)
+  	{
+! 	    if (!buf->b_dev_valid || mch_stat((char *)ffname, &st) < 0)
+  		st.st_dev = (dev_T)-1;
+  	    stp = &st;
+  	}
+***************
+*** 2926,2936 ****
+  
+      if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0)
+      {
+  	buf->b_dev = st.st_dev;
+  	buf->b_ino = st.st_ino;
+      }
+      else
+! 	buf->b_dev = -1;
+  }
+  
+  /*
+--- 2928,2939 ----
+  
+      if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0)
+      {
++ 	buf->b_dev_valid = TRUE;
+  	buf->b_dev = st.st_dev;
+  	buf->b_ino = st.st_ino;
+      }
+      else
+! 	buf->b_dev_valid = FALSE;
+  }
+  
+  /*
+***************
+*** 2941,2947 ****
+      buf_T	*buf;
+      struct stat *stp;
+  {
+!     return (buf->b_dev >= 0
+  	    && stp->st_dev == buf->b_dev
+  	    && stp->st_ino == buf->b_ino);
+  }
+--- 2944,2950 ----
+      buf_T	*buf;
+      struct stat *stp;
+  {
+!     return (buf->b_dev_valid
+  	    && stp->st_dev == buf->b_dev
+  	    && stp->st_ino == buf->b_ino);
+  }
+*** ../vim-7.2.169/src/fileio.c	2009-04-29 18:01:23.000000000 +0200
+--- src/fileio.c	2009-05-13 20:24:08.000000000 +0200
+***************
+*** 4416,4422 ****
+  # endif
+  	buf_setino(buf);
+      }
+!     else if (buf->b_dev < 0)
+  	/* Set the inode when creating a new file. */
+  	buf_setino(buf);
+  #endif
+--- 4416,4422 ----
+  # endif
+  	buf_setino(buf);
+      }
+!     else if (!buf->b_dev_valid)
+  	/* Set the inode when creating a new file. */
+  	buf_setino(buf);
+  #endif
+*** ../vim-7.2.169/src/structs.h	2009-05-13 18:54:14.000000000 +0200
+--- src/structs.h	2009-05-13 20:24:54.000000000 +0200
+***************
+*** 1166,1172 ****
+      char_u	*b_fname;	/* current file name */
+  
+  #ifdef UNIX
+!     dev_t	b_dev;		/* device number (-1 if not set) */
+      ino_t	b_ino;		/* inode number */
+  #endif
+  #ifdef FEAT_CW_EDITOR
+--- 1166,1173 ----
+      char_u	*b_fname;	/* current file name */
+  
+  #ifdef UNIX
+!     int		b_dev_valid;	/* TRUE when b_dev has a valid number */
+!     dev_t	b_dev;		/* device number */
+      ino_t	b_ino;		/* inode number */
+  #endif
+  #ifdef FEAT_CW_EDITOR
+*** ../vim-7.2.169/src/version.c	2009-05-13 18:54:14.000000000 +0200
+--- src/version.c	2009-05-13 20:43:22.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     170,
+  /**/
+
+-- 
+A special cleaning ordinance bans housewives from hiding dirt and dust under a
+rug in a dwelling.
+		[real standing law in Pennsylvania, United States of America]
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.171 b/source/ap/vim/patches/7.2.171
new file mode 100644
index 000000000..7d1b8a861
--- /dev/null
+++ b/source/ap/vim/patches/7.2.171
@@ -0,0 +1,80 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.171
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.171 (after 7.2.169)
+Problem:    Compiler warnings. (Tony Mechelynck)
+Solution:   Add function prototype. (Patrick Texier)  Init variable.
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-7.2.170/src/ex_cmds.c	2009-05-13 18:54:14.000000000 +0200
+--- src/ex_cmds.c	2009-05-14 21:11:01.000000000 +0200
+***************
+*** 4637,4643 ****
+  
+  		if (do_ask)
+  		{
+! 		    int typed;
+  
+  		    /* change State to CONFIRM, so that the mouse works
+  		     * properly */
+--- 4635,4641 ----
+  
+  		if (do_ask)
+  		{
+! 		    int typed = 0;
+  
+  		    /* change State to CONFIRM, so that the mouse works
+  		     * properly */
+***************
+*** 6553,6558 ****
+--- 6549,6555 ----
+  static sign_T	*first_sign = NULL;
+  static int	last_sign_typenr = MAX_TYPENR;	/* is decremented */
+  
++ static int sign_cmd_idx __ARGS((char_u *begin_cmd, char_u *end_cmd));
+  static void sign_list_defined __ARGS((sign_T *sp));
+  static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
+  
+***************
+*** 6579,6586 ****
+   */
+      static int
+  sign_cmd_idx(begin_cmd, end_cmd)
+!     char	*begin_cmd;	/* begin of sign subcmd */
+!     char	*end_cmd;	/* just after sign subcmd */
+  {
+      int		idx;
+      char	save = *end_cmd;
+--- 6576,6583 ----
+   */
+      static int
+  sign_cmd_idx(begin_cmd, end_cmd)
+!     char_u	*begin_cmd;	/* begin of sign subcmd */
+!     char_u	*end_cmd;	/* just after sign subcmd */
+  {
+      int		idx;
+      char	save = *end_cmd;
+*** ../vim-7.2.170/src/version.c	2009-05-13 20:47:07.000000000 +0200
+--- src/version.c	2009-05-14 21:49:22.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     171,
+  /**/
+
+-- 
+Living on Earth includes an annual free trip around the Sun.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.172 b/source/ap/vim/patches/7.2.172
new file mode 100644
index 000000000..1ba814d32
--- /dev/null
+++ b/source/ap/vim/patches/7.2.172
@@ -0,0 +1,59 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.172 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.172 (extra)
+Problem:    Compiler warning.
+Solution:   Adjust function prototype. (Patrick Texier)
+Files:	    src/os_mswin.c
+
+
+*** ../vim-7.2.171/src/os_mswin.c	2009-01-22 21:49:21.000000000 +0100
+--- src/os_mswin.c	2009-05-14 20:54:32.000000000 +0200
+***************
+*** 1227,1234 ****
+   * Wait for another process to Close the Clipboard.
+   * Returns TRUE for success.
+   */
+!     int
+! vim_open_clipboard()
+  {
+      int delay = 10;
+  
+--- 1227,1234 ----
+   * Wait for another process to Close the Clipboard.
+   * Returns TRUE for success.
+   */
+!     static int
+! vim_open_clipboard(void)
+  {
+      int delay = 10;
+  
+*** ../vim-7.2.171/src/version.c	2009-05-14 21:51:06.000000000 +0200
+--- src/version.c	2009-05-14 21:59:45.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     172,
+  /**/
+
+-- 
+FROG: How you English say:  I one more time, mac, I unclog my nose towards
+      you, sons of a window-dresser,  so, you think you could out-clever us
+      French fellows with your silly knees-bent creeping about advancing
+      behaviour.  (blows a raspberry) I wave my private parts at your aunties,
+      you brightly-coloured, mealy-templed, cranberry-smelling, electric
+      donkey-bottom biters.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.173 b/source/ap/vim/patches/7.2.173
new file mode 100644
index 000000000..331a6e849
--- /dev/null
+++ b/source/ap/vim/patches/7.2.173
@@ -0,0 +1,719 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.173
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.173
+Problem:    Without lint there is no check for unused function arguments.
+Solution:   Use gcc -Wunused-parameter instead of lint.  For a few files add
+	    attributes to arguments that are known not to be used.
+Files:	    src/auto/configure, src/buffer.c, src/charset.c, src/diff.c,
+	    src/configure.in, src/config.h.in, src/edit.c, src/ex_cmds.c,
+	    src/ex_cmds2.c, src/version.c, src/vim.h
+
+
+*** ../vim-7.2.172/src/auto/configure	2009-05-13 14:48:55.000000000 +0200
+--- src/auto/configure	2009-05-14 22:08:12.000000000 +0200
+***************
+*** 10362,10367 ****
+--- 10372,10427 ----
+  
+  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  
++ { $as_echo "$as_me:$LINENO: checking whether __attribute__((unused)) is allowed" >&5
++ $as_echo_n "checking whether __attribute__((unused)) is allowed... " >&6; }
++ cat >conftest.$ac_ext <<_ACEOF
++ /* confdefs.h.  */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h.  */
++ #include <stdio.h>
++ int
++ main ()
++ {
++ int x __attribute__((unused));
++   ;
++   return 0;
++ }
++ _ACEOF
++ rm -f conftest.$ac_objext
++ if { (ac_try="$ac_compile"
++ case "(($ac_try" in
++   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++   *) ac_try_echo=$ac_try;;
++ esac
++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++ $as_echo "$ac_try_echo") >&5
++   (eval "$ac_compile") 2>conftest.er1
++   ac_status=$?
++   grep -v '^ *+' conftest.er1 >conftest.err
++   rm -f conftest.er1
++   cat conftest.err >&5
++   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); } && {
++ 	 test -z "$ac_c_werror_flag" ||
++ 	 test ! -s conftest.err
++        } && test -s conftest.$ac_objext; then
++   { $as_echo "$as_me:$LINENO: result: yes" >&5
++ $as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF
++ #define HAVE_ATTRIBUTE_UNUSED 1
++ _ACEOF
++ 
++ else
++   $as_echo "$as_me: failed program was:" >&5
++ sed 's/^/| /' conftest.$ac_ext >&5
++ 
++ 	{ $as_echo "$as_me:$LINENO: result: no" >&5
++ $as_echo "no" >&6; }
++ fi
++ 
++ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ 
+  if test "${ac_cv_header_elf_h+set}" = set; then
+    { $as_echo "$as_me:$LINENO: checking for elf.h" >&5
+  $as_echo_n "checking for elf.h... " >&6; }
+*** ../vim-7.2.172/src/buffer.c	2009-05-13 20:47:07.000000000 +0200
+--- src/buffer.c	2009-05-14 21:34:06.000000000 +0200
+***************
+*** 512,523 ****
+   * buf_freeall() - free all things allocated for a buffer that are related to
+   * the file.
+   */
+- /*ARGSUSED*/
+      void
+  buf_freeall(buf, del_buf, wipe_buf)
+      buf_T	*buf;
+!     int		del_buf;	/* buffer is going to be deleted */
+!     int		wipe_buf;	/* buffer is going to be wiped out */
+  {
+  #ifdef FEAT_AUTOCMD
+      int		is_curbuf = (buf == curbuf);
+--- 512,522 ----
+   * buf_freeall() - free all things allocated for a buffer that are related to
+   * the file.
+   */
+      void
+  buf_freeall(buf, del_buf, wipe_buf)
+      buf_T	*buf;
+!     int		del_buf UNUSED;	    /* buffer is going to be deleted */
+!     int		wipe_buf UNUSED;    /* buffer is going to be wiped out */
+  {
+  #ifdef FEAT_AUTOCMD
+      int		is_curbuf = (buf == curbuf);
+***************
+*** 2437,2447 ****
+   * another tab page.
+   * Returns NULL when there isn't any info.
+   */
+- /*ARGSUSED*/
+      static wininfo_T *
+  find_wininfo(buf, skip_diff_buffer)
+      buf_T	*buf;
+!     int		skip_diff_buffer;
+  {
+      wininfo_T	*wip;
+  
+--- 2436,2445 ----
+   * another tab page.
+   * Returns NULL when there isn't any info.
+   */
+      static wininfo_T *
+  find_wininfo(buf, skip_diff_buffer)
+      buf_T	*buf;
+!     int		skip_diff_buffer UNUSED;
+  {
+      wininfo_T	*wip;
+  
+***************
+*** 4278,4287 ****
+   * Make "ffname" a full file name, set "sfname" to "ffname" if not NULL.
+   * "ffname" becomes a pointer to allocated memory (or NULL).
+   */
+- /*ARGSUSED*/
+      void
+  fname_expand(buf, ffname, sfname)
+!     buf_T	*buf;
+      char_u	**ffname;
+      char_u	**sfname;
+  {
+--- 4276,4284 ----
+   * Make "ffname" a full file name, set "sfname" to "ffname" if not NULL.
+   * "ffname" becomes a pointer to allocated memory (or NULL).
+   */
+      void
+  fname_expand(buf, ffname, sfname)
+!     buf_T	*buf UNUSED;
+      char_u	**ffname;
+      char_u	**sfname;
+  {
+***************
+*** 5577,5587 ****
+   * this buffer.  Call this to wipe out a temp buffer that does not contain any
+   * marks.
+   */
+- /*ARGSUSED*/
+      void
+  wipe_buffer(buf, aucmd)
+      buf_T	*buf;
+!     int		aucmd;	    /* When TRUE trigger autocommands. */
+  {
+      if (buf->b_fnum == top_file_num - 1)
+  	--top_file_num;
+--- 5574,5583 ----
+   * this buffer.  Call this to wipe out a temp buffer that does not contain any
+   * marks.
+   */
+      void
+  wipe_buffer(buf, aucmd)
+      buf_T	*buf;
+!     int		aucmd UNUSED;	    /* When TRUE trigger autocommands. */
+  {
+      if (buf->b_fnum == top_file_num - 1)
+  	--top_file_num;
+*** ../vim-7.2.172/src/charset.c	2009-05-13 14:10:46.000000000 +0200
+--- src/charset.c	2009-05-14 21:34:30.000000000 +0200
+***************
+*** 1026,1038 ****
+   * string at start of line.  Warning: *headp is only set if it's a non-zero
+   * value, init to 0 before calling.
+   */
+- /*ARGSUSED*/
+      int
+  win_lbr_chartabsize(wp, s, col, headp)
+      win_T	*wp;
+      char_u	*s;
+      colnr_T	col;
+!     int		*headp;
+  {
+  #ifdef FEAT_LINEBREAK
+      int		c;
+--- 1026,1037 ----
+   * string at start of line.  Warning: *headp is only set if it's a non-zero
+   * value, init to 0 before calling.
+   */
+      int
+  win_lbr_chartabsize(wp, s, col, headp)
+      win_T	*wp;
+      char_u	*s;
+      colnr_T	col;
+!     int		*headp UNUSED;
+  {
+  #ifdef FEAT_LINEBREAK
+      int		c;
+*** ../vim-7.2.172/src/diff.c	2009-05-13 18:54:14.000000000 +0200
+--- src/diff.c	2009-05-14 21:24:59.000000000 +0200
+***************
+*** 652,661 ****
+   * The buffers are written to a file, also for unmodified buffers (the file
+   * could have been produced by autocommands, e.g. the netrw plugin).
+   */
+- /*ARGSUSED*/
+      void
+  ex_diffupdate(eap)
+!     exarg_T	*eap;	    /* can be NULL, it's not used */
+  {
+      buf_T	*buf;
+      int		idx_orig;
+--- 652,660 ----
+   * The buffers are written to a file, also for unmodified buffers (the file
+   * could have been produced by autocommands, e.g. the netrw plugin).
+   */
+      void
+  ex_diffupdate(eap)
+!     exarg_T	*eap UNUSED;	    /* can be NULL */
+  {
+      buf_T	*buf;
+      int		idx_orig;
+***************
+*** 1094,1103 ****
+  /*
+   * Set options to show difs for the current window.
+   */
+- /*ARGSUSED*/
+      void
+  ex_diffthis(eap)
+!     exarg_T	*eap;
+  {
+      /* Set 'diff', 'scrollbind' on and 'wrap' off. */
+      diff_win_options(curwin, TRUE);
+--- 1093,1101 ----
+  /*
+   * Set options to show difs for the current window.
+   */
+      void
+  ex_diffthis(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      /* Set 'diff', 'scrollbind' on and 'wrap' off. */
+      diff_win_options(curwin, TRUE);
+*** ../vim-7.2.172/src/configure.in	2009-05-13 14:48:55.000000000 +0200
+--- src/configure.in	2009-05-14 22:08:06.000000000 +0200
+***************
+*** 2067,2072 ****
+--- 2067,2077 ----
+  	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_DATE_TIME),
+  	AC_MSG_RESULT(no))
+  
++ AC_MSG_CHECKING(whether __attribute__((unused)) is allowed)
++ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));],
++ 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ATTRIBUTE_UNUSED),
++ 	AC_MSG_RESULT(no))
++ 
+  dnl Checks for header files.
+  AC_CHECK_HEADER(elf.h, HAS_ELF=1)
+  dnl AC_CHECK_HEADER(dwarf.h, SVR4=1)
+*** ../vim-7.2.172/src/config.h.in	2009-03-02 02:44:54.000000000 +0100
+--- src/config.h.in	2009-05-14 21:15:02.000000000 +0200
+***************
+*** 30,35 ****
+--- 30,38 ----
+  /* Define when __DATE__ " " __TIME__ can be used */
+  #undef HAVE_DATE_TIME
+  
++ /* Define when __attribute__((unused)) can be used */
++ #undef HAVE_ATTRIBUTE_UNUSED
++ 
+  /* defined always when using configure */
+  #undef UNIX
+  
+*** ../vim-7.2.172/src/edit.c	2009-05-13 18:54:14.000000000 +0200
+--- src/edit.c	2009-05-14 21:35:08.000000000 +0200
+***************
+*** 1447,1456 ****
+   * Only redraw when there are no characters available.  This speeds up
+   * inserting sequences of characters (e.g., for CTRL-R).
+   */
+- /*ARGSUSED*/
+      static void
+  ins_redraw(ready)
+!     int		ready;	    /* not busy with something */
+  {
+      if (!char_avail())
+      {
+--- 1447,1455 ----
+   * Only redraw when there are no characters available.  This speeds up
+   * inserting sequences of characters (e.g., for CTRL-R).
+   */
+      static void
+  ins_redraw(ready)
+!     int		ready UNUSED;	    /* not busy with something */
+  {
+      if (!char_avail())
+      {
+***************
+*** 1962,1971 ****
+   * Only matters when there are composing characters.
+   * Return TRUE when something was deleted.
+   */
+- /*ARGSUSED*/
+     static int
+  del_char_after_col(limit_col)
+!     int limit_col;
+  {
+  #ifdef FEAT_MBYTE
+      if (enc_utf8 && limit_col >= 0)
+--- 1961,1969 ----
+   * Only matters when there are composing characters.
+   * Return TRUE when something was deleted.
+   */
+     static int
+  del_char_after_col(limit_col)
+!     int limit_col UNUSED;
+  {
+  #ifdef FEAT_MBYTE
+      if (enc_utf8 && limit_col >= 0)
+*** ../vim-7.2.172/src/ex_cmds.c	2009-05-14 21:51:06.000000000 +0200
+--- src/ex_cmds.c	2009-05-14 21:11:01.000000000 +0200
+***************
+*** 43,52 ****
+  /*
+   * ":ascii" and "ga".
+   */
+- /*ARGSUSED*/
+      void
+  do_ascii(eap)
+!     exarg_T	*eap;
+  {
+      int		c;
+      int		cval;
+--- 43,51 ----
+  /*
+   * ":ascii" and "ga".
+   */
+      void
+  do_ascii(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      int		c;
+      int		cval;
+***************
+*** 2373,2382 ****
+   *   ^?		^H
+   * not ^?	^?
+   */
+- /*ARGSUSED*/
+      void
+  do_fixdel(eap)
+!     exarg_T	*eap;
+  {
+      char_u  *p;
+  
+--- 2372,2380 ----
+   *   ^?		^H
+   * not ^?	^?
+   */
+      void
+  do_fixdel(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      char_u  *p;
+  
+***************
+*** 6127,6136 ****
+  /*
+   * ":exusage"
+   */
+- /*ARGSUSED*/
+      void
+  ex_exusage(eap)
+!     exarg_T	*eap;
+  {
+      do_cmdline_cmd((char_u *)"help ex-cmd-index");
+  }
+--- 6125,6133 ----
+  /*
+   * ":exusage"
+   */
+      void
+  ex_exusage(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      do_cmdline_cmd((char_u *)"help ex-cmd-index");
+  }
+***************
+*** 6138,6147 ****
+  /*
+   * ":viusage"
+   */
+- /*ARGSUSED*/
+      void
+  ex_viusage(eap)
+!     exarg_T	*eap;
+  {
+      do_cmdline_cmd((char_u *)"help normal-index");
+  }
+--- 6135,6143 ----
+  /*
+   * ":viusage"
+   */
+      void
+  ex_viusage(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      do_cmdline_cmd((char_u *)"help normal-index");
+  }
+***************
+*** 7154,7163 ****
+   * Function given to ExpandGeneric() to obtain the sign command
+   * expansion.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_sign_name(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      sign_T	*sp;
+--- 7150,7158 ----
+   * Function given to ExpandGeneric() to obtain the sign command
+   * expansion.
+   */
+      char_u *
+  get_sign_name(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      sign_T	*sp;
+*** ../vim-7.2.172/src/ex_cmds2.c	2009-05-13 18:54:14.000000000 +0200
+--- src/ex_cmds2.c	2009-05-14 21:35:40.000000000 +0200
+***************
+*** 680,689 ****
+  /*
+   * ":breaklist".
+   */
+- /*ARGSUSED*/
+      void
+  ex_breaklist(eap)
+!     exarg_T	*eap;
+  {
+      struct debuggy *bp;
+      int		i;
+--- 680,688 ----
+  /*
+   * ":breaklist".
+   */
+      void
+  ex_breaklist(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      struct debuggy *bp;
+      int		i;
+***************
+*** 1342,1355 ****
+  /*
+   * return TRUE if buffer was changed and cannot be abandoned.
+   */
+- /*ARGSUSED*/
+      int
+  check_changed(buf, checkaw, mult_win, forceit, allbuf)
+      buf_T	*buf;
+      int		checkaw;	/* do autowrite if buffer was changed */
+      int		mult_win;	/* check also when several wins for the buf */
+      int		forceit;
+!     int		allbuf;		/* may write all buffers */
+  {
+      if (       !forceit
+  	    && bufIsChanged(buf)
+--- 1341,1353 ----
+  /*
+   * return TRUE if buffer was changed and cannot be abandoned.
+   */
+      int
+  check_changed(buf, checkaw, mult_win, forceit, allbuf)
+      buf_T	*buf;
+      int		checkaw;	/* do autowrite if buffer was changed */
+      int		mult_win;	/* check also when several wins for the buf */
+      int		forceit;
+!     int		allbuf UNUSED;	/* may write all buffers */
+  {
+      if (       !forceit
+  	    && bufIsChanged(buf)
+***************
+*** 1759,1770 ****
+   *
+   * Return FAIL for failure, OK otherwise.
+   */
+- /*ARGSUSED*/
+      static int
+  do_arglist(str, what, after)
+      char_u	*str;
+!     int		what;
+!     int		after;		/* 0 means before first one */
+  {
+      garray_T	new_ga;
+      int		exp_count;
+--- 1757,1767 ----
+   *
+   * Return FAIL for failure, OK otherwise.
+   */
+      static int
+  do_arglist(str, what, after)
+      char_u	*str;
+!     int		what UNUSED;
+!     int		after UNUSED;		/* 0 means before first one */
+  {
+      garray_T	new_ga;
+      int		exp_count;
+***************
+*** 2549,2559 ****
+  
+  static void source_callback __ARGS((char_u *fname, void *cookie));
+  
+- /*ARGSUSED*/
+      static void
+  source_callback(fname, cookie)
+      char_u	*fname;
+!     void	*cookie;
+  {
+      (void)do_source(fname, FALSE, DOSO_NONE);
+  }
+--- 2546,2555 ----
+  
+  static void source_callback __ARGS((char_u *fname, void *cookie));
+  
+      static void
+  source_callback(fname, cookie)
+      char_u	*fname;
+!     void	*cookie UNUSED;
+  {
+      (void)do_source(fname, FALSE, DOSO_NONE);
+  }
+***************
+*** 2680,2689 ****
+  /*
+   * ":options"
+   */
+- /*ARGSUSED*/
+      void
+  ex_options(eap)
+!     exarg_T	*eap;
+  {
+      cmd_source((char_u *)SYS_OPTWIN_FILE, NULL);
+  }
+--- 2676,2684 ----
+  /*
+   * ":options"
+   */
+      void
+  ex_options(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      cmd_source((char_u *)SYS_OPTWIN_FILE, NULL);
+  }
+***************
+*** 3190,3199 ****
+  /*
+   * ":scriptnames"
+   */
+- /*ARGSUSED*/
+      void
+  ex_scriptnames(eap)
+!     exarg_T	*eap;
+  {
+      int i;
+  
+--- 3185,3193 ----
+  /*
+   * ":scriptnames"
+   */
+      void
+  ex_scriptnames(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      int i;
+  
+***************
+*** 3317,3328 ****
+   * Return a pointer to the line in allocated memory.
+   * Return NULL for end-of-file or some error.
+   */
+- /* ARGSUSED */
+      char_u *
+  getsourceline(c, cookie, indent)
+!     int		c;		/* not used */
+      void	*cookie;
+!     int		indent;		/* not used */
+  {
+      struct source_cookie *sp = (struct source_cookie *)cookie;
+      char_u		*line;
+--- 3311,3321 ----
+   * Return a pointer to the line in allocated memory.
+   * Return NULL for end-of-file or some error.
+   */
+      char_u *
+  getsourceline(c, cookie, indent)
+!     int		c UNUSED;
+      void	*cookie;
+!     int		indent UNUSED;
+  {
+      struct source_cookie *sp = (struct source_cookie *)cookie;
+      char_u		*line;
+***************
+*** 3649,3658 ****
+   * ":scriptencoding": Set encoding conversion for a sourced script.
+   * Without the multi-byte feature it's simply ignored.
+   */
+- /*ARGSUSED*/
+      void
+  ex_scriptencoding(eap)
+!     exarg_T	*eap;
+  {
+  #ifdef FEAT_MBYTE
+      struct source_cookie	*sp;
+--- 3642,3650 ----
+   * ":scriptencoding": Set encoding conversion for a sourced script.
+   * Without the multi-byte feature it's simply ignored.
+   */
+      void
+  ex_scriptencoding(eap)
+!     exarg_T	*eap UNUSED;
+  {
+  #ifdef FEAT_MBYTE
+      struct source_cookie	*sp;
+***************
+*** 4101,4110 ****
+   * Function given to ExpandGeneric() to obtain the possible arguments of the
+   * ":language" command.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_lang_arg(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      if (idx == 0)
+--- 4093,4101 ----
+   * Function given to ExpandGeneric() to obtain the possible arguments of the
+   * ":language" command.
+   */
+      char_u *
+  get_lang_arg(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      if (idx == 0)
+*** ../vim-7.2.172/src/version.c	2009-05-14 22:00:37.000000000 +0200
+--- src/version.c	2009-05-14 22:14:51.000000000 +0200
+***************
+*** 1623,1632 ****
+  /*
+   * ":intro": clear screen, display intro screen and wait for return.
+   */
+- /*ARGSUSED*/
+      void
+  ex_intro(eap)
+!     exarg_T	*eap;
+  {
+      screenclear();
+      intro_message(TRUE);
+--- 1625,1633 ----
+  /*
+   * ":intro": clear screen, display intro screen and wait for return.
+   */
+      void
+  ex_intro(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      screenclear();
+      intro_message(TRUE);
+*** ../vim-7.2.172/src/vim.h	2009-05-13 18:54:14.000000000 +0200
+--- src/vim.h	2009-05-14 21:17:51.000000000 +0200
+***************
+*** 262,267 ****
+--- 262,275 ----
+  # define __PARMS(x) __ARGS(x)
+  #endif
+  
++ /* Mark unused function arguments with UNUSED, so that gcc -Wunused-parameter
++  * can be used to check for mistakes. */
++ #ifdef HAVE_ATTRIBUTE_UNUSED
++ # define UNUSED __attribute__((unused))
++ #else
++ # define UNUSED
++ #endif
++ 
+  /* if we're compiling in C++ (currently only KVim), the system
+   * headers must have the correct prototypes or nothing will build.
+   * conversely, our prototypes might clash due to throw() specifiers and
+*** ../vim-7.2.172/src/version.c	2009-05-14 22:00:37.000000000 +0200
+--- src/version.c	2009-05-14 22:14:51.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     173,
+  /**/
+
+-- 
+SIGIRO -- irony detected (iron core dumped)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.174 b/source/ap/vim/patches/7.2.174
new file mode 100644
index 000000000..5f8ccd3a0
--- /dev/null
+++ b/source/ap/vim/patches/7.2.174
@@ -0,0 +1,1718 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.174
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.174
+Problem:    Too many warnings from gcc -Wextra.
+Solution:   Change initializer.  Add UNUSED.  Add type casts.
+Files:      src/edit.c, src/eval.c, src/ex_cmds.c, src/ex_docmd.c,
+            src/ex_getln.c, src/fileio.c, getchar.c, globals.h, main.c,
+            memline.c, message.c, src/misc1.c, src/move.c, src/normal.c,
+            src/option.c, src/os_unix.c, src/os_unix.h, src/regexp.c,
+            src/search.c, src/tag.c
+
+
+*** ../vim-7.2.173/src/edit.c	2009-05-14 22:19:19.000000000 +0200
+--- src/edit.c	2009-05-15 21:06:07.000000000 +0200
+***************
+*** 8991,8997 ****
+  	foldOpenCursor();
+  #endif
+      undisplay_dollar();
+!     if (gchar_cursor() != NUL || virtual_active()
+  	    )
+      {
+  	start_arrow(&curwin->w_cursor);
+--- 8992,9001 ----
+  	foldOpenCursor();
+  #endif
+      undisplay_dollar();
+!     if (gchar_cursor() != NUL
+! #ifdef FEAT_VIRTUALEDIT
+! 	    || virtual_active()
+! #endif
+  	    )
+      {
+  	start_arrow(&curwin->w_cursor);
+*** ../vim-7.2.173/src/eval.c	2009-04-22 16:07:57.000000000 +0200
+--- src/eval.c	2009-05-15 21:18:08.000000000 +0200
+***************
+*** 8303,8312 ****
+  /*
+   * "argc()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_argc(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = ARGCOUNT;
+--- 8303,8311 ----
+  /*
+   * "argc()" function
+   */
+      static void
+  f_argc(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = ARGCOUNT;
+***************
+*** 8315,8324 ****
+  /*
+   * "argidx()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_argidx(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = curwin->w_arg_idx;
+--- 8314,8322 ----
+  /*
+   * "argidx()" function
+   */
+      static void
+  f_argidx(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = curwin->w_arg_idx;
+***************
+*** 8396,8405 ****
+  /*
+   * "browse(save, title, initdir, default)" function
+   */
+- /* ARGSUSED */
+      static void
+  f_browse(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_BROWSE
+--- 8394,8402 ----
+  /*
+   * "browse(save, title, initdir, default)" function
+   */
+      static void
+  f_browse(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_BROWSE
+***************
+*** 8431,8440 ****
+  /*
+   * "browsedir(title, initdir)" function
+   */
+- /* ARGSUSED */
+      static void
+  f_browsedir(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_BROWSE
+--- 8428,8436 ----
+  /*
+   * "browsedir(title, initdir)" function
+   */
+      static void
+  f_browsedir(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_BROWSE
+***************
+*** 8801,8810 ****
+  /*
+   * "changenr()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_changenr(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = curbuf->b_u_seq_cur;
+--- 8797,8805 ----
+  /*
+   * "changenr()" function
+   */
+      static void
+  f_changenr(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = curbuf->b_u_seq_cur;
+***************
+*** 8854,8863 ****
+  /*
+   * "clearmatches()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_clearmatches(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_SEARCH_EXTRA
+--- 8849,8857 ----
+  /*
+   * "clearmatches()" function
+   */
+      static void
+  f_clearmatches(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_SEARCH_EXTRA
+*** ../vim-7.2.173/src/ex_cmds.c	2009-05-14 22:19:19.000000000 +0200
+--- src/ex_cmds.c	2009-05-15 20:42:18.000000000 +0200
+***************
+*** 4040,4047 ****
+--- 4040,4049 ----
+  	bigness = curwin->w_height;
+      else if (firstwin == lastwin)
+  	bigness = curwin->w_p_scr * 2;
++ #ifdef FEAT_WINDOWS
+      else
+  	bigness = curwin->w_height - 3;
++ #endif
+      if (bigness < 1)
+  	bigness = 1;
+  
+*** ../vim-7.2.173/src/ex_docmd.c	2009-05-13 18:54:14.000000000 +0200
+--- src/ex_docmd.c	2009-05-15 20:47:58.000000000 +0200
+***************
+*** 1578,1588 ****
+   * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals
+   * "func".  * Otherwise return TRUE when "fgetline" equals "func".
+   */
+- /*ARGSUSED*/
+      int
+  getline_equal(fgetline, cookie, func)
+      char_u	*(*fgetline) __ARGS((int, void *, int));
+!     void	*cookie;		/* argument for fgetline() */
+      char_u	*(*func) __ARGS((int, void *, int));
+  {
+  #ifdef FEAT_EVAL
+--- 1578,1587 ----
+   * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals
+   * "func".  * Otherwise return TRUE when "fgetline" equals "func".
+   */
+      int
+  getline_equal(fgetline, cookie, func)
+      char_u	*(*fgetline) __ARGS((int, void *, int));
+!     void	*cookie UNUSED;		/* argument for fgetline() */
+      char_u	*(*func) __ARGS((int, void *, int));
+  {
+  #ifdef FEAT_EVAL
+***************
+*** 1610,1619 ****
+   * If "fgetline" is get_loop_line(), return the cookie used by the original
+   * getline function.  Otherwise return "cookie".
+   */
+- /*ARGSUSED*/
+      void *
+  getline_cookie(fgetline, cookie)
+!     char_u	*(*fgetline) __ARGS((int, void *, int));
+      void	*cookie;		/* argument for fgetline() */
+  {
+  # ifdef FEAT_EVAL
+--- 1609,1617 ----
+   * If "fgetline" is get_loop_line(), return the cookie used by the original
+   * getline function.  Otherwise return "cookie".
+   */
+      void *
+  getline_cookie(fgetline, cookie)
+!     char_u	*(*fgetline) __ARGS((int, void *, int)) UNUSED;
+      void	*cookie;		/* argument for fgetline() */
+  {
+  # ifdef FEAT_EVAL
+***************
+*** 2754,2764 ****
+   * "full" is set to TRUE if the whole command name matched.
+   * Returns NULL for an ambiguous user command.
+   */
+- /*ARGSUSED*/
+      static char_u *
+  find_command(eap, full)
+      exarg_T	*eap;
+!     int		*full;
+  {
+      int		len;
+      char_u	*p;
+--- 2752,2761 ----
+   * "full" is set to TRUE if the whole command name matched.
+   * Returns NULL for an ambiguous user command.
+   */
+      static char_u *
+  find_command(eap, full)
+      exarg_T	*eap;
+!     int		*full UNUSED;
+  {
+      int		len;
+      char_u	*p;
+***************
+*** 5053,5062 ****
+  /*
+   * Function given to ExpandGeneric() to obtain the list of command names.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_command_name(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      if (idx >= (int)CMD_SIZE)
+--- 5050,5058 ----
+  /*
+   * Function given to ExpandGeneric() to obtain the list of command names.
+   */
+      char_u *
+  get_command_name(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      if (idx >= (int)CMD_SIZE)
+***************
+*** 5573,5582 ****
+   * ":comclear"
+   * Clear all user commands, global and for current buffer.
+   */
+- /*ARGSUSED*/
+      void
+  ex_comclear(eap)
+!     exarg_T	*eap;
+  {
+      uc_clear(&ucmds);
+      uc_clear(&curbuf->b_ucmds);
+--- 5569,5577 ----
+   * ":comclear"
+   * Clear all user commands, global and for current buffer.
+   */
+      void
+  ex_comclear(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      uc_clear(&ucmds);
+      uc_clear(&curbuf->b_ucmds);
+***************
+*** 6072,6081 ****
+  /*
+   * Function given to ExpandGeneric() to obtain the list of user command names.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_user_commands(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      if (idx < curbuf->b_ucmds.ga_len)
+--- 6067,6075 ----
+  /*
+   * Function given to ExpandGeneric() to obtain the list of user command names.
+   */
+      char_u *
+  get_user_commands(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      if (idx < curbuf->b_ucmds.ga_len)
+***************
+*** 6090,6099 ****
+   * Function given to ExpandGeneric() to obtain the list of user command
+   * attributes.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_user_cmd_flags(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      static char *user_cmd_flags[] =
+--- 6084,6092 ----
+   * Function given to ExpandGeneric() to obtain the list of user command
+   * attributes.
+   */
+      char_u *
+  get_user_cmd_flags(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      static char *user_cmd_flags[] =
+***************
+*** 6108,6117 ****
+  /*
+   * Function given to ExpandGeneric() to obtain the list of values for -nargs.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_user_cmd_nargs(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
+--- 6101,6109 ----
+  /*
+   * Function given to ExpandGeneric() to obtain the list of values for -nargs.
+   */
+      char_u *
+  get_user_cmd_nargs(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
+***************
+*** 6124,6133 ****
+  /*
+   * Function given to ExpandGeneric() to obtain the list of values for -complete.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_user_cmd_complete(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      return (char_u *)command_complete[idx].name;
+--- 6116,6124 ----
+  /*
+   * Function given to ExpandGeneric() to obtain the list of values for -complete.
+   */
+      char_u *
+  get_user_cmd_complete(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      return (char_u *)command_complete[idx].name;
+***************
+*** 6305,6314 ****
+  /*
+   * ":cquit".
+   */
+- /*ARGSUSED*/
+      static void
+  ex_cquit(eap)
+!     exarg_T	*eap;
+  {
+      getout(1);	/* this does not always pass on the exit code to the Manx
+  		   compiler. why? */
+--- 6296,6304 ----
+  /*
+   * ":cquit".
+   */
+      static void
+  ex_cquit(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      getout(1);	/* this does not always pass on the exit code to the Manx
+  		   compiler. why? */
+***************
+*** 6750,6759 ****
+  /*
+   * ":shell".
+   */
+- /*ARGSUSED*/
+      static void
+  ex_shell(eap)
+!     exarg_T	*eap;
+  {
+      do_shell(NULL, 0);
+  }
+--- 6740,6748 ----
+  /*
+   * ":shell".
+   */
+      static void
+  ex_shell(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      do_shell(NULL, 0);
+  }
+***************
+*** 7057,7066 ****
+  /*
+   * ":preserve".
+   */
+- /*ARGSUSED*/
+      static void
+  ex_preserve(eap)
+!     exarg_T	*eap;
+  {
+      curbuf->b_flags |= BF_PRESERVED;
+      ml_preserve(curbuf, TRUE);
+--- 7046,7054 ----
+  /*
+   * ":preserve".
+   */
+      static void
+  ex_preserve(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      curbuf->b_flags |= BF_PRESERVED;
+      ml_preserve(curbuf, TRUE);
+***************
+*** 7292,7301 ****
+  /*
+   * :tabs command: List tabs and their contents.
+   */
+- /*ARGSUSED*/
+      static void
+  ex_tabs(eap)
+!     exarg_T	*eap;
+  {
+      tabpage_T	*tp;
+      win_T	*wp;
+--- 7280,7288 ----
+  /*
+   * :tabs command: List tabs and their contents.
+   */
+      static void
+  ex_tabs(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      tabpage_T	*tp;
+      win_T	*wp;
+***************
+*** 7482,7488 ****
+  /*
+   * ":edit <file>" command and alikes.
+   */
+- /*ARGSUSED*/
+      void
+  do_exedit(eap, old_curwin)
+      exarg_T	*eap;
+--- 7469,7474 ----
+***************
+*** 7694,7703 ****
+  }
+  #endif
+  
+- /*ARGSUSED*/
+      static void
+  ex_swapname(eap)
+!     exarg_T	*eap;
+  {
+      if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)
+  	MSG(_("No swap file"));
+--- 7680,7688 ----
+  }
+  #endif
+  
+      static void
+  ex_swapname(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)
+  	MSG(_("No swap file"));
+***************
+*** 7710,7719 ****
+   * offset.
+   * (1998-11-02 16:21:01  R. Edward Ralston <eralston@computer.org>)
+   */
+- /*ARGSUSED*/
+      static void
+  ex_syncbind(eap)
+!     exarg_T	*eap;
+  {
+  #ifdef FEAT_SCROLLBIND
+      win_T	*wp;
+--- 7695,7703 ----
+   * offset.
+   * (1998-11-02 16:21:01  R. Edward Ralston <eralston@computer.org>)
+   */
+      static void
+  ex_syncbind(eap)
+!     exarg_T	*eap UNUSED;
+  {
+  #ifdef FEAT_SCROLLBIND
+      win_T	*wp;
+***************
+*** 7983,7992 ****
+  /*
+   * ":pwd".
+   */
+- /*ARGSUSED*/
+      static void
+  ex_pwd(eap)
+!     exarg_T	*eap;
+  {
+      if (mch_dirname(NameBuff, MAXPATHL) == OK)
+      {
+--- 7967,7975 ----
+  /*
+   * ":pwd".
+   */
+      static void
+  ex_pwd(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      if (mch_dirname(NameBuff, MAXPATHL) == OK)
+      {
+***************
+*** 8417,8426 ****
+  /*
+   * ":undo".
+   */
+- /*ARGSUSED*/
+      static void
+  ex_undo(eap)
+!     exarg_T	*eap;
+  {
+      if (eap->addr_count == 1)	    /* :undo 123 */
+  	undo_time(eap->line2, FALSE, TRUE);
+--- 8400,8408 ----
+  /*
+   * ":undo".
+   */
+      static void
+  ex_undo(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      if (eap->addr_count == 1)	    /* :undo 123 */
+  	undo_time(eap->line2, FALSE, TRUE);
+***************
+*** 8431,8440 ****
+  /*
+   * ":redo".
+   */
+- /*ARGSUSED*/
+      static void
+  ex_redo(eap)
+!     exarg_T	*eap;
+  {
+      u_redo(1);
+  }
+--- 8413,8421 ----
+  /*
+   * ":redo".
+   */
+      static void
+  ex_redo(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      u_redo(1);
+  }
+***************
+*** 8442,8448 ****
+  /*
+   * ":earlier" and ":later".
+   */
+- /*ARGSUSED*/
+      static void
+  ex_later(eap)
+      exarg_T	*eap;
+--- 8423,8428 ----
+***************
+*** 8627,8636 ****
+  /*
+   * ":redrawstatus": force redraw of status line(s)
+   */
+- /*ARGSUSED*/
+      static void
+  ex_redrawstatus(eap)
+!     exarg_T	*eap;
+  {
+  #if defined(FEAT_WINDOWS)
+      int		r = RedrawingDisabled;
+--- 8607,8615 ----
+  /*
+   * ":redrawstatus": force redraw of status line(s)
+   */
+      static void
+  ex_redrawstatus(eap)
+!     exarg_T	*eap UNUSED;
+  {
+  #if defined(FEAT_WINDOWS)
+      int		r = RedrawingDisabled;
+***************
+*** 8891,8901 ****
+  
+  #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
+  	|| defined(PROTO)
+- /*ARGSUSED*/
+      int
+  vim_mkdir_emsg(name, prot)
+      char_u	*name;
+!     int		prot;
+  {
+      if (vim_mkdir(name, prot) != 0)
+      {
+--- 8870,8879 ----
+  
+  #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
+  	|| defined(PROTO)
+      int
+  vim_mkdir_emsg(name, prot)
+      char_u	*name;
+!     int		prot UNUSED;
+  {
+      if (vim_mkdir(name, prot) != 0)
+      {
+***************
+*** 10968,10977 ****
+  }
+  #endif
+  
+- /*ARGSUSED*/
+      static void
+  ex_digraphs(eap)
+!     exarg_T	*eap;
+  {
+  #ifdef FEAT_DIGRAPHS
+      if (*eap->arg != NUL)
+--- 10946,10954 ----
+  }
+  #endif
+  
+      static void
+  ex_digraphs(eap)
+!     exarg_T	*eap UNUSED;
+  {
+  #ifdef FEAT_DIGRAPHS
+      if (*eap->arg != NUL)
+***************
+*** 11005,11014 ****
+  /*
+   * ":nohlsearch"
+   */
+- /*ARGSUSED*/
+      static void
+  ex_nohlsearch(eap)
+!     exarg_T	*eap;
+  {
+      no_hlsearch = TRUE;
+      redraw_all_later(SOME_VALID);
+--- 10982,10990 ----
+  /*
+   * ":nohlsearch"
+   */
+      static void
+  ex_nohlsearch(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      no_hlsearch = TRUE;
+      redraw_all_later(SOME_VALID);
+***************
+*** 11087,11096 ****
+  /*
+   * ":X": Get crypt key
+   */
+- /*ARGSUSED*/
+      static void
+  ex_X(eap)
+!     exarg_T	*eap;
+  {
+      (void)get_crypt_key(TRUE, TRUE);
+  }
+--- 11063,11071 ----
+  /*
+   * ":X": Get crypt key
+   */
+      static void
+  ex_X(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      (void)get_crypt_key(TRUE, TRUE);
+  }
+*** ../vim-7.2.173/src/ex_getln.c	2009-04-29 18:44:38.000000000 +0200
+--- src/ex_getln.c	2009-05-15 20:49:22.000000000 +0200
+***************
+*** 140,150 ****
+   * Return pointer to allocated string if there is a commandline, NULL
+   * otherwise.
+   */
+- /*ARGSUSED*/
+      char_u *
+  getcmdline(firstc, count, indent)
+      int		firstc;
+!     long	count;		/* only used for incremental search */
+      int		indent;		/* indent for inside conditionals */
+  {
+      int		c;
+--- 140,149 ----
+   * Return pointer to allocated string if there is a commandline, NULL
+   * otherwise.
+   */
+      char_u *
+  getcmdline(firstc, count, indent)
+      int		firstc;
+!     long	count UNUSED;	/* only used for incremental search */
+      int		indent;		/* indent for inside conditionals */
+  {
+      int		c;
+***************
+*** 2113,2123 ****
+  /*
+   * Get an Ex command line for the ":" command.
+   */
+- /* ARGSUSED */
+      char_u *
+! getexline(c, dummy, indent)
+      int		c;		/* normally ':', NUL for ":append" */
+!     void	*dummy;		/* cookie not used */
+      int		indent;		/* indent for inside conditionals */
+  {
+      /* When executing a register, remove ':' that's in front of each line. */
+--- 2112,2121 ----
+  /*
+   * Get an Ex command line for the ":" command.
+   */
+      char_u *
+! getexline(c, cookie, indent)
+      int		c;		/* normally ':', NUL for ":append" */
+!     void	*cookie UNUSED;
+      int		indent;		/* indent for inside conditionals */
+  {
+      /* When executing a register, remove ':' that's in front of each line. */
+***************
+*** 2132,2143 ****
+   * mappings or abbreviations.
+   * Returns a string in allocated memory or NULL.
+   */
+- /* ARGSUSED */
+      char_u *
+! getexmodeline(promptc, dummy, indent)
+      int		promptc;	/* normally ':', NUL for ":append" and '?' for
+  				   :s prompt */
+!     void	*dummy;		/* cookie not used */
+      int		indent;		/* indent for inside conditionals */
+  {
+      garray_T	line_ga;
+--- 2130,2140 ----
+   * mappings or abbreviations.
+   * Returns a string in allocated memory or NULL.
+   */
+      char_u *
+! getexmodeline(promptc, cookie, indent)
+      int		promptc;	/* normally ':', NUL for ":append" and '?' for
+  				   :s prompt */
+!     void	*cookie UNUSED;
+      int		indent;		/* indent for inside conditionals */
+  {
+      garray_T	line_ga;
+***************
+*** 3832,3842 ****
+   * Returns EXPAND_NOTHING when the character that triggered expansion should
+   * be inserted like a normal character.
+   */
+- /*ARGSUSED*/
+      static int
+  showmatches(xp, wildmenu)
+      expand_T	*xp;
+!     int		wildmenu;
+  {
+  #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])
+      int		num_files;
+--- 3829,3838 ----
+   * Returns EXPAND_NOTHING when the character that triggered expansion should
+   * be inserted like a normal character.
+   */
+      static int
+  showmatches(xp, wildmenu)
+      expand_T	*xp;
+!     int		wildmenu UNUSED;
+  {
+  #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])
+      int		num_files;
+*** ../vim-7.2.173/src/fileio.c	2009-05-13 20:47:07.000000000 +0200
+--- src/fileio.c	2009-05-15 20:52:40.000000000 +0200
+***************
+*** 3498,3504 ****
+  		    if (mch_stat((char *)IObuff, &st) < 0
+  			    || st.st_uid != st_old.st_uid
+  			    || st.st_gid != st_old.st_gid
+! 			    || st.st_mode != perm)
+  			backup_copy = TRUE;
+  # endif
+  		    /* Close the file before removing it, on MS-Windows we
+--- 3498,3504 ----
+  		    if (mch_stat((char *)IObuff, &st) < 0
+  			    || st.st_uid != st_old.st_uid
+  			    || st.st_gid != st_old.st_gid
+! 			    || (long)st.st_mode != perm)
+  			backup_copy = TRUE;
+  # endif
+  		    /* Close the file before removing it, on MS-Windows we
+***************
+*** 5963,5969 ****
+  	else if (*ext == '.')
+  #endif
+  	{
+! 	    if (s - ptr > (size_t)8)
+  	    {
+  		s = ptr + 8;
+  		*s = '\0';
+--- 5971,5977 ----
+  	else if (*ext == '.')
+  #endif
+  	{
+! 	    if ((size_t)(s - ptr) > (size_t)8)
+  	    {
+  		s = ptr + 8;
+  		*s = '\0';
+***************
+*** 6460,6470 ****
+   * return 2 if a message has been displayed.
+   * return 0 otherwise.
+   */
+- /*ARGSUSED*/
+      int
+  buf_check_timestamp(buf, focus)
+      buf_T	*buf;
+!     int		focus;		/* called for GUI focus event */
+  {
+      struct stat	st;
+      int		stat_res;
+--- 6468,6477 ----
+   * return 2 if a message has been displayed.
+   * return 0 otherwise.
+   */
+      int
+  buf_check_timestamp(buf, focus)
+      buf_T	*buf;
+!     int		focus UNUSED;	/* called for GUI focus event */
+  {
+      struct stat	st;
+      int		stat_res;
+***************
+*** 6868,6879 ****
+      /* Careful: autocommands may have made "buf" invalid! */
+  }
+  
+- /*ARGSUSED*/
+      void
+  buf_store_time(buf, st, fname)
+      buf_T	*buf;
+      struct stat	*st;
+!     char_u	*fname;
+  {
+      buf->b_mtime = (long)st->st_mtime;
+      buf->b_orig_size = (size_t)st->st_size;
+--- 6875,6885 ----
+      /* Careful: autocommands may have made "buf" invalid! */
+  }
+  
+      void
+  buf_store_time(buf, st, fname)
+      buf_T	*buf;
+      struct stat	*st;
+!     char_u	*fname UNUSED;
+  {
+      buf->b_mtime = (long)st->st_mtime;
+      buf->b_orig_size = (size_t)st->st_size;
+***************
+*** 6936,6945 ****
+   * The returned pointer is to allocated memory.
+   * The returned pointer is NULL if no valid name was found.
+   */
+- /*ARGSUSED*/
+      char_u  *
+  vim_tempname(extra_char)
+!     int	    extra_char;	    /* character to use in the name instead of '?' */
+  {
+  #ifdef USE_TMPNAM
+      char_u	itmp[L_tmpnam];	/* use tmpnam() */
+--- 6942,6950 ----
+   * The returned pointer is to allocated memory.
+   * The returned pointer is NULL if no valid name was found.
+   */
+      char_u  *
+  vim_tempname(extra_char)
+!     int	    extra_char UNUSED;  /* char to use in the name instead of '?' */
+  {
+  #ifdef USE_TMPNAM
+      char_u	itmp[L_tmpnam];	/* use tmpnam() */
+***************
+*** 6968,6974 ****
+  	/*
+  	 * Try the entries in TEMPDIRNAMES to create the temp directory.
+  	 */
+! 	for (i = 0; i < sizeof(tempdirs) / sizeof(char *); ++i)
+  	{
+  	    /* expand $TMP, leave room for "/v1100000/999999999" */
+  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
+--- 6973,6979 ----
+  	/*
+  	 * Try the entries in TEMPDIRNAMES to create the temp directory.
+  	 */
+! 	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
+  	{
+  	    /* expand $TMP, leave room for "/v1100000/999999999" */
+  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
+***************
+*** 9588,9600 ****
+   *
+   * Returns NULL when out of memory.
+   */
+- /*ARGSUSED*/
+      char_u *
+  file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
+      char_u	*pat;
+      char_u	*pat_end;	/* first char after pattern or NULL */
+      char	*allow_dirs;	/* Result passed back out in here */
+!     int		no_bslash;	/* Don't use a backward slash as pathsep */
+  {
+      int		size;
+      char_u	*endp;
+--- 9593,9604 ----
+   *
+   * Returns NULL when out of memory.
+   */
+      char_u *
+  file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
+      char_u	*pat;
+      char_u	*pat_end;	/* first char after pattern or NULL */
+      char	*allow_dirs;	/* Result passed back out in here */
+!     int		no_bslash UNUSED; /* Don't use a backward slash as pathsep */
+  {
+      int		size;
+      char_u	*endp;
+*** ../vim-7.2.173/src/misc1.c	2009-04-29 11:00:09.000000000 +0200
+--- src/misc1.c	2009-05-15 20:59:08.000000000 +0200
+***************
+*** 2188,2199 ****
+   *
+   * return FAIL for failure, OK otherwise
+   */
+- /*ARGSUSED*/
+      int
+  del_bytes(count, fixpos_arg, use_delcombine)
+      long	count;
+      int		fixpos_arg;
+!     int		use_delcombine;	    /* 'delcombine' option applies */
+  {
+      char_u	*oldp, *newp;
+      colnr_T	oldlen;
+--- 2188,2198 ----
+   *
+   * return FAIL for failure, OK otherwise
+   */
+      int
+  del_bytes(count, fixpos_arg, use_delcombine)
+      long	count;
+      int		fixpos_arg;
+!     int		use_delcombine UNUSED;	    /* 'delcombine' option applies */
+  {
+      char_u	*oldp, *newp;
+      colnr_T	oldlen;
+*** ../vim-7.2.173/src/move.c	2008-11-15 16:05:30.000000000 +0100
+--- src/move.c	2009-05-15 21:00:06.000000000 +0200
+***************
+*** 1238,1248 ****
+  /*
+   * Scroll the current window down by "line_count" logical lines.  "CTRL-Y"
+   */
+- /*ARGSUSED*/
+      void
+  scrolldown(line_count, byfold)
+      long	line_count;
+!     int		byfold;		/* TRUE: count a closed fold as one line */
+  {
+      long	done = 0;	/* total # of physical lines done */
+      int		wrow;
+--- 1238,1247 ----
+  /*
+   * Scroll the current window down by "line_count" logical lines.  "CTRL-Y"
+   */
+      void
+  scrolldown(line_count, byfold)
+      long	line_count;
+!     int		byfold UNUSED;	/* TRUE: count a closed fold as one line */
+  {
+      long	done = 0;	/* total # of physical lines done */
+      int		wrow;
+***************
+*** 1349,1359 ****
+  /*
+   * Scroll the current window up by "line_count" logical lines.  "CTRL-E"
+   */
+- /*ARGSUSED*/
+      void
+  scrollup(line_count, byfold)
+      long	line_count;
+!     int		byfold;		/* TRUE: count a closed fold as one line */
+  {
+  #if defined(FEAT_FOLDING) || defined(FEAT_DIFF)
+      linenr_T	lnum;
+--- 1348,1357 ----
+  /*
+   * Scroll the current window up by "line_count" logical lines.  "CTRL-E"
+   */
+      void
+  scrollup(line_count, byfold)
+      long	line_count;
+!     int		byfold UNUSED;	/* TRUE: count a closed fold as one line */
+  {
+  #if defined(FEAT_FOLDING) || defined(FEAT_DIFF)
+      linenr_T	lnum;
+*** ../vim-7.2.173/src/normal.c	2009-04-29 17:39:17.000000000 +0200
+--- src/normal.c	2009-05-15 21:08:07.000000000 +0200
+***************
+*** 493,506 ****
+      int		i;
+  
+      /* Fill the index table with a one to one relation. */
+!     for (i = 0; i < NV_CMDS_SIZE; ++i)
+  	nv_cmd_idx[i] = i;
+  
+      /* Sort the commands by the command character.  */
+      qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare);
+  
+      /* Find the first entry that can't be indexed by the command character. */
+!     for (i = 0; i < NV_CMDS_SIZE; ++i)
+  	if (i != nv_cmds[nv_cmd_idx[i]].cmd_char)
+  	    break;
+      nv_max_linear = i - 1;
+--- 493,506 ----
+      int		i;
+  
+      /* Fill the index table with a one to one relation. */
+!     for (i = 0; i < (int)NV_CMDS_SIZE; ++i)
+  	nv_cmd_idx[i] = i;
+  
+      /* Sort the commands by the command character.  */
+      qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare);
+  
+      /* Find the first entry that can't be indexed by the command character. */
+!     for (i = 0; i < (int)NV_CMDS_SIZE; ++i)
+  	if (i != nv_cmds[nv_cmd_idx[i]].cmd_char)
+  	    break;
+      nv_max_linear = i - 1;
+***************
+*** 561,571 ****
+  /*
+   * Execute a command in Normal mode.
+   */
+- /*ARGSUSED*/
+      void
+  normal_cmd(oap, toplevel)
+      oparg_T	*oap;
+!     int		toplevel;		/* TRUE when called from main() */
+  {
+      cmdarg_T	ca;			/* command arguments */
+      int		c;
+--- 561,570 ----
+  /*
+   * Execute a command in Normal mode.
+   */
+      void
+  normal_cmd(oap, toplevel)
+      oparg_T	*oap;
+!     int		toplevel UNUSED;	/* TRUE when called from main() */
+  {
+      cmdarg_T	ca;			/* command arguments */
+      int		c;
+***************
+*** 2188,2197 ****
+  /*
+   * Handle the "g@" operator: call 'operatorfunc'.
+   */
+- /*ARGSUSED*/
+      static void
+  op_function(oap)
+!     oparg_T	*oap;
+  {
+  #ifdef FEAT_EVAL
+      char_u	*(argv[1]);
+--- 2187,2195 ----
+  /*
+   * Handle the "g@" operator: call 'operatorfunc'.
+   */
+      static void
+  op_function(oap)
+!     oparg_T	*oap UNUSED;
+  {
+  #ifdef FEAT_EVAL
+      char_u	*(argv[1]);
+***************
+*** 4100,4109 ****
+   * Command character that doesn't do anything, but unlike nv_ignore() does
+   * start edit().  Used for "startinsert" executed while starting up.
+   */
+- /*ARGSUSED */
+      static void
+  nv_nop(cap)
+!     cmdarg_T	*cap;
+  {
+  }
+  
+--- 4098,4106 ----
+   * Command character that doesn't do anything, but unlike nv_ignore() does
+   * start edit().  Used for "startinsert" executed while starting up.
+   */
+      static void
+  nv_nop(cap)
+!     cmdarg_T	*cap UNUSED;
+  {
+  }
+  
+***************
+*** 5241,5247 ****
+  	if (cap->oap->op_type != OP_NOP
+  		&& (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
+  		    || cap->oap->start.col >
+! 					 STRLEN(ml_get(cap->oap->start.lnum))))
+  	    clearopbeep(cap->oap);
+      }
+  }
+--- 5238,5244 ----
+  	if (cap->oap->op_type != OP_NOP
+  		&& (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
+  		    || cap->oap->start.col >
+! 			       (colnr_T)STRLEN(ml_get(cap->oap->start.lnum))))
+  	    clearopbeep(cap->oap);
+      }
+  }
+***************
+*** 5816,5822 ****
+      for (n = cap->count1; n > 0; --n)
+      {
+  	if ((!PAST_LINE && oneright() == FAIL)
+! 		|| (PAST_LINE && *ml_get_cursor() == NUL))
+  	{
+  	    /*
+  	     *	  <Space> wraps to next line if 'whichwrap' has 's'.
+--- 5813,5822 ----
+      for (n = cap->count1; n > 0; --n)
+      {
+  	if ((!PAST_LINE && oneright() == FAIL)
+! #ifdef FEAT_VISUAL
+! 		|| (PAST_LINE && *ml_get_cursor() == NUL)
+! #endif
+! 		)
+  	{
+  	    /*
+  	     *	  <Space> wraps to next line if 'whichwrap' has 's'.
+*** ../vim-7.2.173/src/option.c	2009-03-18 15:40:03.000000000 +0100
+--- src/option.c	2009-05-15 21:08:50.000000000 +0200
+***************
+*** 5302,5315 ****
+   * When "set_sid" is zero set the scriptID to current_SID.  When "set_sid" is
+   * SID_NONE don't set the scriptID.  Otherwise set the scriptID to "set_sid".
+   */
+- /*ARGSUSED*/
+      void
+  set_string_option_direct(name, opt_idx, val, opt_flags, set_sid)
+      char_u	*name;
+      int		opt_idx;
+      char_u	*val;
+      int		opt_flags;	/* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
+!     int		set_sid;
+  {
+      char_u	*s;
+      char_u	**varp;
+--- 5302,5314 ----
+   * When "set_sid" is zero set the scriptID to current_SID.  When "set_sid" is
+   * SID_NONE don't set the scriptID.  Otherwise set the scriptID to "set_sid".
+   */
+      void
+  set_string_option_direct(name, opt_idx, val, opt_flags, set_sid)
+      char_u	*name;
+      int		opt_idx;
+      char_u	*val;
+      int		opt_flags;	/* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
+!     int		set_sid UNUSED;
+  {
+      char_u	*s;
+      char_u	**varp;
+***************
+*** 9357,9366 ****
+  /*
+   * Check for NULL pointers in a winopt_T and replace them with empty_option.
+   */
+- /*ARGSUSED*/
+      void
+  check_winopt(wop)
+!     winopt_T	*wop;
+  {
+  #ifdef FEAT_FOLDING
+      check_string_option(&wop->wo_fdi);
+--- 9356,9364 ----
+  /*
+   * Check for NULL pointers in a winopt_T and replace them with empty_option.
+   */
+      void
+  check_winopt(wop)
+!     winopt_T	*wop UNUSED;
+  {
+  #ifdef FEAT_FOLDING
+      check_string_option(&wop->wo_fdi);
+***************
+*** 9382,9391 ****
+  /*
+   * Free the allocated memory inside a winopt_T.
+   */
+- /*ARGSUSED*/
+      void
+  clear_winopt(wop)
+!     winopt_T	*wop;
+  {
+  #ifdef FEAT_FOLDING
+      clear_string_option(&wop->wo_fdi);
+--- 9380,9388 ----
+  /*
+   * Free the allocated memory inside a winopt_T.
+   */
+      void
+  clear_winopt(wop)
+!     winopt_T	*wop UNUSED;
+  {
+  #ifdef FEAT_FOLDING
+      clear_string_option(&wop->wo_fdi);
+*** ../vim-7.2.173/src/os_unix.c	2009-05-13 12:46:36.000000000 +0200
+--- src/os_unix.c	2009-05-15 21:13:43.000000000 +0200
+***************
+*** 458,467 ****
+   * Return total amount of memory available in Kbyte.
+   * Doesn't change when memory has been allocated.
+   */
+- /* ARGSUSED */
+      long_u
+  mch_total_mem(special)
+!     int special;
+  {
+  # ifdef __EMX__
+      return ulimit(3, 0L) >> 10;   /* always 32MB? */
+--- 458,466 ----
+   * Return total amount of memory available in Kbyte.
+   * Doesn't change when memory has been allocated.
+   */
+      long_u
+  mch_total_mem(special)
+!     int special UNUSED;
+  {
+  # ifdef __EMX__
+      return ulimit(3, 0L) >> 10;   /* always 32MB? */
+***************
+*** 815,821 ****
+   * Let me try it with a few tricky defines from my own osdef.h	(jw).
+   */
+  #if defined(SIGWINCH)
+- /* ARGSUSED */
+      static RETSIGTYPE
+  sig_winch SIGDEFARG(sigarg)
+  {
+--- 814,819 ----
+***************
+*** 1355,1365 ****
+  /*
+   * Check_win checks whether we have an interactive stdout.
+   */
+- /* ARGSUSED */
+      int
+  mch_check_win(argc, argv)
+!     int	    argc;
+!     char    **argv;
+  {
+  #ifdef OS2
+      /*
+--- 1353,1362 ----
+  /*
+   * Check_win checks whether we have an interactive stdout.
+   */
+      int
+  mch_check_win(argc, argv)
+!     int	    argc UNUSED;
+!     char    **argv UNUSED;
+  {
+  #ifdef OS2
+      /*
+***************
+*** 2467,2473 ****
+      }
+  
+      /* Catch file names which are too long. */
+!     if (retval == FAIL || STRLEN(buf) + STRLEN(fname) >= len)
+  	return FAIL;
+  
+      /* Do not append ".", "/dir/." is equal to "/dir". */
+--- 2464,2470 ----
+      }
+  
+      /* Catch file names which are too long. */
+!     if (retval == FAIL || (int)(STRLEN(buf) + STRLEN(fname)) >= len)
+  	return FAIL;
+  
+      /* Do not append ".", "/dir/." is equal to "/dir". */
+***************
+*** 2686,2692 ****
+   */
+      vim_acl_T
+  mch_get_acl(fname)
+!     char_u	*fname;
+  {
+      vim_acl_T	ret = NULL;
+  #ifdef HAVE_POSIX_ACL
+--- 2683,2689 ----
+   */
+      vim_acl_T
+  mch_get_acl(fname)
+!     char_u	*fname UNUSED;
+  {
+      vim_acl_T	ret = NULL;
+  #ifdef HAVE_POSIX_ACL
+***************
+*** 2746,2752 ****
+   */
+      void
+  mch_set_acl(fname, aclent)
+!     char_u	*fname;
+      vim_acl_T	aclent;
+  {
+      if (aclent == NULL)
+--- 2743,2749 ----
+   */
+      void
+  mch_set_acl(fname, aclent)
+!     char_u	*fname UNUSED;
+      vim_acl_T	aclent;
+  {
+      if (aclent == NULL)
+***************
+*** 2789,2798 ****
+  /*
+   * Set hidden flag for "name".
+   */
+- /* ARGSUSED */
+      void
+  mch_hide(name)
+!     char_u	*name;
+  {
+      /* can't hide a file */
+  }
+--- 2786,2794 ----
+  /*
+   * Set hidden flag for "name".
+   */
+      void
+  mch_hide(name)
+!     char_u	*name UNUSED;
+  {
+      /* can't hide a file */
+  }
+***************
+*** 3481,3490 ****
+  /*
+   * set screen mode, always fails.
+   */
+- /* ARGSUSED */
+      int
+  mch_screenmode(arg)
+!     char_u   *arg;
+  {
+      EMSG(_(e_screenmode));
+      return FAIL;
+--- 3477,3485 ----
+  /*
+   * set screen mode, always fails.
+   */
+      int
+  mch_screenmode(arg)
+!     char_u   *arg UNUSED;
+  {
+      EMSG(_(e_screenmode));
+      return FAIL;
+***************
+*** 4189,4197 ****
+  			    {
+  				s = vim_strchr(lp + written, NL);
+  				len = write(toshell_fd, (char *)lp + written,
+! 					   s == NULL ? l : s - (lp + written));
+  			    }
+! 			    if (len == l)
+  			    {
+  				/* Finished a line, add a NL, unless this line
+  				 * should not have one. */
+--- 4184,4193 ----
+  			    {
+  				s = vim_strchr(lp + written, NL);
+  				len = write(toshell_fd, (char *)lp + written,
+! 					   s == NULL ? l
+! 					      : (size_t)(s - (lp + written)));
+  			    }
+! 			    if (len == (int)l)
+  			    {
+  				/* Finished a line, add a NL, unless this line
+  				 * should not have one. */
+***************
+*** 4746,4752 ****
+   * Returns also, when a request from Sniff is waiting -- toni.
+   * Or when a Linux GPM mouse event is waiting.
+   */
+- /* ARGSUSED */
+  #if defined(__BEOS__)
+      int
+  #else
+--- 4742,4747 ----
+***************
+*** 4755,4761 ****
+  RealWaitForChar(fd, msec, check_for_gpm)
+      int		fd;
+      long	msec;
+!     int		*check_for_gpm;
+  {
+      int		ret;
+  #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
+--- 4750,4756 ----
+  RealWaitForChar(fd, msec, check_for_gpm)
+      int		fd;
+      long	msec;
+!     int		*check_for_gpm UNUSED;
+  {
+      int		ret;
+  #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
+***************
+*** 5572,5578 ****
+      i = fread((char *)buffer, 1, len, fd);
+      fclose(fd);
+      mch_remove(tempname);
+!     if (i != len)
+      {
+  	/* unexpected read error */
+  	EMSG2(_(e_notread), tempname);
+--- 5567,5573 ----
+      i = fread((char *)buffer, 1, len, fd);
+      fclose(fd);
+      mch_remove(tempname);
+!     if (i != (int)len)
+      {
+  	/* unexpected read error */
+  	EMSG2(_(e_notread), tempname);
+***************
+*** 5633,5639 ****
+  	if (shell_style == STYLE_PRINT && !did_find_nul)
+  	{
+  	    /* If there is a NUL, set did_find_nul, else set check_spaces */
+! 	    if (len && (int)STRLEN(buffer) < len - 1)
+  		did_find_nul = TRUE;
+  	    else
+  		check_spaces = TRUE;
+--- 5628,5634 ----
+  	if (shell_style == STYLE_PRINT && !did_find_nul)
+  	{
+  	    /* If there is a NUL, set did_find_nul, else set check_spaces */
+! 	    if (len && (int)STRLEN(buffer) < (int)len - 1)
+  		did_find_nul = TRUE;
+  	    else
+  		check_spaces = TRUE;
+*** ../vim-7.2.173/src/os_unix.h	2009-05-13 12:46:36.000000000 +0200
+--- src/os_unix.h	2009-05-15 21:10:31.000000000 +0200
+***************
+*** 126,132 ****
+  #  define SIGDUMMYARG	0, 0, (struct sigcontext *)0
+  # else
+  #  define SIGPROTOARG	(int)
+! #  define SIGDEFARG(s)	(s) int s;
+  #  define SIGDUMMYARG	0
+  # endif
+  #else
+--- 126,132 ----
+  #  define SIGDUMMYARG	0, 0, (struct sigcontext *)0
+  # else
+  #  define SIGPROTOARG	(int)
+! #  define SIGDEFARG(s)	(s) int s UNUSED;
+  #  define SIGDUMMYARG	0
+  # endif
+  #else
+*** ../vim-7.2.173/src/regexp.c	2009-02-21 22:03:06.000000000 +0100
+--- src/regexp.c	2009-05-15 21:14:18.000000000 +0200
+***************
+*** 471,477 ****
+  
+      if ((*pp)[1] == ':')
+      {
+! 	for (i = 0; i < sizeof(class_names) / sizeof(*class_names); ++i)
+  	    if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0)
+  	    {
+  		*pp += STRLEN(class_names[i]) + 2;
+--- 471,477 ----
+  
+      if ((*pp)[1] == ':')
+      {
+! 	for (i = 0; i < (int)(sizeof(class_names) / sizeof(*class_names)); ++i)
+  	    if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0)
+  	    {
+  		*pp += STRLEN(class_names[i]) + 2;
+***************
+*** 3362,3373 ****
+   * Match a regexp against a string ("line" points to the string) or multiple
+   * lines ("line" is NULL, use reg_getline()).
+   */
+- /*ARGSUSED*/
+      static long
+  vim_regexec_both(line, col, tm)
+      char_u	*line;
+      colnr_T	col;		/* column to start looking for match */
+!     proftime_T	*tm;		/* timeout limit or NULL */
+  {
+      regprog_T	*prog;
+      char_u	*s;
+--- 3362,3372 ----
+   * Match a regexp against a string ("line" points to the string) or multiple
+   * lines ("line" is NULL, use reg_getline()).
+   */
+      static long
+  vim_regexec_both(line, col, tm)
+      char_u	*line;
+      colnr_T	col;		/* column to start looking for match */
+!     proftime_T	*tm UNUSED;	/* timeout limit or NULL */
+  {
+      regprog_T	*prog;
+      char_u	*s;
+*** ../vim-7.2.173/src/search.c	2009-04-22 18:43:06.000000000 +0200
+--- src/search.c	2009-05-15 21:16:36.000000000 +0200
+***************
+*** 522,528 ****
+   * When FEAT_EVAL is defined, returns the index of the first matching
+   * subpattern plus one; one if there was none.
+   */
+- /*ARGSUSED*/
+      int
+  searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
+      win_T	*win;		/* window to search in; can be NULL for a
+--- 522,527 ----
+***************
+*** 535,541 ****
+      int		options;
+      int		pat_use;	/* which pattern to use when "pat" is empty */
+      linenr_T	stop_lnum;	/* stop after this line number when != 0 */
+!     proftime_T	*tm;		/* timeout limit or NULL */
+  {
+      int		found;
+      linenr_T	lnum;		/* no init to shut up Apollo cc */
+--- 534,540 ----
+      int		options;
+      int		pat_use;	/* which pattern to use when "pat" is empty */
+      linenr_T	stop_lnum;	/* stop after this line number when != 0 */
+!     proftime_T	*tm UNUSED;	/* timeout limit or NULL */
+  {
+      int		found;
+      linenr_T	lnum;		/* no init to shut up Apollo cc */
+***************
+*** 554,561 ****
+      int		save_called_emsg = called_emsg;
+  #ifdef FEAT_SEARCH_EXTRA
+      int		break_loop = FALSE;
+- #else
+- # define break_loop FALSE
+  #endif
+  
+      if (search_regcomp(pat, RE_SEARCH, pat_use,
+--- 553,558 ----
+***************
+*** 940,946 ****
+  	     * twice.
+  	     */
+  	    if (!p_ws || stop_lnum != 0 || got_int || called_emsg
+! 					       || break_loop || found || loop)
+  		break;
+  
+  	    /*
+--- 937,946 ----
+  	     * twice.
+  	     */
+  	    if (!p_ws || stop_lnum != 0 || got_int || called_emsg
+! #ifdef FEAT_SEARCH_EXTRA
+! 					       || break_loop
+! #endif
+! 					       || found || loop)
+  		break;
+  
+  	    /*
+***************
+*** 958,964 ****
+  		give_warning((char_u *)_(dir == BACKWARD
+  					  ? top_bot_msg : bot_top_msg), TRUE);
+  	}
+! 	if (got_int || called_emsg || break_loop)
+  	    break;
+      }
+      while (--count > 0 && found);   /* stop after count matches or no match */
+--- 958,968 ----
+  		give_warning((char_u *)_(dir == BACKWARD
+  					  ? top_bot_msg : bot_top_msg), TRUE);
+  	}
+! 	if (got_int || called_emsg
+! #ifdef FEAT_SEARCH_EXTRA
+! 		|| break_loop
+! #endif
+! 		)
+  	    break;
+      }
+      while (--count > 0 && found);   /* stop after count matches or no match */
+*** ../vim-7.2.173/src/tag.c	2009-02-23 00:53:35.000000000 +0100
+--- src/tag.c	2009-05-15 21:16:59.000000000 +0200
+***************
+*** 1105,1114 ****
+  /*
+   * Print the tag stack
+   */
+- /*ARGSUSED*/
+      void
+  do_tags(eap)
+!     exarg_T	*eap;
+  {
+      int		i;
+      char_u	*name;
+--- 1105,1113 ----
+  /*
+   * Print the tag stack
+   */
+      void
+  do_tags(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      int		i;
+      char_u	*name;
+***************
+*** 2530,2540 ****
+   * Callback function for finding all "tags" and "tags-??" files in
+   * 'runtimepath' doc directories.
+   */
+- /*ARGSUSED*/
+      static void
+  found_tagfile_cb(fname, cookie)
+      char_u	*fname;
+!     void	*cookie;
+  {
+      if (ga_grow(&tag_fnames, 1) == OK)
+  	((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
+--- 2529,2538 ----
+   * Callback function for finding all "tags" and "tags-??" files in
+   * 'runtimepath' doc directories.
+   */
+      static void
+  found_tagfile_cb(fname, cookie)
+      char_u	*fname;
+!     void	*cookie UNUSED;
+  {
+      if (ga_grow(&tag_fnames, 1) == OK)
+  	((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
+*** ../vim-7.2.173/src/version.c	2009-05-14 22:19:19.000000000 +0200
+--- src/version.c	2009-05-15 21:21:44.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     174,
+  /**/
+
+-- 
+TERRY GILLIAM PLAYED: PATSY (ARTHUR'S TRUSTY STEED), THE GREEN KNIGHT
+                      SOOTHSAYER, BRIDGEKEEPER, SIR GAWAIN (THE FIRST TO BE
+                      KILLED BY THE RABBIT)
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.175 b/source/ap/vim/patches/7.2.175
new file mode 100644
index 000000000..4ba3a1587
--- /dev/null
+++ b/source/ap/vim/patches/7.2.175
@@ -0,0 +1,51 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.175
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.175
+Problem:    Compiler warning in OpenBSD.
+Solution:   Add type cast for NULL. (Dasn)
+Files:	    src/if_cscope.c
+
+
+*** ../vim-7.2.174/src/if_cscope.c	2009-04-22 16:22:44.000000000 +0200
+--- src/if_cscope.c	2009-05-16 16:15:03.000000000 +0200
+***************
+*** 994,1000 ****
+  	vim_free(ppath);
+  
+  #if defined(UNIX)
+! 	if (execl("/bin/sh", "sh", "-c", cmd, NULL) == -1)
+  	    PERROR(_("cs_create_connection exec failed"));
+  
+  	exit(127);
+--- 994,1000 ----
+  	vim_free(ppath);
+  
+  #if defined(UNIX)
+! 	if (execl("/bin/sh", "sh", "-c", cmd, (char *)NULL) == -1)
+  	    PERROR(_("cs_create_connection exec failed"));
+  
+  	exit(127);
+*** ../vim-7.2.174/src/version.c	2009-05-15 21:31:11.000000000 +0200
+--- src/version.c	2009-05-16 16:13:15.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     175,
+  /**/
+
+-- 
+Every time I lose weight, it finds me again!
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.176 b/source/ap/vim/patches/7.2.176
new file mode 100644
index 000000000..91c98afbc
--- /dev/null
+++ b/source/ap/vim/patches/7.2.176
@@ -0,0 +1,207 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.176
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.176
+Problem:    Exceptions for splint are not useful.
+Solution:   Remove the S_SPLINT_S ifdefs.
+Files:	    src/edit.c, src/ex_cmds.c, src/ex_docmd.c, src/os_unix.c,
+	    src/os_unix.h, src/os_unixx.h, src/structs.h, src/term.h
+
+
+*** ../vim-7.2.175/src/edit.c	2009-05-15 21:31:11.000000000 +0200
+--- src/edit.c	2009-05-16 16:18:35.000000000 +0200
+***************
+*** 69,79 ****
+      compl_T	*cp_prev;
+      char_u	*cp_str;	/* matched text */
+      char	cp_icase;	/* TRUE or FALSE: ignore case */
+- #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
+-     char_u	**cp_text;	/* text for the menu */
+- #else
+      char_u	*(cp_text[CPT_COUNT]);	/* text for the menu */
+- #endif
+      char_u	*cp_fname;	/* file containing the match, allocated when
+  				 * cp_flags has FREE_FNAME */
+      int		cp_flags;	/* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */
+--- 69,75 ----
+***************
+*** 3835,3845 ****
+      char_u	*word;
+      int		icase = FALSE;
+      int		adup = FALSE;
+- #ifdef S_SPLINT_S  /* splint doesn't parse array of pointers correctly */
+-     char_u	**cptext;
+- #else
+      char_u	*(cptext[CPT_COUNT]);
+- #endif
+  
+      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
+      {
+--- 3831,3837 ----
+*** ../vim-7.2.175/src/ex_cmds.c	2009-05-15 21:31:11.000000000 +0200
+--- src/ex_cmds.c	2009-05-16 16:18:56.000000000 +0200
+***************
+*** 5776,5785 ****
+  {
+      char_u	*s, *d;
+      int		i;
+- #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
+-     static char **mtable;
+-     static char **rtable;
+- #else
+      static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
+  			       "/*", "/\\*", "\"*", "**",
+  			       "/\\(\\)",
+--- 5776,5781 ----
+***************
+*** 5794,5800 ****
+  			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
+  			       "\\[count]", "\\[quotex]", "\\[range]",
+  			       "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
+- #endif
+      int flags;
+  
+      d = IObuff;		    /* assume IObuff is long enough! */
+--- 5790,5795 ----
+*** ../vim-7.2.175/src/ex_docmd.c	2009-05-15 21:31:11.000000000 +0200
+--- src/ex_docmd.c	2009-05-16 16:19:26.000000000 +0200
+***************
+*** 9395,9407 ****
+  {
+      int		len;
+      int		i;
+! #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
+!     static char **spec_str;
+!     static char *(nospec_str[])
+! #else
+!     static char *(spec_str[])
+! #endif
+! 	= {
+  		    "%",
+  #define SPEC_PERC   0
+  		    "#",
+--- 9395,9401 ----
+  {
+      int		len;
+      int		i;
+!     static char *(spec_str[]) = {
+  		    "%",
+  #define SPEC_PERC   0
+  		    "#",
+*** ../vim-7.2.175/src/os_unix.c	2009-05-15 21:31:11.000000000 +0200
+--- src/os_unix.c	2009-05-16 16:20:00.000000000 +0200
+***************
+*** 199,207 ****
+  #endif
+  
+  #ifndef SIG_ERR
+! # ifndef S_SPLINT_S
+! #  define SIG_ERR	((RETSIGTYPE (*)())-1)
+! # endif
+  #endif
+  
+  /* volatile because it is used in signal handler sig_winch(). */
+--- 199,205 ----
+  #endif
+  
+  #ifndef SIG_ERR
+! # define SIG_ERR	((RETSIGTYPE (*)())-1)
+  #endif
+  
+  /* volatile because it is used in signal handler sig_winch(). */
+***************
+*** 443,451 ****
+  
+  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
+  # ifdef HAVE_SYS_RESOURCE_H
+! #  ifndef S_SPLINT_S  /* splint crashes on bits/resource.h */
+! #   include <sys/resource.h>
+! #  endif
+  # endif
+  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
+  #  include <sys/sysctl.h>
+--- 441,447 ----
+  
+  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
+  # ifdef HAVE_SYS_RESOURCE_H
+! #  include <sys/resource.h>
+  # endif
+  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
+  #  include <sys/sysctl.h>
+*** ../vim-7.2.175/src/os_unix.h	2009-05-15 21:31:11.000000000 +0200
+--- src/os_unix.h	2009-05-16 16:17:22.000000000 +0200
+***************
+*** 53,61 ****
+  #endif
+  
+  #ifdef HAVE_UNISTD_H
+! # ifndef S_SPLINT_S  /* splint crashes on bits/confname.h */
+! #  include <unistd.h>
+! # endif
+  #endif
+  
+  #ifdef HAVE_LIBC_H
+--- 53,59 ----
+  #endif
+  
+  #ifdef HAVE_UNISTD_H
+! # include <unistd.h>
+  #endif
+  
+  #ifdef HAVE_LIBC_H
+*** ../vim-7.2.175/src/structs.h	2009-05-13 20:47:07.000000000 +0200
+--- src/structs.h	2009-05-16 16:17:51.000000000 +0200
+***************
+*** 1646,1656 ****
+  #endif
+  #ifdef FEAT_DIFF
+      diff_T	    *tp_first_diff;
+- # ifdef S_SPLINT_S  /* splint doesn't understand the array of pointers */
+-     buf_T	    **tp_diffbuf;
+- # else
+      buf_T	    *(tp_diffbuf[DB_COUNT]);
+- # endif
+      int		    tp_diff_invalid;	/* list of diffs is outdated */
+  #endif
+      frame_T	    *tp_snapshot;    /* window layout snapshot */
+--- 1646,1652 ----
+*** ../vim-7.2.175/src/term.h	2009-05-13 18:54:14.000000000 +0200
+--- src/term.h	2009-05-16 16:20:06.000000000 +0200
+***************
+*** 96,106 ****
+   * - there should be code in term.c to obtain the value from the termcap
+   */
+  
+- #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
+- extern char_u **term_strings;    /* current terminal strings */
+- #else
+  extern char_u *(term_strings[]);    /* current terminal strings */
+- #endif
+  
+  /*
+   * strings used for terminal
+--- 96,102 ----
+*** ../vim-7.2.175/src/version.c	2009-05-16 16:15:39.000000000 +0200
+--- src/version.c	2009-05-16 16:34:10.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     176,
+  /**/
+
+-- 
+Corn oil comes from corn and olive oil comes from olives, so where
+does baby oil come from?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.177 b/source/ap/vim/patches/7.2.177
new file mode 100644
index 000000000..65dc16c2f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.177
@@ -0,0 +1,2726 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.177
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.177
+Problem:    Compiler warnings when using -Wextra
+Solution:   Add UNUSED and type casts.
+Files:	    src/eval.c, src/ex_docmd.c, src/ex_eval.c, src/ex_getln.c,
+	    src/fileio.c, src/hardcopy.c, src/if_cscope.c, src/if_xcmdsrv.c,
+	    src/farsi.c, src/mark.c, src/menu.c
+
+
+*** ../vim-7.2.176/src/eval.c	2009-05-15 21:31:11.000000000 +0200
+--- src/eval.c	2009-05-16 16:58:30.000000000 +0200
+***************
+*** 3772,3778 ****
+   * Function given to ExpandGeneric() to obtain the list of user defined
+   * (global/buffer/window/built-in) variable names.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_user_var_name(xp, idx)
+      expand_T	*xp;
+--- 3772,3777 ----
+***************
+*** 7787,7793 ****
+   * Function given to ExpandGeneric() to obtain the list of internal or
+   * user defined variable or function names.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_expr_name(xp, idx)
+      expand_T	*xp;
+--- 7786,7791 ----
+***************
+*** 8655,8664 ****
+  /*
+   * "byte2line(byte)" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_byte2line(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifndef FEAT_BYTEOFF
+--- 8653,8661 ----
+  /*
+   * "byte2line(byte)" function
+   */
+      static void
+  f_byte2line(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifndef FEAT_BYTEOFF
+***************
+*** 8678,8684 ****
+  /*
+   * "byteidx()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_byteidx(argvars, rettv)
+      typval_T	*argvars;
+--- 8675,8680 ----
+***************
+*** 8852,8858 ****
+      static void
+  f_clearmatches(argvars, rettv)
+      typval_T	*argvars UNUSED;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_SEARCH_EXTRA
+      clear_matches(curwin);
+--- 8848,8854 ----
+      static void
+  f_clearmatches(argvars, rettv)
+      typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_SEARCH_EXTRA
+      clear_matches(curwin);
+***************
+*** 8916,8926 ****
+  /*
+   * "complete()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_complete(argvars, rettv)
+      typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+      int	    startcol;
+  
+--- 8912,8921 ----
+  /*
+   * "complete()" function
+   */
+      static void
+  f_complete(argvars, rettv)
+      typval_T	*argvars;
+!     typval_T	*rettv UNUSED;
+  {
+      int	    startcol;
+  
+***************
+*** 8951,8957 ****
+  /*
+   * "complete_add()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_complete_add(argvars, rettv)
+      typval_T	*argvars;
+--- 8946,8951 ----
+***************
+*** 8963,8972 ****
+  /*
+   * "complete_check()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_complete_check(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      int		saved = RedrawingDisabled;
+--- 8957,8965 ----
+  /*
+   * "complete_check()" function
+   */
+      static void
+  f_complete_check(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      int		saved = RedrawingDisabled;
+***************
+*** 8981,8991 ****
+  /*
+   * "confirm(message, buttons[, default [, type]])" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_confirm(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
+      char_u	*message;
+--- 8974,8983 ----
+  /*
+   * "confirm(message, buttons[, default [, type]])" function
+   */
+      static void
+  f_confirm(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
+      char_u	*message;
+***************
+*** 9150,9160 ****
+   *
+   * Checks the existence of a cscope connection.
+   */
+- /*ARGSUSED*/
+      static void
+  f_cscope_connection(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_CSCOPE
+      int		num = 0;
+--- 9142,9151 ----
+   *
+   * Checks the existence of a cscope connection.
+   */
+      static void
+  f_cscope_connection(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_CSCOPE
+      int		num = 0;
+***************
+*** 9181,9187 ****
+   * Moves the cursor to the specified line and column.
+   * Returns 0 when the position could be set, -1 otherwise.
+   */
+- /*ARGSUSED*/
+      static void
+  f_cursor(argvars, rettv)
+      typval_T	*argvars;
+--- 9172,9177 ----
+***************
+*** 9275,9285 ****
+  /*
+   * "did_filetype()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_did_filetype(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_AUTOCMD
+      rettv->vval.v_number = did_filetype;
+--- 9265,9274 ----
+  /*
+   * "did_filetype()" function
+   */
+      static void
+  f_did_filetype(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_AUTOCMD
+      rettv->vval.v_number = did_filetype;
+***************
+*** 9289,9299 ****
+  /*
+   * "diff_filler()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_diff_filler(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_DIFF
+      rettv->vval.v_number = diff_check_fill(curwin, get_tv_lnum(argvars));
+--- 9278,9287 ----
+  /*
+   * "diff_filler()" function
+   */
+      static void
+  f_diff_filler(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_DIFF
+      rettv->vval.v_number = diff_check_fill(curwin, get_tv_lnum(argvars));
+***************
+*** 9303,9313 ****
+  /*
+   * "diff_hlID()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_diff_hlID(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_DIFF
+      linenr_T		lnum = get_tv_lnum(argvars);
+--- 9291,9300 ----
+  /*
+   * "diff_hlID()" function
+   */
+      static void
+  f_diff_hlID(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_DIFF
+      linenr_T		lnum = get_tv_lnum(argvars);
+***************
+*** 9420,9426 ****
+  /*
+   * "eval()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_eval(argvars, rettv)
+      typval_T	*argvars;
+--- 9407,9412 ----
+***************
+*** 9444,9453 ****
+  /*
+   * "eventhandler()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_eventhandler(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = vgetc_busy;
+--- 9430,9438 ----
+  /*
+   * "eventhandler()" function
+   */
+      static void
+  f_eventhandler(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = vgetc_busy;
+***************
+*** 9704,9714 ****
+  /*
+   * "feedkeys()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_feedkeys(argvars, rettv)
+      typval_T    *argvars;
+!     typval_T    *rettv;
+  {
+      int		remap = TRUE;
+      char_u	*keys, *flags;
+--- 9689,9698 ----
+  /*
+   * "feedkeys()" function
+   */
+      static void
+  f_feedkeys(argvars, rettv)
+      typval_T    *argvars;
+!     typval_T    *rettv UNUSED;
+  {
+      int		remap = TRUE;
+      char_u	*keys, *flags;
+***************
+*** 10210,10219 ****
+  /*
+   * "foldtext()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_foldtext(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_FOLDING
+--- 10194,10202 ----
+  /*
+   * "foldtext()" function
+   */
+      static void
+  f_foldtext(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_FOLDING
+***************
+*** 10278,10287 ****
+  /*
+   * "foldtextresult(lnum)" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_foldtextresult(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_FOLDING
+--- 10261,10269 ----
+  /*
+   * "foldtextresult(lnum)" function
+   */
+      static void
+  f_foldtextresult(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_FOLDING
+***************
+*** 10314,10324 ****
+  /*
+   * "foreground()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_foreground(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_GUI
+      if (gui.in_use)
+--- 10296,10305 ----
+  /*
+   * "foreground()" function
+   */
+      static void
+  f_foreground(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_GUI
+      if (gui.in_use)
+***************
+*** 10333,10339 ****
+  /*
+   * "function()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_function(argvars, rettv)
+      typval_T	*argvars;
+--- 10314,10319 ----
+***************
+*** 10357,10367 ****
+  /*
+   * "garbagecollect()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_garbagecollect(argvars, rettv)
+      typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+      /* This is postponed until we are back at the toplevel, because we may be
+       * using Lists and Dicts internally.  E.g.: ":echo [garbagecollect()]". */
+--- 10337,10346 ----
+  /*
+   * "garbagecollect()" function
+   */
+      static void
+  f_garbagecollect(argvars, rettv)
+      typval_T	*argvars;
+!     typval_T	*rettv UNUSED;
+  {
+      /* This is postponed until we are back at the toplevel, because we may be
+       * using Lists and Dicts internally.  E.g.: ":echo [garbagecollect()]". */
+***************
+*** 10664,10673 ****
+  /*
+   * "getcharmod()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getcharmod(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = mod_mask;
+--- 10643,10651 ----
+  /*
+   * "getcharmod()" function
+   */
+      static void
+  f_getcharmod(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = mod_mask;
+***************
+*** 10676,10685 ****
+  /*
+   * "getcmdline()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getcmdline(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+--- 10654,10662 ----
+  /*
+   * "getcmdline()" function
+   */
+      static void
+  f_getcmdline(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+***************
+*** 10689,10698 ****
+  /*
+   * "getcmdpos()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getcmdpos(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = get_cmdline_pos() + 1;
+--- 10666,10674 ----
+  /*
+   * "getcmdpos()" function
+   */
+      static void
+  f_getcmdpos(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = get_cmdline_pos() + 1;
+***************
+*** 10701,10710 ****
+  /*
+   * "getcmdtype()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getcmdtype(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+--- 10677,10685 ----
+  /*
+   * "getcmdtype()" function
+   */
+      static void
+  f_getcmdtype(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+***************
+*** 10719,10728 ****
+  /*
+   * "getcwd()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getcwd(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      char_u	cwd[MAXPATHL];
+--- 10694,10702 ----
+  /*
+   * "getcwd()" function
+   */
+      static void
+  f_getcwd(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      char_u	cwd[MAXPATHL];
+***************
+*** 10743,10752 ****
+  /*
+   * "getfontname()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getfontname(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+--- 10717,10725 ----
+  /*
+   * "getfontname()" function
+   */
+      static void
+  f_getfontname(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+***************
+*** 10973,10982 ****
+  /*
+   * "getmatches()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getmatches(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_SEARCH_EXTRA
+--- 10946,10954 ----
+  /*
+   * "getmatches()" function
+   */
+      static void
+  f_getmatches(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_SEARCH_EXTRA
+***************
+*** 11004,11013 ****
+  /*
+   * "getpid()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getpid(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = mch_get_pid();
+--- 10976,10984 ----
+  /*
+   * "getpid()" function
+   */
+      static void
+  f_getpid(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = mch_get_pid();
+***************
+*** 11051,11061 ****
+  /*
+   * "getqflist()" and "getloclist()" functions
+   */
+- /*ARGSUSED*/
+      static void
+  f_getqflist(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_QUICKFIX
+      win_T	*wp;
+--- 11022,11031 ----
+  /*
+   * "getqflist()" and "getloclist()" functions
+   */
+      static void
+  f_getqflist(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_QUICKFIX
+      win_T	*wp;
+***************
+*** 11170,11179 ****
+  /*
+   * "getwinposx()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getwinposx(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = -1;
+--- 11140,11148 ----
+  /*
+   * "getwinposx()" function
+   */
+      static void
+  f_getwinposx(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = -1;
+***************
+*** 11191,11200 ****
+  /*
+   * "getwinposy()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_getwinposy(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = -1;
+--- 11160,11168 ----
+  /*
+   * "getwinposy()" function
+   */
+      static void
+  f_getwinposy(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = -1;
+***************
+*** 11921,11930 ****
+  /*
+   * "haslocaldir()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_haslocaldir(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = (curwin->w_localdir != NULL);
+--- 11889,11897 ----
+  /*
+   * "haslocaldir()" function
+   */
+      static void
+  f_haslocaldir(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = (curwin->w_localdir != NULL);
+***************
+*** 11962,11971 ****
+  /*
+   * "histadd()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_histadd(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_CMDHIST
+--- 11929,11937 ----
+  /*
+   * "histadd()" function
+   */
+      static void
+  f_histadd(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_CMDHIST
+***************
+*** 11996,12006 ****
+  /*
+   * "histdel()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_histdel(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_CMDHIST
+      int		n;
+--- 11962,11971 ----
+  /*
+   * "histdel()" function
+   */
+      static void
+  f_histdel(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_CMDHIST
+      int		n;
+***************
+*** 12028,12037 ****
+  /*
+   * "histget()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_histget(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_CMDHIST
+--- 11993,12001 ----
+  /*
+   * "histget()" function
+   */
+      static void
+  f_histget(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_CMDHIST
+***************
+*** 12061,12070 ****
+  /*
+   * "histnr()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_histnr(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      int		i;
+--- 12025,12033 ----
+  /*
+   * "histnr()" function
+   */
+      static void
+  f_histnr(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      int		i;
+***************
+*** 12106,12115 ****
+  /*
+   * "hostname()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_hostname(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      char_u hostname[256];
+--- 12069,12077 ----
+  /*
+   * "hostname()" function
+   */
+      static void
+  f_hostname(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      char_u hostname[256];
+***************
+*** 12122,12131 ****
+  /*
+   * iconv() function
+   */
+- /*ARGSUSED*/
+      static void
+  f_iconv(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_MBYTE
+--- 12084,12092 ----
+  /*
+   * iconv() function
+   */
+      static void
+  f_iconv(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_MBYTE
+***************
+*** 12420,12429 ****
+  /*
+   * "inputrestore()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_inputrestore(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      if (ga_userinput.ga_len > 0)
+--- 12381,12389 ----
+  /*
+   * "inputrestore()" function
+   */
+      static void
+  f_inputrestore(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      if (ga_userinput.ga_len > 0)
+***************
+*** 12443,12452 ****
+  /*
+   * "inputsave()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_inputsave(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      /* Add an entry to the stack of typeahead storage. */
+--- 12403,12411 ----
+  /*
+   * "inputsave()" function
+   */
+      static void
+  f_inputsave(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      /* Add an entry to the stack of typeahead storage. */
+***************
+*** 12733,12742 ****
+  /*
+   * "last_buffer_nr()" function.
+   */
+- /*ARGSUSED*/
+      static void
+  f_last_buffer_nr(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      int		n = 0;
+--- 12692,12700 ----
+  /*
+   * "last_buffer_nr()" function.
+   */
+      static void
+  f_last_buffer_nr(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      int		n = 0;
+***************
+*** 12863,12872 ****
+  /*
+   * "line2byte(lnum)" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_line2byte(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifndef FEAT_BYTEOFF
+--- 12821,12829 ----
+  /*
+   * "line2byte(lnum)" function
+   */
+      static void
+  f_line2byte(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifndef FEAT_BYTEOFF
+***************
+*** 12912,12921 ****
+  /*
+   * "localtime()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_localtime(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = (varnumber_T)time(NULL);
+--- 12869,12877 ----
+  /*
+   * "localtime()" function
+   */
+      static void
+  f_localtime(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->vval.v_number = (varnumber_T)time(NULL);
+***************
+*** 13497,13503 ****
+  /*
+   * "mode()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_mode(argvars, rettv)
+      typval_T	*argvars;
+--- 13453,13458 ----
+***************
+*** 13726,13736 ****
+  /*
+   * "pumvisible()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_pumvisible(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_INS_EXPAND
+      if (pum_visible())
+--- 13681,13690 ----
+  /*
+   * "pumvisible()" function
+   */
+      static void
+  f_pumvisible(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_INS_EXPAND
+      if (pum_visible())
+***************
+*** 14131,14140 ****
+  /*
+   * "remote_expr()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_remote_expr(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+--- 14085,14093 ----
+  /*
+   * "remote_expr()" function
+   */
+      static void
+  f_remote_expr(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+***************
+*** 14147,14157 ****
+  /*
+   * "remote_foreground()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_remote_foreground(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_CLIENTSERVER
+  # ifdef WIN32
+--- 14100,14109 ----
+  /*
+   * "remote_foreground()" function
+   */
+      static void
+  f_remote_foreground(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_CLIENTSERVER
+  # ifdef WIN32
+***************
+*** 14173,14182 ****
+  #endif
+  }
+  
+- /*ARGSUSED*/
+      static void
+  f_remote_peek(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_CLIENTSERVER
+--- 14125,14133 ----
+  #endif
+  }
+  
+      static void
+  f_remote_peek(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_CLIENTSERVER
+***************
+*** 14231,14240 ****
+  #endif
+  }
+  
+- /*ARGSUSED*/
+      static void
+  f_remote_read(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      char_u	*r = NULL;
+--- 14182,14190 ----
+  #endif
+  }
+  
+      static void
+  f_remote_read(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      char_u	*r = NULL;
+***************
+*** 14266,14275 ****
+  /*
+   * "remote_send()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_remote_send(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+--- 14216,14224 ----
+  /*
+   * "remote_send()" function
+   */
+      static void
+  f_remote_send(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      rettv->v_type = VAR_STRING;
+***************
+*** 14398,14404 ****
+  /*
+   * "repeat()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_repeat(argvars, rettv)
+      typval_T	*argvars;
+--- 14347,14352 ----
+***************
+*** 15207,15216 ****
+  }
+  
+  
+- /*ARGSUSED*/
+      static void
+  f_server2client(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_CLIENTSERVER
+--- 15155,15163 ----
+  }
+  
+  
+      static void
+  f_server2client(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_CLIENTSERVER
+***************
+*** 15239,15248 ****
+  #endif
+  }
+  
+- /*ARGSUSED*/
+      static void
+  f_serverlist(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      char_u	*r = NULL;
+--- 15186,15194 ----
+  #endif
+  }
+  
+      static void
+  f_serverlist(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      char_u	*r = NULL;
+***************
+*** 15263,15273 ****
+  /*
+   * "setbufvar()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_setbufvar(argvars, rettv)
+      typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+      buf_T	*buf;
+      aco_save_T	aco;
+--- 15209,15218 ----
+  /*
+   * "setbufvar()" function
+   */
+      static void
+  f_setbufvar(argvars, rettv)
+      typval_T	*argvars;
+!     typval_T	*rettv UNUSED;
+  {
+      buf_T	*buf;
+      aco_save_T	aco;
+***************
+*** 15402,15413 ****
+  /*
+   * Used by "setqflist()" and "setloclist()" functions
+   */
+- /*ARGSUSED*/
+      static void
+  set_qf_ll_list(wp, list_arg, action_arg, rettv)
+!     win_T	*wp;
+!     typval_T	*list_arg;
+!     typval_T	*action_arg;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_QUICKFIX
+--- 15347,15357 ----
+  /*
+   * Used by "setqflist()" and "setloclist()" functions
+   */
+      static void
+  set_qf_ll_list(wp, list_arg, action_arg, rettv)
+!     win_T	*wp UNUSED;
+!     typval_T	*list_arg UNUSED;
+!     typval_T	*action_arg UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_QUICKFIX
+***************
+*** 15442,15448 ****
+  /*
+   * "setloclist()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_setloclist(argvars, rettv)
+      typval_T	*argvars;
+--- 15386,15391 ----
+***************
+*** 15520,15526 ****
+  /*
+   * "setpos()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_setpos(argvars, rettv)
+      typval_T	*argvars;
+--- 15463,15468 ----
+***************
+*** 15564,15570 ****
+  /*
+   * "setqflist()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_setqflist(argvars, rettv)
+      typval_T	*argvars;
+--- 15506,15511 ----
+***************
+*** 15667,15677 ****
+  /*
+   * "setwinvar()" and "settabwinvar()" functions
+   */
+- /*ARGSUSED*/
+      static void
+  setwinvar(argvars, rettv, off)
+      typval_T	*argvars;
+!     typval_T	*rettv;
+      int		off;
+  {
+      win_T	*win;
+--- 15608,15617 ----
+  /*
+   * "setwinvar()" and "settabwinvar()" functions
+   */
+      static void
+  setwinvar(argvars, rettv, off)
+      typval_T	*argvars;
+!     typval_T	*rettv UNUSED;
+      int		off;
+  {
+      win_T	*win;
+***************
+*** 15987,15996 ****
+  /*
+   * "spellbadword()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_spellbadword(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      char_u	*word = (char_u *)"";
+--- 15927,15935 ----
+  /*
+   * "spellbadword()" function
+   */
+      static void
+  f_spellbadword(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      char_u	*word = (char_u *)"";
+***************
+*** 16042,16051 ****
+  /*
+   * "spellsuggest()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_spellsuggest(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_SPELL
+--- 15981,15989 ----
+  /*
+   * "spellsuggest()" function
+   */
+      static void
+  f_spellsuggest(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_SPELL
+***************
+*** 16528,16537 ****
+  /*
+   * "synID(lnum, col, trans)" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_synID(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      int		id = 0;
+--- 16466,16474 ----
+  /*
+   * "synID(lnum, col, trans)" function
+   */
+      static void
+  f_synID(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      int		id = 0;
+***************
+*** 16556,16565 ****
+  /*
+   * "synIDattr(id, what [, mode])" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_synIDattr(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      char_u	*p = NULL;
+--- 16493,16501 ----
+  /*
+   * "synIDattr(id, what [, mode])" function
+   */
+      static void
+  f_synIDattr(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      char_u	*p = NULL;
+***************
+*** 16652,16661 ****
+  /*
+   * "synIDtrans(id)" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_synIDtrans(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      int		id;
+--- 16588,16596 ----
+  /*
+   * "synIDtrans(id)" function
+   */
+      static void
+  f_synIDtrans(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      int		id;
+***************
+*** 16675,16684 ****
+  /*
+   * "synstack(lnum, col)" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_synstack(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_SYN_HL
+--- 16610,16618 ----
+  /*
+   * "synstack(lnum, col)" function
+   */
+      static void
+  f_synstack(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_SYN_HL
+***************
+*** 16812,16822 ****
+  /*
+   * "tabpagebuflist()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_tabpagebuflist(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_WINDOWS
+      tabpage_T	*tp;
+--- 16746,16755 ----
+  /*
+   * "tabpagebuflist()" function
+   */
+      static void
+  f_tabpagebuflist(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_WINDOWS
+      tabpage_T	*tp;
+***************
+*** 16844,16853 ****
+  /*
+   * "tabpagenr()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_tabpagenr(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      int		nr = 1;
+--- 16777,16785 ----
+  /*
+   * "tabpagenr()" function
+   */
+      static void
+  f_tabpagenr(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      int		nr = 1;
+***************
+*** 16929,16938 ****
+  /*
+   * "tabpagewinnr()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_tabpagewinnr(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      int		nr = 1;
+--- 16861,16869 ----
+  /*
+   * "tabpagewinnr()" function
+   */
+      static void
+  f_tabpagewinnr(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      int		nr = 1;
+***************
+*** 16952,16961 ****
+  /*
+   * "tagfiles()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_tagfiles(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      char_u	fname[MAXPATHL + 1];
+--- 16883,16891 ----
+  /*
+   * "tagfiles()" function
+   */
+      static void
+  f_tagfiles(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      char_u	fname[MAXPATHL + 1];
+***************
+*** 16995,17004 ****
+  /*
+   * "tempname()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_tempname(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      static int	x = 'A';
+--- 16925,16933 ----
+  /*
+   * "tempname()" function
+   */
+      static void
+  f_tempname(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      static int	x = 'A';
+***************
+*** 17031,17041 ****
+  /*
+   * "test(list)" function: Just checking the walls...
+   */
+- /*ARGSUSED*/
+      static void
+  f_test(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+      /* Used for unit testing.  Change the code below to your liking. */
+  #if 0
+--- 16960,16969 ----
+  /*
+   * "test(list)" function: Just checking the walls...
+   */
+      static void
+  f_test(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+      /* Used for unit testing.  Change the code below to your liking. */
+  #if 0
+***************
+*** 17320,17330 ****
+  /*
+   * "visualmode()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_visualmode(argvars, rettv)
+!     typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+  #ifdef FEAT_VISUAL
+      char_u	str[2];
+--- 17248,17257 ----
+  /*
+   * "visualmode()" function
+   */
+      static void
+  f_visualmode(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+!     typval_T	*rettv UNUSED;
+  {
+  #ifdef FEAT_VISUAL
+      char_u	str[2];
+***************
+*** 17360,17369 ****
+  /*
+   * "wincol()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_wincol(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      validate_cursor();
+--- 17287,17295 ----
+  /*
+   * "wincol()" function
+   */
+      static void
+  f_wincol(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      validate_cursor();
+***************
+*** 17390,17399 ****
+  /*
+   * "winline()" function
+   */
+- /*ARGSUSED*/
+      static void
+  f_winline(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      validate_cursor();
+--- 17316,17324 ----
+  /*
+   * "winline()" function
+   */
+      static void
+  f_winline(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      validate_cursor();
+***************
+*** 17403,17412 ****
+  /*
+   * "winnr()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_winnr(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      int		nr = 1;
+--- 17328,17336 ----
+  /*
+   * "winnr()" function
+   */
+      static void
+  f_winnr(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      int		nr = 1;
+***************
+*** 17420,17429 ****
+  /*
+   * "winrestcmd()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_winrestcmd(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_WINDOWS
+--- 17344,17352 ----
+  /*
+   * "winrestcmd()" function
+   */
+      static void
+  f_winrestcmd(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+  #ifdef FEAT_WINDOWS
+***************
+*** 17455,17465 ****
+  /*
+   * "winrestview()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_winrestview(argvars, rettv)
+      typval_T	*argvars;
+!     typval_T	*rettv;
+  {
+      dict_T	*dict;
+  
+--- 17378,17387 ----
+  /*
+   * "winrestview()" function
+   */
+      static void
+  f_winrestview(argvars, rettv)
+      typval_T	*argvars;
+!     typval_T	*rettv UNUSED;
+  {
+      dict_T	*dict;
+  
+***************
+*** 17501,17510 ****
+  /*
+   * "winsaveview()" function
+   */
+- /* ARGSUSED */
+      static void
+  f_winsaveview(argvars, rettv)
+!     typval_T	*argvars;
+      typval_T	*rettv;
+  {
+      dict_T	*dict;
+--- 17423,17431 ----
+  /*
+   * "winsaveview()" function
+   */
+      static void
+  f_winsaveview(argvars, rettv)
+!     typval_T	*argvars UNUSED;
+      typval_T	*rettv;
+  {
+      dict_T	*dict;
+***************
+*** 21646,21657 ****
+   * Called by do_cmdline() to get the next line.
+   * Returns allocated string, or NULL for end of function.
+   */
+- /* ARGSUSED */
+      char_u *
+  get_func_line(c, cookie, indent)
+!     int	    c;		    /* not used */
+      void    *cookie;
+!     int	    indent;	    /* not used */
+  {
+      funccall_T	*fcp = (funccall_T *)cookie;
+      ufunc_T	*fp = fcp->func;
+--- 21567,21577 ----
+   * Called by do_cmdline() to get the next line.
+   * Returns allocated string, or NULL for end of function.
+   */
+      char_u *
+  get_func_line(c, cookie, indent)
+!     int	    c UNUSED;
+      void    *cookie;
+!     int	    indent UNUSED;
+  {
+      funccall_T	*fcp = (funccall_T *)cookie;
+      ufunc_T	*fp = fcp->func;
+***************
+*** 22023,22032 ****
+  /*
+   * List v:oldfiles in a nice way.
+   */
+- /*ARGSUSED*/
+      void
+  ex_oldfiles(eap)
+!     exarg_T	*eap;
+  {
+      list_T	*l = vimvars[VV_OLDFILES].vv_list;
+      listitem_T	*li;
+--- 21943,21951 ----
+  /*
+   * List v:oldfiles in a nice way.
+   */
+      void
+  ex_oldfiles(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      list_T	*l = vimvars[VV_OLDFILES].vv_list;
+      listitem_T	*li;
+*** ../vim-7.2.176/src/ex_docmd.c	2009-05-16 16:36:25.000000000 +0200
+--- src/ex_docmd.c	2009-05-16 17:01:26.000000000 +0200
+***************
+*** 3004,3010 ****
+  
+      if (VIM_ISDIGIT(*cmd))
+  	p = skipwhite(skipdigits(cmd));
+!     for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i)
+      {
+  	for (j = 0; p[j] != NUL; ++j)
+  	    if (p[j] != cmdmods[i].name[j])
+--- 3004,3010 ----
+  
+      if (VIM_ISDIGIT(*cmd))
+  	p = skipwhite(skipdigits(cmd));
+!     for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i)
+      {
+  	for (j = 0; p[j] != NUL; ++j)
+  	    if (p[j] != cmdmods[i].name[j])
+***************
+*** 3032,3038 ****
+      char_u	*p;
+  
+      /* Check command modifiers. */
+!     for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i)
+      {
+  	for (j = 0; name[j] != NUL; ++j)
+  	    if (name[j] != cmdmods[i].name[j])
+--- 3032,3038 ----
+      char_u	*p;
+  
+      /* Check command modifiers. */
+!     for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i)
+      {
+  	for (j = 0; name[j] != NUL; ++j)
+  	    if (name[j] != cmdmods[i].name[j])
+***************
+*** 6093,6099 ****
+  	{"bang", "bar", "buffer", "complete", "count",
+  	    "nargs", "range", "register"};
+  
+!     if (idx >= sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0]))
+  	return NULL;
+      return (char_u *)user_cmd_flags[idx];
+  }
+--- 6093,6099 ----
+  	{"bang", "bar", "buffer", "complete", "count",
+  	    "nargs", "range", "register"};
+  
+!     if (idx >= (int)(sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0])))
+  	return NULL;
+      return (char_u *)user_cmd_flags[idx];
+  }
+***************
+*** 6108,6114 ****
+  {
+      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
+  
+!     if (idx >= sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0]))
+  	return NULL;
+      return (char_u *)user_cmd_nargs[idx];
+  }
+--- 6108,6114 ----
+  {
+      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
+  
+!     if (idx >= (int)(sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0])))
+  	return NULL;
+      return (char_u *)user_cmd_nargs[idx];
+  }
+***************
+*** 9144,9153 ****
+  /*
+   * ":stopinsert"
+   */
+- /*ARGSUSED*/
+      static void
+  ex_stopinsert(eap)
+!     exarg_T	*eap;
+  {
+      restart_edit = 0;
+      stop_insert_mode = TRUE;
+--- 9144,9152 ----
+  /*
+   * ":stopinsert"
+   */
+      static void
+  ex_stopinsert(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      restart_edit = 0;
+      stop_insert_mode = TRUE;
+*** ../vim-7.2.176/src/ex_eval.c	2007-11-24 21:50:19.000000000 +0100
+--- src/ex_eval.c	2009-05-16 17:06:09.000000000 +0200
+***************
+*** 60,66 ****
+--- 60,68 ----
+  #else
+  /* Values used for the Vim release. */
+  # define THROW_ON_ERROR		TRUE
++ # define THROW_ON_ERROR_TRUE
+  # define THROW_ON_INTERRUPT	TRUE
++ # define THROW_ON_INTERRUPT_TRUE
+  #endif
+  
+  static void	catch_exception __ARGS((except_T *excp));
+***************
+*** 1320,1335 ****
+--- 1322,1341 ----
+       * and reset the did_emsg or got_int flag, so this won't happen again at
+       * the next surrounding try conditional.
+       */
++ #ifndef THROW_ON_ERROR_TRUE
+      if (did_emsg && !THROW_ON_ERROR)
+      {
+  	inactivate_try = TRUE;
+  	did_emsg = FALSE;
+      }
++ #endif
++ #ifndef THROW_ON_INTERRUPT_TRUE
+      if (got_int && !THROW_ON_INTERRUPT)
+      {
+  	inactivate_try = TRUE;
+  	got_int = FALSE;
+      }
++ #endif
+      idx = cleanup_conditionals(cstack, 0, inactivate_try);
+      if (idx >= 0)
+      {
+***************
+*** 2254,2263 ****
+  /*
+   * ":endfunction" when not after a ":function"
+   */
+- /*ARGSUSED*/
+      void
+  ex_endfunction(eap)
+!     exarg_T	*eap;
+  {
+      EMSG(_("E193: :endfunction not inside a function"));
+  }
+--- 2260,2268 ----
+  /*
+   * ":endfunction" when not after a ":function"
+   */
+      void
+  ex_endfunction(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      EMSG(_("E193: :endfunction not inside a function"));
+  }
+*** ../vim-7.2.176/src/ex_getln.c	2009-05-15 21:31:11.000000000 +0200
+--- src/ex_getln.c	2009-05-16 17:06:55.000000000 +0200
+***************
+*** 4533,4539 ****
+  	 * right function to do the expansion.
+  	 */
+  	ret = FAIL;
+! 	for (i = 0; i < sizeof(tab) / sizeof(struct expgen); ++i)
+  	    if (xp->xp_context == tab[i].context)
+  	    {
+  		if (tab[i].ic)
+--- 4533,4539 ----
+  	 * right function to do the expansion.
+  	 */
+  	ret = FAIL;
+! 	for (i = 0; i < (int)(sizeof(tab) / sizeof(struct expgen)); ++i)
+  	    if (xp->xp_context == tab[i].context)
+  	    {
+  		if (tab[i].ic)
+*** ../vim-7.2.176/src/fileio.c	2009-05-15 21:31:11.000000000 +0200
+--- src/fileio.c	2009-05-16 17:07:35.000000000 +0200
+***************
+*** 9085,9096 ****
+   * Called by do_cmdline() to get the next line for ":if".
+   * Returns allocated string, or NULL for end of autocommands.
+   */
+- /* ARGSUSED */
+      static char_u *
+  getnextac(c, cookie, indent)
+!     int	    c;		    /* not used */
+      void    *cookie;
+!     int	    indent;	    /* not used */
+  {
+      AutoPatCmd	    *acp = (AutoPatCmd *)cookie;
+      char_u	    *retval;
+--- 9093,9103 ----
+   * Called by do_cmdline() to get the next line for ":if".
+   * Returns allocated string, or NULL for end of autocommands.
+   */
+      static char_u *
+  getnextac(c, cookie, indent)
+!     int	    c UNUSED;
+      void    *cookie;
+!     int	    indent UNUSED;
+  {
+      AutoPatCmd	    *acp = (AutoPatCmd *)cookie;
+      char_u	    *retval;
+***************
+*** 9201,9210 ****
+   * Function given to ExpandGeneric() to obtain the list of autocommand group
+   * names.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_augroup_name(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      if (idx == augroups.ga_len)		/* add "END" add the end */
+--- 9208,9216 ----
+   * Function given to ExpandGeneric() to obtain the list of autocommand group
+   * names.
+   */
+      char_u *
+  get_augroup_name(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      if (idx == augroups.ga_len)		/* add "END" add the end */
+***************
+*** 9270,9279 ****
+  /*
+   * Function given to ExpandGeneric() to obtain the list of event names.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_event_name(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      if (idx < augroups.ga_len)		/* First list group names, if wanted */
+--- 9276,9284 ----
+  /*
+   * Function given to ExpandGeneric() to obtain the list of event names.
+   */
+      char_u *
+  get_event_name(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      if (idx < augroups.ga_len)		/* First list group names, if wanted */
+*** ../vim-7.2.176/src/hardcopy.c	2008-01-12 16:46:41.000000000 +0100
+--- src/hardcopy.c	2009-05-16 17:18:27.000000000 +0200
+***************
+*** 442,453 ****
+  /*
+   * Print the page header.
+   */
+- /*ARGSUSED*/
+      static void
+  prt_header(psettings, pagenum, lnum)
+      prt_settings_T  *psettings;
+      int		pagenum;
+!     linenr_T	lnum;
+  {
+      int		width = psettings->chars_per_line;
+      int		page_line;
+--- 442,452 ----
+  /*
+   * Print the page header.
+   */
+      static void
+  prt_header(psettings, pagenum, lnum)
+      prt_settings_T  *psettings;
+      int		pagenum;
+!     linenr_T	lnum UNUSED;
+  {
+      int		width = psettings->chars_per_line;
+      int		page_line;
+***************
+*** 1881,1887 ****
+  	return FALSE;
+  
+      /* Find type of DSC comment */
+!     for (comment = 0; comment < NUM_ELEMENTS(prt_dsc_table); comment++)
+  	if (prt_resfile_strncmp(0, prt_dsc_table[comment].string,
+  					    prt_dsc_table[comment].len) == 0)
+  	    break;
+--- 1880,1886 ----
+  	return FALSE;
+  
+      /* Find type of DSC comment */
+!     for (comment = 0; comment < (int)NUM_ELEMENTS(prt_dsc_table); comment++)
+  	if (prt_resfile_strncmp(0, prt_dsc_table[comment].string,
+  					    prt_dsc_table[comment].len) == 0)
+  	    break;
+***************
+*** 2454,2465 ****
+  }
+  #endif
+  
+- /*ARGSUSED*/
+      int
+  mch_print_init(psettings, jobname, forceit)
+      prt_settings_T *psettings;
+      char_u	*jobname;
+!     int		forceit;
+  {
+      int		i;
+      char	*paper_name;
+--- 2453,2463 ----
+  }
+  #endif
+  
+      int
+  mch_print_init(psettings, jobname, forceit)
+      prt_settings_T *psettings;
+      char_u	*jobname;
+!     int		forceit UNUSED;
+  {
+      int		i;
+      char	*paper_name;
+***************
+*** 2514,2520 ****
+      if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE)))
+      {
+  	p_mbenc_first = NULL;
+! 	for (cmap = 0; cmap < NUM_ELEMENTS(prt_ps_mbfonts); cmap++)
+  	    if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap],
+  								    &p_mbenc))
+  	    {
+--- 2512,2518 ----
+      if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE)))
+      {
+  	p_mbenc_first = NULL;
+! 	for (cmap = 0; cmap < (int)NUM_ELEMENTS(prt_ps_mbfonts); cmap++)
+  	    if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap],
+  								    &p_mbenc))
+  	    {
+***************
+*** 2642,2648 ****
+  	paper_name = "A4";
+  	paper_strlen = 2;
+      }
+!     for (i = 0; i < PRT_MEDIASIZE_LEN; ++i)
+  	if (STRLEN(prt_mediasize[i].name) == (unsigned)paper_strlen
+  		&& STRNICMP(prt_mediasize[i].name, paper_name,
+  							   paper_strlen) == 0)
+--- 2640,2646 ----
+  	paper_name = "A4";
+  	paper_strlen = 2;
+      }
+!     for (i = 0; i < (int)PRT_MEDIASIZE_LEN; ++i)
+  	if (STRLEN(prt_mediasize[i].name) == (unsigned)paper_strlen
+  		&& STRNICMP(prt_mediasize[i].name, paper_name,
+  							   paper_strlen) == 0)
+***************
+*** 3308,3317 ****
+      return !prt_file_error;
+  }
+  
+- /*ARGSUSED*/
+      int
+  mch_print_begin_page(str)
+!     char_u	*str;
+  {
+      int		page_num[2];
+  
+--- 3306,3314 ----
+      return !prt_file_error;
+  }
+  
+      int
+  mch_print_begin_page(str)
+!     char_u	*str UNUSED;
+  {
+      int		page_num[2];
+  
+***************
+*** 3379,3389 ****
+  #endif
+  }
+  
+- /*ARGSUSED*/
+      int
+  mch_print_text_out(p, len)
+      char_u	*p;
+!     int		len;
+  {
+      int		need_break;
+      char_u	ch;
+--- 3376,3385 ----
+  #endif
+  }
+  
+      int
+  mch_print_text_out(p, len)
+      char_u	*p;
+!     int		len UNUSED;
+  {
+      int		need_break;
+      char_u	ch;
+*** ../vim-7.2.176/src/if_cscope.c	2009-05-16 16:15:39.000000000 +0200
+--- src/if_cscope.c	2009-05-16 17:19:30.000000000 +0200
+***************
+*** 83,89 ****
+  		N_("Reinit all connections"), "reset", 0 },
+      { "show",	cs_show,
+  		N_("Show connections"),       "show", 0 },
+!     { NULL }
+  };
+  
+      static void
+--- 83,89 ----
+  		N_("Reinit all connections"), "reset", 0 },
+      { "show",	cs_show,
+  		N_("Show connections"),       "show", 0 },
+!     { NULL, NULL, NULL, NULL, 0 }
+  };
+  
+      static void
+***************
+*** 107,116 ****
+   * Function given to ExpandGeneric() to obtain the cscope command
+   * expansion.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_cscope_name(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      int		current_idx;
+--- 107,115 ----
+   * Function given to ExpandGeneric() to obtain the cscope command
+   * expansion.
+   */
+      char_u *
+  get_cscope_name(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      int		current_idx;
+***************
+*** 496,505 ****
+   *
+   * MAXPATHL 256
+   */
+- /* ARGSUSED */
+      static int
+  cs_add(eap)
+!     exarg_T *eap;
+  {
+      char *fname, *ppath, *flags = NULL;
+  
+--- 495,503 ----
+   *
+   * MAXPATHL 256
+   */
+      static int
+  cs_add(eap)
+!     exarg_T *eap UNUSED;
+  {
+      char *fname, *ppath, *flags = NULL;
+  
+***************
+*** 1292,1301 ****
+   *
+   * print help
+   */
+- /* ARGSUSED */
+      static int
+  cs_help(eap)
+!     exarg_T *eap;
+  {
+      cscmd_T *cmdp = cs_cmds;
+  
+--- 1290,1298 ----
+   *
+   * print help
+   */
+      static int
+  cs_help(eap)
+!     exarg_T *eap UNUSED;
+  {
+      cscmd_T *cmdp = cs_cmds;
+  
+***************
+*** 1399,1411 ****
+   *
+   * insert a new cscope database filename into the filelist
+   */
+- /*ARGSUSED*/
+      static int
+  cs_insert_filelist(fname, ppath, flags, sb)
+      char *fname;
+      char *ppath;
+      char *flags;
+!     struct stat *sb;
+  {
+      short	i, j;
+  #ifndef UNIX
+--- 1396,1407 ----
+   *
+   * insert a new cscope database filename into the filelist
+   */
+      static int
+  cs_insert_filelist(fname, ppath, flags, sb)
+      char *fname;
+      char *ppath;
+      char *flags;
+!     struct stat *sb UNUSED;
+  {
+      short	i, j;
+  #ifndef UNIX
+***************
+*** 1561,1570 ****
+   *
+   * nuke em
+   */
+- /* ARGSUSED */
+      static int
+  cs_kill(eap)
+!     exarg_T *eap;
+  {
+      char *stok;
+      short i;
+--- 1557,1565 ----
+   *
+   * nuke em
+   */
+      static int
+  cs_kill(eap)
+!     exarg_T *eap UNUSED;
+  {
+      char *stok;
+      short i;
+***************
+*** 2241,2247 ****
+  /*
+   * Used to catch and ignore SIGALRM below.
+   */
+- /* ARGSUSED */
+      static RETSIGTYPE
+  sig_handler SIGDEFARG(sigarg)
+  {
+--- 2236,2241 ----
+***************
+*** 2381,2390 ****
+   *
+   * calls cs_kill on all cscope connections then reinits
+   */
+- /* ARGSUSED */
+      static int
+  cs_reset(eap)
+!     exarg_T *eap;
+  {
+      char	**dblist = NULL, **pplist = NULL, **fllist = NULL;
+      int	i;
+--- 2375,2383 ----
+   *
+   * calls cs_kill on all cscope connections then reinits
+   */
+      static int
+  cs_reset(eap)
+!     exarg_T *eap UNUSED;
+  {
+      char	**dblist = NULL, **pplist = NULL, **fllist = NULL;
+      int	i;
+***************
+*** 2497,2506 ****
+   *
+   * show all cscope connections
+   */
+- /* ARGSUSED */
+      static int
+  cs_show(eap)
+!     exarg_T *eap;
+  {
+      short i;
+      if (cs_cnt_connections() == 0)
+--- 2490,2498 ----
+   *
+   * show all cscope connections
+   */
+      static int
+  cs_show(eap)
+!     exarg_T *eap UNUSED;
+  {
+      short i;
+      if (cs_cnt_connections() == 0)
+*** ../vim-7.2.176/src/if_xcmdsrv.c	2008-11-12 14:52:11.000000000 +0100
+--- src/if_xcmdsrv.c	2009-05-16 17:12:32.000000000 +0200
+***************
+*** 682,688 ****
+       * Scan all of the names out of the property.
+       */
+      ga_init2(&ga, 1, 100);
+!     for (p = regProp; (p - regProp) < numItems; p++)
+      {
+  	entry = p;
+  	while (*p != 0 && !isspace(*p))
+--- 682,688 ----
+       * Scan all of the names out of the property.
+       */
+      ga_init2(&ga, 1, 100);
+!     for (p = regProp; (long_u)(p - regProp) < numItems; p++)
+      {
+  	entry = p;
+  	while (*p != 0 && !isspace(*p))
+***************
+*** 969,975 ****
+       */
+      returnValue = (int_u)None;
+      entry = NULL;	/* Not needed, but eliminates compiler warning. */
+!     for (p = regProp; (p - regProp) < numItems; )
+      {
+  	entry = p;
+  	while (*p != 0 && !isspace(*p))
+--- 969,975 ----
+       */
+      returnValue = (int_u)None;
+      entry = NULL;	/* Not needed, but eliminates compiler warning. */
+!     for (p = regProp; (long_u)(p - regProp) < numItems; )
+      {
+  	entry = p;
+  	while (*p != 0 && !isspace(*p))
+***************
+*** 986,992 ****
+  
+      if (loose != NULL && returnValue == (int_u)None && !IsSerialName(name))
+      {
+! 	for (p = regProp; (p - regProp) < numItems; )
+  	{
+  	    entry = p;
+  	    while (*p != 0 && !isspace(*p))
+--- 986,992 ----
+  
+      if (loose != NULL && returnValue == (int_u)None && !IsSerialName(name))
+      {
+! 	for (p = regProp; (long_u)(p - regProp) < numItems; )
+  	{
+  	    entry = p;
+  	    while (*p != 0 && !isspace(*p))
+***************
+*** 1056,1062 ****
+  	return;
+  
+      /* Scan the property for the window id.  */
+!     for (p = regProp; (p - regProp) < numItems; )
+      {
+  	if (*p != 0)
+  	{
+--- 1056,1062 ----
+  	return;
+  
+      /* Scan the property for the window id.  */
+!     for (p = regProp; (long_u)(p - regProp) < numItems; )
+      {
+  	if (*p != 0)
+  	{
+***************
+*** 1196,1202 ****
+       * one time;  each iteration through the outer loop handles a
+       * single command or result.
+       */
+!     for (p = propInfo; (p - propInfo) < numItems; )
+      {
+  	/*
+  	 * Ignore leading NULs; each command or result starts with a
+--- 1196,1202 ----
+       * one time;  each iteration through the outer loop handles a
+       * single command or result.
+       */
+!     for (p = propInfo; (long_u)(p - propInfo) < numItems; )
+      {
+  	/*
+  	 * Ignore leading NULs; each command or result starts with a
+***************
+*** 1230,1236 ****
+  	    serial = (char_u *)"";
+  	    script = NULL;
+  	    enc = NULL;
+! 	    while (p - propInfo < numItems && *p == '-')
+  	    {
+  		switch (p[1])
+  		{
+--- 1230,1236 ----
+  	    serial = (char_u *)"";
+  	    script = NULL;
+  	    enc = NULL;
+! 	    while ((long_u)(p - propInfo) < numItems && *p == '-')
+  	    {
+  		switch (p[1])
+  		{
+***************
+*** 1333,1339 ****
+  	    res = (char_u *)"";
+  	    code = 0;
+  	    enc = NULL;
+! 	    while ((p-propInfo) < numItems && *p == '-')
+  	    {
+  		switch (p[1])
+  		{
+--- 1333,1339 ----
+  	    res = (char_u *)"";
+  	    code = 0;
+  	    enc = NULL;
+! 	    while ((long_u)(p - propInfo) < numItems && *p == '-')
+  	    {
+  		switch (p[1])
+  		{
+***************
+*** 1401,1407 ****
+  	    gotWindow = 0;
+  	    str = (char_u *)"";
+  	    enc = NULL;
+! 	    while ((p-propInfo) < numItems && *p == '-')
+  	    {
+  		switch (p[1])
+  		{
+--- 1401,1407 ----
+  	    gotWindow = 0;
+  	    str = (char_u *)"";
+  	    enc = NULL;
+! 	    while ((long_u)(p - propInfo) < numItems && *p == '-')
+  	    {
+  		switch (p[1])
+  		{
+***************
+*** 1489,1499 ****
+  /*
+   * Another X Error handler, just used to check for errors.
+   */
+- /* ARGSUSED */
+      static int
+  x_error_check(dpy, error_event)
+!     Display	*dpy;
+!     XErrorEvent	*error_event;
+  {
+      got_x_error = TRUE;
+      return 0;
+--- 1489,1498 ----
+  /*
+   * Another X Error handler, just used to check for errors.
+   */
+      static int
+  x_error_check(dpy, error_event)
+!     Display	*dpy UNUSED;
+!     XErrorEvent	*error_event UNUSED;
+  {
+      got_x_error = TRUE;
+      return 0;
+*** ../vim-7.2.176/src/farsi.c	2008-06-25 00:25:17.000000000 +0200
+--- src/farsi.c	2009-05-16 17:14:41.000000000 +0200
+***************
+*** 103,109 ****
+  	case F_HE:
+  		tempc = _HE;
+  
+! 		if (p_ri && (curwin->w_cursor.col+1 < STRLEN(ml_get_curline())))
+  		{
+  		    inc_cursor();
+  
+--- 103,110 ----
+  	case F_HE:
+  		tempc = _HE;
+  
+! 		if (p_ri && (curwin->w_cursor.col + 1
+! 					 < (colnr_T)STRLEN(ml_get_curline())))
+  		{
+  		    inc_cursor();
+  
+***************
+*** 344,350 ****
+      if (curwin->w_p_rl && p_ri)
+  	return;
+  
+!     if ( (curwin->w_cursor.col < STRLEN(ml_get_curline())))
+      {
+  	if ((p_ri && curwin->w_cursor.col) || !p_ri)
+  	{
+--- 345,351 ----
+      if (curwin->w_p_rl && p_ri)
+  	return;
+  
+!     if ((curwin->w_cursor.col < (colnr_T)STRLEN(ml_get_curline())))
+      {
+  	if ((p_ri && curwin->w_cursor.col) || !p_ri)
+  	{
+***************
+*** 565,571 ****
+  
+      tempc = gchar_cursor();
+  
+!     if (curwin->w_cursor.col+1 < STRLEN(ml_get_curline()))
+      {
+  	inc_cursor();
+  
+--- 566,572 ----
+  
+      tempc = gchar_cursor();
+  
+!     if (curwin->w_cursor.col + 1 < (colnr_T)STRLEN(ml_get_curline()))
+      {
+  	inc_cursor();
+  
+***************
+*** 594,601 ****
+  {
+      int	tempc;
+  
+!     if (!curwin->w_cursor.col &&
+! 	(curwin->w_cursor.col+1 == STRLEN(ml_get_curline())))
+  	return;
+  
+      if (!curwin->w_cursor.col && p_ri)
+--- 595,602 ----
+  {
+      int	tempc;
+  
+!     if (curwin->w_cursor.col != 0 &&
+! 	(curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline())))
+  	return;
+  
+      if (!curwin->w_cursor.col && p_ri)
+***************
+*** 663,670 ****
+  {
+      int	tempc;
+  
+!     if (!curwin->w_cursor.col &&
+! 	(curwin->w_cursor.col+1 == STRLEN(ml_get_curline())))
+  	return;
+  
+      if (!curwin->w_cursor.col && p_ri)
+--- 664,671 ----
+  {
+      int	tempc;
+  
+!     if (curwin->w_cursor.col != 0 &&
+! 	(curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline())))
+  	return;
+  
+      if (!curwin->w_cursor.col && p_ri)
+*** ../vim-7.2.176/src/mark.c	2009-04-29 11:00:09.000000000 +0200
+--- src/mark.c	2009-05-16 17:14:56.000000000 +0200
+***************
+*** 884,893 ****
+  /*
+   * print the jumplist
+   */
+- /*ARGSUSED*/
+      void
+  ex_jumps(eap)
+!     exarg_T	*eap;
+  {
+      int		i;
+      char_u	*name;
+--- 884,892 ----
+  /*
+   * print the jumplist
+   */
+      void
+  ex_jumps(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      int		i;
+      char_u	*name;
+***************
+*** 933,942 ****
+  /*
+   * print the changelist
+   */
+- /*ARGSUSED*/
+      void
+  ex_changes(eap)
+!     exarg_T	*eap;
+  {
+      int		i;
+      char_u	*name;
+--- 932,940 ----
+  /*
+   * print the changelist
+   */
+      void
+  ex_changes(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      int		i;
+      char_u	*name;
+*** ../vim-7.2.176/src/menu.c	2008-08-17 23:43:53.000000000 +0200
+--- src/menu.c	2009-05-16 17:19:57.000000000 +0200
+***************
+*** 231,237 ****
+  		if (skipdigits(menu_path + 7) == p)
+  		{
+  		    menuarg.iconidx = atoi((char *)menu_path + 7);
+! 		    if (menuarg.iconidx >= TOOLBAR_NAME_COUNT)
+  			menuarg.iconidx = -1;
+  		    else
+  			menuarg.icon_builtin = TRUE;
+--- 231,237 ----
+  		if (skipdigits(menu_path + 7) == p)
+  		{
+  		    menuarg.iconidx = atoi((char *)menu_path + 7);
+! 		    if (menuarg.iconidx >= (int)TOOLBAR_NAME_COUNT)
+  			menuarg.iconidx = -1;
+  		    else
+  			menuarg.icon_builtin = TRUE;
+***************
+*** 239,245 ****
+  	    }
+  	    else
+  	    {
+! 		for (i = 0; i < TOOLBAR_NAME_COUNT; ++i)
+  		    if (STRNCMP(toolbar_names[i], menu_path, p - menu_path)
+  									 == 0)
+  		    {
+--- 239,245 ----
+  	    }
+  	    else
+  	    {
+! 		for (i = 0; i < (int)TOOLBAR_NAME_COUNT; ++i)
+  		    if (STRNCMP(toolbar_names[i], menu_path, p - menu_path)
+  									 == 0)
+  		    {
+***************
+*** 1341,1350 ****
+   * Function given to ExpandGeneric() to obtain the list of (sub)menus (not
+   * entries).
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_menu_name(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      static vimmenu_T	*menu = NULL;
+--- 1341,1349 ----
+   * Function given to ExpandGeneric() to obtain the list of (sub)menus (not
+   * entries).
+   */
+      char_u *
+  get_menu_name(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      static vimmenu_T	*menu = NULL;
+***************
+*** 1378,1387 ****
+   * Function given to ExpandGeneric() to obtain the list of menus and menu
+   * entries.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_menu_names(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      static vimmenu_T	*menu = NULL;
+--- 1377,1385 ----
+   * Function given to ExpandGeneric() to obtain the list of menus and menu
+   * entries.
+   */
+      char_u *
+  get_menu_names(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      static vimmenu_T	*menu = NULL;
+***************
+*** 1739,1748 ****
+  /*
+   * Return TRUE if the menu is the tearoff menu.
+   */
+- /*ARGSUSED*/
+      static int
+  menu_is_tearoff(name)
+!     char_u *name;
+  {
+  #ifdef FEAT_GUI
+      return (STRCMP(name, TEAR_STRING) == 0);
+--- 1737,1745 ----
+  /*
+   * Return TRUE if the menu is the tearoff menu.
+   */
+      static int
+  menu_is_tearoff(name)
+!     char_u *name UNUSED;
+  {
+  #ifdef FEAT_GUI
+      return (STRCMP(name, TEAR_STRING) == 0);
+*** ../vim-7.2.176/src/version.c	2009-05-16 16:36:25.000000000 +0200
+--- src/version.c	2009-05-16 17:22:08.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     177,
+  /**/
+
+-- 
+(letter from Mark to Mike, about the film's probable certificate)
+      For an 'A' we would have to: Lose as many shits as possible; Take Jesus
+      Christ out, if possible; Loose "I fart in your general direction"; Lose
+      "the oral sex"; Lose "oh, fuck off"; Lose "We make castanets out of your
+      testicles"
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.178 b/source/ap/vim/patches/7.2.178
new file mode 100644
index 000000000..84fe670f0
--- /dev/null
+++ b/source/ap/vim/patches/7.2.178
@@ -0,0 +1,150 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.178
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.178
+Problem:    Using negative value for device number might not work.
+Solution:   Use a separate flag for whether ffv_dev was set.
+Files:	    src/misc2.c
+
+
+*** ../vim-7.2.177/src/misc2.c	2009-04-29 11:00:09.000000000 +0200
+--- src/misc2.c	2009-05-16 21:05:10.000000000 +0200
+***************
+*** 2841,2847 ****
+  get_key_name(i)
+      int	    i;
+  {
+!     if (i >= KEY_NAMES_TABLE_LEN)
+  	return NULL;
+      return  key_names_table[i].name;
+  }
+--- 2841,2847 ----
+  get_key_name(i)
+      int	    i;
+  {
+!     if (i >= (int)KEY_NAMES_TABLE_LEN)
+  	return NULL;
+      return  key_names_table[i].name;
+  }
+***************
+*** 3869,3875 ****
+       * use filename.
+       */
+  #ifdef UNIX
+!     int			ffv_dev;	/* device number (-1 if not set) */
+      ino_t		ffv_ino;	/* inode number */
+  #endif
+      /* The memory for this struct is allocated according to the length of
+--- 3869,3876 ----
+       * use filename.
+       */
+  #ifdef UNIX
+!     int			ffv_dev_valid;	/* ffv_dev and ffv_ino were set */
+!     dev_t		ffv_dev;	/* device number */
+      ino_t		ffv_ino;	/* inode number */
+  #endif
+      /* The memory for this struct is allocated according to the length of
+***************
+*** 4059,4071 ****
+   * This function silently ignores a few errors, vim_findfile() will have
+   * limited functionality then.
+   */
+- /*ARGSUSED*/
+      void *
+  vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
+  					   search_ctx_arg, tagfile, rel_fname)
+      char_u	*path;
+      char_u	*filename;
+!     char_u	*stopdirs;
+      int		level;
+      int		free_visited;
+      int		find_what;
+--- 4060,4071 ----
+   * This function silently ignores a few errors, vim_findfile() will have
+   * limited functionality then.
+   */
+      void *
+  vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
+  					   search_ctx_arg, tagfile, rel_fname)
+      char_u	*path;
+      char_u	*filename;
+!     char_u	*stopdirs UNUSED;
+      int		level;
+      int		free_visited;
+      int		find_what;
+***************
+*** 5063,5072 ****
+      {
+  	if (
+  #ifdef UNIX
+! 		!url
+! 		    ? (vp->ffv_dev == st.st_dev
+! 			&& vp->ffv_ino == st.st_ino)
+! 		    :
+  #endif
+  		fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0
+  	   )
+--- 5063,5071 ----
+      {
+  	if (
+  #ifdef UNIX
+! 		!url ? (vp->ffv_dev_valid && vp->ffv_dev == st.st_dev
+! 						  && vp->ffv_ino == st.st_ino)
+! 		     :
+  #endif
+  		fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0
+  	   )
+***************
+*** 5091,5104 ****
+  #ifdef UNIX
+  	if (!url)
+  	{
+  	    vp->ffv_ino = st.st_ino;
+  	    vp->ffv_dev = st.st_dev;
+  	    vp->ffv_fname[0] = NUL;
+  	}
+  	else
+  	{
+! 	    vp->ffv_ino = 0;
+! 	    vp->ffv_dev = -1;
+  #endif
+  	    STRCPY(vp->ffv_fname, ff_expand_buffer);
+  #ifdef UNIX
+--- 5090,5103 ----
+  #ifdef UNIX
+  	if (!url)
+  	{
++ 	    vp->ffv_dev_valid = TRUE;
+  	    vp->ffv_ino = st.st_ino;
+  	    vp->ffv_dev = st.st_dev;
+  	    vp->ffv_fname[0] = NUL;
+  	}
+  	else
+  	{
+! 	    vp->ffv_dev_valid = FALSE;
+  #endif
+  	    STRCPY(vp->ffv_fname, ff_expand_buffer);
+  #ifdef UNIX
+*** ../vim-7.2.177/src/version.c	2009-05-16 17:29:37.000000000 +0200
+--- src/version.c	2009-05-16 21:00:15.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     178,
+  /**/
+
+-- 
+FATAL ERROR! SYSTEM HALTED! - Press any key to continue doing nothing.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.179 b/source/ap/vim/patches/7.2.179
new file mode 100644
index 000000000..97f94ed16
--- /dev/null
+++ b/source/ap/vim/patches/7.2.179
@@ -0,0 +1,100 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.179
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.179
+Problem:    Using negative value for device number might not work.
+Solution:   Use a separate flag for whether sn_dev was set.
+Files:	    src/ex_cmds2.c
+
+
+*** ../vim-7.2.178/src/ex_cmds2.c	2009-05-14 22:19:19.000000000 +0200
+--- src/ex_cmds2.c	2009-05-16 21:13:29.000000000 +0200
+***************
+*** 28,34 ****
+  {
+      char_u	*sn_name;
+  # ifdef UNIX
+!     int		sn_dev;
+      ino_t	sn_ino;
+  # endif
+  # ifdef FEAT_PROFILE
+--- 28,35 ----
+  {
+      char_u	*sn_name;
+  # ifdef UNIX
+!     int		sn_dev_valid;
+!     dev_t	sn_dev;
+      ino_t	sn_ino;
+  # endif
+  # ifdef FEAT_PROFILE
+***************
+*** 3049,3055 ****
+  		    /* Compare dev/ino when possible, it catches symbolic
+  		     * links.  Also compare file names, the inode may change
+  		     * when the file was edited. */
+! 		    ((stat_ok && si->sn_dev != -1)
+  			&& (si->sn_dev == st.st_dev
+  			    && si->sn_ino == st.st_ino)) ||
+  # endif
+--- 3050,3056 ----
+  		    /* Compare dev/ino when possible, it catches symbolic
+  		     * links.  Also compare file names, the inode may change
+  		     * when the file was edited. */
+! 		    ((stat_ok && si->sn_dev_valid)
+  			&& (si->sn_dev == st.st_dev
+  			    && si->sn_ino == st.st_ino)) ||
+  # endif
+***************
+*** 3076,3086 ****
+  # ifdef UNIX
+  	if (stat_ok)
+  	{
+  	    si->sn_dev = st.st_dev;
+  	    si->sn_ino = st.st_ino;
+  	}
+  	else
+! 	    si->sn_dev = -1;
+  # endif
+  
+  	/* Allocate the local script variables to use for this script. */
+--- 3077,3088 ----
+  # ifdef UNIX
+  	if (stat_ok)
+  	{
++ 	    si->sn_dev_valid = TRUE;
+  	    si->sn_dev = st.st_dev;
+  	    si->sn_ino = st.st_ino;
+  	}
+  	else
+! 	    si->sn_dev_valid = FALSE;
+  # endif
+  
+  	/* Allocate the local script variables to use for this script. */
+*** ../vim-7.2.178/src/version.c	2009-05-16 21:06:36.000000000 +0200
+--- src/version.c	2009-05-16 21:15:08.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     179,
+  /**/
+
+-- 
+(letter from Mark to Mike, about the film's probable certificate)
+      I would like to get back to the Censor and agree to lose the shits, take
+      the odd Jesus Christ out and lose Oh fuck off, but to retain 'fart in
+      your general direction', 'castanets of your testicles' and 'oral sex'
+      and ask him for an 'A' rating on that basis.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.180 b/source/ap/vim/patches/7.2.180
new file mode 100644
index 000000000..f3f3a9ed8
--- /dev/null
+++ b/source/ap/vim/patches/7.2.180
@@ -0,0 +1,6520 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.180
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.180
+Problem:    Some more compiler warnings when using gcc -Wextra.
+Solution:   Add UNUSED and type casts.
+Files:	    src/buffer.c, src/ex_cmds.c, src/macros.h, src/main.c,
+	    src/menu.c, src/message.c, src/misc1.c, src/mbyte.c,
+	    src/normal.c, src/option.c, src/os_unix.c, src/quickfix.c,
+	    src/screen.c, src/search.c, src/spell.c, src/syntax.c, src/tag.c,
+	    src/term.c, src/ui.c
+
+
+*** ../vim-7.2.179/src/buffer.c	2009-05-14 22:19:19.000000000 +0200
+--- src/buffer.c	2009-05-16 22:21:41.000000000 +0200
+***************
+*** 2025,2037 ****
+   * Return fnum of the found buffer.
+   * Return < 0 for error.
+   */
+- /*ARGSUSED*/
+      int
+  buflist_findpat(pattern, pattern_end, unlisted, diffmode)
+      char_u	*pattern;
+      char_u	*pattern_end;	/* pointer to first char after pattern */
+      int		unlisted;	/* find unlisted buffers */
+!     int		diffmode;	/* find diff-mode buffers only */
+  {
+      buf_T	*buf;
+      regprog_T	*prog;
+--- 2025,2036 ----
+   * Return fnum of the found buffer.
+   * Return < 0 for error.
+   */
+      int
+  buflist_findpat(pattern, pattern_end, unlisted, diffmode)
+      char_u	*pattern;
+      char_u	*pattern_end;	/* pointer to first char after pattern */
+      int		unlisted;	/* find unlisted buffers */
+!     int		diffmode UNUSED; /* find diff-mode buffers only */
+  {
+      buf_T	*buf;
+      regprog_T	*prog;
+***************
+*** 2539,2545 ****
+  /*
+   * List all know file names (for :files and :buffers command).
+   */
+- /*ARGSUSED*/
+      void
+  buflist_list(eap)
+      exarg_T	*eap;
+--- 2538,2543 ----
+***************
+*** 3346,3359 ****
+   * If maxwidth is not zero, the string will be filled at any middle marker
+   * or truncated if too long, fillchar is used for all whitespace.
+   */
+- /*ARGSUSED*/
+      int
+  build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab)
+      win_T	*wp;
+      char_u	*out;		/* buffer to write into != NameBuff */
+      size_t	outlen;		/* length of out[] */
+      char_u	*fmt;
+!     int		use_sandbox;	/* "fmt" was set insecurely, use sandbox */
+      int		fillchar;
+      int		maxwidth;
+      struct stl_hlrec *hltab;	/* return: HL attributes (can be NULL) */
+--- 3344,3356 ----
+   * If maxwidth is not zero, the string will be filled at any middle marker
+   * or truncated if too long, fillchar is used for all whitespace.
+   */
+      int
+  build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab)
+      win_T	*wp;
+      char_u	*out;		/* buffer to write into != NameBuff */
+      size_t	outlen;		/* length of out[] */
+      char_u	*fmt;
+!     int		use_sandbox UNUSED; /* "fmt" was set insecurely, use sandbox */
+      int		fillchar;
+      int		maxwidth;
+      struct stl_hlrec *hltab;	/* return: HL attributes (can be NULL) */
+*** ../vim-7.2.179/src/ex_cmds.c	2009-05-16 16:36:25.000000000 +0200
+--- src/ex_cmds.c	2009-05-16 22:22:46.000000000 +0200
+***************
+*** 2255,2266 ****
+   *
+   * Return the string in allocated memory (NULL when out of memory).
+   */
+- /*ARGSUSED*/
+      char_u *
+  viminfo_readstring(virp, off, convert)
+      vir_T	*virp;
+      int		off;		    /* offset for virp->vir_line */
+!     int		convert;	    /* convert the string */
+  {
+      char_u	*retval;
+      char_u	*s, *d;
+--- 2255,2265 ----
+   *
+   * Return the string in allocated memory (NULL when out of memory).
+   */
+      char_u *
+  viminfo_readstring(virp, off, convert)
+      vir_T	*virp;
+      int		off;		    /* offset for virp->vir_line */
+!     int		convert UNUSED;	    /* convert the string */
+  {
+      char_u	*retval;
+      char_u	*s, *d;
+***************
+*** 2736,2742 ****
+   * May set eap->forceit if a dialog says it's OK to overwrite.
+   * Return OK if it's OK, FAIL if it is not.
+   */
+- /*ARGSUSED*/
+      static int
+  check_overwrite(eap, buf, fname, ffname, other)
+      exarg_T	*eap;
+--- 2735,2740 ----
+*** ../vim-7.2.179/src/macros.h	2009-02-21 20:27:00.000000000 +0100
+--- src/macros.h	2009-05-16 21:52:56.000000000 +0200
+***************
+*** 284,290 ****
+  # define mb_cptr2len(p)	    (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
+  
+  # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++
+! # define MB_CHARLEN(p)	    (has_mbyte ? mb_charlen(p) : STRLEN(p))
+  # define PTR2CHAR(p)	    (has_mbyte ? mb_ptr2char(p) : (int)*(p))
+  #else
+  # define mb_ptr_adv(p)		++p
+--- 284,290 ----
+  # define mb_cptr2len(p)	    (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
+  
+  # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++
+! # define MB_CHARLEN(p)	    (has_mbyte ? mb_charlen(p) : (int)STRLEN(p))
+  # define PTR2CHAR(p)	    (has_mbyte ? mb_ptr2char(p) : (int)*(p))
+  #else
+  # define mb_ptr_adv(p)		++p
+*** ../vim-7.2.179/src/main.c	2008-11-28 21:26:50.000000000 +0100
+--- src/main.c	2009-05-16 22:25:59.000000000 +0200
+***************
+*** 1505,1514 ****
+   *
+   * Also find the --server... arguments and --socketid and --windowid
+   */
+- /*ARGSUSED*/
+      static void
+  early_arg_scan(parmp)
+!     mparm_T	*parmp;
+  {
+  #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
+  	|| !defined(FEAT_NETBEANS_INTG)
+--- 1505,1513 ----
+   *
+   * Also find the --server... arguments and --socketid and --windowid
+   */
+      static void
+  early_arg_scan(parmp)
+!     mparm_T	*parmp UNUSED;
+  {
+  #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
+  	|| !defined(FEAT_NETBEANS_INTG)
+***************
+*** 2380,2389 ****
+   * Create the requested number of windows and edit buffers in them.
+   * Also does recovery if "recoverymode" set.
+   */
+- /*ARGSUSED*/
+      static void
+  create_windows(parmp)
+!     mparm_T	*parmp;
+  {
+  #ifdef FEAT_WINDOWS
+      int		dorewind;
+--- 2379,2387 ----
+   * Create the requested number of windows and edit buffers in them.
+   * Also does recovery if "recoverymode" set.
+   */
+      static void
+  create_windows(parmp)
+!     mparm_T	*parmp UNUSED;
+  {
+  #ifdef FEAT_WINDOWS
+      int		dorewind;
+***************
+*** 3851,3860 ****
+   * return an allocated string.  Otherwise return "data".
+   * "*tofree" is set to the result when it needs to be freed later.
+   */
+- /*ARGSUSED*/
+      char_u *
+  serverConvert(client_enc, data, tofree)
+!     char_u *client_enc;
+      char_u *data;
+      char_u **tofree;
+  {
+--- 3849,3857 ----
+   * return an allocated string.  Otherwise return "data".
+   * "*tofree" is set to the result when it needs to be freed later.
+   */
+      char_u *
+  serverConvert(client_enc, data, tofree)
+!     char_u *client_enc UNUSED;
+      char_u *data;
+      char_u **tofree;
+  {
+*** ../vim-7.2.179/src/menu.c	2009-05-16 17:29:37.000000000 +0200
+--- src/menu.c	2009-05-16 22:29:31.000000000 +0200
+***************
+*** 2340,2349 ****
+   * This function is also defined without the +multi_lang feature, in which
+   * case the commands are ignored.
+   */
+- /*ARGSUSED*/
+      void
+  ex_menutranslate(eap)
+!     exarg_T	*eap;
+  {
+  #ifdef FEAT_MULTI_LANG
+      char_u		*arg = eap->arg;
+--- 2340,2348 ----
+   * This function is also defined without the +multi_lang feature, in which
+   * case the commands are ignored.
+   */
+      void
+  ex_menutranslate(eap)
+!     exarg_T	*eap UNUSED;
+  {
+  #ifdef FEAT_MULTI_LANG
+      char_u		*arg = eap->arg;
+*** ../vim-7.2.179/src/message.c	2009-04-22 14:42:26.000000000 +0200
+--- src/message.c	2009-05-16 22:30:47.000000000 +0200
+***************
+*** 818,827 ****
+  /*
+   * ":messages" command.
+   */
+- /*ARGSUSED*/
+      void
+  ex_messages(eap)
+!     exarg_T	*eap;
+  {
+      struct msg_hist *p;
+      char_u	    *s;
+--- 818,826 ----
+  /*
+   * ":messages" command.
+   */
+      void
+  ex_messages(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      struct msg_hist *p;
+      char_u	    *s;
+***************
+*** 3290,3304 ****
+   * A '&' in a button name becomes a shortcut, so each '&' should be before a
+   * different letter.
+   */
+- /* ARGSUSED */
+      int
+  do_dialog(type, title, message, buttons, dfltbutton, textfield)
+!     int		type;
+!     char_u	*title;
+      char_u	*message;
+      char_u	*buttons;
+      int		dfltbutton;
+!     char_u	*textfield;	/* IObuff for inputdialog(), NULL otherwise */
+  {
+      int		oldState;
+      int		retval = 0;
+--- 3289,3303 ----
+   * A '&' in a button name becomes a shortcut, so each '&' should be before a
+   * different letter.
+   */
+      int
+  do_dialog(type, title, message, buttons, dfltbutton, textfield)
+!     int		type UNUSED;
+!     char_u	*title UNUSED;
+      char_u	*message;
+      char_u	*buttons;
+      int		dfltbutton;
+!     char_u	*textfield UNUSED;	/* IObuff for inputdialog(), NULL
+! 					   otherwise */
+  {
+      int		oldState;
+      int		retval = 0;
+***************
+*** 4021,4027 ****
+  	if (*p != '%')
+  	{
+  	    char    *q = strchr(p + 1, '%');
+! 	    size_t  n = (q == NULL) ? STRLEN(p) : (q - p);
+  
+  	    /* Copy up to the next '%' or NUL without any changes. */
+  	    if (str_l < str_m)
+--- 4020,4026 ----
+  	if (*p != '%')
+  	{
+  	    char    *q = strchr(p + 1, '%');
+! 	    size_t  n = (q == NULL) ? STRLEN(p) : (size_t)(q - p);
+  
+  	    /* Copy up to the next '%' or NUL without any changes. */
+  	    if (str_l < str_m)
+***************
+*** 4268,4274 ****
+  				  precision <= (size_t)0x7fffffffL ? precision
+  						       : (size_t)0x7fffffffL);
+  #endif
+! 			str_arg_l = (q == NULL) ? precision : q - str_arg;
+  		    }
+  		    break;
+  
+--- 4267,4274 ----
+  				  precision <= (size_t)0x7fffffffL ? precision
+  						       : (size_t)0x7fffffffL);
+  #endif
+! 			str_arg_l = (q == NULL) ? precision
+! 						      : (size_t)(q - str_arg);
+  		    }
+  		    break;
+  
+***************
+*** 4368,4374 ****
+  					    get_a_arg(arg_idx);
+  #else
+  # if defined(FEAT_EVAL)
+! 					    tvs != NULL ? tv_nr(tvs, &arg_idx) :
+  # endif
+  						va_arg(ap, unsigned int);
+  #endif
+--- 4368,4375 ----
+  					    get_a_arg(arg_idx);
+  #else
+  # if defined(FEAT_EVAL)
+! 					    tvs != NULL ? (unsigned)
+! 							tv_nr(tvs, &arg_idx) :
+  # endif
+  						va_arg(ap, unsigned int);
+  #endif
+***************
+*** 4381,4387 ****
+  					    get_a_arg(arg_idx);
+  #else
+  # if defined(FEAT_EVAL)
+! 					    tvs != NULL ? tv_nr(tvs, &arg_idx) :
+  # endif
+  						va_arg(ap, unsigned long int);
+  #endif
+--- 4382,4389 ----
+  					    get_a_arg(arg_idx);
+  #else
+  # if defined(FEAT_EVAL)
+! 					    tvs != NULL ? (unsigned long)
+! 							tv_nr(tvs, &arg_idx) :
+  # endif
+  						va_arg(ap, unsigned long int);
+  #endif
+***************
+*** 4704,4710 ****
+  			size_t avail = str_m - str_l;
+  
+  			vim_memset(str + str_l, zero_padding ? '0' : ' ',
+! 					     (size_t)pn > avail ? avail : pn);
+  		    }
+  		    str_l += pn;
+  		}
+--- 4706,4713 ----
+  			size_t avail = str_m - str_l;
+  
+  			vim_memset(str + str_l, zero_padding ? '0' : ' ',
+! 					     (size_t)pn > avail ? avail
+! 								: (size_t)pn);
+  		    }
+  		    str_l += pn;
+  		}
+***************
+*** 4731,4737 ****
+  			size_t avail = str_m - str_l;
+  
+  			mch_memmove(str + str_l, str_arg,
+! 					     (size_t)zn > avail ? avail : zn);
+  		    }
+  		    str_l += zn;
+  		}
+--- 4734,4741 ----
+  			size_t avail = str_m - str_l;
+  
+  			mch_memmove(str + str_l, str_arg,
+! 					     (size_t)zn > avail ? avail
+! 								: (size_t)zn);
+  		    }
+  		    str_l += zn;
+  		}
+***************
+*** 4746,4752 ****
+  			size_t avail = str_m-str_l;
+  
+  			vim_memset(str + str_l, '0',
+! 					     (size_t)zn > avail ? avail : zn);
+  		    }
+  		    str_l += zn;
+  		}
+--- 4750,4757 ----
+  			size_t avail = str_m-str_l;
+  
+  			vim_memset(str + str_l, '0',
+! 					     (size_t)zn > avail ? avail
+! 								: (size_t)zn);
+  		    }
+  		    str_l += zn;
+  		}
+***************
+*** 4765,4771 ****
+  
+  			mch_memmove(str + str_l,
+  				str_arg + zero_padding_insertion_ind,
+! 				(size_t)sn > avail ? avail : sn);
+  		    }
+  		    str_l += sn;
+  		}
+--- 4770,4776 ----
+  
+  			mch_memmove(str + str_l,
+  				str_arg + zero_padding_insertion_ind,
+! 				(size_t)sn > avail ? avail : (size_t)sn);
+  		    }
+  		    str_l += sn;
+  		}
+***************
+*** 4785,4791 ****
+  			size_t avail = str_m - str_l;
+  
+  			vim_memset(str + str_l, ' ',
+! 					     (size_t)pn > avail ? avail : pn);
+  		    }
+  		    str_l += pn;
+  		}
+--- 4790,4797 ----
+  			size_t avail = str_m - str_l;
+  
+  			vim_memset(str + str_l, ' ',
+! 					     (size_t)pn > avail ? avail
+! 								: (size_t)pn);
+  		    }
+  		    str_l += pn;
+  		}
+*** ../vim-7.2.179/src/misc1.c	2009-05-15 21:31:11.000000000 +0200
+--- src/misc1.c	2009-05-16 21:25:34.000000000 +0200
+***************
+*** 4147,4156 ****
+  /*
+   * Function given to ExpandGeneric() to obtain an environment variable name.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_env_name(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+  # if defined(AMIGA) || defined(__MRC__) || defined(__SC__)
+--- 4147,4155 ----
+  /*
+   * Function given to ExpandGeneric() to obtain an environment variable name.
+   */
+      char_u *
+  get_env_name(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+  # if defined(AMIGA) || defined(__MRC__) || defined(__SC__)
+***************
+*** 4742,4750 ****
+  	 * If it is then restrict the search to below this line and try again.
+  	 */
+  	line = ml_get(pos->lnum);
+! 	for (p = line; *p && (unsigned)(p - line) < pos->col; ++p)
+  	    p = skip_string(p);
+! 	if ((unsigned)(p - line) <= pos->col)
+  	    break;
+  	cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1;
+  	if (cur_maxcomment <= 0)
+--- 4741,4749 ----
+  	 * If it is then restrict the search to below this line and try again.
+  	 */
+  	line = ml_get(pos->lnum);
+! 	for (p = line; *p && (colnr_T)(p - line) < pos->col; ++p)
+  	    p = skip_string(p);
+! 	if ((colnr_T)(p - line) <= pos->col)
+  	    break;
+  	cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1;
+  	if (cur_maxcomment <= 0)
+***************
+*** 6275,6281 ****
+       * check for that.
+       */
+      if ((State & INSERT)
+! 	    && curwin->w_cursor.col < STRLEN(linecopy)
+  	    && linecopy[curwin->w_cursor.col] == ')')
+  	linecopy[curwin->w_cursor.col] = NUL;
+  
+--- 6274,6280 ----
+       * check for that.
+       */
+      if ((State & INSERT)
+! 	    && curwin->w_cursor.col < (colnr_T)STRLEN(linecopy)
+  	    && linecopy[curwin->w_cursor.col] == ')')
+  	linecopy[curwin->w_cursor.col] = NUL;
+  
+*** ../vim-7.2.179/src/mbyte.c	2008-11-28 21:26:50.000000000 +0100
+--- src/mbyte.c	2009-05-16 22:29:02.000000000 +0200
+***************
+*** 1015,1024 ****
+   * Return length in bytes of character "c".
+   * Returns 1 for a single-byte character.
+   */
+- /* ARGSUSED */
+      int
+  latin_char2len(c)
+!     int		c;
+  {
+      return 1;
+  }
+--- 1015,1023 ----
+   * Return length in bytes of character "c".
+   * Returns 1 for a single-byte character.
+   */
+      int
+  latin_char2len(c)
+!     int		c UNUSED;
+  {
+      return 1;
+  }
+***************
+*** 1248,1257 ****
+   * Return the number of display cells character at "*p" occupies.
+   * This doesn't take care of unprintable characters, use ptr2cells() for that.
+   */
+- /*ARGSUSED*/
+      int
+  latin_ptr2cells(p)
+!     char_u	*p;
+  {
+      return 1;
+  }
+--- 1247,1255 ----
+   * Return the number of display cells character at "*p" occupies.
+   * This doesn't take care of unprintable characters, use ptr2cells() for that.
+   */
+      int
+  latin_ptr2cells(p)
+!     char_u	*p UNUSED;
+  {
+      return 1;
+  }
+***************
+*** 1293,1302 ****
+   * Return the number of display cells character "c" occupies.
+   * Only takes care of multi-byte chars, not "^C" and such.
+   */
+- /*ARGSUSED*/
+      int
+  latin_char2cells(c)
+!     int		c;
+  {
+      return 1;
+  }
+--- 1291,1299 ----
+   * Return the number of display cells character "c" occupies.
+   * Only takes care of multi-byte chars, not "^C" and such.
+   */
+      int
+  latin_char2cells(c)
+!     int		c UNUSED;
+  {
+      return 1;
+  }
+***************
+*** 1318,1328 ****
+   * Return number of display cells for char at ScreenLines[off].
+   * We make sure that the offset used is less than "max_off".
+   */
+- /*ARGSUSED*/
+      int
+  latin_off2cells(off, max_off)
+!     unsigned	off;
+!     unsigned	max_off;
+  {
+      return 1;
+  }
+--- 1315,1324 ----
+   * Return number of display cells for char at ScreenLines[off].
+   * We make sure that the offset used is less than "max_off".
+   */
+      int
+  latin_off2cells(off, max_off)
+!     unsigned	off UNUSED;
+!     unsigned	max_off UNUSED;
+  {
+      return 1;
+  }
+***************
+*** 2419,2429 ****
+   * Return offset from "p" to the first byte of the character it points into.
+   * Returns 0 when already at the first byte of a character.
+   */
+- /*ARGSUSED*/
+      int
+  latin_head_off(base, p)
+!     char_u	*base;
+!     char_u	*p;
+  {
+      return 0;
+  }
+--- 2415,2424 ----
+   * Return offset from "p" to the first byte of the character it points into.
+   * Returns 0 when already at the first byte of a character.
+   */
+      int
+  latin_head_off(base, p)
+!     char_u	*base UNUSED;
+!     char_u	*p UNUSED;
+  {
+      return 0;
+  }
+***************
+*** 3131,3137 ****
+  	else
+  	    s = p + 1;
+      }
+!     for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
+      {
+  	if (s[i] == '_' || s[i] == '-')
+  	    buf[i] = '-';
+--- 3126,3132 ----
+  	else
+  	    s = p + 1;
+      }
+!     for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i)
+      {
+  	if (s[i] == '_' || s[i] == '-')
+  	    buf[i] = '-';
+***************
+*** 3582,3590 ****
+   * Callback invoked when the user finished preediting.
+   * Put the final string into the input buffer.
+   */
+- /*ARGSUSED0*/
+      static void
+! im_commit_cb(GtkIMContext *context, const gchar *str, gpointer data)
+  {
+      int	slen = (int)STRLEN(str);
+      int	add_to_input = TRUE;
+--- 3577,3586 ----
+   * Callback invoked when the user finished preediting.
+   * Put the final string into the input buffer.
+   */
+      static void
+! im_commit_cb(GtkIMContext *context UNUSED,
+! 	     const gchar *str,
+! 	     gpointer data UNUSED)
+  {
+      int	slen = (int)STRLEN(str);
+      int	add_to_input = TRUE;
+***************
+*** 3670,3678 ****
+  /*
+   * Callback invoked after start to the preedit.
+   */
+- /*ARGSUSED*/
+      static void
+! im_preedit_start_cb(GtkIMContext *context, gpointer data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("im_preedit_start_cb()\n");
+--- 3666,3673 ----
+  /*
+   * Callback invoked after start to the preedit.
+   */
+      static void
+! im_preedit_start_cb(GtkIMContext *context UNUSED, gpointer data UNUSED)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("im_preedit_start_cb()\n");
+***************
+*** 3687,3695 ****
+  /*
+   * Callback invoked after end to the preedit.
+   */
+- /*ARGSUSED*/
+      static void
+! im_preedit_end_cb(GtkIMContext *context, gpointer data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("im_preedit_end_cb()\n");
+--- 3682,3689 ----
+  /*
+   * Callback invoked after end to the preedit.
+   */
+      static void
+! im_preedit_end_cb(GtkIMContext *context UNUSED, gpointer data UNUSED)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("im_preedit_end_cb()\n");
+***************
+*** 3748,3756 ****
+   * remaining input from within the "retrieve_surrounding" signal handler, this
+   * might not be necessary.  Gotta ask on vim-dev for opinions.
+   */
+- /*ARGSUSED1*/
+      static void
+! im_preedit_changed_cb(GtkIMContext *context, gpointer data)
+  {
+      char    *preedit_string = NULL;
+      int	    cursor_index    = 0;
+--- 3742,3749 ----
+   * remaining input from within the "retrieve_surrounding" signal handler, this
+   * might not be necessary.  Gotta ask on vim-dev for opinions.
+   */
+      static void
+! im_preedit_changed_cb(GtkIMContext *context, gpointer data UNUSED)
+  {
+      char    *preedit_string = NULL;
+      int	    cursor_index    = 0;
+***************
+*** 4616,4626 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      void
+  im_set_position(row, col)
+!     int		row;
+!     int		col;
+  {
+      xim_set_preedit();
+  }
+--- 4609,4618 ----
+      }
+  }
+  
+      void
+  im_set_position(row, col)
+!     int		row UNUSED;
+!     int		col UNUSED;
+  {
+      xim_set_preedit();
+  }
+***************
+*** 4927,4938 ****
+  static void xim_instantiate_cb __ARGS((Display *display, XPointer client_data, XPointer	call_data));
+  static void xim_destroy_cb __ARGS((XIM im, XPointer client_data, XPointer call_data));
+  
+- /*ARGSUSED*/
+      static void
+  xim_instantiate_cb(display, client_data, call_data)
+      Display	*display;
+!     XPointer	client_data;
+!     XPointer	call_data;
+  {
+      Window	x11_window;
+      Display	*x11_display;
+--- 4919,4929 ----
+  static void xim_instantiate_cb __ARGS((Display *display, XPointer client_data, XPointer	call_data));
+  static void xim_destroy_cb __ARGS((XIM im, XPointer client_data, XPointer call_data));
+  
+      static void
+  xim_instantiate_cb(display, client_data, call_data)
+      Display	*display;
+!     XPointer	client_data UNUSED;
+!     XPointer	call_data UNUSED;
+  {
+      Window	x11_window;
+      Display	*x11_display;
+***************
+*** 4952,4963 ****
+  					 xim_instantiate_cb, NULL);
+  }
+  
+- /*ARGSUSED*/
+      static void
+  xim_destroy_cb(im, client_data, call_data)
+!     XIM		im;
+!     XPointer	client_data;
+!     XPointer	call_data;
+  {
+      Window	x11_window;
+      Display	*x11_display;
+--- 4943,4953 ----
+  					 xim_instantiate_cb, NULL);
+  }
+  
+      static void
+  xim_destroy_cb(im, client_data, call_data)
+!     XIM		im UNUSED;
+!     XPointer	client_data UNUSED;
+!     XPointer	call_data UNUSED;
+  {
+      Window	x11_window;
+      Display	*x11_display;
+***************
+*** 5276,5284 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static void
+! preedit_start_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("xim_decide_input_style()\n");
+--- 5266,5275 ----
+      }
+  }
+  
+      static void
+! preedit_start_cbproc(XIC thexic UNUSED,
+! 	             XPointer client_data UNUSED,
+! 		     XPointer call_data UNUSED)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("xim_decide_input_style()\n");
+***************
+*** 5310,5318 ****
+  static GSList *key_press_event_queue = NULL;
+  static gboolean processing_queued_event = FALSE;
+  
+- /*ARGSUSED*/
+      static void
+! preedit_draw_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+  {
+      XIMPreeditDrawCallbackStruct *draw_data;
+      XIMText	*text;
+--- 5301,5310 ----
+  static GSList *key_press_event_queue = NULL;
+  static gboolean processing_queued_event = FALSE;
+  
+      static void
+! preedit_draw_cbproc(XIC thexic UNUSED,
+! 		    XPointer client_data UNUSED,
+! 		    XPointer call_data)
+  {
+      XIMPreeditDrawCallbackStruct *draw_data;
+      XIMText	*text;
+***************
+*** 5451,5468 ****
+      return -1;
+  }
+  
+- /*ARGSUSED*/
+      static void
+! preedit_caret_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("preedit_caret_cbproc()\n");
+  #endif
+  }
+  
+- /*ARGSUSED*/
+      static void
+! preedit_done_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("preedit_done_cbproc()\n");
+--- 5443,5462 ----
+      return -1;
+  }
+  
+      static void
+! preedit_caret_cbproc(XIC thexic UNUSED,
+! 		     XPointer client_data UNUSED,
+! 		     XPointer call_data UNUSED)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("preedit_caret_cbproc()\n");
+  #endif
+  }
+  
+      static void
+! preedit_done_cbproc(XIC thexic UNUSED,
+! 		    XPointer client_data UNUSED,
+! 		    XPointer call_data UNUSED)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("preedit_done_cbproc()\n");
+***************
+*** 5501,5509 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      int
+! xim_queue_key_press_event(GdkEventKey *event, int down)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("xim_queue_key_press_event()\n");
+--- 5495,5502 ----
+      }
+  }
+  
+      int
+! xim_queue_key_press_event(GdkEventKey *event, int down UNUSED)
+  {
+  #ifdef XIM_DEBUG
+      xim_log("xim_queue_key_press_event()\n");
+***************
+*** 5519,5527 ****
+      return TRUE;
+  }
+  
+- /*ARGSUSED*/
+      static void
+! preedit_callback_setup(GdkIC *ic)
+  {
+      XIC xxic;
+      XVaNestedList preedit_attr;
+--- 5512,5519 ----
+      return TRUE;
+  }
+  
+      static void
+! preedit_callback_setup(GdkIC *ic UNUSED)
+  {
+      XIC xxic;
+      XVaNestedList preedit_attr;
+***************
+*** 5546,5554 ****
+      XFree(preedit_attr);
+  }
+  
+- /*ARGSUSED*/
+      static void
+! reset_state_setup(GdkIC *ic)
+  {
+  #ifdef USE_X11R6_XIM
+      /* don't change the input context when we call reset */
+--- 5538,5545 ----
+      XFree(preedit_attr);
+  }
+  
+      static void
+! reset_state_setup(GdkIC *ic UNUSED)
+  {
+  #ifdef USE_X11R6_XIM
+      /* don't change the input context when we call reset */
+*** ../vim-7.2.179/src/normal.c	2009-05-15 21:31:11.000000000 +0200
+--- src/normal.c	2009-05-16 22:31:10.000000000 +0200
+***************
+*** 9243,9252 ****
+  }
+  
+  #ifdef FEAT_SNIFF
+- /*ARGSUSED*/
+      static void
+  nv_sniff(cap)
+!     cmdarg_T	*cap;
+  {
+      ProcessSniffRequests();
+  }
+--- 9243,9251 ----
+  }
+  
+  #ifdef FEAT_SNIFF
+      static void
+  nv_sniff(cap)
+!     cmdarg_T	*cap UNUSED;
+  {
+      ProcessSniffRequests();
+  }
+***************
+*** 9262,9271 ****
+  #endif
+  
+  #ifdef FEAT_DND
+- /*ARGSUSED*/
+      static void
+  nv_drop(cap)
+!     cmdarg_T	*cap;
+  {
+      do_put('~', BACKWARD, 1L, PUT_CURSEND);
+  }
+--- 9261,9269 ----
+  #endif
+  
+  #ifdef FEAT_DND
+      static void
+  nv_drop(cap)
+!     cmdarg_T	*cap UNUSED;
+  {
+      do_put('~', BACKWARD, 1L, PUT_CURSEND);
+  }
+***************
+*** 9277,9283 ****
+   * When waiting for a character for 'updatetime' K_CURSORHOLD is put in the
+   * input buffer.  "did_cursorhold" is set to avoid retriggering.
+   */
+- /*ARGSUSED*/
+      static void
+  nv_cursorhold(cap)
+      cmdarg_T	*cap;
+--- 9275,9280 ----
+*** ../vim-7.2.179/src/option.c	2009-05-15 21:31:11.000000000 +0200
+--- src/option.c	2009-05-17 12:13:52.000000000 +0200
+***************
+*** 387,392 ****
+--- 387,395 ----
+      char_u	*def_val[2];	/* default values for variable (vi and vim) */
+  #ifdef FEAT_EVAL
+      scid_T	scriptID;	/* script in which the option was last set */
++ # define SCRIPTID_INIT , 0
++ #else
++ # define SCRIPTID_INIT
+  #endif
+  };
+  
+***************
+*** 477,483 ****
+  #else
+  			    (char_u *)224L,
+  #endif
+! 					    (char_u *)0L}},
+      {"antialias",   "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
+  #if defined(FEAT_GUI) && defined(MACOS_X)
+  			    (char_u *)&p_antialias, PV_NONE,
+--- 480,486 ----
+  #else
+  			    (char_u *)224L,
+  #endif
+! 					    (char_u *)0L} SCRIPTID_INIT},
+      {"antialias",   "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
+  #if defined(FEAT_GUI) && defined(MACOS_X)
+  			    (char_u *)&p_antialias, PV_NONE,
+***************
+*** 486,520 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)FALSE, (char_u *)FALSE}
+  #endif
+! 			    },
+      {"arabic",	    "arab", P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_ARABIC
+  			    (char_u *)VAR_WIN, PV_ARAB,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"arabicshape", "arshape", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
+  #ifdef FEAT_ARABIC
+  			    (char_u *)&p_arshape, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"allowrevins", "ari",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)&p_ari, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"altkeymap",   "akm",  P_BOOL|P_VI_DEF,
+  #ifdef FEAT_FKMAP
+  			    (char_u *)&p_altkeymap, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"ambiwidth",  "ambw",  P_STRING|P_VI_DEF|P_RCLR,
+  #if defined(FEAT_MBYTE)
+  			    (char_u *)&p_ambw, PV_NONE,
+--- 489,523 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)FALSE, (char_u *)FALSE}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"arabic",	    "arab", P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_ARABIC
+  			    (char_u *)VAR_WIN, PV_ARAB,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"arabicshape", "arshape", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
+  #ifdef FEAT_ARABIC
+  			    (char_u *)&p_arshape, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"allowrevins", "ari",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)&p_ari, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"altkeymap",   "akm",  P_BOOL|P_VI_DEF,
+  #ifdef FEAT_FKMAP
+  			    (char_u *)&p_altkeymap, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"ambiwidth",  "ambw",  P_STRING|P_VI_DEF|P_RCLR,
+  #if defined(FEAT_MBYTE)
+  			    (char_u *)&p_ambw, PV_NONE,
+***************
+*** 523,549 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+  #ifdef FEAT_AUTOCHDIR
+      {"autochdir",  "acd",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_acd, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+  #endif
+      {"autoindent",  "ai",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ai, PV_AI,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"autoprint",   "ap",   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"autoread",    "ar",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ar, PV_AR,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"autowrite",   "aw",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_aw, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"autowriteall","awa",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_awa, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"background",  "bg",   P_STRING|P_VI_DEF|P_RCLR,
+  			    (char_u *)&p_bg, PV_NONE,
+  			    {
+--- 526,552 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+  #ifdef FEAT_AUTOCHDIR
+      {"autochdir",  "acd",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_acd, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+  #endif
+      {"autoindent",  "ai",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ai, PV_AI,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"autoprint",   "ap",   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"autoread",    "ar",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ar, PV_AR,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"autowrite",   "aw",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_aw, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"autowriteall","awa",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_awa, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"background",  "bg",   P_STRING|P_VI_DEF|P_RCLR,
+  			    (char_u *)&p_bg, PV_NONE,
+  			    {
+***************
+*** 552,564 ****
+  #else
+  			    (char_u *)"light",
+  #endif
+! 					    (char_u *)0L}},
+      {"backspace",   "bs",   P_STRING|P_VI_DEF|P_VIM|P_COMMA|P_NODUP,
+  			    (char_u *)&p_bs, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"backup",	    "bk",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_bk, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"backupcopy",  "bkc",  P_STRING|P_VIM|P_COMMA|P_NODUP,
+  			    (char_u *)&p_bkc, PV_NONE,
+  #ifdef UNIX
+--- 555,567 ----
+  #else
+  			    (char_u *)"light",
+  #endif
+! 					    (char_u *)0L} SCRIPTID_INIT},
+      {"backspace",   "bs",   P_STRING|P_VI_DEF|P_VIM|P_COMMA|P_NODUP,
+  			    (char_u *)&p_bs, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"backup",	    "bk",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_bk, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"backupcopy",  "bkc",  P_STRING|P_VIM|P_COMMA|P_NODUP,
+  			    (char_u *)&p_bkc, PV_NONE,
+  #ifdef UNIX
+***************
+*** 566,575 ****
+  #else
+  			    {(char_u *)"auto", (char_u *)"auto"}
+  #endif
+! 			    },
+      {"backupdir",   "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
+  			    (char_u *)&p_bdir, PV_NONE,
+! 			    {(char_u *)DFLT_BDIR, (char_u *)0L}},
+      {"backupext",   "bex",  P_STRING|P_VI_DEF|P_NFNAME,
+  			    (char_u *)&p_bex, PV_NONE,
+  			    {
+--- 569,578 ----
+  #else
+  			    {(char_u *)"auto", (char_u *)"auto"}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"backupdir",   "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
+  			    (char_u *)&p_bdir, PV_NONE,
+! 			    {(char_u *)DFLT_BDIR, (char_u *)0L} SCRIPTID_INIT},
+      {"backupext",   "bex",  P_STRING|P_VI_DEF|P_NFNAME,
+  			    (char_u *)&p_bex, PV_NONE,
+  			    {
+***************
+*** 578,584 ****
+  #else
+  			    (char_u *)"~",
+  #endif
+! 					    (char_u *)0L}},
+      {"backupskip",  "bsk",  P_STRING|P_VI_DEF|P_COMMA,
+  #ifdef FEAT_WILDIGN
+  			    (char_u *)&p_bsk, PV_NONE,
+--- 581,587 ----
+  #else
+  			    (char_u *)"~",
+  #endif
+! 					    (char_u *)0L} SCRIPTID_INIT},
+      {"backupskip",  "bsk",  P_STRING|P_VI_DEF|P_COMMA,
+  #ifdef FEAT_WILDIGN
+  			    (char_u *)&p_bsk, PV_NONE,
+***************
+*** 587,626 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+  #ifdef FEAT_BEVAL
+      {"balloondelay","bdlay",P_NUM|P_VI_DEF,
+  			    (char_u *)&p_bdlay, PV_NONE,
+! 			    {(char_u *)600L, (char_u *)0L}},
+      {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC,
+  			    (char_u *)&p_beval, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+  # ifdef FEAT_EVAL
+      {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_bexpr, PV_BEXPR,
+! 			    {(char_u *)"", (char_u *)0L}},
+  # endif
+  #endif
+      {"beautify",    "bf",   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"binary",	    "bin",  P_BOOL|P_VI_DEF|P_RSTAT,
+  			    (char_u *)&p_bin, PV_BIN,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"bioskey",	    "biosk",P_BOOL|P_VI_DEF,
+  #ifdef MSDOS
+  			    (char_u *)&p_biosk, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"bomb",	    NULL,   P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_bomb, PV_BOMB,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"breakat",	    "brk",  P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST,
+  #ifdef FEAT_LINEBREAK
+  			    (char_u *)&p_breakat, PV_NONE,
+--- 590,629 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+  #ifdef FEAT_BEVAL
+      {"balloondelay","bdlay",P_NUM|P_VI_DEF,
+  			    (char_u *)&p_bdlay, PV_NONE,
+! 			    {(char_u *)600L, (char_u *)0L} SCRIPTID_INIT},
+      {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC,
+  			    (char_u *)&p_beval, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+  # ifdef FEAT_EVAL
+      {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_bexpr, PV_BEXPR,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+  # endif
+  #endif
+      {"beautify",    "bf",   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"binary",	    "bin",  P_BOOL|P_VI_DEF|P_RSTAT,
+  			    (char_u *)&p_bin, PV_BIN,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"bioskey",	    "biosk",P_BOOL|P_VI_DEF,
+  #ifdef MSDOS
+  			    (char_u *)&p_biosk, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"bomb",	    NULL,   P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_bomb, PV_BOMB,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"breakat",	    "brk",  P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST,
+  #ifdef FEAT_LINEBREAK
+  			    (char_u *)&p_breakat, PV_NONE,
+***************
+*** 629,635 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"browsedir",   "bsdir",P_STRING|P_VI_DEF,
+  #ifdef FEAT_BROWSE
+  			    (char_u *)&p_bsdir, PV_NONE,
+--- 632,638 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"browsedir",   "bsdir",P_STRING|P_VI_DEF,
+  #ifdef FEAT_BROWSE
+  			    (char_u *)&p_bsdir, PV_NONE,
+***************
+*** 638,644 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"bufhidden",   "bh",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
+  #if defined(FEAT_QUICKFIX)
+  			    (char_u *)&p_bh, PV_BH,
+--- 641,647 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"bufhidden",   "bh",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
+  #if defined(FEAT_QUICKFIX)
+  			    (char_u *)&p_bh, PV_BH,
+***************
+*** 647,657 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"buflisted",   "bl",   P_BOOL|P_VI_DEF|P_NOGLOB,
+  			    (char_u *)&p_bl, PV_BL,
+  			    {(char_u *)1L, (char_u *)0L}
+! 			    },
+      {"buftype",	    "bt",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
+  #if defined(FEAT_QUICKFIX)
+  			    (char_u *)&p_bt, PV_BT,
+--- 650,660 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"buflisted",   "bl",   P_BOOL|P_VI_DEF|P_NOGLOB,
+  			    (char_u *)&p_bl, PV_BL,
+  			    {(char_u *)1L, (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"buftype",	    "bt",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
+  #if defined(FEAT_QUICKFIX)
+  			    (char_u *)&p_bt, PV_BT,
+***************
+*** 660,666 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"casemap",	    "cmp",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_cmp, PV_NONE,
+--- 663,669 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"casemap",	    "cmp",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_cmp, PV_NONE,
+***************
+*** 669,675 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"cdpath",	    "cd",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_SEARCHPATH
+  			    (char_u *)&p_cdpath, PV_NONE,
+--- 672,678 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"cdpath",	    "cd",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_SEARCHPATH
+  			    (char_u *)&p_cdpath, PV_NONE,
+***************
+*** 678,684 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"cedit",	    NULL,   P_STRING,
+  #ifdef FEAT_CMDWIN
+  			    (char_u *)&p_cedit, PV_NONE,
+--- 681,687 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"cedit",	    NULL,   P_STRING,
+  #ifdef FEAT_CMDWIN
+  			    (char_u *)&p_cedit, PV_NONE,
+***************
+*** 687,693 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"charconvert",  "ccv", P_STRING|P_VI_DEF|P_SECURE,
+  #if defined(FEAT_MBYTE) && defined(FEAT_EVAL)
+  			    (char_u *)&p_ccv, PV_NONE,
+--- 690,696 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"charconvert",  "ccv", P_STRING|P_VI_DEF|P_SECURE,
+  #if defined(FEAT_MBYTE) && defined(FEAT_EVAL)
+  			    (char_u *)&p_ccv, PV_NONE,
+***************
+*** 696,709 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"cindent",	    "cin",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CINDENT
+  			    (char_u *)&p_cin, PV_CIN,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"cinkeys",	    "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_CINDENT
+  			    (char_u *)&p_cink, PV_CINK,
+--- 699,712 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"cindent",	    "cin",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CINDENT
+  			    (char_u *)&p_cin, PV_CIN,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"cinkeys",	    "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_CINDENT
+  			    (char_u *)&p_cink, PV_CINK,
+***************
+*** 712,725 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"cinoptions",  "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_CINDENT
+  			    (char_u *)&p_cino, PV_CINO,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"cinwords",    "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
+  			    (char_u *)&p_cinw, PV_CINW,
+--- 715,728 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"cinoptions",  "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_CINDENT
+  			    (char_u *)&p_cino, PV_CINO,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"cinwords",    "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
+  			    (char_u *)&p_cinw, PV_CINW,
+***************
+*** 729,735 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"clipboard",   "cb",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_CLIPBOARD
+  			    (char_u *)&p_cb, PV_NONE,
+--- 732,738 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"clipboard",   "cb",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_CLIPBOARD
+  			    (char_u *)&p_cb, PV_NONE,
+***************
+*** 743,762 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)0L}
+  #endif
+! 			    },
+      {"cmdheight",   "ch",   P_NUM|P_VI_DEF|P_RALL,
+  			    (char_u *)&p_ch, PV_NONE,
+! 			    {(char_u *)1L, (char_u *)0L}},
+      {"cmdwinheight", "cwh", P_NUM|P_VI_DEF,
+  #ifdef FEAT_CMDWIN
+  			    (char_u *)&p_cwh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)7L, (char_u *)0L}},
+      {"columns",	    "co",   P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
+  			    (char_u *)&Columns, PV_NONE,
+! 			    {(char_u *)80L, (char_u *)0L}},
+      {"comments",    "com",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_COMMENTS
+  			    (char_u *)&p_com, PV_COM,
+--- 746,765 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"cmdheight",   "ch",   P_NUM|P_VI_DEF|P_RALL,
+  			    (char_u *)&p_ch, PV_NONE,
+! 			    {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
+      {"cmdwinheight", "cwh", P_NUM|P_VI_DEF,
+  #ifdef FEAT_CMDWIN
+  			    (char_u *)&p_cwh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)7L, (char_u *)0L} SCRIPTID_INIT},
+      {"columns",	    "co",   P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
+  			    (char_u *)&Columns, PV_NONE,
+! 			    {(char_u *)80L, (char_u *)0L} SCRIPTID_INIT},
+      {"comments",    "com",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_COMMENTS
+  			    (char_u *)&p_com, PV_COM,
+***************
+*** 766,772 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_FOLDING
+  			    (char_u *)&p_cms, PV_CMS,
+--- 769,775 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_FOLDING
+  			    (char_u *)&p_cms, PV_CMS,
+***************
+*** 775,786 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+  			    /* P_PRI_MKRC isn't needed here, optval_default()
+  			     * always returns TRUE for 'compatible' */
+      {"compatible",  "cp",   P_BOOL|P_RALL,
+  			    (char_u *)&p_cp, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)FALSE}},
+      {"complete",    "cpt",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_cpt, PV_CPT,
+--- 778,789 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+  			    /* P_PRI_MKRC isn't needed here, optval_default()
+  			     * always returns TRUE for 'compatible' */
+      {"compatible",  "cp",   P_BOOL|P_RALL,
+  			    (char_u *)&p_cp, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)FALSE} SCRIPTID_INIT},
+      {"complete",    "cpt",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_cpt, PV_CPT,
+***************
+*** 789,795 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"completefunc", "cfu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_COMPL_FUNC
+  			    (char_u *)&p_cfu, PV_CFU,
+--- 792,798 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"completefunc", "cfu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_COMPL_FUNC
+  			    (char_u *)&p_cfu, PV_CFU,
+***************
+*** 798,804 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"completeopt",   "cot",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_cot, PV_NONE,
+--- 801,807 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"completeopt",   "cot",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_cot, PV_NONE,
+***************
+*** 807,840 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"confirm",     "cf",   P_BOOL|P_VI_DEF,
+  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
+  			    (char_u *)&p_confirm, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"conskey",	    "consk",P_BOOL|P_VI_DEF,
+  #ifdef MSDOS
+  			    (char_u *)&p_consk, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"copyindent",  "ci",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_ci, PV_CI,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"cpoptions",   "cpo",  P_STRING|P_VIM|P_RALL|P_FLAGLIST,
+  			    (char_u *)&p_cpo, PV_NONE,
+! 			    {(char_u *)CPO_VI, (char_u *)CPO_VIM}},
+      {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_cspc, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"cscopeprg",   "csprg", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_csprg, PV_NONE,
+--- 810,844 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"confirm",     "cf",   P_BOOL|P_VI_DEF,
+  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
+  			    (char_u *)&p_confirm, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"conskey",	    "consk",P_BOOL|P_VI_DEF,
+  #ifdef MSDOS
+  			    (char_u *)&p_consk, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"copyindent",  "ci",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_ci, PV_CI,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"cpoptions",   "cpo",  P_STRING|P_VIM|P_RALL|P_FLAGLIST,
+  			    (char_u *)&p_cpo, PV_NONE,
+! 			    {(char_u *)CPO_VI, (char_u *)CPO_VIM}
+! 			    SCRIPTID_INIT},
+      {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_cspc, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"cscopeprg",   "csprg", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_csprg, PV_NONE,
+***************
+*** 843,849 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX)
+  			    (char_u *)&p_csqf, PV_NONE,
+--- 847,853 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX)
+  			    (char_u *)&p_csqf, PV_NONE,
+***************
+*** 852,896 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"cscopetag",   "cst",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_cst, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"cscopetagorder", "csto", P_NUM|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_csto, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"cscopeverbose", "csverb", P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_csverbose, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_SYN_HL
+  			    (char_u *)VAR_WIN, PV_CUC,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"cursorline",   "cul", P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_SYN_HL
+  			    (char_u *)VAR_WIN, PV_CUL,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"debug",	    NULL,   P_STRING|P_VI_DEF,
+  			    (char_u *)&p_debug, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"define",	    "def",  P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_FIND_ID
+  			    (char_u *)&p_def, PV_DEF,
+--- 856,900 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"cscopetag",   "cst",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_cst, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"cscopetagorder", "csto", P_NUM|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_csto, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"cscopeverbose", "csverb", P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_CSCOPE
+  			    (char_u *)&p_csverbose, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_SYN_HL
+  			    (char_u *)VAR_WIN, PV_CUC,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"cursorline",   "cul", P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_SYN_HL
+  			    (char_u *)VAR_WIN, PV_CUL,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"debug",	    NULL,   P_STRING|P_VI_DEF,
+  			    (char_u *)&p_debug, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"define",	    "def",  P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_FIND_ID
+  			    (char_u *)&p_def, PV_DEF,
+***************
+*** 899,926 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"delcombine", "deco",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_deco, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"dictionary",  "dict", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_dict, PV_DICT,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"diff",	    NULL,   P_BOOL|P_VI_DEF|P_RWIN|P_NOGLOB,
+  #ifdef FEAT_DIFF
+  			    (char_u *)VAR_WIN, PV_DIFF,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"diffexpr",    "dex",  P_STRING|P_VI_DEF|P_SECURE,
+  #if defined(FEAT_DIFF) && defined(FEAT_EVAL)
+  			    (char_u *)&p_dex, PV_NONE,
+--- 903,930 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"delcombine", "deco",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_deco, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"dictionary",  "dict", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_dict, PV_DICT,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"diff",	    NULL,   P_BOOL|P_VI_DEF|P_RWIN|P_NOGLOB,
+  #ifdef FEAT_DIFF
+  			    (char_u *)VAR_WIN, PV_DIFF,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"diffexpr",    "dex",  P_STRING|P_VI_DEF|P_SECURE,
+  #if defined(FEAT_DIFF) && defined(FEAT_EVAL)
+  			    (char_u *)&p_dex, PV_NONE,
+***************
+*** 929,935 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"diffopt",	    "dip",  P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_COMMA|P_NODUP,
+  #ifdef FEAT_DIFF
+  			    (char_u *)&p_dip, PV_NONE,
+--- 933,939 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"diffopt",	    "dip",  P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_COMMA|P_NODUP,
+  #ifdef FEAT_DIFF
+  			    (char_u *)&p_dip, PV_NONE,
+***************
+*** 938,957 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)NULL}
+  #endif
+! 			    },
+      {"digraph",	    "dg",   P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_DIGRAPHS
+  			    (char_u *)&p_dg, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"directory",   "dir",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
+  			    (char_u *)&p_dir, PV_NONE,
+! 			    {(char_u *)DFLT_DIR, (char_u *)0L}},
+      {"display",	    "dy",   P_STRING|P_VI_DEF|P_COMMA|P_RALL|P_NODUP,
+  			    (char_u *)&p_dy, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"eadirection", "ead",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)&p_ead, PV_NONE,
+--- 942,961 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)NULL}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"digraph",	    "dg",   P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_DIGRAPHS
+  			    (char_u *)&p_dg, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"directory",   "dir",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
+  			    (char_u *)&p_dir, PV_NONE,
+! 			    {(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT},
+      {"display",	    "dy",   P_STRING|P_VI_DEF|P_COMMA|P_RALL|P_NODUP,
+  			    (char_u *)&p_dy, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"eadirection", "ead",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)&p_ead, PV_NONE,
+***************
+*** 960,969 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"edcompatible","ed",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ed, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"encoding",    "enc",  P_STRING|P_VI_DEF|P_RCLR,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_enc, PV_NONE,
+--- 964,973 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"edcompatible","ed",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ed, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"encoding",    "enc",  P_STRING|P_VI_DEF|P_RCLR,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_enc, PV_NONE,
+***************
+*** 972,990 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"endofline",   "eol",  P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
+  			    (char_u *)&p_eol, PV_EOL,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"equalalways", "ea",   P_BOOL|P_VI_DEF|P_RALL,
+  			    (char_u *)&p_ea, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"equalprg",    "ep",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_ep, PV_EP,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"errorbells",  "eb",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_eb, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"errorfile",   "ef",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_ef, PV_NONE,
+--- 976,994 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"endofline",   "eol",  P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
+  			    (char_u *)&p_eol, PV_EOL,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"equalalways", "ea",   P_BOOL|P_VI_DEF|P_RALL,
+  			    (char_u *)&p_ea, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"equalprg",    "ep",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_ep, PV_EP,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"errorbells",  "eb",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_eb, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"errorfile",   "ef",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_ef, PV_NONE,
+***************
+*** 993,1024 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"errorformat", "efm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_efm, PV_EFM,
+! 			    {(char_u *)DFLT_EFM, (char_u *)0L},
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"esckeys",	    "ek",   P_BOOL|P_VIM,
+  			    (char_u *)&p_ek, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE}},
+      {"eventignore", "ei",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_AUTOCMD
+  			    (char_u *)&p_ei, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"expandtab",   "et",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_et, PV_ET,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"exrc",	    "ex",   P_BOOL|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_exrc, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF|P_NO_MKRC,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_fenc, PV_FENC,
+--- 997,1028 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"errorformat", "efm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_efm, PV_EFM,
+! 			    {(char_u *)DFLT_EFM, (char_u *)0L}
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"esckeys",	    "ek",   P_BOOL|P_VIM,
+  			    (char_u *)&p_ek, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
+      {"eventignore", "ei",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_AUTOCMD
+  			    (char_u *)&p_ei, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"expandtab",   "et",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_et, PV_ET,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"exrc",	    "ex",   P_BOOL|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_exrc, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF|P_NO_MKRC,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_fenc, PV_FENC,
+***************
+*** 1027,1033 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"fileencodings","fencs", P_STRING|P_VI_DEF|P_COMMA,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_fencs, PV_NONE,
+--- 1031,1037 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"fileencodings","fencs", P_STRING|P_VI_DEF|P_COMMA,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_fencs, PV_NONE,
+***************
+*** 1036,1048 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"fileformat",  "ff",   P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC,
+  			    (char_u *)&p_ff, PV_FF,
+! 			    {(char_u *)DFLT_FF, (char_u *)0L}},
+      {"fileformats", "ffs",  P_STRING|P_VIM|P_COMMA|P_NODUP,
+  			    (char_u *)&p_ffs, PV_NONE,
+! 			    {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}},
+      {"filetype",    "ft",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
+  #ifdef FEAT_AUTOCMD
+  			    (char_u *)&p_ft, PV_FT,
+--- 1040,1053 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"fileformat",  "ff",   P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC,
+  			    (char_u *)&p_ff, PV_FF,
+! 			    {(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT},
+      {"fileformats", "ffs",  P_STRING|P_VIM|P_COMMA|P_NODUP,
+  			    (char_u *)&p_ffs, PV_NONE,
+! 			    {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}
+! 			    SCRIPTID_INIT},
+      {"filetype",    "ft",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
+  #ifdef FEAT_AUTOCMD
+  			    (char_u *)&p_ft, PV_FT,
+***************
+*** 1051,1057 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"fillchars",   "fcs",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
+  #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING)
+  			    (char_u *)&p_fcs, PV_NONE,
+--- 1056,1062 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"fillchars",   "fcs",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
+  #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING)
+  			    (char_u *)&p_fcs, PV_NONE,
+***************
+*** 1060,1086 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)0L}
+  #endif
+! 			    },
+      {"fkmap",	    "fk",   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_FKMAP
+  			    (char_u *)&p_fkmap, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"flash",	    "fl",   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+  #ifdef FEAT_FOLDING
+      {"foldclose",   "fcl",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN,
+  			    (char_u *)&p_fcl, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"foldcolumn",  "fdc",  P_NUM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDC,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"foldenable",  "fen",  P_BOOL|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FEN,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"foldexpr",    "fde",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
+  # ifdef FEAT_EVAL
+  			    (char_u *)VAR_WIN, PV_FDE,
+--- 1065,1091 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"fkmap",	    "fk",   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_FKMAP
+  			    (char_u *)&p_fkmap, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"flash",	    "fl",   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+  #ifdef FEAT_FOLDING
+      {"foldclose",   "fcl",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN,
+  			    (char_u *)&p_fcl, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"foldcolumn",  "fdc",  P_NUM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDC,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"foldenable",  "fen",  P_BOOL|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FEN,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"foldexpr",    "fde",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
+  # ifdef FEAT_EVAL
+  			    (char_u *)VAR_WIN, PV_FDE,
+***************
+*** 1089,1121 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  # endif
+! 			    },
+      {"foldignore",  "fdi",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDI,
+! 			    {(char_u *)"#", (char_u *)NULL}},
+      {"foldlevel",   "fdl",  P_NUM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDL,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"foldlevelstart","fdls", P_NUM|P_VI_DEF,
+  			    (char_u *)&p_fdls, PV_NONE,
+! 			    {(char_u *)-1L, (char_u *)0L}},
+      {"foldmarker",  "fmr",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
+  						       P_RWIN|P_COMMA|P_NODUP,
+  			    (char_u *)VAR_WIN, PV_FMR,
+! 			    {(char_u *)"{{{,}}}", (char_u *)NULL}},
+      {"foldmethod",  "fdm",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDM,
+! 			    {(char_u *)"manual", (char_u *)NULL}},
+      {"foldminlines","fml",  P_NUM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FML,
+! 			    {(char_u *)1L, (char_u *)0L}},
+      {"foldnestmax", "fdn",  P_NUM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDN,
+! 			    {(char_u *)20L, (char_u *)0L}},
+      {"foldopen",    "fdo",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_fdo, PV_NONE,
+  		 {(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
+! 							       (char_u *)0L}},
+      {"foldtext",    "fdt",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
+  # ifdef FEAT_EVAL
+  			    (char_u *)VAR_WIN, PV_FDT,
+--- 1094,1127 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  # endif
+! 			    SCRIPTID_INIT},
+      {"foldignore",  "fdi",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDI,
+! 			    {(char_u *)"#", (char_u *)NULL} SCRIPTID_INIT},
+      {"foldlevel",   "fdl",  P_NUM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDL,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"foldlevelstart","fdls", P_NUM|P_VI_DEF,
+  			    (char_u *)&p_fdls, PV_NONE,
+! 			    {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
+      {"foldmarker",  "fmr",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
+  						       P_RWIN|P_COMMA|P_NODUP,
+  			    (char_u *)VAR_WIN, PV_FMR,
+! 			    {(char_u *)"{{{,}}}", (char_u *)NULL}
+! 			    SCRIPTID_INIT},
+      {"foldmethod",  "fdm",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDM,
+! 			    {(char_u *)"manual", (char_u *)NULL} SCRIPTID_INIT},
+      {"foldminlines","fml",  P_NUM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FML,
+! 			    {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
+      {"foldnestmax", "fdn",  P_NUM|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_FDN,
+! 			    {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
+      {"foldopen",    "fdo",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_fdo, PV_NONE,
+  		 {(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
+! 						 (char_u *)0L} SCRIPTID_INIT},
+      {"foldtext",    "fdt",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
+  # ifdef FEAT_EVAL
+  			    (char_u *)VAR_WIN, PV_FDT,
+***************
+*** 1124,1130 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  # endif
+! 			    },
+  #endif
+      {"formatexpr", "fex",   P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
+  #ifdef FEAT_EVAL
+--- 1130,1136 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  # endif
+! 			    SCRIPTID_INIT},
+  #endif
+      {"formatexpr", "fex",   P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
+  #ifdef FEAT_EVAL
+***************
+*** 1134,1149 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"formatoptions","fo",  P_STRING|P_ALLOCED|P_VIM|P_FLAGLIST,
+  			    (char_u *)&p_fo, PV_FO,
+! 			    {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM}},
+      {"formatlistpat","flp", P_STRING|P_ALLOCED|P_VI_DEF,
+  			    (char_u *)&p_flp, PV_FLP,
+! 			    {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*", (char_u *)0L}},
+      {"formatprg",   "fp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_fp, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"fsync",       "fs",   P_BOOL|P_SECURE|P_VI_DEF,
+  #ifdef HAVE_FSYNC
+  			    (char_u *)&p_fs, PV_NONE,
+--- 1140,1157 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"formatoptions","fo",  P_STRING|P_ALLOCED|P_VIM|P_FLAGLIST,
+  			    (char_u *)&p_fo, PV_FO,
+! 			    {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM}
+! 			    SCRIPTID_INIT},
+      {"formatlistpat","flp", P_STRING|P_ALLOCED|P_VI_DEF,
+  			    (char_u *)&p_flp, PV_FLP,
+! 			    {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*",
+! 						 (char_u *)0L} SCRIPTID_INIT},
+      {"formatprg",   "fp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_fp, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"fsync",       "fs",   P_BOOL|P_SECURE|P_VI_DEF,
+  #ifdef HAVE_FSYNC
+  			    (char_u *)&p_fs, PV_NONE,
+***************
+*** 1152,1173 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)FALSE, (char_u *)0L}
+  #endif
+! 			    },
+      {"gdefault",    "gd",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_gd, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"graphic",	    "gr",   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"grepformat",  "gfm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_gefm, PV_NONE,
+! 			    {(char_u *)DFLT_GREPFORMAT, (char_u *)0L},
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"grepprg",	    "gp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_gp, PV_GP,
+--- 1160,1181 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)FALSE, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"gdefault",    "gd",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_gd, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"graphic",	    "gr",   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"grepformat",  "gfm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_gefm, PV_NONE,
+! 			    {(char_u *)DFLT_GREPFORMAT, (char_u *)0L}
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"grepprg",	    "gp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_gp, PV_GP,
+***************
+*** 1185,1199 ****
+  			    (char_u *)"SEARCH/NUMBERS ",
+  #   else
+  			    (char_u *)"grep -n ",
+! #endif
+! #endif
+  # endif
+! 			    (char_u *)0L},
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"guicursor",    "gcr",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef CURSOR_SHAPE
+  			    (char_u *)&p_guicursor, PV_NONE,
+--- 1193,1207 ----
+  			    (char_u *)"SEARCH/NUMBERS ",
+  #   else
+  			    (char_u *)"grep -n ",
+! #   endif
+! #  endif
+  # endif
+! 			    (char_u *)0L}
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"guicursor",    "gcr",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef CURSOR_SHAPE
+  			    (char_u *)&p_guicursor, PV_NONE,
+***************
+*** 1208,1214 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 				    },
+      {"guifont",	    "gfn",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
+  #ifdef FEAT_GUI
+  			    (char_u *)&p_guifont, PV_NONE,
+--- 1216,1222 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"guifont",	    "gfn",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
+  #ifdef FEAT_GUI
+  			    (char_u *)&p_guifont, PV_NONE,
+***************
+*** 1217,1223 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 				    },
+      {"guifontset",  "gfs",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA,
+  #if defined(FEAT_GUI) && defined(FEAT_XFONTSET)
+  			    (char_u *)&p_guifontset, PV_NONE,
+--- 1225,1231 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"guifontset",  "gfs",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA,
+  #if defined(FEAT_GUI) && defined(FEAT_XFONTSET)
+  			    (char_u *)&p_guifontset, PV_NONE,
+***************
+*** 1226,1232 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 				    },
+      {"guifontwide", "gfw",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
+  #if defined(FEAT_GUI) && defined(FEAT_MBYTE)
+  			    (char_u *)&p_guifontwide, PV_NONE,
+--- 1234,1240 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"guifontwide", "gfw",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
+  #if defined(FEAT_GUI) && defined(FEAT_MBYTE)
+  			    (char_u *)&p_guifontwide, PV_NONE,
+***************
+*** 1235,1248 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 				    },
+      {"guiheadroom", "ghr",  P_NUM|P_VI_DEF,
+  #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)
+  			    (char_u *)&p_ghr, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)50L, (char_u *)0L}},
+      {"guioptions",  "go",   P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST,
+  #if defined(FEAT_GUI)
+  			    (char_u *)&p_go, PV_NONE,
+--- 1243,1256 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"guiheadroom", "ghr",  P_NUM|P_VI_DEF,
+  #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)
+  			    (char_u *)&p_ghr, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)50L, (char_u *)0L} SCRIPTID_INIT},
+      {"guioptions",  "go",   P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST,
+  #if defined(FEAT_GUI)
+  			    (char_u *)&p_go, PV_NONE,
+***************
+*** 1255,1268 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 				    },
+      {"guipty",	    NULL,   P_BOOL|P_VI_DEF,
+  #if defined(FEAT_GUI)
+  			    (char_u *)&p_guipty, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"guitablabel",  "gtl", P_STRING|P_VI_DEF|P_RWIN,
+  #if defined(FEAT_GUI_TABLINE)
+  			    (char_u *)&p_gtl, PV_NONE,
+--- 1263,1276 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"guipty",	    NULL,   P_BOOL|P_VI_DEF,
+  #if defined(FEAT_GUI)
+  			    (char_u *)&p_guipty, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"guitablabel",  "gtl", P_STRING|P_VI_DEF|P_RWIN,
+  #if defined(FEAT_GUI_TABLINE)
+  			    (char_u *)&p_gtl, PV_NONE,
+***************
+*** 1271,1277 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 				    },
+      {"guitabtooltip",  "gtt", P_STRING|P_VI_DEF|P_RWIN,
+  #if defined(FEAT_GUI_TABLINE)
+  			    (char_u *)&p_gtt, PV_NONE,
+--- 1279,1285 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"guitabtooltip",  "gtt", P_STRING|P_VI_DEF|P_RWIN,
+  #if defined(FEAT_GUI_TABLINE)
+  			    (char_u *)&p_gtt, PV_NONE,
+***************
+*** 1280,1299 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 				    },
+      {"hardtabs",    "ht",   P_NUM|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"helpfile",    "hf",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_hf, PV_NONE,
+! 			    {(char_u *)DFLT_HELPFILE, (char_u *)0L}},
+      {"helpheight",  "hh",   P_NUM|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_hh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)20L, (char_u *)0L}},
+      {"helplang",    "hlg",  P_STRING|P_VI_DEF|P_COMMA,
+  #ifdef FEAT_MULTI_LANG
+  			    (char_u *)&p_hlg, PV_NONE,
+--- 1288,1308 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"hardtabs",    "ht",   P_NUM|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"helpfile",    "hf",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_hf, PV_NONE,
+! 			    {(char_u *)DFLT_HELPFILE, (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"helpheight",  "hh",   P_NUM|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_hh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
+      {"helplang",    "hlg",  P_STRING|P_VI_DEF|P_COMMA,
+  #ifdef FEAT_MULTI_LANG
+  			    (char_u *)&p_hlg, PV_NONE,
+***************
+*** 1302,1365 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+!     },
+      {"hidden",	    "hid",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_hid, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"highlight",   "hl",   P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
+  			    (char_u *)&p_hl, PV_NONE,
+! 			    {(char_u *)HIGHLIGHT_INIT, (char_u *)0L}},
+      {"history",	    "hi",   P_NUM|P_VIM,
+  			    (char_u *)&p_hi, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)20L}},
+      {"hkmap",	    "hk",   P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)&p_hkmap, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"hkmapp",	    "hkp",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)&p_hkmapp, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"hlsearch",    "hls",  P_BOOL|P_VI_DEF|P_VIM|P_RALL,
+  			    (char_u *)&p_hls, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"icon",	    NULL,   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_icon, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"iconstring",  NULL,   P_STRING|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_iconstring, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"ignorecase",  "ic",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ic, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"imactivatekey","imak",P_STRING|P_VI_DEF,
+  #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
+  			    (char_u *)&p_imak, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"imcmdline",   "imc",  P_BOOL|P_VI_DEF,
+  #ifdef USE_IM_CONTROL
+  			    (char_u *)&p_imcmdline, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"imdisable",   "imd",  P_BOOL|P_VI_DEF,
+  #ifdef USE_IM_CONTROL
+  			    (char_u *)&p_imdisable, PV_NONE,
+--- 1311,1375 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"hidden",	    "hid",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_hid, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"highlight",   "hl",   P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
+  			    (char_u *)&p_hl, PV_NONE,
+! 			    {(char_u *)HIGHLIGHT_INIT, (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"history",	    "hi",   P_NUM|P_VIM,
+  			    (char_u *)&p_hi, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)20L} SCRIPTID_INIT},
+      {"hkmap",	    "hk",   P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)&p_hkmap, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"hkmapp",	    "hkp",  P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)&p_hkmapp, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"hlsearch",    "hls",  P_BOOL|P_VI_DEF|P_VIM|P_RALL,
+  			    (char_u *)&p_hls, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"icon",	    NULL,   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_icon, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"iconstring",  NULL,   P_STRING|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_iconstring, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"ignorecase",  "ic",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ic, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"imactivatekey","imak",P_STRING|P_VI_DEF,
+  #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
+  			    (char_u *)&p_imak, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"imcmdline",   "imc",  P_BOOL|P_VI_DEF,
+  #ifdef USE_IM_CONTROL
+  			    (char_u *)&p_imcmdline, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"imdisable",   "imd",  P_BOOL|P_VI_DEF,
+  #ifdef USE_IM_CONTROL
+  			    (char_u *)&p_imdisable, PV_NONE,
+***************
+*** 1371,1377 ****
+  #else
+  			    {(char_u *)FALSE, (char_u *)0L}
+  #endif
+! 			    },
+      {"iminsert",    "imi",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_iminsert, PV_IMI,
+  #ifdef B_IMODE_IM
+--- 1381,1387 ----
+  #else
+  			    {(char_u *)FALSE, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"iminsert",    "imi",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_iminsert, PV_IMI,
+  #ifdef B_IMODE_IM
+***************
+*** 1379,1385 ****
+  #else
+  			    {(char_u *)B_IMODE_NONE, (char_u *)0L}
+  #endif
+! 			    },
+      {"imsearch",    "ims",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_imsearch, PV_IMS,
+  #ifdef B_IMODE_IM
+--- 1389,1395 ----
+  #else
+  			    {(char_u *)B_IMODE_NONE, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"imsearch",    "ims",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_imsearch, PV_IMS,
+  #ifdef B_IMODE_IM
+***************
+*** 1387,1393 ****
+  #else
+  			    {(char_u *)B_IMODE_NONE, (char_u *)0L}
+  #endif
+! 			    },
+      {"include",	    "inc",  P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_FIND_ID
+  			    (char_u *)&p_inc, PV_INC,
+--- 1397,1403 ----
+  #else
+  			    {(char_u *)B_IMODE_NONE, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"include",	    "inc",  P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_FIND_ID
+  			    (char_u *)&p_inc, PV_INC,
+***************
+*** 1396,1402 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"includeexpr", "inex", P_STRING|P_ALLOCED|P_VI_DEF,
+  #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL)
+  			    (char_u *)&p_inex, PV_INEX,
+--- 1406,1412 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"includeexpr", "inex", P_STRING|P_ALLOCED|P_VI_DEF,
+  #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL)
+  			    (char_u *)&p_inex, PV_INEX,
+***************
+*** 1405,1414 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"incsearch",   "is",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_is, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"indentexpr", "inde",  P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
+  #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
+  			    (char_u *)&p_inde, PV_INDE,
+--- 1415,1424 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"incsearch",   "is",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_is, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"indentexpr", "inde",  P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
+  #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
+  			    (char_u *)&p_inde, PV_INDE,
+***************
+*** 1417,1423 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"indentkeys", "indk",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
+  			    (char_u *)&p_indk, PV_INDK,
+--- 1427,1433 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"indentkeys", "indk",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
+  			    (char_u *)&p_indk, PV_INDK,
+***************
+*** 1426,1438 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"infercase",   "inf",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_inf, PV_INF,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"insertmode",  "im",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_im, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"isfname",	    "isf",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_isf, PV_NONE,
+  			    {
+--- 1436,1448 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"infercase",   "inf",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_inf, PV_INF,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"insertmode",  "im",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_im, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"isfname",	    "isf",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_isf, PV_NONE,
+  			    {
+***************
+*** 1455,1461 ****
+  #  endif
+  # endif
+  #endif
+! 				(char_u *)0L}},
+      {"isident",	    "isi",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_isi, PV_NONE,
+  			    {
+--- 1465,1471 ----
+  #  endif
+  # endif
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"isident",	    "isi",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_isi, PV_NONE,
+  			    {
+***************
+*** 1472,1478 ****
+  			    (char_u *)"@,48-57,_,192-255",
+  # endif
+  #endif
+! 				(char_u *)0L}},
+      {"iskeyword",   "isk",  P_STRING|P_ALLOCED|P_VIM|P_COMMA|P_NODUP,
+  			    (char_u *)&p_isk, PV_ISK,
+  			    {
+--- 1482,1488 ----
+  			    (char_u *)"@,48-57,_,192-255",
+  # endif
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"iskeyword",   "isk",  P_STRING|P_ALLOCED|P_VIM|P_COMMA|P_NODUP,
+  			    (char_u *)&p_isk, PV_ISK,
+  			    {
+***************
+*** 1491,1497 ****
+  				ISK_LATIN1
+  # endif
+  #endif
+! 				}},
+      {"isprint",	    "isp",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
+  			    (char_u *)&p_isp, PV_NONE,
+  			    {
+--- 1501,1507 ----
+  				ISK_LATIN1
+  # endif
+  #endif
+! 			    } SCRIPTID_INIT},
+      {"isprint",	    "isp",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
+  			    (char_u *)&p_isp, PV_NONE,
+  			    {
+***************
+*** 1507,1516 ****
+  			    ISP_LATIN1,
+  # endif
+  #endif
+! 				(char_u *)0L}},
+      {"joinspaces",  "js",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_js, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"key",	    NULL,   P_STRING|P_ALLOCED|P_VI_DEF|P_NO_MKRC,
+  #ifdef FEAT_CRYPT
+  			    (char_u *)&p_key, PV_KEY,
+--- 1517,1526 ----
+  			    ISP_LATIN1,
+  # endif
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"joinspaces",  "js",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_js, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"key",	    NULL,   P_STRING|P_ALLOCED|P_VI_DEF|P_NO_MKRC,
+  #ifdef FEAT_CRYPT
+  			    (char_u *)&p_key, PV_KEY,
+***************
+*** 1519,1525 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"keymap",	    "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC,
+  #ifdef FEAT_KEYMAP
+  			    (char_u *)&p_keymap, PV_KMAP,
+--- 1529,1535 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"keymap",	    "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC,
+  #ifdef FEAT_KEYMAP
+  			    (char_u *)&p_keymap, PV_KMAP,
+***************
+*** 1528,1541 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)0L}
+  #endif
+! 	},
+      {"keymodel",    "km",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_VISUAL
+  			    (char_u *)&p_km, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"keywordprg",  "kp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_kp, PV_KP,
+  			    {
+--- 1538,1551 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"keymodel",    "km",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_VISUAL
+  			    (char_u *)&p_km, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"keywordprg",  "kp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_kp, PV_KP,
+  			    {
+***************
+*** 1556,1562 ****
+  # endif
+  #endif
+  #endif
+! 				(char_u *)0L}},
+      {"langmap",     "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_LANGMAP
+  			    (char_u *)&p_langmap, PV_NONE,
+--- 1566,1572 ----
+  # endif
+  #endif
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"langmap",     "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_LANGMAP
+  			    (char_u *)&p_langmap, PV_NONE,
+***************
+*** 1565,1595 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL,
+  #endif
+! 				(char_u *)0L}},
+      {"langmenu",    "lm",   P_STRING|P_VI_DEF|P_NFNAME,
+  #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG)
+  			    (char_u *)&p_lm, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"laststatus",  "ls",   P_NUM|P_VI_DEF|P_RALL,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_ls, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L}},
+      {"lazyredraw",  "lz",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_lz, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"linebreak",   "lbr",  P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_LINEBREAK
+  			    (char_u *)VAR_WIN, PV_LBR,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"lines",	    NULL,   P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
+  			    (char_u *)&Rows, PV_NONE,
+  			    {
+--- 1575,1605 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL,
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"langmenu",    "lm",   P_STRING|P_VI_DEF|P_NFNAME,
+  #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG)
+  			    (char_u *)&p_lm, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"laststatus",  "ls",   P_NUM|P_VI_DEF|P_RALL,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_ls, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
+      {"lazyredraw",  "lz",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_lz, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"linebreak",   "lbr",  P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_LINEBREAK
+  			    (char_u *)VAR_WIN, PV_LBR,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"lines",	    NULL,   P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
+  			    (char_u *)&Rows, PV_NONE,
+  			    {
+***************
+*** 1598,1604 ****
+  #else
+  			    (char_u *)24L,
+  #endif
+! 					    (char_u *)0L}},
+      {"linespace",   "lsp",  P_NUM|P_VI_DEF|P_RCLR,
+  #ifdef FEAT_GUI
+  			    (char_u *)&p_linespace, PV_NONE,
+--- 1608,1614 ----
+  #else
+  			    (char_u *)24L,
+  #endif
+! 					    (char_u *)0L} SCRIPTID_INIT},
+      {"linespace",   "lsp",  P_NUM|P_VI_DEF|P_RCLR,
+  #ifdef FEAT_GUI
+  			    (char_u *)&p_linespace, PV_NONE,
+***************
+*** 1610,1623 ****
+  #else
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"lisp",	    NULL,   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_LISP
+  			    (char_u *)&p_lisp, PV_LISP,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"lispwords",   "lw",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_LISP
+  			    (char_u *)&p_lispwords, PV_NONE,
+--- 1620,1633 ----
+  #else
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"lisp",	    NULL,   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_LISP
+  			    (char_u *)&p_lisp, PV_LISP,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"lispwords",   "lw",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_LISP
+  			    (char_u *)&p_lispwords, PV_NONE,
+***************
+*** 1626,1649 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)0L}
+  #endif
+! 			    },
+      {"list",	    NULL,   P_BOOL|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_LIST,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"listchars",   "lcs",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
+  			    (char_u *)&p_lcs, PV_NONE,
+! 			    {(char_u *)"eol:$", (char_u *)0L}},
+      {"loadplugins", "lpl",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_lpl, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+  #ifdef FEAT_GUI_MAC
+      {"macatsui",    NULL,   P_BOOL|P_VI_DEF|P_RCLR,
+  			    (char_u *)&p_macatsui, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+  #endif
+      {"magic",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_magic, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"makeef",	    "mef",  P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_mef, PV_NONE,
+--- 1636,1659 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)"", (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"list",	    NULL,   P_BOOL|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_LIST,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"listchars",   "lcs",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
+  			    (char_u *)&p_lcs, PV_NONE,
+! 			    {(char_u *)"eol:$", (char_u *)0L} SCRIPTID_INIT},
+      {"loadplugins", "lpl",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_lpl, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+  #ifdef FEAT_GUI_MAC
+      {"macatsui",    NULL,   P_BOOL|P_VI_DEF|P_RCLR,
+  			    (char_u *)&p_macatsui, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+  #endif
+      {"magic",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_magic, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"makeef",	    "mef",  P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_mef, PV_NONE,
+***************
+*** 1652,1658 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"makeprg",	    "mp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_mp, PV_MP,
+--- 1662,1668 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"makeprg",	    "mp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_mp, PV_MP,
+***************
+*** 1665,1713 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"matchpairs",  "mps",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_mps, PV_MPS,
+! 			    {(char_u *)"(:),{:},[:]", (char_u *)0L}},
+      {"matchtime",   "mat",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mat, PV_NONE,
+! 			    {(char_u *)5L, (char_u *)0L}},
+      {"maxcombine",  "mco",  P_NUM|P_VI_DEF,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_mco, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)2, (char_u *)0L}},
+      {"maxfuncdepth", "mfd", P_NUM|P_VI_DEF,
+  #ifdef FEAT_EVAL
+  			    (char_u *)&p_mfd, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)100L, (char_u *)0L}},
+      {"maxmapdepth", "mmd",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mmd, PV_NONE,
+! 			    {(char_u *)1000L, (char_u *)0L}},
+      {"maxmem",	    "mm",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mm, PV_NONE,
+! 			    {(char_u *)DFLT_MAXMEM, (char_u *)0L}},
+      {"maxmempattern","mmp", P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mmp, PV_NONE,
+! 			    {(char_u *)1000L, (char_u *)0L}},
+      {"maxmemtot",   "mmt",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mmt, PV_NONE,
+! 			    {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L}},
+      {"menuitems",   "mis",  P_NUM|P_VI_DEF,
+  #ifdef FEAT_MENU
+  			    (char_u *)&p_mis, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)25L, (char_u *)0L}},
+      {"mesg",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"mkspellmem",  "msm",  P_STRING|P_VI_DEF|P_EXPAND|P_SECURE,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_msm, PV_NONE,
+--- 1675,1726 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"matchpairs",  "mps",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_mps, PV_MPS,
+! 			    {(char_u *)"(:),{:},[:]", (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"matchtime",   "mat",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mat, PV_NONE,
+! 			    {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT},
+      {"maxcombine",  "mco",  P_NUM|P_VI_DEF,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_mco, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)2, (char_u *)0L} SCRIPTID_INIT},
+      {"maxfuncdepth", "mfd", P_NUM|P_VI_DEF,
+  #ifdef FEAT_EVAL
+  			    (char_u *)&p_mfd, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)100L, (char_u *)0L} SCRIPTID_INIT},
+      {"maxmapdepth", "mmd",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mmd, PV_NONE,
+! 			    {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT},
+      {"maxmem",	    "mm",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mm, PV_NONE,
+! 			    {(char_u *)DFLT_MAXMEM, (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"maxmempattern","mmp", P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mmp, PV_NONE,
+! 			    {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT},
+      {"maxmemtot",   "mmt",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mmt, PV_NONE,
+! 			    {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"menuitems",   "mis",  P_NUM|P_VI_DEF,
+  #ifdef FEAT_MENU
+  			    (char_u *)&p_mis, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)25L, (char_u *)0L} SCRIPTID_INIT},
+      {"mesg",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"mkspellmem",  "msm",  P_STRING|P_VI_DEF|P_EXPAND|P_SECURE,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_msm, PV_NONE,
+***************
+*** 1716,1737 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+!     },
+      {"modeline",    "ml",   P_BOOL|P_VIM,
+  			    (char_u *)&p_ml, PV_ML,
+! 			    {(char_u *)FALSE, (char_u *)TRUE}},
+      {"modelines",   "mls",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mls, PV_NONE,
+! 			    {(char_u *)5L, (char_u *)0L}},
+      {"modifiable",  "ma",   P_BOOL|P_VI_DEF|P_NOGLOB,
+  			    (char_u *)&p_ma, PV_MA,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"modified",    "mod",  P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
+  			    (char_u *)&p_mod, PV_MOD,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"more",	    NULL,   P_BOOL|P_VIM,
+  			    (char_u *)&p_more, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE}},
+      {"mouse",	    NULL,   P_STRING|P_VI_DEF|P_FLAGLIST,
+  			    (char_u *)&p_mouse, PV_NONE,
+  			    {
+--- 1729,1750 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"modeline",    "ml",   P_BOOL|P_VIM,
+  			    (char_u *)&p_ml, PV_ML,
+! 			    {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
+      {"modelines",   "mls",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mls, PV_NONE,
+! 			    {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT},
+      {"modifiable",  "ma",   P_BOOL|P_VI_DEF|P_NOGLOB,
+  			    (char_u *)&p_ma, PV_MA,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"modified",    "mod",  P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
+  			    (char_u *)&p_mod, PV_MOD,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"more",	    NULL,   P_BOOL|P_VIM,
+  			    (char_u *)&p_more, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
+      {"mouse",	    NULL,   P_STRING|P_VI_DEF|P_FLAGLIST,
+  			    (char_u *)&p_mouse, PV_NONE,
+  			    {
+***************
+*** 1740,1760 ****
+  #else
+  				(char_u *)"",
+  #endif
+! 				(char_u *)0L}},
+      {"mousefocus",   "mousef", P_BOOL|P_VI_DEF,
+  #ifdef FEAT_GUI
+  			    (char_u *)&p_mousef, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"mousehide",   "mh",   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_GUI
+  			    (char_u *)&p_mh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"mousemodel",  "mousem", P_STRING|P_VI_DEF,
+  			    (char_u *)&p_mousem, PV_NONE,
+  			    {
+--- 1753,1773 ----
+  #else
+  				(char_u *)"",
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"mousefocus",   "mousef", P_BOOL|P_VI_DEF,
+  #ifdef FEAT_GUI
+  			    (char_u *)&p_mousef, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"mousehide",   "mh",   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_GUI
+  			    (char_u *)&p_mh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"mousemodel",  "mousem", P_STRING|P_VI_DEF,
+  			    (char_u *)&p_mousem, PV_NONE,
+  			    {
+***************
+*** 1767,1773 ****
+  				(char_u *)"extend",
+  # endif
+  #endif
+! 				(char_u *)0L}},
+      {"mouseshape",  "mouses",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_MOUSESHAPE
+  			    (char_u *)&p_mouseshape, PV_NONE,
+--- 1780,1786 ----
+  				(char_u *)"extend",
+  # endif
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"mouseshape",  "mouses",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_MOUSESHAPE
+  			    (char_u *)&p_mouseshape, PV_NONE,
+***************
+*** 1776,1808 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"mousetime",   "mouset",	P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mouset, PV_NONE,
+! 			    {(char_u *)500L, (char_u *)0L}},
+      {"mzquantum",  "mzq",   P_NUM,
+  #ifdef FEAT_MZSCHEME
+  			    (char_u *)&p_mzq, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)100L, (char_u *)100L}},
+      {"novice",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"nrformats",   "nf",   P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_nf, PV_NF,
+! 			    {(char_u *)"octal,hex", (char_u *)0L}},
+      {"number",	    "nu",   P_BOOL|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_NU,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"numberwidth", "nuw",  P_NUM|P_RWIN|P_VIM,
+  #ifdef FEAT_LINEBREAK
+  			    (char_u *)VAR_WIN, PV_NUW,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)8L, (char_u *)4L}},
+      {"omnifunc",    "ofu",  P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_COMPL_FUNC
+  			    (char_u *)&p_ofu, PV_OFU,
+--- 1789,1822 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"mousetime",   "mouset",	P_NUM|P_VI_DEF,
+  			    (char_u *)&p_mouset, PV_NONE,
+! 			    {(char_u *)500L, (char_u *)0L} SCRIPTID_INIT},
+      {"mzquantum",  "mzq",   P_NUM,
+  #ifdef FEAT_MZSCHEME
+  			    (char_u *)&p_mzq, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)100L, (char_u *)100L} SCRIPTID_INIT},
+      {"novice",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"nrformats",   "nf",   P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_nf, PV_NF,
+! 			    {(char_u *)"octal,hex", (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"number",	    "nu",   P_BOOL|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_NU,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"numberwidth", "nuw",  P_NUM|P_RWIN|P_VIM,
+  #ifdef FEAT_LINEBREAK
+  			    (char_u *)VAR_WIN, PV_NUW,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)8L, (char_u *)4L} SCRIPTID_INIT},
+      {"omnifunc",    "ofu",  P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_COMPL_FUNC
+  			    (char_u *)&p_ofu, PV_OFU,
+***************
+*** 1811,1820 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"open",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"opendevice",  "odev", P_BOOL|P_VI_DEF,
+  #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
+  			    (char_u *)&p_odev, PV_NONE,
+--- 1825,1834 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"open",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"opendevice",  "odev", P_BOOL|P_VI_DEF,
+  #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
+  			    (char_u *)&p_odev, PV_NONE,
+***************
+*** 1822,1834 ****
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+  			    {(char_u *)FALSE, (char_u *)FALSE}
+! 			    },
+      {"operatorfunc", "opfunc", P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_opfunc, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} },
+      {"optimize",    "opt",  P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"osfiletype",  "oft",  P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_OSFILETYPE
+  			    (char_u *)&p_oft, PV_OFT,
+--- 1836,1848 ----
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+  			    {(char_u *)FALSE, (char_u *)FALSE}
+! 			    SCRIPTID_INIT},
+      {"operatorfunc", "opfunc", P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_opfunc, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"optimize",    "opt",  P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"osfiletype",  "oft",  P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_OSFILETYPE
+  			    (char_u *)&p_oft, PV_OFT,
+***************
+*** 1837,1853 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"paragraphs",  "para", P_STRING|P_VI_DEF,
+  			    (char_u *)&p_para, PV_NONE,
+  			    {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp",
+! 				(char_u *)0L}},
+      {"paste",	    NULL,   P_BOOL|P_VI_DEF|P_PRI_MKRC,
+  			    (char_u *)&p_paste, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"pastetoggle", "pt",   P_STRING|P_VI_DEF,
+  			    (char_u *)&p_pt, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"patchexpr",   "pex",  P_STRING|P_VI_DEF|P_SECURE,
+  #if defined(FEAT_DIFF) && defined(FEAT_EVAL)
+  			    (char_u *)&p_pex, PV_NONE,
+--- 1851,1867 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"paragraphs",  "para", P_STRING|P_VI_DEF,
+  			    (char_u *)&p_para, PV_NONE,
+  			    {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp",
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"paste",	    NULL,   P_BOOL|P_VI_DEF|P_PRI_MKRC,
+  			    (char_u *)&p_paste, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"pastetoggle", "pt",   P_STRING|P_VI_DEF,
+  			    (char_u *)&p_pt, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"patchexpr",   "pex",  P_STRING|P_VI_DEF|P_SECURE,
+  #if defined(FEAT_DIFF) && defined(FEAT_EVAL)
+  			    (char_u *)&p_pex, PV_NONE,
+***************
+*** 1856,1865 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"patchmode",   "pm",   P_STRING|P_VI_DEF|P_NFNAME,
+  			    (char_u *)&p_pm, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"path",	    "pa",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_path, PV_PATH,
+  			    {
+--- 1870,1879 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"patchmode",   "pm",   P_STRING|P_VI_DEF|P_NFNAME,
+  			    (char_u *)&p_pm, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"path",	    "pa",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_path, PV_PATH,
+  			    {
+***************
+*** 1872,1895 ****
+  			    (char_u *)".,/usr/include,,",
+  # endif
+  #endif
+! 				(char_u *)0L}},
+      {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_pi, PV_PI,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"previewheight", "pvh", P_NUM|P_VI_DEF,
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+  			    (char_u *)&p_pvh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)12L, (char_u *)0L}},
+      {"previewwindow", "pvw", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB,
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+  			    (char_u *)VAR_WIN, PV_PVW,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_PRINTER
+  			    (char_u *)&p_pdev, PV_NONE,
+--- 1886,1909 ----
+  			    (char_u *)".,/usr/include,,",
+  # endif
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_pi, PV_PI,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"previewheight", "pvh", P_NUM|P_VI_DEF,
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+  			    (char_u *)&p_pvh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)12L, (char_u *)0L} SCRIPTID_INIT},
+      {"previewwindow", "pvw", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB,
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+  			    (char_u *)VAR_WIN, PV_PVW,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_PRINTER
+  			    (char_u *)&p_pdev, PV_NONE,
+***************
+*** 1898,1904 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"printencoding", "penc", P_STRING|P_VI_DEF,
+  #ifdef FEAT_POSTSCRIPT
+  			    (char_u *)&p_penc, PV_NONE,
+--- 1912,1918 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"printencoding", "penc", P_STRING|P_VI_DEF,
+  #ifdef FEAT_POSTSCRIPT
+  			    (char_u *)&p_penc, PV_NONE,
+***************
+*** 1907,1913 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"printexpr", "pexpr",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_POSTSCRIPT
+  			    (char_u *)&p_pexpr, PV_NONE,
+--- 1921,1927 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"printexpr", "pexpr",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_POSTSCRIPT
+  			    (char_u *)&p_pexpr, PV_NONE,
+***************
+*** 1916,1922 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"printfont", "pfn",    P_STRING|P_VI_DEF,
+  #ifdef FEAT_PRINTER
+  			    (char_u *)&p_pfn, PV_NONE,
+--- 1930,1936 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"printfont", "pfn",    P_STRING|P_VI_DEF,
+  #ifdef FEAT_PRINTER
+  			    (char_u *)&p_pfn, PV_NONE,
+***************
+*** 1931,1937 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"printheader", "pheader",  P_STRING|P_VI_DEF|P_GETTEXT,
+  #ifdef FEAT_PRINTER
+  			    (char_u *)&p_header, PV_NONE,
+--- 1945,1951 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"printheader", "pheader",  P_STRING|P_VI_DEF|P_GETTEXT,
+  #ifdef FEAT_PRINTER
+  			    (char_u *)&p_header, PV_NONE,
+***************
+*** 1940,1946 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+     {"printmbcharset", "pmbcs",  P_STRING|P_VI_DEF,
+  #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE)
+  			    (char_u *)&p_pmcs, PV_NONE,
+--- 1954,1960 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+     {"printmbcharset", "pmbcs",  P_STRING|P_VI_DEF,
+  #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE)
+  			    (char_u *)&p_pmcs, PV_NONE,
+***************
+*** 1949,1955 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"printmbfont", "pmbfn",  P_STRING|P_VI_DEF,
+  #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE)
+  			    (char_u *)&p_pmfn, PV_NONE,
+--- 1963,1969 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"printmbfont", "pmbfn",  P_STRING|P_VI_DEF,
+  #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE)
+  			    (char_u *)&p_pmfn, PV_NONE,
+***************
+*** 1958,1964 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"printoptions", "popt", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_PRINTER
+  			    (char_u *)&p_popt, PV_NONE,
+--- 1972,1978 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"printoptions", "popt", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_PRINTER
+  			    (char_u *)&p_popt, PV_NONE,
+***************
+*** 1967,1983 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"prompt",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_prompt, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"pumheight",   "ph",   P_NUM|P_VI_DEF,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_ph, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"quoteescape", "qe",   P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_TEXTOBJ
+  			    (char_u *)&p_qe, PV_QE,
+--- 1981,1997 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"prompt",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_prompt, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"pumheight",   "ph",   P_NUM|P_VI_DEF,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_ph, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"quoteescape", "qe",   P_STRING|P_ALLOCED|P_VI_DEF,
+  #ifdef FEAT_TEXTOBJ
+  			    (char_u *)&p_qe, PV_QE,
+***************
+*** 1986,2032 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"readonly",    "ro",   P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB,
+  			    (char_u *)&p_ro, PV_RO,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"redraw",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"redrawtime",  "rdt",  P_NUM|P_VI_DEF,
+  #ifdef FEAT_RELTIME
+  			    (char_u *)&p_rdt, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)2000L, (char_u *)0L}},
+      {"remap",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_remap, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"report",	    NULL,   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_report, PV_NONE,
+! 			    {(char_u *)2L, (char_u *)0L}},
+      {"restorescreen", "rs", P_BOOL|P_VI_DEF,
+  #ifdef WIN3264
+  			    (char_u *)&p_rs, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"revins",	    "ri",   P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)&p_ri, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"rightleft",   "rl",   P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)VAR_WIN, PV_RL,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"rightleftcmd", "rlc", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)VAR_WIN, PV_RLC,
+--- 2000,2046 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"readonly",    "ro",   P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB,
+  			    (char_u *)&p_ro, PV_RO,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"redraw",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"redrawtime",  "rdt",  P_NUM|P_VI_DEF,
+  #ifdef FEAT_RELTIME
+  			    (char_u *)&p_rdt, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)2000L, (char_u *)0L} SCRIPTID_INIT},
+      {"remap",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_remap, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"report",	    NULL,   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_report, PV_NONE,
+! 			    {(char_u *)2L, (char_u *)0L} SCRIPTID_INIT},
+      {"restorescreen", "rs", P_BOOL|P_VI_DEF,
+  #ifdef WIN3264
+  			    (char_u *)&p_rs, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"revins",	    "ri",   P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)&p_ri, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"rightleft",   "rl",   P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)VAR_WIN, PV_RL,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"rightleftcmd", "rlc", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_RIGHTLEFT
+  			    (char_u *)VAR_WIN, PV_RLC,
+***************
+*** 2035,2074 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"ruler",	    "ru",   P_BOOL|P_VI_DEF|P_VIM|P_RSTAT,
+  #ifdef FEAT_CMDL_INFO
+  			    (char_u *)&p_ru, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"rulerformat", "ruf",  P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT,
+  #ifdef FEAT_STL_OPT
+  			    (char_u *)&p_ruf, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"runtimepath", "rtp",  P_STRING|P_VI_DEF|P_EXPAND|P_COMMA|P_NODUP|P_SECURE,
+  			    (char_u *)&p_rtp, PV_NONE,
+! 			    {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L}},
+      {"scroll",	    "scr",  P_NUM|P_NO_MKRC|P_VI_DEF,
+  			    (char_u *)VAR_WIN, PV_SCROLL,
+! 			    {(char_u *)12L, (char_u *)0L}},
+      {"scrollbind",  "scb",  P_BOOL|P_VI_DEF,
+  #ifdef FEAT_SCROLLBIND
+  			    (char_u *)VAR_WIN, PV_SCBIND,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"scrolljump",  "sj",   P_NUM|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sj, PV_NONE,
+! 			    {(char_u *)1L, (char_u *)0L}},
+      {"scrolloff",   "so",   P_NUM|P_VI_DEF|P_VIM|P_RALL,
+  			    (char_u *)&p_so, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"scrollopt",   "sbo",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_SCROLLBIND
+  			    (char_u *)&p_sbo, PV_NONE,
+--- 2049,2089 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"ruler",	    "ru",   P_BOOL|P_VI_DEF|P_VIM|P_RSTAT,
+  #ifdef FEAT_CMDL_INFO
+  			    (char_u *)&p_ru, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"rulerformat", "ruf",  P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT,
+  #ifdef FEAT_STL_OPT
+  			    (char_u *)&p_ruf, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"runtimepath", "rtp",  P_STRING|P_VI_DEF|P_EXPAND|P_COMMA|P_NODUP|P_SECURE,
+  			    (char_u *)&p_rtp, PV_NONE,
+! 			    {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"scroll",	    "scr",  P_NUM|P_NO_MKRC|P_VI_DEF,
+  			    (char_u *)VAR_WIN, PV_SCROLL,
+! 			    {(char_u *)12L, (char_u *)0L} SCRIPTID_INIT},
+      {"scrollbind",  "scb",  P_BOOL|P_VI_DEF,
+  #ifdef FEAT_SCROLLBIND
+  			    (char_u *)VAR_WIN, PV_SCBIND,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"scrolljump",  "sj",   P_NUM|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sj, PV_NONE,
+! 			    {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
+      {"scrolloff",   "so",   P_NUM|P_VI_DEF|P_VIM|P_RALL,
+  			    (char_u *)&p_so, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"scrollopt",   "sbo",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_SCROLLBIND
+  			    (char_u *)&p_sbo, PV_NONE,
+***************
+*** 2077,2103 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"sections",    "sect", P_STRING|P_VI_DEF,
+  			    (char_u *)&p_sections, PV_NONE,
+! 			    {(char_u *)"SHNHH HUnhsh", (char_u *)0L}},
+      {"secure",	    NULL,   P_BOOL|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_secure, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"selection",   "sel",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_VISUAL
+  			    (char_u *)&p_sel, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"inclusive", (char_u *)0L}},
+      {"selectmode",  "slm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_VISUAL
+  			    (char_u *)&p_slm, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_SESSION
+  			    (char_u *)&p_ssop, PV_NONE,
+--- 2092,2120 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"sections",    "sect", P_STRING|P_VI_DEF,
+  			    (char_u *)&p_sections, PV_NONE,
+! 			    {(char_u *)"SHNHH HUnhsh", (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"secure",	    NULL,   P_BOOL|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_secure, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"selection",   "sel",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_VISUAL
+  			    (char_u *)&p_sel, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"inclusive", (char_u *)0L}
+! 			    SCRIPTID_INIT},
+      {"selectmode",  "slm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_VISUAL
+  			    (char_u *)&p_slm, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_SESSION
+  			    (char_u *)&p_ssop, PV_NONE,
+***************
+*** 2107,2113 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"shell",	    "sh",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_sh, PV_NONE,
+  			    {
+--- 2124,2130 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"shell",	    "sh",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_sh, PV_NONE,
+  			    {
+***************
+*** 2136,2142 ****
+  #  endif
+  # endif
+  #endif /* VMS */
+! 				(char_u *)0L}},
+      {"shellcmdflag","shcf", P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_shcf, PV_NONE,
+  			    {
+--- 2153,2159 ----
+  #  endif
+  # endif
+  #endif /* VMS */
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"shellcmdflag","shcf", P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_shcf, PV_NONE,
+  			    {
+***************
+*** 2149,2155 ****
+  			    (char_u *)"-c",
+  # endif
+  #endif
+! 				(char_u *)0L}},
+      {"shellpipe",   "sp",   P_STRING|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_sp, PV_NONE,
+--- 2166,2172 ----
+  			    (char_u *)"-c",
+  # endif
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"shellpipe",   "sp",   P_STRING|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_QUICKFIX
+  			    (char_u *)&p_sp, PV_NONE,
+***************
+*** 2168,2197 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+!     },
+      {"shellquote",  "shq",  P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_shq, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"shellredir",  "srr",  P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_srr, PV_NONE,
+! 			    {(char_u *)">", (char_u *)0L}},
+      {"shellslash",  "ssl",   P_BOOL|P_VI_DEF,
+  #ifdef BACKSLASH_IN_FILENAME
+  			    (char_u *)&p_ssl, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"shelltemp",   "stmp", P_BOOL,
+  			    (char_u *)&p_stmp, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE}},
+      {"shelltype",   "st",   P_NUM|P_VI_DEF,
+  #ifdef AMIGA
+  			    (char_u *)&p_st, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"shellxquote", "sxq",  P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_sxq, PV_NONE,
+  			    {
+--- 2185,2214 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"shellquote",  "shq",  P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_shq, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"shellredir",  "srr",  P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_srr, PV_NONE,
+! 			    {(char_u *)">", (char_u *)0L} SCRIPTID_INIT},
+      {"shellslash",  "ssl",   P_BOOL|P_VI_DEF,
+  #ifdef BACKSLASH_IN_FILENAME
+  			    (char_u *)&p_ssl, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"shelltemp",   "stmp", P_BOOL,
+  			    (char_u *)&p_stmp, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
+      {"shelltype",   "st",   P_NUM|P_VI_DEF,
+  #ifdef AMIGA
+  			    (char_u *)&p_st, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"shellxquote", "sxq",  P_STRING|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_sxq, PV_NONE,
+  			    {
+***************
+*** 2200,2229 ****
+  #else
+  			    (char_u *)"",
+  #endif
+! 				(char_u *)0L}},
+      {"shiftround",  "sr",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sr, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"shiftwidth",  "sw",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_sw, PV_SW,
+! 			    {(char_u *)8L, (char_u *)0L}},
+      {"shortmess",   "shm",  P_STRING|P_VIM|P_FLAGLIST,
+  			    (char_u *)&p_shm, PV_NONE,
+! 			    {(char_u *)"", (char_u *)"filnxtToO"}},
+      {"shortname",   "sn",   P_BOOL|P_VI_DEF,
+  #ifdef SHORT_FNAME
+  			    (char_u *)NULL, PV_NONE,
+  #else
+  			    (char_u *)&p_sn, PV_SN,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"showbreak",   "sbr",  P_STRING|P_VI_DEF|P_RALL,
+  #ifdef FEAT_LINEBREAK
+  			    (char_u *)&p_sbr, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"showcmd",	    "sc",   P_BOOL|P_VIM,
+  #ifdef FEAT_CMDL_INFO
+  			    (char_u *)&p_sc, PV_NONE,
+--- 2217,2247 ----
+  #else
+  			    (char_u *)"",
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"shiftround",  "sr",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sr, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"shiftwidth",  "sw",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_sw, PV_SW,
+! 			    {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT},
+      {"shortmess",   "shm",  P_STRING|P_VIM|P_FLAGLIST,
+  			    (char_u *)&p_shm, PV_NONE,
+! 			    {(char_u *)"", (char_u *)"filnxtToO"}
+! 			    SCRIPTID_INIT},
+      {"shortname",   "sn",   P_BOOL|P_VI_DEF,
+  #ifdef SHORT_FNAME
+  			    (char_u *)NULL, PV_NONE,
+  #else
+  			    (char_u *)&p_sn, PV_SN,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"showbreak",   "sbr",  P_STRING|P_VI_DEF|P_RALL,
+  #ifdef FEAT_LINEBREAK
+  			    (char_u *)&p_sbr, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"showcmd",	    "sc",   P_BOOL|P_VIM,
+  #ifdef FEAT_CMDL_INFO
+  			    (char_u *)&p_sc, PV_NONE,
+***************
+*** 2236,2293 ****
+  #else
+  				(char_u *)TRUE
+  #endif
+! 				}},
+      {"showfulltag", "sft",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_sft, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"showmatch",   "sm",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_sm, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"showmode",    "smd",  P_BOOL|P_VIM,
+  			    (char_u *)&p_smd, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE}},
+      {"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_stal, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L}},
+      {"sidescroll",  "ss",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ss, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"sidescrolloff", "siso", P_NUM|P_VI_DEF|P_VIM|P_RBUF,
+  			    (char_u *)&p_siso, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"slowopen",    "slow", P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"smartcase",   "scs",  P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_scs, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"smartindent", "si",   P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_SMARTINDENT
+  			    (char_u *)&p_si, PV_SI,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"smarttab",    "sta",  P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sta, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"softtabstop", "sts",  P_NUM|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sts, PV_STS,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"sourceany",   NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"spell",	    NULL,   P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_SPELL
+  			    (char_u *)VAR_WIN, PV_SPELL,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_spc, PV_SPC,
+--- 2254,2311 ----
+  #else
+  				(char_u *)TRUE
+  #endif
+! 				} SCRIPTID_INIT},
+      {"showfulltag", "sft",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_sft, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"showmatch",   "sm",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_sm, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"showmode",    "smd",  P_BOOL|P_VIM,
+  			    (char_u *)&p_smd, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
+      {"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_stal, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
+      {"sidescroll",  "ss",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ss, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"sidescrolloff", "siso", P_NUM|P_VI_DEF|P_VIM|P_RBUF,
+  			    (char_u *)&p_siso, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"slowopen",    "slow", P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"smartcase",   "scs",  P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_scs, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"smartindent", "si",   P_BOOL|P_VI_DEF|P_VIM,
+  #ifdef FEAT_SMARTINDENT
+  			    (char_u *)&p_si, PV_SI,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"smarttab",    "sta",  P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sta, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"softtabstop", "sts",  P_NUM|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sts, PV_STS,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"sourceany",   NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"spell",	    NULL,   P_BOOL|P_VI_DEF|P_RWIN,
+  #ifdef FEAT_SPELL
+  			    (char_u *)VAR_WIN, PV_SPELL,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_spc, PV_SPC,
+***************
+*** 2296,2302 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"spellfile",   "spf",  P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE|P_COMMA,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_spf, PV_SPF,
+--- 2314,2320 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"spellfile",   "spf",  P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE|P_COMMA,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_spf, PV_SPF,
+***************
+*** 2305,2311 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"spelllang",   "spl",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_RBUF|P_EXPAND,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_spl, PV_SPL,
+--- 2323,2329 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"spelllang",   "spl",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_RBUF|P_EXPAND,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_spl, PV_SPL,
+***************
+*** 2314,2320 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_sps, PV_NONE,
+--- 2332,2338 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA,
+  #ifdef FEAT_SPELL
+  			    (char_u *)&p_sps, PV_NONE,
+***************
+*** 2323,2357 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+!     },
+      {"splitbelow",  "sb",   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_sb, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"splitright",  "spr",  P_BOOL|P_VI_DEF,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)&p_spr, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"startofline", "sol",  P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sol, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"statusline"  ,"stl",  P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT,
+  #ifdef FEAT_STL_OPT
+  			    (char_u *)&p_stl, PV_STL,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"suffixes",    "su",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_su, PV_NONE,
+  			    {(char_u *)".bak,~,.o,.h,.info,.swp,.obj",
+! 				(char_u *)0L}},
+      {"suffixesadd", "sua",  P_STRING|P_VI_DEF|P_ALLOCED|P_COMMA|P_NODUP,
+  #ifdef FEAT_SEARCHPATH
+  			    (char_u *)&p_sua, PV_SUA,
+--- 2341,2375 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"splitbelow",  "sb",   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_sb, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"splitright",  "spr",  P_BOOL|P_VI_DEF,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)&p_spr, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"startofline", "sol",  P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_sol, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"statusline"  ,"stl",  P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT,
+  #ifdef FEAT_STL_OPT
+  			    (char_u *)&p_stl, PV_STL,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"suffixes",    "su",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_su, PV_NONE,
+  			    {(char_u *)".bak,~,.o,.h,.info,.swp,.obj",
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"suffixesadd", "sua",  P_STRING|P_VI_DEF|P_ALLOCED|P_COMMA|P_NODUP,
+  #ifdef FEAT_SEARCHPATH
+  			    (char_u *)&p_sua, PV_SUA,
+***************
+*** 2360,2375 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"swapfile",    "swf",  P_BOOL|P_VI_DEF|P_RSTAT,
+  			    (char_u *)&p_swf, PV_SWF,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"swapsync",    "sws",  P_STRING|P_VI_DEF,
+  			    (char_u *)&p_sws, PV_NONE,
+! 			    {(char_u *)"fsync", (char_u *)0L}},
+      {"switchbuf",   "swb",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_swb, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"synmaxcol",   "smc",  P_NUM|P_VI_DEF|P_RBUF,
+  #ifdef FEAT_SYN_HL
+  			    (char_u *)&p_smc, PV_SMC,
+--- 2378,2393 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"swapfile",    "swf",  P_BOOL|P_VI_DEF|P_RSTAT,
+  			    (char_u *)&p_swf, PV_SWF,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"swapsync",    "sws",  P_STRING|P_VI_DEF,
+  			    (char_u *)&p_sws, PV_NONE,
+! 			    {(char_u *)"fsync", (char_u *)0L} SCRIPTID_INIT},
+      {"switchbuf",   "swb",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_swb, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"synmaxcol",   "smc",  P_NUM|P_VI_DEF|P_RBUF,
+  #ifdef FEAT_SYN_HL
+  			    (char_u *)&p_smc, PV_SMC,
+***************
+*** 2378,2384 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"syntax",	    "syn",  P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
+  #ifdef FEAT_SYN_HL
+  			    (char_u *)&p_syn, PV_SYN,
+--- 2396,2402 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"syntax",	    "syn",  P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
+  #ifdef FEAT_SYN_HL
+  			    (char_u *)&p_syn, PV_SYN,
+***************
+*** 2387,2410 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"tabline",	    "tal",  P_STRING|P_VI_DEF|P_RALL,
+  #ifdef FEAT_STL_OPT
+  			    (char_u *)&p_tal, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"tabpagemax",  "tpm",  P_NUM|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_tpm, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)10L, (char_u *)0L}},
+      {"tabstop",	    "ts",   P_NUM|P_VI_DEF|P_RBUF,
+  			    (char_u *)&p_ts, PV_TS,
+! 			    {(char_u *)8L, (char_u *)0L}},
+      {"tagbsearch",  "tbs",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_tbs, PV_NONE,
+  #ifdef VMS	/* binary searching doesn't appear to work on VMS */
+--- 2405,2428 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"tabline",	    "tal",  P_STRING|P_VI_DEF|P_RALL,
+  #ifdef FEAT_STL_OPT
+  			    (char_u *)&p_tal, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"tabpagemax",  "tpm",  P_NUM|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_tpm, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)10L, (char_u *)0L} SCRIPTID_INIT},
+      {"tabstop",	    "ts",   P_NUM|P_VI_DEF|P_RBUF,
+  			    (char_u *)&p_ts, PV_TS,
+! 			    {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT},
+      {"tagbsearch",  "tbs",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_tbs, PV_NONE,
+  #ifdef VMS	/* binary searching doesn't appear to work on VMS */
+***************
+*** 2412,2424 ****
+  #else
+  			    {(char_u *)TRUE, (char_u *)0L}
+  #endif
+! 			    },
+      {"taglength",   "tl",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_tl, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"tagrelative", "tr",   P_BOOL|P_VIM,
+  			    (char_u *)&p_tr, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE}},
+      {"tags",	    "tag",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_tags, PV_TAGS,
+  			    {
+--- 2430,2442 ----
+  #else
+  			    {(char_u *)TRUE, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"taglength",   "tl",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_tl, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"tagrelative", "tr",   P_BOOL|P_VIM,
+  			    (char_u *)&p_tr, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
+      {"tags",	    "tag",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_tags, PV_TAGS,
+  			    {
+***************
+*** 2427,2446 ****
+  #else
+  			    (char_u *)"./tags,tags",
+  #endif
+! 				(char_u *)0L}},
+      {"tagstack",    "tgst", P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_tgst, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"term",	    NULL,   P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
+  			    (char_u *)&T_NAME, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"termbidi", "tbidi",   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_ARABIC
+  			    (char_u *)&p_tbidi, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_tenc, PV_NONE,
+--- 2445,2464 ----
+  #else
+  			    (char_u *)"./tags,tags",
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"tagstack",    "tgst", P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_tgst, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"term",	    NULL,   P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
+  			    (char_u *)&T_NAME, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"termbidi", "tbidi",   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_ARABIC
+  			    (char_u *)&p_tbidi, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR,
+  #ifdef FEAT_MBYTE
+  			    (char_u *)&p_tenc, PV_NONE,
+***************
+*** 2449,2461 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"terse",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_terse, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"textauto",    "ta",   P_BOOL|P_VIM,
+  			    (char_u *)&p_ta, PV_NONE,
+! 			    {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE}},
+      {"textmode",    "tx",   P_BOOL|P_VI_DEF|P_NO_MKRC,
+  			    (char_u *)&p_tx, PV_TX,
+  			    {
+--- 2467,2480 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"terse",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_terse, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"textauto",    "ta",   P_BOOL|P_VIM,
+  			    (char_u *)&p_ta, PV_NONE,
+! 			    {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE}
+! 			    SCRIPTID_INIT},
+      {"textmode",    "tx",   P_BOOL|P_VI_DEF|P_NO_MKRC,
+  			    (char_u *)&p_tx, PV_TX,
+  			    {
+***************
+*** 2464,2503 ****
+  #else
+  			    (char_u *)FALSE,
+  #endif
+! 				(char_u *)0L}},
+      {"textwidth",   "tw",   P_NUM|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_tw, PV_TW,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"thesaurus",   "tsr",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_tsr, PV_TSR,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"tildeop",	    "top",  P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_to, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"timeout",	    "to",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_timeout, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"timeoutlen",  "tm",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_tm, PV_NONE,
+! 			    {(char_u *)1000L, (char_u *)0L}},
+      {"title",	    NULL,   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_title, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"titlelen",    NULL,   P_NUM|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_titlelen, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)85L, (char_u *)0L}},
+      {"titleold",    NULL,   P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE|P_NO_MKRC,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_titleold, PV_NONE,
+--- 2483,2522 ----
+  #else
+  			    (char_u *)FALSE,
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"textwidth",   "tw",   P_NUM|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_tw, PV_TW,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"thesaurus",   "tsr",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_INS_EXPAND
+  			    (char_u *)&p_tsr, PV_TSR,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"tildeop",	    "top",  P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_to, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"timeout",	    "to",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_timeout, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"timeoutlen",  "tm",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_tm, PV_NONE,
+! 			    {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT},
+      {"title",	    NULL,   P_BOOL|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_title, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"titlelen",    NULL,   P_NUM|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_titlelen, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)85L, (char_u *)0L} SCRIPTID_INIT},
+      {"titleold",    NULL,   P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE|P_NO_MKRC,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_titleold, PV_NONE,
+***************
+*** 2507,2555 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"titlestring", NULL,   P_STRING|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_titlestring, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+  #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
+      {"toolbar",     "tb",   P_STRING|P_COMMA|P_VI_DEF|P_NODUP,
+  			    (char_u *)&p_toolbar, PV_NONE,
+! 			    {(char_u *)"icons,tooltips", (char_u *)0L}},
+  #endif
+  #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) && defined(HAVE_GTK2)
+      {"toolbariconsize",	"tbis", P_STRING|P_VI_DEF,
+  			    (char_u *)&p_tbis, PV_NONE,
+! 			    {(char_u *)"small", (char_u *)0L}},
+  #endif
+      {"ttimeout",    NULL,   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_ttimeout, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"ttimeoutlen", "ttm",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ttm, PV_NONE,
+! 			    {(char_u *)-1L, (char_u *)0L}},
+      {"ttybuiltin",  "tbi",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_tbi, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"ttyfast",	    "tf",   P_BOOL|P_NO_MKRC|P_VI_DEF,
+  			    (char_u *)&p_tf, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"ttymouse",    "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF,
+  #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS))
+  			    (char_u *)&p_ttym, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"ttyscroll",   "tsl",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ttyscroll, PV_NONE,
+! 			    {(char_u *)999L, (char_u *)0L}},
+      {"ttytype",	    "tty",  P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
+  			    (char_u *)&T_NAME, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"undolevels",  "ul",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ul, PV_NONE,
+  			    {
+--- 2526,2575 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"titlestring", NULL,   P_STRING|P_VI_DEF,
+  #ifdef FEAT_TITLE
+  			    (char_u *)&p_titlestring, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+  #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
+      {"toolbar",     "tb",   P_STRING|P_COMMA|P_VI_DEF|P_NODUP,
+  			    (char_u *)&p_toolbar, PV_NONE,
+! 			    {(char_u *)"icons,tooltips", (char_u *)0L}
+! 			    SCRIPTID_INIT},
+  #endif
+  #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) && defined(HAVE_GTK2)
+      {"toolbariconsize",	"tbis", P_STRING|P_VI_DEF,
+  			    (char_u *)&p_tbis, PV_NONE,
+! 			    {(char_u *)"small", (char_u *)0L} SCRIPTID_INIT},
+  #endif
+      {"ttimeout",    NULL,   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_ttimeout, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"ttimeoutlen", "ttm",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ttm, PV_NONE,
+! 			    {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
+      {"ttybuiltin",  "tbi",  P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_tbi, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"ttyfast",	    "tf",   P_BOOL|P_NO_MKRC|P_VI_DEF,
+  			    (char_u *)&p_tf, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"ttymouse",    "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF,
+  #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS))
+  			    (char_u *)&p_ttym, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"ttyscroll",   "tsl",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ttyscroll, PV_NONE,
+! 			    {(char_u *)999L, (char_u *)0L} SCRIPTID_INIT},
+      {"ttytype",	    "tty",  P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
+  			    (char_u *)&T_NAME, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"undolevels",  "ul",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ul, PV_NONE,
+  			    {
+***************
+*** 2558,2576 ****
+  #else
+  			    (char_u *)100L,
+  #endif
+! 				(char_u *)0L}},
+      {"updatecount", "uc",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_uc, PV_NONE,
+! 			    {(char_u *)200L, (char_u *)0L}},
+      {"updatetime",  "ut",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ut, PV_NONE,
+! 			    {(char_u *)4000L, (char_u *)0L}},
+      {"verbose",	    "vbs",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_verbose, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"verbosefile", "vfile", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_vfile, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"viewdir",     "vdir", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_SESSION
+  			    (char_u *)&p_vdir, PV_NONE,
+--- 2578,2596 ----
+  #else
+  			    (char_u *)100L,
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"updatecount", "uc",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_uc, PV_NONE,
+! 			    {(char_u *)200L, (char_u *)0L} SCRIPTID_INIT},
+      {"updatetime",  "ut",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_ut, PV_NONE,
+! 			    {(char_u *)4000L, (char_u *)0L} SCRIPTID_INIT},
+      {"verbose",	    "vbs",  P_NUM|P_VI_DEF,
+  			    (char_u *)&p_verbose, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"verbosefile", "vfile", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  			    (char_u *)&p_vfile, PV_NONE,
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"viewdir",     "vdir", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_SESSION
+  			    (char_u *)&p_vdir, PV_NONE,
+***************
+*** 2579,2585 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"viewoptions", "vop",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_SESSION
+  			    (char_u *)&p_vop, PV_NONE,
+--- 2599,2605 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"viewoptions", "vop",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_SESSION
+  			    (char_u *)&p_vop, PV_NONE,
+***************
+*** 2588,2594 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"viminfo",	    "vi",   P_STRING|P_COMMA|P_NODUP|P_SECURE,
+  #ifdef FEAT_VIMINFO
+  			    (char_u *)&p_viminfo, PV_NONE,
+--- 2608,2614 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"viminfo",	    "vi",   P_STRING|P_COMMA|P_NODUP|P_SECURE,
+  #ifdef FEAT_VIMINFO
+  			    (char_u *)&p_viminfo, PV_NONE,
+***************
+*** 2606,2612 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"virtualedit", "ve",   P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM,
+  #ifdef FEAT_VIRTUALEDIT
+  			    (char_u *)&p_ve, PV_NONE,
+--- 2626,2632 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"virtualedit", "ve",   P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM,
+  #ifdef FEAT_VIRTUALEDIT
+  			    (char_u *)&p_ve, PV_NONE,
+***************
+*** 2615,2665 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    },
+      {"visualbell",  "vb",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_vb, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"w300",	    NULL,   P_NUM|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"w1200",	    NULL,   P_NUM|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"w9600",	    NULL,   P_NUM|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"warn",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_warn, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"weirdinvert", "wiv",  P_BOOL|P_VI_DEF|P_RCLR,
+  			    (char_u *)&p_wiv, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"whichwrap",   "ww",   P_STRING|P_VIM|P_COMMA|P_FLAGLIST,
+  			    (char_u *)&p_ww, PV_NONE,
+! 			    {(char_u *)"", (char_u *)"b,s"}},
+      {"wildchar",    "wc",   P_NUM|P_VIM,
+  			    (char_u *)&p_wc, PV_NONE,
+! 			    {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB}},
+      {"wildcharm",   "wcm",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_wcm, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"wildignore",  "wig",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_WILDIGN
+  			    (char_u *)&p_wig, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L}},
+      {"wildmenu",    "wmnu", P_BOOL|P_VI_DEF,
+  #ifdef FEAT_WILDMENU
+  			    (char_u *)&p_wmnu, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"wildmode",    "wim",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_wim, PV_NONE,
+! 			    {(char_u *)"full", (char_u *)0L}},
+      {"wildoptions", "wop",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_CMDL_COMPL
+  			    (char_u *)&p_wop, PV_NONE,
+--- 2635,2686 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)0L, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"visualbell",  "vb",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_vb, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"w300",	    NULL,   P_NUM|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"w1200",	    NULL,   P_NUM|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"w9600",	    NULL,   P_NUM|P_VI_DEF,
+  			    (char_u *)NULL, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"warn",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_warn, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"weirdinvert", "wiv",  P_BOOL|P_VI_DEF|P_RCLR,
+  			    (char_u *)&p_wiv, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"whichwrap",   "ww",   P_STRING|P_VIM|P_COMMA|P_FLAGLIST,
+  			    (char_u *)&p_ww, PV_NONE,
+! 			    {(char_u *)"", (char_u *)"b,s"} SCRIPTID_INIT},
+      {"wildchar",    "wc",   P_NUM|P_VIM,
+  			    (char_u *)&p_wc, PV_NONE,
+! 			    {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB}
+! 			    SCRIPTID_INIT},
+      {"wildcharm",   "wcm",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_wcm, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"wildignore",  "wig",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  #ifdef FEAT_WILDIGN
+  			    (char_u *)&p_wig, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+      {"wildmenu",    "wmnu", P_BOOL|P_VI_DEF,
+  #ifdef FEAT_WILDMENU
+  			    (char_u *)&p_wmnu, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"wildmode",    "wim",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  			    (char_u *)&p_wim, PV_NONE,
+! 			    {(char_u *)"full", (char_u *)0L} SCRIPTID_INIT},
+      {"wildoptions", "wop",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_CMDL_COMPL
+  			    (char_u *)&p_wop, PV_NONE,
+***************
+*** 2668,2674 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"winaltkeys",  "wak",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_WAK
+  			    (char_u *)&p_wak, PV_NONE,
+--- 2689,2695 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"winaltkeys",  "wak",  P_STRING|P_VI_DEF,
+  #ifdef FEAT_WAK
+  			    (char_u *)&p_wak, PV_NONE,
+***************
+*** 2677,2743 ****
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    },
+      {"window",	    "wi",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_window, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"winheight",   "wh",   P_NUM|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_wh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L}},
+      {"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)VAR_WIN, PV_WFH,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)VAR_WIN, PV_WFW,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"winminheight", "wmh", P_NUM|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_wmh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L}},
+      {"winminwidth", "wmw", P_NUM|P_VI_DEF,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)&p_wmw, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L}},
+      {"winwidth",   "wiw",   P_NUM|P_VI_DEF,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)&p_wiw, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)20L, (char_u *)0L}},
+      {"wrap",	    NULL,   P_BOOL|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_WRAP,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"wrapmargin",  "wm",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_wm, PV_WM,
+! 			    {(char_u *)0L, (char_u *)0L}},
+      {"wrapscan",    "ws",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ws, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"write",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_write, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L}},
+      {"writeany",    "wa",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_wa, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L}},
+      {"writebackup", "wb",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_wb, PV_NONE,
+  			    {
+--- 2698,2764 ----
+  			    (char_u *)NULL, PV_NONE,
+  			    {(char_u *)NULL, (char_u *)0L}
+  #endif
+! 			    SCRIPTID_INIT},
+      {"window",	    "wi",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_window, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"winheight",   "wh",   P_NUM|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_wh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
+      {"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)VAR_WIN, PV_WFH,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)VAR_WIN, PV_WFW,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"winminheight", "wmh", P_NUM|P_VI_DEF,
+  #ifdef FEAT_WINDOWS
+  			    (char_u *)&p_wmh, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
+      {"winminwidth", "wmw", P_NUM|P_VI_DEF,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)&p_wmw, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
+      {"winwidth",   "wiw",   P_NUM|P_VI_DEF,
+  #ifdef FEAT_VERTSPLIT
+  			    (char_u *)&p_wiw, PV_NONE,
+  #else
+  			    (char_u *)NULL, PV_NONE,
+  #endif
+! 			    {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
+      {"wrap",	    NULL,   P_BOOL|P_VI_DEF|P_RWIN,
+  			    (char_u *)VAR_WIN, PV_WRAP,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"wrapmargin",  "wm",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_wm, PV_WM,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+      {"wrapscan",    "ws",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_ws, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"write",	    NULL,   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_write, PV_NONE,
+! 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+      {"writeany",    "wa",   P_BOOL|P_VI_DEF,
+  			    (char_u *)&p_wa, PV_NONE,
+! 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+      {"writebackup", "wb",   P_BOOL|P_VI_DEF|P_VIM,
+  			    (char_u *)&p_wb, PV_NONE,
+  			    {
+***************
+*** 2746,2760 ****
+  #else
+  			    (char_u *)FALSE,
+  #endif
+! 				(char_u *)0L}},
+      {"writedelay",  "wd",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_wd, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L}},
+  
+  /* terminal output codes */
+  #define p_term(sss, vvv)   {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \
+  			    (char_u *)&vvv, PV_NONE, \
+! 			    {(char_u *)"", (char_u *)0L}},
+  
+      p_term("t_AB", T_CAB)
+      p_term("t_AF", T_CAF)
+--- 2767,2781 ----
+  #else
+  			    (char_u *)FALSE,
+  #endif
+! 				(char_u *)0L} SCRIPTID_INIT},
+      {"writedelay",  "wd",   P_NUM|P_VI_DEF,
+  			    (char_u *)&p_wd, PV_NONE,
+! 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+  
+  /* terminal output codes */
+  #define p_term(sss, vvv)   {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \
+  			    (char_u *)&vvv, PV_NONE, \
+! 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+  
+      p_term("t_AB", T_CAB)
+      p_term("t_AF", T_CAF)
+***************
+*** 2815,2821 ****
+  
+  /* terminal key codes are not in here */
+  
+!     {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL}}	/* end marker */
+  };
+  
+  #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption))
+--- 2836,2843 ----
+  
+  /* terminal key codes are not in here */
+  
+!     /* end marker */
+!     {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL} SCRIPTID_INIT}
+  };
+  
+  #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption))
+***************
+*** 9917,9923 ****
+  	regmatch->rm_ic = ic;
+  	if (xp->xp_context != EXPAND_BOOL_SETTINGS)
+  	{
+! 	    for (match = 0; match < sizeof(names) / sizeof(char *); ++match)
+  		if (vim_regexec(regmatch, (char_u *)names[match], (colnr_T)0))
+  		{
+  		    if (loop == 0)
+--- 9939,9946 ----
+  	regmatch->rm_ic = ic;
+  	if (xp->xp_context != EXPAND_BOOL_SETTINGS)
+  	{
+! 	    for (match = 0; match < (int)(sizeof(names) / sizeof(char *));
+! 								      ++match)
+  		if (vim_regexec(regmatch, (char_u *)names[match], (colnr_T)0))
+  		{
+  		    if (loop == 0)
+*** ../vim-7.2.179/src/os_unix.c	2009-05-16 16:36:25.000000000 +0200
+--- src/os_unix.c	2009-05-17 12:17:01.000000000 +0200
+***************
+*** 821,827 ****
+  #endif
+  
+  #if defined(SIGINT)
+- /* ARGSUSED */
+      static RETSIGTYPE
+  catch_sigint SIGDEFARG(sigarg)
+  {
+--- 821,826 ----
+***************
+*** 833,839 ****
+  #endif
+  
+  #if defined(SIGPWR)
+- /* ARGSUSED */
+      static RETSIGTYPE
+  catch_sigpwr SIGDEFARG(sigarg)
+  {
+--- 832,837 ----
+***************
+*** 853,859 ****
+  /*
+   * signal function for alarm().
+   */
+- /* ARGSUSED */
+      static RETSIGTYPE
+  sig_alarm SIGDEFARG(sigarg)
+  {
+--- 851,856 ----
+***************
+*** 1087,1093 ****
+  /*
+   * signal handler for SIGCONT
+   */
+- /* ARGSUSED */
+      static RETSIGTYPE
+  sigcont_handler SIGDEFARG(sigarg)
+  {
+--- 1084,1089 ----
+***************
+*** 1436,1446 ****
+  /*
+   * Another X Error handler, just used to check for errors.
+   */
+- /* ARGSUSED */
+      static int
+  x_error_check(dpy, error_event)
+!     Display *dpy;
+!     XErrorEvent	*error_event;
+  {
+      got_x_error = TRUE;
+      return 0;
+--- 1432,1441 ----
+  /*
+   * Another X Error handler, just used to check for errors.
+   */
+      static int
+  x_error_check(dpy, error_event)
+!     Display *dpy UNUSED;
+!     XErrorEvent	*error_event UNUSED;
+  {
+      got_x_error = TRUE;
+      return 0;
+***************
+*** 1453,1467 ****
+   */
+  static int x_IOerror_check __ARGS((Display *dpy));
+  
+- /* ARGSUSED */
+      static int
+  x_IOerror_check(dpy)
+!     Display *dpy;
+  {
+      /* This function should not return, it causes exit().  Longjump instead. */
+      LONGJMP(lc_jump_env, 1);
+-     /*NOTREACHED*/
+-     return 0;
+  }
+  # endif
+  
+--- 1448,1459 ----
+   */
+  static int x_IOerror_check __ARGS((Display *dpy));
+  
+      static int
+  x_IOerror_check(dpy)
+!     Display *dpy UNUSED;
+  {
+      /* This function should not return, it causes exit().  Longjump instead. */
+      LONGJMP(lc_jump_env, 1);
+  }
+  # endif
+  
+***************
+*** 1470,1479 ****
+   */
+  static int x_IOerror_handler __ARGS((Display *dpy));
+  
+- /* ARGSUSED */
+      static int
+  x_IOerror_handler(dpy)
+!     Display *dpy;
+  {
+      xterm_dpy = NULL;
+      x11_window = 0;
+--- 1462,1470 ----
+   */
+  static int x_IOerror_handler __ARGS((Display *dpy));
+  
+      static int
+  x_IOerror_handler(dpy)
+!     Display *dpy UNUSED;
+  {
+      xterm_dpy = NULL;
+      x11_window = 0;
+***************
+*** 1482,1489 ****
+  
+      /* This function should not return, it causes exit().  Longjump instead. */
+      LONGJMP(x_jump_env, 1);
+-     /*NOTREACHED*/
+-     return 0;
+  }
+  #endif
+  
+--- 1473,1478 ----
+***************
+*** 1919,1928 ****
+  
+  #else  /* FEAT_X11 */
+  
+- /*ARGSUSED*/
+      static int
+  get_x11_title(test_only)
+!     int	    test_only;
+  {
+      return FALSE;
+  }
+--- 1908,1916 ----
+  
+  #else  /* FEAT_X11 */
+  
+      static int
+  get_x11_title(test_only)
+!     int	    test_only UNUSED;
+  {
+      return FALSE;
+  }
+***************
+*** 2497,2507 ****
+   * file name to remain exactly the same.
+   * Only required for file systems where case is ignored and preserved.
+   */
+- /*ARGSUSED*/
+      void
+  fname_case(name, len)
+      char_u	*name;
+!     int		len;	    /* buffer size, only used when name gets longer */
+  {
+      struct stat st;
+      char_u	*slash, *tail;
+--- 2485,2494 ----
+   * file name to remain exactly the same.
+   * Only required for file systems where case is ignored and preserved.
+   */
+      void
+  fname_case(name, len)
+      char_u	*name;
+!     int		len UNUSED;  /* buffer size, only used when name gets longer */
+  {
+      struct stat st;
+      char_u	*slash, *tail;
+***************
+*** 5141,5147 ****
+  
+  #define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|"
+  
+- /* ARGSUSED */
+      int
+  mch_expand_wildcards(num_pat, pat, num_file, file, flags)
+      int		   num_pat;
+--- 5128,5133 ----
+***************
+*** 6068,6074 ****
+  /*
+   * Gets info from sysmouse and adds special keys to input buf.
+   */
+- /* ARGSUSED */
+      static RETSIGTYPE
+  sig_sysmouse SIGDEFARG(sigarg)
+  {
+--- 6054,6059 ----
+***************
+*** 6632,6642 ****
+   * This is our chance to ask the user if they want to save,
+   * or abort the logout
+   */
+- /*ARGSUSED*/
+      static void
+  xsmp_handle_interaction(smc_conn, client_data)
+      SmcConn	smc_conn;
+!     SmPointer	client_data;
+  {
+      cmdmod_T	save_cmdmod;
+      int		cancel_shutdown = False;
+--- 6617,6626 ----
+   * This is our chance to ask the user if they want to save,
+   * or abort the logout
+   */
+      static void
+  xsmp_handle_interaction(smc_conn, client_data)
+      SmcConn	smc_conn;
+!     SmPointer	client_data UNUSED;
+  {
+      cmdmod_T	save_cmdmod;
+      int		cancel_shutdown = False;
+***************
+*** 6669,6684 ****
+  /*
+   * Callback that starts save-yourself.
+   */
+- /*ARGSUSED*/
+      static void
+  xsmp_handle_save_yourself(smc_conn, client_data, save_type,
+  					       shutdown, interact_style, fast)
+      SmcConn	smc_conn;
+!     SmPointer	client_data;
+!     int		save_type;
+      Bool	shutdown;
+!     int		interact_style;
+!     Bool	fast;
+  {
+      /* Handle already being in saveyourself */
+      if (xsmp.save_yourself)
+--- 6653,6667 ----
+  /*
+   * Callback that starts save-yourself.
+   */
+      static void
+  xsmp_handle_save_yourself(smc_conn, client_data, save_type,
+  					       shutdown, interact_style, fast)
+      SmcConn	smc_conn;
+!     SmPointer	client_data UNUSED;
+!     int		save_type UNUSED;
+      Bool	shutdown;
+!     int		interact_style UNUSED;
+!     Bool	fast UNUSED;
+  {
+      /* Handle already being in saveyourself */
+      if (xsmp.save_yourself)
+***************
+*** 6712,6722 ****
+  /*
+   * Callback to warn us of imminent death.
+   */
+- /*ARGSUSED*/
+      static void
+  xsmp_die(smc_conn, client_data)
+!     SmcConn	smc_conn;
+!     SmPointer	client_data;
+  {
+      xsmp_close();
+  
+--- 6695,6704 ----
+  /*
+   * Callback to warn us of imminent death.
+   */
+      static void
+  xsmp_die(smc_conn, client_data)
+!     SmcConn	smc_conn UNUSED;
+!     SmPointer	client_data UNUSED;
+  {
+      xsmp_close();
+  
+***************
+*** 6728,6738 ****
+  /*
+   * Callback to tell us that save-yourself has completed.
+   */
+- /*ARGSUSED*/
+      static void
+  xsmp_save_complete(smc_conn, client_data)
+!     SmcConn	smc_conn;
+!     SmPointer	client_data;
+  {
+      xsmp.save_yourself = False;
+  }
+--- 6710,6719 ----
+  /*
+   * Callback to tell us that save-yourself has completed.
+   */
+      static void
+  xsmp_save_complete(smc_conn, client_data)
+!     SmcConn	smc_conn UNUSED;
+!     SmPointer	client_data UNUSED;
+  {
+      xsmp.save_yourself = False;
+  }
+***************
+*** 6742,6752 ****
+   * Callback to tell us that an instigated shutdown was cancelled
+   * (maybe even by us)
+   */
+- /*ARGSUSED*/
+      static void
+  xsmp_shutdown_cancelled(smc_conn, client_data)
+      SmcConn	smc_conn;
+!     SmPointer	client_data;
+  {
+      if (xsmp.save_yourself)
+  	SmcSaveYourselfDone(smc_conn, True);
+--- 6723,6732 ----
+   * Callback to tell us that an instigated shutdown was cancelled
+   * (maybe even by us)
+   */
+      static void
+  xsmp_shutdown_cancelled(smc_conn, client_data)
+      SmcConn	smc_conn;
+!     SmPointer	client_data UNUSED;
+  {
+      if (xsmp.save_yourself)
+  	SmcSaveYourselfDone(smc_conn, True);
+***************
+*** 6758,6770 ****
+  /*
+   * Callback to tell us that a new ICE connection has been established.
+   */
+- /*ARGSUSED*/
+      static void
+  xsmp_ice_connection(iceConn, clientData, opening, watchData)
+      IceConn	iceConn;
+!     IcePointer	clientData;
+      Bool	opening;
+!     IcePointer	*watchData;
+  {
+      /* Intercept creation of ICE connection fd */
+      if (opening)
+--- 6738,6749 ----
+  /*
+   * Callback to tell us that a new ICE connection has been established.
+   */
+      static void
+  xsmp_ice_connection(iceConn, clientData, opening, watchData)
+      IceConn	iceConn;
+!     IcePointer	clientData UNUSED;
+      Bool	opening;
+!     IcePointer	*watchData UNUSED;
+  {
+      /* Intercept creation of ICE connection fd */
+      if (opening)
+*** ../vim-7.2.179/src/quickfix.c	2009-05-13 18:54:14.000000000 +0200
+--- src/quickfix.c	2009-05-16 22:31:49.000000000 +0200
+***************
+*** 2240,2246 ****
+   * ":cclose": close the window showing the list of errors.
+   * ":lclose": close the window showing the location list
+   */
+- /*ARGSUSED*/
+      void
+  ex_cclose(eap)
+      exarg_T	*eap;
+--- 2240,2245 ----
+***************
+*** 3211,3217 ****
+  			break;
+  		    col = regmatch.endpos[0].col
+  					    + (col == regmatch.endpos[0].col);
+! 		    if (col > STRLEN(ml_get_buf(buf, lnum, FALSE)))
+  			break;
+  		}
+  		line_breakcheck();
+--- 3210,3216 ----
+  			break;
+  		    col = regmatch.endpos[0].col
+  					    + (col == regmatch.endpos[0].col);
+! 		    if (col > (colnr_T)STRLEN(ml_get_buf(buf, lnum, FALSE)))
+  			break;
+  		}
+  		line_breakcheck();
+*** ../vim-7.2.179/src/screen.c	2009-05-13 12:46:36.000000000 +0200
+--- src/screen.c	2009-05-16 21:51:13.000000000 +0200
+***************
+*** 270,280 ****
+   * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot
+   * may become invalid and the whole window will have to be redrawn.
+   */
+- /*ARGSUSED*/
+      void
+  redrawWinline(lnum, invalid)
+      linenr_T	lnum;
+!     int		invalid;	/* window line height is invalid now */
+  {
+  #ifdef FEAT_FOLDING
+      int		i;
+--- 270,279 ----
+   * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot
+   * may become invalid and the whole window will have to be redrawn.
+   */
+      void
+  redrawWinline(lnum, invalid)
+      linenr_T	lnum;
+!     int		invalid UNUSED;	/* window line height is invalid now */
+  {
+  #ifdef FEAT_FOLDING
+      int		i;
+***************
+*** 2413,2419 ****
+  			&& (lnume < bot->lnum
+  			    || (lnume == bot->lnum
+  				&& (bot->col - (*p_sel == 'e'))
+! 		>= STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE)))))))
+  	{
+  	    if (VIsual_mode == Ctrl_V)
+  	    {
+--- 2412,2418 ----
+  			&& (lnume < bot->lnum
+  			    || (lnume == bot->lnum
+  				&& (bot->col - (*p_sel == 'e'))
+! 		>= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE)))))))
+  	{
+  	    if (VIsual_mode == Ctrl_V)
+  	    {
+***************
+*** 2549,2562 ****
+   *
+   * Return the number of last row the line occupies.
+   */
+- /* ARGSUSED */
+      static int
+  win_line(wp, lnum, startrow, endrow, nochange)
+      win_T	*wp;
+      linenr_T	lnum;
+      int		startrow;
+      int		endrow;
+!     int		nochange;		/* not updating for changed text */
+  {
+      int		col;			/* visual column on screen */
+      unsigned	off;			/* offset in ScreenLines/ScreenAttrs */
+--- 2548,2560 ----
+   *
+   * Return the number of last row the line occupies.
+   */
+      static int
+  win_line(wp, lnum, startrow, endrow, nochange)
+      win_T	*wp;
+      linenr_T	lnum;
+      int		startrow;
+      int		endrow;
+!     int		nochange UNUSED;	/* not updating for changed text */
+  {
+      int		col;			/* visual column on screen */
+      unsigned	off;			/* offset in ScreenLines/ScreenAttrs */
+***************
+*** 6098,6104 ****
+  				fillchar, maxwidth, hltab, tabtab);
+      len = (int)STRLEN(buf);
+  
+!     while (width < maxwidth && len < sizeof(buf) - 1)
+      {
+  #ifdef FEAT_MBYTE
+  	len += (*mb_char2bytes)(fillchar, buf + len);
+--- 6096,6102 ----
+  				fillchar, maxwidth, hltab, tabtab);
+      len = (int)STRLEN(buf);
+  
+!     while (width < maxwidth && len < (int)sizeof(buf) - 1)
+      {
+  #ifdef FEAT_MBYTE
+  	len += (*mb_char2bytes)(fillchar, buf + len);
+***************
+*** 8655,8661 ****
+   *
+   * Return OK for success, FAIL if the lines are not deleted.
+   */
+- /*ARGSUSED*/
+      int
+  screen_del_lines(off, row, line_count, end, force, wp)
+      int		off;
+--- 8653,8658 ----
+***************
+*** 8663,8669 ****
+      int		line_count;
+      int		end;
+      int		force;		/* even when line_count > p_ttyscroll */
+!     win_T	*wp;		/* NULL or window to use width from */
+  {
+      int		j;
+      int		i;
+--- 8660,8666 ----
+      int		line_count;
+      int		end;
+      int		force;		/* even when line_count > p_ttyscroll */
+!     win_T	*wp UNUSED;	/* NULL or window to use width from */
+  {
+      int		j;
+      int		i;
+*** ../vim-7.2.179/src/search.c	2009-05-15 21:31:11.000000000 +0200
+--- src/search.c	2009-05-16 22:33:05.000000000 +0200
+***************
+*** 4527,4538 ****
+   * Find identifiers or defines in included files.
+   * if p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase.
+   */
+- /*ARGSUSED*/
+      void
+  find_pattern_in_path(ptr, dir, len, whole, skip_comments,
+  				    type, count, action, start_lnum, end_lnum)
+      char_u	*ptr;		/* pointer to search pattern */
+!     int		dir;		/* direction of expansion */
+      int		len;		/* length of search pattern */
+      int		whole;		/* match whole words only */
+      int		skip_comments;	/* don't match inside comments */
+--- 4527,4537 ----
+   * Find identifiers or defines in included files.
+   * if p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase.
+   */
+      void
+  find_pattern_in_path(ptr, dir, len, whole, skip_comments,
+  				    type, count, action, start_lnum, end_lnum)
+      char_u	*ptr;		/* pointer to search pattern */
+!     int		dir UNUSED;	/* direction of expansion */
+      int		len;		/* length of search pattern */
+      int		whole;		/* match whole words only */
+      int		skip_comments;	/* don't match inside comments */
+*** ../vim-7.2.179/src/spell.c	2009-05-13 18:54:14.000000000 +0200
+--- src/spell.c	2009-05-16 22:10:19.000000000 +0200
+***************
+*** 950,957 ****
+   */
+  #ifndef FEAT_MBYTE
+  /* Non-multi-byte implementation. */
+! # define SPELL_TOFOLD(c) ((c) < 256 ? spelltab.st_fold[c] : (c))
+! # define SPELL_TOUPPER(c) ((c) < 256 ? spelltab.st_upper[c] : (c))
+  # define SPELL_ISUPPER(c) ((c) < 256 ? spelltab.st_isu[c] : FALSE)
+  #else
+  # if defined(HAVE_WCHAR_H)
+--- 950,957 ----
+   */
+  #ifndef FEAT_MBYTE
+  /* Non-multi-byte implementation. */
+! # define SPELL_TOFOLD(c) ((c) < 256 ? (int)spelltab.st_fold[c] : (c))
+! # define SPELL_TOUPPER(c) ((c) < 256 ? (int)spelltab.st_upper[c] : (c))
+  # define SPELL_ISUPPER(c) ((c) < 256 ? spelltab.st_isu[c] : FALSE)
+  #else
+  # if defined(HAVE_WCHAR_H)
+***************
+*** 962,979 ****
+   * the "w" library function for characters above 255 if available. */
+  # ifdef HAVE_TOWLOWER
+  #  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
+! 	    : (c) < 256 ? spelltab.st_fold[c] : towlower(c))
+  # else
+  #  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
+! 	    : (c) < 256 ? spelltab.st_fold[c] : (c))
+  # endif
+  
+  # ifdef HAVE_TOWUPPER
+  #  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
+! 	    : (c) < 256 ? spelltab.st_upper[c] : towupper(c))
+  # else
+  #  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
+! 	    : (c) < 256 ? spelltab.st_upper[c] : (c))
+  # endif
+  
+  # ifdef HAVE_ISWUPPER
+--- 962,979 ----
+   * the "w" library function for characters above 255 if available. */
+  # ifdef HAVE_TOWLOWER
+  #  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
+! 	    : (c) < 256 ? (int)spelltab.st_fold[c] : (int)towlower(c))
+  # else
+  #  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
+! 	    : (c) < 256 ? (int)spelltab.st_fold[c] : (c))
+  # endif
+  
+  # ifdef HAVE_TOWUPPER
+  #  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
+! 	    : (c) < 256 ? (int)spelltab.st_upper[c] : (int)towupper(c))
+  # else
+  #  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
+! 	    : (c) < 256 ? (int)spelltab.st_upper[c] : (c))
+  # endif
+  
+  # ifdef HAVE_ISWUPPER
+***************
+*** 8052,8058 ****
+      /* time_t can be up to 8 bytes in size, more than long_u, thus we
+       * can't use put_bytes() here. */
+      for (i = 7; i >= 0; --i)
+! 	if (i + 1 > sizeof(time_t))
+  	    /* ">>" doesn't work well when shifting more bits than avail */
+  	    putc(0, fd);
+  	else
+--- 8052,8058 ----
+      /* time_t can be up to 8 bytes in size, more than long_u, thus we
+       * can't use put_bytes() here. */
+      for (i = 7; i >= 0; --i)
+! 	if (i + 1 > (int)sizeof(time_t))
+  	    /* ">>" doesn't work well when shifting more bits than avail */
+  	    putc(0, fd);
+  	else
+***************
+*** 10541,10550 ****
+  /*
+   * ":spellrepall"
+   */
+- /*ARGSUSED*/
+      void
+  ex_spellrepall(eap)
+!     exarg_T *eap;
+  {
+      pos_T	pos = curwin->w_cursor;
+      char_u	*frompat;
+--- 10541,10549 ----
+  /*
+   * ":spellrepall"
+   */
+      void
+  ex_spellrepall(eap)
+!     exarg_T *eap UNUSED;
+  {
+      pos_T	pos = curwin->w_cursor;
+      char_u	*frompat;
+***************
+*** 15604,15613 ****
+  /*
+   * ":spellinfo"
+   */
+- /*ARGSUSED*/
+      void
+  ex_spellinfo(eap)
+!     exarg_T *eap;
+  {
+      int		lpi;
+      langp_T	*lp;
+--- 15603,15611 ----
+  /*
+   * ":spellinfo"
+   */
+      void
+  ex_spellinfo(eap)
+!     exarg_T *eap UNUSED;
+  {
+      int		lpi;
+      langp_T	*lp;
+***************
+*** 16153,16159 ****
+   */
+      int
+  expand_spelling(lnum, pat, matchp)
+!     linenr_T	lnum;
+      char_u	*pat;
+      char_u	***matchp;
+  {
+--- 16151,16157 ----
+   */
+      int
+  expand_spelling(lnum, pat, matchp)
+!     linenr_T	lnum UNUSED;
+      char_u	*pat;
+      char_u	***matchp;
+  {
+*** ../vim-7.2.179/src/syntax.c	2008-08-09 19:37:33.000000000 +0200
+--- src/syntax.c	2009-05-16 22:14:19.000000000 +0200
+***************
+*** 3224,3234 ****
+  /*
+   * Handle ":syntax case" command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_case(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	    /* not used */
+  {
+      char_u	*arg = eap->arg;
+      char_u	*next;
+--- 3224,3233 ----
+  /*
+   * Handle ":syntax case" command.
+   */
+      static void
+  syn_cmd_case(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      char_u	*arg = eap->arg;
+      char_u	*next;
+***************
+*** 3249,3259 ****
+  /*
+   * Handle ":syntax spell" command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_spell(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	    /* not used */
+  {
+      char_u	*arg = eap->arg;
+      char_u	*next;
+--- 3248,3257 ----
+  /*
+   * Handle ":syntax spell" command.
+   */
+      static void
+  syn_cmd_spell(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      char_u	*arg = eap->arg;
+      char_u	*next;
+***************
+*** 3517,3527 ****
+  /*
+   * Handle ":syntax on" command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_on(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	/* not used */
+  {
+      syn_cmd_onoff(eap, "syntax");
+  }
+--- 3515,3524 ----
+  /*
+   * Handle ":syntax on" command.
+   */
+      static void
+  syn_cmd_on(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      syn_cmd_onoff(eap, "syntax");
+  }
+***************
+*** 3529,3539 ****
+  /*
+   * Handle ":syntax enable" command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_enable(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	/* not used */
+  {
+      set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable");
+      syn_cmd_onoff(eap, "syntax");
+--- 3526,3535 ----
+  /*
+   * Handle ":syntax enable" command.
+   */
+      static void
+  syn_cmd_enable(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable");
+      syn_cmd_onoff(eap, "syntax");
+***************
+*** 3543,3553 ****
+  /*
+   * Handle ":syntax reset" command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_reset(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	/* not used */
+  {
+      eap->nextcmd = check_nextcmd(eap->arg);
+      if (!eap->skip)
+--- 3539,3548 ----
+  /*
+   * Handle ":syntax reset" command.
+   */
+      static void
+  syn_cmd_reset(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      eap->nextcmd = check_nextcmd(eap->arg);
+      if (!eap->skip)
+***************
+*** 3561,3571 ****
+  /*
+   * Handle ":syntax manual" command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_manual(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	/* not used */
+  {
+      syn_cmd_onoff(eap, "manual");
+  }
+--- 3556,3565 ----
+  /*
+   * Handle ":syntax manual" command.
+   */
+      static void
+  syn_cmd_manual(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      syn_cmd_onoff(eap, "manual");
+  }
+***************
+*** 3573,3583 ****
+  /*
+   * Handle ":syntax off" command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_off(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	/* not used */
+  {
+      syn_cmd_onoff(eap, "nosyntax");
+  }
+--- 3567,3576 ----
+  /*
+   * Handle ":syntax off" command.
+   */
+      static void
+  syn_cmd_off(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      syn_cmd_onoff(eap, "nosyntax");
+  }
+***************
+*** 4461,4471 ****
+  /*
+   * Handle ":syntax include [@{group-name}] filename" command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_include(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	    /* not used */
+  {
+      char_u	*arg = eap->arg;
+      int		sgl_id = 1;
+--- 4454,4463 ----
+  /*
+   * Handle ":syntax include [@{group-name}] filename" command.
+   */
+      static void
+  syn_cmd_include(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      char_u	*arg = eap->arg;
+      int		sgl_id = 1;
+***************
+*** 4532,4542 ****
+  /*
+   * Handle ":syntax keyword {group-name} [{option}] keyword .." command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_keyword(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	    /* not used */
+  {
+      char_u	*arg = eap->arg;
+      char_u	*group_name_end;
+--- 4524,4533 ----
+  /*
+   * Handle ":syntax keyword {group-name} [{option}] keyword .." command.
+   */
+      static void
+  syn_cmd_keyword(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      char_u	*arg = eap->arg;
+      char_u	*group_name_end;
+***************
+*** 5275,5285 ****
+   * Handle ":syntax cluster {cluster-name} [contains={groupname},..]
+   *		[add={groupname},..] [remove={groupname},..]".
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_cluster(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	    /* not used */
+  {
+      char_u	*arg = eap->arg;
+      char_u	*group_name_end;
+--- 5266,5275 ----
+   * Handle ":syntax cluster {cluster-name} [contains={groupname},..]
+   *		[add={groupname},..] [remove={groupname},..]".
+   */
+      static void
+  syn_cmd_cluster(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      char_u	*arg = eap->arg;
+      char_u	*group_name_end;
+***************
+*** 5464,5474 ****
+  /*
+   * Handle ":syntax sync .." command.
+   */
+- /* ARGSUSED */
+      static void
+  syn_cmd_sync(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing;	    /* not used */
+  {
+      char_u	*arg_start = eap->arg;
+      char_u	*arg_end;
+--- 5454,5463 ----
+  /*
+   * Handle ":syntax sync .." command.
+   */
+      static void
+  syn_cmd_sync(eap, syncing)
+      exarg_T	*eap;
+!     int		syncing UNUSED;
+  {
+      char_u	*arg_start = eap->arg;
+      char_u	*arg_end;
+***************
+*** 6099,6108 ****
+   * Function given to ExpandGeneric() to obtain the list syntax names for
+   * expansion.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_syntax_name(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+      if (expand_what == EXP_SUBCMD)
+--- 6088,6096 ----
+   * Function given to ExpandGeneric() to obtain the list syntax names for
+   * expansion.
+   */
+      char_u *
+  get_syntax_name(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+      if (expand_what == EXP_SUBCMD)
+***************
+*** 7744,7757 ****
+  /*
+   * Get the font or fontset for one highlight group.
+   */
+- /*ARGSUSED*/
+      static void
+  hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
+      int		idx;
+      char_u	*arg;
+!     int		do_normal;	/* set normal font */
+!     int		do_menu;	/* set menu font */
+!     int		do_tooltip;	/* set tooltip font */
+  {
+  # ifdef FEAT_XFONTSET
+      /* If 'guifontset' is not empty, first try using the name as a
+--- 7732,7744 ----
+  /*
+   * Get the font or fontset for one highlight group.
+   */
+      static void
+  hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
+      int		idx;
+      char_u	*arg;
+!     int		do_normal;		/* set normal font */
+!     int		do_menu UNUSED;		/* set menu font */
+!     int		do_tooltip UNUSED;	/* set tooltip font */
+  {
+  # ifdef FEAT_XFONTSET
+      /* If 'guifontset' is not empty, first try using the name as a
+***************
+*** 9150,9159 ****
+   * Function given to ExpandGeneric() to obtain the list of group names.
+   * Also used for synIDattr() function.
+   */
+- /*ARGSUSED*/
+      char_u *
+  get_highlight_name(xp, idx)
+!     expand_T	*xp;
+      int		idx;
+  {
+  #ifdef FEAT_CMDL_COMPL
+--- 9137,9145 ----
+   * Function given to ExpandGeneric() to obtain the list of group names.
+   * Also used for synIDattr() function.
+   */
+      char_u *
+  get_highlight_name(xp, idx)
+!     expand_T	*xp UNUSED;
+      int		idx;
+  {
+  #ifdef FEAT_CMDL_COMPL
+*** ../vim-7.2.179/src/tag.c	2009-05-15 21:31:11.000000000 +0200
+--- src/tag.c	2009-05-16 22:16:31.000000000 +0200
+***************
+*** 100,106 ****
+   * Tag for preview window is remembered separately, to avoid messing up the
+   * normal tagstack.
+   */
+! static taggy_T ptag_entry = {NULL};
+  #endif
+  
+  /*
+--- 100,106 ----
+   * Tag for preview window is remembered separately, to avoid messing up the
+   * normal tagstack.
+   */
+! static taggy_T ptag_entry = {NULL, {INIT_POS_T(0, 0, 0), 0}, 0, 0};
+  #endif
+  
+  /*
+***************
+*** 3791,3797 ****
+  		--end;
+  	}
+  	len = (int)(end - start);
+! 	if (len > sizeof(buf) - 1)
+  	    len = sizeof(buf) - 1;
+  	vim_strncpy(buf, start, len);
+      }
+--- 3791,3797 ----
+  		--end;
+  	}
+  	len = (int)(end - start);
+! 	if (len > (int)sizeof(buf) - 1)
+  	    len = sizeof(buf) - 1;
+  	vim_strncpy(buf, start, len);
+      }
+*** ../vim-7.2.179/src/term.c	2009-01-22 18:32:55.000000000 +0100
+--- src/term.c	2009-05-16 22:18:08.000000000 +0200
+***************
+*** 2906,2912 ****
+      int	    i;
+      int	    shift;
+  
+!     for (i = 1; i <= sizeof(long_u); i++)
+      {
+  	shift = 8 * (sizeof(long_u) - i);
+  	dst[i - 1] = (char_u) ((val >> shift) & 0xff);
+--- 2906,2912 ----
+      int	    i;
+      int	    shift;
+  
+!     for (i = 1; i <= (int)sizeof(long_u); i++)
+      {
+  	shift = 8 * (sizeof(long_u) - i);
+  	dst[i - 1] = (char_u) ((val >> shift) & 0xff);
+***************
+*** 2937,2943 ****
+      len = get_bytes_from_buf(buf, bytes, (int)sizeof(long_u));
+      if (len != -1)
+      {
+! 	for (i = 0; i < sizeof(long_u); i++)
+  	{
+  	    shift = 8 * (sizeof(long_u) - 1 - i);
+  	    *val += (long_u)bytes[i] << shift;
+--- 2937,2943 ----
+      len = get_bytes_from_buf(buf, bytes, (int)sizeof(long_u));
+      if (len != -1)
+      {
+! 	for (i = 0; i < (int)sizeof(long_u); i++)
+  	{
+  	    shift = 8 * (sizeof(long_u) - 1 - i);
+  	    *val += (long_u)bytes[i] << shift;
+*** ../vim-7.2.179/src/ui.c	2008-11-28 21:26:50.000000000 +0100
+--- src/ui.c	2009-05-16 22:33:55.000000000 +0200
+***************
+*** 320,329 ****
+   * The gui_set_shellsize() or mch_set_shellsize() function will try to set the
+   * new size.  If this is not possible, it will adjust Rows and Columns.
+   */
+- /*ARGSUSED*/
+      void
+  ui_set_shellsize(mustset)
+!     int		mustset;	/* set by the user */
+  {
+  #ifdef FEAT_GUI
+      if (gui.in_use)
+--- 320,328 ----
+   * The gui_set_shellsize() or mch_set_shellsize() function will try to set the
+   * new size.  If this is not possible, it will adjust Rows and Columns.
+   */
+      void
+  ui_set_shellsize(mustset)
+!     int		mustset UNUSED;	/* set by the user */
+  {
+  #ifdef FEAT_GUI
+      if (gui.in_use)
+***************
+*** 1127,1136 ****
+   * available for pasting.
+   * When "both" is TRUE also copy to the '+' register.
+   */
+- /*ARGSUSED*/
+      void
+  clip_copy_modeless_selection(both)
+!     int		both;
+  {
+      char_u	*buffer;
+      char_u	*bufp;
+--- 1126,1134 ----
+   * available for pasting.
+   * When "both" is TRUE also copy to the '+' register.
+   */
+      void
+  clip_copy_modeless_selection(both)
+!     int		both UNUSED;
+  {
+      char_u	*buffer;
+      char_u	*bufp;
+***************
+*** 1701,1710 ****
+      return (int)maxlen;
+  }
+  
+- /*ARGSUSED*/
+      void
+  fill_input_buf(exit_on_error)
+!     int	exit_on_error;
+  {
+  #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX)
+      int		len;
+--- 1699,1707 ----
+      return (int)maxlen;
+  }
+  
+      void
+  fill_input_buf(exit_on_error)
+!     int	exit_on_error UNUSED;
+  {
+  #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX)
+      int		len;
+***************
+*** 1992,2002 ****
+  
+  static void  clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *));
+  
+- /* ARGSUSED */
+      static void
+  clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
+  			      format)
+!     Widget	w;
+      XtPointer	success;
+      Atom	*sel_atom;
+      Atom	*type;
+--- 1989,1998 ----
+  
+  static void  clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *));
+  
+      static void
+  clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
+  			      format)
+!     Widget	w UNUSED;
+      XtPointer	success;
+      Atom	*sel_atom;
+      Atom	*type;
+***************
+*** 2202,2211 ****
+  
+  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
+  
+- /* ARGSUSED */
+      static Boolean
+  clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format)
+!     Widget	w;
+      Atom	*sel_atom;
+      Atom	*target;
+      Atom	*type;
+--- 2198,2206 ----
+  
+  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
+  
+      static Boolean
+  clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format)
+!     Widget	w UNUSED;
+      Atom	*sel_atom;
+      Atom	*target;
+      Atom	*type;
+***************
+*** 2332,2341 ****
+  
+  static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
+  
+- /* ARGSUSED */
+      static void
+  clip_x11_lose_ownership_cb(w, sel_atom)
+!     Widget  w;
+      Atom    *sel_atom;
+  {
+      if (*sel_atom == clip_plus.sel_atom)
+--- 2327,2335 ----
+  
+  static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
+  
+      static void
+  clip_x11_lose_ownership_cb(w, sel_atom)
+!     Widget  w UNUSED;
+      Atom    *sel_atom;
+  {
+      if (*sel_atom == clip_plus.sel_atom)
+***************
+*** 2368,2377 ****
+   * Send the current selection to the clipboard.  Do nothing for X because we
+   * will fill in the selection only when requested by another app.
+   */
+- /*ARGSUSED*/
+      void
+  clip_x11_set_selection(cbd)
+!     VimClipboard *cbd;
+  {
+  }
+  #endif
+--- 2362,2370 ----
+   * Send the current selection to the clipboard.  Do nothing for X because we
+   * will fill in the selection only when requested by another app.
+   */
+      void
+  clip_x11_set_selection(cbd)
+!     VimClipboard *cbd UNUSED;
+  {
+  }
+  #endif
+***************
+*** 2922,2932 ****
+   * Find the window at screen position "*rowp" and "*colp".  The positions are
+   * updated to become relative to the top-left of the window.
+   */
+- /*ARGSUSED*/
+      win_T *
+  mouse_find_win(rowp, colp)
+      int		*rowp;
+!     int		*colp;
+  {
+      frame_T	*fp;
+  
+--- 2915,2924 ----
+   * Find the window at screen position "*rowp" and "*colp".  The positions are
+   * updated to become relative to the top-left of the window.
+   */
+      win_T *
+  mouse_find_win(rowp, colp)
+      int		*rowp;
+!     int		*colp UNUSED;
+  {
+      frame_T	*fp;
+  
+*** ../vim-7.2.179/src/version.c	2009-05-16 21:16:12.000000000 +0200
+--- src/version.c	2009-05-17 13:06:38.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     180,
+  /**/
+
+-- 
+Wi n0t trei a h0liday in Sweden thi yer?
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.181 b/source/ap/vim/patches/7.2.181
new file mode 100644
index 000000000..bf7d5feb1
--- /dev/null
+++ b/source/ap/vim/patches/7.2.181
@@ -0,0 +1,1978 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.181
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.181
+Problem:    Some more compiler warnings when using gcc -Wextra.
+Solution:   Add UNUSED and type casts.
+Files:	    src/if_mzsch.c, src/gui.c, src/gui_gtk.c, src/gui_gtk_x11.c,
+	    src/gui_gtk_f.c, src/gui_beval.c, src/netbeans.c
+
+
+*** ../vim-7.2.180/src/if_mzsch.c	2007-07-06 19:43:08.000000000 +0200
+--- src/if_mzsch.c	2009-05-16 22:24:18.000000000 +0200
+***************
+*** 667,679 ****
+      static void CALLBACK
+  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
+  # elif defined(FEAT_GUI_GTK)
+- /*ARGSUSED*/
+      static gint
+! timer_proc(gpointer data)
+  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
+- /* ARGSUSED */
+      static void
+! timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
+  # elif defined(FEAT_GUI_MAC)
+      pascal void
+  timer_proc(EventLoopTimerRef theTimer, void *userData)
+--- 667,677 ----
+      static void CALLBACK
+  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
+  # elif defined(FEAT_GUI_GTK)
+      static gint
+! timer_proc(gpointer data UNUSED)
+  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
+      static void
+! timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)
+  # elif defined(FEAT_GUI_MAC)
+      pascal void
+  timer_proc(EventLoopTimerRef theTimer, void *userData)
+*** ../vim-7.2.180/src/gui.c	2008-12-03 18:50:09.000000000 +0100
+--- src/gui.c	2009-05-17 15:52:18.000000000 +0200
+***************
+*** 678,688 ****
+   * Return OK when able to set the font.  When it failed FAIL is returned and
+   * the fonts are unchanged.
+   */
+- /*ARGSUSED*/
+      int
+  gui_init_font(font_list, fontset)
+      char_u	*font_list;
+!     int		fontset;
+  {
+  #define FONTLEN 320
+      char_u	font_name[FONTLEN];
+--- 678,687 ----
+   * Return OK when able to set the font.  When it failed FAIL is returned and
+   * the fonts are unchanged.
+   */
+      int
+  gui_init_font(font_list, fontset)
+      char_u	*font_list;
+!     int		fontset UNUSED;
+  {
+  #define FONTLEN 320
+      char_u	font_name[FONTLEN];
+***************
+*** 1138,1147 ****
+   * Position the various GUI components (text area, menu).  The vertical
+   * scrollbars are NOT handled here.  See gui_update_scrollbars().
+   */
+- /*ARGSUSED*/
+      static void
+  gui_position_components(total_width)
+!     int	    total_width;
+  {
+      int	    text_area_x;
+      int	    text_area_y;
+--- 1137,1145 ----
+   * Position the various GUI components (text area, menu).  The vertical
+   * scrollbars are NOT handled here.  See gui_update_scrollbars().
+   */
+      static void
+  gui_position_components(total_width)
+!     int	    total_width UNUSED;
+  {
+      int	    text_area_x;
+      int	    text_area_y;
+***************
+*** 1374,1383 ****
+   * If "fit_to_display" is TRUE then the size may be reduced to fit the window
+   * on the screen.
+   */
+- /*ARGSUSED*/
+      void
+  gui_set_shellsize(mustset, fit_to_display, direction)
+!     int		mustset;		/* set by the user */
+      int		fit_to_display;
+      int		direction;		/* RESIZE_HOR, RESIZE_VER */
+  {
+--- 1372,1380 ----
+   * If "fit_to_display" is TRUE then the size may be reduced to fit the window
+   * on the screen.
+   */
+      void
+  gui_set_shellsize(mustset, fit_to_display, direction)
+!     int		mustset UNUSED;		/* set by the user */
+      int		fit_to_display;
+      int		direction;		/* RESIZE_HOR, RESIZE_VER */
+  {
+***************
+*** 3120,3126 ****
+   * If "oldval" is not NULL, "oldval" is the previous value, the new value is
+   * in p_go.
+   */
+- /*ARGSUSED*/
+      void
+  gui_init_which_components(oldval)
+      char_u	*oldval;
+--- 3117,3122 ----
+***************
+*** 4411,4417 ****
+      if (curwin->w_p_wrap)
+  	return FALSE;
+  
+!     if (curwin->w_leftcol == scrollbar_value)
+  	return FALSE;
+  
+      curwin->w_leftcol = (colnr_T)scrollbar_value;
+--- 4407,4413 ----
+      if (curwin->w_p_wrap)
+  	return FALSE;
+  
+!     if ((long_u)curwin->w_leftcol == scrollbar_value)
+  	return FALSE;
+  
+      curwin->w_leftcol = (colnr_T)scrollbar_value;
+***************
+*** 4424,4430 ****
+  	    && longest_lnum < curwin->w_botline
+  	    && !virtual_active())
+      {
+! 	if (scrollbar_value > scroll_line_len(curwin->w_cursor.lnum))
+  	{
+  	    curwin->w_cursor.lnum = longest_lnum;
+  	    curwin->w_cursor.col = 0;
+--- 4420,4426 ----
+  	    && longest_lnum < curwin->w_botline
+  	    && !virtual_active())
+      {
+! 	if (scrollbar_value > (long_u)scroll_line_len(curwin->w_cursor.lnum))
+  	{
+  	    curwin->w_cursor.lnum = longest_lnum;
+  	    curwin->w_cursor.col = 0;
+***************
+*** 4670,4676 ****
+  /*
+   * Find window where the mouse pointer "y" coordinate is in.
+   */
+- /*ARGSUSED*/
+      static win_T *
+  xy2win(x, y)
+      int		x;
+--- 4666,4671 ----
+***************
+*** 5124,5130 ****
+   * of dropped files, they will be freed in this function, and caller can't use
+   * fnames after call this function.
+   */
+- /*ARGSUSED*/
+      void
+  gui_handle_drop(x, y, modifiers, fnames, count)
+      int		x;
+--- 5119,5124 ----
+*** ../vim-7.2.180/src/gui_gtk.c	2008-07-31 22:29:28.000000000 +0200
+--- src/gui_gtk.c	2009-05-17 16:06:30.000000000 +0200
+***************
+*** 285,298 ****
+      return image;
+  }
+  
+- /*ARGSUSED*/
+      static gint
+! toolbar_button_focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
+! {
+!     /* When we're in a GtkPlug, we don't have window focus events, only widget focus.
+!      * To emulate stand-alone gvim, if a button gets focus (e.g., <Tab> into GtkPlug)
+!      * immediately pass it to mainwin.
+!      */
+      if (gtk_socket_id != 0)
+  	gtk_widget_grab_focus(gui.drawarea);
+  
+--- 285,298 ----
+      return image;
+  }
+  
+      static gint
+! toolbar_button_focus_in_event(GtkWidget *widget UNUSED,
+! 			      GdkEventFocus *event UNUSED,
+! 			      gpointer data UNUSED)
+! {
+!     /* When we're in a GtkPlug, we don't have window focus events, only widget
+!      * focus.  To emulate stand-alone gvim, if a button gets focus (e.g.,
+!      * <Tab> into GtkPlug) immediately pass it to mainwin. */
+      if (gtk_socket_id != 0)
+  	gtk_widget_grab_focus(gui.drawarea);
+  
+***************
+*** 585,593 ****
+      gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
+  }
+  
+- /*ARGSUSED*/
+      static void
+! menu_item_activate(GtkWidget *widget, gpointer data)
+  {
+      gui_menu_cb((vimmenu_T *)data);
+  
+--- 585,592 ----
+      gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
+  }
+  
+      static void
+! menu_item_activate(GtkWidget *widget UNUSED, gpointer data)
+  {
+      gui_menu_cb((vimmenu_T *)data);
+  
+***************
+*** 1202,1210 ****
+  #endif
+  
+  #ifndef USE_FILE_CHOOSER
+- /*ARGSUSED*/
+      static void
+! browse_ok_cb(GtkWidget *widget, gpointer cbdata)
+  {
+      gui_T *vw = (gui_T *)cbdata;
+  
+--- 1201,1208 ----
+  #endif
+  
+  #ifndef USE_FILE_CHOOSER
+      static void
+! browse_ok_cb(GtkWidget *widget UNUSED, gpointer cbdata)
+  {
+      gui_T *vw = (gui_T *)cbdata;
+  
+***************
+*** 1218,1226 ****
+  	gtk_main_quit();
+  }
+  
+- /*ARGSUSED*/
+      static void
+! browse_cancel_cb(GtkWidget *widget, gpointer cbdata)
+  {
+      gui_T *vw = (gui_T *)cbdata;
+  
+--- 1216,1223 ----
+  	gtk_main_quit();
+  }
+  
+      static void
+! browse_cancel_cb(GtkWidget *widget UNUSED, gpointer cbdata)
+  {
+      gui_T *vw = (gui_T *)cbdata;
+  
+***************
+*** 1234,1242 ****
+  	gtk_main_quit();
+  }
+  
+- /*ARGSUSED*/
+      static gboolean
+! browse_destroy_cb(GtkWidget * widget)
+  {
+      if (gui.browse_fname != NULL)
+      {
+--- 1231,1238 ----
+  	gtk_main_quit();
+  }
+  
+      static gboolean
+! browse_destroy_cb(GtkWidget *widget UNUSED)
+  {
+      if (gui.browse_fname != NULL)
+      {
+***************
+*** 1262,1275 ****
+   * initdir			initial directory, NULL for current dir
+   * filter			not used (file name filter)
+   */
+- /*ARGSUSED*/
+      char_u *
+! gui_mch_browse(int saving,
+  	       char_u *title,
+  	       char_u *dflt,
+! 	       char_u *ext,
+  	       char_u *initdir,
+! 	       char_u *filter)
+  {
+  #ifdef USE_FILE_CHOOSER
+      GtkWidget		*fc;
+--- 1258,1270 ----
+   * initdir			initial directory, NULL for current dir
+   * filter			not used (file name filter)
+   */
+      char_u *
+! gui_mch_browse(int saving UNUSED,
+  	       char_u *title,
+  	       char_u *dflt,
+! 	       char_u *ext UNUSED,
+  	       char_u *initdir,
+! 	       char_u *filter UNUSED)
+  {
+  #ifdef USE_FILE_CHOOSER
+      GtkWidget		*fc;
+***************
+*** 1377,1383 ****
+   * dflt				default name
+   * initdir			initial directory, NULL for current dir
+   */
+- /*ARGSUSED*/
+      char_u *
+  gui_mch_browsedir(
+  	       char_u *title,
+--- 1372,1377 ----
+***************
+*** 1460,1466 ****
+  }
+  
+  # ifdef FEAT_GUI_GNOME
+- /* ARGSUSED */
+      static int
+  gui_gnome_dialog( int	type,
+  		char_u	*title,
+--- 1454,1459 ----
+***************
+*** 1611,1617 ****
+      GtkWidget	*dialog;
+  } CancelData;
+  
+- /* ARGSUSED */
+      static void
+  dlg_button_clicked(GtkWidget * widget, ButtonData *data)
+  {
+--- 1604,1609 ----
+***************
+*** 1622,1628 ****
+  /*
+   * This makes the Escape key equivalent to the cancel button.
+   */
+- /*ARGSUSED*/
+      static int
+  dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
+  {
+--- 1614,1619 ----
+***************
+*** 1655,1661 ****
+  	gtk_main_quit();
+  }
+  
+- /* ARGSUSED */
+      int
+  gui_mch_dialog(	int	type,		/* type of dialog */
+  		char_u	*title,		/* title of dialog */
+--- 1646,1651 ----
+***************
+*** 2215,2221 ****
+      GtkDialog	*dialog;	    /* Widget of the dialog */
+  } DialogInfo;
+  
+- /*ARGSUSED2*/
+      static gboolean
+  dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+  {
+--- 2205,2210 ----
+***************
+*** 2398,2411 ****
+   * Note: The push_in output argument seems to affect scrolling of huge
+   * menus that don't fit on the screen.	Leave it at the default for now.
+   */
+- /*ARGSUSED0*/
+      static void
+! popup_menu_position_func(GtkMenu *menu,
+  			 gint *x, gint *y,
+  # ifdef HAVE_GTK2
+! 			 gboolean *push_in,
+  # endif
+! 			 gpointer user_data)
+  {
+      gdk_window_get_origin(gui.drawarea->window, x, y);
+  
+--- 2387,2399 ----
+   * Note: The push_in output argument seems to affect scrolling of huge
+   * menus that don't fit on the screen.	Leave it at the default for now.
+   */
+      static void
+! popup_menu_position_func(GtkMenu *menu UNUSED,
+  			 gint *x, gint *y,
+  # ifdef HAVE_GTK2
+! 			 gboolean *push_in UNUSED,
+  # endif
+! 			 gpointer user_data UNUSED)
+  {
+      gdk_window_get_origin(gui.drawarea->window, x, y);
+  
+***************
+*** 2464,2476 ****
+      GtkWidget *all;	/* 'Replace All' action button */
+  } SharedFindReplace;
+  
+! static SharedFindReplace find_widgets = { NULL, };
+! static SharedFindReplace repl_widgets = { NULL, };
+  
+- /* ARGSUSED */
+      static int
+  find_key_press_event(
+! 		GtkWidget	*widget,
+  		GdkEventKey	*event,
+  		SharedFindReplace *frdp)
+  {
+--- 2452,2463 ----
+      GtkWidget *all;	/* 'Replace All' action button */
+  } SharedFindReplace;
+  
+! static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+! static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+  
+      static int
+  find_key_press_event(
+! 		GtkWidget	*widget UNUSED,
+  		GdkEventKey	*event,
+  		SharedFindReplace *frdp)
+  {
+***************
+*** 2962,2970 ****
+  /*
+   * Callback for actions of the find and replace dialogs
+   */
+- /*ARGSUSED*/
+      static void
+! find_replace_cb(GtkWidget *widget, gpointer data)
+  {
+      int			flags;
+      char_u		*find_text;
+--- 2949,2956 ----
+  /*
+   * Callback for actions of the find and replace dialogs
+   */
+      static void
+! find_replace_cb(GtkWidget *widget UNUSED, gpointer data)
+  {
+      int			flags;
+      char_u		*find_text;
+***************
+*** 3010,3018 ****
+  }
+  
+  /* our usual callback function */
+- /*ARGSUSED*/
+      static void
+! entry_activate_cb(GtkWidget *widget, gpointer data)
+  {
+      gtk_widget_grab_focus(GTK_WIDGET(data));
+  }
+--- 2996,3003 ----
+  }
+  
+  /* our usual callback function */
+      static void
+! entry_activate_cb(GtkWidget *widget UNUSED, gpointer data)
+  {
+      gtk_widget_grab_focus(GTK_WIDGET(data));
+  }
+***************
+*** 3055,3064 ****
+  /*
+   * ":helpfind"
+   */
+- /*ARGSUSED*/
+      void
+  ex_helpfind(eap)
+!     exarg_T	*eap;
+  {
+      /* This will fail when menus are not loaded.  Well, it's only for
+       * backwards compatibility anyway. */
+--- 3040,3048 ----
+  /*
+   * ":helpfind"
+   */
+      void
+  ex_helpfind(eap)
+!     exarg_T	*eap UNUSED;
+  {
+      /* This will fail when menus are not loaded.  Well, it's only for
+       * backwards compatibility anyway. */
+*** ../vim-7.2.180/src/gui_gtk_x11.c	2008-11-28 21:26:50.000000000 +0100
+--- src/gui_gtk_x11.c	2009-05-17 15:53:02.000000000 +0200
+***************
+*** 619,627 ****
+   * Doesn't seem possible, since check_copy_area() relies on
+   * this information.  --danielk
+   */
+- /*ARGSUSED*/
+      static gint
+! visibility_event(GtkWidget *widget, GdkEventVisibility *event, gpointer data)
+  {
+      gui.visibility = event->state;
+      /*
+--- 625,634 ----
+   * Doesn't seem possible, since check_copy_area() relies on
+   * this information.  --danielk
+   */
+      static gint
+! visibility_event(GtkWidget *widget UNUSED,
+! 		 GdkEventVisibility *event,
+! 		 gpointer data UNUSED)
+  {
+      gui.visibility = event->state;
+      /*
+***************
+*** 638,646 ****
+  /*
+   * Redraw the corresponding portions of the screen.
+   */
+- /*ARGSUSED*/
+      static gint
+! expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
+  {
+      /* Skip this when the GUI isn't set up yet, will redraw later. */
+      if (gui.starting)
+--- 645,654 ----
+  /*
+   * Redraw the corresponding portions of the screen.
+   */
+      static gint
+! expose_event(GtkWidget *widget UNUSED,
+! 	     GdkEventExpose *event,
+! 	     gpointer data UNUSED)
+  {
+      /* Skip this when the GUI isn't set up yet, will redraw later. */
+      if (gui.starting)
+***************
+*** 668,676 ****
+  /*
+   * Handle changes to the "Comm" property
+   */
+- /*ARGSUSED2*/
+      static gint
+! property_event(GtkWidget *widget, GdkEventProperty *event, gpointer data)
+  {
+      if (event->type == GDK_PROPERTY_NOTIFY
+  	    && event->state == (int)GDK_PROPERTY_NEW_VALUE
+--- 676,685 ----
+  /*
+   * Handle changes to the "Comm" property
+   */
+      static gint
+! property_event(GtkWidget *widget,
+! 	       GdkEventProperty *event,
+! 	       gpointer data UNUSED)
+  {
+      if (event->type == GDK_PROPERTY_NOTIFY
+  	    && event->state == (int)GDK_PROPERTY_NEW_VALUE
+***************
+*** 740,748 ****
+      blink_state = BLINK_NONE;
+  }
+  
+- /*ARGSUSED*/
+      static gint
+! blink_cb(gpointer data)
+  {
+      if (blink_state == BLINK_ON)
+      {
+--- 749,756 ----
+      blink_state = BLINK_NONE;
+  }
+  
+      static gint
+! blink_cb(gpointer data UNUSED)
+  {
+      if (blink_state == BLINK_ON)
+      {
+***************
+*** 781,789 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static gint
+! enter_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+  {
+      if (blink_state == BLINK_NONE)
+  	gui_mch_start_blink();
+--- 789,798 ----
+      }
+  }
+  
+      static gint
+! enter_notify_event(GtkWidget *widget UNUSED,
+! 		   GdkEventCrossing *event UNUSED,
+! 		   gpointer data UNUSED)
+  {
+      if (blink_state == BLINK_NONE)
+  	gui_mch_start_blink();
+***************
+*** 795,803 ****
+      return FALSE;
+  }
+  
+- /*ARGSUSED*/
+      static gint
+! leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+  {
+      if (blink_state != BLINK_NONE)
+  	gui_mch_stop_blink();
+--- 804,813 ----
+      return FALSE;
+  }
+  
+      static gint
+! leave_notify_event(GtkWidget *widget UNUSED,
+! 		   GdkEventCrossing *event UNUSED,
+! 		   gpointer data UNUSED)
+  {
+      if (blink_state != BLINK_NONE)
+  	gui_mch_stop_blink();
+***************
+*** 805,813 ****
+      return FALSE;
+  }
+  
+- /*ARGSUSED*/
+      static gint
+! focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
+  {
+      gui_focus_change(TRUE);
+  
+--- 815,824 ----
+      return FALSE;
+  }
+  
+      static gint
+! focus_in_event(GtkWidget *widget,
+! 	       GdkEventFocus *event UNUSED,
+! 	       gpointer data UNUSED)
+  {
+      gui_focus_change(TRUE);
+  
+***************
+*** 826,834 ****
+      return TRUE;
+  }
+  
+- /*ARGSUSED*/
+      static gint
+! focus_out_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
+  {
+      gui_focus_change(FALSE);
+  
+--- 837,846 ----
+      return TRUE;
+  }
+  
+      static gint
+! focus_out_event(GtkWidget *widget UNUSED,
+! 	        GdkEventFocus *event UNUSED,
+! 		gpointer data UNUSED)
+  {
+      gui_focus_change(FALSE);
+  
+***************
+*** 956,964 ****
+  /*
+   * Main keyboard handler:
+   */
+- /*ARGSUSED*/
+      static gint
+! key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
+  {
+  #ifdef HAVE_GTK2
+      /* 256 bytes is way over the top, but for safety let's reduce it only
+--- 968,977 ----
+  /*
+   * Main keyboard handler:
+   */
+      static gint
+! key_press_event(GtkWidget *widget UNUSED,
+! 		GdkEventKey *event,
+! 		gpointer data UNUSED)
+  {
+  #ifdef HAVE_GTK2
+      /* 256 bytes is way over the top, but for safety let's reduce it only
+***************
+*** 1225,1233 ****
+  }
+  
+  #if defined(FEAT_XIM) && defined(HAVE_GTK2)
+- /*ARGSUSED0*/
+      static gboolean
+! key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
+  {
+      /*
+       * GTK+ 2 input methods may do fancy stuff on key release events too.
+--- 1238,1247 ----
+  }
+  
+  #if defined(FEAT_XIM) && defined(HAVE_GTK2)
+      static gboolean
+! key_release_event(GtkWidget *widget UNUSED,
+! 		  GdkEventKey *event,
+! 		  gpointer data UNUSED)
+  {
+      /*
+       * GTK+ 2 input methods may do fancy stuff on key release events too.
+***************
+*** 1243,1253 ****
+   * Selection handlers:
+   */
+  
+- /*ARGSUSED*/
+      static gint
+! selection_clear_event(GtkWidget		*widget,
+  		      GdkEventSelection	*event,
+! 		      gpointer		user_data)
+  {
+      if (event->selection == clip_plus.gtk_sel_atom)
+  	clip_lose_selection(&clip_plus);
+--- 1257,1266 ----
+   * Selection handlers:
+   */
+  
+      static gint
+! selection_clear_event(GtkWidget		*widget UNUSED,
+  		      GdkEventSelection	*event,
+! 		      gpointer		user_data UNUSED)
+  {
+      if (event->selection == clip_plus.gtk_sel_atom)
+  	clip_lose_selection(&clip_plus);
+***************
+*** 1265,1276 ****
+  #define RS_FAIL	2	/* selection_received_cb() called and failed */
+  static int received_selection = RS_NONE;
+  
+- /*ARGSUSED*/
+      static void
+! selection_received_cb(GtkWidget		*widget,
+  		      GtkSelectionData	*data,
+! 		      guint		time_,
+! 		      gpointer		user_data)
+  {
+      VimClipboard    *cbd;
+      char_u	    *text;
+--- 1278,1288 ----
+  #define RS_FAIL	2	/* selection_received_cb() called and failed */
+  static int received_selection = RS_NONE;
+  
+      static void
+! selection_received_cb(GtkWidget		*widget UNUSED,
+  		      GtkSelectionData	*data,
+! 		      guint		time_ UNUSED,
+! 		      gpointer		user_data UNUSED)
+  {
+      VimClipboard    *cbd;
+      char_u	    *text;
+***************
+*** 1414,1426 ****
+   * Prepare our selection data for passing it to the external selection
+   * client.
+   */
+- /*ARGSUSED*/
+      static void
+! selection_get_cb(GtkWidget	    *widget,
+  		 GtkSelectionData   *selection_data,
+  		 guint		    info,
+! 		 guint		    time_,
+! 		 gpointer	    user_data)
+  {
+      char_u	    *string;
+      char_u	    *tmpbuf;
+--- 1426,1437 ----
+   * Prepare our selection data for passing it to the external selection
+   * client.
+   */
+      static void
+! selection_get_cb(GtkWidget	    *widget UNUSED,
+  		 GtkSelectionData   *selection_data,
+  		 guint		    info,
+! 		 guint		    time_ UNUSED,
+! 		 gpointer	    user_data UNUSED)
+  {
+      char_u	    *string;
+      char_u	    *tmpbuf;
+***************
+*** 1678,1684 ****
+  
+  	offshoot = dx > dy ? dx : dy;
+  
+! 	/* Make a linearly declaying timer delay with a threshold of 5 at a
+  	 * distance of 127 pixels from the main window.
+  	 *
+  	 * One could think endlessly about the most ergonomic variant here.
+--- 1689,1695 ----
+  
+  	offshoot = dx > dy ? dx : dy;
+  
+! 	/* Make a linearly decaying timer delay with a threshold of 5 at a
+  	 * distance of 127 pixels from the main window.
+  	 *
+  	 * One could think endlessly about the most ergonomic variant here.
+***************
+*** 1707,1715 ****
+  /*
+   * Timer used to recognize multiple clicks of the mouse button.
+   */
+- /*ARGSUSED0*/
+      static gint
+! motion_repeat_timer_cb(gpointer data)
+  {
+      int		    x;
+      int		    y;
+--- 1718,1725 ----
+  /*
+   * Timer used to recognize multiple clicks of the mouse button.
+   */
+      static gint
+! motion_repeat_timer_cb(gpointer data UNUSED)
+  {
+      int		    x;
+      int		    y;
+***************
+*** 1749,1757 ****
+      return FALSE;
+  }
+  
+- /*ARGSUSED2*/
+      static gint
+! motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+  {
+      if (event->is_hint)
+      {
+--- 1759,1768 ----
+      return FALSE;
+  }
+  
+      static gint
+! motion_notify_event(GtkWidget *widget,
+! 		    GdkEventMotion *event,
+! 		    gpointer data UNUSED)
+  {
+      if (event->is_hint)
+      {
+***************
+*** 1777,1785 ****
+   * by our own timeout mechanism instead of the one provided by GTK+ itself.
+   * This is due to the way the generic VIM code is recognizing multiple clicks.
+   */
+- /*ARGSUSED2*/
+      static gint
+! button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
+  {
+      int button;
+      int repeated_click = FALSE;
+--- 1788,1797 ----
+   * by our own timeout mechanism instead of the one provided by GTK+ itself.
+   * This is due to the way the generic VIM code is recognizing multiple clicks.
+   */
+      static gint
+! button_press_event(GtkWidget *widget,
+! 		   GdkEventButton *event,
+! 		   gpointer data UNUSED)
+  {
+      int button;
+      int repeated_click = FALSE;
+***************
+*** 1855,1863 ****
+   * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
+   * Instead, it abstracts scrolling via the new GdkEventScroll.
+   */
+- /*ARGSUSED2*/
+      static gboolean
+! scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
+  {
+      int	    button;
+      int_u   vim_modifiers;
+--- 1867,1876 ----
+   * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
+   * Instead, it abstracts scrolling via the new GdkEventScroll.
+   */
+      static gboolean
+! scroll_event(GtkWidget *widget,
+! 	     GdkEventScroll *event,
+! 	     gpointer data UNUSED)
+  {
+      int	    button;
+      int_u   vim_modifiers;
+***************
+*** 1896,1904 ****
+  #endif /* HAVE_GTK2 */
+  
+  
+- /*ARGSUSED*/
+      static gint
+! button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
+  {
+      int x, y;
+      int_u vim_modifiers;
+--- 1909,1918 ----
+  #endif /* HAVE_GTK2 */
+  
+  
+      static gint
+! button_release_event(GtkWidget *widget UNUSED,
+! 		     GdkEventButton *event,
+! 		     gpointer data UNUSED)
+  {
+      int x, y;
+      int_u vim_modifiers;
+***************
+*** 2100,2106 ****
+  /*
+   * DND receiver.
+   */
+- /*ARGSUSED2*/
+      static void
+  drag_data_received_cb(GtkWidget		*widget,
+  		      GdkDragContext	*context,
+--- 2114,2119 ----
+***************
+*** 2109,2115 ****
+  		      GtkSelectionData	*data,
+  		      guint		info,
+  		      guint		time_,
+! 		      gpointer		user_data)
+  {
+      GdkModifierType state;
+  
+--- 2122,2128 ----
+  		      GtkSelectionData	*data,
+  		      guint		info,
+  		      guint		time_,
+! 		      gpointer		user_data UNUSED)
+  {
+      GdkModifierType state;
+  
+***************
+*** 2143,2149 ****
+   * be abandoned and pop up a dialog asking the user for confirmation if
+   * necessary.
+   */
+- /*ARGSUSED0*/
+      static void
+  sm_client_check_changed_any(GnomeClient	    *client,
+  			    gint	    key,
+--- 2156,2161 ----
+***************
+*** 2251,2257 ****
+   * for confirmation if necessary.  Save the current editing session and tell
+   * the session manager how to restart Vim.
+   */
+- /*ARGSUSED1*/
+      static gboolean
+  sm_client_save_yourself(GnomeClient	    *client,
+  			gint		    phase,
+--- 2263,2268 ----
+***************
+*** 2339,2345 ****
+   * here since "save_yourself" has been emitted before (unless serious trouble
+   * is happening).
+   */
+- /*ARGSUSED0*/
+      static void
+  sm_client_die(GnomeClient *client, gpointer data)
+  {
+--- 2350,2355 ----
+***************
+*** 2379,2388 ****
+  /*
+   * GTK tells us that XSMP needs attention
+   */
+- /*ARGSUSED*/
+      static gboolean
+  local_xsmp_handle_requests(source, condition, data)
+!     GIOChannel		*source;
+      GIOCondition	condition;
+      gpointer		data;
+  {
+--- 2389,2397 ----
+  /*
+   * GTK tells us that XSMP needs attention
+   */
+      static gboolean
+  local_xsmp_handle_requests(source, condition, data)
+!     GIOChannel		*source UNUSED;
+      GIOCondition	condition;
+      gpointer		data;
+  {
+***************
+*** 2480,2495 ****
+   * WM_SAVE_YOURSELF hack it actually stores the session...  And yes,
+   * it should work with KDE as well.
+   */
+- /*ARGSUSED1*/
+      static GdkFilterReturn
+! global_event_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
+  {
+      XEvent *xevent = (XEvent *)xev;
+  
+      if (xevent != NULL
+  	    && xevent->type == ClientMessage
+  	    && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
+! 	    && xevent->xclient.data.l[0] == GET_X_ATOM(save_yourself_atom))
+      {
+  	out_flush();
+  	ml_sync_all(FALSE, FALSE); /* preserve all swap files */
+--- 2489,2506 ----
+   * WM_SAVE_YOURSELF hack it actually stores the session...  And yes,
+   * it should work with KDE as well.
+   */
+      static GdkFilterReturn
+! global_event_filter(GdkXEvent *xev,
+! 		    GdkEvent *event UNUSED,
+! 		    gpointer data UNUSED)
+  {
+      XEvent *xevent = (XEvent *)xev;
+  
+      if (xevent != NULL
+  	    && xevent->type == ClientMessage
+  	    && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
+! 	    && (long_u)xevent->xclient.data.l[0]
+! 					    == GET_X_ATOM(save_yourself_atom))
+      {
+  	out_flush();
+  	ml_sync_all(FALSE, FALSE); /* preserve all swap files */
+***************
+*** 2512,2518 ****
+  /*
+   * GDK handler for X ClientMessage events.
+   */
+- /*ARGSUSED2*/
+      static GdkFilterReturn
+  gdk_wm_protocols_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
+  {
+--- 2523,2528 ----
+***************
+*** 2558,2566 ****
+  /*
+   * Setup the window icon & xcmdsrv comm after the main window has been realized.
+   */
+- /*ARGSUSED*/
+      static void
+! mainwin_realize(GtkWidget *widget, gpointer data)
+  {
+  /* If you get an error message here, you still need to unpack the runtime
+   * archive! */
+--- 2568,2575 ----
+  /*
+   * Setup the window icon & xcmdsrv comm after the main window has been realized.
+   */
+      static void
+! mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
+  {
+  /* If you get an error message here, you still need to unpack the runtime
+   * archive! */
+***************
+*** 2712,2722 ****
+  }
+  
+  #ifdef HAVE_GTK_MULTIHEAD
+- /*ARGSUSED1*/
+      static void
+  mainwin_screen_changed_cb(GtkWidget  *widget,
+! 			  GdkScreen  *previous_screen,
+! 			  gpointer   data)
+  {
+      if (!gtk_widget_has_screen(widget))
+  	return;
+--- 2721,2730 ----
+  }
+  
+  #ifdef HAVE_GTK_MULTIHEAD
+      static void
+  mainwin_screen_changed_cb(GtkWidget  *widget,
+! 			  GdkScreen  *previous_screen UNUSED,
+! 			  gpointer   data UNUSED)
+  {
+      if (!gtk_widget_has_screen(widget))
+  	return;
+***************
+*** 2757,2765 ****
+   * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
+   * fact that the main VIM engine doesn't take them into account anywhere.
+   */
+- /*ARGSUSED1*/
+      static void
+! drawarea_realize_cb(GtkWidget *widget, gpointer data)
+  {
+      GtkWidget *sbar;
+  
+--- 2765,2772 ----
+   * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
+   * fact that the main VIM engine doesn't take them into account anywhere.
+   */
+      static void
+! drawarea_realize_cb(GtkWidget *widget, gpointer data UNUSED)
+  {
+      GtkWidget *sbar;
+  
+***************
+*** 2789,2797 ****
+  /*
+   * Properly clean up on shutdown.
+   */
+- /*ARGSUSED0*/
+      static void
+! drawarea_unrealize_cb(GtkWidget *widget, gpointer data)
+  {
+      /* Don't write messages to the GUI anymore */
+      full_screen = FALSE;
+--- 2796,2803 ----
+  /*
+   * Properly clean up on shutdown.
+   */
+      static void
+! drawarea_unrealize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
+  {
+      /* Don't write messages to the GUI anymore */
+      full_screen = FALSE;
+***************
+*** 2827,2837 ****
+  #endif
+  }
+  
+- /*ARGSUSED0*/
+      static void
+! drawarea_style_set_cb(GtkWidget	*widget,
+! 		      GtkStyle	*previous_style,
+! 		      gpointer	data)
+  {
+      gui_mch_new_colors();
+  }
+--- 2833,2842 ----
+  #endif
+  }
+  
+      static void
+! drawarea_style_set_cb(GtkWidget	*widget UNUSED,
+! 		      GtkStyle	*previous_style UNUSED,
+! 		      gpointer	data UNUSED)
+  {
+      gui_mch_new_colors();
+  }
+***************
+*** 2840,2848 ****
+   * Callback routine for the "delete_event" signal on the toplevel window.
+   * Tries to vim gracefully, or refuses to exit with changed buffers.
+   */
+- /*ARGSUSED*/
+      static gint
+! delete_event_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
+  {
+      gui_shell_closed();
+      return TRUE;
+--- 2845,2854 ----
+   * Callback routine for the "delete_event" signal on the toplevel window.
+   * Tries to vim gracefully, or refuses to exit with changed buffers.
+   */
+      static gint
+! delete_event_cb(GtkWidget *widget UNUSED,
+! 		GdkEventAny *event UNUSED,
+! 		gpointer data UNUSED)
+  {
+      gui_shell_closed();
+      return TRUE;
+***************
+*** 2964,2970 ****
+  
+      /* At start-up, don't try to set the hints until the initial
+       * values have been used (those that dictate our initial size)
+!      * Let forced (i.e., correct) values thruogh always.
+       */
+      if (!(force_width && force_height)  &&  init_window_hints_state > 0)
+      {
+--- 2970,2976 ----
+  
+      /* At start-up, don't try to set the hints until the initial
+       * values have been used (those that dictate our initial size)
+!      * Let forced (i.e., correct) values through always.
+       */
+      if (!(force_width && force_height)  &&  init_window_hints_state > 0)
+      {
+***************
+*** 3142,3150 ****
+  /*
+   * Handle selecting an item in the tab line popup menu.
+   */
+- /*ARGSUSED*/
+      static void
+! tabline_menu_handler(GtkMenuItem *item, gpointer user_data)
+  {
+      /* Add the string cmd into input buffer */
+      send_tabline_menu_event(clicked_page, (int)(long)user_data);
+--- 3148,3155 ----
+  /*
+   * Handle selecting an item in the tab line popup menu.
+   */
+      static void
+! tabline_menu_handler(GtkMenuItem *item UNUSED, gpointer user_data)
+  {
+      /* Add the string cmd into input buffer */
+      send_tabline_menu_event(clicked_page, (int)(long)user_data);
+***************
+*** 3244,3256 ****
+  /*
+   * Handle selecting one of the tabs.
+   */
+- /*ARGSUSED*/
+      static void
+  on_select_tab(
+! 	GtkNotebook	*notebook,
+! 	GtkNotebookPage *page,
+  	gint		idx,
+! 	gpointer	data)
+  {
+      if (!ignore_tabline_evt)
+      {
+--- 3249,3260 ----
+  /*
+   * Handle selecting one of the tabs.
+   */
+      static void
+  on_select_tab(
+! 	GtkNotebook	*notebook UNUSED,
+! 	GtkNotebookPage *page UNUSED,
+  	gint		idx,
+! 	gpointer	data UNUSED)
+  {
+      if (!ignore_tabline_evt)
+      {
+***************
+*** 3784,3790 ****
+  #endif
+  
+      if (gtk_socket_id != 0)
+! 	/* make sure keybord input can go to the drawarea */
+  	GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
+  
+      /*
+--- 3788,3794 ----
+  #endif
+  
+      if (gtk_socket_id != 0)
+! 	/* make sure keyboard input can go to the drawarea */
+  	GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
+  
+      /*
+***************
+*** 3922,3931 ****
+  /*
+   * This signal informs us about the need to rearrange our sub-widgets.
+   */
+- /*ARGSUSED*/
+      static gint
+! form_configure_event(GtkWidget *widget, GdkEventConfigure *event,
+! 		     gpointer data)
+  {
+      int usable_height = event->height;
+  
+--- 3926,3935 ----
+  /*
+   * This signal informs us about the need to rearrange our sub-widgets.
+   */
+      static gint
+! form_configure_event(GtkWidget *widget UNUSED,
+! 		     GdkEventConfigure *event,
+! 		     gpointer data UNUSED)
+  {
+      int usable_height = event->height;
+  
+***************
+*** 3948,3956 ****
+   * We can't do much more here than to trying to preserve what had been done,
+   * since the window is already inevitably going away.
+   */
+- /*ARGSUSED0*/
+      static void
+! mainwin_destroy_cb(GtkObject *object, gpointer data)
+  {
+      /* Don't write messages to the GUI anymore */
+      full_screen = FALSE;
+--- 3952,3959 ----
+   * We can't do much more here than to trying to preserve what had been done,
+   * since the window is already inevitably going away.
+   */
+      static void
+! mainwin_destroy_cb(GtkObject *object UNUSED, gpointer data UNUSED)
+  {
+      /* Don't write messages to the GUI anymore */
+      full_screen = FALSE;
+***************
+*** 3980,3988 ****
+   * scrollbar init.), actually do the standard hinst and stop the timer.
+   * We'll not let the default hints be set while this timer's active.
+   */
+- /*ARGSUSED*/
+      static gboolean
+! check_startup_plug_hints(gpointer data)
+  {
+      if (init_window_hints_state == 1)
+      {
+--- 3983,3990 ----
+   * scrollbar init.), actually do the standard hinst and stop the timer.
+   * We'll not let the default hints be set while this timer's active.
+   */
+      static gboolean
+! check_startup_plug_hints(gpointer data UNUSED)
+  {
+      if (init_window_hints_state == 1)
+      {
+***************
+*** 4055,4061 ****
+  	    Columns = w;
+  	if (mask & HeightValue)
+  	{
+! 	    if (p_window > h - 1 || !option_was_set((char_u *)"window"))
+  		p_window = h - 1;
+  	    Rows = h;
+  	}
+--- 4057,4063 ----
+  	    Columns = w;
+  	if (mask & HeightValue)
+  	{
+! 	    if (p_window > (long)h - 1 || !option_was_set((char_u *)"window"))
+  		p_window = h - 1;
+  	    Rows = h;
+  	}
+***************
+*** 4229,4237 ****
+  }
+  
+  
+- /*ARGSUSED0*/
+      void
+! gui_mch_exit(int rc)
+  {
+      if (gui.mainwin != NULL)
+  	gtk_widget_destroy(gui.mainwin);
+--- 4231,4238 ----
+  }
+  
+  
+      void
+! gui_mch_exit(int rc UNUSED)
+  {
+      if (gui.mainwin != NULL)
+  	gtk_widget_destroy(gui.mainwin);
+***************
+*** 4286,4292 ****
+   * report the new size through form_configure_event().  That caused the window
+   * layout to be messed up.
+   */
+- /*ARGSUSED0*/
+      static gboolean
+  force_shell_resize_idle(gpointer data)
+  {
+--- 4287,4292 ----
+***************
+*** 4314,4325 ****
+  /*
+   * Set the windows size.
+   */
+- /*ARGSUSED2*/
+      void
+  gui_mch_set_shellsize(int width, int height,
+! 		      int min_width,  int min_height,
+! 		      int base_width, int base_height,
+! 		      int direction)
+  {
+  #ifndef HAVE_GTK2
+      /* Hack: When the form already is at the desired size, the window might
+--- 4314,4324 ----
+  /*
+   * Set the windows size.
+   */
+      void
+  gui_mch_set_shellsize(int width, int height,
+! 		      int min_width UNUSED,  int min_height UNUSED,
+! 		      int base_width UNUSED, int base_height UNUSED,
+! 		      int direction UNUSED)
+  {
+  #ifndef HAVE_GTK2
+      /* Hack: When the form already is at the desired size, the window might
+***************
+*** 4413,4421 ****
+  }
+  
+  #if defined(FEAT_TITLE) || defined(PROTO)
+- /*ARGSUSED*/
+      void
+! gui_mch_settitle(char_u *title, char_u *icon)
+  {
+  # ifdef HAVE_GTK2
+      if (title != NULL && output_conv.vc_type != CONV_NONE)
+--- 4412,4419 ----
+  }
+  
+  #if defined(FEAT_TITLE) || defined(PROTO)
+      void
+! gui_mch_settitle(char_u *title, char_u *icon UNUSED)
+  {
+  # ifdef HAVE_GTK2
+      if (title != NULL && output_conv.vc_type != CONV_NONE)
+***************
+*** 4493,4499 ****
+   * Get a font structure for highlighting.
+   * "cbdata" is a pointer to the global gui structure.
+   */
+- /*ARGSUSED*/
+      static void
+  font_sel_ok(GtkWidget *wgt, gpointer cbdata)
+  {
+--- 4491,4496 ----
+***************
+*** 4509,4515 ****
+  	gtk_main_quit();
+  }
+  
+- /*ARGSUSED*/
+      static void
+  font_sel_cancel(GtkWidget *wgt, gpointer cbdata)
+  {
+--- 4506,4511 ----
+***************
+*** 4520,4526 ****
+  	gtk_main_quit();
+  }
+  
+- /*ARGSUSED*/
+      static void
+  font_sel_destroy(GtkWidget *wgt, gpointer cbdata)
+  {
+--- 4516,4521 ----
+***************
+*** 4620,4626 ****
+  /*
+   * Try to load the requested fontset.
+   */
+- /*ARGSUSED2*/
+      GuiFontset
+  gui_mch_get_fontset(char_u *name, int report_error, int fixed_width)
+  {
+--- 4615,4620 ----
+***************
+*** 4863,4869 ****
+      styled_font[1] = &gui.ital_font;
+      styled_font[2] = &gui.boldital_font;
+  
+!     /* First free whatever was freviously there. */
+      for (i = 0; i < 3; ++i)
+  	if (*styled_font[i])
+  	{
+--- 4857,4863 ----
+      styled_font[1] = &gui.ital_font;
+      styled_font[2] = &gui.boldital_font;
+  
+!     /* First free whatever was previously there. */
+      for (i = 0; i < 3; ++i)
+  	if (*styled_font[i])
+  	{
+***************
+*** 5012,5020 ****
+   * Initialize Vim to use the font or fontset with the given name.
+   * Return FAIL if the font could not be loaded, OK otherwise.
+   */
+- /*ARGSUSED1*/
+      int
+! gui_mch_init_font(char_u *font_name, int fontset)
+  {
+  #ifdef HAVE_GTK2
+      PangoFontDescription    *font_desc;
+--- 5006,5013 ----
+   * Initialize Vim to use the font or fontset with the given name.
+   * Return FAIL if the font could not be loaded, OK otherwise.
+   */
+      int
+! gui_mch_init_font(char_u *font_name, int fontset UNUSED)
+  {
+  #ifdef HAVE_GTK2
+      PangoFontDescription    *font_desc;
+***************
+*** 5326,5334 ****
+  /*
+   * Return the name of font "font" in allocated memory.
+   */
+- /*ARGSUSED*/
+      char_u *
+! gui_mch_get_fontname(GuiFont font, char_u *name)
+  {
+  # ifdef HAVE_GTK2
+      if (font != NOFONT)
+--- 5319,5326 ----
+  /*
+   * Return the name of font "font" in allocated memory.
+   */
+      char_u *
+! gui_mch_get_fontname(GuiFont font, char_u *name UNUSED)
+  {
+  # ifdef HAVE_GTK2
+      if (font != NOFONT)
+***************
+*** 5732,5738 ****
+  {
+      int			i;
+      int			offset;
+!     const static int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
+      int			y = FILL_Y(row + 1) - 1;
+  
+      /* Undercurl: draw curl at the bottom of the character cell. */
+--- 5724,5730 ----
+  {
+      int			i;
+      int			offset;
+!     static const int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
+      int			y = FILL_Y(row + 1) - 1;
+  
+      /* Undercurl: draw curl at the bottom of the character cell. */
+***************
+*** 6402,6408 ****
+  /*
+   * Callback function, used when data is available on the SNiFF connection.
+   */
+- /* ARGSUSED */
+      static void
+  sniff_request_cb(
+      gpointer	data,
+--- 6394,6399 ----
+***************
+*** 6711,6719 ****
+  /*
+   * Disown the selection.
+   */
+- /*ARGSUSED*/
+      void
+! clip_mch_lose_selection(VimClipboard *cbd)
+  {
+      /* WEIRD: when using NULL to actually disown the selection, we lose the
+       * selection the first time we own it. */
+--- 6702,6709 ----
+  /*
+   * Disown the selection.
+   */
+      void
+! clip_mch_lose_selection(VimClipboard *cbd UNUSED)
+  {
+      /* WEIRD: when using NULL to actually disown the selection, we lose the
+       * selection the first time we own it. */
+***************
+*** 6741,6749 ****
+   * Send the current selection to the clipboard.  Do nothing for X because we
+   * will fill in the selection only when requested by another app.
+   */
+- /*ARGSUSED*/
+      void
+! clip_mch_set_selection(VimClipboard *cbd)
+  {
+  }
+  
+--- 6731,6738 ----
+   * Send the current selection to the clipboard.  Do nothing for X because we
+   * will fill in the selection only when requested by another app.
+   */
+      void
+! clip_mch_set_selection(VimClipboard *cbd UNUSED)
+  {
+  }
+  
+***************
+*** 6950,6956 ****
+  	    else
+  		id &= ~1;	/* they are always even (why?) */
+  	}
+! 	else if (shape < sizeof(mshape_ids) / sizeof(int))
+  	    id = mshape_ids[shape];
+  	else
+  	    return;
+--- 6939,6945 ----
+  	    else
+  		id &= ~1;	/* they are always even (why?) */
+  	}
+! 	else if (shape < (int)(sizeof(mshape_ids) / sizeof(int)))
+  	    id = mshape_ids[shape];
+  	else
+  	    return;
+*** ../vim-7.2.180/src/gui_gtk_f.c	2007-05-10 19:50:33.000000000 +0200
+--- src/gui_gtk_f.c	2009-05-17 15:48:51.000000000 +0200
+***************
+*** 227,240 ****
+  
+      if (!form_type)
+      {
+! 	GtkTypeInfo form_info =
+! 	{
+! 	    "GtkForm",
+! 	    sizeof(GtkForm),
+! 	    sizeof(GtkFormClass),
+! 	    (GtkClassInitFunc) gtk_form_class_init,
+! 	    (GtkObjectInitFunc) gtk_form_init
+! 	};
+  
+  	form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
+      }
+--- 227,239 ----
+  
+      if (!form_type)
+      {
+! 	GtkTypeInfo form_info;
+! 
+! 	form_info.type_name = "GtkForm";
+! 	form_info.object_size = sizeof(GtkForm);
+! 	form_info.class_size = sizeof(GtkFormClass);
+! 	form_info.class_init_func = (GtkClassInitFunc)gtk_form_class_init;
+! 	form_info.object_init_func = (GtkObjectInitFunc)gtk_form_init;
+  
+  	form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
+      }
+***************
+*** 611,620 ****
+      }
+  }
+  
+- /*ARGSUSED1*/
+      static void
+  gtk_form_forall(GtkContainer	*container,
+! 		gboolean	include_internals,
+  		GtkCallback	callback,
+  		gpointer	callback_data)
+  {
+--- 610,618 ----
+      }
+  }
+  
+      static void
+  gtk_form_forall(GtkContainer	*container,
+! 		gboolean	include_internals UNUSED,
+  		GtkCallback	callback,
+  		gpointer	callback_data)
+  {
+***************
+*** 786,794 ****
+   * them or discards them, depending on whether we are obscured
+   * or not.
+   */
+- /*ARGSUSED1*/
+      static GdkFilterReturn
+! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
+  {
+      XEvent *xevent;
+      GtkForm *form;
+--- 784,791 ----
+   * them or discards them, depending on whether we are obscured
+   * or not.
+   */
+      static GdkFilterReturn
+! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event UNUSED, gpointer data)
+  {
+      XEvent *xevent;
+      GtkForm *form;
+***************
+*** 821,829 ****
+   * there is no corresponding event in GTK, so we have
+   * to get the events from a filter
+   */
+- /*ARGSUSED1*/
+      static GdkFilterReturn
+! gtk_form_main_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
+  {
+      XEvent *xevent;
+      GtkForm *form;
+--- 818,827 ----
+   * there is no corresponding event in GTK, so we have
+   * to get the events from a filter
+   */
+      static GdkFilterReturn
+! gtk_form_main_filter(GdkXEvent *gdk_xevent,
+! 		     GdkEvent *event UNUSED,
+! 		     gpointer data)
+  {
+      XEvent *xevent;
+      GtkForm *form;
+***************
+*** 911,919 ****
+  #endif
+  }
+  
+- /*ARGSUSED0*/
+      static void
+! gtk_form_child_map(GtkWidget *widget, gpointer user_data)
+  {
+      GtkFormChild *child;
+  
+--- 909,916 ----
+  #endif
+  }
+  
+      static void
+! gtk_form_child_map(GtkWidget *widget UNUSED, gpointer user_data)
+  {
+      GtkFormChild *child;
+  
+***************
+*** 923,931 ****
+      gdk_window_show(child->window);
+  }
+  
+- /*ARGSUSED0*/
+      static void
+! gtk_form_child_unmap(GtkWidget *widget, gpointer user_data)
+  {
+      GtkFormChild *child;
+  
+--- 920,927 ----
+      gdk_window_show(child->window);
+  }
+  
+      static void
+! gtk_form_child_unmap(GtkWidget *widget UNUSED, gpointer user_data)
+  {
+      GtkFormChild *child;
+  
+*** ../vim-7.2.180/src/gui_beval.c	2009-03-18 12:20:35.000000000 +0100
+--- src/gui_beval.c	2009-05-17 15:53:22.000000000 +0200
+***************
+*** 15,21 ****
+  /*
+   * Common code, invoked when the mouse is resting for a moment.
+   */
+- /*ARGSUSED*/
+      void
+  general_beval_cb(beval, state)
+      BalloonEval *beval;
+--- 15,20 ----
+***************
+*** 551,559 ****
+      return FALSE; /* continue emission */
+  }
+  
+- /*ARGSUSED*/
+      static gint
+! mainwin_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
+  {
+      BalloonEval *beval = (BalloonEval *)data;
+  
+--- 550,557 ----
+      return FALSE; /* continue emission */
+  }
+  
+      static gint
+! mainwin_event_cb(GtkWidget *widget UNUSED, GdkEvent *event, gpointer data)
+  {
+      BalloonEval *beval = (BalloonEval *)data;
+  
+***************
+*** 663,671 ****
+      return FALSE; /* don't call me again */
+  }
+  
+- /*ARGSUSED2*/
+      static gint
+! balloon_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
+  {
+      gtk_paint_flat_box(widget->style, widget->window,
+  		       GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+--- 661,670 ----
+      return FALSE; /* don't call me again */
+  }
+  
+      static gint
+! balloon_expose_event_cb(GtkWidget *widget,
+! 			GdkEventExpose *event,
+! 			gpointer data UNUSED)
+  {
+      gtk_paint_flat_box(widget->style, widget->window,
+  		       GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+***************
+*** 676,682 ****
+  }
+  
+  # ifndef HAVE_GTK2
+- /*ARGSUSED2*/
+      static void
+  balloon_draw_cb(GtkWidget *widget, GdkRectangle *area, gpointer data)
+  {
+--- 675,680 ----
+***************
+*** 726,732 ****
+  /*
+   * The X event handler. All it does is call the real event handler.
+   */
+- /*ARGSUSED*/
+      static void
+  pointerEventEH(w, client_data, event, unused)
+      Widget	w;
+--- 724,729 ----
+***************
+*** 877,883 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static void
+  timerRoutine(dx, id)
+      XtPointer	    dx;
+--- 874,879 ----
+*** ../vim-7.2.180/src/netbeans.c	2009-02-21 22:12:43.000000000 +0100
+--- src/netbeans.c	2009-05-17 15:51:14.000000000 +0200
+***************
+*** 700,706 ****
+  /*
+   * Read and process a command from netbeans.
+   */
+- /*ARGSUSED*/
+  #if defined(FEAT_GUI_W32) || defined(PROTO)
+  /* Use this one when generating prototypes, the others are static. */
+      void
+--- 700,705 ----
+***************
+*** 708,719 ****
+  #else
+  # ifdef FEAT_GUI_MOTIF
+      static void
+! messageFromNetbeans(XtPointer clientData, int *unused1, XtInputId *unused2)
+  # endif
+  # ifdef FEAT_GUI_GTK
+      static void
+! messageFromNetbeans(gpointer clientData, gint unused1,
+! 						    GdkInputCondition unused2)
+  # endif
+  #endif
+  {
+--- 707,721 ----
+  #else
+  # ifdef FEAT_GUI_MOTIF
+      static void
+! messageFromNetbeans(XtPointer clientData UNUSED
+! 		    int *unused1 UNUSED,
+! 		    XtInputId *unused2 UNUSED)
+  # endif
+  # ifdef FEAT_GUI_GTK
+      static void
+! messageFromNetbeans(gpointer clientData UNUSED,
+! 		    gint unused1 UNUSED,
+! 		    GdkInputCondition unused2 UNUSED)
+  # endif
+  #endif
+  {
+***************
+*** 1585,1591 ****
+--- 1587,1595 ----
+  			    buf_delsign(buf->bufp, id);
+  			}
+  			else
++ 			{
+  			    nbdebug(("    No sign on line %d\n", i));
++ 			}
+  		    }
+  
+  		    nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
+***************
+*** 2144,2150 ****
+--- 2148,2156 ----
+  #endif
+  	    }
+  	    else
++ 	    {
+  		nbdebug(("    BAD POSITION in setDot: %s\n", s));
++ 	    }
+  
+  	    /* gui_update_cursor(TRUE, FALSE); */
+  	    /* update_curbuf(NOT_VALID); */
+***************
+*** 2744,2754 ****
+   * cursor and sends it to the debugger for evaluation.  The debugger should
+   * respond with a showBalloon command when there is a useful result.
+   */
+- /*ARGSUSED*/
+      void
+  netbeans_beval_cb(
+  	BalloonEval	*beval,
+! 	int		 state)
+  {
+      win_T	*wp;
+      char_u	*text;
+--- 2750,2759 ----
+   * cursor and sends it to the debugger for evaluation.  The debugger should
+   * respond with a showBalloon command when there is a useful result.
+   */
+      void
+  netbeans_beval_cb(
+  	BalloonEval	*beval,
+! 	int		 state UNUSED)
+  {
+      win_T	*wp;
+      char_u	*text;
+***************
+*** 3061,3069 ****
+  /*
+   * Send netbeans an unmodufied command.
+   */
+- /*ARGSUSED*/
+      void
+! netbeans_unmodified(buf_T *bufp)
+  {
+  #if 0
+      char_u	buf[128];
+--- 3066,3073 ----
+  /*
+   * Send netbeans an unmodufied command.
+   */
+      void
+! netbeans_unmodified(buf_T *bufp UNUSED)
+  {
+  #if 0
+      char_u	buf[128];
+***************
+*** 3370,3382 ****
+   * buf->signmapused[]	maps buffer-local annotation IDs to an index in
+   *			globalsignmap[].
+   */
+- /*ARGSUSED*/
+      static void
+  addsigntype(
+      nbbuf_T	*buf,
+      int		typeNum,
+      char_u	*typeName,
+!     char_u	*tooltip,
+      char_u	*glyphFile,
+      int		use_fg,
+      int		fg,
+--- 3374,3385 ----
+   * buf->signmapused[]	maps buffer-local annotation IDs to an index in
+   *			globalsignmap[].
+   */
+      static void
+  addsigntype(
+      nbbuf_T	*buf,
+      int		typeNum,
+      char_u	*typeName,
+!     char_u	*tooltip UNUSED,
+      char_u	*glyphFile,
+      int		use_fg,
+      int		fg,
+*** ../vim-7.2.180/src/version.c	2009-05-17 13:30:58.000000000 +0200
+--- src/version.c	2009-05-17 16:07:26.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     181,
+  /**/
+
+-- 
+I am always surprised in the Linux world how quickly solutions can be
+obtained.  (Imagine sending an email to Bill Gates, asking why Windows
+crashed, and how to fix it...  and then getting an answer that fixed the
+problem... <0>_<0> !)		              -- Mark Langdon
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.182 b/source/ap/vim/patches/7.2.182
new file mode 100644
index 000000000..2df649955
--- /dev/null
+++ b/source/ap/vim/patches/7.2.182
@@ -0,0 +1,66 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.182
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.182 (after 7.2.181)
+Problem:    Compilation problems after previous patch for Motif.  Gvim with
+	    GTK crashes on startup.
+Solution:   Add comma.  Init form structure to zeroes.
+Files:	    src/netbeans.c, src/gui_gtk_f.c
+
+
+*** ../vim-7.2.181/src/netbeans.c	2009-05-17 16:23:20.000000000 +0200
+--- src/netbeans.c	2009-05-17 22:34:11.000000000 +0200
+***************
+*** 707,713 ****
+  #else
+  # ifdef FEAT_GUI_MOTIF
+      static void
+! messageFromNetbeans(XtPointer clientData UNUSED
+  		    int *unused1 UNUSED,
+  		    XtInputId *unused2 UNUSED)
+  # endif
+--- 707,713 ----
+  #else
+  # ifdef FEAT_GUI_MOTIF
+      static void
+! messageFromNetbeans(XtPointer clientData UNUSED,
+  		    int *unused1 UNUSED,
+  		    XtInputId *unused2 UNUSED)
+  # endif
+*** ../vim-7.2.181/src/gui_gtk_f.c	2009-05-17 16:23:20.000000000 +0200
+--- src/gui_gtk_f.c	2009-05-17 23:20:41.000000000 +0200
+***************
+*** 229,234 ****
+--- 229,235 ----
+      {
+  	GtkTypeInfo form_info;
+  
++ 	vim_memset(&form_info, 0, sizeof(form_info));
+  	form_info.type_name = "GtkForm";
+  	form_info.object_size = sizeof(GtkForm);
+  	form_info.class_size = sizeof(GtkFormClass);
+*** ../vim-7.2.181/src/version.c	2009-05-17 16:23:20.000000000 +0200
+--- src/version.c	2009-05-17 23:21:41.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     182,
+  /**/
+
+-- 
+We apologise again for the fault in the subtitles.  Those responsible for
+sacking the people who have just been sacked have been sacked.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.183 b/source/ap/vim/patches/7.2.183
new file mode 100644
index 000000000..ad1052db0
--- /dev/null
+++ b/source/ap/vim/patches/7.2.183
@@ -0,0 +1,1846 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.183
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.183
+Problem:    Configure problem for sys/sysctl.h on OpenBSD. (Dasn)
+Solution:   Add separate check for this header file.  Also switch to newer
+	    version of autoconf.
+Files:	    src/auto/configure, src/configure.in
+
+
+*** ../vim-7.2.182/src/auto/configure	2009-05-14 22:19:19.000000000 +0200
+--- src/auto/configure	2009-05-16 13:32:16.000000000 +0200
+***************
+*** 1,6 ****
+  #! /bin/sh
+  # Guess values for system-dependent variables and create Makefiles.
+! # Generated by GNU Autoconf 2.62.
+  #
+  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+  # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+--- 1,6 ----
+  #! /bin/sh
+  # Guess values for system-dependent variables and create Makefiles.
+! # Generated by GNU Autoconf 2.63.
+  #
+  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+  # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+***************
+*** 635,772 ****
+  # include <unistd.h>
+  #endif"
+  
+! ac_subst_vars='SHELL
+! PATH_SEPARATOR
+! PACKAGE_NAME
+! PACKAGE_TARNAME
+! PACKAGE_VERSION
+! PACKAGE_STRING
+! PACKAGE_BUGREPORT
+! exec_prefix
+! prefix
+! program_transform_name
+! bindir
+! sbindir
+! libexecdir
+! datarootdir
+! datadir
+! sysconfdir
+! sharedstatedir
+! localstatedir
+! includedir
+! oldincludedir
+! docdir
+! infodir
+! htmldir
+! dvidir
+! pdfdir
+! psdir
+! libdir
+! localedir
+! mandir
+! DEFS
+! ECHO_C
+! ECHO_N
+! ECHO_T
+! LIBS
+! build_alias
+! host_alias
+! target_alias
+! SET_MAKE
+! CC
+! CFLAGS
+! LDFLAGS
+! CPPFLAGS
+! ac_ct_CC
+! EXEEXT
+! OBJEXT
+! CPP
+! GREP
+! EGREP
+! AWK
+! STRIP
+! CPP_MM
+! OS_EXTRA_SRC
+! OS_EXTRA_OBJ
+! VIMNAME
+! EXNAME
+! VIEWNAME
+! line_break
+! dovimdiff
+! dogvimdiff
+! compiledby
+! vi_cv_path_mzscheme
+! MZSCHEME_SRC
+! MZSCHEME_OBJ
+! MZSCHEME_PRO
+! MZSCHEME_LIBS
+! MZSCHEME_CFLAGS
+! vi_cv_path_perl
+! vi_cv_perllib
+! shrpenv
+! PERL_SRC
+! PERL_OBJ
+! PERL_PRO
+! PERL_CFLAGS
+! PERL_LIBS
+! vi_cv_path_python
+! PYTHON_CONFDIR
+! PYTHON_LIBS
+! PYTHON_GETPATH_CFLAGS
+! PYTHON_CFLAGS
+! PYTHON_SRC
+! PYTHON_OBJ
+! vi_cv_path_tcl
+! TCL_SRC
+! TCL_OBJ
+! TCL_PRO
+! TCL_CFLAGS
+! TCL_LIBS
+! vi_cv_path_ruby
+! RUBY_SRC
+! RUBY_OBJ
+! RUBY_PRO
+! RUBY_CFLAGS
+! RUBY_LIBS
+! WORKSHOP_SRC
+! WORKSHOP_OBJ
+! NETBEANS_SRC
+! NETBEANS_OBJ
+! SNIFF_SRC
+! SNIFF_OBJ
+! xmkmfpath
+! XMKMF
+! X_CFLAGS
+! X_PRE_LIBS
+! X_LIBS
+! X_EXTRA_LIBS
+! X_LIB
+! GTK_CONFIG
+! GTK12_CONFIG
+! PKG_CONFIG
+! GTK_CFLAGS
+! GTK_LIBS
+! GTK_LIBNAME
+! GNOME_LIBS
+! GNOME_LIBDIR
+! GNOME_INCLUDEDIR
+! GNOME_CONFIG
+! MOTIF_LIBNAME
+! NARROW_PROTO
+! GUI_INC_LOC
+! GUI_LIB_LOC
+! GUITYPE
+! GUI_X_LIBS
+! HANGULIN_SRC
+! HANGULIN_OBJ
+! TAGPRG
+! INSTALL_LANGS
+! INSTALL_TOOL_LANGS
+! MSGFMT
+! MAKEMO
+! DEPEND_CFLAGS_FILTER
+  LIBOBJS
+! LTLIBOBJS'
+  ac_subst_files=''
+  ac_user_opts='
+  enable_option_checking
+--- 635,772 ----
+  # include <unistd.h>
+  #endif"
+  
+! ac_subst_vars='LTLIBOBJS
+  LIBOBJS
+! DEPEND_CFLAGS_FILTER
+! MAKEMO
+! MSGFMT
+! INSTALL_TOOL_LANGS
+! INSTALL_LANGS
+! TAGPRG
+! HANGULIN_OBJ
+! HANGULIN_SRC
+! GUI_X_LIBS
+! GUITYPE
+! GUI_LIB_LOC
+! GUI_INC_LOC
+! NARROW_PROTO
+! MOTIF_LIBNAME
+! GNOME_CONFIG
+! GNOME_INCLUDEDIR
+! GNOME_LIBDIR
+! GNOME_LIBS
+! GTK_LIBNAME
+! GTK_LIBS
+! GTK_CFLAGS
+! PKG_CONFIG
+! GTK12_CONFIG
+! GTK_CONFIG
+! X_LIB
+! X_EXTRA_LIBS
+! X_LIBS
+! X_PRE_LIBS
+! X_CFLAGS
+! XMKMF
+! xmkmfpath
+! SNIFF_OBJ
+! SNIFF_SRC
+! NETBEANS_OBJ
+! NETBEANS_SRC
+! WORKSHOP_OBJ
+! WORKSHOP_SRC
+! RUBY_LIBS
+! RUBY_CFLAGS
+! RUBY_PRO
+! RUBY_OBJ
+! RUBY_SRC
+! vi_cv_path_ruby
+! TCL_LIBS
+! TCL_CFLAGS
+! TCL_PRO
+! TCL_OBJ
+! TCL_SRC
+! vi_cv_path_tcl
+! PYTHON_OBJ
+! PYTHON_SRC
+! PYTHON_CFLAGS
+! PYTHON_GETPATH_CFLAGS
+! PYTHON_LIBS
+! PYTHON_CONFDIR
+! vi_cv_path_python
+! PERL_LIBS
+! PERL_CFLAGS
+! PERL_PRO
+! PERL_OBJ
+! PERL_SRC
+! shrpenv
+! vi_cv_perllib
+! vi_cv_path_perl
+! MZSCHEME_CFLAGS
+! MZSCHEME_LIBS
+! MZSCHEME_PRO
+! MZSCHEME_OBJ
+! MZSCHEME_SRC
+! vi_cv_path_mzscheme
+! compiledby
+! dogvimdiff
+! dovimdiff
+! line_break
+! VIEWNAME
+! EXNAME
+! VIMNAME
+! OS_EXTRA_OBJ
+! OS_EXTRA_SRC
+! CPP_MM
+! STRIP
+! AWK
+! EGREP
+! GREP
+! CPP
+! OBJEXT
+! EXEEXT
+! ac_ct_CC
+! CPPFLAGS
+! LDFLAGS
+! CFLAGS
+! CC
+! SET_MAKE
+! target_alias
+! host_alias
+! build_alias
+! LIBS
+! ECHO_T
+! ECHO_N
+! ECHO_C
+! DEFS
+! mandir
+! localedir
+! libdir
+! psdir
+! pdfdir
+! dvidir
+! htmldir
+! infodir
+! docdir
+! oldincludedir
+! includedir
+! localstatedir
+! sharedstatedir
+! sysconfdir
+! datadir
+! datarootdir
+! libexecdir
+! sbindir
+! bindir
+! program_transform_name
+! prefix
+! exec_prefix
+! PACKAGE_BUGREPORT
+! PACKAGE_STRING
+! PACKAGE_VERSION
+! PACKAGE_TARNAME
+! PACKAGE_NAME
+! PATH_SEPARATOR
+! SHELL'
+  ac_subst_files=''
+  ac_user_opts='
+  enable_option_checking
+***************
+*** 1253,1261 ****
+  if test -n "$ac_unrecognized_opts"; then
+    case $enable_option_checking in
+      no) ;;
+!     fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+     { (exit 1); exit 1; }; } ;;
+!     *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    esac
+  fi
+  
+--- 1253,1261 ----
+  if test -n "$ac_unrecognized_opts"; then
+    case $enable_option_checking in
+      no) ;;
+!     fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+     { (exit 1); exit 1; }; } ;;
+!     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    esac
+  fi
+  
+***************
+*** 1308,1314 ****
+  ac_pwd=`pwd` && test -n "$ac_pwd" &&
+  ac_ls_di=`ls -di .` &&
+  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+!   { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+     { (exit 1); exit 1; }; }
+  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+    { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+--- 1308,1314 ----
+  ac_pwd=`pwd` && test -n "$ac_pwd" &&
+  ac_ls_di=`ls -di .` &&
+  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+!   { $as_echo "$as_me: error: working directory cannot be determined" >&2
+     { (exit 1); exit 1; }; }
+  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+    { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+***************
+*** 1587,1593 ****
+  if $ac_init_version; then
+    cat <<\_ACEOF
+  configure
+! generated by GNU Autoconf 2.62
+  
+  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+--- 1587,1593 ----
+  if $ac_init_version; then
+    cat <<\_ACEOF
+  configure
+! generated by GNU Autoconf 2.63
+  
+  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+***************
+*** 1601,1607 ****
+  running configure, to aid debugging if configure makes a mistake.
+  
+  It was created by $as_me, which was
+! generated by GNU Autoconf 2.62.  Invocation command line was
+  
+    $ $0 $@
+  
+--- 1601,1607 ----
+  running configure, to aid debugging if configure makes a mistake.
+  
+  It was created by $as_me, which was
+! generated by GNU Autoconf 2.63.  Invocation command line was
+  
+    $ $0 $@
+  
+***************
+*** 1724,1731 ****
+      case $ac_val in #(
+      *${as_nl}*)
+        case $ac_var in #(
+!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+! $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+        esac
+        case $ac_var in #(
+        _ | IFS | as_nl) ;; #(
+--- 1724,1731 ----
+      case $ac_val in #(
+      *${as_nl}*)
+        case $ac_var in #(
+!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+        esac
+        case $ac_var in #(
+        _ | IFS | as_nl) ;; #(
+***************
+*** 1928,1933 ****
+--- 1928,1935 ----
+    fi
+  done
+  if $ac_cache_corrupted; then
++   { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+    { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+***************
+*** 2084,2095 ****
+    else
+      case $cross_compiling:$ac_tool_warned in
+  yes:)
+! { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+! whose name does not start with the host triplet.  If you think this
+! configuration is useful to you, please write to autoconf@gnu.org." >&5
+! $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+! whose name does not start with the host triplet.  If you think this
+! configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+  ac_tool_warned=yes ;;
+  esac
+      CC=$ac_ct_CC
+--- 2086,2093 ----
+    else
+      case $cross_compiling:$ac_tool_warned in
+  yes:)
+! { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+  ac_tool_warned=yes ;;
+  esac
+      CC=$ac_ct_CC
+***************
+*** 2288,2299 ****
+    else
+      case $cross_compiling:$ac_tool_warned in
+  yes:)
+! { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+! whose name does not start with the host triplet.  If you think this
+! configuration is useful to you, please write to autoconf@gnu.org." >&5
+! $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+! whose name does not start with the host triplet.  If you think this
+! configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+  ac_tool_warned=yes ;;
+  esac
+      CC=$ac_ct_CC
+--- 2286,2293 ----
+    else
+      case $cross_compiling:$ac_tool_warned in
+  yes:)
+! { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+  ac_tool_warned=yes ;;
+  esac
+      CC=$ac_ct_CC
+***************
+*** 2303,2313 ****
+  fi
+  
+  
+! test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }
+  
+  # Provide some information about the compiler.
+  $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+--- 2297,2309 ----
+  fi
+  
+  
+! test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+! { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }; }
+  
+  # Provide some information about the compiler.
+  $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+***************
+*** 2437,2447 ****
+    $as_echo "$as_me: failed program was:" >&5
+  sed 's/^/| /' conftest.$ac_ext >&5
+  
+  { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: C compiler cannot create executables
+  See \`config.log' for more details." >&2;}
+!    { (exit 77); exit 77; }; }
+  fi
+  
+  ac_exeext=$ac_cv_exeext
+--- 2433,2445 ----
+    $as_echo "$as_me: failed program was:" >&5
+  sed 's/^/| /' conftest.$ac_ext >&5
+  
++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: C compiler cannot create executables
+  See \`config.log' for more details." >&2;}
+!    { (exit 77); exit 77; }; }; }
+  fi
+  
+  ac_exeext=$ac_cv_exeext
+***************
+*** 2469,2481 ****
+      if test "$cross_compiling" = maybe; then
+  	cross_compiling=yes
+      else
+! 	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+  If you meant to cross compile, use \`--host'.
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: cannot run C compiled programs.
+  If you meant to cross compile, use \`--host'.
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }
+      fi
+    fi
+  fi
+--- 2467,2481 ----
+      if test "$cross_compiling" = maybe; then
+  	cross_compiling=yes
+      else
+! 	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+! { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+  If you meant to cross compile, use \`--host'.
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: cannot run C compiled programs.
+  If you meant to cross compile, use \`--host'.
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }; }
+      fi
+    fi
+  fi
+***************
+*** 2518,2528 ****
+    esac
+  done
+  else
+!   { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }
+  fi
+  
+  rm -f conftest$ac_cv_exeext
+--- 2518,2530 ----
+    esac
+  done
+  else
+!   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+! { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }; }
+  fi
+  
+  rm -f conftest$ac_cv_exeext
+***************
+*** 2576,2586 ****
+    $as_echo "$as_me: failed program was:" >&5
+  sed 's/^/| /' conftest.$ac_ext >&5
+  
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }
+  fi
+  
+  rm -f conftest.$ac_cv_objext conftest.$ac_ext
+--- 2578,2590 ----
+    $as_echo "$as_me: failed program was:" >&5
+  sed 's/^/| /' conftest.$ac_ext >&5
+  
++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }; }
+  fi
+  
+  rm -f conftest.$ac_cv_objext conftest.$ac_ext
+***************
+*** 3148,3158 ****
+  if $ac_preproc_ok; then
+    :
+  else
+!   { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }
+  fi
+  
+  ac_ext=c
+--- 3152,3164 ----
+  if $ac_preproc_ok; then
+    :
+  else
+!   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+! { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  See \`config.log' for more details." >&5
+  $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+  See \`config.log' for more details." >&2;}
+!    { (exit 1); exit 1; }; }; }
+  fi
+  
+  ac_ext=c
+***************
+*** 4016,4023 ****
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! if test `eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+--- 4022,4030 ----
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 4154,4160 ****
+  $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
+  
+  fi
+! if test $ac_cv_header_Carbon_Carbon_h = yes; then
+    CARBON=yes
+  fi
+  
+--- 4161,4167 ----
+  $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
+  
+  fi
+! if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
+    CARBON=yes
+  fi
+  
+***************
+*** 4484,4490 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
+  $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
+! if test $ac_cv_lib_selinux_is_selinux_enabled = yes; then
+    LIBS="$LIBS -lselinux"
+  	   cat >>confdefs.h <<\_ACEOF
+  #define HAVE_SELINUX 1
+--- 4491,4497 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
+  $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
+! if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then
+    LIBS="$LIBS -lselinux"
+  	   cat >>confdefs.h <<\_ACEOF
+  #define HAVE_SELINUX 1
+***************
+*** 5891,5897 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+  $as_echo "$ac_cv_lib_socket_socket" >&6; }
+! if test $ac_cv_lib_socket_socket = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define HAVE_LIBSOCKET 1
+  _ACEOF
+--- 5898,5904 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+  $as_echo "$ac_cv_lib_socket_socket" >&6; }
+! if test "x$ac_cv_lib_socket_socket" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define HAVE_LIBSOCKET 1
+  _ACEOF
+***************
+*** 5966,5972 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+! if test $ac_cv_lib_nsl_gethostbyname = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define HAVE_LIBNSL 1
+  _ACEOF
+--- 5973,5979 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define HAVE_LIBNSL 1
+  _ACEOF
+***************
+*** 6203,6210 ****
+    have_x=disabled
+  else
+    case $x_includes,$x_libraries in #(
+!     *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
+! $as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
+     { (exit 1); exit 1; }; };; #(
+      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
+    $as_echo_n "(cached) " >&6
+--- 6210,6217 ----
+    have_x=disabled
+  else
+    case $x_includes,$x_libraries in #(
+!     *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
+! $as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
+     { (exit 1); exit 1; }; };; #(
+      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
+    $as_echo_n "(cached) " >&6
+***************
+*** 6242,6248 ****
+  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+      esac
+      case $ac_im_usrlibdir in
+! 	/usr/lib | /lib) ;;
+  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+      esac
+    fi
+--- 6249,6255 ----
+  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+      esac
+      case $ac_im_usrlibdir in
+! 	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
+  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+      esac
+    fi
+***************
+*** 6682,6688 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+! if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+  fi
+  
+--- 6689,6695 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+! if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+  fi
+  
+***************
+*** 6752,6758 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+! if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+  fi
+  
+--- 6759,6765 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+! if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+  fi
+  
+***************
+*** 6924,6930 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+! if test $ac_cv_lib_nsl_gethostbyname = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+  fi
+  
+--- 6931,6937 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+  fi
+  
+***************
+*** 6994,7000 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+! if test $ac_cv_lib_bsd_gethostbyname = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+  fi
+  
+--- 7001,7007 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+! if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+  fi
+  
+***************
+*** 7160,7166 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+  $as_echo "$ac_cv_lib_socket_connect" >&6; }
+! if test $ac_cv_lib_socket_connect = yes; then
+    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+  fi
+  
+--- 7167,7173 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+  $as_echo "$ac_cv_lib_socket_connect" >&6; }
+! if test "x$ac_cv_lib_socket_connect" = x""yes; then
+    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+  fi
+  
+***************
+*** 7319,7325 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+  $as_echo "$ac_cv_lib_posix_remove" >&6; }
+! if test $ac_cv_lib_posix_remove = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+  fi
+  
+--- 7326,7332 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+  $as_echo "$ac_cv_lib_posix_remove" >&6; }
+! if test "x$ac_cv_lib_posix_remove" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+  fi
+  
+***************
+*** 7478,7484 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+! if test $ac_cv_lib_ipc_shmat = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+  fi
+  
+--- 7485,7491 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+! if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+  fi
+  
+***************
+*** 7559,7565 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+! if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+  fi
+  
+--- 7566,7572 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+! if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
+    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+  fi
+  
+***************
+*** 7727,7733 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
+  $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; }
+! if test $ac_cv_lib_Xdmcp__XdmcpAuthDoIt = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp"
+  fi
+  
+--- 7734,7740 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
+  $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; }
+! if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp"
+  fi
+  
+***************
+*** 7797,7803 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
+  $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; }
+! if test $ac_cv_lib_ICE_IceOpenConnection = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE"
+  fi
+  
+--- 7804,7810 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
+  $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; }
+! if test "x$ac_cv_lib_ICE_IceOpenConnection" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE"
+  fi
+  
+***************
+*** 7868,7874 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+  $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; }
+! if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then
+    X_PRE_LIBS="$X_PRE_LIBS -lXpm"
+  fi
+  
+--- 7875,7881 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+  $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; }
+! if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = x""yes; then
+    X_PRE_LIBS="$X_PRE_LIBS -lXpm"
+  fi
+  
+***************
+*** 9251,9257 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+  $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
+! if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
+    GUI_X_LIBS="-lXext"
+  fi
+  
+--- 9258,9264 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+  $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
+! if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then
+    GUI_X_LIBS="-lXext"
+  fi
+  
+***************
+*** 9320,9326 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5
+  $as_echo "$ac_cv_lib_w_wslen" >&6; }
+! if test $ac_cv_lib_w_wslen = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
+  fi
+  
+--- 9327,9333 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5
+  $as_echo "$ac_cv_lib_w_wslen" >&6; }
+! if test "x$ac_cv_lib_w_wslen" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
+  fi
+  
+***************
+*** 9389,9395 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
+  $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
+! if test $ac_cv_lib_dl_dlsym = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
+  fi
+  
+--- 9396,9402 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
+  $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
+! if test "x$ac_cv_lib_dl_dlsym" = x""yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
+  fi
+  
+***************
+*** 9458,9464 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
+  $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; }
+! if test $ac_cv_lib_Xmu_XmuCreateStippledPixmap = yes; then
+    GUI_X_LIBS="-lXmu $GUI_X_LIBS"
+  fi
+  
+--- 9465,9471 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
+  $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; }
+! if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = x""yes; then
+    GUI_X_LIBS="-lXmu $GUI_X_LIBS"
+  fi
+  
+***************
+*** 9528,9534 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5
+  $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; }
+! if test $ac_cv_lib_Xp_XpEndJob = yes; then
+    GUI_X_LIBS="-lXp $GUI_X_LIBS"
+  fi
+  
+--- 9535,9541 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5
+  $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; }
+! if test "x$ac_cv_lib_Xp_XpEndJob" = x""yes; then
+    GUI_X_LIBS="-lXp $GUI_X_LIBS"
+  fi
+  
+***************
+*** 9699,9706 ****
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! if test `eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+--- 9706,9714 ----
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 9852,9859 ****
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! if test `eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+--- 9860,9868 ----
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 10098,10105 ****
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! if test `eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+--- 10107,10115 ----
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 10539,10545 ****
+  $as_echo "$ac_cv_header_elf_h" >&6; }
+  
+  fi
+! if test $ac_cv_header_elf_h = yes; then
+    HAS_ELF=1
+  fi
+  
+--- 10549,10555 ----
+  $as_echo "$ac_cv_header_elf_h" >&6; }
+  
+  fi
+! if test "x$ac_cv_header_elf_h" = x""yes; then
+    HAS_ELF=1
+  fi
+  
+***************
+*** 10605,10611 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
+  $as_echo "$ac_cv_lib_elf_main" >&6; }
+! if test $ac_cv_lib_elf_main = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define HAVE_LIBELF 1
+  _ACEOF
+--- 10615,10621 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
+  $as_echo "$ac_cv_lib_elf_main" >&6; }
+! if test "x$ac_cv_lib_elf_main" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define HAVE_LIBELF 1
+  _ACEOF
+***************
+*** 10679,10686 ****
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! if test `eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+  _ACEOF
+--- 10689,10697 ----
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 10966,10972 ****
+  
+  
+  
+- 
+  for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
+  	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \
+  	iconv.h langinfo.h math.h unistd.h stropts.h errno.h \
+--- 10977,10982 ----
+***************
+*** 10974,10980 ****
+  	sys/stream.h termios.h libc.h sys/statfs.h \
+  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
+  	libgen.h util/debug.h util/msg18n.h frame.h \
+! 	sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h
+  do
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+--- 10984,10990 ----
+  	sys/stream.h termios.h libc.h sys/statfs.h \
+  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
+  	libgen.h util/debug.h util/msg18n.h frame.h \
+! 	sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h
+  do
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+***************
+*** 11108,11115 ****
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! if test `eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+--- 11118,11126 ----
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 11172,11179 ****
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! if test `eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+--- 11183,11256 ----
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+!   cat >>confdefs.h <<_ACEOF
+! #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+! _ACEOF
+! 
+! fi
+! 
+! done
+! 
+! 
+! 
+! for ac_header in sys/sysctl.h
+! do
+! as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+! { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+! $as_echo_n "checking for $ac_header... " >&6; }
+! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+!   $as_echo_n "(cached) " >&6
+! else
+!   cat >conftest.$ac_ext <<_ACEOF
+! /* confdefs.h.  */
+! _ACEOF
+! cat confdefs.h >>conftest.$ac_ext
+! cat >>conftest.$ac_ext <<_ACEOF
+! /* end confdefs.h.  */
+! #if defined HAVE_SYS_PARAM_H
+! #  include <sys/param.h>
+! #endif
+! 
+! #include <$ac_header>
+! _ACEOF
+! rm -f conftest.$ac_objext
+! if { (ac_try="$ac_compile"
+! case "(($ac_try" in
+!   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+!   *) ac_try_echo=$ac_try;;
+! esac
+! eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+! $as_echo "$ac_try_echo") >&5
+!   (eval "$ac_compile") 2>conftest.er1
+!   ac_status=$?
+!   grep -v '^ *+' conftest.er1 >conftest.err
+!   rm -f conftest.er1
+!   cat conftest.err >&5
+!   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+!   (exit $ac_status); } && {
+! 	 test -z "$ac_c_werror_flag" ||
+! 	 test ! -s conftest.err
+!        } && test -s conftest.$ac_objext; then
+!   eval "$as_ac_Header=yes"
+! else
+!   $as_echo "$as_me: failed program was:" >&5
+! sed 's/^/| /' conftest.$ac_ext >&5
+! 
+! 	eval "$as_ac_Header=no"
+! fi
+! 
+! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+! fi
+! ac_res=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+! 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+! $as_echo "$ac_res" >&6; }
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 11372,11379 ****
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! if test `eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+--- 11449,11457 ----
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 11770,11776 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+  $as_echo "$ac_cv_type_mode_t" >&6; }
+! if test $ac_cv_type_mode_t = yes; then
+    :
+  else
+  
+--- 11848,11854 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+  $as_echo "$ac_cv_type_mode_t" >&6; }
+! if test "x$ac_cv_type_mode_t" = x""yes; then
+    :
+  else
+  
+***************
+*** 11874,11880 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+  $as_echo "$ac_cv_type_off_t" >&6; }
+! if test $ac_cv_type_off_t = yes; then
+    :
+  else
+  
+--- 11952,11958 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+  $as_echo "$ac_cv_type_off_t" >&6; }
+! if test "x$ac_cv_type_off_t" = x""yes; then
+    :
+  else
+  
+***************
+*** 11978,11984 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+  $as_echo "$ac_cv_type_pid_t" >&6; }
+! if test $ac_cv_type_pid_t = yes; then
+    :
+  else
+  
+--- 12056,12062 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+  $as_echo "$ac_cv_type_pid_t" >&6; }
+! if test "x$ac_cv_type_pid_t" = x""yes; then
+    :
+  else
+  
+***************
+*** 12082,12088 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+  $as_echo "$ac_cv_type_size_t" >&6; }
+! if test $ac_cv_type_size_t = yes; then
+    :
+  else
+  
+--- 12160,12166 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+  $as_echo "$ac_cv_type_size_t" >&6; }
+! if test "x$ac_cv_type_size_t" = x""yes; then
+    :
+  else
+  
+***************
+*** 12286,12292 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
+  $as_echo "$ac_cv_type_ino_t" >&6; }
+! if test $ac_cv_type_ino_t = yes; then
+    :
+  else
+  
+--- 12364,12370 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
+  $as_echo "$ac_cv_type_ino_t" >&6; }
+! if test "x$ac_cv_type_ino_t" = x""yes; then
+    :
+  else
+  
+***************
+*** 12390,12396 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5
+  $as_echo "$ac_cv_type_dev_t" >&6; }
+! if test $ac_cv_type_dev_t = yes; then
+    :
+  else
+  
+--- 12468,12474 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5
+  $as_echo "$ac_cv_type_dev_t" >&6; }
+! if test "x$ac_cv_type_dev_t" = x""yes; then
+    :
+  else
+  
+***************
+*** 12680,12687 ****
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! if test `eval 'as_val=${'$as_ac_Lib'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
+  _ACEOF
+--- 12758,12766 ----
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! as_val=`eval 'as_val=${'$as_ac_Lib'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 13929,13936 ****
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! if test `eval 'as_val=${'$as_ac_var'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+  _ACEOF
+--- 14008,14016 ----
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! as_val=`eval 'as_val=${'$as_ac_var'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 14313,14319 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5
+  $as_echo "$ac_cv_lib_m_strtod" >&6; }
+! if test $ac_cv_lib_m_strtod = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define HAVE_LIBM 1
+  _ACEOF
+--- 14393,14399 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5
+  $as_echo "$ac_cv_lib_m_strtod" >&6; }
+! if test "x$ac_cv_lib_m_strtod" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define HAVE_LIBM 1
+  _ACEOF
+***************
+*** 14473,14479 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5
+  $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; }
+! if test $ac_cv_lib_posix1e_acl_get_file = yes; then
+    LIBS="$LIBS -lposix1e"
+  else
+    { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
+--- 14553,14559 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5
+  $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; }
+! if test "x$ac_cv_lib_posix1e_acl_get_file" = x""yes; then
+    LIBS="$LIBS -lposix1e"
+  else
+    { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
+***************
+*** 14541,14547 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
+  $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
+! if test $ac_cv_lib_acl_acl_get_file = yes; then
+    LIBS="$LIBS -lacl"
+  		  { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5
+  $as_echo_n "checking for fgetxattr in -lattr... " >&6; }
+--- 14621,14627 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
+  $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
+! if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then
+    LIBS="$LIBS -lacl"
+  		  { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5
+  $as_echo_n "checking for fgetxattr in -lattr... " >&6; }
+***************
+*** 14608,14614 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5
+  $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; }
+! if test $ac_cv_lib_attr_fgetxattr = yes; then
+    LIBS="$LIBS -lattr"
+  fi
+  
+--- 14688,14694 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5
+  $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; }
+! if test "x$ac_cv_lib_attr_fgetxattr" = x""yes; then
+    LIBS="$LIBS -lattr"
+  fi
+  
+***************
+*** 15746,15752 ****
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
+  $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
+! if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then
+    LIBS="$LIBS -lxpg4"
+  fi
+  
+--- 15826,15832 ----
+  fi
+  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
+  $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
+! if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = x""yes; then
+    LIBS="$LIBS -lxpg4"
+  fi
+  
+***************
+*** 16045,16052 ****
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! if test `eval 'as_val=${'$as_ac_var'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+  _ACEOF
+--- 16125,16133 ----
+  		 $as_echo "$as_val"'`
+  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+  $as_echo "$ac_res" >&6; }
+! as_val=`eval 'as_val=${'$as_ac_var'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 16246,16252 ****
+  $as_echo "$ac_cv_header_dlfcn_h" >&6; }
+  
+  fi
+! if test $ac_cv_header_dlfcn_h = yes; then
+    DLL=dlfcn.h
+  else
+    if test "${ac_cv_header_dl_h+set}" = set; then
+--- 16327,16333 ----
+  $as_echo "$ac_cv_header_dlfcn_h" >&6; }
+  
+  fi
+! if test "x$ac_cv_header_dlfcn_h" = x""yes; then
+    DLL=dlfcn.h
+  else
+    if test "${ac_cv_header_dl_h+set}" = set; then
+***************
+*** 16376,16382 ****
+  $as_echo "$ac_cv_header_dl_h" >&6; }
+  
+  fi
+! if test $ac_cv_header_dl_h = yes; then
+    DLL=dl.h
+  fi
+  
+--- 16457,16463 ----
+  $as_echo "$ac_cv_header_dl_h" >&6; }
+  
+  fi
+! if test "x$ac_cv_header_dl_h" = x""yes; then
+    DLL=dl.h
+  fi
+  
+***************
+*** 16895,16902 ****
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! if test `eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'` = yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+--- 16976,16984 ----
+  $as_echo "$ac_res" >&6; }
+  
+  fi
+! as_val=`eval 'as_val=${'$as_ac_Header'}
+! 		 $as_echo "$as_val"'`
+!    if test "x$as_val" = x""yes; then
+    cat >>confdefs.h <<_ACEOF
+  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+  _ACEOF
+***************
+*** 16986,16993 ****
+      case $ac_val in #(
+      *${as_nl}*)
+        case $ac_var in #(
+!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+! $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+        esac
+        case $ac_var in #(
+        _ | IFS | as_nl) ;; #(
+--- 17068,17075 ----
+      case $ac_val in #(
+      *${as_nl}*)
+        case $ac_var in #(
+!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+        esac
+        case $ac_var in #(
+        _ | IFS | as_nl) ;; #(
+***************
+*** 17379,17385 ****
+  # values after options handling.
+  ac_log="
+  This file was extended by $as_me, which was
+! generated by GNU Autoconf 2.62.  Invocation command line was
+  
+    CONFIG_FILES    = $CONFIG_FILES
+    CONFIG_HEADERS  = $CONFIG_HEADERS
+--- 17461,17467 ----
+  # values after options handling.
+  ac_log="
+  This file was extended by $as_me, which was
+! generated by GNU Autoconf 2.63.  Invocation command line was
+  
+    CONFIG_FILES    = $CONFIG_FILES
+    CONFIG_HEADERS  = $CONFIG_HEADERS
+***************
+*** 17392,17397 ****
+--- 17474,17488 ----
+  
+  _ACEOF
+  
++ case $ac_config_files in *"
++ "*) set x $ac_config_files; shift; ac_config_files=$*;;
++ esac
++ 
++ case $ac_config_headers in *"
++ "*) set x $ac_config_headers; shift; ac_config_headers=$*;;
++ esac
++ 
++ 
+  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  # Files that config.status was made for.
+  config_files="$ac_config_files"
+***************
+*** 17404,17419 ****
+  \`$as_me' instantiates files from templates according to the
+  current configuration.
+  
+! Usage: $0 [OPTIONS] [FILE]...
+  
+    -h, --help       print this help, then exit
+    -V, --version    print version number and configuration settings, then exit
+!   -q, --quiet      do not print progress messages
+    -d, --debug      don't remove temporary files
+        --recheck    update $as_me by reconfiguring in the same conditions
+!   --file=FILE[:TEMPLATE]
+                     instantiate the configuration file FILE
+!   --header=FILE[:TEMPLATE]
+                     instantiate the configuration header FILE
+  
+  Configuration files:
+--- 17495,17511 ----
+  \`$as_me' instantiates files from templates according to the
+  current configuration.
+  
+! Usage: $0 [OPTION]... [FILE]...
+  
+    -h, --help       print this help, then exit
+    -V, --version    print version number and configuration settings, then exit
+!   -q, --quiet, --silent
+!                    do not print progress messages
+    -d, --debug      don't remove temporary files
+        --recheck    update $as_me by reconfiguring in the same conditions
+!       --file=FILE[:TEMPLATE]
+                     instantiate the configuration file FILE
+!       --header=FILE[:TEMPLATE]
+                     instantiate the configuration header FILE
+  
+  Configuration files:
+***************
+*** 17428,17434 ****
+  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_cs_version="\\
+  config.status
+! configured by $0, generated by GNU Autoconf 2.62,
+    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+  
+  Copyright (C) 2008 Free Software Foundation, Inc.
+--- 17520,17526 ----
+  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_cs_version="\\
+  config.status
+! configured by $0, generated by GNU Autoconf 2.63,
+    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+  
+  Copyright (C) 2008 Free Software Foundation, Inc.
+***************
+*** 17625,17631 ****
+  $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+     { (exit 1); exit 1; }; }
+  
+!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+      break
+    elif $ac_last_try; then
+      { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+--- 17717,17724 ----
+  $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+     { (exit 1); exit 1; }; }
+  
+!   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+!   if test $ac_delim_n = $ac_delim_num; then
+      break
+    elif $ac_last_try; then
+      { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+***************
+*** 17830,17838 ****
+    }
+    split(mac1, mac2, "(") #)
+    macro = mac2[1]
+    if (D_is_set[macro]) {
+      # Preserve the white space surrounding the "#".
+-     prefix = substr(line, 1, index(line, defundef) - 1)
+      print prefix "define", macro P[macro] D[macro]
+      next
+    } else {
+--- 17923,17931 ----
+    }
+    split(mac1, mac2, "(") #)
+    macro = mac2[1]
++   prefix = substr(line, 1, index(line, defundef) - 1)
+    if (D_is_set[macro]) {
+      # Preserve the white space surrounding the "#".
+      print prefix "define", macro P[macro] D[macro]
+      next
+    } else {
+***************
+*** 17840,17846 ****
+      # in the case of _POSIX_SOURCE, which is predefined and required
+      # on some systems where configure will not decide to define it.
+      if (defundef == "undef") {
+!       print "/*", line, "*/"
+        next
+      }
+    }
+--- 17933,17939 ----
+      # in the case of _POSIX_SOURCE, which is predefined and required
+      # on some systems where configure will not decide to define it.
+      if (defundef == "undef") {
+!       print "/*", prefix defundef, macro, "*/"
+        next
+      }
+    }
+***************
+*** 17864,17871 ****
+    esac
+    case $ac_mode$ac_tag in
+    :[FHL]*:*);;
+!   :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+! $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+     { (exit 1); exit 1; }; };;
+    :[FH]-) ac_tag=-:-;;
+    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+--- 17957,17964 ----
+    esac
+    case $ac_mode$ac_tag in
+    :[FHL]*:*);;
+!   :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+! $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+     { (exit 1); exit 1; }; };;
+    :[FH]-) ac_tag=-:-;;
+    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+***************
+*** 18183,18190 ****
+    $ac_cs_success || { (exit 1); exit 1; }
+  fi
+  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+!   { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+! $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+  fi
+  
+  
+--- 18276,18283 ----
+    $ac_cs_success || { (exit 1); exit 1; }
+  fi
+  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+!   { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+! $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  fi
+  
+  
+*** ../vim-7.2.182/src/configure.in	2009-05-14 22:19:19.000000000 +0200
+--- src/configure.in	2009-05-16 13:32:00.000000000 +0200
+***************
+*** 2100,2106 ****
+  	sys/stream.h termios.h libc.h sys/statfs.h \
+  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
+  	libgen.h util/debug.h util/msg18n.h frame.h \
+! 	sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h)
+  
+  dnl sys/ptem.h depends on sys/stream.h on Solaris
+  AC_CHECK_HEADERS(sys/ptem.h, [], [],
+--- 2100,2106 ----
+  	sys/stream.h termios.h libc.h sys/statfs.h \
+  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
+  	libgen.h util/debug.h util/msg18n.h frame.h \
+! 	sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h)
+  
+  dnl sys/ptem.h depends on sys/stream.h on Solaris
+  AC_CHECK_HEADERS(sys/ptem.h, [], [],
+***************
+*** 2108,2113 ****
+--- 2108,2119 ----
+  #  include <sys/stream.h>
+  #endif])
+  
++ dnl sys/sysctl.h depends on sys/param.h on OpenBSD
++ AC_CHECK_HEADERS(sys/sysctl.h, [], [],
++ [#if defined HAVE_SYS_PARAM_H
++ #  include <sys/param.h>
++ #endif])
++ 
+  
+  dnl pthread_np.h may exist but can only be used after including pthread.h
+  AC_MSG_CHECKING([for pthread_np.h])
+*** ../vim-7.2.182/src/version.c	2009-05-17 23:25:16.000000000 +0200
+--- src/version.c	2009-05-21 15:16:01.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     183,
+  /**/
+
+-- 
+CART DRIVER: Bring out your dead!
+   There are legs stick out of windows and doors.  Two MEN are fighting in the
+   mud - covered from head to foot in it.  Another MAN is on his hands in
+   knees shovelling mud into his mouth.  We just catch sight of a MAN falling
+   into a well.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.184 b/source/ap/vim/patches/7.2.184
new file mode 100644
index 000000000..638821570
--- /dev/null
+++ b/source/ap/vim/patches/7.2.184
@@ -0,0 +1,3646 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.184
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.184
+Problem:    Some more compiler warnings when using gcc -Wextra.
+Solution:   Add UNUSED and type casts.  Autoconf check for wchar_t.
+Files:	    src/auto/configure, src/config.h.in, src/configure.in,
+	    src/gui_athena.c, src/gui_x11.c, src/gui.c, src/gui_beval.c,
+	    src/gui_at_sb.c, src/gui_at_fs.c, src/gui_motif.c,
+	    src/gui_xmdlg.c, src/gui_xmebw.c, src/if_python.c, src/window.c,
+	    src/workshop.c
+
+
+*** ../vim-7.2.183/src/auto/configure	2009-05-21 15:19:59.000000000 +0200
+--- src/auto/configure	2009-05-21 16:05:01.000000000 +0200
+***************
+*** 7977,7982 ****
+--- 7977,8058 ----
+  
+      LDFLAGS="$ac_save_LDFLAGS"
+  
++     { $as_echo "$as_me:$LINENO: checking size of wchar_t is 2 bytes" >&5
++ $as_echo_n "checking size of wchar_t is 2 bytes... " >&6; }
++     if test "${ac_cv_small_wchar_t+set}" = set; then
++   $as_echo_n "(cached) " >&6
++ else
++   if test "$cross_compiling" = yes; then
++   { { $as_echo "$as_me:$LINENO: error: failed to compile test program" >&5
++ $as_echo "$as_me: error: failed to compile test program" >&2;}
++    { (exit 1); exit 1; }; }
++ else
++   cat >conftest.$ac_ext <<_ACEOF
++ /* confdefs.h.  */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h.  */
++ 
++ #include <X11/Xlib.h>
++ #if STDC_HEADERS
++ # include <stdlib.h>
++ # include <stddef.h>
++ #endif
++ 		main()
++ 		{
++ 		  if (sizeof(wchar_t) <= 2)
++ 		    exit(1);
++ 		  exit(0);
++ 		}
++ _ACEOF
++ rm -f conftest$ac_exeext
++ if { (ac_try="$ac_link"
++ case "(($ac_try" in
++   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++   *) ac_try_echo=$ac_try;;
++ esac
++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++ $as_echo "$ac_try_echo") >&5
++   (eval "$ac_link") 2>&5
++   ac_status=$?
++   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++   { (case "(($ac_try" in
++   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++   *) ac_try_echo=$ac_try;;
++ esac
++ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++ $as_echo "$ac_try_echo") >&5
++   (eval "$ac_try") 2>&5
++   ac_status=$?
++   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); }; }; then
++   ac_cv_small_wchar_t="no"
++ else
++   $as_echo "$as_me: program exited with status $ac_status" >&5
++ $as_echo "$as_me: failed program was:" >&5
++ sed 's/^/| /' conftest.$ac_ext >&5
++ 
++ ( exit $ac_status )
++ ac_cv_small_wchar_t="yes"
++ fi
++ rm -rf conftest.dSYM
++ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ fi
++ 
++ 
++ fi
++ 
++     { $as_echo "$as_me:$LINENO: result: $ac_cv_small_wchar_t" >&5
++ $as_echo "$ac_cv_small_wchar_t" >&6; }
++     if test "x$ac_cv_small_wchar_t" = "xyes" ; then
++       cat >>confdefs.h <<\_ACEOF
++ #define SMALL_WCHAR_T 1
++ _ACEOF
++ 
++     fi
++ 
+    fi
+  fi
+  
+***************
+*** 15417,15423 ****
+  
+  
+  
+- 
+  bcopy_test_prog='
+  #include "confdefs.h"
+  #ifdef HAVE_STRING_H
+--- 15493,15498 ----
+*** ../vim-7.2.183/src/config.h.in	2009-05-14 22:19:19.000000000 +0200
+--- src/config.h.in	2009-05-21 15:44:24.000000000 +0200
+***************
+*** 39,44 ****
+--- 39,47 ----
+  /* Defined to the size of an int */
+  #undef SIZEOF_INT
+  
++ /* Define when wchar_t is only 2 bytes. */
++ #undef SMALL_WCHAR_T
++ 
+  /*
+   * If we cannot trust one of the following from the libraries, we use our
+   * own safe but probably slower vim_memmove().
+*** ../vim-7.2.183/src/configure.in	2009-05-21 15:19:59.000000000 +0200
+--- src/configure.in	2009-05-21 16:04:56.000000000 +0200
+***************
+*** 1193,1198 ****
+--- 1193,1220 ----
+  
+      LDFLAGS="$ac_save_LDFLAGS"
+  
++     AC_MSG_CHECKING(size of wchar_t is 2 bytes)
++     AC_CACHE_VAL(ac_cv_small_wchar_t,
++ 	[AC_TRY_RUN([
++ #include <X11/Xlib.h>
++ #if STDC_HEADERS
++ # include <stdlib.h>
++ # include <stddef.h>
++ #endif
++ 		main()
++ 		{
++ 		  if (sizeof(wchar_t) <= 2)
++ 		    exit(1);
++ 		  exit(0);
++ 		}],
++ 		ac_cv_small_wchar_t="no",
++ 		ac_cv_small_wchar_t="yes",
++ 		AC_MSG_ERROR(failed to compile test program))])
++     AC_MSG_RESULT($ac_cv_small_wchar_t)
++     if test "x$ac_cv_small_wchar_t" = "xyes" ; then
++       AC_DEFINE(SMALL_WCHAR_T)
++     fi
++ 
+    fi
+  fi
+  
+***************
+*** 2881,2887 ****
+  AC_MSG_RESULT($ac_cv_sizeof_int)
+  AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int)
+  
+- 
+  dnl Check for memmove() before bcopy(), makes memmove() be used when both are
+  dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
+  
+--- 2903,2908 ----
+*** ../vim-7.2.183/src/gui_athena.c	2008-06-24 23:00:51.000000000 +0200
+--- src/gui_athena.c	2009-05-21 16:39:43.000000000 +0200
+***************
+*** 86,95 ****
+   * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
+   * left or middle mouse button.
+   */
+- /* ARGSUSED */
+      static void
+  gui_athena_scroll_cb_jump(w, client_data, call_data)
+!     Widget	w;
+      XtPointer	client_data, call_data;
+  {
+      scrollbar_T *sb, *sb_info;
+--- 86,94 ----
+   * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
+   * left or middle mouse button.
+   */
+      static void
+  gui_athena_scroll_cb_jump(w, client_data, call_data)
+!     Widget	w UNUSED;
+      XtPointer	client_data, call_data;
+  {
+      scrollbar_T *sb, *sb_info;
+***************
+*** 122,131 ****
+   * Scrollbar callback (XtNscrollProc) for paging up or down with the left or
+   * right mouse buttons.
+   */
+- /* ARGSUSED */
+      static void
+  gui_athena_scroll_cb_scroll(w, client_data, call_data)
+!     Widget	w;
+      XtPointer	client_data, call_data;
+  {
+      scrollbar_T *sb, *sb_info;
+--- 121,129 ----
+   * Scrollbar callback (XtNscrollProc) for paging up or down with the left or
+   * right mouse buttons.
+   */
+      static void
+  gui_athena_scroll_cb_scroll(w, client_data, call_data)
+!     Widget	w UNUSED;
+      XtPointer	client_data, call_data;
+  {
+      scrollbar_T *sb, *sb_info;
+***************
+*** 492,498 ****
+      if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
+      {
+  	if (menu->iconidx >= 0 && menu->iconidx
+! 		   < (sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
+  	    xpm = built_in_pixmaps[menu->iconidx];
+  	else
+  	    xpm = tb_blank_xpm;
+--- 490,496 ----
+      if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
+      {
+  	if (menu->iconidx >= 0 && menu->iconidx
+! 	      < (int)(sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
+  	    xpm = built_in_pixmaps[menu->iconidx];
+  	else
+  	    xpm = tb_blank_xpm;
+***************
+*** 763,769 ****
+      XtGetValues(XtParent(widget), args, n);
+  
+      retval = num_children;
+!     for (i = 0; i < num_children; ++i)
+      {
+  	Widget	current = children[i];
+  	vimmenu_T	*menu = NULL;
+--- 761,767 ----
+      XtGetValues(XtParent(widget), args, n);
+  
+      retval = num_children;
+!     for (i = 0; i < (int)num_children; ++i)
+      {
+  	Widget	current = children[i];
+  	vimmenu_T	*menu = NULL;
+***************
+*** 780,790 ****
+      return retval;
+  }
+  
+- /* ARGSUSED */
+      void
+  gui_mch_add_menu(menu, idx)
+      vimmenu_T	*menu;
+!     int		idx;
+  {
+      char_u	*pullright_name;
+      Dimension	height, space, border;
+--- 778,787 ----
+      return retval;
+  }
+  
+      void
+  gui_mch_add_menu(menu, idx)
+      vimmenu_T	*menu;
+!     int		idx UNUSED;
+  {
+      char_u	*pullright_name;
+      Dimension	height, space, border;
+***************
+*** 869,875 ****
+  	    XtVaGetValues(parent->submenu_id, XtNchildren, &children,
+  					      XtNnumChildren, &num_children,
+  					      NULL);
+! 	    for (i = 0; i < num_children; ++i)
+  	    {
+  		XtVaSetValues(children[i],
+  			      XtNrightMargin, puller_width,
+--- 866,872 ----
+  	    XtVaGetValues(parent->submenu_id, XtNchildren, &children,
+  					      XtNnumChildren, &num_children,
+  					      NULL);
+! 	    for (i = 0; i < (int)num_children; ++i)
+  	    {
+  		XtVaSetValues(children[i],
+  			      XtNrightMargin, puller_width,
+***************
+*** 913,919 ****
+      XtVaGetValues(id, XtNchildren, &children,
+  		      XtNnumChildren, &num_children,
+  		      NULL);
+!     for (i = 0; i < num_children; ++i)
+      {
+  	if (children[i] == ignore)
+  	    continue;
+--- 910,916 ----
+      XtVaGetValues(id, XtNchildren, &children,
+  		      XtNnumChildren, &num_children,
+  		      NULL);
+!     for (i = 0; i < (int)num_children; ++i)
+      {
+  	if (children[i] == ignore)
+  	    continue;
+***************
+*** 1175,1185 ****
+      return pname;
+  }
+  
+- /* ARGSUSED */
+      void
+  gui_mch_add_menu_item(menu, idx)
+      vimmenu_T	*menu;
+!     int		idx;
+  {
+      vimmenu_T	*parent = menu->parent;
+  
+--- 1172,1181 ----
+      return pname;
+  }
+  
+      void
+  gui_mch_add_menu_item(menu, idx)
+      vimmenu_T	*menu;
+!     int		idx UNUSED;
+  {
+      vimmenu_T	*parent = menu->parent;
+  
+***************
+*** 1444,1450 ****
+  		XtNchildren,	    &children,
+  		XtNnumChildren,	    &numChildren,
+  		NULL);
+! 	for (i = 0; i < numChildren; i++)
+  	{
+  	    whgt = 0;
+  
+--- 1440,1446 ----
+  		XtNchildren,	    &children,
+  		XtNnumChildren,	    &numChildren,
+  		NULL);
+! 	for (i = 0; i < (int)numChildren; i++)
+  	{
+  	    whgt = 0;
+  
+***************
+*** 1473,1482 ****
+  #endif
+  
+  
+- /* ARGSUSED */
+      void
+  gui_mch_toggle_tearoffs(enable)
+!     int		enable;
+  {
+      /* no tearoff menus */
+  }
+--- 1469,1477 ----
+  #endif
+  
+  
+      void
+  gui_mch_toggle_tearoffs(enable)
+!     int		enable UNUSED;
+  {
+      /* no tearoff menus */
+  }
+***************
+*** 1537,1543 ****
+  	    else
+  		get_left_margin = True;
+  
+! 	    for (i = 0; i < num_children; ++i)
+  	    {
+  		if (children[i] == menu->id)
+  		    continue;
+--- 1532,1538 ----
+  	    else
+  		get_left_margin = True;
+  
+! 	    for (i = 0; i < (int)num_children; ++i)
+  	    {
+  		if (children[i] == menu->id)
+  		    continue;
+***************
+*** 1645,1655 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static void
+  gui_athena_menu_timeout(client_data, id)
+      XtPointer	    client_data;
+!     XtIntervalId    *id;
+  {
+      Widget  w = (Widget)client_data;
+      Widget  popup;
+--- 1640,1649 ----
+      }
+  }
+  
+      static void
+  gui_athena_menu_timeout(client_data, id)
+      XtPointer	    client_data;
+!     XtIntervalId    *id UNUSED;
+  {
+      Widget  w = (Widget)client_data;
+      Widget  popup;
+***************
+*** 1678,1689 ****
+   *
+   * This is called when XtPopup() is called.
+   */
+- /*ARGSUSED*/
+      static void
+  gui_athena_popup_callback(w, client_data, call_data)
+      Widget	w;
+      XtPointer	client_data;
+!     XtPointer	call_data;
+  {
+      /* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */
+      vimmenu_T	*menu = (vimmenu_T *)client_data;
+--- 1672,1682 ----
+   *
+   * This is called when XtPopup() is called.
+   */
+      static void
+  gui_athena_popup_callback(w, client_data, call_data)
+      Widget	w;
+      XtPointer	client_data;
+!     XtPointer	call_data UNUSED;
+  {
+      /* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */
+      vimmenu_T	*menu = (vimmenu_T *)client_data;
+***************
+*** 1711,1717 ****
+  		     NULL);
+  }
+  
+- /* ARGSUSED */
+      static void
+  gui_athena_popdown_submenus_action(w, event, args, nargs)
+      Widget	w;
+--- 1704,1709 ----
+***************
+*** 1756,1762 ****
+      return False;
+  }
+  
+- /* ARGSUSED */
+      static void
+  gui_athena_delayed_arm_action(w, event, args, nargs)
+      Widget	w;
+--- 1748,1753 ----
+***************
+*** 1837,1843 ****
+       * (XtIsSubclass(popup,simpleMenuWidgetClass) == True) */
+  }
+  
+- /* ARGSUSED */
+      void
+  gui_mch_show_popupmenu(menu)
+      vimmenu_T *menu;
+--- 1828,1833 ----
+***************
+*** 2046,2060 ****
+   * Put up a file requester.
+   * Returns the selected name in allocated memory, or NULL for Cancel.
+   */
+- /* ARGSUSED */
+      char_u *
+  gui_mch_browse(saving, title, dflt, ext, initdir, filter)
+!     int		saving;		/* select file to write */
+!     char_u	*title;		/* not used (title for the window) */
+!     char_u	*dflt;		/* not used (default name) */
+!     char_u	*ext;		/* not used (extension added) */
+      char_u	*initdir;	/* initial directory, NULL for current dir */
+!     char_u	*filter;	/* not used (file name filter) */
+  {
+      Position x, y;
+      char_u	dirbuf[MAXPATHL];
+--- 2036,2049 ----
+   * Put up a file requester.
+   * Returns the selected name in allocated memory, or NULL for Cancel.
+   */
+      char_u *
+  gui_mch_browse(saving, title, dflt, ext, initdir, filter)
+!     int		saving UNUSED;	/* select file to write */
+!     char_u	*title;		/* title for the window */
+!     char_u	*dflt;		/* default name */
+!     char_u	*ext UNUSED;	/* extension added */
+      char_u	*initdir;	/* initial directory, NULL for current dir */
+!     char_u	*filter UNUSED;	/* file name filter */
+  {
+      Position x, y;
+      char_u	dirbuf[MAXPATHL];
+***************
+*** 2100,2112 ****
+   * Callback function for the textfield.  When CR is hit this works like
+   * hitting the "OK" button, ESC like "Cancel".
+   */
+- /* ARGSUSED */
+      static void
+  keyhit_callback(w, client_data, event, cont)
+!     Widget		w;
+!     XtPointer		client_data;
+      XEvent		*event;
+!     Boolean		*cont;
+  {
+      char	buf[2];
+  
+--- 2089,2100 ----
+   * Callback function for the textfield.  When CR is hit this works like
+   * hitting the "OK" button, ESC like "Cancel".
+   */
+      static void
+  keyhit_callback(w, client_data, event, cont)
+!     Widget		w UNUSED;
+!     XtPointer		client_data UNUSED;
+      XEvent		*event;
+!     Boolean		*cont UNUSED;
+  {
+      char	buf[2];
+  
+***************
+*** 2119,2130 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  butproc(w, client_data, call_data)
+!     Widget	w;
+      XtPointer	client_data;
+!     XtPointer	call_data;
+  {
+      dialogStatus = (int)(long)client_data + 1;
+  }
+--- 2107,2117 ----
+      }
+  }
+  
+      static void
+  butproc(w, client_data, call_data)
+!     Widget	w UNUSED;
+      XtPointer	client_data;
+!     XtPointer	call_data UNUSED;
+  {
+      dialogStatus = (int)(long)client_data + 1;
+  }
+***************
+*** 2132,2158 ****
+  /*
+   * Function called when dialog window closed.
+   */
+- /*ARGSUSED*/
+      static void
+  dialog_wm_handler(w, client_data, event, dum)
+!     Widget	w;
+!     XtPointer	client_data;
+      XEvent	*event;
+!     Boolean	*dum;
+  {
+      if (event->type == ClientMessage
+! 	    && ((XClientMessageEvent *)event)->data.l[0] == dialogatom)
+  	dialogStatus = 0;
+  }
+  
+- /* ARGSUSED */
+      int
+  gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)
+!     int		type;
+      char_u	*title;
+      char_u	*message;
+      char_u	*buttons;
+!     int		dfltbutton;
+      char_u	*textfield;
+  {
+      char_u		*buts;
+--- 2119,2143 ----
+  /*
+   * Function called when dialog window closed.
+   */
+      static void
+  dialog_wm_handler(w, client_data, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	client_data UNUSED;
+      XEvent	*event;
+!     Boolean	*dum UNUSED;
+  {
+      if (event->type == ClientMessage
+! 	    && (Atom)((XClientMessageEvent *)event)->data.l[0] == dialogatom)
+  	dialogStatus = 0;
+  }
+  
+      int
+  gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)
+!     int		type UNUSED;
+      char_u	*title;
+      char_u	*message;
+      char_u	*buttons;
+!     int		dfltbutton UNUSED;
+      char_u	*textfield;
+  {
+      char_u		*buts;
+*** ../vim-7.2.183/src/gui_x11.c	2009-02-24 04:11:07.000000000 +0100
+--- src/gui_x11.c	2009-05-21 16:47:02.000000000 +0200
+***************
+*** 570,591 ****
+   * Call-back routines.
+   */
+  
+- /* ARGSUSED */
+      static void
+  gui_x11_timer_cb(timed_out, interval_id)
+      XtPointer	    timed_out;
+!     XtIntervalId    *interval_id;
+  {
+      *((int *)timed_out) = TRUE;
+  }
+  
+- /* ARGSUSED */
+      static void
+  gui_x11_visibility_cb(w, dud, event, dum)
+!     Widget	w;
+!     XtPointer	dud;
+      XEvent	*event;
+!     Boolean	*dum;
+  {
+      if (event->type != VisibilityNotify)
+  	return;
+--- 570,589 ----
+   * Call-back routines.
+   */
+  
+      static void
+  gui_x11_timer_cb(timed_out, interval_id)
+      XtPointer	    timed_out;
+!     XtIntervalId    *interval_id UNUSED;
+  {
+      *((int *)timed_out) = TRUE;
+  }
+  
+      static void
+  gui_x11_visibility_cb(w, dud, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	dud UNUSED;
+      XEvent	*event;
+!     Boolean	*dum UNUSED;
+  {
+      if (event->type != VisibilityNotify)
+  	return;
+***************
+*** 603,615 ****
+      gui_mch_update();
+  }
+  
+- /* ARGSUSED */
+      static void
+  gui_x11_expose_cb(w, dud, event, dum)
+!     Widget	w;
+!     XtPointer	dud;
+      XEvent	*event;
+!     Boolean	*dum;
+  {
+      XExposeEvent	*gevent;
+      int			new_x;
+--- 601,612 ----
+      gui_mch_update();
+  }
+  
+      static void
+  gui_x11_expose_cb(w, dud, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	dud UNUSED;
+      XEvent	*event;
+!     Boolean	*dum UNUSED;
+  {
+      XExposeEvent	*gevent;
+      int			new_x;
+***************
+*** 680,692 ****
+  }
+  #endif
+  
+- /* ARGSUSED */
+      static void
+  gui_x11_resize_window_cb(w, dud, event, dum)
+!     Widget	w;
+!     XtPointer	dud;
+      XEvent	*event;
+!     Boolean	*dum;
+  {
+      static int lastWidth, lastHeight;
+  
+--- 677,688 ----
+  }
+  #endif
+  
+      static void
+  gui_x11_resize_window_cb(w, dud, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	dud UNUSED;
+      XEvent	*event;
+!     Boolean	*dum UNUSED;
+  {
+      static int lastWidth, lastHeight;
+  
+***************
+*** 727,761 ****
+  #endif
+  }
+  
+- /* ARGSUSED */
+      static void
+  gui_x11_focus_change_cb(w, data, event, dum)
+!     Widget	w;
+!     XtPointer	data;
+      XEvent	*event;
+!     Boolean	*dum;
+  {
+      gui_focus_change(event->type == FocusIn);
+  }
+  
+- /* ARGSUSED */
+      static void
+  gui_x11_enter_cb(w, data, event, dum)
+!     Widget	w;
+!     XtPointer	data;
+!     XEvent	*event;
+!     Boolean	*dum;
+  {
+      gui_focus_change(TRUE);
+  }
+  
+- /* ARGSUSED */
+      static void
+  gui_x11_leave_cb(w, data, event, dum)
+!     Widget	w;
+!     XtPointer	data;
+!     XEvent	*event;
+!     Boolean	*dum;
+  {
+      gui_focus_change(FALSE);
+  }
+--- 723,754 ----
+  #endif
+  }
+  
+      static void
+  gui_x11_focus_change_cb(w, data, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	data UNUSED;
+      XEvent	*event;
+!     Boolean	*dum UNUSED;
+  {
+      gui_focus_change(event->type == FocusIn);
+  }
+  
+      static void
+  gui_x11_enter_cb(w, data, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	data UNUSED;
+!     XEvent	*event UNUSED;
+!     Boolean	*dum UNUSED;
+  {
+      gui_focus_change(TRUE);
+  }
+  
+      static void
+  gui_x11_leave_cb(w, data, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	data UNUSED;
+!     XEvent	*event UNUSED;
+!     Boolean	*dum UNUSED;
+  {
+      gui_focus_change(FALSE);
+  }
+***************
+*** 766,778 ****
+  # endif
+  #endif
+  
+- /* ARGSUSED */
+      void
+  gui_x11_key_hit_cb(w, dud, event, dum)
+!     Widget	w;
+!     XtPointer	dud;
+      XEvent	*event;
+!     Boolean	*dum;
+  {
+      XKeyPressedEvent	*ev_press;
+  #ifdef FEAT_XIM
+--- 759,770 ----
+  # endif
+  #endif
+  
+      void
+  gui_x11_key_hit_cb(w, dud, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	dud UNUSED;
+      XEvent	*event;
+!     Boolean	*dum UNUSED;
+  {
+      XKeyPressedEvent	*ev_press;
+  #ifdef FEAT_XIM
+***************
+*** 1078,1090 ****
+  #endif
+  }
+  
+- /* ARGSUSED */
+      static void
+  gui_x11_mouse_cb(w, dud, event, dum)
+!     Widget	w;
+!     XtPointer	dud;
+      XEvent	*event;
+!     Boolean	*dum;
+  {
+      static XtIntervalId timer = (XtIntervalId)0;
+      static int	timed_out = TRUE;
+--- 1070,1081 ----
+  #endif
+  }
+  
+      static void
+  gui_x11_mouse_cb(w, dud, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	dud UNUSED;
+      XEvent	*event;
+!     Boolean	*dum UNUSED;
+  {
+      static XtIntervalId timer = (XtIntervalId)0;
+      static int	timed_out = TRUE;
+***************
+*** 1210,1220 ****
+      while (arg < *argc)
+      {
+  	/* Look for argv[arg] in cmdline_options[] table */
+! 	for (i = 0; i < XtNumber(cmdline_options); i++)
+  	    if (strcmp(argv[arg], cmdline_options[i].option) == 0)
+  		break;
+  
+! 	if (i < XtNumber(cmdline_options))
+  	{
+  	    /* Remember finding "-rv" or "-reverse" */
+  	    if (strcmp("-rv", argv[arg]) == 0
+--- 1201,1211 ----
+      while (arg < *argc)
+      {
+  	/* Look for argv[arg] in cmdline_options[] table */
+! 	for (i = 0; i < (int)XtNumber(cmdline_options); i++)
+  	    if (strcmp(argv[arg], cmdline_options[i].option) == 0)
+  		break;
+  
+! 	if (i < (int)XtNumber(cmdline_options))
+  	{
+  	    /* Remember finding "-rv" or "-reverse" */
+  	    if (strcmp("-rv", argv[arg]) == 0
+***************
+*** 1319,1330 ****
+  
+  static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i));
+  
+- /*ARGSUSED*/
+      static void
+  local_xsmp_handle_requests(c, s, i)
+!     XtPointer	c;
+!     int		*s;
+!     XtInputId	*i;
+  {
+      if (xsmp_handle_requests() == FAIL)
+  	XtRemoveInput(_xsmp_xtinputid);
+--- 1310,1320 ----
+  
+  static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i));
+  
+      static void
+  local_xsmp_handle_requests(c, s, i)
+!     XtPointer	c UNUSED;
+!     int		*s UNUSED;
+!     XtInputId	*i UNUSED;
+  {
+      if (xsmp_handle_requests() == FAIL)
+  	XtRemoveInput(_xsmp_xtinputid);
+***************
+*** 1438,1444 ****
+  	    Columns = w;
+  	if (mask & HeightValue)
+  	{
+! 	    if (p_window > h - 1 || !option_was_set((char_u *)"window"))
+  		p_window = h - 1;
+  	    Rows = h;
+  	}
+--- 1428,1434 ----
+  	    Columns = w;
+  	if (mask & HeightValue)
+  	{
+! 	    if (p_window > (long)h - 1 || !option_was_set((char_u *)"window"))
+  		p_window = h - 1;
+  	    Rows = h;
+  	}
+***************
+*** 1753,1762 ****
+  }
+  #endif
+  
+- /*ARGSUSED*/
+      void
+  gui_mch_exit(rc)
+!     int		rc;
+  {
+  #if 0
+      /* Lesstif gives an error message here, and so does Solaris.  The man page
+--- 1743,1751 ----
+  }
+  #endif
+  
+      void
+  gui_mch_exit(rc)
+!     int		rc UNUSED;
+  {
+  #if 0
+      /* Lesstif gives an error message here, and so does Solaris.  The man page
+***************
+*** 1799,1805 ****
+  	NULL);
+  }
+  
+- /*ARGSUSED*/
+      void
+  gui_mch_set_shellsize(width, height, min_width, min_height,
+  		    base_width, base_height, direction)
+--- 1788,1793 ----
+***************
+*** 1809,1815 ****
+      int		min_height;
+      int		base_width;
+      int		base_height;
+!     int		direction;
+  {
+  #ifdef FEAT_XIM
+      height += xim_get_status_area_height(),
+--- 1797,1803 ----
+      int		min_height;
+      int		base_width;
+      int		base_height;
+!     int		direction UNUSED;
+  {
+  #ifdef FEAT_XIM
+      height += xim_get_status_area_height(),
+***************
+*** 1847,1857 ****
+   * If "fontset" is TRUE, load the "font_name" as a fontset.
+   * Return FAIL if the font could not be loaded, OK otherwise.
+   */
+- /*ARGSUSED*/
+      int
+  gui_mch_init_font(font_name, do_fontset)
+      char_u	*font_name;
+!     int		do_fontset;
+  {
+      XFontStruct	*font = NULL;
+  
+--- 1835,1844 ----
+   * If "fontset" is TRUE, load the "font_name" as a fontset.
+   * Return FAIL if the font could not be loaded, OK otherwise.
+   */
+      int
+  gui_mch_init_font(font_name, do_fontset)
+      char_u	*font_name;
+!     int		do_fontset UNUSED;
+  {
+      XFontStruct	*font = NULL;
+  
+***************
+*** 2029,2038 ****
+   * Return the name of font "font" in allocated memory.
+   * Don't know how to get the actual name, thus use the provided name.
+   */
+- /*ARGSUSED*/
+      char_u *
+  gui_mch_get_fontname(font, name)
+!     GuiFont font;
+      char_u  *name;
+  {
+      if (name == NULL)
+--- 2016,2024 ----
+   * Return the name of font "font" in allocated memory.
+   * Don't know how to get the actual name, thus use the provided name.
+   */
+      char_u *
+  gui_mch_get_fontname(font, name)
+!     GuiFont font UNUSED;
+      char_u  *name;
+  {
+      if (name == NULL)
+***************
+*** 2521,2527 ****
+  {
+      int			i;
+      int			offset;
+!     const static int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
+  
+      XSetForeground(gui.dpy, gui.text_gc, prev_sp_color);
+      for (i = FILL_X(col); i < FILL_X(col + cells); ++i)
+--- 2507,2513 ----
+  {
+      int			i;
+      int			offset;
+!     static const int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
+  
+      XSetForeground(gui.dpy, gui.text_gc, prev_sp_color);
+      for (i = FILL_X(col); i < FILL_X(col + cells); ++i)
+***************
+*** 2569,2576 ****
+  # ifdef FEAT_XFONTSET
+  	    if (current_fontset != NULL)
+  	    {
+! 		if (c >= 0x10000 && sizeof(wchar_t) <= 2)
+  		    c = 0xbf;		/* show chars > 0xffff as ? */
+  		((wchar_t *)buf)[wlen] = c;
+  	    }
+  	    else
+--- 2555,2564 ----
+  # ifdef FEAT_XFONTSET
+  	    if (current_fontset != NULL)
+  	    {
+! #  ifdef SMALL_WCHAR_T
+! 		if (c >= 0x10000)
+  		    c = 0xbf;		/* show chars > 0xffff as ? */
++ #  endif
+  		((wchar_t *)buf)[wlen] = c;
+  	    }
+  	    else
+***************
+*** 3136,3146 ****
+      /* Nothing to do in X */
+  }
+  
+- /* ARGSUSED */
+      void
+  gui_x11_menu_cb(w, client_data, call_data)
+!     Widget	w;
+!     XtPointer	client_data, call_data;
+  {
+      gui_menu_cb((vimmenu_T *)client_data);
+  }
+--- 3124,3134 ----
+      /* Nothing to do in X */
+  }
+  
+      void
+  gui_x11_menu_cb(w, client_data, call_data)
+!     Widget	w UNUSED;
+!     XtPointer	client_data;
+!     XtPointer	call_data UNUSED;
+  {
+      gui_menu_cb((vimmenu_T *)client_data);
+  }
+***************
+*** 3153,3165 ****
+   * Function called when window closed.	Works like ":qa".
+   * Should put up a requester!
+   */
+- /*ARGSUSED*/
+      static void
+  gui_x11_wm_protocol_handler(w, client_data, event, dum)
+!     Widget	w;
+!     XtPointer	client_data;
+      XEvent	*event;
+!     Boolean	*dum;
+  {
+      /*
+       * Only deal with Client messages.
+--- 3141,3152 ----
+   * Function called when window closed.	Works like ":qa".
+   * Should put up a requester!
+   */
+      static void
+  gui_x11_wm_protocol_handler(w, client_data, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	client_data UNUSED;
+      XEvent	*event;
+!     Boolean	*dum UNUSED;
+  {
+      /*
+       * Only deal with Client messages.
+***************
+*** 3172,3178 ****
+       * exit.  That can be cancelled though, thus Vim shouldn't exit here.
+       * Just sync our swap files.
+       */
+!     if (((XClientMessageEvent *)event)->data.l[0] ==
+  						  wm_atoms[SAVE_YOURSELF_IDX])
+      {
+  	out_flush();
+--- 3159,3165 ----
+       * exit.  That can be cancelled though, thus Vim shouldn't exit here.
+       * Just sync our swap files.
+       */
+!     if ((Atom)((XClientMessageEvent *)event)->data.l[0] ==
+  						  wm_atoms[SAVE_YOURSELF_IDX])
+      {
+  	out_flush();
+***************
+*** 3185,3191 ****
+  	return;
+      }
+  
+!     if (((XClientMessageEvent *)event)->data.l[0] !=
+  						  wm_atoms[DELETE_WINDOW_IDX])
+  	return;
+  
+--- 3172,3178 ----
+  	return;
+      }
+  
+!     if ((Atom)((XClientMessageEvent *)event)->data.l[0] !=
+  						  wm_atoms[DELETE_WINDOW_IDX])
+  	return;
+  
+***************
+*** 3196,3208 ****
+  /*
+   * Function called when property changed. Check for incoming commands
+   */
+- /*ARGSUSED*/
+      static void
+  gui_x11_send_event_handler(w, client_data, event, dum)
+!     Widget	w;
+!     XtPointer	client_data;
+      XEvent	*event;
+!     Boolean	*dum;
+  {
+      XPropertyEvent *e = (XPropertyEvent *) event;
+  
+--- 3183,3194 ----
+  /*
+   * Function called when property changed. Check for incoming commands
+   */
+      static void
+  gui_x11_send_event_handler(w, client_data, event, dum)
+!     Widget	w UNUSED;
+!     XtPointer	client_data UNUSED;
+      XEvent	*event;
+!     Boolean	*dum UNUSED;
+  {
+      XPropertyEvent *e = (XPropertyEvent *) event;
+  
+***************
+*** 3277,3287 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  gui_x11_blink_cb(timed_out, interval_id)
+!     XtPointer	    timed_out;
+!     XtIntervalId    *interval_id;
+  {
+      if (blink_state == BLINK_ON)
+      {
+--- 3263,3272 ----
+      }
+  }
+  
+      static void
+  gui_x11_blink_cb(timed_out, interval_id)
+!     XtPointer	    timed_out UNUSED;
+!     XtIntervalId    *interval_id UNUSED;
+  {
+      if (blink_state == BLINK_ON)
+      {
+*** ../vim-7.2.183/src/gui.c	2009-05-17 16:23:20.000000000 +0200
+--- src/gui.c	2009-05-21 16:37:39.000000000 +0200
+***************
+*** 3119,3125 ****
+   */
+      void
+  gui_init_which_components(oldval)
+!     char_u	*oldval;
+  {
+  #ifdef FEAT_MENU
+      static int	prev_menu_is_active = -1;
+--- 3119,3125 ----
+   */
+      void
+  gui_init_which_components(oldval)
+!     char_u	*oldval UNUSED;
+  {
+  #ifdef FEAT_MENU
+      static int	prev_menu_is_active = -1;
+***************
+*** 4668,4675 ****
+   */
+      static win_T *
+  xy2win(x, y)
+!     int		x;
+!     int		y;
+  {
+  #ifdef FEAT_WINDOWS
+      int		row;
+--- 4668,4675 ----
+   */
+      static win_T *
+  xy2win(x, y)
+!     int		x UNUSED;
+!     int		y UNUSED;
+  {
+  #ifdef FEAT_WINDOWS
+      int		row;
+***************
+*** 5121,5128 ****
+   */
+      void
+  gui_handle_drop(x, y, modifiers, fnames, count)
+!     int		x;
+!     int		y;
+      int_u	modifiers;
+      char_u	**fnames;
+      int		count;
+--- 5121,5128 ----
+   */
+      void
+  gui_handle_drop(x, y, modifiers, fnames, count)
+!     int		x UNUSED;
+!     int		y UNUSED;
+      int_u	modifiers;
+      char_u	**fnames;
+      int		count;
+*** ../vim-7.2.183/src/gui_beval.c	2009-05-17 16:23:20.000000000 +0200
+--- src/gui_beval.c	2009-05-21 15:03:02.000000000 +0200
+***************
+*** 18,24 ****
+      void
+  general_beval_cb(beval, state)
+      BalloonEval *beval;
+!     int state;
+  {
+      win_T	*wp;
+      int		col;
+--- 18,24 ----
+      void
+  general_beval_cb(beval, state)
+      BalloonEval *beval;
+!     int		state UNUSED;
+  {
+      win_T	*wp;
+      int		col;
+***************
+*** 726,735 ****
+   */
+      static void
+  pointerEventEH(w, client_data, event, unused)
+!     Widget	w;
+      XtPointer	client_data;
+      XEvent	*event;
+!     Boolean	*unused;
+  {
+      BalloonEval *beval = (BalloonEval *)client_data;
+      pointerEvent(beval, event);
+--- 726,735 ----
+   */
+      static void
+  pointerEventEH(w, client_data, event, unused)
+!     Widget	w UNUSED;
+      XtPointer	client_data;
+      XEvent	*event;
+!     Boolean	*unused UNUSED;
+  {
+      BalloonEval *beval = (BalloonEval *)client_data;
+      pointerEvent(beval, event);
+***************
+*** 877,883 ****
+      static void
+  timerRoutine(dx, id)
+      XtPointer	    dx;
+!     XtIntervalId    *id;
+  {
+      BalloonEval *beval = (BalloonEval *)dx;
+  
+--- 877,883 ----
+      static void
+  timerRoutine(dx, id)
+      XtPointer	    dx;
+!     XtIntervalId    *id UNUSED;
+  {
+      BalloonEval *beval = (BalloonEval *)dx;
+  
+*** ../vim-7.2.183/src/gui_at_sb.c	2008-11-28 21:26:50.000000000 +0100
+--- src/gui_at_sb.c	2009-05-21 16:38:53.000000000 +0200
+***************
+*** 198,207 ****
+      /* extension	*/  NULL
+    },
+    { /* simple fields */
+!     /* change_sensitive	*/  XtInheritChangeSensitive
+    },
+    { /* scrollbar fields */
+!     /* ignore	    */	0
+    }
+  };
+  
+--- 198,210 ----
+      /* extension	*/  NULL
+    },
+    { /* simple fields */
+!     /* change_sensitive	*/  XtInheritChangeSensitive,
+! #ifndef OLDXAW
+!     /* extension */	    NULL
+! #endif
+    },
+    { /* scrollbar fields */
+!     /* empty	    */	    0
+    }
+  };
+  
+***************
+*** 241,247 ****
+  
+      if (bottom <= 0 || bottom <= top)
+  	return;
+!     if ((sw = sbw->scrollbar.shadow_width) < 0)
+  	sw = 0;
+      margin = MARGIN (sbw);
+      floor = sbw->scrollbar.length - margin + 2;
+--- 244,251 ----
+  
+      if (bottom <= 0 || bottom <= top)
+  	return;
+!     sw = sbw->scrollbar.shadow_width;
+!     if (sw < 0)
+  	sw = 0;
+      margin = MARGIN (sbw);
+      floor = sbw->scrollbar.length - margin + 2;
+***************
+*** 516,528 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  Initialize(request, new, args, num_args)
+!     Widget	request;	/* what the client asked for */
+      Widget	new;		/* what we're going to give him */
+!     ArgList	args;
+!     Cardinal	*num_args;
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget) new;
+  
+--- 520,531 ----
+      }
+  }
+  
+      static void
+  Initialize(request, new, args, num_args)
+!     Widget	request UNUSED;	/* what the client asked for */
+      Widget	new;		/* what we're going to give him */
+!     ArgList	args UNUSED;
+!     Cardinal	*num_args UNUSED;
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget) new;
+  
+***************
+*** 556,569 ****
+  	(w, valueMask, attributes);
+  }
+  
+- /* ARGSUSED */
+      static Boolean
+  SetValues(current, request, desired, args, num_args)
+!     Widget  current,	    /* what I am */
+! 	    request,	    /* what he wants me to be */
+! 	    desired;	    /* what I will become */
+!     ArgList args;
+!     Cardinal *num_args;
+  {
+      ScrollbarWidget	sbw = (ScrollbarWidget) current;
+      ScrollbarWidget	dsbw = (ScrollbarWidget) desired;
+--- 559,571 ----
+  	(w, valueMask, attributes);
+  }
+  
+      static Boolean
+  SetValues(current, request, desired, args, num_args)
+!     Widget  current;	    /* what I am */
+!     Widget  request UNUSED; /* what he wants me to be */
+!     Widget  desired;	    /* what I will become */
+!     ArgList args UNUSED;
+!     Cardinal *num_args UNUSED;
+  {
+      ScrollbarWidget	sbw = (ScrollbarWidget) current;
+      ScrollbarWidget	dsbw = (ScrollbarWidget) desired;
+***************
+*** 609,615 ****
+  }
+  
+  
+- /* ARGSUSED */
+      static void
+  Redisplay(w, event, region)
+      Widget w;
+--- 611,616 ----
+***************
+*** 789,799 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  RepeatNotify(client_data, idp)
+      XtPointer client_data;
+!     XtIntervalId *idp;
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget) client_data;
+      int		    call_data;
+--- 790,799 ----
+      }
+  }
+  
+      static void
+  RepeatNotify(client_data, idp)
+      XtPointer client_data;
+!     XtIntervalId *idp UNUSED;
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget) client_data;
+      int		    call_data;
+***************
+*** 839,884 ****
+      return (num < small) ? small : ((num > big) ? big : num);
+  }
+  
+- /* ARGSUSED */
+      static void
+  ScrollOneLineUp(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params;
+!     Cardinal	*num_params;
+  {
+      ScrollSome(w, event, -ONE_LINE_DATA);
+  }
+  
+- /* ARGSUSED */
+      static void
+  ScrollOneLineDown(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params;
+!     Cardinal	*num_params;
+  {
+      ScrollSome(w, event, ONE_LINE_DATA);
+  }
+  
+- /* ARGSUSED */
+      static void
+  ScrollPageDown(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params;
+!     Cardinal	*num_params;
+  {
+      ScrollSome(w, event, ONE_PAGE_DATA);
+  }
+  
+- /* ARGSUSED */
+      static void
+  ScrollPageUp(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params;
+!     Cardinal	*num_params;
+  {
+      ScrollSome(w, event, -ONE_PAGE_DATA);
+  }
+--- 839,880 ----
+      return (num < small) ? small : ((num > big) ? big : num);
+  }
+  
+      static void
+  ScrollOneLineUp(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params UNUSED;
+!     Cardinal	*num_params UNUSED;
+  {
+      ScrollSome(w, event, -ONE_LINE_DATA);
+  }
+  
+      static void
+  ScrollOneLineDown(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params UNUSED;
+!     Cardinal	*num_params UNUSED;
+  {
+      ScrollSome(w, event, ONE_LINE_DATA);
+  }
+  
+      static void
+  ScrollPageDown(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params UNUSED;
+!     Cardinal	*num_params UNUSED;
+  {
+      ScrollSome(w, event, ONE_PAGE_DATA);
+  }
+  
+      static void
+  ScrollPageUp(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params UNUSED;
+!     Cardinal	*num_params UNUSED;
+  {
+      ScrollSome(w, event, -ONE_PAGE_DATA);
+  }
+***************
+*** 901,913 ****
+      XtCallCallbacks(w, XtNscrollProc, (XtPointer)call_data);
+  }
+  
+- /* ARGSUSED */
+      static void
+  NotifyScroll(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params;
+!     Cardinal	*num_params;
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget) w;
+      Position	    x, y, loc;
+--- 897,908 ----
+      XtCallCallbacks(w, XtNscrollProc, (XtPointer)call_data);
+  }
+  
+      static void
+  NotifyScroll(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params UNUSED;
+!     Cardinal	*num_params UNUSED;
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget) w;
+      Position	    x, y, loc;
+***************
+*** 991,1003 ****
+  					   delay, RepeatNotify, (XtPointer)w);
+  }
+  
+- /* ARGSUSED */
+      static void
+  EndScroll(w, event, params, num_params)
+      Widget w;
+!     XEvent *event;	/* unused */
+!     String *params;	/* unused */
+!     Cardinal *num_params;   /* unused */
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget) w;
+  
+--- 986,997 ----
+  					   delay, RepeatNotify, (XtPointer)w);
+  }
+  
+      static void
+  EndScroll(w, event, params, num_params)
+      Widget w;
+!     XEvent *event UNUSED;
+!     String *params UNUSED;
+!     Cardinal *num_params UNUSED;
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget) w;
+  
+***************
+*** 1023,1035 ****
+      return PICKLENGTH(sbw, x / width, y / height);
+  }
+  
+- /* ARGSUSED */
+      static void
+  MoveThumb(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params;	/* unused */
+!     Cardinal	*num_params;	/* unused */
+  {
+      ScrollbarWidget	sbw = (ScrollbarWidget)w;
+      Position		x, y;
+--- 1017,1028 ----
+      return PICKLENGTH(sbw, x / width, y / height);
+  }
+  
+      static void
+  MoveThumb(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params UNUSED;
+!     Cardinal	*num_params UNUSED;
+  {
+      ScrollbarWidget	sbw = (ScrollbarWidget)w;
+      Position		x, y;
+***************
+*** 1069,1081 ****
+  }
+  
+  
+- /* ARGSUSED */
+      static void
+  NotifyThumb(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params;	/* unused */
+!     Cardinal	*num_params;	/* unused */
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget)w;
+      /* Use a union to avoid a warning for the weird conversion from float to
+--- 1062,1073 ----
+  }
+  
+  
+      static void
+  NotifyThumb(w, event, params, num_params)
+      Widget	w;
+      XEvent	*event;
+!     String	*params UNUSED;
+!     Cardinal	*num_params UNUSED;
+  {
+      ScrollbarWidget sbw = (ScrollbarWidget)w;
+      /* Use a union to avoid a warning for the weird conversion from float to
+***************
+*** 1096,1102 ****
+      XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
+  }
+  
+- /* ARGSUSED */
+      static void
+  AllocTopShadowGC(w)
+      Widget w;
+--- 1088,1093 ----
+***************
+*** 1110,1116 ****
+      sbw->scrollbar.top_shadow_GC = XtGetGC(w, valuemask, &myXGCV);
+  }
+  
+- /* ARGSUSED */
+      static void
+  AllocBotShadowGC(w)
+      Widget w;
+--- 1101,1106 ----
+***************
+*** 1124,1134 ****
+      sbw->scrollbar.bot_shadow_GC = XtGetGC(w, valuemask, &myXGCV);
+  }
+  
+- /* ARGSUSED */
+      static void
+  _Xaw3dDrawShadows(gw, event, region, out)
+      Widget  gw;
+!     XEvent  *event;
+      Region  region;
+      int	    out;
+  {
+--- 1114,1123 ----
+      sbw->scrollbar.bot_shadow_GC = XtGetGC(w, valuemask, &myXGCV);
+  }
+  
+      static void
+  _Xaw3dDrawShadows(gw, event, region, out)
+      Widget  gw;
+!     XEvent  *event UNUSED;
+      Region  region;
+      int	    out;
+  {
+*** ../vim-7.2.183/src/gui_at_fs.c	2006-05-13 15:51:07.000000000 +0200
+--- src/gui_at_fs.c	2009-05-21 16:38:36.000000000 +0200
+***************
+*** 829,835 ****
+      text.format = FMT8BIT;
+  
+  #ifdef XtNinternational
+!     if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
+      {
+  	XawTextReplace(selFileField, (XawTextPosition)0,
+  				    (XawTextPosition)WcsLen((wchar_t *)&SFtextBuffer[0]), &text);
+--- 829,835 ----
+      text.format = FMT8BIT;
+  
+  #ifdef XtNinternational
+!     if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
+      {
+  	XawTextReplace(selFileField, (XawTextPosition)0,
+  				    (XawTextPosition)WcsLen((wchar_t *)&SFtextBuffer[0]), &text);
+***************
+*** 851,867 ****
+  #endif
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFbuttonPressList(w, n, event)
+!     Widget		w;
+!     int			n;
+!     XButtonPressedEvent	*event;
+  {
+      SFbuttonPressed = 1;
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFbuttonReleaseList(w, n, event)
+      Widget		 w;
+--- 851,865 ----
+  #endif
+  }
+  
+      static void
+  SFbuttonPressList(w, n, event)
+!     Widget		w UNUSED;
+!     int			n UNUSED;
+!     XButtonPressedEvent	*event UNUSED;
+  {
+      SFbuttonPressed = 1;
+  }
+  
+      static void
+  SFbuttonReleaseList(w, n, event)
+      Widget		 w;
+***************
+*** 989,999 ****
+      return result;
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFdirModTimer(cl, id)
+!     XtPointer		cl;
+!     XtIntervalId	*id;
+  {
+      static int		n = -1;
+      static int		f = 0;
+--- 987,996 ----
+      return result;
+  }
+  
+      static void
+  SFdirModTimer(cl, id)
+!     XtPointer		cl UNUSED;
+!     XtIntervalId	*id UNUSED;
+  {
+      static int		n = -1;
+      static int		f = 0;
+***************
+*** 1596,1606 ****
+  
+  static void SFscrollTimer __ARGS((XtPointer p, XtIntervalId *id));
+  
+- /* ARGSUSED */
+      static void
+  SFscrollTimer(p, id)
+      XtPointer		p;
+!     XtIntervalId	*id;
+  {
+      SFDir	*dir;
+      int		save;
+--- 1593,1602 ----
+  
+  static void SFscrollTimer __ARGS((XtPointer p, XtIntervalId *id));
+  
+      static void
+  SFscrollTimer(p, id)
+      XtPointer		p;
+!     XtIntervalId	*id UNUSED;
+  {
+      SFDir	*dir;
+      int		save;
+***************
+*** 1695,1704 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFenterList(w, n, event)
+!     Widget		w;
+      int			n;
+      XEnterWindowEvent	*event;
+  {
+--- 1691,1699 ----
+      }
+  }
+  
+      static void
+  SFenterList(w, n, event)
+!     Widget		w UNUSED;
+      int			n;
+      XEnterWindowEvent	*event;
+  {
+***************
+*** 1719,1730 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFleaveList(w, n, event)
+!     Widget	w;
+      int		n;
+!     XEvent	*event;
+  {
+      if (SFcurrentInvert[n] != -1)
+      {
+--- 1714,1724 ----
+      }
+  }
+  
+      static void
+  SFleaveList(w, n, event)
+!     Widget	w UNUSED;
+      int		n;
+!     XEvent	*event UNUSED;
+  {
+      if (SFcurrentInvert[n] != -1)
+      {
+***************
+*** 1733,1742 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFmotionList(w, n, event)
+!     Widget		w;
+      int			n;
+      XMotionEvent	*event;
+  {
+--- 1727,1735 ----
+      }
+  }
+  
+      static void
+  SFmotionList(w, n, event)
+!     Widget		w UNUSED;
+      int			n;
+      XMotionEvent	*event;
+  {
+***************
+*** 1754,1760 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFvFloatSliderMovedCallback(w, n, fnew)
+      Widget	w;
+--- 1747,1752 ----
+***************
+*** 1767,1776 ****
+      SFvSliderMovedCallback(w, (int)(long)n, nw);
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFvSliderMovedCallback(w, n, nw)
+!     Widget	w;
+      int		n;
+      int		nw;
+  {
+--- 1759,1767 ----
+      SFvSliderMovedCallback(w, (int)(long)n, nw);
+  }
+  
+      static void
+  SFvSliderMovedCallback(w, n, nw)
+!     Widget	w UNUSED;
+      int		n;
+      int		nw;
+  {
+***************
+*** 1853,1862 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFvAreaSelectedCallback(w, n, pnew)
+!     Widget		w;
+      XtPointer	n;
+      XtPointer	pnew;
+  {
+--- 1844,1852 ----
+      }
+  }
+  
+      static void
+  SFvAreaSelectedCallback(w, n, pnew)
+!     Widget	w;
+      XtPointer	n;
+      XtPointer	pnew;
+  {
+***************
+*** 1914,1923 ****
+      SFvSliderMovedCallback(w, (int)(long)n, nw);
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFhSliderMovedCallback(w, n, nw)
+!     Widget	w;
+      XtPointer	n;
+      XtPointer	nw;
+  {
+--- 1904,1912 ----
+      SFvSliderMovedCallback(w, (int)(long)n, nw);
+  }
+  
+      static void
+  SFhSliderMovedCallback(w, n, nw)
+!     Widget	w UNUSED;
+      XtPointer	n;
+      XtPointer	nw;
+  {
+***************
+*** 1933,1942 ****
+      SFdrawList((int)(long)n, SF_DO_NOT_SCROLL);
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFhAreaSelectedCallback(w, n, pnew)
+!     Widget		w;
+      XtPointer	n;
+      XtPointer	pnew;
+  {
+--- 1922,1930 ----
+      SFdrawList((int)(long)n, SF_DO_NOT_SCROLL);
+  }
+  
+      static void
+  SFhAreaSelectedCallback(w, n, pnew)
+!     Widget	w;
+      XtPointer	n;
+      XtPointer	pnew;
+  {
+***************
+*** 1994,2004 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFpathSliderMovedCallback(w, client_data, nw)
+!     Widget		w;
+!     XtPointer	client_data;
+      XtPointer	nw;
+  {
+      SFDir		*dir;
+--- 1982,1991 ----
+      }
+  }
+  
+      static void
+  SFpathSliderMovedCallback(w, client_data, nw)
+!     Widget	w UNUSED;
+!     XtPointer	client_data UNUSED;
+      XtPointer	nw;
+  {
+      SFDir		*dir;
+***************
+*** 2031,2041 ****
+      XawTextSetInsertionPoint(selFileField, pos);
+  }
+  
+- /* ARGSUSED */
+      static void
+  SFpathAreaSelectedCallback(w, client_data, pnew)
+      Widget	w;
+!     XtPointer	client_data;
+      XtPointer	pnew;
+  {
+      int		nw = (int)(long)pnew;
+--- 2018,2027 ----
+      XawTextSetInsertionPoint(selFileField, pos);
+  }
+  
+      static void
+  SFpathAreaSelectedCallback(w, client_data, pnew)
+      Widget	w;
+!     XtPointer	client_data UNUSED;
+      XtPointer	pnew;
+  {
+      int		nw = (int)(long)pnew;
+***************
+*** 2206,2218 ****
+  
+  static void SFexposeList __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont));
+  
+- /* ARGSUSED */
+      static void
+  SFexposeList(w, n, event, cont)
+!     Widget	w;
+      XtPointer	n;
+      XEvent	*event;
+!     Boolean	*cont;
+  {
+      if ((event->type == NoExpose) || event->xexpose.count)
+  	return;
+--- 2192,2203 ----
+  
+  static void SFexposeList __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont));
+  
+      static void
+  SFexposeList(w, n, event, cont)
+!     Widget	w UNUSED;
+      XtPointer	n;
+      XEvent	*event;
+!     Boolean	*cont UNUSED;
+  {
+      if ((event->type == NoExpose) || event->xexpose.count)
+  	return;
+***************
+*** 2222,2234 ****
+  
+  static void SFmodVerifyCallback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont));
+  
+- /* ARGSUSED */
+      static void
+  SFmodVerifyCallback(w, client_data, event, cont)
+!     Widget		w;
+!     XtPointer		client_data;
+      XEvent		*event;
+!     Boolean		*cont;
+  {
+      char	buf[2];
+  
+--- 2207,2218 ----
+  
+  static void SFmodVerifyCallback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont));
+  
+      static void
+  SFmodVerifyCallback(w, client_data, event, cont)
+!     Widget		w UNUSED;
+!     XtPointer		client_data UNUSED;
+      XEvent		*event;
+!     Boolean		*cont UNUSED;
+  {
+      char	buf[2];
+  
+***************
+*** 2241,2251 ****
+  
+  static void SFokCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
+  
+- /* ARGSUSED */
+      static void
+  SFokCallback(w, cl, cd)
+!     Widget	w;
+!     XtPointer	cl, cd;
+  {
+      SFstatus = SEL_FILE_OK;
+  }
+--- 2225,2235 ----
+  
+  static void SFokCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
+  
+      static void
+  SFokCallback(w, cl, cd)
+!     Widget	w UNUSED;
+!     XtPointer	cl UNUSED;
+!     XtPointer	cd UNUSED;
+  {
+      SFstatus = SEL_FILE_OK;
+  }
+***************
+*** 2258,2268 ****
+  
+  static void SFcancelCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
+  
+- /* ARGSUSED */
+      static void
+  SFcancelCallback(w, cl, cd)
+!     Widget	w;
+!     XtPointer	cl, cd;
+  {
+      SFstatus = SEL_FILE_CANCEL;
+  }
+--- 2242,2252 ----
+  
+  static void SFcancelCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
+  
+      static void
+  SFcancelCallback(w, cl, cd)
+!     Widget	w UNUSED;
+!     XtPointer	cl UNUSED;
+!     XtPointer	cd UNUSED;
+  {
+      SFstatus = SEL_FILE_CANCEL;
+  }
+***************
+*** 2275,2290 ****
+  
+  static void SFdismissAction __ARGS((Widget w, XEvent *event, String *params, Cardinal *num_params));
+  
+- /* ARGSUSED */
+      static void
+  SFdismissAction(w, event, params, num_params)
+!     Widget	w;
+!     XEvent *event;
+!     String *params;
+!     Cardinal *num_params;
+  {
+!     if (event->type == ClientMessage &&
+! 	    event->xclient.data.l[0] != SFwmDeleteWindow)
+  	return;
+  
+      SFstatus = SEL_FILE_CANCEL;
+--- 2259,2273 ----
+  
+  static void SFdismissAction __ARGS((Widget w, XEvent *event, String *params, Cardinal *num_params));
+  
+      static void
+  SFdismissAction(w, event, params, num_params)
+!     Widget	w UNUSED;
+!     XEvent	*event;
+!     String	*params UNUSED;
+!     Cardinal	*num_params UNUSED;
+  {
+!     if (event->type == ClientMessage
+! 	    && (Atom)event->xclient.data.l[0] != SFwmDeleteWindow)
+  	return;
+  
+      SFstatus = SEL_FILE_CANCEL;
+***************
+*** 2703,2709 ****
+  SFtextChanged()
+  {
+  #if defined(FEAT_XFONTSET) && defined(XtNinternational)
+!     if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
+      {
+  	wchar_t *wcbuf=(wchar_t *)SFtextBuffer;
+  
+--- 2686,2692 ----
+  SFtextChanged()
+  {
+  #if defined(FEAT_XFONTSET) && defined(XtNinternational)
+!     if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
+      {
+  	wchar_t *wcbuf=(wchar_t *)SFtextBuffer;
+  
+***************
+*** 2749,2755 ****
+  #if defined(FEAT_XFONTSET) && defined(XtNinternational)
+      char *buf;
+  
+!     if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
+      {
+  	wchar_t *wcbuf;
+  	int mbslength;
+--- 2732,2738 ----
+  #if defined(FEAT_XFONTSET) && defined(XtNinternational)
+      char *buf;
+  
+!     if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
+      {
+  	wchar_t *wcbuf;
+  	int mbslength;
+*** ../vim-7.2.183/src/gui_motif.c	2008-06-20 11:39:30.000000000 +0200
+--- src/gui_motif.c	2009-05-21 17:15:05.000000000 +0200
+***************
+*** 117,126 ****
+   * Call-back routines.
+   */
+  
+- /* ARGSUSED */
+      static void
+  scroll_cb(w, client_data, call_data)
+!     Widget	w;
+      XtPointer	client_data, call_data;
+  {
+      scrollbar_T *sb;
+--- 117,125 ----
+   * Call-back routines.
+   */
+  
+      static void
+  scroll_cb(w, client_data, call_data)
+!     Widget	w UNUSED;
+      XtPointer	client_data, call_data;
+  {
+      scrollbar_T *sb;
+***************
+*** 136,146 ****
+  }
+  
+  #ifdef FEAT_GUI_TABLINE
+- /*ARGSUSED*/
+      static void
+  tabline_cb(w, client_data, call_data)
+!     Widget	w;
+!     XtPointer	client_data, call_data;
+  {
+      XmNotebookCallbackStruct *nptr;
+  
+--- 135,145 ----
+  }
+  
+  #ifdef FEAT_GUI_TABLINE
+      static void
+  tabline_cb(w, client_data, call_data)
+!     Widget	w UNUSED;
+!     XtPointer	client_data UNUSED;
+!     XtPointer	call_data;
+  {
+      XmNotebookCallbackStruct *nptr;
+  
+***************
+*** 149,159 ****
+  	send_tabline_event(nptr->page_number);
+  }
+  
+- /*ARGSUSED*/
+      static void
+  tabline_button_cb(w, client_data, call_data)
+      Widget	w;
+!     XtPointer	client_data, call_data;
+  {
+      int		cmd, tab_idx;
+  
+--- 148,158 ----
+  	send_tabline_event(nptr->page_number);
+  }
+  
+      static void
+  tabline_button_cb(w, client_data, call_data)
+      Widget	w;
+!     XtPointer	client_data UNUSED;
+!     XtPointer	call_data UNUSED;
+  {
+      int		cmd, tab_idx;
+  
+***************
+*** 166,176 ****
+  /*
+   * Tabline single mouse click timeout handler
+   */
+- /*ARGSUSED*/
+      static void
+  motif_tabline_timer_cb (timed_out, interval_id)
+      XtPointer		timed_out;
+!     XtIntervalId	*interval_id;
+  {
+      *((int *)timed_out) = TRUE;
+  }
+--- 165,174 ----
+  /*
+   * Tabline single mouse click timeout handler
+   */
+      static void
+  motif_tabline_timer_cb (timed_out, interval_id)
+      XtPointer		timed_out;
+!     XtIntervalId	*interval_id UNUSED;
+  {
+      *((int *)timed_out) = TRUE;
+  }
+***************
+*** 203,215 ****
+      return FALSE;
+  }
+  
+- /*ARGSUSED*/
+      static void
+  tabline_menu_cb(w, closure, e, continue_dispatch)
+      Widget	w;
+!     XtPointer	closure;
+      XEvent	*e;
+!     Boolean	*continue_dispatch;
+  {
+      Widget			tab_w;
+      XButtonPressedEvent		*event;
+--- 201,212 ----
+      return FALSE;
+  }
+  
+      static void
+  tabline_menu_cb(w, closure, e, continue_dispatch)
+      Widget	w;
+!     XtPointer	closure UNUSED;
+      XEvent	*e;
+!     Boolean	*continue_dispatch UNUSED;
+  {
+      Widget			tab_w;
+      XButtonPressedEvent		*event;
+***************
+*** 277,287 ****
+      XtManageChild(tabLine_menu);
+  }
+  
+- /*ARGSUSED*/
+      static void
+  tabline_balloon_cb(beval, state)
+      BalloonEval	*beval;
+!     int		state;
+  {
+      int		nr;
+      tabpage_T	*tp;
+--- 274,283 ----
+      XtManageChild(tabLine_menu);
+  }
+  
+      static void
+  tabline_balloon_cb(beval, state)
+      BalloonEval	*beval;
+!     int		state UNUSED;
+  {
+      int		nr;
+      tabpage_T	*tp;
+***************
+*** 642,654 ****
+  #endif
+  }
+  
+- /*ARGSUSED*/
+      void
+  gui_mch_set_text_area_pos(x, y, w, h)
+!     int	    x;
+!     int	    y;
+!     int	    w;
+!     int	    h;
+  {
+  #ifdef FEAT_TOOLBAR
+      /* Give keyboard focus to the textArea instead of the toolbar. */
+--- 638,649 ----
+  #endif
+  }
+  
+      void
+  gui_mch_set_text_area_pos(x, y, w, h)
+!     int	    x UNUSED;
+!     int	    y UNUSED;
+!     int	    w UNUSED;
+!     int	    h UNUSED;
+  {
+  #ifdef FEAT_TOOLBAR
+      /* Give keyboard focus to the textArea instead of the toolbar. */
+***************
+*** 1261,1267 ****
+      if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
+      {
+  	if (menu->iconidx >= 0 && menu->iconidx
+! 		   < (sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
+  	    xpm = built_in_pixmaps[menu->iconidx];
+  	else
+  	    xpm = tb_blank_xpm;
+--- 1256,1262 ----
+      if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
+      {
+  	if (menu->iconidx >= 0 && menu->iconidx
+! 	       < (int)(sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
+  	    xpm = built_in_pixmaps[menu->iconidx];
+  	else
+  	    xpm = tb_blank_xpm;
+***************
+*** 1716,1725 ****
+      }
+  }
+  
+- /* ARGSUSED */
+      void
+  gui_mch_show_popupmenu(menu)
+!     vimmenu_T *menu;
+  {
+  #ifdef MOTIF_POPUP
+      XmMenuPosition(menu->submenu_id, gui_x11_get_last_mouse_event());
+--- 1711,1719 ----
+      }
+  }
+  
+      void
+  gui_mch_show_popupmenu(menu)
+!     vimmenu_T *menu UNUSED;
+  {
+  #ifdef MOTIF_POPUP
+      XmMenuPosition(menu->submenu_id, gui_x11_get_last_mouse_event());
+***************
+*** 2046,2054 ****
+  /*
+   * Callback routine for dialog mnemonic processing.
+   */
+- /*ARGSUSED*/
+      static void
+! mnemonic_event(Widget w, XtPointer call_data, XKeyEvent *event)
+  {
+      do_mnemonic(w, event->keycode);
+  }
+--- 2040,2047 ----
+  /*
+   * Callback routine for dialog mnemonic processing.
+   */
+      static void
+! mnemonic_event(Widget w, XtPointer call_data UNUSED, XKeyEvent *event)
+  {
+      do_mnemonic(w, event->keycode);
+  }
+***************
+*** 2287,2299 ****
+   * Put up a file requester.
+   * Returns the selected name in allocated memory, or NULL for Cancel.
+   */
+- /* ARGSUSED */
+      char_u *
+  gui_mch_browse(saving, title, dflt, ext, initdir, filter)
+!     int		saving;		/* select file to write */
+      char_u	*title;		/* title for the window */
+      char_u	*dflt;		/* default name */
+!     char_u	*ext;		/* not used (extension added) */
+      char_u	*initdir;	/* initial directory, NULL for current dir */
+      char_u	*filter;	/* file name filter */
+  {
+--- 2280,2291 ----
+   * Put up a file requester.
+   * Returns the selected name in allocated memory, or NULL for Cancel.
+   */
+      char_u *
+  gui_mch_browse(saving, title, dflt, ext, initdir, filter)
+!     int		saving UNUSED;	/* select file to write */
+      char_u	*title;		/* title for the window */
+      char_u	*dflt;		/* default name */
+!     char_u	*ext UNUSED;	/* not used (extension added) */
+      char_u	*initdir;	/* initial directory, NULL for current dir */
+      char_u	*filter;	/* file name filter */
+  {
+***************
+*** 2413,2424 ****
+  /*
+   * Process callback from Dialog cancel actions.
+   */
+- /* ARGSUSED */
+      static void
+  DialogCancelCB(w, client_data, call_data)
+!     Widget	w;		/*  widget id		*/
+!     XtPointer	client_data;	/*  data from application   */
+!     XtPointer	call_data;	/*  data from widget class  */
+  {
+      if (browse_fname != NULL)
+      {
+--- 2405,2415 ----
+  /*
+   * Process callback from Dialog cancel actions.
+   */
+      static void
+  DialogCancelCB(w, client_data, call_data)
+!     Widget	w UNUSED;		/*  widget id		*/
+!     XtPointer	client_data UNUSED;	/*  data from application   */
+!     XtPointer	call_data UNUSED;	/*  data from widget class  */
+  {
+      if (browse_fname != NULL)
+      {
+***************
+*** 2431,2442 ****
+  /*
+   * Process callback from Dialog actions.
+   */
+- /* ARGSUSED */
+      static void
+  DialogAcceptCB(w, client_data, call_data)
+!     Widget	w;		/*  widget id		*/
+!     XtPointer	client_data;	/*  data from application   */
+!     XtPointer	call_data;	/*  data from widget class  */
+  {
+      XmFileSelectionBoxCallbackStruct *fcb;
+  
+--- 2422,2432 ----
+  /*
+   * Process callback from Dialog actions.
+   */
+      static void
+  DialogAcceptCB(w, client_data, call_data)
+!     Widget	w UNUSED;		/*  widget id		*/
+!     XtPointer	client_data UNUSED;	/*  data from application   */
+!     XtPointer	call_data;		/*  data from widget class  */
+  {
+      XmFileSelectionBoxCallbackStruct *fcb;
+  
+***************
+*** 2467,2479 ****
+   * Callback function for the textfield.  When CR is hit this works like
+   * hitting the "OK" button, ESC like "Cancel".
+   */
+- /* ARGSUSED */
+      static void
+  keyhit_callback(w, client_data, event, cont)
+      Widget		w;
+!     XtPointer		client_data;
+      XEvent		*event;
+!     Boolean		*cont;
+  {
+      char	buf[2];
+      KeySym	key_sym;
+--- 2457,2468 ----
+   * Callback function for the textfield.  When CR is hit this works like
+   * hitting the "OK" button, ESC like "Cancel".
+   */
+      static void
+  keyhit_callback(w, client_data, event, cont)
+      Widget		w;
+!     XtPointer		client_data UNUSED;
+      XEvent		*event;
+!     Boolean		*cont UNUSED;
+  {
+      char	buf[2];
+      KeySym	key_sym;
+***************
+*** 2490,2501 ****
+  	XmTextFieldClearSelection(w, XtLastTimestampProcessed(gui.dpy));
+  }
+  
+- /* ARGSUSED */
+      static void
+  butproc(w, client_data, call_data)
+!     Widget	w;
+      XtPointer	client_data;
+!     XtPointer	call_data;
+  {
+      dialogStatus = (int)(long)client_data + 1;
+  }
+--- 2479,2489 ----
+  	XmTextFieldClearSelection(w, XtLastTimestampProcessed(gui.dpy));
+  }
+  
+      static void
+  butproc(w, client_data, call_data)
+!     Widget	w UNUSED;
+      XtPointer	client_data;
+!     XtPointer	call_data UNUSED;
+  {
+      dialogStatus = (int)(long)client_data + 1;
+  }
+***************
+*** 2567,2576 ****
+  }
+  #endif
+  
+- /* ARGSUSED */
+      int
+  gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield)
+!     int		type;
+      char_u	*title;
+      char_u	*message;
+      char_u	*button_names;
+--- 2555,2563 ----
+  }
+  #endif
+  
+      int
+  gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield)
+!     int		type UNUSED;
+      char_u	*title;
+      char_u	*message;
+      char_u	*button_names;
+***************
+*** 3197,3203 ****
+  		XmNchildren, &children,
+  		XmNnumChildren, &numChildren, NULL);
+  	borders += tst + tmh;
+! 	for (i = 0; i < numChildren; i++)
+  	{
+  	    whgt = 0;
+  	    XtVaGetValues(children[i], XmNheight, &whgt, NULL);
+--- 3184,3190 ----
+  		XmNchildren, &children,
+  		XmNnumChildren, &numChildren, NULL);
+  	borders += tst + tmh;
+! 	for (i = 0; i < (int)numChildren; i++)
+  	{
+  	    whgt = 0;
+  	    XtVaGetValues(children[i], XmNheight, &whgt, NULL);
+***************
+*** 3237,3249 ****
+   * I have to use footer help for backwards compatability.  Hopefully both will
+   * get implemented and the user will have a choice.
+   */
+- /*ARGSUSED*/
+      static void
+  toolbarbutton_enter_cb(w, client_data, event, cont)
+!     Widget	w;
+      XtPointer	client_data;
+!     XEvent	*event;
+!     Boolean	*cont;
+  {
+      vimmenu_T	*menu = (vimmenu_T *) client_data;
+  
+--- 3224,3235 ----
+   * I have to use footer help for backwards compatability.  Hopefully both will
+   * get implemented and the user will have a choice.
+   */
+      static void
+  toolbarbutton_enter_cb(w, client_data, event, cont)
+!     Widget	w UNUSED;
+      XtPointer	client_data;
+!     XEvent	*event UNUSED;
+!     Boolean	*cont UNUSED;
+  {
+      vimmenu_T	*menu = (vimmenu_T *) client_data;
+  
+***************
+*** 3254,3266 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static void
+  toolbarbutton_leave_cb(w, client_data, event, cont)
+!     Widget	w;
+!     XtPointer	client_data;
+!     XEvent	*event;
+!     Boolean	*cont;
+  {
+      gui_mch_set_footer((char_u *) "");
+  }
+--- 3240,3251 ----
+      }
+  }
+  
+      static void
+  toolbarbutton_leave_cb(w, client_data, event, cont)
+!     Widget	w UNUSED;
+!     XtPointer	client_data UNUSED;
+!     XEvent	*event UNUSED;
+!     Boolean	*cont UNUSED;
+  {
+      gui_mch_set_footer((char_u *) "");
+  }
+***************
+*** 3492,3501 ****
+  /*
+   * Set the fontlist for Widget "id" to use gui.menu_fontset or gui.menu_font.
+   */
+- /*ARGSUSED*/
+      void
+  gui_motif_menu_fontlist(id)
+!     Widget  id;
+  {
+  #ifdef FEAT_MENU
+  #ifdef FONTSET_ALWAYS
+--- 3477,3485 ----
+  /*
+   * Set the fontlist for Widget "id" to use gui.menu_fontset or gui.menu_font.
+   */
+      void
+  gui_motif_menu_fontlist(id)
+!     Widget  id UNUSED;
+  {
+  #ifdef FEAT_MENU
+  #ifdef FONTSET_ALWAYS
+***************
+*** 3566,3573 ****
+      Widget cancel;
+  } SharedFindReplace;
+  
+! static SharedFindReplace find_widgets = { NULL };
+! static SharedFindReplace repl_widgets = { NULL };
+  
+  static void find_replace_destroy_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
+  static void find_replace_dismiss_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
+--- 3550,3557 ----
+      Widget cancel;
+  } SharedFindReplace;
+  
+! static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+! static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+  
+  static void find_replace_destroy_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
+  static void find_replace_dismiss_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
+***************
+*** 3576,3587 ****
+  static void find_replace_keypress __ARGS((Widget w, SharedFindReplace * frdp, XKeyEvent * event));
+  static void find_replace_dialog_create __ARGS((char_u *entry_text, int do_replace));
+  
+- /*ARGSUSED*/
+      static void
+  find_replace_destroy_callback(w, client_data, call_data)
+!     Widget	w;
+      XtPointer	client_data;
+!     XtPointer	call_data;
+  {
+      SharedFindReplace *cd = (SharedFindReplace *)client_data;
+  
+--- 3560,3570 ----
+  static void find_replace_keypress __ARGS((Widget w, SharedFindReplace * frdp, XKeyEvent * event));
+  static void find_replace_dialog_create __ARGS((char_u *entry_text, int do_replace));
+  
+      static void
+  find_replace_destroy_callback(w, client_data, call_data)
+!     Widget	w UNUSED;
+      XtPointer	client_data;
+!     XtPointer	call_data UNUSED;
+  {
+      SharedFindReplace *cd = (SharedFindReplace *)client_data;
+  
+***************
+*** 3590,3601 ****
+  	cd->dialog = (Widget)0;
+  }
+  
+- /*ARGSUSED*/
+      static void
+  find_replace_dismiss_callback(w, client_data, call_data)
+!     Widget	w;
+      XtPointer	client_data;
+!     XtPointer	call_data;
+  {
+      SharedFindReplace *cd = (SharedFindReplace *)client_data;
+  
+--- 3573,3583 ----
+  	cd->dialog = (Widget)0;
+  }
+  
+      static void
+  find_replace_dismiss_callback(w, client_data, call_data)
+!     Widget	w UNUSED;
+      XtPointer	client_data;
+!     XtPointer	call_data UNUSED;
+  {
+      SharedFindReplace *cd = (SharedFindReplace *)client_data;
+  
+***************
+*** 3603,3624 ****
+  	XtUnmanageChild(cd->dialog);
+  }
+  
+- /*ARGSUSED*/
+      static void
+  entry_activate_callback(w, client_data, call_data)
+!     Widget	w;
+      XtPointer	client_data;
+!     XtPointer	call_data;
+  {
+      XmProcessTraversal((Widget)client_data, XmTRAVERSE_CURRENT);
+  }
+  
+- /*ARGSUSED*/
+      static void
+  find_replace_callback(w, client_data, call_data)
+!     Widget	w;
+      XtPointer	client_data;
+!     XtPointer	call_data;
+  {
+      long_u	flags = (long_u)client_data;
+      char	*find_text, *repl_text;
+--- 3585,3604 ----
+  	XtUnmanageChild(cd->dialog);
+  }
+  
+      static void
+  entry_activate_callback(w, client_data, call_data)
+!     Widget	w UNUSED;
+      XtPointer	client_data;
+!     XtPointer	call_data UNUSED;
+  {
+      XmProcessTraversal((Widget)client_data, XmTRAVERSE_CURRENT);
+  }
+  
+      static void
+  find_replace_callback(w, client_data, call_data)
+!     Widget	w UNUSED;
+      XtPointer	client_data;
+!     XtPointer	call_data UNUSED;
+  {
+      long_u	flags = (long_u)client_data;
+      char	*find_text, *repl_text;
+***************
+*** 3668,3677 ****
+  	XtFree(repl_text);
+  }
+  
+- /*ARGSUSED*/
+      static void
+  find_replace_keypress(w, frdp, event)
+!     Widget		w;
+      SharedFindReplace	*frdp;
+      XKeyEvent		*event;
+  {
+--- 3648,3656 ----
+  	XtFree(repl_text);
+  }
+  
+      static void
+  find_replace_keypress(w, frdp, event)
+!     Widget		w UNUSED;
+      SharedFindReplace	*frdp;
+      XKeyEvent		*event;
+  {
+*** ../vim-7.2.183/src/gui_xmdlg.c	2008-11-28 21:26:50.000000000 +0100
+--- src/gui_xmdlg.c	2009-05-21 17:01:52.000000000 +0200
+***************
+*** 448,454 ****
+  
+  	    items[i] = XmStringCreateLocalized(list[ENCODING][i]);
+  
+! 	    if (i < n_items)
+  	    {
+  		/* recycle old button */
+  		XtVaSetValues(children[i],
+--- 448,454 ----
+  
+  	    items[i] = XmStringCreateLocalized(list[ENCODING][i]);
+  
+! 	    if (i < (int)n_items)
+  	    {
+  		/* recycle old button */
+  		XtVaSetValues(children[i],
+***************
+*** 481,487 ****
+  
+  	/* Destroy all the outstanding menu items.
+  	 */
+! 	for (i = count[ENCODING]; i < n_items; ++i)
+  	{
+  	    XtUnmanageChild(children[i]);
+  	    XtDestroyWidget(children[i]);
+--- 481,487 ----
+  
+  	/* Destroy all the outstanding menu items.
+  	 */
+! 	for (i = count[ENCODING]; i < (int)n_items; ++i)
+  	{
+  	    XtUnmanageChild(children[i]);
+  	    XtDestroyWidget(children[i]);
+***************
+*** 544,552 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static void
+! stoggle_callback(Widget w,
+  	SharedFontSelData *data,
+  	XmToggleButtonCallbackStruct *call_data)
+  {
+--- 544,551 ----
+      }
+  }
+  
+      static void
+! stoggle_callback(Widget w UNUSED,
+  	SharedFontSelData *data,
+  	XmToggleButtonCallbackStruct *call_data)
+  {
+***************
+*** 709,719 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static void
+  encoding_callback(Widget w,
+  	SharedFontSelData *data,
+! 	XtPointer dummy)
+  {
+      XmString str;
+      XmListCallbackStruct fake_data;
+--- 708,717 ----
+      }
+  }
+  
+      static void
+  encoding_callback(Widget w,
+  	SharedFontSelData *data,
+! 	XtPointer dummy UNUSED)
+  {
+      XmString str;
+      XmListCallbackStruct fake_data;
+***************
+*** 752,762 ****
+      do_choice(w, data, call_data, SIZE);
+  }
+  
+- /*ARGSUSED*/
+      static void
+! cancel_callback(Widget w,
+  	SharedFontSelData *data,
+! 	XmListCallbackStruct *call_data)
+  {
+      if (data->sel[ENCODING])
+      {
+--- 750,759 ----
+      do_choice(w, data, call_data, SIZE);
+  }
+  
+      static void
+! cancel_callback(Widget w UNUSED,
+  	SharedFontSelData *data,
+! 	XmListCallbackStruct *call_data UNUSED)
+  {
+      if (data->sel[ENCODING])
+      {
+***************
+*** 789,799 ****
+      data->exit = True;
+  }
+  
+- /*ARGSUSED*/
+      static void
+! ok_callback(Widget w,
+  	SharedFontSelData *data,
+! 	XmPushButtonCallbackStruct *call_data)
+  {
+      char    *pattern;
+      char    **name;
+--- 786,795 ----
+      data->exit = True;
+  }
+  
+      static void
+! ok_callback(Widget w UNUSED,
+  	SharedFontSelData *data,
+! 	XmPushButtonCallbackStruct *call_data UNUSED)
+  {
+      char    *pattern;
+      char    **name;
+*** ../vim-7.2.183/src/gui_xmebw.c	2008-11-28 21:26:50.000000000 +0100
+--- src/gui_xmebw.c	2009-05-21 17:06:17.000000000 +0200
+***************
+*** 235,247 ****
+      return tmp;
+  }
+  
+- /*ARGSUSED*/
+      static int
+  alloc_color(Display	*display,
+  	Colormap	colormap,
+  	char		*colorname,
+  	XColor		*xcolor,
+! 	void		*closure)
+  {
+      int status;
+  
+--- 235,246 ----
+      return tmp;
+  }
+  
+      static int
+  alloc_color(Display	*display,
+  	Colormap	colormap,
+  	char		*colorname,
+  	XColor		*xcolor,
+! 	void		*closure UNUSED)
+  {
+      int status;
+  
+***************
+*** 595,603 ****
+  		       XtHeight(eb), eb->primitive.highlight_thickness);
+  }
+  
+- /*ARGSUSED*/
+      static void
+! draw_pixmap(XmEnhancedButtonWidget eb, XEvent *event, Region region)
+  {
+      Pixmap	pix;
+      GC		gc = eb->label.normal_GC;
+--- 594,603 ----
+  		       XtHeight(eb), eb->primitive.highlight_thickness);
+  }
+  
+      static void
+! draw_pixmap(XmEnhancedButtonWidget eb,
+! 	    XEvent *event UNUSED,
+! 	    Region region UNUSED)
+  {
+      Pixmap	pix;
+      GC		gc = eb->label.normal_GC;
+***************
+*** 641,647 ****
+      height = eb->core.height - 2 * y;
+      if (h < height)
+  	height = h;
+!     if (depth == eb->core.depth)
+  	XCopyArea(XtDisplay(eb), pix, XtWindow(eb), gc, 0, 0,
+  		width, height, x, y);
+      else if (depth == 1)
+--- 641,647 ----
+      height = eb->core.height - 2 * y;
+      if (h < height)
+  	height = h;
+!     if (depth == (int)eb->core.depth)
+  	XCopyArea(XtDisplay(eb), pix, XtWindow(eb), gc, 0, 0,
+  		width, height, x, y);
+      else if (depth == 1)
+***************
+*** 731,739 ****
+  	eb->label.normal_GC = tmp_gc;
+  }
+  
+- /*ARGSUSED*/
+      static void
+! Enter(Widget wid, XEvent *event, String *params, Cardinal *num_params)
+  {
+      XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) wid;
+      XmPushButtonCallbackStruct call_value;
+--- 731,741 ----
+  	eb->label.normal_GC = tmp_gc;
+  }
+  
+      static void
+! Enter(Widget wid,
+!       XEvent *event,
+!       String *params UNUSED,
+!       Cardinal *num_params UNUSED)
+  {
+      XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) wid;
+      XmPushButtonCallbackStruct call_value;
+***************
+*** 818,826 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static void
+! Leave(Widget wid, XEvent *event, String *params, Cardinal *num_params)
+  {
+      XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)wid;
+      XmPushButtonCallbackStruct call_value;
+--- 820,830 ----
+      }
+  }
+  
+      static void
+! Leave(Widget wid,
+!       XEvent *event,
+!       String *params UNUSED,
+!       Cardinal *num_params UNUSED)
+  {
+      XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)wid;
+      XmPushButtonCallbackStruct call_value;
+***************
+*** 976,984 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static void
+! Initialize(Widget rq, Widget ebw, ArgList args, Cardinal *n)
+  {
+      XmEnhancedButtonWidget  request = (XmEnhancedButtonWidget)rq;
+      XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget)ebw;
+--- 980,987 ----
+      }
+  }
+  
+      static void
+! Initialize(Widget rq, Widget ebw, ArgList args UNUSED, Cardinal *n UNUSED)
+  {
+      XmEnhancedButtonWidget  request = (XmEnhancedButtonWidget)rq;
+      XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget)ebw;
+***************
+*** 1056,1064 ****
+      free_pixmaps((XmEnhancedButtonWidget)w);
+  }
+  
+- /*ARGSUSED*/
+      static Boolean
+! SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *n)
+  {
+      XmEnhancedButtonWidget  cur = (XmEnhancedButtonWidget) current;
+      XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget) new;
+--- 1059,1070 ----
+      free_pixmaps((XmEnhancedButtonWidget)w);
+  }
+  
+      static Boolean
+! SetValues(Widget current,
+! 	  Widget request UNUSED,
+! 	  Widget new,
+! 	  ArgList args UNUSED,
+! 	  Cardinal *n UNUSED)
+  {
+      XmEnhancedButtonWidget  cur = (XmEnhancedButtonWidget) current;
+      XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget) new;
+***************
+*** 1108,1114 ****
+  		if ((win_x < 0) || (win_y < 0))
+  		    return False;
+  
+! 		if ((win_x > r_width) || (win_y > r_height))
+  		    return False;
+  		draw_highlight(eb);
+  		draw_shadows(eb);
+--- 1114,1120 ----
+  		if ((win_x < 0) || (win_y < 0))
+  		    return False;
+  
+! 		if ((win_x > (int)r_width) || (win_y > (int)r_height))
+  		    return False;
+  		draw_highlight(eb);
+  		draw_shadows(eb);
+*** ../vim-7.2.183/src/if_python.c	2009-01-13 18:10:21.000000000 +0100
+--- src/if_python.c	2009-05-21 17:27:50.000000000 +0200
+***************
+*** 1096,1104 ****
+  
+  /* Vim module - Implementation
+   */
+- /*ARGSUSED*/
+      static PyObject *
+! VimCommand(PyObject *self, PyObject *args)
+  {
+      char *cmd;
+      PyObject *result;
+--- 1096,1103 ----
+  
+  /* Vim module - Implementation
+   */
+      static PyObject *
+! VimCommand(PyObject *self UNUSED, PyObject *args)
+  {
+      char *cmd;
+      PyObject *result;
+***************
+*** 1242,1250 ****
+  }
+  #endif
+  
+- /*ARGSUSED*/
+      static PyObject *
+! VimEval(PyObject *self, PyObject *args)
+  {
+  #ifdef FEAT_EVAL
+      char	*expr;
+--- 1241,1248 ----
+  }
+  #endif
+  
+      static PyObject *
+! VimEval(PyObject *self UNUSED, PyObject *args)
+  {
+  #ifdef FEAT_EVAL
+      char	*expr;
+***************
+*** 1894,1902 ****
+  /* Buffer list object - Implementation
+   */
+  
+- /*ARGSUSED*/
+      static PyInt
+! BufListLength(PyObject *self)
+  {
+      buf_T	*b = firstbuf;
+      PyInt	n = 0;
+--- 1892,1899 ----
+  /* Buffer list object - Implementation
+   */
+  
+      static PyInt
+! BufListLength(PyObject *self UNUSED)
+  {
+      buf_T	*b = firstbuf;
+      PyInt	n = 0;
+***************
+*** 1910,1918 ****
+      return n;
+  }
+  
+- /*ARGSUSED*/
+      static PyObject *
+! BufListItem(PyObject *self, PyInt n)
+  {
+      buf_T *b;
+  
+--- 1907,1914 ----
+      return n;
+  }
+  
+      static PyObject *
+! BufListItem(PyObject *self UNUSED, PyInt n)
+  {
+      buf_T *b;
+  
+***************
+*** 2210,2218 ****
+  
+  /* Window list object - Implementation
+   */
+- /*ARGSUSED*/
+      static PyInt
+! WinListLength(PyObject *self)
+  {
+      win_T	*w = firstwin;
+      PyInt	n = 0;
+--- 2206,2213 ----
+  
+  /* Window list object - Implementation
+   */
+      static PyInt
+! WinListLength(PyObject *self UNUSED)
+  {
+      win_T	*w = firstwin;
+      PyInt	n = 0;
+***************
+*** 2226,2234 ****
+      return n;
+  }
+  
+- /*ARGSUSED*/
+      static PyObject *
+! WinListItem(PyObject *self, PyInt n)
+  {
+      win_T *w;
+  
+--- 2221,2228 ----
+      return n;
+  }
+  
+      static PyObject *
+! WinListItem(PyObject *self UNUSED, PyInt n)
+  {
+      win_T *w;
+  
+***************
+*** 2274,2282 ****
+  
+  /* Current items object - Implementation
+   */
+- /*ARGSUSED*/
+      static PyObject *
+! CurrentGetattr(PyObject *self, char *name)
+  {
+      if (strcmp(name, "buffer") == 0)
+  	return (PyObject *)BufferNew(curbuf);
+--- 2268,2275 ----
+  
+  /* Current items object - Implementation
+   */
+      static PyObject *
+! CurrentGetattr(PyObject *self UNUSED, char *name)
+  {
+      if (strcmp(name, "buffer") == 0)
+  	return (PyObject *)BufferNew(curbuf);
+***************
+*** 2295,2303 ****
+      }
+  }
+  
+- /*ARGSUSED*/
+      static int
+! CurrentSetattr(PyObject *self, char *name, PyObject *value)
+  {
+      if (strcmp(name, "line") == 0)
+      {
+--- 2288,2295 ----
+      }
+  }
+  
+      static int
+! CurrentSetattr(PyObject *self UNUSED, char *name, PyObject *value)
+  {
+      if (strcmp(name, "line") == 0)
+      {
+*** ../vim-7.2.183/src/window.c	2009-02-22 02:36:36.000000000 +0100
+--- src/window.c	2009-05-21 15:14:54.000000000 +0200
+***************
+*** 1163,1174 ****
+   * WSP_NEWLOC may be specified in flags to prevent the location list from
+   * being copied.
+   */
+- /*ARGSUSED*/
+      static void
+  win_init(newp, oldp, flags)
+      win_T	*newp;
+      win_T	*oldp;
+!     int		 flags;
+  {
+      int		i;
+  
+--- 1163,1173 ----
+   * WSP_NEWLOC may be specified in flags to prevent the location list from
+   * being copied.
+   */
+      static void
+  win_init(newp, oldp, flags)
+      win_T	*newp;
+      win_T	*oldp;
+!     int		 flags UNUSED;
+  {
+      int		i;
+  
+***************
+*** 1268,1278 ****
+   * Must be called when there is just one window, filling the whole screen
+   * (excluding the command line).
+   */
+- /*ARGSUSED*/
+      int
+  make_windows(count, vertical)
+      int		count;
+!     int		vertical;	/* split windows vertically if TRUE */
+  {
+      int		maxcount;
+      int		todo;
+--- 1267,1276 ----
+   * Must be called when there is just one window, filling the whole screen
+   * (excluding the command line).
+   */
+      int
+  make_windows(count, vertical)
+      int		count;
+!     int		vertical UNUSED;  /* split windows vertically if TRUE */
+  {
+      int		maxcount;
+      int		todo;
+***************
+*** 2353,2363 ****
+   * Remove a window and its frame from the tree of frames.
+   * Returns a pointer to the window that got the freed up space.
+   */
+- /*ARGSUSED*/
+      static win_T *
+  winframe_remove(win, dirp, tp)
+      win_T	*win;
+!     int		*dirp;		/* set to 'v' or 'h' for direction if 'ea' */
+      tabpage_T	*tp;		/* tab page "win" is in, NULL for current */
+  {
+      frame_T	*frp, *frp2, *frp3;
+--- 2351,2360 ----
+   * Remove a window and its frame from the tree of frames.
+   * Returns a pointer to the window that got the freed up space.
+   */
+      static win_T *
+  winframe_remove(win, dirp, tp)
+      win_T	*win;
+!     int		*dirp UNUSED;	/* set to 'v' or 'h' for direction if 'ea' */
+      tabpage_T	*tp;		/* tab page "win" is in, NULL for current */
+  {
+      frame_T	*frp, *frp2, *frp3;
+***************
+*** 3500,3509 ****
+   * FAIL.
+   * Careful: When OK is returned need to get a new tab page very very soon!
+   */
+- /*ARGSUSED*/
+      static int
+  leave_tabpage(new_curbuf)
+!     buf_T	*new_curbuf;	    /* what is going to be the new curbuf,
+  				       NULL if unknown */
+  {
+      tabpage_T	*tp = curtab;
+--- 3497,3505 ----
+   * FAIL.
+   * Careful: When OK is returned need to get a new tab page very very soon!
+   */
+      static int
+  leave_tabpage(new_curbuf)
+!     buf_T	*new_curbuf UNUSED;    /* what is going to be the new curbuf,
+  				       NULL if unknown */
+  {
+      tabpage_T	*tp = curtab;
+***************
+*** 3545,3555 ****
+   * Start using tab page "tp".
+   * Only to be used after leave_tabpage() or freeing the current tab page.
+   */
+- /*ARGSUSED*/
+      static void
+  enter_tabpage(tp, old_curbuf)
+      tabpage_T	*tp;
+!     buf_T	*old_curbuf;
+  {
+      int		old_off = tp->tp_firstwin->w_winrow;
+      win_T	*next_prevwin = tp->tp_prevwin;
+--- 3541,3550 ----
+   * Start using tab page "tp".
+   * Only to be used after leave_tabpage() or freeing the current tab page.
+   */
+      static void
+  enter_tabpage(tp, old_curbuf)
+      tabpage_T	*tp;
+!     buf_T	*old_curbuf UNUSED;
+  {
+      int		old_off = tp->tp_firstwin->w_winrow;
+      win_T	*next_prevwin = tp->tp_prevwin;
+***************
+*** 4157,4166 ****
+  /*
+   * allocate a window structure and link it in the window list
+   */
+- /*ARGSUSED*/
+      static win_T *
+  win_alloc(after)
+!     win_T	*after;
+  {
+      win_T	*newwin;
+  
+--- 4152,4160 ----
+  /*
+   * allocate a window structure and link it in the window list
+   */
+      static win_T *
+  win_alloc(after)
+!     win_T	*after UNUSED;
+  {
+      win_T	*newwin;
+  
+*** ../vim-7.2.183/src/workshop.c	2008-11-28 11:47:14.000000000 +0100
+--- src/workshop.c	2009-05-21 17:12:55.000000000 +0200
+***************
+*** 204,215 ****
+   * Function:
+   *	Load a given file into the WorkShop buffer.
+   */
+- /*ARGSUSED*/
+      void
+  workshop_load_file(
+  	char	*filename,		/* the file to load */
+  	int	 line,			/* an optional line number (or 0) */
+! 	char	*frameid)		/* used for multi-frame support */
+  {
+  #ifdef WSDEBUG_TRACE
+      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
+--- 204,214 ----
+   * Function:
+   *	Load a given file into the WorkShop buffer.
+   */
+      void
+  workshop_load_file(
+  	char	*filename,		/* the file to load */
+  	int	 line,			/* an optional line number (or 0) */
+! 	char	*frameid UNUSED)	/* used for multi-frame support */
+  {
+  #ifdef WSDEBUG_TRACE
+      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
+***************
+*** 263,272 ****
+      load_window(filename, lineno);
+  }
+  
+- /*ARGSUSED*/
+      void
+  workshop_front_file(
+! 	char	*filename)
+  {
+  #ifdef WSDEBUG_TRACE
+      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
+--- 262,270 ----
+      load_window(filename, lineno);
+  }
+  
+      void
+  workshop_front_file(
+! 	char	*filename UNUSED)
+  {
+  #ifdef WSDEBUG_TRACE
+      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
+***************
+*** 538,546 ****
+   * breakpoints have moved when a program has been recompiled and
+   * reloaded into dbx.
+   */
+- /*ARGSUSED*/
+      void
+! workshop_moved_marks(char *filename)
+  {
+  #ifdef WSDEBUG_TRACE
+      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
+--- 536,543 ----
+   * breakpoints have moved when a program has been recompiled and
+   * reloaded into dbx.
+   */
+      void
+! workshop_moved_marks(char *filename UNUSED)
+  {
+  #ifdef WSDEBUG_TRACE
+      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
+***************
+*** 575,585 ****
+      return (int)h;
+  }
+  
+- /*ARGSUSED*/
+      void
+  workshop_footer_message(
+! 	char		*message,
+! 	int		 severity)	/* severity is currently unused */
+  {
+  #ifdef WSDEBUG_TRACE
+      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
+--- 572,581 ----
+      return (int)h;
+  }
+  
+      void
+  workshop_footer_message(
+! 	char	*message,
+! 	int	severity UNUSED)	/* severity is currently unused */
+  {
+  #ifdef WSDEBUG_TRACE
+      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
+***************
+*** 687,701 ****
+   * command. The globals curMenuName and curMenuPriority contain the name and
+   * priority of the parent menu tree.
+   */
+- /*ARGSUSED*/
+      void
+  workshop_menu_item(
+  	char		*label,
+  	char		*verb,
+! 	char		*accelerator,
+  	char		*acceleratorText,
+! 	char		*name,
+! 	char		*filepos,
+  	char		*sensitive)
+  {
+      char		 cbuf[BUFSIZ];
+--- 683,696 ----
+   * command. The globals curMenuName and curMenuPriority contain the name and
+   * priority of the parent menu tree.
+   */
+      void
+  workshop_menu_item(
+  	char		*label,
+  	char		*verb,
+! 	char		*accelerator UNUSED,
+  	char		*acceleratorText,
+! 	char		*name UNUSED,
+! 	char		*filepos UNUSED,
+  	char		*sensitive)
+  {
+      char		 cbuf[BUFSIZ];
+***************
+*** 810,822 ****
+      workshopInitDone = True;
+  }
+  
+- /*ARGSUSED*/
+      void
+  workshop_toolbar_button(
+  	char	*label,
+  	char	*verb,
+! 	char	*senseVerb,
+! 	char	*filepos,
+  	char	*help,
+  	char	*sense,
+  	char	*file,
+--- 805,816 ----
+      workshopInitDone = True;
+  }
+  
+      void
+  workshop_toolbar_button(
+  	char	*label,
+  	char	*verb,
+! 	char	*senseVerb UNUSED,
+! 	char	*filepos UNUSED,
+  	char	*help,
+  	char	*sense,
+  	char	*file,
+***************
+*** 968,974 ****
+  	    if (strcmp(option, "syntax") == 0)
+  		vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value);
+  	    else if (strcmp(option, "savefiles") == 0)
+! 		; /* XXX - Not yet implemented */
+  	    break;
+  
+  	case 'l':
+--- 962,970 ----
+  	    if (strcmp(option, "syntax") == 0)
+  		vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value);
+  	    else if (strcmp(option, "savefiles") == 0)
+! 	    {
+! 		/* XXX - Not yet implemented */
+! 	    }
+  	    break;
+  
+  	case 'l':
+***************
+*** 1098,1107 ****
+  /*
+   * A button in the toolbar has been pushed.
+   */
+- /*ARGSUSED*/
+      int
+  workshop_get_positions(
+! 	void		*clientData,	/* unused */
+  	char	       **filename,	/* output data */
+  	int		*curLine,	/* output data */
+  	int		*curCol,	/* output data */
+--- 1094,1102 ----
+  /*
+   * A button in the toolbar has been pushed.
+   */
+      int
+  workshop_get_positions(
+! 	void		*clientData UNUSED,
+  	char	       **filename,	/* output data */
+  	int		*curLine,	/* output data */
+  	int		*curCol,	/* output data */
+***************
+*** 1526,1534 ****
+  	return NULL;
+  }
+  
+- /*ARGSUSED*/
+      void
+! workshop_save_sensitivity(char *filename)
+  {
+  }
+  
+--- 1521,1528 ----
+  	return NULL;
+  }
+  
+      void
+! workshop_save_sensitivity(char *filename UNUSED)
+  {
+  }
+  
+*** ../vim-7.2.183/src/version.c	2009-05-21 15:19:59.000000000 +0200
+--- src/version.c	2009-05-21 23:19:40.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     184,
+  /**/
+
+-- 
+CART DRIVER: Bring out your dead!
+LARGE MAN:   Here's one!
+CART DRIVER: Ninepence.
+BODY:        I'm not dead!
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.185 b/source/ap/vim/patches/7.2.185
new file mode 100644
index 000000000..35dbad05e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.185
@@ -0,0 +1,305 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.185
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.185
+Problem:    Some more compiler warnings when using gcc -Wextra.
+Solution:   Add UNUSED and type casts.
+Files:	    src/Makefile, src/if_tlc.c, src/if_ruby.c
+
+
+*** ../vim-7.2.184/src/Makefile	2009-05-21 23:25:47.000000000 +0200
+--- src/Makefile	2009-05-22 18:18:44.000000000 +0200
+***************
+*** 105,112 ****
+  # 4. "make test"  {{{1
+  #	This is optional.  This will run Vim scripts on a number of test
+  #	files, and compare the produced output with the expected output.
+! #	If all is well, you will get the "ALL DONE" message in the end.  See
+! #	below (search for "/^test").
+  #
+  # 5. "make install"  {{{1
+  #	If the new Vim seems to be working OK you can install it and the
+--- 105,112 ----
+  # 4. "make test"  {{{1
+  #	This is optional.  This will run Vim scripts on a number of test
+  #	files, and compare the produced output with the expected output.
+! #	If all is well, you will get the "ALL DONE" message in the end.  If a
+! #	test fails you get "TEST FAILURE".  See below (search for "/^test").
+  #
+  # 5. "make install"  {{{1
+  #	If the new Vim seems to be working OK you can install it and the
+***************
+*** 533,538 ****
+--- 533,543 ----
+  #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes
+  #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
+  
++ # Use this with GCC to check for mistakes, unused arguments, etc.
++ #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
++ #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
++ #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code
++ 
+  # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond
+  # allocated memory (and makes every malloc()/free() very slow).
+  # Electric Fence is free (search ftp sites).
+***************
+*** 551,562 ****
+  # }}}
+  
+  # LINT - for running lint
+! #  For standard lint
+! #LINT = lint
+! #LINT_OPTIONS = -beprxzF
+! #  For splint  (see cleanlint.vim for filtering the output)
+! LINT = splint
+! LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999
+  
+  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
+  # Might not work with GUI or Perl.
+--- 556,568 ----
+  # }}}
+  
+  # LINT - for running lint
+! #  For standard Unix lint
+! LINT = lint
+! LINT_OPTIONS = -beprxzF
+! #  For splint
+! #  It doesn't work well, crashes on include files and non-ascii characters.
+! #LINT = splint
+! #LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999
+  
+  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
+  # Might not work with GUI or Perl.
+***************
+*** 1743,1749 ****
+  # messages.  Don't worry about that.
+  # If there is a real error, there will be a difference between "test.out" and
+  # a "test99.ok" file.
+! # If everything is alright, the final message will be "ALL DONE".
+  #
+  test check:
+  	$(MAKE) -f Makefile $(VIMTARGET)
+--- 1749,1756 ----
+  # messages.  Don't worry about that.
+  # If there is a real error, there will be a difference between "test.out" and
+  # a "test99.ok" file.
+! # If everything is alright, the final message will be "ALL DONE".  If not you
+! # get "TEST FAILURE".
+  #
+  test check:
+  	$(MAKE) -f Makefile $(VIMTARGET)
+***************
+*** 2427,2433 ****
+  	$(CCC) -o $@ if_xcmdsrv.c
+  
+  objects/if_mzsch.o: if_mzsch.c
+! 	$(CCC) -o $@ if_mzsch.c
+  
+  objects/if_perl.o: auto/if_perl.c
+  	$(CCC) -o $@ auto/if_perl.c
+--- 2434,2440 ----
+  	$(CCC) -o $@ if_xcmdsrv.c
+  
+  objects/if_mzsch.o: if_mzsch.c
+! 	$(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c
+  
+  objects/if_perl.o: auto/if_perl.c
+  	$(CCC) -o $@ auto/if_perl.c
+***************
+*** 2436,2442 ****
+  	$(CCC) -o $@ if_perlsfio.c
+  
+  objects/if_python.o: if_python.c
+! 	$(CCC) -o $@ if_python.c
+  
+  objects/if_ruby.o: if_ruby.c
+  	$(CCC) -o $@ if_ruby.c
+--- 2443,2449 ----
+  	$(CCC) -o $@ if_perlsfio.c
+  
+  objects/if_python.o: if_python.c
+! 	$(CCC) -o $@ $(PYTHON_CFLAGS_EXTRA) if_python.c
+  
+  objects/if_ruby.o: if_ruby.c
+  	$(CCC) -o $@ if_ruby.c
+*** ../vim-7.2.184/src/if_ruby.c	2007-09-13 15:00:49.000000000 +0200
+--- src/if_ruby.c	2009-05-22 15:32:04.000000000 +0200
+***************
+*** 492,498 ****
+      }
+  }
+  
+! static VALUE vim_message(VALUE self, VALUE str)
+  {
+      char *buff, *p;
+  
+--- 492,498 ----
+      }
+  }
+  
+! static VALUE vim_message(VALUE self UNUSED, VALUE str)
+  {
+      char *buff, *p;
+  
+***************
+*** 505,524 ****
+      return Qnil;
+  }
+  
+! static VALUE vim_set_option(VALUE self, VALUE str)
+  {
+      do_set((char_u *)STR2CSTR(str), 0);
+      update_screen(NOT_VALID);
+      return Qnil;
+  }
+  
+! static VALUE vim_command(VALUE self, VALUE str)
+  {
+      do_cmdline_cmd((char_u *)STR2CSTR(str));
+      return Qnil;
+  }
+  
+! static VALUE vim_evaluate(VALUE self, VALUE str)
+  {
+  #ifdef FEAT_EVAL
+      char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL, TRUE);
+--- 505,524 ----
+      return Qnil;
+  }
+  
+! static VALUE vim_set_option(VALUE self UNUSED, VALUE str)
+  {
+      do_set((char_u *)STR2CSTR(str), 0);
+      update_screen(NOT_VALID);
+      return Qnil;
+  }
+  
+! static VALUE vim_command(VALUE self UNUSED, VALUE str)
+  {
+      do_cmdline_cmd((char_u *)STR2CSTR(str));
+      return Qnil;
+  }
+  
+! static VALUE vim_evaluate(VALUE self UNUSED, VALUE str)
+  {
+  #ifdef FEAT_EVAL
+      char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL, TRUE);
+***************
+*** 580,586 ****
+      return INT2NUM(n);
+  }
+  
+! static VALUE buffer_s_aref(VALUE self, VALUE num)
+  {
+      buf_T *b;
+      int n = NUM2INT(num);
+--- 580,586 ----
+      return INT2NUM(n);
+  }
+  
+! static VALUE buffer_s_aref(VALUE self UNUSED, VALUE num)
+  {
+      buf_T *b;
+      int n = NUM2INT(num);
+***************
+*** 629,635 ****
+--- 629,637 ----
+  	return line ? rb_str_new2(line) : Qnil;
+      }
+      rb_raise(rb_eIndexError, "index %d out of buffer", n);
++ #ifndef __GNUC__
+      return Qnil; /* For stop warning */
++ #endif
+  }
+  
+  static VALUE buffer_aref(VALUE self, VALUE num)
+***************
+*** 668,674 ****
+--- 670,678 ----
+      else
+      {
+  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
++ #ifndef __GNUC__
+  	return Qnil; /* For stop warning */
++ #endif
+      }
+      return str;
+  }
+***************
+*** 789,795 ****
+      return get_buffer_line(curbuf, curwin->w_cursor.lnum);
+  }
+  
+! static VALUE set_current_line(VALUE self, VALUE str)
+  {
+      return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
+  }
+--- 793,799 ----
+      return get_buffer_line(curbuf, curwin->w_cursor.lnum);
+  }
+  
+! static VALUE set_current_line(VALUE self UNUSED, VALUE str)
+  {
+      return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
+  }
+***************
+*** 815,821 ****
+  #endif
+  }
+  
+! static VALUE window_s_aref(VALUE self, VALUE num)
+  {
+      win_T *w;
+      int n = NUM2INT(num);
+--- 819,825 ----
+  #endif
+  }
+  
+! static VALUE window_s_aref(VALUE self UNUSED, VALUE num)
+  {
+      win_T *w;
+      int n = NUM2INT(num);
+***************
+*** 897,903 ****
+      return Qnil;
+  }
+  
+! static VALUE f_p(int argc, VALUE *argv, VALUE self)
+  {
+      int i;
+      VALUE str = rb_str_new("", 0);
+--- 901,907 ----
+      return Qnil;
+  }
+  
+! static VALUE f_p(int argc, VALUE *argv, VALUE self UNUSED)
+  {
+      int i;
+      VALUE str = rb_str_new("", 0);
+*** ../vim-7.2.184/src/version.c	2009-05-21 23:25:38.000000000 +0200
+--- src/version.c	2009-05-22 18:18:58.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     185,
+  /**/
+
+-- 
+BODY:        I'm not dead!
+CART DRIVER: 'Ere.  He says he's not dead.
+LARGE MAN:   Yes he is.
+BODY:        I'm not!
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.186 b/source/ap/vim/patches/7.2.186
new file mode 100644
index 000000000..c3710425d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.186
@@ -0,0 +1,331 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.186
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.186
+Problem:    Some more compiler warnings when using gcc -Wextra.
+Solution:   Now with the intended if_tcl.c changes.
+Files:	    src/if_tcl.c
+
+
+*** ../vim-7.2.185/src/if_tcl.c	2007-05-10 20:55:34.000000000 +0200
+--- src/if_tcl.c	2009-05-22 15:29:53.000000000 +0200
+***************
+*** 290,299 ****
+   */
+  #define TCL_EXIT	5
+  
+- /* ARGSUSED */
+      static int
+  exitcmd(dummy, interp, objc, objv)
+!     ClientData dummy;
+      Tcl_Interp *interp;
+      int objc;
+      Tcl_Obj *CONST objv[];
+--- 290,298 ----
+   */
+  #define TCL_EXIT	5
+  
+      static int
+  exitcmd(dummy, interp, objc, objv)
+!     ClientData dummy UNUSED;
+      Tcl_Interp *interp;
+      int objc;
+      Tcl_Obj *CONST objv[];
+***************
+*** 315,324 ****
+      return TCL_ERROR;
+  }
+  
+- /* ARGSUSED */
+      static int
+  catchcmd(dummy, interp, objc, objv)
+!     ClientData	dummy;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+--- 314,322 ----
+      return TCL_ERROR;
+  }
+  
+      static int
+  catchcmd(dummy, interp, objc, objv)
+!     ClientData	dummy UNUSED;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+***************
+*** 356,365 ****
+  /*
+   *  "::vim::beep" - what Vi[m] does best :-)
+   */
+- /* ARGSUSED */
+      static int
+  beepcmd(dummy, interp, objc, objv)
+!     ClientData dummy;
+      Tcl_Interp *interp;
+      int objc;
+      Tcl_Obj *CONST objv[];
+--- 354,362 ----
+  /*
+   *  "::vim::beep" - what Vi[m] does best :-)
+   */
+      static int
+  beepcmd(dummy, interp, objc, objv)
+!     ClientData dummy UNUSED;
+      Tcl_Interp *interp;
+      int objc;
+      Tcl_Obj *CONST objv[];
+***************
+*** 378,387 ****
+   *  "::vim::buffer {N}" - create buffer command for buffer N.
+   *  "::vim::buffer new" - create a new buffer (not implemented)
+   */
+- /* ARGSUSED */
+      static int
+  buffercmd(dummy, interp, objc, objv)
+!     ClientData dummy;
+      Tcl_Interp *interp;
+      int objc;
+      Tcl_Obj *CONST objv[];
+--- 375,383 ----
+   *  "::vim::buffer {N}" - create buffer command for buffer N.
+   *  "::vim::buffer new" - create a new buffer (not implemented)
+   */
+      static int
+  buffercmd(dummy, interp, objc, objv)
+!     ClientData dummy UNUSED;
+      Tcl_Interp *interp;
+      int objc;
+      Tcl_Obj *CONST objv[];
+***************
+*** 475,484 ****
+  /*
+   * "::vim::window list" - create list of window commands.
+   */
+- /* ARGSUSED */
+      static int
+  windowcmd(dummy, interp, objc, objv)
+!     ClientData	dummy;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+--- 471,479 ----
+  /*
+   * "::vim::window list" - create list of window commands.
+   */
+      static int
+  windowcmd(dummy, interp, objc, objv)
+!     ClientData	dummy UNUSED;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+***************
+*** 1130,1139 ****
+  }
+  
+  
+- /* ARGSUSED */
+      static int
+  commandcmd(dummy, interp, objc, objv)
+!     ClientData	dummy;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+--- 1125,1133 ----
+  }
+  
+  
+      static int
+  commandcmd(dummy, interp, objc, objv)
+!     ClientData	dummy UNUSED;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+***************
+*** 1145,1154 ****
+      return err;
+  }
+  
+- /* ARGSUSED */
+      static int
+  optioncmd(dummy, interp, objc, objv)
+!     ClientData	dummy;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+--- 1139,1147 ----
+      return err;
+  }
+  
+      static int
+  optioncmd(dummy, interp, objc, objv)
+!     ClientData	dummy UNUSED;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+***************
+*** 1160,1169 ****
+      return err;
+  }
+  
+- /* ARGSUSED */
+      static int
+  exprcmd(dummy, interp, objc, objv)
+!     ClientData	dummy;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+--- 1153,1161 ----
+      return err;
+  }
+  
+      static int
+  exprcmd(dummy, interp, objc, objv)
+!     ClientData	dummy UNUSED;
+      Tcl_Interp	*interp;
+      int		objc;
+      Tcl_Obj	*CONST objv[];
+***************
+*** 1584,1594 ****
+      I/O Channel
+  ********************************************/
+  
+- /* ARGSUSED */
+      static int
+  channel_close(instance, interp)
+      ClientData	instance;
+!     Tcl_Interp	*interp;
+  {
+      int		err = 0;
+  
+--- 1576,1585 ----
+      I/O Channel
+  ********************************************/
+  
+      static int
+  channel_close(instance, interp)
+      ClientData	instance;
+!     Tcl_Interp	*interp UNUSED;
+  {
+      int		err = 0;
+  
+***************
+*** 1602,1613 ****
+      return err;
+  }
+  
+- /* ARGSUSED */
+      static int
+  channel_input(instance, buf, bufsiz, errptr)
+!     ClientData	instance;
+!     char	*buf;
+!     int		bufsiz;
+      int		*errptr;
+  {
+  
+--- 1593,1603 ----
+      return err;
+  }
+  
+      static int
+  channel_input(instance, buf, bufsiz, errptr)
+!     ClientData	instance UNUSED;
+!     char	*buf UNUSED;
+!     int		bufsiz UNUSED;
+      int		*errptr;
+  {
+  
+***************
+*** 1659,1679 ****
+      return result;
+  }
+  
+- /* ARGSUSED */
+      static void
+  channel_watch(instance, mask)
+!     ClientData	instance;
+!     int		mask;
+  {
+      Tcl_SetErrno(EINVAL);
+  }
+  
+- /* ARGSUSED */
+      static int
+  channel_gethandle(instance, direction, handleptr)
+!     ClientData	instance;
+!     int		direction;
+!     ClientData	*handleptr;
+  {
+      Tcl_SetErrno(EINVAL);
+      return EINVAL;
+--- 1649,1667 ----
+      return result;
+  }
+  
+      static void
+  channel_watch(instance, mask)
+!     ClientData	instance UNUSED;
+!     int		mask UNUSED;
+  {
+      Tcl_SetErrno(EINVAL);
+  }
+  
+      static int
+  channel_gethandle(instance, direction, handleptr)
+!     ClientData	instance UNUSED;
+!     int		direction UNUSED;
+!     ClientData	*handleptr UNUSED;
+  {
+      Tcl_SetErrno(EINVAL);
+      return EINVAL;
+***************
+*** 1691,1697 ****
+      NULL,   /* set option */
+      NULL,   /* get option */
+      channel_watch,
+!     channel_gethandle
+  };
+  
+  /**********************************
+--- 1679,1692 ----
+      NULL,   /* set option */
+      NULL,   /* get option */
+      channel_watch,
+!     channel_gethandle,
+!     NULL,
+!     NULL,
+!     NULL,
+!     NULL,
+!     NULL,
+!     NULL,
+!     NULL
+  };
+  
+  /**********************************
+*** ../vim-7.2.185/src/version.c	2009-05-22 18:20:23.000000000 +0200
+--- src/version.c	2009-05-22 21:07:21.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     186,
+  /**/
+
+-- 
+ARTHUR: Old woman!
+DENNIS: Man!
+ARTHUR: Man.  I'm sorry.  Old man, What knight live in that castle over there?
+DENNIS: I'm thirty-seven.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.187 b/source/ap/vim/patches/7.2.187
new file mode 100644
index 000000000..13dfc9f18
--- /dev/null
+++ b/source/ap/vim/patches/7.2.187
@@ -0,0 +1,125 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.187
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.187 (after 7.2.186)
+Problem:    Doesn't build with older versions of TCL. (Yongwei Wu)
+Solution:   Add #ifdefs. (Dominique Pelle)
+Files:	    src/if_tcl.c
+
+
+*** ../vim-7.2.186/src/if_tcl.c	2009-05-22 21:07:45.000000000 +0200
+--- src/if_tcl.c	2009-05-23 14:23:51.000000000 +0200
+***************
+*** 161,167 ****
+  # endif
+  
+  /*
+!  * Declare HANDLE for perl.dll and function pointers.
+   */
+  static HANDLE hTclLib = NULL;
+  Tcl_Interp* (*dll_Tcl_CreateInterp)();
+--- 161,167 ----
+  # endif
+  
+  /*
+!  * Declare HANDLE for tcl.dll and function pointers.
+   */
+  static HANDLE hTclLib = NULL;
+  Tcl_Interp* (*dll_Tcl_CreateInterp)();
+***************
+*** 182,188 ****
+   * Make all runtime-links of tcl.
+   *
+   * 1. Get module handle using LoadLibraryEx.
+!  * 2. Get pointer to perl function by GetProcAddress.
+   * 3. Repeat 2, until get all functions will be used.
+   *
+   * Parameter 'libname' provides name of DLL.
+--- 182,188 ----
+   * Make all runtime-links of tcl.
+   *
+   * 1. Get module handle using LoadLibraryEx.
+!  * 2. Get pointer to tcl function by GetProcAddress.
+   * 3. Repeat 2, until get all functions will be used.
+   *
+   * Parameter 'libname' provides name of DLL.
+***************
+*** 1670,1692 ****
+  
+  static Tcl_ChannelType channel_type =
+  {
+!     "vimmessage",
+!     NULL,   /* blockmode */
+!     channel_close,
+!     channel_input,
+!     channel_output,
+!     NULL,   /* seek */
+!     NULL,   /* set option */
+!     NULL,   /* get option */
+!     channel_watch,
+!     channel_gethandle,
+!     NULL,
+!     NULL,
+!     NULL,
+!     NULL,
+!     NULL,
+!     NULL,
+!     NULL
+  };
+  
+  /**********************************
+--- 1670,1700 ----
+  
+  static Tcl_ChannelType channel_type =
+  {
+!     "vimmessage",	/* typeName */
+!     NULL,		/* version */
+!     channel_close,	/* closeProc */
+!     channel_input,	/* inputProc */
+!     channel_output,	/* outputProc */
+!     NULL,		/* seekProc */
+!     NULL,		/* setOptionProc */
+!     NULL,		/* getOptionProc */
+!     channel_watch,	/* watchProc */
+!     channel_gethandle,	/* getHandleProc */
+!     NULL,		/* close2Proc */
+!     NULL,		/* blockModeProc */
+! #ifdef TCL_CHANNEL_VERSION_2
+!     NULL,		/* flushProc */
+!     NULL,		/* handlerProc */
+! #endif
+! #ifdef TCL_CHANNEL_VERSION_3
+!     NULL,		/* wideSeekProc */
+! #endif
+! #ifdef TCL_CHANNEL_VERSION_4
+!     NULL,		/* threadActionProc */
+! #endif
+! #ifdef TCL_CHANNEL_VERSION_5
+!     NULL		/* truncateProc */
+! #endif
+  };
+  
+  /**********************************
+*** ../vim-7.2.186/src/version.c	2009-05-22 21:07:45.000000000 +0200
+--- src/version.c	2009-05-23 14:25:04.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     187,
+  /**/
+
+-- 
+Friends?  I have lots of friends!  In fact, I have every episode ever made.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.188 b/source/ap/vim/patches/7.2.188
new file mode 100644
index 000000000..1aa527dac
--- /dev/null
+++ b/source/ap/vim/patches/7.2.188
@@ -0,0 +1,278 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.188
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.188
+Problem:    Crash with specific use of function calls. (Meikel Brandmeyer)
+Solution:   Make sure the items referenced by a function call are not freed
+	    twice.  (based on patch from Nico Weber)
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.187/src/eval.c	2009-05-16 17:29:37.000000000 +0200
+--- src/eval.c	2009-05-22 20:04:22.000000000 +0200
+***************
+*** 129,136 ****
+--- 129,139 ----
+  /*
+   * When recursively copying lists and dicts we need to remember which ones we
+   * have done to avoid endless recursiveness.  This unique ID is used for that.
++  * The last bit is used for previous_funccal, ignored when comparing.
+   */
+  static int current_copyID = 0;
++ #define COPYID_INC 2
++ #define COPYID_MASK (~0x1)
+  
+  /*
+   * Array to hold the hashtab with variables local to each sourced script.
+***************
+*** 439,444 ****
+--- 442,448 ----
+  static void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
+  static char_u *list2string __ARGS((typval_T *tv, int copyID));
+  static int list_join __ARGS((garray_T *gap, list_T *l, char_u *sep, int echo, int copyID));
++ static int free_unref_items __ARGS((int copyID));
+  static void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));
+  static void set_ref_in_list __ARGS((list_T *l, int copyID));
+  static void set_ref_in_item __ARGS((typval_T *tv, int copyID));
+***************
+*** 6494,6507 ****
+      int
+  garbage_collect()
+  {
+!     dict_T	*dd;
+!     list_T	*ll;
+!     int		copyID = ++current_copyID;
+      buf_T	*buf;
+      win_T	*wp;
+      int		i;
+      funccall_T	*fc, **pfc;
+!     int		did_free = FALSE;
+  #ifdef FEAT_WINDOWS
+      tabpage_T	*tp;
+  #endif
+--- 6498,6510 ----
+      int
+  garbage_collect()
+  {
+!     int		copyID;
+      buf_T	*buf;
+      win_T	*wp;
+      int		i;
+      funccall_T	*fc, **pfc;
+!     int		did_free;
+!     int		did_free_funccal = FALSE;
+  #ifdef FEAT_WINDOWS
+      tabpage_T	*tp;
+  #endif
+***************
+*** 6511,6520 ****
+--- 6514,6538 ----
+      may_garbage_collect = FALSE;
+      garbage_collect_at_exit = FALSE;
+  
++     /* We advance by two because we add one for items referenced through
++      * previous_funccal. */
++     current_copyID += COPYID_INC;
++     copyID = current_copyID;
++ 
+      /*
+       * 1. Go through all accessible variables and mark all lists and dicts
+       *    with copyID.
+       */
++ 
++     /* Don't free variables in the previous_funccal list unless they are only
++      * referenced through previous_funccal.  This must be first, because if
++      * the item is referenced elsewhere it must not be freed. */
++     for (fc = previous_funccal; fc != NULL; fc = fc->caller)
++     {
++ 	set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1);
++ 	set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID + 1);
++     }
++ 
+      /* script-local variables */
+      for (i = 1; i <= ga_scripts.ga_len; ++i)
+  	set_ref_in_ht(&SCRIPT_VARS(i), copyID);
+***************
+*** 6546,6556 ****
+      /* v: vars */
+      set_ref_in_ht(&vimvarht, copyID);
+  
+      /*
+!      * 2. Go through the list of dicts and free items without the copyID.
+       */
+      for (dd = first_dict; dd != NULL; )
+! 	if (dd->dv_copyID != copyID)
+  	{
+  	    /* Free the Dictionary and ordinary items it contains, but don't
+  	     * recurse into Lists and Dictionaries, they will be in the list
+--- 6564,6610 ----
+      /* v: vars */
+      set_ref_in_ht(&vimvarht, copyID);
+  
++     /* Free lists and dictionaries that are not referenced. */
++     did_free = free_unref_items(copyID);
++ 
++     /* check if any funccal can be freed now */
++     for (pfc = &previous_funccal; *pfc != NULL; )
++     {
++ 	if (can_free_funccal(*pfc, copyID))
++ 	{
++ 	    fc = *pfc;
++ 	    *pfc = fc->caller;
++ 	    free_funccal(fc, TRUE);
++ 	    did_free = TRUE;
++ 	    did_free_funccal = TRUE;
++ 	}
++ 	else
++ 	    pfc = &(*pfc)->caller;
++     }
++     if (did_free_funccal)
++ 	/* When a funccal was freed some more items might be garbage
++ 	 * collected, so run again. */
++ 	(void)garbage_collect();
++ 
++     return did_free;
++ }
++ 
++ /*
++  * Free lists and dictionaries that are no longer referenced.
++  */
++     static int
++ free_unref_items(copyID)
++     int copyID;
++ {
++     dict_T	*dd;
++     list_T	*ll;
++     int		did_free = FALSE;
++ 
+      /*
+!      * Go through the list of dicts and free items without the copyID.
+       */
+      for (dd = first_dict; dd != NULL; )
+! 	if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
+  	{
+  	    /* Free the Dictionary and ordinary items it contains, but don't
+  	     * recurse into Lists and Dictionaries, they will be in the list
+***************
+*** 6565,6576 ****
+  	    dd = dd->dv_used_next;
+  
+      /*
+!      * 3. Go through the list of lists and free items without the copyID.
+!      *    But don't free a list that has a watcher (used in a for loop), these
+!      *    are not referenced anywhere.
+       */
+      for (ll = first_list; ll != NULL; )
+! 	if (ll->lv_copyID != copyID && ll->lv_watch == NULL)
+  	{
+  	    /* Free the List and ordinary items it contains, but don't recurse
+  	     * into Lists and Dictionaries, they will be in the list of dicts
+--- 6619,6631 ----
+  	    dd = dd->dv_used_next;
+  
+      /*
+!      * Go through the list of lists and free items without the copyID.
+!      * But don't free a list that has a watcher (used in a for loop), these
+!      * are not referenced anywhere.
+       */
+      for (ll = first_list; ll != NULL; )
+! 	if ((ll->lv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)
+! 						      && ll->lv_watch == NULL)
+  	{
+  	    /* Free the List and ordinary items it contains, but don't recurse
+  	     * into Lists and Dictionaries, they will be in the list of dicts
+***************
+*** 6584,6603 ****
+  	else
+  	    ll = ll->lv_used_next;
+  
+-     /* check if any funccal can be freed now */
+-     for (pfc = &previous_funccal; *pfc != NULL; )
+-     {
+- 	if (can_free_funccal(*pfc, copyID))
+- 	{
+- 	    fc = *pfc;
+- 	    *pfc = fc->caller;
+- 	    free_funccal(fc, TRUE);
+- 	    did_free = TRUE;
+- 	}
+- 	else
+- 	    pfc = &(*pfc)->caller;
+-     }
+- 
+      return did_free;
+  }
+  
+--- 6639,6644 ----
+***************
+*** 18842,18847 ****
+--- 18883,18889 ----
+  {
+      hash_init(&dict->dv_hashtab);
+      dict->dv_refcount = DO_NOT_FREE_CNT;
++     dict->dv_copyID = 0;
+      dict_var->di_tv.vval.v_dict = dict;
+      dict_var->di_tv.v_type = VAR_DICT;
+      dict_var->di_tv.v_lock = VAR_FIXED;
+***************
+*** 21294,21301 ****
+      current_funccal = fc->caller;
+      --depth;
+  
+!     /* if the a:000 list and the a: dict are not referenced we can free the
+!      * funccall_T and what's in it. */
+      if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
+  	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
+  	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
+--- 21336,21343 ----
+      current_funccal = fc->caller;
+      --depth;
+  
+!     /* If the a:000 list and the l: and a: dicts are not referenced we can
+!      * free the funccall_T and what's in it. */
+      if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
+  	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
+  	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
+***************
+*** 21334,21340 ****
+  
+  /*
+   * Return TRUE if items in "fc" do not have "copyID".  That means they are not
+!  * referenced from anywhere.
+   */
+      static int
+  can_free_funccal(fc, copyID)
+--- 21376,21382 ----
+  
+  /*
+   * Return TRUE if items in "fc" do not have "copyID".  That means they are not
+!  * referenced from anywhere that is in use.
+   */
+      static int
+  can_free_funccal(fc, copyID)
+*** ../vim-7.2.187/src/version.c	2009-05-23 14:27:43.000000000 +0200
+--- src/version.c	2009-05-24 13:20:49.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     188,
+  /**/
+
+-- 
+ARTHUR:    ... and I am your king ....
+OLD WOMAN: Ooooh!  I didn't know we had a king.  I thought we were an
+           autonomous collective ...
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.189 b/source/ap/vim/patches/7.2.189
new file mode 100644
index 000000000..c8ad9addb
--- /dev/null
+++ b/source/ap/vim/patches/7.2.189
@@ -0,0 +1,86 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.189
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.189
+Problem:    Possible hang for deleting auto-indent. (Dominique Pelle)
+Solution:   Make sure the position is not beyond the end of the line.
+Files:	    src/edit.c
+
+
+*** ../vim-7.2.188/src/edit.c	2009-05-16 16:36:25.000000000 +0200
+--- src/edit.c	2009-05-26 10:53:05.000000000 +0200
+***************
+*** 6420,6432 ****
+  
+  	/* If we just did an auto-indent, remove the white space from the end
+  	 * of the line, and put the cursor back.
+! 	 * Do this when ESC was used or moving the cursor up/down. */
+  	if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
+! 			&& curwin->w_cursor.lnum != end_insert_pos->lnum)))
+  	{
+  	    pos_T	tpos = curwin->w_cursor;
+  
+  	    curwin->w_cursor = *end_insert_pos;
+  	    for (;;)
+  	    {
+  		if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
+--- 6420,6436 ----
+  
+  	/* If we just did an auto-indent, remove the white space from the end
+  	 * of the line, and put the cursor back.
+! 	 * Do this when ESC was used or moving the cursor up/down.
+! 	 * Check for the old position still being valid, just in case the text
+! 	 * got changed unexpectedly. */
+  	if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
+! 			&& curwin->w_cursor.lnum != end_insert_pos->lnum))
+! 		&& end_insert_pos->lnum <= curbuf->b_ml.ml_line_count)
+  	{
+  	    pos_T	tpos = curwin->w_cursor;
+  
+  	    curwin->w_cursor = *end_insert_pos;
++ 	    check_cursor_col();  /* make sure it is not past the line */
+  	    for (;;)
+  	    {
+  		if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
+***************
+*** 6434,6440 ****
+  		cc = gchar_cursor();
+  		if (!vim_iswhite(cc))
+  		    break;
+! 		(void)del_char(TRUE);
+  	    }
+  	    if (curwin->w_cursor.lnum != tpos.lnum)
+  		curwin->w_cursor = tpos;
+--- 6438,6445 ----
+  		cc = gchar_cursor();
+  		if (!vim_iswhite(cc))
+  		    break;
+! 		if (del_char(TRUE) == FAIL)
+! 		    break;  /* should not happen */
+  	    }
+  	    if (curwin->w_cursor.lnum != tpos.lnum)
+  		curwin->w_cursor = tpos;
+*** ../vim-7.2.188/src/version.c	2009-05-24 13:40:17.000000000 +0200
+--- src/version.c	2009-05-26 10:50:53.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     189,
+  /**/
+
+-- 
+FIRST VILLAGER: We have found a witch.  May we burn her?
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.190 b/source/ap/vim/patches/7.2.190
new file mode 100644
index 000000000..2a0aee98e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.190
@@ -0,0 +1,182 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.190
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.190
+Problem:    The register executed by @@ isn't restored.
+Solution:   Mark the executable register in the viminfo file.
+Files:	    src/ops.c
+
+
+*** ../vim-7.2.189/src/ops.c	2009-05-13 12:46:36.000000000 +0200
+--- src/ops.c	2009-05-26 18:05:23.000000000 +0200
+***************
+*** 1143,1148 ****
+--- 1143,1150 ----
+      return OK;
+  }
+  
++ static int execreg_lastc = NUL;
++ 
+  /*
+   * execute a yank register: copy it into the stuff buffer
+   *
+***************
+*** 1155,1161 ****
+      int	    addcr;		/* always add '\n' to end of line */
+      int	    silent;		/* set "silent" flag in typeahead buffer */
+  {
+-     static int	lastc = NUL;
+      long	i;
+      char_u	*p;
+      int		retval = OK;
+--- 1157,1162 ----
+***************
+*** 1163,1174 ****
+  
+      if (regname == '@')			/* repeat previous one */
+      {
+! 	if (lastc == NUL)
+  	{
+  	    EMSG(_("E748: No previously used register"));
+  	    return FAIL;
+  	}
+! 	regname = lastc;
+      }
+  					/* check for valid regname */
+      if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE))
+--- 1164,1175 ----
+  
+      if (regname == '@')			/* repeat previous one */
+      {
+! 	if (execreg_lastc == NUL)
+  	{
+  	    EMSG(_("E748: No previously used register"));
+  	    return FAIL;
+  	}
+! 	regname = execreg_lastc;
+      }
+  					/* check for valid regname */
+      if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE))
+***************
+*** 1176,1182 ****
+  	emsg_invreg(regname);
+  	return FAIL;
+      }
+!     lastc = regname;
+  
+  #ifdef FEAT_CLIPBOARD
+      regname = may_get_selection(regname);
+--- 1177,1183 ----
+  	emsg_invreg(regname);
+  	return FAIL;
+      }
+!     execreg_lastc = regname;
+  
+  #ifdef FEAT_CLIPBOARD
+      regname = may_get_selection(regname);
+***************
+*** 5337,5347 ****
+--- 5338,5351 ----
+  
+      /* We only get here (hopefully) if line[0] == '"' */
+      str = virp->vir_line + 1;
++ 
++     /* If the line starts with "" this is the y_previous register. */
+      if (*str == '"')
+      {
+  	set_prev = TRUE;
+  	str++;
+      }
++ 
+      if (!ASCII_ISALNUM(*str) && *str != '-')
+      {
+  	if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line))
+***************
+*** 5351,5356 ****
+--- 5355,5368 ----
+      get_yank_register(*str++, FALSE);
+      if (!force && y_current->y_array != NULL)
+  	do_it = FALSE;
++ 
++     if (*str == '@')
++     {
++ 	/* "x@: register x used for @@ */
++ 	if (force || execreg_lastc == NUL)
++ 	    execreg_lastc = str[-1];
++     }
++ 
+      size = 0;
+      limit = 100;	/* Optimized for registers containing <= 100 lines */
+      if (do_it)
+***************
+*** 5360,5366 ****
+  	vim_free(y_current->y_array);
+  	array = y_current->y_array =
+  		       (char_u **)alloc((unsigned)(limit * sizeof(char_u *)));
+! 	str = skipwhite(str);
+  	if (STRNCMP(str, "CHAR", 4) == 0)
+  	    y_current->y_type = MCHAR;
+  #ifdef FEAT_VISUAL
+--- 5372,5378 ----
+  	vim_free(y_current->y_array);
+  	array = y_current->y_array =
+  		       (char_u **)alloc((unsigned)(limit * sizeof(char_u *)));
+! 	str = skipwhite(skiptowhite(str));
+  	if (STRNCMP(str, "CHAR", 4) == 0)
+  	    y_current->y_type = MCHAR;
+  #ifdef FEAT_VISUAL
+***************
+*** 5443,5448 ****
+--- 5455,5461 ----
+      max_kbyte = get_viminfo_parameter('s');
+      if (max_kbyte == 0)
+  	return;
++ 
+      for (i = 0; i < NUM_REGISTERS; i++)
+      {
+  	if (y_regs[i].y_array == NULL)
+***************
+*** 5497,5503 ****
+  	if (y_previous == &y_regs[i])
+  	    fprintf(fp, "\"");
+  	c = get_register_name(i);
+! 	fprintf(fp, "\"%c\t%s\t%d\n", c, type,
+  #ifdef FEAT_VISUAL
+  		    (int)y_regs[i].y_width
+  #else
+--- 5510,5519 ----
+  	if (y_previous == &y_regs[i])
+  	    fprintf(fp, "\"");
+  	c = get_register_name(i);
+! 	fprintf(fp, "\"%c", c);
+! 	if (c == execreg_lastc)
+! 	    fprintf(fp, "@");
+! 	fprintf(fp, "\t%s\t%d\n", type,
+  #ifdef FEAT_VISUAL
+  		    (int)y_regs[i].y_width
+  #else
+*** ../vim-7.2.189/src/version.c	2009-05-26 11:01:43.000000000 +0200
+--- src/version.c	2009-05-26 18:10:13.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     190,
+  /**/
+
+-- 
+If you had to identify, in one word, the reason why the
+human race has not achieved, and never will achieve, its
+full potential, that word would be "meetings."
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.191 b/source/ap/vim/patches/7.2.191
new file mode 100644
index 000000000..f9c33571d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.191
@@ -0,0 +1,3705 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.191
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.191
+Problem:    Mzscheme interface doesn't work on Ubuntu.
+Solution:   Change autoconf rules.  Define missing macro.  Some changes to
+	    avoid gcc warnings.  Remove per-buffer namespace. (Sergey Khorev)
+Files:	    runtime/doc/if_mzsch.txt, src/Makefile, src/Make_ming.mak,
+	    src/Make_mvc.mak, src/auto/configure, src/configure.in,
+	    src/config.mk.in, src/eval.c, src/if_mzsch.c, src/if_mzsch.h,
+	    src/main.c, src/proto/if_mzsch.pro
+
+
+*** ../vim-7.2.190/runtime/doc/if_mzsch.txt	2008-08-09 19:36:48.000000000 +0200
+--- runtime/doc/if_mzsch.txt	2009-05-26 18:49:53.000000000 +0200
+***************
+*** 1,4 ****
+! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
+  
+  
+  		  VIM REFERENCE MANUAL    by Sergey Khorev
+--- 1,4 ----
+! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 May 26
+  
+  
+  		  VIM REFERENCE MANUAL    by Sergey Khorev
+***************
+*** 42,51 ****
+  
+  							*:mzfile* *:mzf*
+  :[range]mzf[ile] {file}	Execute the MzScheme script in {file}.  {not in Vi}
+- 			All statements are executed in the namespace of the
+- 			buffer that was current during :mzfile start.
+- 			If you want to access other namespaces, use
+- 			'parameterize'.
+  
+  All of these commands do essentially the same thing - they execute a piece of
+  MzScheme code, with the "current range" set to the given line
+--- 42,47 ----
+***************
+*** 54,61 ****
+  In the case of :mzscheme, the code to execute is in the command-line.
+  In the case of :mzfile, the code to execute is the contents of the given file.
+  
+- Each buffer has its own MzScheme namespace. Global namespace is bound to
+- the "global-namespace" value from the 'vimext' module.
+  MzScheme interface defines exception exn:vim, derived from exn.
+  It is raised for various Vim errors.
+  
+--- 50,55 ----
+***************
+*** 79,118 ****
+  e.g.: >
+  	:mzscheme (require (prefix vim- vimext))
+  <
+! All the examples below assume this naming scheme.  Note that you need to do
+! this again for every buffer.
+  
+- The auto-instantiation can be achieved with autocommands, e.g. you can put
+- something like this in your .vimrc (EOFs should not have indentation): >
+-     function s:MzRequire()
+- 	if has("mzscheme")
+- 	    :mz << EOF
+- 	    (require (prefix vim- vimext))
+- 	    (let ((buf (vim-get-buff-by-name (vim-eval "expand(\"<afile>\")"))))
+- 	      (when (and buf (not (eq? buf (vim-curr-buff))))
+- 		(parameterize ((current-namespace (vim-get-buff-namespace buf)))
+- 		  (namespace-attach-module vim-global-namespace 'vimext)
+- 		  (namespace-require '(prefix vim vimext)))))
+-     EOF
+- 	endif
+-     endfunction
+- 
+-     function s:MzStartup()
+- 	if has("mzscheme")
+- 	    au BufNew,BufNewFile,BufAdd,BufReadPre * :call s:MzRequire()
+- 	    :mz << EOF
+- 	    (current-library-collection-paths
+- 		(cons
+- 		    (build-path (find-system-path 'addon-dir) (version) "collects")
+- 		    (current-library-collection-paths)))
+-     EOF
+- 	endif
+-     endfunction
+- 
+-     call s:MzStartup()
+- <
+- 
+- The global namespace just instantiated this module with the prefix "vimext:".
+  							*mzscheme-sandbox*
+  When executed in the |sandbox|, access to some filesystem and Vim interface
+  procedures is restricted.
+--- 73,80 ----
+  e.g.: >
+  	:mzscheme (require (prefix vim- vimext))
+  <
+! All the examples below assume this naming scheme. 
+  
+  							*mzscheme-sandbox*
+  When executed in the |sandbox|, access to some filesystem and Vim interface
+  procedures is restricted.
+***************
+*** 121,135 ****
+  2. Examples						*mzscheme-examples*
+  >
+  	:mzscheme (display "Hello")
+  	:mzscheme (vim-set-buff-line 10 "This is line #10")
+  <
+  Inline script usage: >
+  	function! <SID>SetFirstLine()
+  	    :mz << EOF
+  	    (display "!!!")
+  	    (vim-set-buff-line 1 "This is line #1")
+  	    (vim-beep)
+! 	    EOF
+  	endfunction
+  
+  	nmap <F9> :call <SID>SetFirstLine() <CR>
+--- 83,102 ----
+  2. Examples						*mzscheme-examples*
+  >
+  	:mzscheme (display "Hello")
++ 	:mz (display (string-append "Using MzScheme version " (version)))
++ 	:mzscheme (require (prefix vim- vimext)) ; for MzScheme < 4.x
++ 	:mzscheme (require (prefix-in vim- 'vimext)) ; MzScheme 4.x
+  	:mzscheme (vim-set-buff-line 10 "This is line #10")
+  <
+  Inline script usage: >
+  	function! <SID>SetFirstLine()
+  	    :mz << EOF
+  	    (display "!!!")
++ 	    (require (prefix vim- vimext))
++ 	    ; for newer versions (require (prefix-in vim- 'vimext))
+  	    (vim-set-buff-line 1 "This is line #1")
+  	    (vim-beep)
+! 	EOF
+  	endfunction
+  
+  	nmap <F9> :call <SID>SetFirstLine() <CR>
+***************
+*** 137,153 ****
+  File execution: >
+  	:mzfile supascript.scm
+  <
+! Accessing the current buffer namespace from an MzScheme program running in
+! another buffer within |:mzfile|-executed script : >
+! 	; Move to the window below
+! 	(vim-command "wincmd j")
+! 	; execute in the context of buffer, to which window belongs
+! 	; assume that buffer has 'textstring' defined
+! 	(parameterize ((current-namespace
+! 			(vim-get-buff-namespace (vim-curr-buff))))
+! 	 (eval '(vim-set-buff-line 1 textstring)))
+! <
+  
+  ==============================================================================
+  3. Threads						*mzscheme-threads*
+  
+--- 104,136 ----
+  File execution: >
+  	:mzfile supascript.scm
+  <
+! Vim exception handling: >
+! 	:mz << EOF
+! 	(require (prefix vim- vimext))
+! 	; for newer versions (require (prefix-in vim- 'vimext))
+! 	(with-handlers
+! 	  ([exn:vim? (lambda (e) (display (exn-message e)))])
+! 	  (vim-eval "nonsense-string"))
+! 	EOF
+! <
+! Auto-instantiation of vimext module (can be placed in your |vimrc|): >
+!     function! MzRequire()
+! 	:redir => l:mzversion
+! 	:mz (version)
+! 	:redir END
+! 	if strpart(l:mzversion, 1, 1) < "4"
+! 	    " MzScheme versions < 4.x:
+! 	    :mz (require (prefix vim- vimext))
+! 	else
+! 	    " newer versions:
+! 	    :mz (require (prefix-in vim- 'vimext))
+! 	endif
+!     endfunction
+  
++     if has("mzscheme")
++ 	silent call MzRequire()
++     endif
++ <
+  ==============================================================================
+  3. Threads						*mzscheme-threads*
+  
+***************
+*** 168,178 ****
+  Common
+  ------
+      (command {command-string})	    Perform the vim ":Ex" style command.
+!     (eval {expr-string})	    Evaluate the vim expression to a string.
+! 				    A |List| is turned into a string by
+! 				    joining the items and inserting line
+! 				    breaks.
+! 				    NOTE clashes with MzScheme eval
+      (range-start)		    Start/End of the range passed with
+      (range-end)			    the Scheme command.
+      (beep)			    beep
+--- 151,161 ----
+  Common
+  ------
+      (command {command-string})	    Perform the vim ":Ex" style command.
+!     (eval {expr-string})	    Evaluate the vim expression into
+! 				    respective MzScheme object: |Lists| are
+! 				    represented as Scheme lists,
+! 				    |Dictionaries| as hash tables.
+! 				    NOTE the name clashes with MzScheme eval
+      (range-start)		    Start/End of the range passed with
+      (range-end)			    the Scheme command.
+      (beep)			    beep
+***************
+*** 186,192 ****
+  				    be set. The symbol 'global can be passed
+  				    as {buffer-or-window}. Then |:setglobal|
+  				    will be used.
+-     global-namespace		    The MzScheme main namespace.
+  
+  Buffers							 *mzscheme-buffer*
+  -------
+--- 169,174 ----
+***************
+*** 228,234 ****
+  					if there is no such buffer.
+      (get-buff-by-num {buffernum})   Get a buffer by its number (return #f if
+  				    there is no buffer with this number).
+-     (get-buff-namespace [buffer])   Get buffer namespace.
+  
+  Windows							    *mzscheme-window*
+  ------
+--- 210,215 ----
+***************
+*** 250,256 ****
+      (set-cursor (line . col) [window])  Set cursor position.
+  
+  ==============================================================================
+! 5. Dynamic loading					*mzscheme-dynamic*
+  
+  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
+  output then includes |+mzscheme/dyn|.
+--- 231,237 ----
+      (set-cursor (line . col) [window])  Set cursor position.
+  
+  ==============================================================================
+! 5. Dynamic loading				    *mzscheme-dynamic* *E812*
+  
+  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
+  output then includes |+mzscheme/dyn|.
+*** ../vim-7.2.190/src/Makefile	2009-05-26 18:12:19.000000000 +0200
+--- src/Makefile	2009-05-26 22:54:48.000000000 +0200
+***************
+*** 536,542 ****
+  # Use this with GCC to check for mistakes, unused arguments, etc.
+  #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
+  #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
+! #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code
+  
+  # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond
+  # allocated memory (and makes every malloc()/free() very slow).
+--- 536,542 ----
+  # Use this with GCC to check for mistakes, unused arguments, etc.
+  #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
+  #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
+! #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
+  
+  # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond
+  # allocated memory (and makes every malloc()/free() very slow).
+***************
+*** 2200,2205 ****
+--- 2200,2206 ----
+  	-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c
+  	-rm -f conftest* *~ auto/link.sed
+  	-rm -rf $(APPDIR)
++ 	-rm -rf mzscheme_base.c
+  	if test -d $(PODIR); then \
+  		cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \
+  	fi
+***************
+*** 2433,2440 ****
+  objects/if_xcmdsrv.o: if_xcmdsrv.c
+  	$(CCC) -o $@ if_xcmdsrv.c
+  
+! objects/if_mzsch.o: if_mzsch.c
+  	$(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c
+  
+  objects/if_perl.o: auto/if_perl.c
+  	$(CCC) -o $@ auto/if_perl.c
+--- 2434,2444 ----
+  objects/if_xcmdsrv.o: if_xcmdsrv.c
+  	$(CCC) -o $@ if_xcmdsrv.c
+  
+! objects/if_mzsch.o: if_mzsch.c $(MZSCHEME_EXTRA)
+  	$(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c
++  
++ mzscheme_base.c:
++ 	$(MZSCHEME_MZC) --c-mods mzscheme_base.c ++lib scheme/base
+  
+  objects/if_perl.o: auto/if_perl.c
+  	$(CCC) -o $@ auto/if_perl.c
+*** ../vim-7.2.190/src/Make_ming.mak	2007-08-12 15:24:29.000000000 +0200
+--- src/Make_ming.mak	2009-05-26 18:54:15.000000000 +0200
+***************
+*** 115,122 ****
+--- 115,135 ----
+  MZSCHEME_VER=205_000
+  endif
+  
++ ifndef MZSCHEME_PRECISE_GC
++ MZSCHEME_PRECISE_GC=no
++ endif
++ 
++ # for version 4.x we need to generate byte-code for Scheme base
++ ifndef MZSCHEME_GENERATE_BASE
++ MZSCHEME_GENERATE_BASE=no
++ endif
++ 
+  ifeq (no,$(DYNAMIC_MZSCHEME))
++ ifeq (yes,$(MZSCHEME_PRECISE_GC))
++ MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
++ else
+  MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
++ endif
+  # the modern MinGW can dynamically link to dlls directly.
+  # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
+  ifndef MZSCHEME_DLLS
+***************
+*** 410,415 ****
+--- 423,435 ----
+  ifdef MZSCHEME
+  OBJ += $(OUTDIR)/if_mzsch.o
+  MZSCHEME_INCL = if_mzsch.h
++ ifeq (yes,$(MZSCHEME_GENERATE_BASE))
++ CFLAGS += -DINCLUDE_MZSCHEME_BASE
++ MZ_EXTRA_DEP += mzscheme_base.c
++ endif
++ ifeq (yes,$(MZSCHEME_PRECISE_GC))
++ CFLAGS += -DMZ_PRECISE_GC
++ endif
+  endif
+  ifdef PYTHON
+  OBJ += $(OUTDIR)/if_python.o
+***************
+*** 588,593 ****
+--- 608,619 ----
+  $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
+  	$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
+  
++ $(OUTDIR)/if_mzsch.o:	if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
++ 	$(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
++ 
++ mzscheme_base.c:
++ 	$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
++ 
+  pathdef.c: $(INCL)
+  ifneq (sh.exe, $(SHELL))
+  	@echo creating pathdef.c
+*** ../vim-7.2.190/src/Make_mvc.mak	2009-02-04 18:34:54.000000000 +0100
+--- src/Make_mvc.mak	2009-05-26 18:54:51.000000000 +0200
+***************
+*** 34,39 ****
+--- 34,40 ----
+  #	  MZSCHEME=[Path to MzScheme directory]
+  #	  DYNAMIC_MZSCHEME=yes (to load the MzScheme DLLs dynamically)
+  #	  MZSCHEME_VER=[version, 205_000, ...]
++ #	  MZSCHEME_DEBUG=no
+  #
+  #	Perl interface:
+  #	  PERL=[Path to Perl directory]
+***************
+*** 621,635 ****
+--- 622,658 ----
+  MZSCHEME_VER = 205_000
+  !endif
+  CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
++ !if EXIST("$(MZSCHEME)\collects\scheme\base.ss")
++ # for MzScheme 4.x we need to include byte code for basic Scheme stuff
++ MZSCHEME_EXTRA_DEP = mzscheme_base.c
++ CFLAGS = $(CFLAGS) -DINCLUDE_MZSCHEME_BASE
++ !endif
++ !if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib") \
++ 	&& !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib")
++ !message Building with Precise GC
++ MZSCHEME_PRECISE_GC = yes
++ CFLAGS = $(CFLAGS) -DMZ_PRECISE_GC
++ !endif
+  !if "$(DYNAMIC_MZSCHEME)" == "yes"
++ !if "$(MZSCHEME_PRECISE_GC)" == "yes"
++ !error MzScheme with Precise GC cannot be loaded dynamically
++ !endif
+  !message MzScheme DLLs will be loaded dynamically
+  CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \
+  		-DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" \
+  		-DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+  !else
++ !if "$(MZSCHEME_DEBUG)" == "yes"
++ CFLAGS = $(CFLAGS) -DMZSCHEME_FORCE_GC
++ !endif
++ !if "$(MZSCHEME_PRECISE_GC)" == "yes"
++ # Precise GC does not use separate dll
++ MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
++ !else
+  MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \
+  		$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
+  !endif
++ !endif
+  MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
+  !endif
+  
+***************
+*** 930,938 ****
+  $(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c  $(INCL)
+  	$(CC) $(CFLAGS) $(PERL_INC) if_perlsfio.c
+  
+! $(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c  $(INCL)
+  	$(CC) $(CFLAGS) if_mzsch.c \
+  		-DMZSCHEME_COLLECTS=\"$(MZSCHEME:\=\\)\\collects\"
+  
+  $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c  $(INCL)
+  	$(CC) $(CFLAGS) $(PYTHON_INC) if_python.c
+--- 953,963 ----
+  $(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c  $(INCL)
+  	$(CC) $(CFLAGS) $(PERL_INC) if_perlsfio.c
+  
+! $(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c  $(INCL) $(MZSCHEME_EXTRA_DEP)
+  	$(CC) $(CFLAGS) if_mzsch.c \
+  		-DMZSCHEME_COLLECTS=\"$(MZSCHEME:\=\\)\\collects\"
++ mzscheme_base.c:
++ 	$(MZSCHEME)\mzc --c-mods mzscheme_base.c ++lib scheme/base
+  
+  $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c  $(INCL)
+  	$(CC) $(CFLAGS) $(PYTHON_INC) if_python.c
+*** ../vim-7.2.190/src/auto/configure	2009-05-21 23:25:38.000000000 +0200
+--- src/auto/configure	2009-05-26 19:12:29.000000000 +0200
+***************
+*** 701,706 ****
+--- 701,708 ----
+  shrpenv
+  vi_cv_perllib
+  vi_cv_path_perl
++ MZSCHEME_MZC
++ MZSCHEME_EXTRA
+  MZSCHEME_CFLAGS
+  MZSCHEME_LIBS
+  MZSCHEME_PRO
+***************
+*** 4641,4648 ****
+  $as_echo "\"$PLTHOME\"" >&6; }
+  	vi_cv_path_mzscheme_pfx="$PLTHOME"
+      else
+! 	{ $as_echo "$as_me:$LINENO: result: \"not set\"" >&5
+! $as_echo "\"not set\"" >&6; }
+  		# Extract the first word of "mzscheme", so it can be a program name with args.
+  set dummy mzscheme; ac_word=$2
+  { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+--- 4643,4650 ----
+  $as_echo "\"$PLTHOME\"" >&6; }
+  	vi_cv_path_mzscheme_pfx="$PLTHOME"
+      else
+! 	{ $as_echo "$as_me:$LINENO: result: not set" >&5
+! $as_echo "not set" >&6; }
+  		# Extract the first word of "mzscheme", so it can be a program name with args.
+  set dummy mzscheme; ac_word=$2
+  { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+***************
+*** 4697,4712 ****
+  if test "${vi_cv_path_mzscheme_pfx+set}" = set; then
+    $as_echo_n "(cached) " >&6
+  else
+!    vi_cv_path_mzscheme_pfx=`
+! 	    ${vi_cv_path_mzscheme} -evm \
+! 	    "(display (simplify-path		\
+  	       (build-path (call-with-values	\
+  		(lambda () (split-path (find-system-path (quote exec-file)))) \
+! 		(lambda (base name must-be-dir?) base)) (quote up))))"`
+  fi
+  { $as_echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme_pfx" >&5
+  $as_echo "$vi_cv_path_mzscheme_pfx" >&6; }
+! 	    	    vi_cv_path_mzscheme_pfx=`echo "$vi_cv_path_mzscheme_pfx" | sed 's+/$++'`
+  	fi
+      fi
+    fi
+--- 4699,4714 ----
+  if test "${vi_cv_path_mzscheme_pfx+set}" = set; then
+    $as_echo_n "(cached) " >&6
+  else
+!   	    	    echo "(display (simplify-path		\
+  	       (build-path (call-with-values	\
+  		(lambda () (split-path (find-system-path (quote exec-file)))) \
+! 		(lambda (base name must-be-dir?) base)) (quote up))))" > mzdirs.scm
+! 	    	     vi_cv_path_mzscheme_pfx=`${vi_cv_path_mzscheme} -r mzdirs.scm | \
+! 		sed -e 's+/$++'`
+  fi
+  { $as_echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme_pfx" >&5
+  $as_echo "$vi_cv_path_mzscheme_pfx" >&6; }
+! 	    rm -f mzdirs.scm
+  	fi
+      fi
+    fi
+***************
+*** 4716,4736 ****
+      { $as_echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5
+  $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; }
+      if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then
+!       { $as_echo "$as_me:$LINENO: result: \"yes\"" >&5
+! $as_echo "\"yes\"" >&6; }
+      else
+!       { $as_echo "$as_me:$LINENO: result: \"no\"" >&5
+! $as_echo "\"no\"" >&6; }
+!       { $as_echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include" >&5
+! $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include... " >&6; }
+        if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then
+! 	{ $as_echo "$as_me:$LINENO: result: \"yes\"" >&5
+! $as_echo "\"yes\"" >&6; }
+! 	SCHEME_INC=/plt
+        else
+! 	{ $as_echo "$as_me:$LINENO: result: \"no\"" >&5
+! $as_echo "\"no\"" >&6; }
+! 	vi_cv_path_mzscheme_pfx=
+        fi
+      fi
+    fi
+--- 4718,4749 ----
+      { $as_echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5
+  $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; }
+      if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then
+!       SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include
+!       { $as_echo "$as_me:$LINENO: result: yes" >&5
+! $as_echo "yes" >&6; }
+      else
+!       { $as_echo "$as_me:$LINENO: result: no" >&5
+! $as_echo "no" >&6; }
+!       { $as_echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5
+! $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; }
+        if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then
+! 	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+! $as_echo "yes" >&6; }
+! 	SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
+        else
+! 	{ $as_echo "$as_me:$LINENO: result: no" >&5
+! $as_echo "no" >&6; }
+! 	{ $as_echo "$as_me:$LINENO: checking if scheme.h can be found in /usr/include/plt/" >&5
+! $as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; }
+! 	if test -f /usr/include/plt/scheme.h; then
+! 	  { $as_echo "$as_me:$LINENO: result: yes" >&5
+! $as_echo "yes" >&6; }
+! 	  SCHEME_INC=/usr/include/plt
+! 	else
+! 	  { $as_echo "$as_me:$LINENO: result: no" >&5
+! $as_echo "no" >&6; }
+! 	  vi_cv_path_mzscheme_pfx=
+! 	fi
+        fi
+      fi
+    fi
+***************
+*** 4738,4758 ****
+    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+      if test "x$MACOSX" = "xyes"; then
+        MZSCHEME_LIBS="-framework PLT_MzScheme"
+      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+      else
+!       MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+        if test "$GCC" = yes; then
+! 			MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib"
+        elif test "`(uname) 2>/dev/null`" = SunOS &&
+  			       uname -r | grep '^5' >/dev/null; then
+! 	MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib"
+        fi
+      fi
+      if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+        SCHEME_COLLECTS=lib/plt/
+      fi
+!     MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include${SCHEME_INC}   \
+        -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'"
+      MZSCHEME_SRC="if_mzsch.c"
+      MZSCHEME_OBJ="objects/if_mzsch.o"
+--- 4751,4784 ----
+    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+      if test "x$MACOSX" = "xyes"; then
+        MZSCHEME_LIBS="-framework PLT_MzScheme"
++     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
++       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
++       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+      else
+!             if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
+!         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
+! 	MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+!       else
+!         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+!       fi
+        if test "$GCC" = yes; then
+! 			MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib"
+        elif test "`(uname) 2>/dev/null`" = SunOS &&
+  			       uname -r | grep '^5' >/dev/null; then
+! 	MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib"
+        fi
+      fi
+      if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+        SCHEME_COLLECTS=lib/plt/
+      fi
+!     if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
+!             MZSCHEME_EXTRA="mzscheme_base.c"
+!       MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
+!       MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
+!     fi
+!     MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
+        -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'"
+      MZSCHEME_SRC="if_mzsch.c"
+      MZSCHEME_OBJ="objects/if_mzsch.o"
+***************
+*** 4767,4772 ****
+--- 4793,4800 ----
+  
+  
+  
++ 
++ 
+  fi
+  
+  
+*** ../vim-7.2.190/src/configure.in	2009-05-21 23:25:38.000000000 +0200
+--- src/configure.in	2009-05-26 18:57:35.000000000 +0200
+***************
+*** 414,420 ****
+  	AC_MSG_RESULT("$PLTHOME")
+  	vi_cv_path_mzscheme_pfx="$PLTHOME"
+      else
+! 	AC_MSG_RESULT("not set")
+  	dnl -- try to find MzScheme executable
+  	AC_PATH_PROG(vi_cv_path_mzscheme, mzscheme)
+  
+--- 414,420 ----
+  	AC_MSG_RESULT("$PLTHOME")
+  	vi_cv_path_mzscheme_pfx="$PLTHOME"
+      else
+! 	AC_MSG_RESULT(not set)
+  	dnl -- try to find MzScheme executable
+  	AC_PATH_PROG(vi_cv_path_mzscheme, mzscheme)
+  
+***************
+*** 430,443 ****
+  	if test "X$vi_cv_path_mzscheme" != "X"; then
+  	    dnl -- find where MzScheme thinks it was installed
+  	    AC_CACHE_CHECK(MzScheme install prefix,vi_cv_path_mzscheme_pfx,
+! 	    [ vi_cv_path_mzscheme_pfx=`
+! 	    ${vi_cv_path_mzscheme} -evm \
+! 	    "(display (simplify-path		\
+  	       (build-path (call-with-values	\
+  		(lambda () (split-path (find-system-path (quote exec-file)))) \
+! 		(lambda (base name must-be-dir?) base)) (quote up))))"` ])
+! 	    dnl Remove a trailing slash.
+! 	    vi_cv_path_mzscheme_pfx=`echo "$vi_cv_path_mzscheme_pfx" | sed 's+/$++'`
+  	fi
+      fi
+    fi
+--- 430,445 ----
+  	if test "X$vi_cv_path_mzscheme" != "X"; then
+  	    dnl -- find where MzScheme thinks it was installed
+  	    AC_CACHE_CHECK(MzScheme install prefix,vi_cv_path_mzscheme_pfx,
+! 	    dnl different versions of MzScheme differ in command line processing
+! 	    dnl use universal approach
+! 	    echo "(display (simplify-path		\
+  	       (build-path (call-with-values	\
+  		(lambda () (split-path (find-system-path (quote exec-file)))) \
+! 		(lambda (base name must-be-dir?) base)) (quote up))))" > mzdirs.scm
+! 	    dnl Remove a trailing slash
+! 	    [ vi_cv_path_mzscheme_pfx=`${vi_cv_path_mzscheme} -r mzdirs.scm | \
+! 		sed -e 's+/$++'` ])
+! 	    rm -f mzdirs.scm
+  	fi
+      fi
+    fi
+***************
+*** 446,461 ****
+    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+      AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include)
+      if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then
+!       AC_MSG_RESULT("yes")
+      else
+!       AC_MSG_RESULT("no")
+!       AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include)
+        if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then
+! 	AC_MSG_RESULT("yes")
+! 	SCHEME_INC=/plt
+        else
+! 	AC_MSG_RESULT("no")
+! 	vi_cv_path_mzscheme_pfx=
+        fi
+      fi
+    fi
+--- 448,471 ----
+    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+      AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include)
+      if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then
+!       SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include
+!       AC_MSG_RESULT(yes)
+      else
+!       AC_MSG_RESULT(no)
+!       AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt)
+        if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then
+! 	AC_MSG_RESULT(yes)
+! 	SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
+        else
+! 	AC_MSG_RESULT(no)
+! 	AC_MSG_CHECKING(if scheme.h can be found in /usr/include/plt/)
+! 	if test -f /usr/include/plt/scheme.h; then
+! 	  AC_MSG_RESULT(yes)
+! 	  SCHEME_INC=/usr/include/plt
+! 	else
+! 	  AC_MSG_RESULT(no)
+! 	  vi_cv_path_mzscheme_pfx=
+! 	fi
+        fi
+      fi
+    fi
+***************
+*** 463,485 ****
+    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+      if test "x$MACOSX" = "xyes"; then
+        MZSCHEME_LIBS="-framework PLT_MzScheme"
+      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+      else
+!       MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+        if test "$GCC" = yes; then
+  	dnl Make Vim remember the path to the library.  For when it's not in
+  	dnl $LD_LIBRARY_PATH.
+! 	MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib"
+        elif test "`(uname) 2>/dev/null`" = SunOS &&
+  			       uname -r | grep '^5' >/dev/null; then
+! 	MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib"
+        fi
+      fi
+      if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+        SCHEME_COLLECTS=lib/plt/
+      fi
+!     MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include${SCHEME_INC}   \
+        -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'"
+      MZSCHEME_SRC="if_mzsch.c"
+      MZSCHEME_OBJ="objects/if_mzsch.o"
+--- 473,510 ----
+    if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+      if test "x$MACOSX" = "xyes"; then
+        MZSCHEME_LIBS="-framework PLT_MzScheme"
++     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
++       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
++       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+      else
+!       dnl Using shared objects
+!       if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
+!         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
+! 	MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+!       else
+!         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+!       fi
+        if test "$GCC" = yes; then
+  	dnl Make Vim remember the path to the library.  For when it's not in
+  	dnl $LD_LIBRARY_PATH.
+! 	MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib"
+        elif test "`(uname) 2>/dev/null`" = SunOS &&
+  			       uname -r | grep '^5' >/dev/null; then
+! 	MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib"
+        fi
+      fi
+      if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+        SCHEME_COLLECTS=lib/plt/
+      fi
+!     if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
+!       dnl need to generate bytecode for MzScheme base
+!       MZSCHEME_EXTRA="mzscheme_base.c"
+!       MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
+!       MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
+!     fi
+!     MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
+        -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'"
+      MZSCHEME_SRC="if_mzsch.c"
+      MZSCHEME_OBJ="objects/if_mzsch.o"
+***************
+*** 491,496 ****
+--- 516,523 ----
+    AC_SUBST(MZSCHEME_PRO)
+    AC_SUBST(MZSCHEME_LIBS)
+    AC_SUBST(MZSCHEME_CFLAGS)
++   AC_SUBST(MZSCHEME_EXTRA)
++   AC_SUBST(MZSCHEME_MZC)
+  fi
+  
+  
+*** ../vim-7.2.190/src/config.mk.in	2008-06-25 00:49:03.000000000 +0200
+--- src/config.mk.in	2009-05-26 18:57:49.000000000 +0200
+***************
+*** 41,46 ****
+--- 41,48 ----
+  MZSCHEME_OBJ	= @MZSCHEME_OBJ@
+  MZSCHEME_CFLAGS	= @MZSCHEME_CFLAGS@
+  MZSCHEME_PRO	= @MZSCHEME_PRO@
++ MZSCHEME_EXTRA  = @MZSCHEME_EXTRA@
++ MZSCHEME_MZC	= @MZSCHEME_MZC@
+  
+  PERL		= @vi_cv_path_perl@
+  PERLLIB		= @vi_cv_perllib@
+*** ../vim-7.2.190/src/eval.c	2009-05-24 13:40:17.000000000 +0200
+--- src/eval.c	2009-05-26 18:58:20.000000000 +0200
+***************
+*** 5866,5872 ****
+      return item1 == NULL && item2 == NULL;
+  }
+  
+! #if defined(FEAT_PYTHON) || defined(PROTO)
+  /*
+   * Return the dictitem that an entry in a hashtable points to.
+   */
+--- 5866,5872 ----
+      return item1 == NULL && item2 == NULL;
+  }
+  
+! #if defined(FEAT_PYTHON) || defined(FEAT_MZSCHEME) || defined(PROTO)
+  /*
+   * Return the dictitem that an entry in a hashtable points to.
+   */
+*** ../vim-7.2.190/src/if_mzsch.c	2009-05-17 16:23:20.000000000 +0200
+--- src/if_mzsch.c	2009-05-26 19:24:18.000000000 +0200
+***************
+*** 4,9 ****
+--- 4,11 ----
+   * Original work by Brent Fulgham <bfulgham@debian.org>
+   * (Based on lots of help from Matthew Flatt)
+   *
++  * TODO Convert byte-strings to char strings?
++  *
+   * This consists of six parts:
+   * 1. MzScheme interpreter main program
+   * 2. Routines that handle the external interface between MzScheme and
+***************
+*** 18,24 ****
+   *    garbage collector will do it self
+   * 2. Requires at least NORMAL features. I can't imagine why one may want
+   *    to build with SMALL or TINY features but with MzScheme interface.
+!  * 3. I don't use K&R-style functions. Anyway, MzScheme headers are ANSI.
+   */
+  
+  #include "vim.h"
+--- 20,26 ----
+   *    garbage collector will do it self
+   * 2. Requires at least NORMAL features. I can't imagine why one may want
+   *    to build with SMALL or TINY features but with MzScheme interface.
+!  * 3. I don't use K&R-style functions. Anyways, MzScheme headers are ANSI.
+   */
+  
+  #include "vim.h"
+***************
+*** 29,42 ****
+   * depend". */
+  #if defined(FEAT_MZSCHEME) || defined(PROTO)
+  
+  /* Base data structures */
+  #define SCHEME_VIMBUFFERP(obj)  SAME_TYPE(SCHEME_TYPE(obj), mz_buffer_type)
+  #define SCHEME_VIMWINDOWP(obj)  SAME_TYPE(SCHEME_TYPE(obj), mz_window_type)
+  
+  typedef struct
+  {
+!     Scheme_Type	    tag;
+!     Scheme_Env	    *env;
+      buf_T	    *buf;
+  } vim_mz_buffer;
+  
+--- 31,45 ----
+   * depend". */
+  #if defined(FEAT_MZSCHEME) || defined(PROTO)
+  
++ #include <assert.h>
++ 
+  /* Base data structures */
+  #define SCHEME_VIMBUFFERP(obj)  SAME_TYPE(SCHEME_TYPE(obj), mz_buffer_type)
+  #define SCHEME_VIMWINDOWP(obj)  SAME_TYPE(SCHEME_TYPE(obj), mz_window_type)
+  
+  typedef struct
+  {
+!     Scheme_Object   so;
+      buf_T	    *buf;
+  } vim_mz_buffer;
+  
+***************
+*** 44,50 ****
+  
+  typedef struct
+  {
+!     Scheme_Type	    tag;
+      win_T	    *win;
+  } vim_mz_window;
+  
+--- 47,53 ----
+  
+  typedef struct
+  {
+!     Scheme_Object   so;
+      win_T	    *win;
+  } vim_mz_window;
+  
+***************
+*** 67,85 ****
+      Scheme_Object   *port;
+  } Port_Info;
+  
+- /* info for closed prim */
+- /*
+-  * data have different means:
+-  * for do_eval it is char*
+-  * for do_apply is Apply_Onfo*
+-  * for do_load is Port_Info*
+-  */
+- typedef struct
+- {
+-     void	*data;
+-     Scheme_Env	*env;
+- } Cmd_Info;
+- 
+  /* info for do_apply */
+  typedef struct
+  {
+--- 70,75 ----
+***************
+*** 122,128 ****
+  static Scheme_Object *insert_buffer_line_list(void *, int, Scheme_Object **);
+  static Scheme_Object *get_range_start(void *, int, Scheme_Object **);
+  static Scheme_Object *get_range_end(void *, int, Scheme_Object **);
+- static Scheme_Object *get_buffer_namespace(void *, int, Scheme_Object **);
+  static vim_mz_buffer *get_vim_curr_buffer(void);
+  
+  /*  Window-related commands */
+--- 112,117 ----
+***************
+*** 163,170 ****
+  static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what);
+  static void startup_mzscheme(void);
+  static char *string_to_line(Scheme_Object *obj);
+- static int mzscheme_io_init(void);
+- static void mzscheme_interface_init(vim_mz_buffer *self);
+  static void do_output(char *mesg, long len);
+  static void do_printf(char *format, ...);
+  static void do_flush(void);
+--- 152,157 ----
+***************
+*** 174,192 ****
+  static Scheme_Object *do_eval(void *, int noargc, Scheme_Object **noargv);
+  static Scheme_Object *do_load(void *, int noargc, Scheme_Object **noargv);
+  static Scheme_Object *do_apply(void *, int noargc, Scheme_Object **noargv);
+! static void register_vim_exn(Scheme_Env *env);
+  static vim_mz_buffer *get_buffer_arg(const char *fname, int argnum,
+  	int argc, Scheme_Object **argv);
+  static vim_mz_window *get_window_arg(const char *fname, int argnum,
+  	int argc, Scheme_Object **argv);
+- static void add_vim_exn(Scheme_Env *env);
+  static int line_in_range(linenr_T, buf_T *);
+  static void check_line_range(linenr_T, buf_T *);
+  static void mz_fix_cursor(int lo, int hi, int extra);
+  
+! static int eval_in_namespace(void *, Scheme_Closed_Prim *, Scheme_Env *,
+! 		Scheme_Object **ret);
+! static void make_modules(Scheme_Env *);
+  
+  #ifdef DYNAMIC_MZSCHEME
+  
+--- 161,212 ----
+  static Scheme_Object *do_eval(void *, int noargc, Scheme_Object **noargv);
+  static Scheme_Object *do_load(void *, int noargc, Scheme_Object **noargv);
+  static Scheme_Object *do_apply(void *, int noargc, Scheme_Object **noargv);
+! static void register_vim_exn(void);
+  static vim_mz_buffer *get_buffer_arg(const char *fname, int argnum,
+  	int argc, Scheme_Object **argv);
+  static vim_mz_window *get_window_arg(const char *fname, int argnum,
+  	int argc, Scheme_Object **argv);
+  static int line_in_range(linenr_T, buf_T *);
+  static void check_line_range(linenr_T, buf_T *);
+  static void mz_fix_cursor(int lo, int hi, int extra);
+  
+! static int eval_with_exn_handling(void *, Scheme_Closed_Prim *,
+! 	    Scheme_Object **ret);
+! static void make_modules(void);
+! static void init_exn_catching_apply(void);
+! static int mzscheme_env_main(Scheme_Env *env, int argc, char **argv);
+! static int mzscheme_init(void);
+! #ifdef FEAT_EVAL
+! static Scheme_Object *vim_to_mzscheme(typval_T *vim_value, int depth,
+! 	Scheme_Hash_Table *visited);
+! #endif
+! 
+! #ifdef MZ_PRECISE_GC
+! static int buffer_size_proc(void *obj)
+! {
+!     return gcBYTES_TO_WORDS(sizeof(vim_mz_buffer));
+! }
+! static int buffer_mark_proc(void *obj)
+! {
+!     return buffer_size_proc(obj);
+! }
+! static int buffer_fixup_proc(void *obj)
+! {
+!     return buffer_size_proc(obj);
+! }
+! static int window_size_proc(void *obj)
+! {
+!     return gcBYTES_TO_WORDS(sizeof(vim_mz_window));
+! }
+! static int window_mark_proc(void *obj)
+! {
+!     return window_size_proc(obj);
+! }
+! static int window_fixup_proc(void *obj)
+! {
+!     return window_size_proc(obj);
+! }
+! #endif
+  
+  #ifdef DYNAMIC_MZSCHEME
+  
+***************
+*** 260,267 ****
+      (Scheme_Closed_Prim *prim, void *data, const char *name, mzshort mina,
+       mzshort maxa);
+  static Scheme_Object *(*dll_scheme_make_integer_value)(long i);
+- static Scheme_Object *(*dll_scheme_make_namespace)(int argc,
+- 	Scheme_Object *argv[]);
+  static Scheme_Object *(*dll_scheme_make_pair)(Scheme_Object *car,
+  	Scheme_Object *cdr);
+  static Scheme_Object *(*dll_scheme_make_prim_w_arity)(Scheme_Prim *prim,
+--- 280,285 ----
+***************
+*** 311,316 ****
+--- 329,345 ----
+  static Scheme_Object *(*dll_scheme_char_string_to_path)
+      (Scheme_Object *s);
+  # endif
++ static Scheme_Hash_Table *(*dll_scheme_make_hash_table)(int type);
++ static void (*dll_scheme_hash_set)(Scheme_Hash_Table *table,
++ 	Scheme_Object *key, Scheme_Object *value);
++ static Scheme_Object *(*dll_scheme_hash_get)(Scheme_Hash_Table *table,
++ 	Scheme_Object *key);
++ static Scheme_Object *(*dll_scheme_make_double)(double d);
++ # ifdef INCLUDE_MZSCHEME_BASE
++ static Scheme_Object *(*dll_scheme_make_sized_byte_string)(char *chars,
++ 	long len, int copy);
++ static Scheme_Object *(*dll_scheme_namespace_require)(Scheme_Object *req);
++ # endif
+  
+  /* arrays are imported directly */
+  # define scheme_eof dll_scheme_eof
+***************
+*** 368,374 ****
+  # define scheme_lookup_global dll_scheme_lookup_global
+  # define scheme_make_closed_prim_w_arity dll_scheme_make_closed_prim_w_arity
+  # define scheme_make_integer_value dll_scheme_make_integer_value
+- # define scheme_make_namespace dll_scheme_make_namespace
+  # define scheme_make_pair dll_scheme_make_pair
+  # define scheme_make_prim_w_arity dll_scheme_make_prim_w_arity
+  # if MZSCHEME_VERSION_MAJOR < 299
+--- 397,402 ----
+***************
+*** 403,408 ****
+--- 431,444 ----
+  #  define scheme_char_string_to_path \
+      dll_scheme_char_string_to_path
+  # endif
++ # define scheme_make_hash_table dll_scheme_make_hash_table
++ # define scheme_hash_set dll_scheme_hash_set
++ # define scheme_hash_get dll_scheme_hash_get
++ # define scheme_make_double dll_scheme_make_double
++ # ifdef INCLUDE_MZSCHEME_BASE
++ #  define scheme_make_sized_byte_string dll_scheme_make_sized_byte_string
++ #  define scheme_namespace_require dll_scheme_namespace_require
++ # endif
+  
+  typedef struct
+  {
+***************
+*** 468,474 ****
+      {"scheme_make_closed_prim_w_arity",
+  	(void **)&dll_scheme_make_closed_prim_w_arity},
+      {"scheme_make_integer_value", (void **)&dll_scheme_make_integer_value},
+-     {"scheme_make_namespace", (void **)&dll_scheme_make_namespace},
+      {"scheme_make_pair", (void **)&dll_scheme_make_pair},
+      {"scheme_make_prim_w_arity", (void **)&dll_scheme_make_prim_w_arity},
+  # if MZSCHEME_VERSION_MAJOR < 299
+--- 504,509 ----
+***************
+*** 502,510 ****
+      {"scheme_current_config", (void **)&dll_scheme_current_config},
+      {"scheme_char_string_to_byte_string",
+  	(void **)&dll_scheme_char_string_to_byte_string},
+!     {"scheme_char_string_to_path",
+! 	(void **)&dll_scheme_char_string_to_path},
+  # endif
+      {NULL, NULL}};
+  
+  static HINSTANCE hMzGC = 0;
+--- 537,552 ----
+      {"scheme_current_config", (void **)&dll_scheme_current_config},
+      {"scheme_char_string_to_byte_string",
+  	(void **)&dll_scheme_char_string_to_byte_string},
+!     {"scheme_char_string_to_path", (void **)&dll_scheme_char_string_to_path},
+  # endif
++     {"scheme_make_hash_table", (void **)&dll_scheme_make_hash_table},
++     {"scheme_hash_set", (void **)&dll_scheme_hash_set},
++     {"scheme_hash_get", (void **)&dll_scheme_hash_get},
++     {"scheme_make_double", (void **)&dll_scheme_make_double},
++ # ifdef INCLUDE_MZSCHEME_BASE
++     {"scheme_make_sized_byte_string", (void **)&dll_scheme_make_sized_byte_string},
++     {"scheme_namespace_require", (void **)&dll_scheme_namespace_require},
++ #endif
+      {NULL, NULL}};
+  
+  static HINSTANCE hMzGC = 0;
+***************
+*** 592,597 ****
+--- 634,644 ----
+  }
+  #endif /* DYNAMIC_MZSCHEME */
+  
++ /* need to put it here for dynamic stuff to work */
++ #ifdef INCLUDE_MZSCHEME_BASE
++ # include "mzscheme_base.c"
++ #endif
++ 
+  /*
+   *========================================================================
+   *  1. MzScheme interpreter startup
+***************
+*** 601,621 ****
+  static Scheme_Type mz_buffer_type;
+  static Scheme_Type mz_window_type;
+  
+! static int initialized = 0;
+  
+  /* global environment */
+  static Scheme_Env    *environment = NULL;
+  /* output/error handlers */
+  static Scheme_Object *curout = NULL;
+  static Scheme_Object *curerr = NULL;
+! /* vim:exn exception */
+  static Scheme_Object *exn_catching_apply = NULL;
+  static Scheme_Object *exn_p = NULL;
+  static Scheme_Object *exn_message = NULL;
+  static Scheme_Object *vim_exn = NULL; /* Vim Error exception */
+!  /* values for exn:vim - constructor, predicate, accessors etc */
+! static Scheme_Object *vim_exn_names = NULL;
+! static Scheme_Object *vim_exn_values = NULL;
+  
+  static long range_start;
+  static long range_end;
+--- 648,669 ----
+  static Scheme_Type mz_buffer_type;
+  static Scheme_Type mz_window_type;
+  
+! static int initialized = FALSE;
+  
+  /* global environment */
+  static Scheme_Env    *environment = NULL;
+  /* output/error handlers */
+  static Scheme_Object *curout = NULL;
+  static Scheme_Object *curerr = NULL;
+! /* exn:vim exception */
+  static Scheme_Object *exn_catching_apply = NULL;
+  static Scheme_Object *exn_p = NULL;
+  static Scheme_Object *exn_message = NULL;
+  static Scheme_Object *vim_exn = NULL; /* Vim Error exception */
+! 
+! #if !defined(MZ_PRECISE_GC) || MZSCHEME_VERSION_MAJOR < 400
+! static void *stack_base = NULL;
+! #endif
+  
+  static long range_start;
+  static long range_end;
+***************
+*** 668,677 ****
+  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
+  # elif defined(FEAT_GUI_GTK)
+      static gint
+! timer_proc(gpointer data UNUSED)
+  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
+      static void
+! timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)
+  # elif defined(FEAT_GUI_MAC)
+      pascal void
+  timer_proc(EventLoopTimerRef theTimer, void *userData)
+--- 716,725 ----
+  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
+  # elif defined(FEAT_GUI_GTK)
+      static gint
+! timer_proc(gpointer data)
+  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
+      static void
+! timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
+  # elif defined(FEAT_GUI_MAC)
+      pascal void
+  timer_proc(EventLoopTimerRef theTimer, void *userData)
+***************
+*** 751,762 ****
+  #endif
+  }
+  
+      static void
+  startup_mzscheme(void)
+  {
+!     Scheme_Object *proc_make_security_guard;
+! 
+!     scheme_set_stack_base(NULL, 1);
+  
+      MZ_REGISTER_STATIC(environment);
+      MZ_REGISTER_STATIC(curout);
+--- 799,862 ----
+  #endif
+  }
+  
++     void
++ mzscheme_main(void)
++ {
++ #if defined(MZ_PRECISE_GC) && MZSCHEME_VERSION_MAJOR >= 400
++     /* use trampoline for precise GC in MzScheme >= 4.x */
++     scheme_main_setup(TRUE, mzscheme_env_main, 0, NULL);
++ #else
++     mzscheme_env_main(NULL, 0, NULL);
++ #endif
++ }
++ 
++     static int
++ mzscheme_env_main(Scheme_Env *env, int argc, char **argv)
++ {
++     /* neither argument nor return values are used */
++ #ifdef MZ_PRECISE_GC
++ # if MZSCHEME_VERSION_MAJOR < 400
++     /*
++      * Starting from version 4.x, embedding applications must use
++      * scheme_main_setup/scheme_main_stack_setup trampolines
++      * rather than setting stack base directly with scheme_set_stack_base
++      */
++     Scheme_Object   *dummy = NULL;
++     MZ_GC_DECL_REG(1);
++     MZ_GC_VAR_IN_REG(0, dummy);
++ 
++     stack_base = &__gc_var_stack__;
++ # else
++     /* environment has been created by us by Scheme */
++     environment = env;
++ # endif
++     /*
++      * In 4.x, all activities must be performed inside trampoline
++      * so we are forced to initialise GC immediately
++      * This can be postponed in 3.x but I see no point in implementing
++      * a feature which will work in older versions only.
++      * One would better use conservative GC if he needs dynamic MzScheme
++      */
++     mzscheme_init();
++ #else
++     int dummy = 0;
++     stack_base = (void *)&dummy;
++ #endif
++     main_loop(FALSE, FALSE);
++ #if defined(MZ_PRECISE_GC) && MZSCHEME_VERSION_MAJOR < 400
++     /* releasing dummy */
++     MZ_GC_REG();
++     MZ_GC_UNREG();
++ #endif
++     return 0;
++ }
++ 
+      static void
+  startup_mzscheme(void)
+  {
+! #if !defined(MZ_PRECISE_GC) || MZSCHEME_VERSION_MAJOR < 400
+!     scheme_set_stack_base(stack_base, 1);
+! #endif
+  
+      MZ_REGISTER_STATIC(environment);
+      MZ_REGISTER_STATIC(curout);
+***************
+*** 765,774 ****
+      MZ_REGISTER_STATIC(exn_p);
+      MZ_REGISTER_STATIC(exn_message);
+      MZ_REGISTER_STATIC(vim_exn);
+-     MZ_REGISTER_STATIC(vim_exn_names);
+-     MZ_REGISTER_STATIC(vim_exn_values);
+  
+      environment = scheme_basic_env();
+  
+      /* redirect output */
+      scheme_console_output = do_output;
+--- 865,899 ----
+      MZ_REGISTER_STATIC(exn_p);
+      MZ_REGISTER_STATIC(exn_message);
+      MZ_REGISTER_STATIC(vim_exn);
+  
++ #if !defined(MZ_PRECISE_GC) || MZSCHEME_VERSION_MAJOR < 400
++     /* in newer versions of precise GC the initial env has been created */
+      environment = scheme_basic_env();
++ #endif
++     MZ_GC_CHECK();
++ 
++ #ifdef INCLUDE_MZSCHEME_BASE
++     {
++ 	/*
++ 	 * versions 4.x do not provide Scheme bindings by defaults
++ 	 * we need to add them explicitly
++ 	 */
++ 	Scheme_Object *scheme_base_symbol = NULL;
++ 	MZ_GC_DECL_REG(1);
++ 	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
++ 	MZ_GC_REG();
++ 	/* invoke function from generated and included base.c */
++ 	declare_modules(environment);
++ 	scheme_base_symbol = scheme_intern_symbol("scheme/base");
++ 	MZ_GC_CHECK();
++ 	scheme_namespace_require(scheme_base_symbol);
++ 	MZ_GC_CHECK();
++ 	MZ_GC_UNREG();
++     }
++ #endif
++     register_vim_exn();
++     /* use new environment to initialise exception handling */
++     init_exn_catching_apply();
+  
+      /* redirect output */
+      scheme_console_output = do_output;
+***************
+*** 776,823 ****
+  
+  #ifdef MZSCHEME_COLLECTS
+      /* setup 'current-library-collection-paths' parameter */
+-     scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
+- 	    scheme_make_pair(
+  # if MZSCHEME_VERSION_MAJOR >= 299
+! 		scheme_char_string_to_path(
+! 		    scheme_byte_string_to_char_string(
+! 			scheme_make_byte_string(MZSCHEME_COLLECTS))),
+  # else
+! 		scheme_make_string(MZSCHEME_COLLECTS),
+  # endif
+- 		scheme_null));
+  #endif
+  #ifdef HAVE_SANDBOX
+!     /* setup sandbox guards */
+!     proc_make_security_guard = scheme_lookup_global(
+! 	    scheme_intern_symbol("make-security-guard"),
+! 	    environment);
+!     if (proc_make_security_guard != NULL)
+!     {
+! 	Scheme_Object *args[3];
+! 	Scheme_Object *guard;
+! 	args[0] = scheme_get_param(scheme_config, MZCONFIG_SECURITY_GUARD);
+! 	args[1] = scheme_make_prim_w_arity(sandbox_file_guard,
+! 		"sandbox-file-guard", 3, 3);
+! 	args[2] = scheme_make_prim_w_arity(sandbox_network_guard,
+! 		"sandbox-network-guard", 4, 4);
+! 	guard = scheme_apply(proc_make_security_guard, 3, args);
+! 	scheme_set_param(scheme_config, MZCONFIG_SECURITY_GUARD, guard);
+      }
+  #endif
+      /* Create buffer and window types for use in Scheme code */
+      mz_buffer_type = scheme_make_type("<vim-buffer>");
+      mz_window_type = scheme_make_type("<vim-window>");
+  
+!     register_vim_exn(environment);
+!     make_modules(environment);
+  
+      /*
+       * setup callback to receive notifications
+       * whether thread scheduling is (or not) required
+       */
+      scheme_notify_multithread = notify_multithread;
+-     initialized = 1;
+  }
+  
+  /*
+--- 901,1031 ----
+  
+  #ifdef MZSCHEME_COLLECTS
+      /* setup 'current-library-collection-paths' parameter */
+  # if MZSCHEME_VERSION_MAJOR >= 299
+!     {
+! 	Scheme_Object	*coll_byte_string = NULL;
+! 	Scheme_Object	*coll_char_string = NULL;
+! 	Scheme_Object	*coll_path = NULL;
+! 	Scheme_Object	*coll_pair = NULL;
+! 	Scheme_Config	*config = NULL;
+! 
+! 	MZ_GC_DECL_REG(5);
+! 	MZ_GC_VAR_IN_REG(0, coll_byte_string);
+! 	MZ_GC_VAR_IN_REG(1, coll_char_string);
+! 	MZ_GC_VAR_IN_REG(2, coll_path);
+! 	MZ_GC_VAR_IN_REG(3, coll_pair);
+! 	MZ_GC_VAR_IN_REG(4, config);
+! 	MZ_GC_REG();
+! 	coll_byte_string = scheme_make_byte_string(MZSCHEME_COLLECTS);
+! 	MZ_GC_CHECK();
+! 	coll_char_string = scheme_byte_string_to_char_string(coll_byte_string);
+! 	MZ_GC_CHECK();
+! 	coll_path = scheme_char_string_to_path(coll_char_string);
+! 	MZ_GC_CHECK();
+! 	coll_pair = scheme_make_pair(coll_path, scheme_null);
+! 	MZ_GC_CHECK();
+! 	config = scheme_config;
+! 	MZ_GC_CHECK();
+! 	scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);
+! 	MZ_GC_CHECK();
+! 	MZ_GC_UNREG();
+!     }
+  # else
+!     {
+! 	Scheme_Object	*coll_string = NULL;
+! 	Scheme_Object	*coll_pair = NULL;
+! 	Scheme_Config	*config = NULL;
+! 
+! 	MZ_GC_DECL_REG(3);
+! 	MZ_GC_VAR_IN_REG(0, coll_string);
+! 	MZ_GC_VAR_IN_REG(1, coll_pair);
+! 	MZ_GC_VAR_IN_REG(2, config);
+! 	MZ_GC_REG();
+! 	coll_string = scheme_make_string(MZSCHEME_COLLECTS);
+! 	MZ_GC_CHECK();
+! 	coll_pair = scheme_make_pair(coll_string, scheme_null);
+! 	MZ_GC_CHECK();
+! 	config = scheme_config;
+! 	MZ_GC_CHECK();
+! 	scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);
+! 	MZ_GC_CHECK();
+! 	MZ_GC_UNREG();
+!     }
+  # endif
+  #endif
+  #ifdef HAVE_SANDBOX
+!     {
+! 	Scheme_Object	*make_security_guard = NULL;
+! 	MZ_GC_DECL_REG(1);
+! 	MZ_GC_VAR_IN_REG(0, make_security_guard);
+! 	MZ_GC_REG();
+! 
+! #if MZSCHEME_VERSION_MAJOR < 400
+! 	{
+! 	    Scheme_Object	*make_security_guard_symbol = NULL;
+! 	    MZ_GC_DECL_REG(1);
+! 	    MZ_GC_VAR_IN_REG(0, make_security_guard_symbol);
+! 	    MZ_GC_REG();
+! 	    make_security_guard_symbol = scheme_intern_symbol("make-security-guard");
+! 	    MZ_GC_CHECK();
+! 	    make_security_guard = scheme_lookup_global(
+! 		    make_security_guard_symbol, environment);
+! 	    MZ_GC_UNREG();
+! 	}
+! #else
+! 	make_security_guard = scheme_builtin_value("make-security-guard");
+! 	MZ_GC_CHECK();
+! #endif
+! 
+! 	/* setup sandbox guards */
+! 	if (make_security_guard != NULL)
+! 	{
+! 	    Scheme_Object   *args[3] = {NULL, NULL, NULL};
+! 	    Scheme_Object   *guard = NULL;
+! 	    Scheme_Config   *config = NULL;
+! 	    MZ_GC_DECL_REG(5);
+! 	    MZ_GC_ARRAY_VAR_IN_REG(0, args, 3);
+! 	    MZ_GC_VAR_IN_REG(3, guard);
+! 	    MZ_GC_VAR_IN_REG(4, config);
+! 	    MZ_GC_REG();
+! 	    config = scheme_config;
+! 	    MZ_GC_CHECK();
+! 	    args[0] = scheme_get_param(config, MZCONFIG_SECURITY_GUARD);
+! 	    MZ_GC_CHECK();
+! 	    args[1] = scheme_make_prim_w_arity(sandbox_file_guard,
+! 		    "sandbox-file-guard", 3, 3);
+! 	    args[2] = scheme_make_prim_w_arity(sandbox_network_guard,
+! 		    "sandbox-network-guard", 4, 4);
+! 	    guard = scheme_apply(make_security_guard, 3, args);
+! 	    MZ_GC_CHECK();
+! 	    scheme_set_param(config, MZCONFIG_SECURITY_GUARD, guard);
+! 	    MZ_GC_CHECK();
+! 	    MZ_GC_UNREG();
+! 	}
+! 	MZ_GC_UNREG();
+      }
+  #endif
+      /* Create buffer and window types for use in Scheme code */
+      mz_buffer_type = scheme_make_type("<vim-buffer>");
++     MZ_GC_CHECK();
+      mz_window_type = scheme_make_type("<vim-window>");
++     MZ_GC_CHECK();
++ #ifdef MZ_PRECISE_GC
++     GC_register_traversers(mz_buffer_type,
++ 	    buffer_size_proc, buffer_mark_proc, buffer_fixup_proc,
++ 	    TRUE, TRUE);
++     GC_register_traversers(mz_window_type,
++ 	    window_size_proc, window_mark_proc, window_fixup_proc,
++ 	    TRUE, TRUE);
++ #endif
+  
+!     make_modules();
+  
+      /*
+       * setup callback to receive notifications
+       * whether thread scheduling is (or not) required
+       */
+      scheme_notify_multithread = notify_multithread;
+  }
+  
+  /*
+***************
+*** 827,897 ****
+      static int
+  mzscheme_init(void)
+  {
+-     int do_require = FALSE;
+- 
+      if (!initialized)
+      {
+- 	do_require = TRUE;
+  #ifdef DYNAMIC_MZSCHEME
+  	if (!mzscheme_enabled(TRUE))
+  	{
+! 	    EMSG(_("???: Sorry, this command is disabled, the MzScheme library could not be loaded."));
+  	    return -1;
+  	}
+  #endif
+  	startup_mzscheme();
+! 
+! 	if (mzscheme_io_init())
+! 	    return -1;
+! 
+!     }
+!     /* recreate ports each call effectivelly clearing these ones */
+!     curout = scheme_make_string_output_port();
+!     curerr = scheme_make_string_output_port();
+!     scheme_set_param(scheme_config, MZCONFIG_OUTPUT_PORT, curout);
+!     scheme_set_param(scheme_config, MZCONFIG_ERROR_PORT, curerr);
+! 
+!     if (do_require)
+!     {
+! 	/* auto-instantiate in basic env */
+! 	eval_in_namespace("(require (prefix vimext: vimext))", do_eval,
+! 		environment, NULL);
+      }
+- 
+-     return 0;
+- }
+- 
+- /*
+-  * This routine fills the namespace with various important routines that can
+-  * be used within MzScheme.
+-  */
+-     static void
+- mzscheme_interface_init(vim_mz_buffer *mzbuff)
+- {
+-     Scheme_Object   *attach;
+- 
+-     mzbuff->env = (Scheme_Env *)scheme_make_namespace(0, NULL);
+- 
+-     /*
+-      * attach instantiated modules from global namespace
+-      * so they can be easily instantiated in the buffer namespace
+-      */
+-     attach = scheme_lookup_global(
+- 	    scheme_intern_symbol("namespace-attach-module"),
+- 	    environment);
+- 
+-     if (attach != NULL)
+      {
+! 	Scheme_Object   *ret;
+! 	Scheme_Object	*args[2];
+! 
+! 	args[0] = (Scheme_Object *)environment;
+! 	args[1] = scheme_intern_symbol("vimext");
+! 
+! 	ret = (Scheme_Object *)mzvim_apply(attach, 2, args);
+      }
+  
+!     add_vim_exn(mzbuff->env);
+  }
+  
+  /*
+--- 1035,1072 ----
+      static int
+  mzscheme_init(void)
+  {
+      if (!initialized)
+      {
+  #ifdef DYNAMIC_MZSCHEME
+  	if (!mzscheme_enabled(TRUE))
+  	{
+! 	    EMSG(_("E812: Sorry, this command is disabled, the MzScheme libraries could not be loaded."));
+  	    return -1;
+  	}
+  #endif
+  	startup_mzscheme();
+! 	initialized = TRUE;
+      }
+      {
+! 	Scheme_Config	*config = NULL;
+! 	MZ_GC_DECL_REG(1);
+! 	MZ_GC_VAR_IN_REG(0, config);
+! 	MZ_GC_REG();
+! 	config = scheme_config;
+! 	MZ_GC_CHECK();
+! 	/* recreate ports each call effectivelly clearing these ones */
+! 	curout = scheme_make_string_output_port();
+! 	MZ_GC_CHECK();
+! 	curerr = scheme_make_string_output_port();
+! 	MZ_GC_CHECK();
+! 	scheme_set_param(config, MZCONFIG_OUTPUT_PORT, curout);
+! 	MZ_GC_CHECK();
+! 	scheme_set_param(config, MZCONFIG_ERROR_PORT, curerr);
+! 	MZ_GC_CHECK();
+! 	MZ_GC_UNREG();
+      }
+  
+!     return 0;
+  }
+  
+  /*
+***************
+*** 901,928 ****
+   */
+  
+  /*
+!  * Evaluate command in namespace with exception handling
+   */
+      static int
+! eval_in_namespace(void *data, Scheme_Closed_Prim *what, Scheme_Env *env,
+! 		Scheme_Object **ret)
+  {
+!     Scheme_Object   *value;
+!     Scheme_Object   *exn;
+!     Cmd_Info	    info;   /* closure info */
+! 
+!     info.data = data;
+!     info.env = env;
+! 
+!     scheme_set_param(scheme_config, MZCONFIG_ENV,
+! 	    (Scheme_Object *) env);
+!     /*
+!      * ensure all evaluations will be in current buffer namespace,
+!      * the second argument to scheme_eval_string isn't enough!
+!      */
+!     value = _apply_thunk_catch_exceptions(
+! 	    scheme_make_closed_prim_w_arity(what, &info, "mzvim", 0, 0),
+! 	    &exn);
+  
+      if (!value)
+      {
+--- 1076,1100 ----
+   */
+  
+  /*
+!  * Evaluate command with exception handling
+   */
+      static int
+! eval_with_exn_handling(void *data, Scheme_Closed_Prim *what, Scheme_Object **ret)
+  {
+!     Scheme_Object   *value = NULL;
+!     Scheme_Object   *exn = NULL;
+!     Scheme_Object   *prim = NULL;
+! 
+!     MZ_GC_DECL_REG(3);
+!     MZ_GC_VAR_IN_REG(0, value);
+!     MZ_GC_VAR_IN_REG(1, exn);
+!     MZ_GC_VAR_IN_REG(2, prim);
+!     MZ_GC_REG();
+! 
+!     prim = scheme_make_closed_prim_w_arity(what, data, "mzvim", 0, 0);
+!     MZ_GC_CHECK();
+!     value = _apply_thunk_catch_exceptions(prim, &exn);
+!     MZ_GC_CHECK();
+  
+      if (!value)
+      {
+***************
+*** 930,938 ****
+  	/* Got an exn? */
+  	if (value)
+  	{
+! 	    scheme_display(value, curerr);  /*  Send to stderr-vim */
+  	    do_flush();
+  	}
+  	/* `raise' was called on some arbitrary value */
+  	return FAIL;
+      }
+--- 1102,1112 ----
+  	/* Got an exn? */
+  	if (value)
+  	{
+! 	    scheme_display(value, curerr);   /*  Send to stderr-vim */
+! 	    MZ_GC_CHECK();
+  	    do_flush();
+  	}
++ 	MZ_GC_UNREG();
+  	/* `raise' was called on some arbitrary value */
+  	return FAIL;
+      }
+***************
+*** 941,949 ****
+--- 1115,1127 ----
+  	*ret = value;
+      /* Print any result, as long as it's not a void */
+      else if (!SCHEME_VOIDP(value))
++     {
+  	scheme_display(value, curout);  /* Send to stdout-vim */
++ 	MZ_GC_CHECK();
++     }
+  
+      do_flush();
++     MZ_GC_UNREG();
+      return OK;
+  }
+  
+***************
+*** 957,963 ****
+      range_start = eap->line1;
+      range_end = eap->line2;
+  
+!     return eval_in_namespace(data, what, get_vim_curr_buffer()->env, NULL);
+  }
+  
+  /*
+--- 1135,1141 ----
+      range_start = eap->line1;
+      range_end = eap->line2;
+  
+!     return eval_with_exn_handling(data, what, NULL);
+  }
+  
+  /*
+***************
+*** 974,979 ****
+--- 1152,1158 ----
+  	bp->buf = INVALID_BUFFER_VALUE;
+  	buf->b_mzscheme_ref = NULL;
+  	scheme_gc_ptr_ok(bp);
++ 	MZ_GC_CHECK();
+      }
+  }
+  
+***************
+*** 990,995 ****
+--- 1169,1175 ----
+  	wp->win = INVALID_WINDOW_VALUE;
+  	win->w_mzscheme_ref = NULL;
+  	scheme_gc_ptr_ok(wp);
++ 	MZ_GC_CHECK();
+      }
+  }
+  
+***************
+*** 1014,1031 ****
+      }
+  }
+  
+- /* eval MzScheme string */
+-     void *
+- mzvim_eval_string(char_u *str)
+- {
+-     Scheme_Object *ret = NULL;
+-     if (mzscheme_init())
+- 	return FAIL;
+- 
+-     eval_in_namespace(str, do_eval, get_vim_curr_buffer()->env, &ret);
+-     return ret;
+- }
+- 
+  /*
+   * apply MzScheme procedure with arguments,
+   * handling errors
+--- 1194,1199 ----
+***************
+*** 1033,1075 ****
+      Scheme_Object *
+  mzvim_apply(Scheme_Object *proc, int argc, Scheme_Object **argv)
+  {
+-     Apply_Info	data;
+-     Scheme_Object *ret = NULL;
+- 
+      if (mzscheme_init())
+  	return FAIL;
+  
+!     data.proc = proc;
+!     data.argc = argc;
+!     data.argv = argv;
+! 
+!     eval_in_namespace(&data, do_apply, get_vim_curr_buffer()->env, &ret);
+!     return ret;
+  }
+  
+      static Scheme_Object *
+  do_load(void *data, int noargc, Scheme_Object **noargv)
+  {
+!     Cmd_Info	    *info = (Cmd_Info *)data;
+!     Scheme_Object   *result = scheme_void;
+!     Scheme_Object   *expr;
+!     char_u	    *file = scheme_malloc_fail_ok(
+! 					  scheme_malloc_atomic, MAXPATHL + 1);
+!     Port_Info	    *pinfo = (Port_Info *)(info->data);
+  
+      /* make Vim expansion */
+!     expand_env((char_u *)pinfo->name, file, MAXPATHL);
+!     /* scheme_load looks strange working with namespaces and error handling*/
+      pinfo->port = scheme_open_input_file(file, "mzfile");
+!     scheme_count_lines(pinfo->port); /* to get accurate read error location*/
+  
+      /* Like REPL but print only last result */
+      while (!SCHEME_EOFP(expr = scheme_read(pinfo->port)))
+! 	result = scheme_eval(expr, info->env);
+  
+      /* errors will be caught in do_mzscheme_comamnd and ex_mzfile */
+      scheme_close_input_port(pinfo->port);
+      pinfo->port = NULL;
+      return result;
+  }
+  
+--- 1201,1265 ----
+      Scheme_Object *
+  mzvim_apply(Scheme_Object *proc, int argc, Scheme_Object **argv)
+  {
+      if (mzscheme_init())
+  	return FAIL;
++     else
++     {
++ 	Apply_Info	data = {NULL, 0, NULL};
++ 	Scheme_Object	*ret = NULL;
+  
+! 	MZ_GC_DECL_REG(5);
+! 	MZ_GC_VAR_IN_REG(0, ret);
+! 	MZ_GC_VAR_IN_REG(1, data.proc);
+! 	MZ_GC_ARRAY_VAR_IN_REG(2, data.argv, argc);
+! 	MZ_GC_REG();
+! 
+! 	data.proc = proc;
+! 	data.argc = argc;
+! 	data.argv = argv;
+! 
+! 	eval_with_exn_handling(&data, do_apply, &ret);
+! 	MZ_GC_UNREG();
+! 	return ret;
+!     }
+  }
+  
+      static Scheme_Object *
+  do_load(void *data, int noargc, Scheme_Object **noargv)
+  {
+!     Scheme_Object   *expr = NULL;
+!     Scheme_Object   *result = NULL;
+!     char	    *file = NULL;
+!     Port_Info	    *pinfo = (Port_Info *)data;
+! 
+!     MZ_GC_DECL_REG(3);
+!     MZ_GC_VAR_IN_REG(0, expr);
+!     MZ_GC_VAR_IN_REG(1, result);
+!     MZ_GC_VAR_IN_REG(2, file);
+!     MZ_GC_REG();
+! 
+!     file = (char *)scheme_malloc_fail_ok(scheme_malloc_atomic, MAXPATHL + 1);
+!     MZ_GC_CHECK();
+  
+      /* make Vim expansion */
+!     expand_env((char_u *)pinfo->name, (char_u *)file, MAXPATHL);
+      pinfo->port = scheme_open_input_file(file, "mzfile");
+!     MZ_GC_CHECK();
+!     scheme_count_lines(pinfo->port);  /* to get accurate read error location*/
+!     MZ_GC_CHECK();
+  
+      /* Like REPL but print only last result */
+      while (!SCHEME_EOFP(expr = scheme_read(pinfo->port)))
+!     {
+! 	result = scheme_eval(expr, environment);
+! 	MZ_GC_CHECK();
+!     }
+  
+      /* errors will be caught in do_mzscheme_comamnd and ex_mzfile */
+      scheme_close_input_port(pinfo->port);
++     MZ_GC_CHECK();
+      pinfo->port = NULL;
++     MZ_GC_UNREG();
+      return result;
+  }
+  
+***************
+*** 1077,1089 ****
+      void
+  ex_mzfile(exarg_T *eap)
+  {
+!     Port_Info	pinfo;
+  
+      pinfo.name = (char *)eap->arg;
+-     pinfo.port = NULL;
+      if (do_mzscheme_command(eap, &pinfo, do_load) != OK
+  	    && pinfo.port != NULL)	/* looks like port was not closed */
+  	scheme_close_input_port(pinfo.port);
+  }
+  
+  
+--- 1267,1286 ----
+      void
+  ex_mzfile(exarg_T *eap)
+  {
+!     Port_Info	pinfo = {NULL, NULL};
+! 
+!     MZ_GC_DECL_REG(1);
+!     MZ_GC_VAR_IN_REG(0, pinfo.port);
+!     MZ_GC_REG();
+  
+      pinfo.name = (char *)eap->arg;
+      if (do_mzscheme_command(eap, &pinfo, do_load) != OK
+  	    && pinfo.port != NULL)	/* looks like port was not closed */
++     {
+  	scheme_close_input_port(pinfo.port);
++ 	MZ_GC_CHECK();
++     }
++     MZ_GC_UNREG();
+  }
+  
+  
+***************
+*** 1103,1116 ****
+  		"(with-handlers ([void (lambda (exn) (cons #f exn))]) "
+  		"(cons #t (thunk))))";
+  
+! 	/* make sure we have a namespace with the standard syntax: */
+! 	Scheme_Env *env = (Scheme_Env *)scheme_make_namespace(0, NULL);
+! 	add_vim_exn(env);
+! 
+! 	exn_catching_apply = scheme_eval_string(e, env);
+! 	exn_p = scheme_lookup_global(scheme_intern_symbol("exn?"), env);
+! 	exn_message = scheme_lookup_global(
+! 		scheme_intern_symbol("exn-message"), env);
+      }
+  }
+  
+--- 1300,1311 ----
+  		"(with-handlers ([void (lambda (exn) (cons #f exn))]) "
+  		"(cons #t (thunk))))";
+  
+! 	exn_catching_apply = scheme_eval_string(e, environment);
+! 	MZ_GC_CHECK();
+! 	exn_p = scheme_builtin_value("exn?");
+! 	MZ_GC_CHECK();
+! 	exn_message = scheme_builtin_value("exn-message");
+! 	MZ_GC_CHECK();
+      }
+  }
+  
+***************
+*** 1124,1131 ****
+  {
+      Scheme_Object *v;
+  
+-     init_exn_catching_apply();
+- 
+      v = _scheme_apply(exn_catching_apply, 1, &f);
+      /* v is a pair: (cons #t value) or (cons #f exn) */
+  
+--- 1319,1324 ----
+***************
+*** 1141,1148 ****
+      static Scheme_Object *
+  extract_exn_message(Scheme_Object *v)
+  {
+-     init_exn_catching_apply();
+- 
+      if (SCHEME_TRUEP(_scheme_apply(exn_p, 1, &v)))
+  	return _scheme_apply(exn_message, 1, &v);
+      else
+--- 1334,1339 ----
+***************
+*** 1152,1167 ****
+      static Scheme_Object *
+  do_eval(void *s, int noargc, Scheme_Object **noargv)
+  {
+!     Cmd_Info	*info = (Cmd_Info *)s;
+! 
+!     return scheme_eval_string_all((char *)(info->data), info->env, TRUE);
+  }
+  
+      static Scheme_Object *
+  do_apply(void *a, int noargc, Scheme_Object **noargv)
+  {
+!     Apply_Info	*info = (Apply_Info *)(((Cmd_Info *)a)->data);
+! 
+      return scheme_apply(info->proc, info->argc, info->argv);
+  }
+  
+--- 1343,1355 ----
+      static Scheme_Object *
+  do_eval(void *s, int noargc, Scheme_Object **noargv)
+  {
+!     return scheme_eval_string_all((char *)s, environment, TRUE);
+  }
+  
+      static Scheme_Object *
+  do_apply(void *a, int noargc, Scheme_Object **noargv)
+  {
+!     Apply_Info	*info = (Apply_Info *)a;
+      return scheme_apply(info->proc, info->argc, info->argv);
+  }
+  
+***************
+*** 1219,1224 ****
+--- 1407,1413 ----
+      long length;
+  
+      buff = scheme_get_sized_string_output(curerr, &length);
++     MZ_GC_CHECK();
+      if (length)
+      {
+  	do_err_output(buff, length);
+***************
+*** 1226,1242 ****
+      }
+  
+      buff = scheme_get_sized_string_output(curout, &length);
+      if (length)
+  	do_output(buff, length);
+  }
+  
+-     static int
+- mzscheme_io_init(void)
+- {
+-     /* Nothing needed so far... */
+-     return 0;
+- }
+- 
+  /*
+   *========================================================================
+   *  4. Implementation of the Vim Features for MzScheme
+--- 1415,1425 ----
+      }
+  
+      buff = scheme_get_sized_string_output(curout, &length);
++     MZ_GC_CHECK();
+      if (length)
+  	do_output(buff, length);
+  }
+  
+  /*
+   *========================================================================
+   *  4. Implementation of the Vim Features for MzScheme
+***************
+*** 1263,1284 ****
+  vim_eval(void *data, int argc, Scheme_Object **argv)
+  {
+  #ifdef FEAT_EVAL
+!     Vim_Prim	    *prim = (Vim_Prim *)data;
+!     char	    *expr;
+!     char	    *str;
+!     Scheme_Object   *result;
+  
+!     expr = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
+  
+!     str = (char *)eval_to_string((char_u *)expr, NULL, TRUE);
+  
+!     if (str == NULL)
+  	raise_vim_exn(_("invalid expression"));
+  
+!     result = scheme_make_string(str);
+! 
+!     vim_free(str);
+  
+      return result;
+  #else
+      raise_vim_exn(_("expressions disabled at compile time"));
+--- 1446,1475 ----
+  vim_eval(void *data, int argc, Scheme_Object **argv)
+  {
+  #ifdef FEAT_EVAL
+!     Vim_Prim		*prim = (Vim_Prim *)data;
+!     char		*expr;
+!     Scheme_Object	*result;
+!     /* hash table to store visited values to avoid infinite loops */
+!     Scheme_Hash_Table	*visited = NULL;
+!     typval_T		*vim_result;
+! 
+!     MZ_GC_DECL_REG(1);
+!     MZ_GC_VAR_IN_REG(0, visited);
+!     MZ_GC_REG();
+  
+!     visited = scheme_make_hash_table(SCHEME_hash_ptr);
+!     MZ_GC_CHECK();
+  
+!     expr = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
+!     vim_result = eval_expr((char_u *)expr, NULL);
+  
+!     if (vim_result == NULL)
+  	raise_vim_exn(_("invalid expression"));
+  
+!     result = vim_to_mzscheme(vim_result, 1, visited);
+!     free_tv(vim_result);
+  
++     MZ_GC_UNREG();
+      return result;
+  #else
+      raise_vim_exn(_("expressions disabled at compile time"));
+***************
+*** 1318,1324 ****
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      char_u	    *name;
+      long	    value;
+!     char_u	    *strval;
+      int		    rc;
+      Scheme_Object   *rval;
+      int		    opt_flags = 0;
+--- 1509,1515 ----
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      char_u	    *name;
+      long	    value;
+!     char	    *strval;
+      int		    rc;
+      Scheme_Object   *rval;
+      int		    opt_flags = 0;
+***************
+*** 1333,1338 ****
+--- 1524,1530 ----
+  	{
+  	    MZ_REGISTER_STATIC(M_global);
+  	    M_global = scheme_intern_symbol("global");
++ 	    MZ_GC_CHECK();
+  	}
+  
+  	if (argv[1] == M_global)
+***************
+*** 1354,1360 ****
+  	    scheme_wrong_type(prim->name, "vim-buffer/window", 1, argc, argv);
+      }
+  
+!     rc = get_option_value(name, &value, &strval, opt_flags);
+      curbuf = save_curb;
+      curwin = save_curw;
+  
+--- 1546,1552 ----
+  	    scheme_wrong_type(prim->name, "vim-buffer/window", 1, argc, argv);
+      }
+  
+!     rc = get_option_value(name, &value, (char_u **)&strval, opt_flags);
+      curbuf = save_curb;
+      curwin = save_curw;
+  
+***************
+*** 1364,1369 ****
+--- 1556,1562 ----
+  	return scheme_make_integer_value(value);
+      case 0:
+  	rval = scheme_make_string(strval);
++ 	MZ_GC_CHECK();
+  	vim_free(strval);
+  	return rval;
+      case -1:
+***************
+*** 1393,1398 ****
+--- 1586,1592 ----
+  	{
+  	    MZ_REGISTER_STATIC(M_global);
+  	    M_global = scheme_intern_symbol("global");
++ 	    MZ_GC_CHECK();
+  	}
+  
+  	if (argv[1] == M_global)
+***************
+*** 1463,1469 ****
+--- 1657,1666 ----
+  
+      for (w = firstwin; w != NULL; w = w->w_next)
+  	if (w->w_buffer == buf->buf)
++ 	{
+  	    list = scheme_make_pair(window_new(w), list);
++ 	    MZ_GC_CHECK();
++ 	}
+  
+      return list;
+  }
+***************
+*** 1471,1477 ****
+      static Scheme_Object *
+  window_new(win_T *win)
+  {
+!     vim_mz_window *self;
+  
+      /* We need to handle deletion of windows underneath us.
+       * If we add a "w_mzscheme_ref" field to the win_T structure,
+--- 1668,1678 ----
+      static Scheme_Object *
+  window_new(win_T *win)
+  {
+!     vim_mz_window *self = NULL;
+! 
+!     MZ_GC_DECL_REG(1);
+!     MZ_GC_VAR_IN_REG(0, self);
+!     MZ_GC_REG();
+  
+      /* We need to handle deletion of windows underneath us.
+       * If we add a "w_mzscheme_ref" field to the win_T structure,
+***************
+*** 1485,1497 ****
+  	return win->w_mzscheme_ref;
+  
+      self = scheme_malloc_fail_ok(scheme_malloc, sizeof(vim_mz_window));
+- 
+      vim_memset(self, 0, sizeof(vim_mz_window));
+      scheme_dont_gc_ptr(self);	/* because win isn't visible to GC */
+      win->w_mzscheme_ref = self;
+      self->win = win;
+!     self->tag = mz_window_type;
+  
+      return (Scheme_Object *)(self);
+  }
+  
+--- 1686,1699 ----
+  	return win->w_mzscheme_ref;
+  
+      self = scheme_malloc_fail_ok(scheme_malloc, sizeof(vim_mz_window));
+      vim_memset(self, 0, sizeof(vim_mz_window));
+      scheme_dont_gc_ptr(self);	/* because win isn't visible to GC */
++     MZ_GC_CHECK();
+      win->w_mzscheme_ref = self;
+      self->win = win;
+!     self->so.type = mz_window_type;
+  
++     MZ_GC_UNREG();
+      return (Scheme_Object *)(self);
+  }
+  
+***************
+*** 1660,1666 ****
+  /*
+   *===========================================================================
+   *  6. Vim Buffer-related Manipulation Functions
+-  *     Note that each buffer should have its own private namespace.
+   *===========================================================================
+   */
+  
+--- 1862,1867 ----
+***************
+*** 1669,1682 ****
+  mzscheme_open_buffer(void *data, int argc, Scheme_Object **argv)
+  {
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+!     char	    *fname;
+      int		    num = 0;
+      Scheme_Object   *onum;
+  
+  #ifdef HAVE_SANDBOX
+      sandbox_check();
+  #endif
+!     fname = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
+      /* TODO make open existing file */
+      num = buflist_add(fname, BLN_LISTED | BLN_CURBUF);
+  
+--- 1870,1883 ----
+  mzscheme_open_buffer(void *data, int argc, Scheme_Object **argv)
+  {
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+!     char_u	    *fname;
+      int		    num = 0;
+      Scheme_Object   *onum;
+  
+  #ifdef HAVE_SANDBOX
+      sandbox_check();
+  #endif
+!     fname = (char_u *)SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
+      /* TODO make open existing file */
+      num = buflist_add(fname, BLN_LISTED | BLN_CURBUF);
+  
+***************
+*** 1712,1718 ****
+      buf_T	*buf;
+      char_u	*fname;
+  
+!     fname = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
+  
+      for (buf = firstbuf; buf; buf = buf->b_next)
+  	if (buf->b_ffname == NULL || buf->b_sfname == NULL)
+--- 1913,1919 ----
+      buf_T	*buf;
+      char_u	*fname;
+  
+!     fname = (char_u *)SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
+  
+      for (buf = firstbuf; buf; buf = buf->b_next)
+  	if (buf->b_ffname == NULL || buf->b_sfname == NULL)
+***************
+*** 1783,1789 ****
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      vim_mz_buffer   *buf = get_buffer_arg(prim->name, 0, argc, argv);
+  
+!     return scheme_make_string(buf->buf->b_ffname);
+  }
+  
+  /* (curr-buff) */
+--- 1984,1990 ----
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      vim_mz_buffer   *buf = get_buffer_arg(prim->name, 0, argc, argv);
+  
+!     return scheme_make_string((char *)buf->buf->b_ffname);
+  }
+  
+  /* (curr-buff) */
+***************
+*** 1796,1802 ****
+      static Scheme_Object *
+  buffer_new(buf_T *buf)
+  {
+!     vim_mz_buffer *self;
+  
+      /* We need to handle deletion of buffers underneath us.
+       * If we add a "b_mzscheme_ref" field to the buf_T structure,
+--- 1997,2007 ----
+      static Scheme_Object *
+  buffer_new(buf_T *buf)
+  {
+!     vim_mz_buffer *self = NULL;
+! 
+!     MZ_GC_DECL_REG(1);
+!     MZ_GC_VAR_IN_REG(0, self);
+!     MZ_GC_REG();
+  
+      /* We need to handle deletion of buffers underneath us.
+       * If we add a "b_mzscheme_ref" field to the buf_T structure,
+***************
+*** 1806,1820 ****
+  	return buf->b_mzscheme_ref;
+  
+      self = scheme_malloc_fail_ok(scheme_malloc, sizeof(vim_mz_buffer));
+- 
+      vim_memset(self, 0, sizeof(vim_mz_buffer));
+!     scheme_dont_gc_ptr(self);	/* because buf isn't visible to GC */
+      buf->b_mzscheme_ref = self;
+      self->buf = buf;
+!     self->tag = mz_buffer_type;
+! 
+!     mzscheme_interface_init(self);	/* Set up namespace */
+  
+      return (Scheme_Object *)(self);
+  }
+  
+--- 2011,2024 ----
+  	return buf->b_mzscheme_ref;
+  
+      self = scheme_malloc_fail_ok(scheme_malloc, sizeof(vim_mz_buffer));
+      vim_memset(self, 0, sizeof(vim_mz_buffer));
+!     scheme_dont_gc_ptr(self); /* because buf isn't visible to GC */
+!     MZ_GC_CHECK();
+      buf->b_mzscheme_ref = self;
+      self->buf = buf;
+!     self->so.type = mz_buffer_type;
+  
++     MZ_GC_UNREG();
+      return (Scheme_Object *)(self);
+  }
+  
+***************
+*** 1845,1858 ****
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      vim_mz_buffer   *buf;
+      int		    linenr;
+!     char	    *line;
+  
+      buf = get_buffer_arg(prim->name, 1, argc, argv);
+      linenr = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0));
+      line = ml_get_buf(buf->buf, (linenr_T)linenr, FALSE);
+  
+      raise_if_error();
+!     return scheme_make_string(line);
+  }
+  
+  
+--- 2049,2062 ----
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      vim_mz_buffer   *buf;
+      int		    linenr;
+!     char_u	    *line;
+  
+      buf = get_buffer_arg(prim->name, 1, argc, argv);
+      linenr = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0));
+      line = ml_get_buf(buf->buf, (linenr_T)linenr, FALSE);
+  
+      raise_if_error();
+!     return scheme_make_string((char *)line);
+  }
+  
+  
+***************
+*** 1869,1875 ****
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      vim_mz_buffer   *buf;
+      int		    i, hi, lo, n;
+!     Scheme_Object   *list;
+  
+      buf = get_buffer_arg(prim->name, 2, argc, argv);
+      list = scheme_null;
+--- 2073,2083 ----
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      vim_mz_buffer   *buf;
+      int		    i, hi, lo, n;
+!     Scheme_Object   *list = NULL;
+! 
+!     MZ_GC_DECL_REG(1);
+!     MZ_GC_VAR_IN_REG(0, list);
+!     MZ_GC_REG();
+  
+      buf = get_buffer_arg(prim->name, 2, argc, argv);
+      list = scheme_null;
+***************
+*** 1897,1904 ****
+  
+  	/* Set the list item */
+  	list = scheme_make_pair(str, list);
+      }
+! 
+      return list;
+  }
+  
+--- 2105,2113 ----
+  
+  	/* Set the list item */
+  	list = scheme_make_pair(str, list);
++ 	MZ_GC_CHECK();
+      }
+!     MZ_GC_UNREG();
+      return list;
+  }
+  
+***************
+*** 1925,1935 ****
+       */
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      vim_mz_buffer   *buf;
+!     Scheme_Object   *line;
+      char	    *save;
+-     buf_T	    *savebuf;
+      int		    n;
+  
+  #ifdef HAVE_SANDBOX
+      sandbox_check();
+  #endif
+--- 2134,2147 ----
+       */
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+      vim_mz_buffer   *buf;
+!     Scheme_Object   *line = NULL;
+      char	    *save;
+      int		    n;
+  
++     MZ_GC_DECL_REG(1);
++     MZ_GC_VAR_IN_REG(0, line);
++     MZ_GC_REG();
++ 
+  #ifdef HAVE_SANDBOX
+      sandbox_check();
+  #endif
+***************
+*** 1943,1949 ****
+  
+      if (SCHEME_FALSEP(line))
+      {
+! 	savebuf = curbuf;
+  	curbuf = buf->buf;
+  
+  	if (u_savedel((linenr_T)n, 1L) == FAIL)
+--- 2155,2162 ----
+  
+      if (SCHEME_FALSEP(line))
+      {
+! 	buf_T	    *savebuf = curbuf;
+! 
+  	curbuf = buf->buf;
+  
+  	if (u_savedel((linenr_T)n, 1L) == FAIL)
+***************
+*** 1962,1994 ****
+  
+  	curbuf = savebuf;
+  
+  	raise_if_error();
+  	return scheme_void;
+      }
+  
+!     /* Otherwise it's a line */
+!     save = string_to_line(line);
+!     savebuf = curbuf;
+  
+!     curbuf = buf->buf;
+  
+-     if (u_savesub((linenr_T)n) == FAIL)
+-     {
+- 	curbuf = savebuf;
+- 	raise_vim_exn(_("cannot save undo information"));
+-     }
+-     else if (ml_replace((linenr_T)n, (char_u *)save, TRUE) == FAIL)
+-     {
+  	curbuf = savebuf;
+- 	raise_vim_exn(_("cannot replace line"));
+-     }
+-     else
+- 	changed_bytes((linenr_T)n, 0);
+  
+!     curbuf = savebuf;
+  
+!     raise_if_error();
+!     return scheme_void;
+  }
+  
+  /*
+--- 2175,2230 ----
+  
+  	curbuf = savebuf;
+  
++ 	MZ_GC_UNREG();
+  	raise_if_error();
+  	return scheme_void;
+      }
++     else
++     {
++ 	/* Otherwise it's a line */
++ 	buf_T	    *savebuf = curbuf;
+  
+! 	save = string_to_line(line);
+  
+! 	curbuf = buf->buf;
+! 
+! 	if (u_savesub((linenr_T)n) == FAIL)
+! 	{
+! 	    curbuf = savebuf;
+! 	    vim_free(save);
+! 	    raise_vim_exn(_("cannot save undo information"));
+! 	}
+! 	else if (ml_replace((linenr_T)n, (char_u *)save, TRUE) == FAIL)
+! 	{
+! 	    curbuf = savebuf;
+! 	    vim_free(save);
+! 	    raise_vim_exn(_("cannot replace line"));
+! 	}
+! 	else
+! 	{
+! 	    vim_free(save);
+! 	    changed_bytes((linenr_T)n, 0);
+! 	}
+  
+  	curbuf = savebuf;
+  
+! 	/* Check that the cursor is not beyond the end of the line now. */
+! 	if (buf->buf == curwin->w_buffer)
+! 	    check_cursor_col();
+  
+! 	MZ_GC_UNREG();
+! 	raise_if_error();
+! 	return scheme_void;
+!     }
+! }
+! 
+!     static void
+! free_array(char **array)
+! {
+!     char **curr = array;
+!     while (*curr != NULL)
+! 	vim_free(*curr++);
+!     vim_free(array);
+  }
+  
+  /*
+***************
+*** 2013,2027 ****
+       *	  3. Anything else - this is an error.
+       */
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+!     vim_mz_buffer   *buf;
+!     Scheme_Object   *line_list;
+!     Scheme_Object   *line;
+!     Scheme_Object   *rest;
+!     char	    **array;
+!     buf_T	    *savebuf;
+      int		    i, old_len, new_len, hi, lo;
+      long	    extra;
+  
+  #ifdef HAVE_SANDBOX
+      sandbox_check();
+  #endif
+--- 2249,2263 ----
+       *	  3. Anything else - this is an error.
+       */
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+!     vim_mz_buffer   *buf = NULL;
+!     Scheme_Object   *line_list = NULL;
+      int		    i, old_len, new_len, hi, lo;
+      long	    extra;
+  
++     MZ_GC_DECL_REG(1);
++     MZ_GC_VAR_IN_REG(0, line_list);
++     MZ_GC_REG();
++ 
+  #ifdef HAVE_SANDBOX
+      sandbox_check();
+  #endif
+***************
+*** 2047,2053 ****
+  
+      if (SCHEME_FALSEP(line_list) || SCHEME_NULLP(line_list))
+      {
+! 	savebuf = curbuf;
+  	curbuf = buf->buf;
+  
+  	if (u_savedel((linenr_T)lo, (long)old_len) == FAIL)
+--- 2283,2289 ----
+  
+      if (SCHEME_FALSEP(line_list) || SCHEME_NULLP(line_list))
+      {
+! 	buf_T	*savebuf = curbuf;
+  	curbuf = buf->buf;
+  
+  	if (u_savedel((linenr_T)lo, (long)old_len) == FAIL)
+***************
+*** 2070,2167 ****
+  
+  	curbuf = savebuf;
+  
+  	raise_if_error();
+  	return scheme_void;
+      }
+  
+!     /* List */
+!     new_len = scheme_proper_list_length(line_list);
+!     if (new_len < 0)	/* improper or cyclic list */
+! 	scheme_wrong_type(prim->name, "proper list",
+! 		2, argc, argv);
+  
+!     /* Using MzScheme allocator, so we don't need to free this and
+!      * can safely keep pointers to GC collected strings
+!      */
+!     array = (char **)scheme_malloc_fail_ok(scheme_malloc,
+! 		(unsigned)(new_len * sizeof(char *)));
+  
+!     rest = line_list;
+!     for (i = 0; i < new_len; ++i)
+!     {
+! 	line = SCHEME_CAR(rest);
+! 	rest = SCHEME_CDR(rest);
+! 	if (!SCHEME_STRINGP(line))
+! 	    scheme_wrong_type(prim->name, "string-list", 2, argc, argv);
+! 	array[i] = string_to_line(line);
+!     }
+  
+!     savebuf = curbuf;
+!     curbuf = buf->buf;
+  
+!     if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL)
+!     {
+! 	curbuf = savebuf;
+! 	raise_vim_exn(_("cannot save undo information"));
+!     }
+  
+!     /*
+!      * If the size of the range is reducing (ie, new_len < old_len) we
+!      * need to delete some old_len. We do this at the start, by
+!      * repeatedly deleting line "lo".
+!      */
+!     for (i = 0; i < old_len - new_len; ++i)
+!     {
+! 	if (ml_delete((linenr_T)lo, FALSE) == FAIL)
+! 	{
+! 	    curbuf = savebuf;
+! 	    raise_vim_exn(_("cannot delete line"));
+! 	}
+! 	extra--;
+!     }
+  
+!     /*
+!      * For as long as possible, replace the existing old_len with the
+!      * new old_len. This is a more efficient operation, as it requires
+!      * less memory allocation and freeing.
+!      */
+!     for (i = 0; i < old_len && i < new_len; i++)
+! 	if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], TRUE) == FAIL)
+! 	{
+! 	    curbuf = savebuf;
+! 	    raise_vim_exn(_("cannot replace line"));
+! 	}
+  
+!     /*
+!      * Now we may need to insert the remaining new_len.  We don't need to
+!      * free the string passed back because MzScheme has control of that
+!      * memory.
+!      */
+!     while (i < new_len)
+!     {
+! 	if (ml_append((linenr_T)(lo + i - 1),
+! 		(char_u *)array[i], 0, FALSE) == FAIL)
+! 	{
+! 	    curbuf = savebuf;
+! 	    raise_vim_exn(_("cannot insert line"));
+  	}
+- 	++i;
+- 	++extra;
+-     }
+  
+!     /*
+!      * Adjust marks. Invalidate any which lie in the
+!      * changed range, and move any in the remainder of the buffer.
+!      */
+!     mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), (long)MAXLNUM, (long)extra);
+!     changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra);
+  
+!     if (buf->buf == curwin->w_buffer)
+! 	mz_fix_cursor(lo, hi, extra);
+!     curbuf = savebuf;
+  
+!     raise_if_error();
+!     return scheme_void;
+  }
+  
+  /*
+--- 2306,2426 ----
+  
+  	curbuf = savebuf;
+  
++ 	MZ_GC_UNREG();
+  	raise_if_error();
+  	return scheme_void;
+      }
++     else
++     {
++ 	buf_T	*savebuf = curbuf;
+  
+! 	/* List */
+! 	new_len = scheme_proper_list_length(line_list);
+! 	MZ_GC_CHECK();
+! 	if (new_len < 0)	/* improper or cyclic list */
+! 	    scheme_wrong_type(prim->name, "proper list",
+! 		    2, argc, argv);
+! 	else
+! 	{
+! 	    char		**array = NULL;
+! 	    Scheme_Object   *line = NULL;
+! 	    Scheme_Object   *rest = NULL;
+! 
+! 	    MZ_GC_DECL_REG(2);
+! 	    MZ_GC_VAR_IN_REG(0, line);
+! 	    MZ_GC_VAR_IN_REG(1, rest);
+! 	    MZ_GC_REG();
+  
+! 	    array = (char **)alloc(new_len * sizeof(char *));
+! 	    vim_memset(array, 0, new_len * sizeof(char *));
+  
+! 	    rest = line_list;
+! 	    for (i = 0; i < new_len; ++i)
+! 	    {
+! 		line = SCHEME_CAR(rest);
+! 		rest = SCHEME_CDR(rest);
+! 		if (!SCHEME_STRINGP(line))
+! 		{
+! 		    free_array(array);
+! 		    scheme_wrong_type(prim->name, "string-list", 2, argc, argv);
+! 		}
+! 		array[i] = string_to_line(line);
+! 	    }
+  
+! 	    curbuf = buf->buf;
+  
+! 	    if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL)
+! 	    {
+! 		curbuf = savebuf;
+! 		free_array(array);
+! 		raise_vim_exn(_("cannot save undo information"));
+! 	    }
+  
+! 	    /*
+! 	     * If the size of the range is reducing (ie, new_len < old_len) we
+! 	     * need to delete some old_len. We do this at the start, by
+! 	     * repeatedly deleting line "lo".
+! 	     */
+! 	    for (i = 0; i < old_len - new_len; ++i)
+! 	    {
+! 		if (ml_delete((linenr_T)lo, FALSE) == FAIL)
+! 		{
+! 		    curbuf = savebuf;
+! 		    free_array(array);
+! 		    raise_vim_exn(_("cannot delete line"));
+! 		}
+! 		extra--;
+! 	    }
+  
+! 	    /*
+! 	     * For as long as possible, replace the existing old_len with the
+! 	     * new old_len. This is a more efficient operation, as it requires
+! 	     * less memory allocation and freeing.
+! 	     */
+! 	    for (i = 0; i < old_len && i < new_len; i++)
+! 		if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], TRUE) == FAIL)
+! 		{
+! 		    curbuf = savebuf;
+! 		    free_array(array);
+! 		    raise_vim_exn(_("cannot replace line"));
+! 		}
+  
+! 	    /*
+! 	     * Now we may need to insert the remaining new_len.  We don't need to
+! 	     * free the string passed back because MzScheme has control of that
+! 	     * memory.
+! 	     */
+! 	    while (i < new_len)
+! 	    {
+! 		if (ml_append((linenr_T)(lo + i - 1),
+! 			    (char_u *)array[i], 0, FALSE) == FAIL)
+! 		{
+! 		    curbuf = savebuf;
+! 		    free_array(array);
+! 		    raise_vim_exn(_("cannot insert line"));
+! 		}
+! 		++i;
+! 		++extra;
+! 	    }
+! 	    MZ_GC_UNREG();
+! 	    free_array(array);
+  	}
+  
+! 	/*
+! 	 * Adjust marks. Invalidate any which lie in the
+! 	 * changed range, and move any in the remainder of the buffer.
+! 	 */
+! 	mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), (long)MAXLNUM, (long)extra);
+! 	changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra);
+  
+! 	if (buf->buf == curwin->w_buffer)
+! 	    mz_fix_cursor(lo, hi, extra);
+! 	curbuf = savebuf;
+  
+! 	MZ_GC_UNREG();
+! 	raise_if_error();
+! 	return scheme_void;
+!     }
+  }
+  
+  /*
+***************
+*** 2179,2193 ****
+  insert_buffer_line_list(void *data, int argc, Scheme_Object **argv)
+  {
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+!     vim_mz_buffer   *buf;
+!     Scheme_Object   *list;
+!     Scheme_Object   *line;
+!     Scheme_Object   *rest;
+!     char	    **array;
+!     char	    *str;
+!     buf_T	    *savebuf;
+      int		    i, n, size;
+  
+  #ifdef HAVE_SANDBOX
+      sandbox_check();
+  #endif
+--- 2438,2452 ----
+  insert_buffer_line_list(void *data, int argc, Scheme_Object **argv)
+  {
+      Vim_Prim	    *prim = (Vim_Prim *)data;
+!     vim_mz_buffer   *buf = NULL;
+!     Scheme_Object   *list = NULL;
+!     char	    *str = NULL;
+      int		    i, n, size;
+  
++     MZ_GC_DECL_REG(1);
++     MZ_GC_VAR_IN_REG(0, list);
++     MZ_GC_REG();
++ 
+  #ifdef HAVE_SANDBOX
+      sandbox_check();
+  #endif
+***************
+*** 2206,2294 ****
+  	check_line_range(n, buf->buf);
+      if (SCHEME_STRINGP(list))
+      {
+! 	str = string_to_line(list);
+  
+! 	savebuf = curbuf;
+  	curbuf = buf->buf;
+  
+  	if (u_save((linenr_T)n, (linenr_T)(n+1)) == FAIL)
+  	{
+  	    curbuf = savebuf;
+  	    raise_vim_exn(_("cannot save undo information"));
+  	}
+  	else if (ml_append((linenr_T)n, (char_u *)str, 0, FALSE) == FAIL)
+  	{
+  	    curbuf = savebuf;
+  	    raise_vim_exn(_("cannot insert line"));
+  	}
+  	else
+  	    appended_lines_mark((linenr_T)n, 1L);
+  
+  	curbuf = savebuf;
+  	update_screen(VALID);
+  
+  	raise_if_error();
+  	return scheme_void;
+      }
+  
+      /* List */
+      size = scheme_proper_list_length(list);
+      if (size < 0)	/* improper or cyclic list */
+  	scheme_wrong_type(prim->name, "proper list",
+  		2, argc, argv);
+! 
+!     /* Using MzScheme allocator, so we don't need to free this and
+!      * can safely keep pointers to GC collected strings
+!      */
+!     array = (char **)scheme_malloc_fail_ok(
+! 	    scheme_malloc, (unsigned)(size * sizeof(char *)));
+! 
+!     rest = list;
+!     for (i = 0; i < size; ++i)
+      {
+! 	line = SCHEME_CAR(rest);
+! 	rest = SCHEME_CDR(rest);
+! 	array[i] = string_to_line(line);
+!     }
+  
+!     savebuf = curbuf;
+!     curbuf = buf->buf;
+  
+!     if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL)
+!     {
+! 	curbuf = savebuf;
+! 	raise_vim_exn(_("cannot save undo information"));
+!     }
+!     else
+!     {
+  	for (i = 0; i < size; ++i)
+! 	    if (ml_append((linenr_T)(n + i), (char_u *)array[i],
+! 			0, FALSE) == FAIL)
+! 	    {
+! 		curbuf = savebuf;
+! 		raise_vim_exn(_("cannot insert line"));
+! 	    }
+  
+! 	if (i > 0)
+! 	    appended_lines_mark((linenr_T)n, (long)i);
+!     }
+  
+!     curbuf = savebuf;
+!     update_screen(VALID);
+  
+      raise_if_error();
+      return scheme_void;
+  }
+  
+- /* (get-buff-namespace [buffer]) */
+-     static Scheme_Object *
+- get_buffer_namespace(void *data, int argc, Scheme_Object **argv)
+- {
+-     Vim_Prim	*prim = (Vim_Prim *)data;
+- 
+-     return (Scheme_Object *)get_buffer_arg(prim->name, 0, argc, argv)->env;
+- }
+- 
+  /*
+   * Predicates
+   */
+--- 2465,2563 ----
+  	check_line_range(n, buf->buf);
+      if (SCHEME_STRINGP(list))
+      {
+! 	buf_T	    *savebuf = curbuf;
+  
+! 	str = string_to_line(list);
+  	curbuf = buf->buf;
+  
+  	if (u_save((linenr_T)n, (linenr_T)(n+1)) == FAIL)
+  	{
+  	    curbuf = savebuf;
++ 	    vim_free(str);
+  	    raise_vim_exn(_("cannot save undo information"));
+  	}
+  	else if (ml_append((linenr_T)n, (char_u *)str, 0, FALSE) == FAIL)
+  	{
+  	    curbuf = savebuf;
++ 	    vim_free(str);
+  	    raise_vim_exn(_("cannot insert line"));
+  	}
+  	else
++ 	{
++ 	    vim_free(str);
+  	    appended_lines_mark((linenr_T)n, 1L);
++ 	}
+  
+  	curbuf = savebuf;
+  	update_screen(VALID);
+  
++ 	MZ_GC_UNREG();
+  	raise_if_error();
+  	return scheme_void;
+      }
+  
+      /* List */
+      size = scheme_proper_list_length(list);
++     MZ_GC_CHECK();
+      if (size < 0)	/* improper or cyclic list */
+  	scheme_wrong_type(prim->name, "proper list",
+  		2, argc, argv);
+!     else
+      {
+! 	Scheme_Object   *line = NULL;
+! 	Scheme_Object   *rest = NULL;
+! 	char		**array;
+! 	buf_T		*savebuf = curbuf;
+! 
+! 	MZ_GC_DECL_REG(2);
+! 	MZ_GC_VAR_IN_REG(0, line);
+! 	MZ_GC_VAR_IN_REG(1, rest);
+! 	MZ_GC_REG();
+  
+! 	array = (char **)alloc(size * sizeof(char *));
+! 	vim_memset(array, 0, size * sizeof(char *));
+  
+! 	rest = list;
+  	for (i = 0; i < size; ++i)
+! 	{
+! 	    line = SCHEME_CAR(rest);
+! 	    rest = SCHEME_CDR(rest);
+! 	    array[i] = string_to_line(line);
+! 	}
+  
+! 	curbuf = buf->buf;
+  
+! 	if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL)
+! 	{
+! 	    curbuf = savebuf;
+! 	    free_array(array);
+! 	    raise_vim_exn(_("cannot save undo information"));
+! 	}
+! 	else
+! 	{
+! 	    for (i = 0; i < size; ++i)
+! 		if (ml_append((linenr_T)(n + i), (char_u *)array[i],
+! 			    0, FALSE) == FAIL)
+! 		{
+! 		    curbuf = savebuf;
+! 		    free_array(array);
+! 		    raise_vim_exn(_("cannot insert line"));
+! 		}
+! 
+! 	    if (i > 0)
+! 		appended_lines_mark((linenr_T)n, (long)i);
+! 	}
+! 	free_array(array);
+! 	MZ_GC_UNREG();
+! 	curbuf = savebuf;
+! 	update_screen(VALID);
+!     }
+  
++     MZ_GC_UNREG();
+      raise_if_error();
+      return scheme_void;
+  }
+  
+  /*
+   * Predicates
+   */
+***************
+*** 2343,2383 ****
+  /*
+   * Convert an MzScheme string into a Vim line.
+   *
+!  * The result is in allocated memory. All internal nulls are replaced by
+!  * newline characters. It is an error for the string to contain newline
+!  * characters.
+   *
+   */
+      static char *
+  string_to_line(Scheme_Object *obj)
+  {
+!     char	*str;
+      long	len;
+      int		i;
+  
+!     str = scheme_display_to_string(obj, &len);
+  
+      /* Error checking: String must not contain newlines, as we
+       * are replacing a single line, and we must replace it with
+       * a single line.
+       */
+!     if (memchr(str, '\n', len))
+  	scheme_signal_error(_("string cannot contain newlines"));
+  
+      /* Create a copy of the string, with internal nulls replaced by
+       * newline characters, as is the vim convention.
+       */
+      for (i = 0; i < len; ++i)
+      {
+! 	if (str[i] == '\0')
+! 	    str[i] = '\n';
+      }
+  
+!     str[i] = '\0';
+  
+!     return str;
+  }
+  
+  /*
+   * Check to see whether a Vim error has been reported, or a keyboard
+   * interrupt (from vim --> got_int) has been detected.
+--- 2612,2784 ----
+  /*
+   * Convert an MzScheme string into a Vim line.
+   *
+!  * All internal nulls are replaced by newline characters.
+!  * It is an error for the string to contain newline characters.
+   *
++  * Returns pointer to Vim allocated memory
+   */
+      static char *
+  string_to_line(Scheme_Object *obj)
+  {
+!     char	*scheme_str = NULL;
+!     char	*vim_str = NULL;
+      long	len;
+      int		i;
+  
+!     scheme_str = scheme_display_to_string(obj, &len);
+  
+      /* Error checking: String must not contain newlines, as we
+       * are replacing a single line, and we must replace it with
+       * a single line.
+       */
+!     if (memchr(scheme_str, '\n', len))
+  	scheme_signal_error(_("string cannot contain newlines"));
+  
++     vim_str = (char *)alloc(len + 1);
++ 
+      /* Create a copy of the string, with internal nulls replaced by
+       * newline characters, as is the vim convention.
+       */
+      for (i = 0; i < len; ++i)
+      {
+! 	if (scheme_str[i] == '\0')
+! 	    vim_str[i] = '\n';
+! 	else
+! 	    vim_str[i] = scheme_str[i];
+      }
+  
+!     vim_str[i] = '\0';
+  
+!     MZ_GC_CHECK();
+!     return vim_str;
+  }
+  
++ #ifdef FEAT_EVAL
++ /*
++  * Convert Vim value into MzScheme, adopted from if_python.c
++  */
++     static Scheme_Object *
++ vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
++ {
++     Scheme_Object   *result = NULL;
++     int		    new_value = TRUE;
++ 
++     MZ_GC_DECL_REG(1);
++     MZ_GC_VAR_IN_REG(0, result);
++     MZ_GC_REG();
++ 
++     /* Avoid infinite recursion */
++     if (depth > 100)
++     {
++ 	MZ_GC_UNREG();
++ 	return scheme_void;
++     }
++ 
++     /* Check if we run into a recursive loop.  The item must be in visited
++      * then and we can use it again.
++      */
++     result = scheme_hash_get(visited, (Scheme_Object *)vim_value);
++     MZ_GC_CHECK();
++     if (result != NULL) /* found, do nothing */
++ 	new_value = FALSE;
++     else if (vim_value->v_type == VAR_STRING)
++     {
++ 	result = scheme_make_string((char *)vim_value->vval.v_string);
++ 	MZ_GC_CHECK();
++     }
++     else if (vim_value->v_type == VAR_NUMBER)
++     {
++ 	result = scheme_make_integer((long)vim_value->vval.v_number);
++ 	MZ_GC_CHECK();
++     }
++ # ifdef FEAT_FLOAT
++     else if (vim_value->v_type == VAR_FLOAT)
++     {
++ 	result = scheme_make_double((double)vim_value->vval.v_float);
++ 	MZ_GC_CHECK();
++     }
++ # endif
++     else if (vim_value->v_type == VAR_LIST)
++     {
++ 	list_T		*list = vim_value->vval.v_list;
++ 	listitem_T	*curr;
++ 
++ 	if (list == NULL || list->lv_first == NULL)
++ 	    result = scheme_null;
++ 	else
++ 	{
++ 	    Scheme_Object   *obj = NULL;
++ 
++ 	    MZ_GC_DECL_REG(1);
++ 	    MZ_GC_VAR_IN_REG(0, obj);
++ 	    MZ_GC_REG();
++ 
++ 	    curr = list->lv_last;
++ 	    obj = vim_to_mzscheme(&curr->li_tv, depth + 1, visited);
++ 	    result = scheme_make_pair(obj, scheme_null);
++ 	    MZ_GC_CHECK();
++ 
++ 	    while (curr != list->lv_first)
++ 	    {
++ 		curr = curr->li_prev;
++ 		obj = vim_to_mzscheme(&curr->li_tv, depth + 1, visited);
++ 		result = scheme_make_pair(obj, result);
++ 		MZ_GC_CHECK();
++ 	    }
++ 	}
++ 	MZ_GC_UNREG();
++     }
++     else if (vim_value->v_type == VAR_DICT)
++     {
++ 	Scheme_Object	  *key = NULL;
++ 	Scheme_Object	  *obj = NULL;
++ 
++ 	MZ_GC_DECL_REG(2);
++ 	MZ_GC_VAR_IN_REG(0, key);
++ 	MZ_GC_VAR_IN_REG(1, obj);
++ 	MZ_GC_REG();
++ 
++ 	result = (Scheme_Object *)scheme_make_hash_table(SCHEME_hash_ptr);
++ 	MZ_GC_CHECK();
++ 	if (vim_value->vval.v_dict != NULL)
++ 	{
++ 	    hashtab_T	*ht = &vim_value->vval.v_dict->dv_hashtab;
++ 	    long_u	todo = ht->ht_used;
++ 	    hashitem_T	*hi;
++ 	    dictitem_T	*di;
++ 
++ 	    for (hi = ht->ht_array; todo > 0; ++hi)
++ 	    {
++ 		if (!HASHITEM_EMPTY(hi))
++ 		{
++ 		    --todo;
++ 
++ 		    di = dict_lookup(hi);
++ 		    obj = vim_to_mzscheme(&di->di_tv, depth + 1, visited);
++ 		    key = scheme_make_string((char *)hi->hi_key);
++ 		    MZ_GC_CHECK();
++ 		    scheme_hash_set((Scheme_Hash_Table *)result, key, obj);
++ 		    MZ_GC_CHECK();
++ 		}
++ 	    }
++ 	}
++ 	MZ_GC_UNREG();
++     }
++     else
++     {
++ 	result = scheme_void;
++ 	new_value = FALSE;
++     }
++     if (new_value)
++     {
++ 	scheme_hash_set(visited, (Scheme_Object *)vim_value, result);
++ 	MZ_GC_CHECK();
++     }
++     MZ_GC_UNREG();
++     return result;
++ }
++ #endif
++ 
+  /*
+   * Check to see whether a Vim error has been reported, or a keyboard
+   * interrupt (from vim --> got_int) has been detected.
+***************
+*** 2392,2441 ****
+   * register Scheme exn:vim
+   */
+      static void
+! register_vim_exn(Scheme_Env *env)
+  {
+!     Scheme_Object   *exn_name = scheme_intern_symbol("exn:vim");
+  
+      if (vim_exn == NULL)
+  	vim_exn = scheme_make_struct_type(exn_name,
+! 		scheme_builtin_value("struct:exn"), NULL, 0, 0, NULL, NULL
+  #if MZSCHEME_VERSION_MAJOR >= 299
+  		, NULL
+  #endif
+  		);
+  
+-     if (vim_exn_values == NULL)
+-     {
+- 	int	nc = 0;
+  
+! 	Scheme_Object   **exn_names = scheme_make_struct_names(
+! 		exn_name, scheme_null, 0, &nc);
+! 	Scheme_Object   **exn_values = scheme_make_struct_values(
+! 		vim_exn, exn_names, nc, 0);
+! 
+! 	vim_exn_names = scheme_make_vector(nc, scheme_false);
+! 	vim_exn_values = scheme_make_vector(nc, scheme_false);
+! 	/* remember names and values */
+! 	mch_memmove(SCHEME_VEC_ELS(vim_exn_names), exn_names,
+! 		nc * sizeof(Scheme_Object *));
+! 	mch_memmove(SCHEME_VEC_ELS(vim_exn_values), exn_values,
+! 		nc * sizeof(Scheme_Object *));
+      }
+! 
+!     add_vim_exn(env);
+! }
+! 
+! /*
+!  * Add stuff of exn:vim to env
+!  */
+!     static void
+! add_vim_exn(Scheme_Env *env)
+! {
+!     int i;
+! 
+!     for (i = 0; i < SCHEME_VEC_SIZE(vim_exn_values); i++)
+! 	scheme_add_global_symbol(SCHEME_VEC_ELS(vim_exn_names)[i],
+! 		SCHEME_VEC_ELS(vim_exn_values)[i], env);
+  }
+  
+  /*
+--- 2793,2851 ----
+   * register Scheme exn:vim
+   */
+      static void
+! register_vim_exn(void)
+  {
+!     int	nc = 0;
+!     int i;
+!     Scheme_Object   *struct_exn = NULL;
+!     Scheme_Object   *exn_name = NULL;
+! 
+!     MZ_GC_DECL_REG(2);
+!     MZ_GC_VAR_IN_REG(0, struct_exn);
+!     MZ_GC_VAR_IN_REG(1, exn_name);
+!     MZ_GC_REG();
+! 
+!     exn_name = scheme_intern_symbol("exn:vim");
+!     MZ_GC_CHECK();
+!     struct_exn = scheme_builtin_value("struct:exn");
+!     MZ_GC_CHECK();
+  
+      if (vim_exn == NULL)
+  	vim_exn = scheme_make_struct_type(exn_name,
+! 		struct_exn, NULL, 0, 0, NULL, NULL
+  #if MZSCHEME_VERSION_MAJOR >= 299
+  		, NULL
+  #endif
+  		);
+  
+  
+!     {
+! 	Scheme_Object   **tmp = NULL;
+! 	Scheme_Object   *exn_names[5] = {NULL, NULL, NULL, NULL, NULL};
+! 	Scheme_Object   *exn_values[5] = {NULL, NULL, NULL, NULL, NULL};
+! 	MZ_GC_DECL_REG(6);
+! 	MZ_GC_ARRAY_VAR_IN_REG(0, exn_names, 5);
+! 	MZ_GC_ARRAY_VAR_IN_REG(3, exn_values, 5);
+! 	MZ_GC_REG();
+! 
+! 	tmp = scheme_make_struct_names(exn_name, scheme_null, 0, &nc);
+! 	assert(nc <= 5);
+! 	mch_memmove(exn_names, tmp, nc * sizeof(Scheme_Object *));
+! 	MZ_GC_CHECK();
+! 
+! 	tmp = scheme_make_struct_values(vim_exn, exn_names, nc, 0);
+! 	mch_memmove(exn_values, tmp, nc * sizeof(Scheme_Object *));
+! 	MZ_GC_CHECK();
+! 
+! 	for (i = 0; i < nc; i++)
+! 	{
+! 	    scheme_add_global_symbol(exn_names[i],
+! 		    exn_values[i], environment);
+! 	    MZ_GC_CHECK();
+! 	}
+! 	MZ_GC_UNREG();
+      }
+!     MZ_GC_UNREG();
+  }
+  
+  /*
+***************
+*** 2444,2469 ****
+      void
+  raise_vim_exn(const char *add_info)
+  {
+!     Scheme_Object   *argv[2];
+!     char_u	    *fmt = _("Vim error: ~a");
+  
+      if (add_info != NULL)
+      {
+! 	Scheme_Object   *info = scheme_make_string(add_info);
+! 	argv[0] = scheme_byte_string_to_char_string(scheme_make_string(
+! 		scheme_format(fmt, strlen(fmt), 1, &info, NULL)));
+  	SCHEME_SET_IMMUTABLE(argv[0]);
+      }
+      else
+  	argv[0] = scheme_make_string(_("Vim error"));
+  
+  #if MZSCHEME_VERSION_MAJOR < 360
+      argv[1] = scheme_current_continuation_marks();
+  #else
+      argv[1] = scheme_current_continuation_marks(NULL);
+  #endif
+  
+!     scheme_raise(scheme_make_struct_instance(vim_exn, 2, argv));
+  }
+  
+      void
+--- 2854,2907 ----
+      void
+  raise_vim_exn(const char *add_info)
+  {
+!     char	    *fmt = _("Vim error: ~a");
+!     Scheme_Object   *argv[2] = {NULL, NULL};
+!     Scheme_Object   *exn = NULL;
+! 
+!     MZ_GC_DECL_REG(4);
+!     MZ_GC_ARRAY_VAR_IN_REG(0, argv, 2);
+!     MZ_GC_VAR_IN_REG(3, exn);
+!     MZ_GC_REG();
+  
+      if (add_info != NULL)
+      {
+! 	char		*c_string = NULL;
+! 	Scheme_Object	*byte_string = NULL;
+! 	Scheme_Object   *info = NULL;
+! 
+! 	MZ_GC_DECL_REG(3);
+! 	MZ_GC_VAR_IN_REG(0, c_string);
+! 	MZ_GC_VAR_IN_REG(1, byte_string);
+! 	MZ_GC_VAR_IN_REG(2, info);
+! 	MZ_GC_REG();
+! 
+! 	info = scheme_make_string(add_info);
+! 	MZ_GC_CHECK();
+! 	c_string = scheme_format(fmt, STRLEN(fmt), 1, &info, NULL);
+! 	MZ_GC_CHECK();
+! 	byte_string = scheme_make_string(c_string);
+! 	MZ_GC_CHECK();
+! 	argv[0] = scheme_byte_string_to_char_string(byte_string);
+! 	MZ_GC_CHECK();
+  	SCHEME_SET_IMMUTABLE(argv[0]);
++ 	MZ_GC_UNREG();
+      }
+      else
+  	argv[0] = scheme_make_string(_("Vim error"));
++     MZ_GC_CHECK();
+  
+  #if MZSCHEME_VERSION_MAJOR < 360
+      argv[1] = scheme_current_continuation_marks();
++     MZ_GC_CHECK();
+  #else
+      argv[1] = scheme_current_continuation_marks(NULL);
++     MZ_GC_CHECK();
+  #endif
+  
+!     exn = scheme_make_struct_instance(vim_exn, 2, argv);
+!     MZ_GC_CHECK();
+!     scheme_raise(exn);
+!     MZ_GC_UNREG();
+  }
+  
+      void
+***************
+*** 2570,2575 ****
+--- 3008,3015 ----
+  	    curwin->w_cursor.lnum = lo;
+  	    check_cursor();
+  	}
++ 	else
++ 	    check_cursor_col();
+  	changed_cline_bef_curs();
+      }
+      invalidate_botline();
+***************
+*** 2595,2601 ****
+      {mzscheme_open_buffer, "open-buff", 1, 1},
+      {get_buffer_by_name, "get-buff-by-name", 1, 1},
+      {get_buffer_by_num, "get-buff-by-num", 1, 1},
+-     {get_buffer_namespace, "get-buff-namespace", 0, 1},
+      /*
+       * Window-related commands
+       */
+--- 3035,3040 ----
+***************
+*** 2653,2675 ****
+  }
+  
+      static void
+! make_modules(Scheme_Env *env)
+  {
+!     int		i;
+!     Scheme_Env	*mod;
+! 
+!     mod = scheme_primitive_module(scheme_intern_symbol("vimext"), env);
+      /* all prims made closed so they can access their own names */
+!     for (i = 0; i < sizeof(prims)/sizeof(prims[0]); i++)
+      {
+  	Vim_Prim *prim = prims + i;
+! 	scheme_add_global(prim->name,
+! 		scheme_make_closed_prim_w_arity(prim->prim, prim, prim->name,
+! 		    prim->mina, prim->maxa),
+! 		mod);
+      }
+-     scheme_add_global("global-namespace", (Scheme_Object *)environment, mod);
+      scheme_finish_primitive_module(mod);
+  }
+  
+  #ifdef HAVE_SANDBOX
+--- 3092,3126 ----
+  }
+  
+      static void
+! make_modules()
+  {
+!     int		    i;
+!     Scheme_Env	    *mod = NULL;
+!     Scheme_Object   *vimext_symbol = NULL;
+!     Scheme_Object   *closed_prim = NULL;
+! 
+!     MZ_GC_DECL_REG(3);
+!     MZ_GC_VAR_IN_REG(0, mod);
+!     MZ_GC_VAR_IN_REG(1, vimext_symbol);
+!     MZ_GC_VAR_IN_REG(2, closed_prim);
+!     MZ_GC_REG();
+! 
+!     vimext_symbol = scheme_intern_symbol("vimext");
+!     MZ_GC_CHECK();
+!     mod = scheme_primitive_module(vimext_symbol, environment);
+!     MZ_GC_CHECK();
+      /* all prims made closed so they can access their own names */
+!     for (i = 0; i < (int)(sizeof(prims)/sizeof(prims[0])); i++)
+      {
+  	Vim_Prim *prim = prims + i;
+! 	closed_prim = scheme_make_closed_prim_w_arity(prim->prim, prim, prim->name,
+! 			    prim->mina, prim->maxa);
+! 	scheme_add_global(prim->name, closed_prim, mod);
+! 	MZ_GC_CHECK();
+      }
+      scheme_finish_primitive_module(mod);
++     MZ_GC_CHECK();
++     MZ_GC_UNREG();
+  }
+  
+  #ifdef HAVE_SANDBOX
+***************
+*** 2697,2717 ****
+--- 3148,3172 ----
+  	{
+  	    MZ_REGISTER_STATIC(M_write);
+  	    M_write = scheme_intern_symbol("write");
++ 	    MZ_GC_CHECK();
+  	}
+  	if (M_read == NULL)
+  	{
+  	    MZ_REGISTER_STATIC(M_read);
+  	    M_read = scheme_intern_symbol("read");
++ 	    MZ_GC_CHECK();
+  	}
+  	if (M_execute == NULL)
+  	{
+  	    MZ_REGISTER_STATIC(M_execute);
+  	    M_execute = scheme_intern_symbol("execute");
++ 	    MZ_GC_CHECK();
+  	}
+  	if (M_delete == NULL)
+  	{
+  	    MZ_REGISTER_STATIC(M_delete);
+  	    M_delete = scheme_intern_symbol("delete");
++ 	    MZ_GC_CHECK();
+  	}
+  
+  	while (!SCHEME_NULLP(requested_access))
+*** ../vim-7.2.190/src/if_mzsch.h	2006-03-24 23:43:11.000000000 +0100
+--- src/if_mzsch.h	2009-05-26 19:08:21.000000000 +0200
+***************
+*** 11,16 ****
+--- 11,17 ----
+  
+  /* #ifdef needed for "make depend" */
+  #ifdef FEAT_MZSCHEME
++ # include <schvers.h>
+  # include <scheme.h>
+  #endif
+  
+***************
+*** 46,49 ****
+--- 47,77 ----
+  # define scheme_byte_string_to_char_string(obj) (obj)
+  #endif
+  
++ /* Precise GC macros */
++ #ifndef MZ_GC_DECL_REG
++ # define MZ_GC_DECL_REG(size)            /* empty */
++ #endif
++ #ifndef MZ_GC_VAR_IN_REG
++ # define MZ_GC_VAR_IN_REG(x, v)          /* empty */
++ #endif
++ #ifndef MZ_GC_ARRAY_VAR_IN_REG
++ # define MZ_GC_ARRAY_VAR_IN_REG(x, v, l) /* empty */
++ #endif
++ #ifndef MZ_GC_REG
++ # define MZ_GC_REG()                     /* empty */
++ #endif
++ #ifndef MZ_GC_UNREG
++ # define MZ_GC_UNREG()                   /* empty */
++ #endif
++ 
++ #ifdef MZSCHEME_FORCE_GC
++ /*
++  * force garbage collection to check all references are registered
++  * seg faults will indicate not registered refs
++  */
++ # define MZ_GC_CHECK() scheme_collect_garbage();
++ #else
++ # define MZ_GC_CHECK()			/* empty */
++ #endif
++ 
+  #endif /* _IF_MZSCH_H_ */
+*** ../vim-7.2.190/src/main.c	2009-05-17 13:30:58.000000000 +0200
+--- src/main.c	2009-05-26 19:09:01.000000000 +0200
+***************
+*** 935,942 ****
+--- 935,948 ----
+  
+      /*
+       * Call the main command loop.  This never returns.
++      * For embedded MzScheme the main_loop will be called by Scheme
++      * for proper stack tracking
+       */
++ #ifndef FEAT_MZSCHEME
+      main_loop(FALSE, FALSE);
++ #else
++     mzscheme_main();
++ #endif
+  
+      return 0;
+  }
+*** ../vim-7.2.190/src/proto/if_mzsch.pro	2004-07-12 17:51:52.000000000 +0200
+--- src/proto/if_mzsch.pro	2009-05-26 19:09:55.000000000 +0200
+***************
+*** 15,24 ****
+  void *mzvim_eval_string __ARGS((char_u *str));
+  struct Scheme_Object *mzvim_apply __ARGS((struct Scheme_Object *, int argc,
+      struct Scheme_Object **));
+! int mzthreads_allowed (void);
+! #ifdef FEAT_GUI_KDE
+! void timer_proc (void);
+! void mzscheme_kde_start_timer (void);
+! void mzscheme_kde_stop_timer (void);
+! #endif
+  /* vim: set ft=c : */
+--- 15,20 ----
+  void *mzvim_eval_string __ARGS((char_u *str));
+  struct Scheme_Object *mzvim_apply __ARGS((struct Scheme_Object *, int argc,
+      struct Scheme_Object **));
+! int mzthreads_allowed __ARGS((void));
+! void mzscheme_main __ARGS((void));
+  /* vim: set ft=c : */
+*** ../vim-7.2.190/src/version.c	2009-05-26 18:12:13.000000000 +0200
+--- src/version.c	2009-05-26 22:52:53.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     191,
+  /**/
+
+-- 
+Scientists decoded the first message from an alien civilization:
+        SIMPLY SEND 6 TIMES 10 TO THE 50 ATOMS OF HYDROGEN TO THE STAR
+SYSTEM AT THE TOP OF THE LIST, CROSS OFF THAT STAR SYSTEM, THEN PUT
+YOUR STAR SYSTEM AT THE BOTTOM OF THE LIST AND SEND IT TO 100 OTHER
+STAR SYSTEMS.  WITHIN ONE TENTH GALACTIC ROTATION YOU WILL RECEIVE
+ENOUGH HYDROGREN TO POWER YOUR CIVILIZATION UNTIL ENTROPY REACHES ITS
+MAXIMUM!  IT REALLY WORKS!
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.192 b/source/ap/vim/patches/7.2.192
new file mode 100644
index 000000000..28cefd5bb
--- /dev/null
+++ b/source/ap/vim/patches/7.2.192
@@ -0,0 +1,135 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.192
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.192 (after 7.2.188)
+Problem:    Still a crash in the garbage collector for a very rare situation.
+Solution:   Make sure current_copyID is always incremented correctly. (Kent
+	    Sibilev)
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.191/src/eval.c	2009-05-26 22:58:43.000000000 +0200
+--- src/eval.c	2009-05-29 21:13:47.000000000 +0200
+***************
+*** 6526,6532 ****
+  
+      /* Don't free variables in the previous_funccal list unless they are only
+       * referenced through previous_funccal.  This must be first, because if
+!      * the item is referenced elsewhere it must not be freed. */
+      for (fc = previous_funccal; fc != NULL; fc = fc->caller)
+      {
+  	set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1);
+--- 6526,6532 ----
+  
+      /* Don't free variables in the previous_funccal list unless they are only
+       * referenced through previous_funccal.  This must be first, because if
+!      * the item is referenced elsewhere the funccal must not be freed. */
+      for (fc = previous_funccal; fc != NULL; fc = fc->caller)
+      {
+  	set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1);
+***************
+*** 6564,6573 ****
+      /* v: vars */
+      set_ref_in_ht(&vimvarht, copyID);
+  
+!     /* Free lists and dictionaries that are not referenced. */
+      did_free = free_unref_items(copyID);
+  
+!     /* check if any funccal can be freed now */
+      for (pfc = &previous_funccal; *pfc != NULL; )
+      {
+  	if (can_free_funccal(*pfc, copyID))
+--- 6564,6577 ----
+      /* v: vars */
+      set_ref_in_ht(&vimvarht, copyID);
+  
+!     /*
+!      * 2. Free lists and dictionaries that are not referenced.
+!      */
+      did_free = free_unref_items(copyID);
+  
+!     /*
+!      * 3. Check if any funccal can be freed now.
+!      */
+      for (pfc = &previous_funccal; *pfc != NULL; )
+      {
+  	if (can_free_funccal(*pfc, copyID))
+***************
+*** 9286,9292 ****
+      if (noref < 0 || noref > 1)
+  	EMSG(_(e_invarg));
+      else
+! 	item_copy(&argvars[0], rettv, TRUE, noref == 0 ? ++current_copyID : 0);
+  }
+  
+  /*
+--- 9290,9299 ----
+      if (noref < 0 || noref > 1)
+  	EMSG(_(e_invarg));
+      else
+!     {
+! 	current_copyID += COPYID_INC;
+! 	item_copy(&argvars[0], rettv, TRUE, noref == 0 ? current_copyID : 0);
+!     }
+  }
+  
+  /*
+***************
+*** 18966,18972 ****
+      char_u	*s;
+      char_u	numbuf[NUMBUFLEN];
+  
+!     s = echo_string(&v->di_tv, &tofree, numbuf, ++current_copyID);
+      list_one_var_a(prefix, v->di_key, v->di_tv.v_type,
+  					 s == NULL ? (char_u *)"" : s, first);
+      vim_free(tofree);
+--- 18973,18980 ----
+      char_u	*s;
+      char_u	numbuf[NUMBUFLEN];
+  
+!     current_copyID += COPYID_INC;
+!     s = echo_string(&v->di_tv, &tofree, numbuf, current_copyID);
+      list_one_var_a(prefix, v->di_key, v->di_tv.v_type,
+  					 s == NULL ? (char_u *)"" : s, first);
+      vim_free(tofree);
+***************
+*** 19401,19407 ****
+  	    }
+  	    else if (eap->cmdidx == CMD_echo)
+  		msg_puts_attr((char_u *)" ", echo_attr);
+! 	    p = echo_string(&rettv, &tofree, numbuf, ++current_copyID);
+  	    if (p != NULL)
+  		for ( ; *p != NUL && !got_int; ++p)
+  		{
+--- 19409,19416 ----
+  	    }
+  	    else if (eap->cmdidx == CMD_echo)
+  		msg_puts_attr((char_u *)" ", echo_attr);
+! 	    current_copyID += COPYID_INC;
+! 	    p = echo_string(&rettv, &tofree, numbuf, current_copyID);
+  	    if (p != NULL)
+  		for ( ; *p != NUL && !got_int; ++p)
+  		{
+*** ../vim-7.2.191/src/version.c	2009-05-26 22:58:43.000000000 +0200
+--- src/version.c	2009-06-03 13:21:20.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     192,
+  /**/
+
+-- 
+Imagine a world without hypothetical situations.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.193 b/source/ap/vim/patches/7.2.193
new file mode 100644
index 000000000..175a6b886
--- /dev/null
+++ b/source/ap/vim/patches/7.2.193
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.193
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.193
+Problem:    Warning for uninitialized values.
+Solution:   Initialize all the struct items.
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.192/src/eval.c	2009-06-03 13:22:22.000000000 +0200
+--- src/eval.c	2009-05-29 21:13:47.000000000 +0200
+***************
+*** 286,292 ****
+  #define VV_RO		2	/* read-only */
+  #define VV_RO_SBX	4	/* read-only in the sandbox */
+  
+! #define VV_NAME(s, t)	s, {{t}}, {0}
+  
+  static struct vimvar
+  {
+--- 286,292 ----
+  #define VV_RO		2	/* read-only */
+  #define VV_RO_SBX	4	/* read-only in the sandbox */
+  
+! #define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}, {0}
+  
+  static struct vimvar
+  {
+*** ../vim-7.2.192/src/version.c	2009-06-03 13:22:23.000000000 +0200
+--- src/version.c	2009-06-03 14:25:18.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     193,
+  /**/
+
+-- 
+No engineer can take a shower without wondering if some sort of Teflon coating
+would make showering unnecessary.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.194 b/source/ap/vim/patches/7.2.194
new file mode 100644
index 000000000..91d438f86
--- /dev/null
+++ b/source/ap/vim/patches/7.2.194
@@ -0,0 +1,44 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.194 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.194 (extra)
+Problem:    MSVC: rem commands are echoed.
+Solution:   Add commands to switch off echo. (Wang Xu)
+Files:	    src/msvc2008.bat
+
+
+*** ../vim-7.2.193/src/msvc2008.bat	2008-06-24 22:55:23.000000000 +0200
+--- src/msvc2008.bat	2009-04-29 18:05:11.000000000 +0200
+***************
+*** 1,5 ****
+--- 1,7 ----
++ @echo off
+  rem To be used on MS-Windows for Visual C++ 2008 Express Edition
+  rem   aka Microsoft Visual Studio 9.0.
+  rem See INSTALLpc.txt for information.
++ @echo on
+  
+  call "%VS90COMNTOOLS%%vsvars32.bat"
+*** ../vim-7.2.193/src/version.c	2009-06-03 14:25:47.000000000 +0200
+--- src/version.c	2009-06-03 15:04:30.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     194,
+  /**/
+
+-- 
+I used to be indecisive, now I'm not sure.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.195 b/source/ap/vim/patches/7.2.195
new file mode 100644
index 000000000..5669a65f9
--- /dev/null
+++ b/source/ap/vim/patches/7.2.195
@@ -0,0 +1,79 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.195
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.195
+Problem:    Leaking memory for the command Vim was started with.
+Solution:   Remember the pointer and free it.
+Files:	    src/gui_gtk_x11.c
+
+
+*** ../vim-7.2.194/src/gui_gtk_x11.c	2009-05-17 16:23:20.000000000 +0200
+--- src/gui_gtk_x11.c	2009-06-03 12:44:31.000000000 +0200
+***************
+*** 412,417 ****
+--- 412,418 ----
+  #endif
+  #if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION)
+  static const char *restart_command = NULL;
++ static       char *abs_restart_command = NULL;
+  #endif
+  static int found_iconic_arg = FALSE;
+  
+***************
+*** 449,456 ****
+  	char_u buf[MAXPATHL];
+  
+  	if (mch_FullName((char_u *)argv[0], buf, (int)sizeof(buf), TRUE) == OK)
+! 	    /* Tiny leak; doesn't matter, and usually we don't even get here */
+! 	    restart_command = (char *)vim_strsave(buf);
+      }
+  #endif
+  
+--- 450,459 ----
+  	char_u buf[MAXPATHL];
+  
+  	if (mch_FullName((char_u *)argv[0], buf, (int)sizeof(buf), TRUE) == OK)
+! 	{
+! 	    abs_restart_command = (char *)vim_strsave(buf);
+! 	    restart_command = abs_restart_command;
+! 	}
+      }
+  #endif
+  
+***************
+*** 611,616 ****
+--- 614,622 ----
+  gui_mch_free_all()
+  {
+      vim_free(gui_argv);
++ #if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION)
++     vim_free(abs_restart_command);
++ #endif
+  }
+  #endif
+  
+*** ../vim-7.2.194/src/version.c	2009-06-03 15:05:05.000000000 +0200
+--- src/version.c	2009-06-03 16:19:00.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     195,
+  /**/
+
+-- 
+I think that you'll agree that engineers are very effective in their social
+interactions.  It's the "normal" people who are nuts.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.196 b/source/ap/vim/patches/7.2.196
new file mode 100644
index 000000000..7be8d95c4
--- /dev/null
+++ b/source/ap/vim/patches/7.2.196
@@ -0,0 +1,84 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.196
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.196 (after 7.2.167)
+Problem:    Turns out splint doesn't work well enough to be usable.
+Solution:   Remove splint support.
+Files:	    Filelist, src/cleanlint.vim
+
+
+*** ../vim-7.2.195/Filelist	2009-05-13 12:46:36.000000000 +0200
+--- Filelist	2009-05-21 14:42:46.000000000 +0200
+***************
+*** 139,145 ****
+  		src/INSTALL \
+  		src/INSTALLx.txt \
+  		src/Makefile \
+- 		src/cleanlint.vim \
+  		src/auto/configure \
+  		src/config.aap.in \
+  		src/config.h.in \
+--- 139,144 ----
+*** ../vim-7.2.195/src/cleanlint.vim	2009-05-13 18:54:14.000000000 +0200
+--- src/cleanlint.vim	1970-01-01 01:00:00.000000000 +0100
+***************
+*** 1,32 ****
+- " Vim tool: Filter output of splint
+- "
+- " Maintainer:	Bram Moolenaar <Bram@vim.org>
+- " Last Change:	2009 May 13
+- 
+- " Usage: redirect output of "make lint" to a file, edit that file with Vim and
+- " :call CleanLint()
+- " This deletes irrelevant messages.  What remains might be valid warnings.
+- 
+- fun! CleanLint()
+-   g/Assignment of dev_t to __dev_t:/lockmarks d
+-   g/Assignment of __dev_t to dev_t:/lockmarks d
+-   g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
+-   g/Operands of == have incompatible types (char_u, int): /lockmarks d
+-   g/Assignment of char to char_u: /lockmarks d
+-   g/Assignment of unsigned int to int: /lockmarks d
+-   g/Assignment of int to unsigned int: /lockmarks d
+-   g/Assignment of unsigned int to long int: /lockmarks d
+-   g/Assignment of int to char_u: /lockmarks d
+-   g/Function .* expects arg . to be wint_t gets int: /lockmarks d
+-   g/Function .* expects arg . to be size_t gets int: /lockmarks d
+-   g/Initial value of .* is type char, expects char_u: /lockmarks d
+-   g/^ex_cmds.h:.* Function types are inconsistent. Parameter 1 is implicitly temp, but unqualified in assigned function:/lockmarks d
+-   g/^ex_docmd.c:.* nospec_str/lockmarks d
+-   g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
+-   g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
+-   g/^  Types are incompatible/lockmarks d
+-   g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
+-   g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
+-   g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
+-   g+ A variable is declared but never used. Use /.@unused@./ in front of declaration to suppress message.+lockmarks d
+- endfun
+--- 0 ----
+*** ../vim-7.2.195/src/version.c	2009-06-03 16:20:09.000000000 +0200
+--- src/version.c	2009-06-03 22:04:31.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     196,
+  /**/
+
+-- 
+It's totally unfair to suggest - as many have - that engineers are socially
+inept.  Engineers simply have different objectives when it comes to social
+interaction.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.197 b/source/ap/vim/patches/7.2.197
new file mode 100644
index 000000000..8e49a5306
--- /dev/null
+++ b/source/ap/vim/patches/7.2.197
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.197
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.197
+Problem:    Warning for uninitialized values.
+Solution:   Initialize all the struct items of typebuf.
+Files:	    src/globals.h
+
+
+*** ../vim-7.2.196/src/globals.h	2009-05-13 12:46:36.000000000 +0200
+--- src/globals.h	2009-06-10 15:52:18.000000000 +0200
+***************
+*** 960,966 ****
+  		    ;
+  EXTERN typebuf_T typebuf		/* typeahead buffer */
+  #ifdef DO_INIT
+! 		    = {NULL, NULL}
+  #endif
+  		    ;
+  #ifdef FEAT_EX_EXTRA
+--- 967,973 ----
+  		    ;
+  EXTERN typebuf_T typebuf		/* typeahead buffer */
+  #ifdef DO_INIT
+! 		    = {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}
+  #endif
+  		    ;
+  #ifdef FEAT_EX_EXTRA
+*** ../vim-7.2.196/src/version.c	2009-06-03 22:07:38.000000000 +0200
+--- src/version.c	2009-06-10 18:14:58.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     197,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+18. Your wife drapes a blond wig over your monitor to remind you of what she
+    looks like.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.198 b/source/ap/vim/patches/7.2.198
new file mode 100644
index 000000000..cae27ac3c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.198
@@ -0,0 +1,60 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.198
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.198
+Problem:    Size of buffer used for tgetent() may be too small.
+Solution:   Use the largest known size everywhere.
+Files:	    src/vim.h
+
+
+*** ../vim-7.2.197/src/vim.h	2009-05-14 22:19:19.000000000 +0200
+--- src/vim.h	2009-06-07 20:37:48.000000000 +0200
+***************
+*** 1345,1355 ****
+  # define MSG_BUF_CLEN  MSG_BUF_LEN	    /* cell length */
+  #endif
+  
+! #if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX)
+! # define TBUFSZ 2048		/* buffer size for termcap entry */
+! #else
+! # define TBUFSZ 1024		/* buffer size for termcap entry */
+! #endif
+  
+  /*
+   * Maximum length of key sequence to be mapped.
+--- 1345,1355 ----
+  # define MSG_BUF_CLEN  MSG_BUF_LEN	    /* cell length */
+  #endif
+  
+! /* Size of the buffer used for tgetent().  Unfortunately this is largely
+!  * undocumented, some systems use 1024.  Using a buffer that is too small
+!  * causes a buffer overrun and a crash.  Use the maximum known value to stay
+!  * on the safe side. */
+! #define TBUFSZ 2048		/* buffer size for termcap entry */
+  
+  /*
+   * Maximum length of key sequence to be mapped.
+*** ../vim-7.2.197/src/version.c	2009-06-10 18:15:49.000000000 +0200
+--- src/version.c	2009-06-16 11:06:45.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     198,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+7. Finish all your sentences with "in accordance with the prophecy".
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.199 b/source/ap/vim/patches/7.2.199
new file mode 100644
index 000000000..391ede6fa
--- /dev/null
+++ b/source/ap/vim/patches/7.2.199
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.199
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.199
+Problem:    Strange character in comment.
+Solution:   Change to "message". (Yongwei Wu)
+Files:      src/term.c
+
+
+*** ../vim-7.2.198/src/term.c	2009-05-17 13:30:58.000000000 +0200
+--- src/term.c	2009-06-16 11:16:17.000000000 +0200
+***************
+*** 5555,5561 ****
+   * respects the current B/k/< settings of 'cpoption'.
+   *
+   * This function is called when expanding mappings/abbreviations on the
+!  * command-line, and for building the "Ambiguous mapping..." error messæge.
+   *
+   * It uses a growarray to build the translation string since the
+   * latter can be wider than the original description. The caller has to
+--- 5555,5561 ----
+   * respects the current B/k/< settings of 'cpoption'.
+   *
+   * This function is called when expanding mappings/abbreviations on the
+!  * command-line, and for building the "Ambiguous mapping..." error message.
+   *
+   * It uses a growarray to build the translation string since the
+   * latter can be wider than the original description. The caller has to
+*** ../vim-7.2.198/src/version.c	2009-06-16 11:08:13.000000000 +0200
+--- src/version.c	2009-06-16 14:31:03.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     199,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+10. Ask people what sex they are. Laugh hysterically after they answer.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.200 b/source/ap/vim/patches/7.2.200
new file mode 100644
index 000000000..65cc598e8
--- /dev/null
+++ b/source/ap/vim/patches/7.2.200
@@ -0,0 +1,348 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.200
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.200
+Problem:    Reading past end of string when navigating the menu bar or
+	    resizing the window.
+Solution:   Add and use mb_ptr2len_len(). (partly by Dominique Pelle)
+	    Also add mb_ptr2cells_len() to prevent more trouble.
+Files:	    src/gui_gtk_x11.c, src/os_unix.c, src/globals.h, src/mbyte.c,
+	    src/proto/mbyte.pro
+
+
+*** ../vim-7.2.199/src/gui_gtk_x11.c	2009-06-03 16:20:09.000000000 +0200
+--- src/gui_gtk_x11.c	2009-06-16 14:44:19.000000000 +0200
+***************
+*** 6077,6088 ****
+  # ifdef FEAT_MBYTE
+  	    if (enc_utf8)
+  	    {
+! 		c = utf_ptr2char(p);
+  		if (c >= 0x10000)	/* show chars > 0xffff as ? */
+  		    c = 0xbf;
+  		buf[textlen].byte1 = c >> 8;
+  		buf[textlen].byte2 = c;
+! 		p += utf_ptr2len(p);
+  		width += utf_char2cells(c);
+  	    }
+  	    else
+--- 6135,6149 ----
+  # ifdef FEAT_MBYTE
+  	    if (enc_utf8)
+  	    {
+! 		int pcc[MAX_MCO];
+! 
+! 		/* TODO: use the composing characters */
+! 		c = utfc_ptr2char_len(p, &pcc, len - (p - s));
+  		if (c >= 0x10000)	/* show chars > 0xffff as ? */
+  		    c = 0xbf;
+  		buf[textlen].byte1 = c >> 8;
+  		buf[textlen].byte2 = c;
+! 		p += utfc_ptr2len_len(p, len - (p - s));
+  		width += utf_char2cells(c);
+  	    }
+  	    else
+***************
+*** 6106,6113 ****
+  	if (has_mbyte)
+  	{
+  	    width = 0;
+! 	    for (p = s; p < s + len; p += (*mb_ptr2len)(p))
+! 		width += (*mb_ptr2cells)(p);
+  	}
+  	else
+  # endif
+--- 6167,6174 ----
+  	if (has_mbyte)
+  	{
+  	    width = 0;
+! 	    for (p = s; p < s + len; p += (*mb_ptr2len_len)(p, len - (p - s)))
+! 		width += (*mb_ptr2cells_len)(p, len - (p - s));
+  	}
+  	else
+  # endif
+*** ../vim-7.2.199/src/os_unix.c	2009-05-17 13:30:58.000000000 +0200
+--- src/os_unix.c	2009-06-03 12:35:59.000000000 +0200
+***************
+*** 4305,4311 ****
+  				ta_buf[i] = '\n';
+  # ifdef FEAT_MBYTE
+  			    if (has_mbyte)
+! 				i += (*mb_ptr2len)(ta_buf + i) - 1;
+  # endif
+  			}
+  
+--- 4305,4312 ----
+  				ta_buf[i] = '\n';
+  # ifdef FEAT_MBYTE
+  			    if (has_mbyte)
+! 				i += (*mb_ptr2len_len)(ta_buf + i,
+! 							ta_len + len - i) - 1;
+  # endif
+  			}
+  
+*** ../vim-7.2.199/src/globals.h	2009-06-10 18:15:49.000000000 +0200
+--- src/globals.h	2009-06-12 21:10:30.000000000 +0200
+***************
+*** 810,820 ****
+--- 815,828 ----
+   */
+  /* length of char in bytes, including following composing chars */
+  EXTERN int (*mb_ptr2len) __ARGS((char_u *p)) INIT(= latin_ptr2len);
++ /* idem, with limit on string length */
++ EXTERN int (*mb_ptr2len_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2len_len);
+  /* byte length of char */
+  EXTERN int (*mb_char2len) __ARGS((int c)) INIT(= latin_char2len);
+  /* convert char to bytes, return the length */
+  EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes);
+  EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells);
++ EXTERN int (*mb_ptr2cells_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2cells_len);
+  EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells);
+  EXTERN int (*mb_off2cells) __ARGS((unsigned off, unsigned max_off)) INIT(= latin_off2cells);
+  EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char);
+*** ../vim-7.2.199/src/mbyte.c	2009-05-17 13:30:58.000000000 +0200
+--- src/mbyte.c	2009-06-16 15:01:30.000000000 +0200
+***************
+*** 127,133 ****
+--- 127,136 ----
+  static int dbcs_char2len __ARGS((int c));
+  static int dbcs_char2bytes __ARGS((int c, char_u *buf));
+  static int dbcs_ptr2len __ARGS((char_u *p));
++ static int dbcs_ptr2len_len __ARGS((char_u *p, int size));
++ static int utf_ptr2cells_len __ARGS((char_u *p, int size));
+  static int dbcs_char2cells __ARGS((int c));
++ static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
+  static int dbcs_ptr2char __ARGS((char_u *p));
+  
+  /* Lookup table to quickly get the length in bytes of a UTF-8 character from
+***************
+*** 606,614 ****
+--- 609,619 ----
+      if (enc_utf8)
+      {
+  	mb_ptr2len = utfc_ptr2len;
++ 	mb_ptr2len_len = utfc_ptr2len_len;
+  	mb_char2len = utf_char2len;
+  	mb_char2bytes = utf_char2bytes;
+  	mb_ptr2cells = utf_ptr2cells;
++ 	mb_ptr2cells_len = utf_ptr2cells_len;
+  	mb_char2cells = utf_char2cells;
+  	mb_off2cells = utf_off2cells;
+  	mb_ptr2char = utf_ptr2char;
+***************
+*** 617,625 ****
+--- 622,632 ----
+      else if (enc_dbcs != 0)
+      {
+  	mb_ptr2len = dbcs_ptr2len;
++ 	mb_ptr2len_len = dbcs_ptr2len_len;
+  	mb_char2len = dbcs_char2len;
+  	mb_char2bytes = dbcs_char2bytes;
+  	mb_ptr2cells = dbcs_ptr2cells;
++ 	mb_ptr2cells_len = dbcs_ptr2cells_len;
+  	mb_char2cells = dbcs_char2cells;
+  	mb_off2cells = dbcs_off2cells;
+  	mb_ptr2char = dbcs_ptr2char;
+***************
+*** 628,636 ****
+--- 635,645 ----
+      else
+      {
+  	mb_ptr2len = latin_ptr2len;
++ 	mb_ptr2len_len = latin_ptr2len_len;
+  	mb_char2len = latin_char2len;
+  	mb_char2bytes = latin_char2bytes;
+  	mb_ptr2cells = latin_ptr2cells;
++ 	mb_ptr2cells_len = latin_ptr2cells_len;
+  	mb_char2cells = latin_char2cells;
+  	mb_off2cells = latin_off2cells;
+  	mb_ptr2char = latin_ptr2char;
+***************
+*** 1069,1075 ****
+   * Get byte length of character at "*p" but stop at a NUL.
+   * For UTF-8 this includes following composing characters.
+   * Returns 0 when *p is NUL.
+-  *
+   */
+      int
+  latin_ptr2len(p)
+--- 1078,1083 ----
+***************
+*** 1091,1096 ****
+--- 1099,1138 ----
+      return len;
+  }
+  
++ /*
++  * mb_ptr2len_len() function pointer.
++  * Like mb_ptr2len(), but limit to read "size" bytes.
++  * Returns 0 for an empty string.
++  * Returns 1 for an illegal char or an incomplete byte sequence.
++  */
++     int
++ latin_ptr2len_len(p, size)
++     char_u	*p;
++     int		size;
++ {
++     if (size < 1 || *p == NUL)
++ 	return 0;
++     return 1;
++ }
++ 
++     static int
++ dbcs_ptr2len_len(p, size)
++     char_u	*p;
++     int		size;
++ {
++     int		len;
++ 
++     if (size < 1 || *p == NUL)
++ 	return 0;
++     if (size == 1)
++ 	return 1;
++     /* Check that second byte is not missing. */
++     len = MB_BYTE2LEN(*p);
++     if (len == 2 && p[1] == NUL)
++ 	len = 1;
++     return len;
++ }
++ 
+  struct interval
+  {
+      unsigned short first;
+***************
+*** 1287,1292 ****
+--- 1329,1383 ----
+  }
+  
+  /*
++  * mb_ptr2cells_len() function pointer.
++  * Like mb_ptr2cells(), but limit string length to "size".
++  * For an empty string or truncated character returns 1.
++  */
++     int
++ latin_ptr2cells_len(p, size)
++     char_u	*p UNUSED;
++     int		size UNUSED;
++ {
++     return 1;
++ }
++ 
++     static int
++ utf_ptr2cells_len(p, size)
++     char_u	*p;
++     int		size;
++ {
++     int		c;
++ 
++     /* Need to convert to a wide character. */
++     if (size > 0 && *p >= 0x80)
++     {
++ 	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
++ 	    return 1;
++ 	c = utf_ptr2char(p);
++ 	/* An illegal byte is displayed as <xx>. */
++ 	if (utf_ptr2len(p) == 1 || c == NUL)
++ 	    return 4;
++ 	/* If the char is ASCII it must be an overlong sequence. */
++ 	if (c < 0x80)
++ 	    return char2cells(c);
++ 	return utf_char2cells(c);
++     }
++     return 1;
++ }
++ 
++     static int
++ dbcs_ptr2cells_len(p, size)
++     char_u	*p;
++     int		size;
++ {
++     /* Number of cells is equal to number of bytes, except for euc-jp when
++      * the first byte is 0x8e. */
++     if (size <= 1 || (enc_dbcs == DBCS_JPNU && *p == 0x8e))
++ 	return 1;
++     return MB_BYTE2LEN(*p);
++ }
++ 
++ /*
+   * mb_char2cells() function pointer.
+   * Return the number of display cells character "c" occupies.
+   * Only takes care of multi-byte chars, not "^C" and such.
+***************
+*** 1716,1721 ****
+--- 1807,1813 ----
+  /*
+   * Return the number of bytes the UTF-8 encoding of the character at "p[size]"
+   * takes.  This includes following composing characters.
++  * Returns 0 for an empty string.
+   * Returns 1 for an illegal char or an incomplete byte sequence.
+   */
+      int
+***************
+*** 1728,1734 ****
+      int		prevlen;
+  #endif
+  
+!     if (*p == NUL)
+  	return 0;
+      if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */
+  	return 1;
+--- 1820,1826 ----
+      int		prevlen;
+  #endif
+  
+!     if (size < 1 || *p == NUL)
+  	return 0;
+      if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */
+  	return 1;
+*** ../vim-7.2.199/src/proto/mbyte.pro	2008-07-13 19:34:19.000000000 +0200
+--- src/proto/mbyte.pro	2009-06-16 14:58:39.000000000 +0200
+***************
+*** 7,16 ****
+--- 7,18 ----
+  int latin_char2len __ARGS((int c));
+  int latin_char2bytes __ARGS((int c, char_u *buf));
+  int latin_ptr2len __ARGS((char_u *p));
++ int latin_ptr2len_len __ARGS((char_u *p, int size));
+  int utf_char2cells __ARGS((int c));
+  int latin_ptr2cells __ARGS((char_u *p));
+  int utf_ptr2cells __ARGS((char_u *p));
+  int dbcs_ptr2cells __ARGS((char_u *p));
++ int latin_ptr2cells_len __ARGS((char_u *p, int size));
+  int latin_char2cells __ARGS((int c));
+  int latin_off2cells __ARGS((unsigned off, unsigned max_off));
+  int dbcs_off2cells __ARGS((unsigned off, unsigned max_off));
+***************
+*** 85,90 ****
+--- 87,93 ----
+  int preedit_get_status __ARGS((void));
+  int im_is_preediting __ARGS((void));
+  int convert_setup __ARGS((vimconv_T *vcp, char_u *from, char_u *to));
++ int convert_setup_ext __ARGS((vimconv_T *vcp, char_u *from, int from_unicode_is_utf8, char_u *to, int to_unicode_is_utf8));
+  int convert_input __ARGS((char_u *ptr, int len, int maxlen));
+  int convert_input_safe __ARGS((char_u *ptr, int len, int maxlen, char_u **restp, int *restlenp));
+  char_u *string_convert __ARGS((vimconv_T *vcp, char_u *ptr, int *lenp));
+*** ../vim-7.2.199/src/version.c	2009-06-16 14:31:56.000000000 +0200
+--- src/version.c	2009-06-16 14:37:38.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     200,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+12. Sing along at the opera.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.201 b/source/ap/vim/patches/7.2.201
new file mode 100644
index 000000000..cd2df0798
--- /dev/null
+++ b/source/ap/vim/patches/7.2.201
@@ -0,0 +1,494 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.201
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.201
+Problem:    Cannot copy/paste HTML to/from Firefox via the clipboard.
+Solution:   Implement this for GTK.  Add the "html" value to 'clipboard'.
+Files:	    runtime/doc/options.txt, src/globals.h, src/gui_gtk_x11.c,
+	    src/mbyte.c, src/proto/mbyte.pro, src/option.c
+
+
+*** ../vim-7.2.200/runtime/doc/options.txt	2009-02-21 20:27:00.000000000 +0100
+--- runtime/doc/options.txt	2009-06-12 22:25:22.000000000 +0200
+***************
+*** 1443,1448 ****
+--- 1444,1457 ----
+  	autoselectml	Like "autoselect", but for the modeless selection
+  			only.  Compare to the 'A' flag in 'guioptions'.
+  
++ 	html		When the clipboard contains HTML, use this when
++ 			pasting.  When putting text on the clipboard, mark it
++ 			as HTML.  This works to copy rendered HTML from
++ 			Firefox, paste it as raw HTML in Vim, select the HTML
++ 			in Vim and paste it in a rich edit box in Firefox.
++ 			Only supported for GTK version 2 and later.
++ 			Only available with the |+multi_byte| feature.
++ 
+  	exclude:{pattern}
+  			Defines a pattern that is matched against the name of
+  			the terminal 'term'.  If there is a match, no
+*** ../vim-7.2.200/src/globals.h	2009-06-16 15:12:11.000000000 +0200
+--- src/globals.h	2009-06-12 21:10:30.000000000 +0200
+***************
+*** 509,514 ****
+--- 509,515 ----
+  EXTERN int	clip_unnamed INIT(= FALSE);
+  EXTERN int	clip_autoselect INIT(= FALSE);
+  EXTERN int	clip_autoselectml INIT(= FALSE);
++ EXTERN int	clip_html INIT(= FALSE);
+  EXTERN regprog_T *clip_exclude_prog INIT(= NULL);
+  #endif
+  
+*** ../vim-7.2.200/src/gui_gtk_x11.c	2009-06-16 15:12:11.000000000 +0200
+--- src/gui_gtk_x11.c	2009-06-16 14:44:19.000000000 +0200
+***************
+*** 107,112 ****
+--- 107,113 ----
+      TARGET_UTF8_STRING,
+      TARGET_STRING,
+      TARGET_COMPOUND_TEXT,
++     TARGET_HTML,
+      TARGET_TEXT,
+      TARGET_TEXT_URI_LIST,
+      TARGET_TEXT_PLAIN,
+***************
+*** 123,128 ****
+--- 124,130 ----
+      {VIMENC_ATOM_NAME,	0, TARGET_VIMENC},
+      {VIM_ATOM_NAME,	0, TARGET_VIM},
+  #ifdef FEAT_MBYTE
++     {"text/html",	0, TARGET_HTML},
+      {"UTF8_STRING",	0, TARGET_UTF8_STRING},
+  #endif
+      {"COMPOUND_TEXT",	0, TARGET_COMPOUND_TEXT},
+***************
+*** 140,145 ****
+--- 142,148 ----
+  {
+      {"text/uri-list",	0, TARGET_TEXT_URI_LIST},
+  # ifdef FEAT_MBYTE
++     {"text/html",	0, TARGET_HTML},
+      {"UTF8_STRING",	0, TARGET_UTF8_STRING},
+  # endif
+      {"STRING",		0, TARGET_STRING},
+***************
+*** 178,183 ****
+--- 181,187 ----
+   * Atoms used to control/reference X11 selections.
+   */
+  #ifdef FEAT_MBYTE
++ static GdkAtom html_atom = GDK_NONE;
+  static GdkAtom utf8_string_atom = GDK_NONE;
+  #endif
+  #ifndef HAVE_GTK2
+***************
+*** 1364,1369 ****
+--- 1368,1391 ----
+  	    else
+  		text = tmpbuf_utf8;
+  	}
++ 	else if (len >= 2 && text[0] == 0xff && text[1] == 0xfe)
++ 	{
++ 	    vimconv_T conv;
++ 
++ 	    /* UTF-16, we get this for HTML */
++ 	    conv.vc_type = CONV_NONE;
++ 	    convert_setup_ext(&conv, (char_u *)"utf-16le", FALSE, p_enc, TRUE);
++ 
++ 	    if (conv.vc_type != CONV_NONE)
++ 	    {
++ 		text += 2;
++ 		len -= 2;
++ 		tmpbuf = string_convert(&conv, text, &len);
++ 		convert_setup(&conv, NULL, NULL);
++ 	    }
++ 	    if (tmpbuf != NULL)
++ 		text = tmpbuf;
++ 	}
+      }
+  #else /* !HAVE_GTK2 */
+  # ifdef FEAT_MBYTE
+***************
+*** 1451,1456 ****
+--- 1473,1479 ----
+  
+      if (info != (guint)TARGET_STRING
+  #ifdef FEAT_MBYTE
++ 	    && (!clip_html || info != (guint)TARGET_HTML)
+  	    && info != (guint)TARGET_UTF8_STRING
+  	    && info != (guint)TARGET_VIMENC
+  #endif
+***************
+*** 1486,1491 ****
+--- 1509,1548 ----
+      }
+  
+  #ifdef FEAT_MBYTE
++     else if (info == (guint)TARGET_HTML)
++     {
++ 	vimconv_T conv;
++ 
++ 	/* Since we get utf-16, we probably should set it as well. */
++ 	conv.vc_type = CONV_NONE;
++ 	convert_setup_ext(&conv, p_enc, TRUE, (char_u *)"utf-16le", FALSE);
++ 	if (conv.vc_type != CONV_NONE)
++ 	{
++ 	    tmpbuf = string_convert(&conv, string, &length);
++ 	    convert_setup(&conv, NULL, NULL);
++ 	    vim_free(string);
++ 	    string = tmpbuf;
++ 	}
++ 
++ 	/* Prepend the BOM: "fffe" */
++ 	if (string != NULL)
++ 	{
++ 	    tmpbuf = alloc(length + 2);
++ 	    tmpbuf[0] = 0xff;
++ 	    tmpbuf[1] = 0xfe;
++ 	    mch_memmove(tmpbuf + 2, string, (size_t)length);
++ 	    vim_free(string);
++ 	    string = tmpbuf;
++ 	    length += 2;
++ 
++ 	    selection_data->type = selection_data->target;
++ 	    selection_data->format = 16;	/* 16 bits per char */
++ 	    gtk_selection_data_set(selection_data, html_atom, 16,
++ 							      string, length);
++ 	    vim_free(string);
++ 	}
++ 	return;
++     }
+      else if (info == (guint)TARGET_VIMENC)
+      {
+  	int l = STRLEN(p_enc);
+***************
+*** 3464,3469 ****
+--- 3521,3527 ----
+  
+      /* Initialise atoms */
+  #ifdef FEAT_MBYTE
++     html_atom = gdk_atom_intern("text/html", FALSE);
+      utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
+  #endif
+  #ifndef HAVE_GTK2
+***************
+*** 6665,6670 ****
+--- 6723,6732 ----
+  
+      for (i = 0; i < N_SELECTION_TARGETS; ++i)
+      {
++ #ifdef FEAT_MBYTE
++ 	if (!clip_html && selection_targets[i].info == TARGET_HTML)
++ 	    continue;
++ #endif
+  	received_selection = RS_NONE;
+  	target = gdk_atom_intern(selection_targets[i].target, FALSE);
+  
+*** ../vim-7.2.200/src/mbyte.c	2009-06-16 15:12:11.000000000 +0200
+--- src/mbyte.c	2009-06-16 15:01:30.000000000 +0200
+***************
+*** 3265,3271 ****
+  
+  # if defined(USE_ICONV) || defined(PROTO)
+  
+! static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp));
+  
+  /*
+   * Call iconv_open() with a check if iconv() works properly (there are broken
+--- 3265,3271 ----
+  
+  # if defined(USE_ICONV) || defined(PROTO)
+  
+! static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp, int *resultlenp));
+  
+  /*
+   * Call iconv_open() with a check if iconv() works properly (there are broken
+***************
+*** 3326,3338 ****
+   * If "unconvlenp" is not NULL handle the string ending in an incomplete
+   * sequence and set "*unconvlenp" to the length of it.
+   * Returns the converted string in allocated memory.  NULL for an error.
+   */
+      static char_u *
+! iconv_string(vcp, str, slen, unconvlenp)
+      vimconv_T	*vcp;
+      char_u	*str;
+      int		slen;
+      int		*unconvlenp;
+  {
+      const char	*from;
+      size_t	fromlen;
+--- 3326,3340 ----
+   * If "unconvlenp" is not NULL handle the string ending in an incomplete
+   * sequence and set "*unconvlenp" to the length of it.
+   * Returns the converted string in allocated memory.  NULL for an error.
++  * If resultlenp is not NULL, sets it to the result length in bytes.
+   */
+      static char_u *
+! iconv_string(vcp, str, slen, unconvlenp, resultlenp)
+      vimconv_T	*vcp;
+      char_u	*str;
+      int		slen;
+      int		*unconvlenp;
++     int		*resultlenp;
+  {
+      const char	*from;
+      size_t	fromlen;
+***************
+*** 3418,3423 ****
+--- 3420,3428 ----
+  	/* Not enough room or skipping illegal sequence. */
+  	done = to - (char *)result;
+      }
++ 
++     if (resultlenp != NULL)
++ 	*resultlenp = (int)(to - (char *)result);
+      return result;
+  }
+  
+***************
+*** 5837,5844 ****
+--- 5842,5866 ----
+      char_u	*from;
+      char_u	*to;
+  {
++     return convert_setup_ext(vcp, from, TRUE, to, TRUE);
++ }
++ 
++ /*
++  * As convert_setup(), but only when from_unicode_is_utf8 is TRUE will all
++  * "from" unicode charsets be considered utf-8.  Same for "to".
++  */
++     int
++ convert_setup_ext(vcp, from, from_unicode_is_utf8, to, to_unicode_is_utf8)
++     vimconv_T	*vcp;
++     char_u	*from;
++     int		from_unicode_is_utf8;
++     char_u	*to;
++     int		to_unicode_is_utf8;
++ {
+      int		from_prop;
+      int		to_prop;
++     int		from_is_utf8;
++     int		to_is_utf8;
+  
+      /* Reset to no conversion. */
+  # ifdef USE_ICONV
+***************
+*** 5856,5892 ****
+  
+      from_prop = enc_canon_props(from);
+      to_prop = enc_canon_props(to);
+!     if ((from_prop & ENC_LATIN1) && (to_prop & ENC_UNICODE))
+      {
+  	/* Internal latin1 -> utf-8 conversion. */
+  	vcp->vc_type = CONV_TO_UTF8;
+  	vcp->vc_factor = 2;	/* up to twice as long */
+      }
+!     else if ((from_prop & ENC_LATIN9) && (to_prop & ENC_UNICODE))
+      {
+  	/* Internal latin9 -> utf-8 conversion. */
+  	vcp->vc_type = CONV_9_TO_UTF8;
+  	vcp->vc_factor = 3;	/* up to three as long (euro sign) */
+      }
+!     else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN1))
+      {
+  	/* Internal utf-8 -> latin1 conversion. */
+  	vcp->vc_type = CONV_TO_LATIN1;
+      }
+!     else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN9))
+      {
+  	/* Internal utf-8 -> latin9 conversion. */
+  	vcp->vc_type = CONV_TO_LATIN9;
+      }
+  #ifdef WIN3264
+      /* Win32-specific codepage <-> codepage conversion without iconv. */
+!     else if (((from_prop & ENC_UNICODE) || encname2codepage(from) > 0)
+! 	    && ((to_prop & ENC_UNICODE) || encname2codepage(to) > 0))
+      {
+  	vcp->vc_type = CONV_CODEPAGE;
+  	vcp->vc_factor = 2;	/* up to twice as long */
+! 	vcp->vc_cpfrom = (from_prop & ENC_UNICODE) ? 0 : encname2codepage(from);
+! 	vcp->vc_cpto = (to_prop & ENC_UNICODE) ? 0 : encname2codepage(to);
+      }
+  #endif
+  #ifdef MACOS_X
+--- 5878,5923 ----
+  
+      from_prop = enc_canon_props(from);
+      to_prop = enc_canon_props(to);
+!     if (from_unicode_is_utf8)
+! 	from_is_utf8 = from_prop & ENC_UNICODE;
+!     else
+! 	from_is_utf8 = from_prop == ENC_UNICODE;
+!     if (to_unicode_is_utf8)
+! 	to_is_utf8 = to_prop & ENC_UNICODE;
+!     else
+! 	to_is_utf8 = to_prop == ENC_UNICODE;
+! 
+!     if ((from_prop & ENC_LATIN1) && to_is_utf8)
+      {
+  	/* Internal latin1 -> utf-8 conversion. */
+  	vcp->vc_type = CONV_TO_UTF8;
+  	vcp->vc_factor = 2;	/* up to twice as long */
+      }
+!     else if ((from_prop & ENC_LATIN9) && to_is_utf8)
+      {
+  	/* Internal latin9 -> utf-8 conversion. */
+  	vcp->vc_type = CONV_9_TO_UTF8;
+  	vcp->vc_factor = 3;	/* up to three as long (euro sign) */
+      }
+!     else if (from_is_utf8 && (to_prop & ENC_LATIN1))
+      {
+  	/* Internal utf-8 -> latin1 conversion. */
+  	vcp->vc_type = CONV_TO_LATIN1;
+      }
+!     else if (from_is_utf8 && (to_prop & ENC_LATIN9))
+      {
+  	/* Internal utf-8 -> latin9 conversion. */
+  	vcp->vc_type = CONV_TO_LATIN9;
+      }
+  #ifdef WIN3264
+      /* Win32-specific codepage <-> codepage conversion without iconv. */
+!     else if ((from_is_utf8 || encname2codepage(from) > 0)
+! 	    && (to_is_utf8 || encname2codepage(to) > 0))
+      {
+  	vcp->vc_type = CONV_CODEPAGE;
+  	vcp->vc_factor = 2;	/* up to twice as long */
+! 	vcp->vc_cpfrom = from_is_utf8 ? 0 : encname2codepage(from);
+! 	vcp->vc_cpto = to_is_utf8 ? 0 : encname2codepage(to);
+      }
+  #endif
+  #ifdef MACOS_X
+***************
+*** 5894,5900 ****
+      {
+  	vcp->vc_type = CONV_MAC_LATIN1;
+      }
+!     else if ((from_prop & ENC_MACROMAN) && (to_prop & ENC_UNICODE))
+      {
+  	vcp->vc_type = CONV_MAC_UTF8;
+  	vcp->vc_factor = 2;	/* up to twice as long */
+--- 5925,5931 ----
+      {
+  	vcp->vc_type = CONV_MAC_LATIN1;
+      }
+!     else if ((from_prop & ENC_MACROMAN) && to_is_utf8)
+      {
+  	vcp->vc_type = CONV_MAC_UTF8;
+  	vcp->vc_factor = 2;	/* up to twice as long */
+***************
+*** 5903,5909 ****
+      {
+  	vcp->vc_type = CONV_LATIN1_MAC;
+      }
+!     else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_MACROMAN))
+      {
+  	vcp->vc_type = CONV_UTF8_MAC;
+      }
+--- 5934,5940 ----
+      {
+  	vcp->vc_type = CONV_LATIN1_MAC;
+      }
+!     else if (from_is_utf8 && (to_prop & ENC_MACROMAN))
+      {
+  	vcp->vc_type = CONV_UTF8_MAC;
+      }
+***************
+*** 5913,5920 ****
+      {
+  	/* Use iconv() for conversion. */
+  	vcp->vc_fd = (iconv_t)my_iconv_open(
+! 		(to_prop & ENC_UNICODE) ? (char_u *)"utf-8" : to,
+! 		(from_prop & ENC_UNICODE) ? (char_u *)"utf-8" : from);
+  	if (vcp->vc_fd != (iconv_t)-1)
+  	{
+  	    vcp->vc_type = CONV_ICONV;
+--- 5944,5951 ----
+      {
+  	/* Use iconv() for conversion. */
+  	vcp->vc_fd = (iconv_t)my_iconv_open(
+! 		to_is_utf8 ? (char_u *)"utf-8" : to,
+! 		from_is_utf8 ? (char_u *)"utf-8" : from);
+  	if (vcp->vc_fd != (iconv_t)-1)
+  	{
+  	    vcp->vc_type = CONV_ICONV;
+***************
+*** 6170,6178 ****
+  
+  # ifdef USE_ICONV
+  	case CONV_ICONV:	/* conversion with output_conv.vc_fd */
+! 	    retval = iconv_string(vcp, ptr, len, unconvlenp);
+! 	    if (retval != NULL && lenp != NULL)
+! 		*lenp = (int)STRLEN(retval);
+  	    break;
+  # endif
+  # ifdef WIN3264
+--- 6201,6207 ----
+  
+  # ifdef USE_ICONV
+  	case CONV_ICONV:	/* conversion with output_conv.vc_fd */
+! 	    retval = iconv_string(vcp, ptr, len, unconvlenp, lenp);
+  	    break;
+  # endif
+  # ifdef WIN3264
+*** ../vim-7.2.200/src/option.c	2009-05-17 13:30:58.000000000 +0200
+--- src/option.c	2009-06-12 21:09:51.000000000 +0200
+***************
+*** 7024,7029 ****
+--- 7024,7030 ----
+      int		new_unnamed = FALSE;
+      int		new_autoselect = FALSE;
+      int		new_autoselectml = FALSE;
++     int		new_html = FALSE;
+      regprog_T	*new_exclude_prog = NULL;
+      char_u	*errmsg = NULL;
+      char_u	*p;
+***************
+*** 7047,7052 ****
+--- 7048,7058 ----
+  	    new_autoselectml = TRUE;
+  	    p += 12;
+  	}
++ 	else if (STRNCMP(p, "html", 4) == 0 && (p[4] == ',' || p[4] == NUL))
++ 	{
++ 	    new_html = TRUE;
++ 	    p += 4;
++ 	}
+  	else if (STRNCMP(p, "exclude:", 8) == 0 && new_exclude_prog == NULL)
+  	{
+  	    p += 8;
+***************
+*** 7068,7073 ****
+--- 7074,7080 ----
+  	clip_unnamed = new_unnamed;
+  	clip_autoselect = new_autoselect;
+  	clip_autoselectml = new_autoselectml;
++ 	clip_html = new_html;
+  	vim_free(clip_exclude_prog);
+  	clip_exclude_prog = new_exclude_prog;
+      }
+*** ../vim-7.2.200/src/version.c	2009-06-16 15:12:11.000000000 +0200
+--- src/version.c	2009-06-16 15:14:02.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     201,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+13. Go to a poetry recital and ask why the poems don't rhyme.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.202 b/source/ap/vim/patches/7.2.202
new file mode 100644
index 000000000..2c2490938
--- /dev/null
+++ b/source/ap/vim/patches/7.2.202
@@ -0,0 +1,62 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.202
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.202
+Problem:    BufWipeout autocommand that edits another buffer causes problems.
+Solution:   Check for the situation, give an error and quit the operation.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.201/src/fileio.c	2009-05-16 17:29:37.000000000 +0200
+--- src/fileio.c	2009-06-11 21:22:37.000000000 +0200
+***************
+*** 4824,4829 ****
+--- 4824,4831 ----
+      char_u	*sfname;
+  {
+  #ifdef FEAT_AUTOCMD
++     buf_T	*buf = curbuf;
++ 
+      /* It's like the unnamed buffer is deleted.... */
+      if (curbuf->b_p_bl)
+  	apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf);
+***************
+*** 4832,4837 ****
+--- 4834,4845 ----
+      if (aborting())	    /* autocmds may abort script processing */
+  	return FAIL;
+  # endif
++     if (curbuf != buf)
++     {
++ 	/* We are in another buffer now, don't do the renaming. */
++ 	EMSG(_(e_auchangedbuf));
++ 	return FAIL;
++     }
+  #endif
+  
+      if (setfname(curbuf, fname, sfname, FALSE) == OK)
+*** ../vim-7.2.201/src/version.c	2009-06-16 15:23:07.000000000 +0200
+--- src/version.c	2009-06-16 15:28:31.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     202,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+14. Put mosquito netting around your work area. Play a tape of jungle
+    sounds all day.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.203 b/source/ap/vim/patches/7.2.203
new file mode 100644
index 000000000..c1322488a
--- /dev/null
+++ b/source/ap/vim/patches/7.2.203
@@ -0,0 +1,1496 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.203
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.203
+Problem:    When reloading a buffer or doing anything else with a buffer that
+	    is not displayed in a visible window, autocommands may be applied
+	    to the current window, folds messed up, etc.
+Solution:   Instead of using the current window for the hidden buffer use a
+	    special window, splitting the current one temporarily.
+Files:	    src/fileio.c, src/globals.h, src/gui.c, src/if_perl.xs,
+	    src/proto/gui.pro, src/proto/window.pro, src/screen.c,
+	    src/structs.h, src/window.c
+
+
+*** ../vim-7.2.202/src/fileio.c	2009-06-16 15:35:46.000000000 +0200
+--- src/fileio.c	2009-06-11 21:22:37.000000000 +0200
+***************
+*** 8365,8371 ****
+  
+  	    /* Execute the modeline settings, but don't set window-local
+  	     * options if we are using the current window for another buffer. */
+! 	    do_modelines(aco.save_curwin == NULL ? OPT_NOWIN : 0);
+  
+  	    /* restore the current window */
+  	    aucmd_restbuf(&aco);
+--- 8365,8371 ----
+  
+  	    /* Execute the modeline settings, but don't set window-local
+  	     * options if we are using the current window for another buffer. */
+! 	    do_modelines(curwin == aucmd_win ? OPT_NOWIN : 0);
+  
+  	    /* restore the current window */
+  	    aucmd_restbuf(&aco);
+***************
+*** 8381,8388 ****
+  
+  /*
+   * Prepare for executing autocommands for (hidden) buffer "buf".
+!  * Search a window for the current buffer.  Save the cursor position and
+!  * screen offset.
+   * Set "curbuf" and "curwin" to match "buf".
+   * When FEAT_AUTOCMD is not defined another version is used, see below.
+   */
+--- 8381,8388 ----
+  
+  /*
+   * Prepare for executing autocommands for (hidden) buffer "buf".
+!  * Search for a visible window containing the current buffer.  If there isn't
+!  * one then use "aucmd_win".
+   * Set "curbuf" and "curwin" to match "buf".
+   * When FEAT_AUTOCMD is not defined another version is used, see below.
+   */
+***************
+*** 8392,8399 ****
+      buf_T	*buf;		/* new curbuf */
+  {
+      win_T	*win;
+! 
+!     aco->new_curbuf = buf;
+  
+      /* Find a window that is for the new buffer */
+      if (buf == curbuf)		/* be quick when buf is curbuf */
+--- 8392,8400 ----
+      buf_T	*buf;		/* new curbuf */
+  {
+      win_T	*win;
+! #ifdef FEAT_WINDOWS
+!     int		save_ea;
+! #endif
+  
+      /* Find a window that is for the new buffer */
+      if (buf == curbuf)		/* be quick when buf is curbuf */
+***************
+*** 8407,8448 ****
+  	win = NULL;
+  #endif
+  
+!     /*
+!      * Prefer to use an existing window for the buffer, it has the least side
+!      * effects (esp. if "buf" is curbuf).
+!      * Otherwise, use curwin for "buf".  It might make some items in the
+!      * window invalid.  At least save the cursor and topline.
+!      */
+      if (win != NULL)
+      {
+! 	/* there is a window for "buf", make it the curwin */
+! 	aco->save_curwin = curwin;
+  	curwin = win;
+- 	aco->save_buf = win->w_buffer;
+- 	aco->new_curwin = win;
+      }
+      else
+      {
+! 	/* there is no window for "buf", use curwin */
+! 	aco->save_curwin = NULL;
+! 	aco->save_buf = curbuf;
+! 	--curbuf->b_nwindows;
+  	curwin->w_buffer = buf;
+  	++buf->b_nwindows;
+  
+! 	/* save cursor and topline, set them to safe values */
+! 	aco->save_cursor = curwin->w_cursor;
+! 	curwin->w_cursor.lnum = 1;
+! 	curwin->w_cursor.col = 0;
+! 	aco->save_topline = curwin->w_topline;
+! 	curwin->w_topline = 1;
+! #ifdef FEAT_DIFF
+! 	aco->save_topfill = curwin->w_topfill;
+! 	curwin->w_topfill = 0;
+  #endif
+      }
+- 
+      curbuf = buf;
+  }
+  
+  /*
+--- 8408,8460 ----
+  	win = NULL;
+  #endif
+  
+!     /* Allocate "aucmd_win" when needed.  If this fails (out of memory) fall
+!      * back to using the current window. */
+!     if (win == NULL && aucmd_win == NULL)
+!     {
+! 	win_alloc_aucmd_win();
+! 	if (aucmd_win == NULL)
+! 	    win = curwin;
+!     }
+! 
+!     aco->save_curwin = curwin;
+!     aco->save_curbuf = curbuf;
+      if (win != NULL)
+      {
+! 	/* There is a window for "buf" in the current tab page, make it the
+! 	 * curwin.  This is preferred, it has the least side effects (esp. if
+! 	 * "buf" is curbuf). */
+  	curwin = win;
+      }
+      else
+      {
+! 	/* There is no window for "buf", use "aucmd_win".  To minimize the side
+! 	 * effects, insert it in a the current tab page.
+! 	 * Anything related to a window (e.g., setting folds) may have
+! 	 * unexpected results. */
+! 	curwin = aucmd_win;
+  	curwin->w_buffer = buf;
+  	++buf->b_nwindows;
+  
+! #ifdef FEAT_WINDOWS
+! 	/* Split the current window, put the aucmd_win in the upper half. */
+! 	make_snapshot(SNAP_AUCMD_IDX);
+! 	save_ea = p_ea;
+! 	p_ea = FALSE;
+! 	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
+! 	(void)win_comp_pos();   /* recompute window positions */
+! 	p_ea = save_ea;
+! #endif
+! 	/* set cursor and topline to safe values */
+! 	curwin_init();
+! #ifdef FEAT_VERTSPLIT
+! 	curwin->w_wincol = 0;
+! 	curwin->w_width = Columns;
+  #endif
+      }
+      curbuf = buf;
++     aco->new_curwin = curwin;
++     aco->new_curbuf = curbuf;
+  }
+  
+  /*
+***************
+*** 8454,8474 ****
+  aucmd_restbuf(aco)
+      aco_save_T	*aco;		/* structure holding saved values */
+  {
+!     if (aco->save_curwin != NULL)
+      {
+  	/* restore curwin */
+  #ifdef FEAT_WINDOWS
+  	if (win_valid(aco->save_curwin))
+  #endif
+  	{
+! 	    /* restore the buffer which was previously edited by curwin, if
+! 	     * it's still the same window and it's valid */
+  	    if (curwin == aco->new_curwin
+! 		    && buf_valid(aco->save_buf)
+! 		    && aco->save_buf->b_ml.ml_mfp != NULL)
+  	    {
+  		--curbuf->b_nwindows;
+! 		curbuf = aco->save_buf;
+  		curwin->w_buffer = curbuf;
+  		++curbuf->b_nwindows;
+  	    }
+--- 8466,8551 ----
+  aucmd_restbuf(aco)
+      aco_save_T	*aco;		/* structure holding saved values */
+  {
+! #ifdef FEAT_WINDOWS
+!     int dummy;
+! #endif
+! 
+!     if (aco->new_curwin == aucmd_win)
+!     {
+! 	--curbuf->b_nwindows;
+! #ifdef FEAT_WINDOWS
+! 	/* Find "aucmd_win", it can't be closed, but it may be in another tab
+! 	 * page. */
+! 	if (curwin != aucmd_win)
+! 	{
+! 	    tabpage_T	*tp;
+! 	    win_T	*wp;
+! 
+! 	    FOR_ALL_TAB_WINDOWS(tp, wp)
+! 	    {
+! 		if (wp == aucmd_win)
+! 		{
+! 		    if (tp != curtab)
+! 			goto_tabpage_tp(tp);
+! 		    win_goto(aucmd_win);
+! 		    break;
+! 		}
+! 	    }
+! 	}
+! 
+! 	/* Remove the window and frame from the tree of frames. */
+! 	(void)winframe_remove(curwin, &dummy, NULL);
+! 	win_remove(curwin, NULL);
+! 	last_status(FALSE);	    /* may need to remove last status line */
+! 	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
+! 	(void)win_comp_pos();   /* recompute window positions */
+! 
+! 	if (win_valid(aco->save_curwin))
+! 	    curwin = aco->save_curwin;
+! 	else
+! 	    /* Hmm, original window disappeared.  Just use the first one. */
+! 	    curwin = firstwin;
+! # ifdef FEAT_EVAL
+! 	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
+! # endif
+! #else
+! 	curwin = aco->save_curwin;
+! #endif
+! 	curbuf = curwin->w_buffer;
+! 
+! 	/* the buffer contents may have changed */
+! 	check_cursor();
+! 	if (curwin->w_topline > curbuf->b_ml.ml_line_count)
+! 	{
+! 	    curwin->w_topline = curbuf->b_ml.ml_line_count;
+! #ifdef FEAT_DIFF
+! 	    curwin->w_topfill = 0;
+! #endif
+! 	}
+! #if defined(FEAT_GUI)
+! 	/* Hide the scrollbars from the aucmd_win and update. */
+! 	gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_LEFT], FALSE);
+! 	gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE);
+! 	gui_may_update_scrollbars();
+! #endif
+!     }
+!     else
+      {
+  	/* restore curwin */
+  #ifdef FEAT_WINDOWS
+  	if (win_valid(aco->save_curwin))
+  #endif
+  	{
+! 	    /* Restore the buffer which was previously edited by curwin, if
+! 	     * it was chagned, we are still the same window and the buffer is
+! 	     * valid. */
+  	    if (curwin == aco->new_curwin
+! 		    && curbuf != aco->new_curbuf
+! 		    && buf_valid(aco->new_curbuf)
+! 		    && aco->new_curbuf->b_ml.ml_mfp != NULL)
+  	    {
+  		--curbuf->b_nwindows;
+! 		curbuf = aco->new_curbuf;
+  		curwin->w_buffer = curbuf;
+  		++curbuf->b_nwindows;
+  	    }
+***************
+*** 8477,8510 ****
+  	    curbuf = curwin->w_buffer;
+  	}
+      }
+-     else
+-     {
+- 	/* restore buffer for curwin if it still exists and is loaded */
+- 	if (buf_valid(aco->save_buf) && aco->save_buf->b_ml.ml_mfp != NULL)
+- 	{
+- 	    --curbuf->b_nwindows;
+- 	    curbuf = aco->save_buf;
+- 	    curwin->w_buffer = curbuf;
+- 	    ++curbuf->b_nwindows;
+- 	    curwin->w_cursor = aco->save_cursor;
+- 	    check_cursor();
+- 	    /* check topline < line_count, in case lines got deleted */
+- 	    if (aco->save_topline <= curbuf->b_ml.ml_line_count)
+- 	    {
+- 		curwin->w_topline = aco->save_topline;
+- #ifdef FEAT_DIFF
+- 		curwin->w_topfill = aco->save_topfill;
+- #endif
+- 	    }
+- 	    else
+- 	    {
+- 		curwin->w_topline = curbuf->b_ml.ml_line_count;
+- #ifdef FEAT_DIFF
+- 		curwin->w_topfill = 0;
+- #endif
+- 	    }
+- 	}
+-     }
+  }
+  
+  static int	autocmd_nested = FALSE;
+--- 8554,8559 ----
+***************
+*** 9419,9427 ****
+      aco_save_T	*aco;		/* structure to save values in */
+      buf_T	*buf;		/* new curbuf */
+  {
+!     aco->save_buf = curbuf;
+      curbuf = buf;
+      curwin->w_buffer = buf;
+  }
+  
+  /*
+--- 9468,9478 ----
+      aco_save_T	*aco;		/* structure to save values in */
+      buf_T	*buf;		/* new curbuf */
+  {
+!     aco->save_curbuf = curbuf;
+!     --curbuf->b_nwindows;
+      curbuf = buf;
+      curwin->w_buffer = buf;
++     ++curbuf->b_nwindows;
+  }
+  
+  /*
+***************
+*** 9432,9439 ****
+  aucmd_restbuf(aco)
+      aco_save_T	*aco;		/* structure holding saved values */
+  {
+!     curbuf = aco->save_buf;
+      curwin->w_buffer = curbuf;
+  }
+  
+  #endif	/* FEAT_AUTOCMD */
+--- 9483,9492 ----
+  aucmd_restbuf(aco)
+      aco_save_T	*aco;		/* structure holding saved values */
+  {
+!     --curbuf->b_nwindows;
+!     curbuf = aco->save_curbuf;
+      curwin->w_buffer = curbuf;
++     ++curbuf->b_nwindows;
+  }
+  
+  #endif	/* FEAT_AUTOCMD */
+*** ../vim-7.2.202/src/globals.h	2009-06-16 15:23:07.000000000 +0200
+--- src/globals.h	2009-06-12 21:10:30.000000000 +0200
+***************
+*** 539,544 ****
+--- 539,548 ----
+  
+  EXTERN win_T	*curwin;	/* currently active window */
+  
++ #ifdef FEAT_AUTOCMD
++ EXTERN win_T	*aucmd_win;	/* window used in aucmd_prepbuf() */
++ #endif
++ 
+  /*
+   * The window layout is kept in a tree of frames.  topframe points to the top
+   * of the tree.
+*** ../vim-7.2.202/src/gui.c	2009-05-21 23:25:38.000000000 +0200
+--- src/gui.c	2009-06-11 20:58:05.000000000 +0200
+***************
+*** 3879,3884 ****
+--- 3879,3899 ----
+   * Scrollbar stuff:
+   */
+  
++ /*
++  * Called when something in the window layout has changed.
++  */
++     void
++ gui_may_update_scrollbars()
++ {
++     if (gui.in_use && starting == 0)
++     {
++ 	out_flush();
++ 	gui_init_which_components(NULL);
++ 	gui_update_scrollbars(TRUE);
++     }
++     need_mouse_correct = TRUE;
++ }
++ 
+      void
+  gui_update_scrollbars(force)
+      int		force;	    /* Force all scrollbars to get updated */
+*** ../vim-7.2.202/src/if_perl.xs	2008-12-03 13:18:16.000000000 +0100
+--- src/if_perl.xs	2009-06-03 17:52:51.000000000 +0200
+***************
+*** 1234,1240 ****
+  		    {
+  			ml_delete(lnum, 0);
+  			deleted_lines_mark(lnum, 1L);
+! 			if (aco.save_buf == curbuf)
+  			    check_cursor();
+  		    }
+  
+--- 1236,1242 ----
+  		    {
+  			ml_delete(lnum, 0);
+  			deleted_lines_mark(lnum, 1L);
+! 			if (aco.save_curbuf == curbuf)
+  			    check_cursor();
+  		    }
+  
+*** ../vim-7.2.202/src/proto/gui.pro	2007-05-05 19:42:19.000000000 +0200
+--- src/proto/gui.pro	2009-06-11 20:58:08.000000000 +0200
+***************
+*** 43,48 ****
+--- 43,49 ----
+  void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
+  scrollbar_T *gui_find_scrollbar __ARGS((long ident));
+  void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
++ void gui_may_update_scrollbars __ARGS((void));
+  void gui_update_scrollbars __ARGS((int force));
+  int gui_do_scroll __ARGS((void));
+  int gui_do_horiz_scroll __ARGS((void));
+*** ../vim-7.2.202/src/proto/window.pro	2007-07-26 22:57:45.000000000 +0200
+--- src/proto/window.pro	2009-06-10 21:20:39.000000000 +0200
+***************
+*** 1,6 ****
+--- 1,7 ----
+  /* window.c */
+  void do_window __ARGS((int nchar, long Prenum, int xchar));
+  int win_split __ARGS((int size, int flags));
++ int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
+  int win_valid __ARGS((win_T *win));
+  int win_count __ARGS((void));
+  int make_windows __ARGS((int count, int vertical));
+***************
+*** 10,18 ****
+--- 11,21 ----
+  void win_close __ARGS((win_T *win, int free_buf));
+  void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp));
+  void win_free_all __ARGS((void));
++ win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
+  void close_others __ARGS((int message, int forceit));
+  void curwin_init __ARGS((void));
+  int win_alloc_first __ARGS((void));
++ void win_alloc_aucmd_win __ARGS((void));
+  void win_init_size __ARGS((void));
+  void free_tabpage __ARGS((tabpage_T *tp));
+  int win_new_tabpage __ARGS((int after));
+***************
+*** 30,35 ****
+--- 33,40 ----
+  void win_enter __ARGS((win_T *wp, int undo_sync));
+  win_T *buf_jump_open_win __ARGS((buf_T *buf));
+  win_T *buf_jump_open_tab __ARGS((buf_T *buf));
++ void win_append __ARGS((win_T *after, win_T *wp));
++ void win_remove __ARGS((win_T *wp, tabpage_T *tp));
+  int win_alloc_lines __ARGS((win_T *wp));
+  void win_free_lsize __ARGS((win_T *wp));
+  void shell_new_rows __ARGS((void));
+***************
+*** 58,63 ****
+--- 63,70 ----
+  int min_rows __ARGS((void));
+  int only_one_window __ARGS((void));
+  void check_lnums __ARGS((int do_curwin));
++ void make_snapshot __ARGS((int idx));
++ void restore_snapshot __ARGS((int idx, int close_curwin));
+  int win_hasvertsplit __ARGS((void));
+  int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id));
+  int match_delete __ARGS((win_T *wp, int id, int perr));
+*** ../vim-7.2.202/src/screen.c	2009-05-17 13:30:58.000000000 +0200
+--- src/screen.c	2009-06-10 16:41:45.000000000 +0200
+***************
+*** 7495,7500 ****
+--- 7495,7504 ----
+  #endif
+  	}
+      }
++ #ifdef FEAT_AUTOCMD
++     if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
++ 	outofmem = TRUE;
++ #endif
+  #ifdef FEAT_WINDOWS
+  give_up:
+  #endif
+*** ../vim-7.2.202/src/structs.h	2009-05-16 16:36:25.000000000 +0200
+--- src/structs.h	2009-06-13 12:51:56.000000000 +0200
+***************
+*** 1621,1626 ****
+--- 1621,1634 ----
+  };
+  #endif
+  
++ #define SNAP_HELP_IDX	0
++ #ifdef FEAT_AUTOCMD
++ # define SNAP_AUCMD_IDX 1
++ # define SNAP_COUNT	2
++ #else
++ # define SNAP_COUNT	1
++ #endif
++ 
+  /*
+   * Tab pages point to the top frame of each tab page.
+   * Note: Most values are NOT valid for the current tab page!  Use "curwin",
+***************
+*** 1649,1655 ****
+      buf_T	    *(tp_diffbuf[DB_COUNT]);
+      int		    tp_diff_invalid;	/* list of diffs is outdated */
+  #endif
+!     frame_T	    *tp_snapshot;    /* window layout snapshot */
+  #ifdef FEAT_EVAL
+      dictitem_T	    tp_winvar;	    /* variable for "t:" Dictionary */
+      dict_T	    tp_vars;	    /* internal variables, local to tab page */
+--- 1657,1663 ----
+      buf_T	    *(tp_diffbuf[DB_COUNT]);
+      int		    tp_diff_invalid;	/* list of diffs is outdated */
+  #endif
+!     frame_T	    *(tp_snapshot[SNAP_COUNT]);  /* window layout snapshots */
+  #ifdef FEAT_EVAL
+      dictitem_T	    tp_winvar;	    /* variable for "t:" Dictionary */
+      dict_T	    tp_vars;	    /* internal variables, local to tab page */
+***************
+*** 2276,2291 ****
+   */
+  typedef struct
+  {
+!     buf_T	*save_buf;	/* saved curbuf */
+  #ifdef FEAT_AUTOCMD
+!     buf_T	*new_curbuf;	/* buffer to be used */
+!     win_T	*save_curwin;	/* saved curwin, NULL if it didn't change */
+!     win_T	*new_curwin;	/* new curwin if save_curwin != NULL */
+!     pos_T	save_cursor;	/* saved cursor pos of save_curwin */
+!     linenr_T	save_topline;	/* saved topline of save_curwin */
+! # ifdef FEAT_DIFF
+!     int		save_topfill;	/* saved topfill of save_curwin */
+! # endif
+  #endif
+  } aco_save_T;
+  
+--- 2284,2294 ----
+   */
+  typedef struct
+  {
+!     buf_T	*save_curbuf;	/* saved curbuf */
+  #ifdef FEAT_AUTOCMD
+!     win_T	*save_curwin;	/* saved curwin */
+!     win_T	*new_curwin;	/* new curwin */
+!     buf_T	*new_curbuf;	/* new curbuf */
+  #endif
+  } aco_save_T;
+  
+*** ../vim-7.2.202/src/window.c	2009-05-21 23:25:38.000000000 +0200
+--- src/window.c	2009-06-12 22:29:33.000000000 +0200
+***************
+*** 11,18 ****
+  
+  static int path_is_url __ARGS((char_u *p));
+  #if defined(FEAT_WINDOWS) || defined(PROTO)
+- static int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
+  static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
+  static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
+  static void frame_setheight __ARGS((frame_T *curfrp, int height));
+  #ifdef FEAT_VERTSPLIT
+--- 11,18 ----
+  
+  static int path_is_url __ARGS((char_u *p));
+  #if defined(FEAT_WINDOWS) || defined(PROTO)
+  static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
++ static void win_init_some __ARGS((win_T *newp, win_T *oldp));
+  static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
+  static void frame_setheight __ARGS((frame_T *curfrp, int height));
+  #ifdef FEAT_VERTSPLIT
+***************
+*** 23,30 ****
+  static void win_totop __ARGS((int size, int flags));
+  static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height));
+  static int last_window __ARGS((void));
+  static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp));
+- static win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
+  static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp));
+  static tabpage_T *alt_tabpage __ARGS((void));
+  static win_T *frame2win __ARGS((frame_T *frp));
+--- 23,30 ----
+  static void win_totop __ARGS((int size, int flags));
+  static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height));
+  static int last_window __ARGS((void));
++ static int one_window __ARGS((void));
+  static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp));
+  static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp));
+  static tabpage_T *alt_tabpage __ARGS((void));
+  static win_T *frame2win __ARGS((frame_T *frp));
+***************
+*** 41,46 ****
+--- 41,47 ----
+  #endif
+  #endif
+  static int win_alloc_firstwin __ARGS((win_T *oldwin));
++ static void new_frame __ARGS((win_T *wp));
+  #if defined(FEAT_WINDOWS) || defined(PROTO)
+  static tabpage_T *alloc_tabpage __ARGS((void));
+  static int leave_tabpage __ARGS((buf_T *new_curbuf));
+***************
+*** 49,56 ****
+  static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin));
+  static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin));
+  static void win_free __ARGS((win_T *wp, tabpage_T *tp));
+- static void win_append __ARGS((win_T *, win_T *));
+- static void win_remove __ARGS((win_T *, tabpage_T *tp));
+  static void frame_append __ARGS((frame_T *after, frame_T *frp));
+  static void frame_insert __ARGS((frame_T *before, frame_T *frp));
+  static void frame_remove __ARGS((frame_T *frp));
+--- 50,55 ----
+***************
+*** 62,78 ****
+  static void frame_add_height __ARGS((frame_T *frp, int n));
+  static void last_status_rec __ARGS((frame_T *fr, int statusline));
+  
+- static void make_snapshot __ARGS((void));
+  static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp));
+! static void clear_snapshot __ARGS((tabpage_T *tp));
+  static void clear_snapshot_rec __ARGS((frame_T *fr));
+- static void restore_snapshot __ARGS((int close_curwin));
+  static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
+  static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
+  
+  #endif /* FEAT_WINDOWS */
+  
+! static win_T *win_alloc __ARGS((win_T *after));
+  static void win_new_height __ARGS((win_T *, int));
+  
+  #define URL_SLASH	1		/* path_is_url() has found "://" */
+--- 61,75 ----
+  static void frame_add_height __ARGS((frame_T *frp, int n));
+  static void last_status_rec __ARGS((frame_T *fr, int statusline));
+  
+  static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp));
+! static void clear_snapshot __ARGS((tabpage_T *tp, int idx));
+  static void clear_snapshot_rec __ARGS((frame_T *fr));
+  static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
+  static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
+  
+  #endif /* FEAT_WINDOWS */
+  
+! static win_T *win_alloc __ARGS((win_T *after, int hidden));
+  static void win_new_height __ARGS((win_T *, int));
+  
+  #define URL_SLASH	1		/* path_is_url() has found "://" */
+***************
+*** 259,265 ****
+  /* cursor to previous window with wrap around */
+      case 'W':
+  		CHECK_CMDWIN
+! 		if (lastwin == firstwin && Prenum != 1)	/* just one window */
+  		    beep_flush();
+  		else
+  		{
+--- 256,262 ----
+  /* cursor to previous window with wrap around */
+      case 'W':
+  		CHECK_CMDWIN
+! 		if (firstwin == lastwin && Prenum != 1)	/* just one window */
+  		    beep_flush();
+  		else
+  		{
+***************
+*** 343,349 ****
+  
+  /* move window to new tab page */
+      case 'T':
+! 		if (firstwin == lastwin)
+  		    MSG(_(m_onlyone));
+  		else
+  		{
+--- 340,346 ----
+  
+  /* move window to new tab page */
+      case 'T':
+! 		if (one_window())
+  		    MSG(_(m_onlyone));
+  		else
+  		{
+***************
+*** 679,687 ****
+      /* When creating the help window make a snapshot of the window layout.
+       * Otherwise clear the snapshot, it's now invalid. */
+      if (flags & WSP_HELP)
+! 	make_snapshot();
+      else
+! 	clear_snapshot(curtab);
+  
+      return win_split_ins(size, flags, NULL, 0);
+  }
+--- 676,684 ----
+      /* When creating the help window make a snapshot of the window layout.
+       * Otherwise clear the snapshot, it's now invalid. */
+      if (flags & WSP_HELP)
+! 	make_snapshot(SNAP_HELP_IDX);
+      else
+! 	clear_snapshot(curtab, SNAP_HELP_IDX);
+  
+      return win_split_ins(size, flags, NULL, 0);
+  }
+***************
+*** 692,698 ****
+   * top/left/right/bottom.
+   * return FAIL for failure, OK otherwise
+   */
+!     static int
+  win_split_ins(size, flags, newwin, dir)
+      int		size;
+      int		flags;
+--- 689,695 ----
+   * top/left/right/bottom.
+   * return FAIL for failure, OK otherwise
+   */
+!     int
+  win_split_ins(size, flags, newwin, dir)
+      int		size;
+      int		flags;
+***************
+*** 893,906 ****
+      {
+  	/* new window below/right of current one */
+  	if (newwin == NULL)
+! 	    wp = win_alloc(oldwin);
+  	else
+  	    win_append(oldwin, wp);
+      }
+      else
+      {
+  	if (newwin == NULL)
+! 	    wp = win_alloc(oldwin->w_prev);
+  	else
+  	    win_append(oldwin->w_prev, wp);
+      }
+--- 890,903 ----
+      {
+  	/* new window below/right of current one */
+  	if (newwin == NULL)
+! 	    wp = win_alloc(oldwin, FALSE);
+  	else
+  	    win_append(oldwin, wp);
+      }
+      else
+      {
+  	if (newwin == NULL)
+! 	    wp = win_alloc(oldwin->w_prev, FALSE);
+  	else
+  	    win_append(oldwin->w_prev, wp);
+      }
+***************
+*** 910,915 ****
+--- 907,919 ----
+  	if (wp == NULL)
+  	    return FAIL;
+  
++ 	new_frame(wp);
++ 	if (wp->w_frame == NULL)
++ 	{
++ 	    win_free(wp, NULL);
++ 	    return FAIL;
++ 	}
++ 
+  	/* make the contents of the new window the same as the current one */
+  	win_init(wp, curwin, flags);
+      }
+***************
+*** 970,982 ****
+      }
+  
+      if (newwin == NULL)
+!     {
+! 	/* Create a frame for the new window. */
+! 	frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
+! 	frp->fr_layout = FR_LEAF;
+! 	frp->fr_win = wp;
+! 	wp->w_frame = frp;
+!     }
+      else
+  	frp = newwin->w_frame;
+      frp->fr_parent = curfrp->fr_parent;
+--- 974,980 ----
+      }
+  
+      if (newwin == NULL)
+! 	frp = wp->w_frame;
+      else
+  	frp = newwin->w_frame;
+      frp->fr_parent = curfrp->fr_parent;
+***************
+*** 1156,1161 ****
+--- 1154,1160 ----
+      return OK;
+  }
+  
++ 
+  /*
+   * Initialize window "newp" from window "oldp".
+   * Used when splitting a window and when creating a new tab page.
+***************
+*** 1204,1217 ****
+      if (oldp->w_localdir != NULL)
+  	newp->w_localdir = vim_strsave(oldp->w_localdir);
+  
+!     /* Use the same argument list. */
+!     newp->w_alist = oldp->w_alist;
+!     ++newp->w_alist->al_refcount;
+!     newp->w_arg_idx = oldp->w_arg_idx;
+! 
+!     /*
+!      * copy tagstack and options from existing window
+!      */
+      for (i = 0; i < oldp->w_tagstacklen; i++)
+      {
+  	newp->w_tagstack[i] = oldp->w_tagstack[i];
+--- 1203,1209 ----
+      if (oldp->w_localdir != NULL)
+  	newp->w_localdir = vim_strsave(oldp->w_localdir);
+  
+!     /* copy tagstack and folds */
+      for (i = 0; i < oldp->w_tagstacklen; i++)
+      {
+  	newp->w_tagstack[i] = oldp->w_tagstack[i];
+***************
+*** 1221,1230 ****
+      }
+      newp->w_tagstackidx = oldp->w_tagstackidx;
+      newp->w_tagstacklen = oldp->w_tagstacklen;
+-     win_copy_options(oldp, newp);
+  # ifdef FEAT_FOLDING
+      copyFoldingState(oldp, newp);
+  # endif
+  }
+  
+  #endif /* FEAT_WINDOWS */
+--- 1213,1241 ----
+      }
+      newp->w_tagstackidx = oldp->w_tagstackidx;
+      newp->w_tagstacklen = oldp->w_tagstacklen;
+  # ifdef FEAT_FOLDING
+      copyFoldingState(oldp, newp);
+  # endif
++ 
++     win_init_some(newp, oldp);
++ }
++ 
++ /*
++  * Initialize window "newp" from window"old".
++  * Only the essential things are copied.
++  */
++     static void
++ win_init_some(newp, oldp)
++     win_T	*newp;
++     win_T	*oldp;
++ {
++     /* Use the same argument list. */
++     newp->w_alist = oldp->w_alist;
++     ++newp->w_alist->al_refcount;
++     newp->w_arg_idx = oldp->w_arg_idx;
++ 
++     /* copy options from existing window */
++     win_copy_options(oldp, newp);
+  }
+  
+  #endif /* FEAT_WINDOWS */
+***************
+*** 1565,1579 ****
+  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
+      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
+       * scrollbars.  Have to update them anyway. */
+!     if (gui.in_use)
+!     {
+! 	out_flush();
+! 	gui_init_which_components(NULL);
+! 	gui_update_scrollbars(TRUE);
+!     }
+!     need_mouse_correct = TRUE;
+  #endif
+- 
+  }
+  
+  /*
+--- 1576,1583 ----
+  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
+      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
+       * scrollbars.  Have to update them anyway. */
+!     gui_may_update_scrollbars();
+  #endif
+  }
+  
+  /*
+***************
+*** 2048,2060 ****
+  }
+  
+  /*
+!  * Return TRUE if the current window is the only window that exists.
+   * Returns FALSE if there is a window, possibly in another tab page.
+   */
+      static int
+  last_window()
+  {
+!     return (lastwin == firstwin && first_tabpage->tp_next == NULL);
+  }
+  
+  /*
+--- 2052,2091 ----
+  }
+  
+  /*
+!  * Return TRUE if the current window is the only window that exists (ignoring
+!  * "aucmd_win").
+   * Returns FALSE if there is a window, possibly in another tab page.
+   */
+      static int
+  last_window()
+  {
+!     return (one_window() && first_tabpage->tp_next == NULL);
+! }
+! 
+! /*
+!  * Return TRUE if there is only one window other than "aucmd_win" in the
+!  * current tab page.
+!  */
+!     static int
+! one_window()
+! {
+! #ifdef FEAT_AUTOCMD
+!     win_T	*wp;
+!     int		seen_one = FALSE;
+! 
+!     FOR_ALL_WINDOWS(wp)
+!     {
+! 	if (wp != aucmd_win)
+! 	{
+! 	    if (seen_one)
+! 		return FALSE;
+! 	    seen_one = TRUE;
+! 	}
+!     }
+!     return TRUE;
+! #else
+!     return firstwin == lastwin;
+! #endif
+  }
+  
+  /*
+***************
+*** 2083,2088 ****
+--- 2114,2132 ----
+  	return;
+      }
+  
++ #ifdef FEAT_AUTOCMD
++     if (win == aucmd_win)
++     {
++ 	EMSG(_("E813: Cannot close autocmd window"));
++ 	return;
++     }
++     if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window())
++     {
++ 	EMSG(_("E814: Cannot close window, only autocmd window would remain"));
++ 	return;
++     }
++ #endif
++ 
+      /*
+       * When closing the last window in a tab page first go to another tab
+       * page and then close the window and the tab page.  This avoids that
+***************
+*** 2112,2118 ****
+      if (win->w_buffer->b_help)
+  	help_window = TRUE;
+      else
+! 	clear_snapshot(curtab);
+  
+  #ifdef FEAT_AUTOCMD
+      if (win == curwin)
+--- 2156,2162 ----
+      if (win->w_buffer->b_help)
+  	help_window = TRUE;
+      else
+! 	clear_snapshot(curtab, SNAP_HELP_IDX);
+  
+  #ifdef FEAT_AUTOCMD
+      if (win == curwin)
+***************
+*** 2229,2235 ****
+      /* After closing the help window, try restoring the window layout from
+       * before it was opened. */
+      if (help_window)
+! 	restore_snapshot(close_curwin);
+  
+  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
+      /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */
+--- 2273,2279 ----
+      /* After closing the help window, try restoring the window layout from
+       * before it was opened. */
+      if (help_window)
+! 	restore_snapshot(SNAP_HELP_IDX, close_curwin);
+  
+  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
+      /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */
+***************
+*** 2344,2349 ****
+--- 2388,2401 ----
+  
+      while (firstwin != NULL)
+  	(void)win_free_mem(firstwin, &dummy, NULL);
++ 
++ # ifdef FEAT_AUTOCMD
++     if (aucmd_win != NULL)
++     {
++ 	(void)win_free_mem(aucmd_win, &dummy, NULL);
++ 	aucmd_win = NULL;
++     }
++ # endif
+  }
+  #endif
+  
+***************
+*** 2351,2357 ****
+   * Remove a window and its frame from the tree of frames.
+   * Returns a pointer to the window that got the freed up space.
+   */
+!     static win_T *
+  winframe_remove(win, dirp, tp)
+      win_T	*win;
+      int		*dirp UNUSED;	/* set to 'v' or 'h' for direction if 'ea' */
+--- 2403,2409 ----
+   * Remove a window and its frame from the tree of frames.
+   * Returns a pointer to the window that got the freed up space.
+   */
+!     win_T *
+  winframe_remove(win, dirp, tp)
+      win_T	*win;
+      int		*dirp UNUSED;	/* set to 'v' or 'h' for direction if 'ea' */
+***************
+*** 3090,3096 ****
+      win_T	*nextwp;
+      int		r;
+  
+!     if (lastwin == firstwin)
+      {
+  	if (message
+  #ifdef FEAT_AUTOCMD
+--- 3142,3148 ----
+      win_T	*nextwp;
+      int		r;
+  
+!     if (one_window())
+      {
+  	if (message
+  #ifdef FEAT_AUTOCMD
+***************
+*** 3194,3202 ****
+--- 3246,3275 ----
+      first_tabpage->tp_topframe = topframe;
+      curtab = first_tabpage;
+  #endif
++ 
+      return OK;
+  }
+  
++ #if defined(FEAT_AUTOCMD) || defined(PROTO)
++ /*
++  * Init "aucmd_win".  This can only be done after the first
++  * window is fully initialized, thus it can't be in win_alloc_first().
++  */
++     void
++ win_alloc_aucmd_win()
++ {
++     aucmd_win = win_alloc(NULL, TRUE);
++     if (aucmd_win != NULL)
++     {
++ 	win_init_some(aucmd_win, curwin);
++ # ifdef FEAT_SCROLLBIND
++ 	aucmd_win->w_p_scb = FALSE;
++ # endif
++ 	new_frame(aucmd_win);
++     }
++ }
++ #endif
++ 
+  /*
+   * Allocate the first window or the first window in a new tab page.
+   * When "oldwin" is NULL create an empty buffer for it.
+***************
+*** 3208,3214 ****
+  win_alloc_firstwin(oldwin)
+      win_T	*oldwin;
+  {
+!     curwin = win_alloc(NULL);
+      if (oldwin == NULL)
+      {
+  	/* Very first window, need to create an empty buffer for it and
+--- 3281,3287 ----
+  win_alloc_firstwin(oldwin)
+      win_T	*oldwin;
+  {
+!     curwin = win_alloc(NULL, FALSE);
+      if (oldwin == NULL)
+      {
+  	/* Very first window, need to create an empty buffer for it and
+***************
+*** 3236,3256 ****
+      }
+  #endif
+  
+!     topframe = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
+!     if (topframe == NULL)
+  	return FAIL;
+!     topframe->fr_layout = FR_LEAF;
+  #ifdef FEAT_VERTSPLIT
+      topframe->fr_width = Columns;
+  #endif
+      topframe->fr_height = Rows - p_ch;
+      topframe->fr_win = curwin;
+-     curwin->w_frame = topframe;
+  
+      return OK;
+  }
+  
+  /*
+   * Initialize the window and frame size to the maximum.
+   */
+      void
+--- 3309,3344 ----
+      }
+  #endif
+  
+!     new_frame(curwin);
+!     if (curwin->w_frame == NULL)
+  	return FAIL;
+!     topframe = curwin->w_frame;
+  #ifdef FEAT_VERTSPLIT
+      topframe->fr_width = Columns;
+  #endif
+      topframe->fr_height = Rows - p_ch;
+      topframe->fr_win = curwin;
+  
+      return OK;
+  }
+  
+  /*
++  * Create a frame for window "wp".
++  */
++     static void
++ new_frame(win_T *wp)
++ {
++     frame_T *frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
++ 
++     wp->w_frame = frp;
++     if (frp != NULL)
++     {
++ 	frp->fr_layout = FR_LEAF;
++ 	frp->fr_win = wp;
++     }
++ }
++ 
++ /*
+   * Initialize the window and frame size to the maximum.
+   */
+      void
+***************
+*** 3300,3309 ****
+  free_tabpage(tp)
+      tabpage_T	*tp;
+  {
+  # ifdef FEAT_DIFF
+      diff_clear(tp);
+  # endif
+!     clear_snapshot(tp);
+  #ifdef FEAT_EVAL
+      vars_clear(&tp->tp_vars.dv_hashtab);	/* free all t: variables */
+  #endif
+--- 3388,3400 ----
+  free_tabpage(tp)
+      tabpage_T	*tp;
+  {
++     int idx;
++ 
+  # ifdef FEAT_DIFF
+      diff_clear(tp);
+  # endif
+!     for (idx = 0; idx < SNAP_COUNT; ++idx)
+! 	clear_snapshot(tp, idx);
+  #ifdef FEAT_EVAL
+      vars_clear(&tp->tp_vars.dv_hashtab);	/* free all t: variables */
+  #endif
+***************
+*** 3370,3381 ****
+  #if defined(FEAT_GUI)
+  	/* When 'guioptions' includes 'L' or 'R' may have to remove or add
+  	 * scrollbars.  Have to update them anyway. */
+! 	if (gui.in_use && starting == 0)
+! 	{
+! 	    gui_init_which_components(NULL);
+! 	    gui_update_scrollbars(TRUE);
+! 	}
+! 	need_mouse_correct = TRUE;
+  #endif
+  
+  	redraw_all_later(CLEAR);
+--- 3461,3467 ----
+  #if defined(FEAT_GUI)
+  	/* When 'guioptions' includes 'L' or 'R' may have to remove or add
+  	 * scrollbars.  Have to update them anyway. */
+! 	gui_may_update_scrollbars();
+  #endif
+  
+  	redraw_all_later(CLEAR);
+***************
+*** 3593,3604 ****
+  #if defined(FEAT_GUI)
+      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
+       * scrollbars.  Have to update them anyway. */
+!     if (gui.in_use && starting == 0)
+!     {
+! 	gui_init_which_components(NULL);
+! 	gui_update_scrollbars(TRUE);
+!     }
+!     need_mouse_correct = TRUE;
+  #endif
+  
+      redraw_all_later(CLEAR);
+--- 3679,3685 ----
+  #if defined(FEAT_GUI)
+      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
+       * scrollbars.  Have to update them anyway. */
+!     gui_may_update_scrollbars();
+  #endif
+  
+      redraw_all_later(CLEAR);
+***************
+*** 4150,4160 ****
+  #endif
+  
+  /*
+!  * allocate a window structure and link it in the window list
+   */
+      static win_T *
+! win_alloc(after)
+      win_T	*after UNUSED;
+  {
+      win_T	*newwin;
+  
+--- 4231,4243 ----
+  #endif
+  
+  /*
+!  * Allocate a window structure and link it in the window list when "hidden" is
+!  * FALSE.
+   */
+      static win_T *
+! win_alloc(after, hidden)
+      win_T	*after UNUSED;
++     int		hidden UNUSED;
+  {
+      win_T	*newwin;
+  
+***************
+*** 4180,4186 ****
+  	 * link the window in the window list
+  	 */
+  #ifdef FEAT_WINDOWS
+! 	win_append(after, newwin);
+  #endif
+  #ifdef FEAT_VERTSPLIT
+  	newwin->w_wincol = 0;
+--- 4263,4270 ----
+  	 * link the window in the window list
+  	 */
+  #ifdef FEAT_WINDOWS
+! 	if (!hidden)
+! 	    win_append(after, newwin);
+  #endif
+  #ifdef FEAT_VERTSPLIT
+  	newwin->w_wincol = 0;
+***************
+*** 4314,4320 ****
+  /*
+   * Append window "wp" in the window list after window "after".
+   */
+!     static void
+  win_append(after, wp)
+      win_T	*after, *wp;
+  {
+--- 4398,4404 ----
+  /*
+   * Append window "wp" in the window list after window "after".
+   */
+!     void
+  win_append(after, wp)
+      win_T	*after, *wp;
+  {
+***************
+*** 4340,4346 ****
+  /*
+   * Remove a window from the window list.
+   */
+!     static void
+  win_remove(wp, tp)
+      win_T	*wp;
+      tabpage_T	*tp;		/* tab page "win" is in, NULL for current */
+--- 4424,4430 ----
+  /*
+   * Remove a window from the window list.
+   */
+!     void
+  win_remove(wp, tp)
+      win_T	*wp;
+      tabpage_T	*tp;		/* tab page "win" is in, NULL for current */
+***************
+*** 6040,6045 ****
+--- 6124,6130 ----
+  /*
+   * Return TRUE if there is only one window (in the current tab page), not
+   * counting a help or preview window, unless it is the current window.
++  * Does not count "aucmd_win".
+   */
+      int
+  only_one_window()
+***************
+*** 6053,6063 ****
+  	return FALSE;
+  
+      for (wp = firstwin; wp != NULL; wp = wp->w_next)
+! 	if (!((wp->w_buffer->b_help && !curbuf->b_help)
+  # ifdef FEAT_QUICKFIX
+  		    || wp->w_p_pvw
+  # endif
+  	     ) || wp == curwin)
+  	    ++count;
+      return (count <= 1);
+  #else
+--- 6138,6152 ----
+  	return FALSE;
+  
+      for (wp = firstwin; wp != NULL; wp = wp->w_next)
+! 	if ((!((wp->w_buffer->b_help && !curbuf->b_help)
+  # ifdef FEAT_QUICKFIX
+  		    || wp->w_p_pvw
+  # endif
+  	     ) || wp == curwin)
++ # ifdef FEAT_AUTOCMD
++ 		&& wp != aucmd_win
++ # endif
++ 	   )
+  	    ++count;
+      return (count <= 1);
+  #else
+***************
+*** 6112,6122 ****
+  /*
+   * Create a snapshot of the current frame sizes.
+   */
+!     static void
+! make_snapshot()
+  {
+!     clear_snapshot(curtab);
+!     make_snapshot_rec(topframe, &curtab->tp_snapshot);
+  }
+  
+      static void
+--- 6201,6212 ----
+  /*
+   * Create a snapshot of the current frame sizes.
+   */
+!     void
+! make_snapshot(idx)
+!     int idx;
+  {
+!     clear_snapshot(curtab, idx);
+!     make_snapshot_rec(topframe, &curtab->tp_snapshot[idx]);
+  }
+  
+      static void
+***************
+*** 6144,6154 ****
+   * Remove any existing snapshot.
+   */
+      static void
+! clear_snapshot(tp)
+      tabpage_T	*tp;
+  {
+!     clear_snapshot_rec(tp->tp_snapshot);
+!     tp->tp_snapshot = NULL;
+  }
+  
+      static void
+--- 6234,6245 ----
+   * Remove any existing snapshot.
+   */
+      static void
+! clear_snapshot(tp, idx)
+      tabpage_T	*tp;
++     int		idx;
+  {
+!     clear_snapshot_rec(tp->tp_snapshot[idx]);
+!     tp->tp_snapshot[idx] = NULL;
+  }
+  
+      static void
+***************
+*** 6168,6193 ****
+   * This is only done if the screen size didn't change and the window layout is
+   * still the same.
+   */
+!     static void
+! restore_snapshot(close_curwin)
+      int		close_curwin;	    /* closing current window */
+  {
+      win_T	*wp;
+  
+!     if (curtab->tp_snapshot != NULL
+  # ifdef FEAT_VERTSPLIT
+! 	    && curtab->tp_snapshot->fr_width == topframe->fr_width
+  # endif
+! 	    && curtab->tp_snapshot->fr_height == topframe->fr_height
+! 	    && check_snapshot_rec(curtab->tp_snapshot, topframe) == OK)
+      {
+! 	wp = restore_snapshot_rec(curtab->tp_snapshot, topframe);
+  	win_comp_pos();
+  	if (wp != NULL && close_curwin)
+  	    win_goto(wp);
+  	redraw_all_later(CLEAR);
+      }
+!     clear_snapshot(curtab);
+  }
+  
+  /*
+--- 6259,6285 ----
+   * This is only done if the screen size didn't change and the window layout is
+   * still the same.
+   */
+!     void
+! restore_snapshot(idx, close_curwin)
+!     int		idx;
+      int		close_curwin;	    /* closing current window */
+  {
+      win_T	*wp;
+  
+!     if (curtab->tp_snapshot[idx] != NULL
+  # ifdef FEAT_VERTSPLIT
+! 	    && curtab->tp_snapshot[idx]->fr_width == topframe->fr_width
+  # endif
+! 	    && curtab->tp_snapshot[idx]->fr_height == topframe->fr_height
+! 	    && check_snapshot_rec(curtab->tp_snapshot[idx], topframe) == OK)
+      {
+! 	wp = restore_snapshot_rec(curtab->tp_snapshot[idx], topframe);
+  	win_comp_pos();
+  	if (wp != NULL && close_curwin)
+  	    win_goto(wp);
+  	redraw_all_later(CLEAR);
+      }
+!     clear_snapshot(curtab, idx);
+  }
+  
+  /*
+*** ../vim-7.2.202/src/version.c	2009-06-16 15:35:46.000000000 +0200
+--- src/version.c	2009-06-16 15:37:16.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     203,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+15. Five days in advance, tell your friends you can't attend their
+    party because you're not in the mood.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.204 b/source/ap/vim/patches/7.2.204
new file mode 100644
index 000000000..ef99c5198
--- /dev/null
+++ b/source/ap/vim/patches/7.2.204
@@ -0,0 +1,137 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.204 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.204 (extra)
+Problem:    Win32: Can't build with Visual Studio 2010 beta 1.
+Solution:   Fix the makefile. (George Reilly)
+Files:	    src/Make_mvc.mak
+
+
+*** ../vim-7.2.203/src/Make_mvc.mak	2009-05-26 22:58:43.000000000 +0200
+--- src/Make_mvc.mak	2009-06-16 16:27:59.000000000 +0200
+***************
+*** 1,18 ****
+  # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
+  # and Win64, using the Microsoft Visual C++ compilers. Known to work with
+  # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
+! # and VC9 (VS2008).
+  #
+  # To build using other Windows compilers, see INSTALLpc.txt
+  #
+  # This makefile can build the console, GUI, OLE-enable, Perl-enabled and
+! # Python-enabled versions of vim for Win32 platforms.
+  #
+! # The basic command line to build vim is:
+  #
+  #	nmake -f Make_mvc.mak
+  #
+! # This will build the console version of vim with no additional interfaces.
+  # To add features, define any of the following:
+  #
+  #	!!!!  After changing features do "nmake clean" first  !!!!
+--- 1,18 ----
+  # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
+  # and Win64, using the Microsoft Visual C++ compilers. Known to work with
+  # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
+! # VC9 (VS2008), and VC10 (VS2010).
+  #
+  # To build using other Windows compilers, see INSTALLpc.txt
+  #
+  # This makefile can build the console, GUI, OLE-enable, Perl-enabled and
+! # Python-enabled versions of Vim for Win32 platforms.
+  #
+! # The basic command line to build Vim is:
+  #
+  #	nmake -f Make_mvc.mak
+  #
+! # This will build the console version of Vim with no additional interfaces.
+  # To add features, define any of the following:
+  #
+  #	!!!!  After changing features do "nmake clean" first  !!!!
+***************
+*** 358,363 ****
+--- 358,366 ----
+  !if "$(_NMAKE_VER)" == "9.00.30729.01"
+  MSVCVER = 9.0
+  !endif
++ !if "$(_NMAKE_VER)" == "10.00.20506.01"
++ MSVCVER = 10.0
++ !endif
+  !endif
+  
+  # Abort bulding VIM if version of VC is unrecognised.
+***************
+*** 372,378 ****
+  !endif
+  
+  # Convert processor ID to MVC-compatible number
+! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0")
+  !if "$(CPUNR)" == "i386"
+  CPUARG = /G3
+  !elseif "$(CPUNR)" == "i486"
+--- 375,381 ----
+  !endif
+  
+  # Convert processor ID to MVC-compatible number
+! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
+  !if "$(CPUNR)" == "i386"
+  CPUARG = /G3
+  !elseif "$(CPUNR)" == "i486"
+***************
+*** 405,411 ****
+  !else # MAXSPEED
+  OPTFLAG = /Ox
+  !endif
+! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
+  # Use link time code generation if not worried about size
+  !if "$(OPTIMIZE)" != "SPACE"
+  OPTFLAG = $(OPTFLAG) /GL
+--- 408,414 ----
+  !else # MAXSPEED
+  OPTFLAG = /Ox
+  !endif
+! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
+  # Use link time code generation if not worried about size
+  !if "$(OPTIMIZE)" != "SPACE"
+  OPTFLAG = $(OPTFLAG) /GL
+***************
+*** 793,799 ****
+  
+  # Report link time code generation progress if used. 
+  !ifdef NODEBUG
+! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
+  !if "$(OPTIMIZE)" != "SPACE"
+  LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
+  !endif
+--- 796,802 ----
+  
+  # Report link time code generation progress if used. 
+  !ifdef NODEBUG
+! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
+  !if "$(OPTIMIZE)" != "SPACE"
+  LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
+  !endif
+*** ../vim-7.2.203/src/version.c	2009-06-16 16:01:34.000000000 +0200
+--- src/version.c	2009-06-16 16:32:41.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     204,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+16. Have your coworkers address you by your wrestling name, Rock Hard Kim.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.205 b/source/ap/vim/patches/7.2.205
new file mode 100644
index 000000000..2af506782
--- /dev/null
+++ b/source/ap/vim/patches/7.2.205
@@ -0,0 +1,81 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.205 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.205 (extra)
+Problem:    Win32: No support for High DPI awarenes.
+Solution:   Fix the manifest file. (George Reilly)
+Files:	    src/Make_mvc.mak, src/gvim.exe.mnf
+
+
+*** ../vim-7.2.204/src/Make_mvc.mak	2009-06-16 16:34:12.000000000 +0200
+--- src/Make_mvc.mak	2009-06-16 16:36:32.000000000 +0200
+***************
+*** 1040,1046 ****
+  $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
+  	$(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
+  
+! $(OUTDIR)/vim.res:	$(OUTDIR) vim.rc version.h tools.bmp tearoff.bmp \
+  		vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
+  	$(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
+  
+--- 1040,1046 ----
+  $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
+  	$(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
+  
+! $(OUTDIR)/vim.res:	$(OUTDIR) vim.rc gvim.exe.mnf version.h tools.bmp tearoff.bmp \
+  		vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
+  	$(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
+  
+*** ../vim-7.2.204/src/gvim.exe.mnf	2008-08-09 19:37:29.000000000 +0200
+--- src/gvim.exe.mnf	2009-06-16 16:36:32.000000000 +0200
+***************
+*** 1,5 ****
+  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+! <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <assemblyIdentity
+      processorArchitecture="*"
+      version="7.2.0.0"
+--- 1,5 ----
+  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+! <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+    <assemblyIdentity
+      processorArchitecture="*"
+      version="7.2.0.0"
+***************
+*** 29,32 ****
+--- 29,38 ----
+        </requestedPrivileges>
+      </security>
+    </trustInfo>
++   <!-- Vista High DPI aware -->
++   <asmv3:application>
++     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
++       <dpiAware>true</dpiAware>
++     </asmv3:windowsSettings>
++   </asmv3:application>
+  </assembly>
+*** ../vim-7.2.204/src/version.c	2009-06-16 16:34:12.000000000 +0200
+--- src/version.c	2009-06-16 16:43:04.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     205,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+17. When the money comes out the ATM, scream "I won!, I won! 3rd
+    time this week!!!!!"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.206 b/source/ap/vim/patches/7.2.206
new file mode 100644
index 000000000..e16fb7e17
--- /dev/null
+++ b/source/ap/vim/patches/7.2.206
@@ -0,0 +1,46 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.206
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.206
+Problem:    Win32: Can't build netbeans interface with Visual Studio 2010.
+Solution:   Undefine ECONNREFUSED. (George Reilly)
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.2.205/src/netbeans.c	2009-05-17 23:25:16.000000000 +0200
+--- src/netbeans.c	2009-06-16 16:39:17.000000000 +0200
+***************
+*** 32,37 ****
+--- 32,38 ----
+  /* WinSock API is separated from C API, thus we can't use read(), write(),
+   * errno... */
+  # define sock_errno WSAGetLastError()
++ # undef ECONNREFUSED
+  # define ECONNREFUSED WSAECONNREFUSED
+  # ifdef EINTR
+  #  undef EINTR
+*** ../vim-7.2.205/src/version.c	2009-06-16 16:45:14.000000000 +0200
+--- src/version.c	2009-06-16 16:57:45.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     206,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+18. When leaving the zoo, start running towards the parking lot,
+    yelling "run for your lives, they're loose!!"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.207 b/source/ap/vim/patches/7.2.207
new file mode 100644
index 000000000..528d35da4
--- /dev/null
+++ b/source/ap/vim/patches/7.2.207
@@ -0,0 +1,69 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.207
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.207
+Problem:    Using freed memory with ":redrawstatus" when it works recursively.
+Solution:   Prevent recursively updating the status line. (partly by Dominique
+	    Pelle)
+Files:	    src/screen.c
+
+
+*** ../vim-7.2.206/src/screen.c	2009-06-16 16:01:34.000000000 +0200
+--- src/screen.c	2009-06-16 17:04:53.000000000 +0200
+***************
+*** 5743,5748 ****
+--- 5743,5755 ----
+      int		fillchar;
+      int		attr;
+      int		this_ru_col;
++     static int  busy = FALSE;
++ 
++     /* It's possible to get here recursively when 'statusline' (indirectly)
++      * invokes ":redrawstatus".  Simply ignore the call then. */
++     if (busy)
++ 	return;
++     busy = TRUE;
+  
+      wp->w_redr_status = FALSE;
+      if (wp->w_status_height == 0)
+***************
+*** 5881,5886 ****
+--- 5888,5894 ----
+  									attr);
+      }
+  #endif
++     busy = FALSE;
+  }
+  
+  #ifdef FEAT_STL_OPT
+*** ../vim-7.2.206/src/version.c	2009-06-16 16:57:53.000000000 +0200
+--- src/version.c	2009-06-16 17:21:56.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     207,
+  /**/
+
+-- 
+In many of the more relaxed civilizations on the Outer Eastern Rim of the
+Galaxy, "The Hitchhiker's Guide to the Galaxy" has already supplanted the
+great "Encyclopedia Galactica" as the standard repository of all knowledge
+and wisdom, for though it has many omissions and contains much that is
+apocryphal, or at least wildly inaccurate, it scores over the older, more
+pedestrian work in two important respects.
+First, it is slightly cheaper; and second, it has the words "DON'T PANIC"
+inscribed in large friendly letters on its cover.
+		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.208 b/source/ap/vim/patches/7.2.208
new file mode 100644
index 000000000..930770d0d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.208
@@ -0,0 +1,82 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.208
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.208
+Problem:    "set novice" gives an error message, it should be ignored.
+Solution:   Don't see "no" in "novice" as unsetting an option.  (Patrick
+	    Texier)
+Files:	    src/option.c
+
+
+*** ../vim-7.2.207/src/option.c	2009-06-16 15:23:07.000000000 +0200
+--- src/option.c	2009-06-16 17:35:08.000000000 +0200
+***************
+*** 4006,4012 ****
+  	else
+  	{
+  	    prefix = 1;
+! 	    if (STRNCMP(arg, "no", 2) == 0)
+  	    {
+  		prefix = 0;
+  		arg += 2;
+--- 4006,4012 ----
+  	else
+  	{
+  	    prefix = 1;
+! 	    if (STRNCMP(arg, "no", 2) == 0 && STRNCMP(arg, "novice", 6) != 0)
+  	    {
+  		prefix = 0;
+  		arg += 2;
+***************
+*** 9757,9763 ****
+  	}
+  	--p;
+      }
+!     if (STRNCMP(p, "no", 2) == 0)
+      {
+  	xp->xp_context = EXPAND_BOOL_SETTINGS;
+  	p += 2;
+--- 9757,9763 ----
+  	}
+  	--p;
+      }
+!     if (STRNCMP(p, "no", 2) == 0 && STRNCMP(p, "novice", 6) != 0)
+      {
+  	xp->xp_context = EXPAND_BOOL_SETTINGS;
+  	p += 2;
+*** ../vim-7.2.207/src/version.c	2009-06-16 17:22:38.000000000 +0200
+--- src/version.c	2009-06-16 17:50:33.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     208,
+  /**/
+
+-- 
+Now it is such a bizarrely improbable coincidence that anything as
+mind-bogglingly useful as the Babel fish could have evolved purely by chance
+that some thinkers have chosen to see it as a final and clinching proof of the
+NON-existence of God.
+The argument goes something like this: 'I refuse to prove that I exist,' says
+God, 'for proof denies faith, and without faith I am nothing.'
+'But,' says Man, 'the Babel fish is a dead giveaway, isn't it?  It could not
+have evolved by chance.  It proves you exist, and so therefore, by your own
+arguments, you don't.  QED.'
+'Oh dear,' says God, 'I hadn't thought of that,' and promptly vanishes in a
+puff of logic.
+'Oh, that was easy,' says Man, and for an encore goes on to prove that black
+is white and gets himself killed on the next pedestrian crossing.
+		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.209 b/source/ap/vim/patches/7.2.209
new file mode 100644
index 000000000..1cc339357
--- /dev/null
+++ b/source/ap/vim/patches/7.2.209
@@ -0,0 +1,82 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.209
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.209
+Problem:    For xxd setmode() is undefined on Cygwin.
+Solution:   Include io.h. (Dominique Pelle)
+Files:	    src/xxd/xxd.c
+
+
+*** ../vim-7.2.208/src/xxd/xxd.c	2007-12-03 21:32:21.000000000 +0100
+--- src/xxd/xxd.c	2009-06-16 18:03:14.000000000 +0200
+***************
+*** 64,69 ****
+--- 64,72 ----
+  # define _CRT_SECURE_NO_DEPRECATE
+  # define _CRT_NONSTDC_NO_DEPRECATE
+  #endif
++ #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
++ # define CYGWIN
++ #endif
+  
+  #include <stdio.h>
+  #ifdef VAXC
+***************
+*** 77,83 ****
+  #if !defined(OS2) && defined(__EMX__)
+  # define OS2
+  #endif
+! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__)
+  # include <io.h>	/* for setmode() */
+  #else
+  # ifdef UNIX
+--- 80,87 ----
+  #if !defined(OS2) && defined(__EMX__)
+  # define OS2
+  #endif
+! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) \
+!   || defined(CYGWIN)
+  # include <io.h>	/* for setmode() */
+  #else
+  # ifdef UNIX
+***************
+*** 150,158 ****
+  # endif
+  #endif
+  
+- #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
+- # define CYGWIN
+- #endif
+  #if defined(MSDOS) || defined(WIN32) || defined(OS2)
+  # define BIN_READ(yes)  ((yes) ? "rb" : "rt")
+  # define BIN_WRITE(yes) ((yes) ? "wb" : "wt")
+--- 154,159 ----
+*** ../vim-7.2.208/src/version.c	2009-06-16 17:50:56.000000000 +0200
+--- src/version.c	2009-06-16 18:16:08.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     209,
+  /**/
+
+-- 
+"So this is it," said Arthur, "we are going to die."
+"Yes," said Ford, "except...no!  Wait a minute!"  He suddenly lunged across
+the chamber at something behind Arthur's line of vision.  "What's this
+switch?" he cried.
+"What?   Where?" cried Arthur, twisting around.
+"No, I was only fooling," said Ford, "we are going to die after all."
+		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.210 b/source/ap/vim/patches/7.2.210
new file mode 100644
index 000000000..9c51a1378
--- /dev/null
+++ b/source/ap/vim/patches/7.2.210
@@ -0,0 +1,58 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.210
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.210
+Problem:    When a file that is being edited has its timestamp updated outside
+	    of Vim and ":checktime" is used still get a warning when writing
+	    the file. (Matt Mueller)
+Solution:   Store the timestamp in b_mtime_read when the timestamp is the only
+	    thing that changed.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.209/src/fileio.c	2009-06-16 16:01:34.000000000 +0200
+--- src/fileio.c	2009-06-20 13:29:41.000000000 +0200
+***************
+*** 6627,6633 ****
+  			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
+  			mesg2 = _("See \":help W16\" for more info.");
+  		    }
+! 		    /* Else: only timestamp changed, ignored */
+  		}
+  	    }
+  	}
+--- 6627,6636 ----
+  			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
+  			mesg2 = _("See \":help W16\" for more info.");
+  		    }
+! 		    else
+! 			/* Only timestamp changed, store it to avoid a warning
+! 			 * in check_mtime() later. */
+! 			buf->b_mtime_read = buf->b_mtime;
+  		}
+  	    }
+  	}
+*** ../vim-7.2.209/src/version.c	2009-06-16 18:29:37.000000000 +0200
+--- src/version.c	2009-06-24 11:57:08.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     210,
+  /**/
+
+-- 
+Have you heard about the new Beowulf cluster? It's so fast, it executes
+an infinite loop in 6 seconds.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.211 b/source/ap/vim/patches/7.2.211
new file mode 100644
index 000000000..05101980b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.211
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.211
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.211
+Problem:    Memory leak when expanding a series of file names.
+Solution:   Use ga_clear_strings() instead of ga_clear().
+Files:	    src/misc1.c
+
+
+*** ../vim-7.2.210/src/misc1.c	2009-05-17 13:30:58.000000000 +0200
+--- src/misc1.c	2009-06-24 16:16:17.000000000 +0200
+***************
+*** 9193,9199 ****
+  		else if (vim_strpbrk(p, (char_u *)"$~") != NULL)
+  		{
+  		    vim_free(p);
+! 		    ga_clear(&ga);
+  		    i = mch_expand_wildcards(num_pat, pat, num_file, file,
+  								       flags);
+  		    recursive = FALSE;
+--- 9193,9199 ----
+  		else if (vim_strpbrk(p, (char_u *)"$~") != NULL)
+  		{
+  		    vim_free(p);
+! 		    ga_clear_strings(&ga);
+  		    i = mch_expand_wildcards(num_pat, pat, num_file, file,
+  								       flags);
+  		    recursive = FALSE;
+*** ../vim-7.2.210/src/version.c	2009-06-24 11:57:53.000000000 +0200
+--- src/version.c	2009-06-24 16:24:32.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     211,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+34. You laugh at people with 14400 baud modems.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.212 b/source/ap/vim/patches/7.2.212
new file mode 100644
index 000000000..33fcb5c43
--- /dev/null
+++ b/source/ap/vim/patches/7.2.212
@@ -0,0 +1,62 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.212 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.212 (extra)
+Problem:    Warnings for redefining SIG macros.
+Solution:   Don't define them if already defined. (Bjorn Winckler)
+Files:	    src/os_mac.h
+
+
+*** ../vim-7.2.211/src/os_mac.h	2008-06-24 22:27:34.000000000 +0200
+--- src/os_mac.h	2009-06-19 21:21:57.000000000 +0200
+***************
+*** 268,276 ****
+   */
+  
+  #ifdef MACOS_X_UNIX
+! # define SIGPROTOARG	(int)
+! # define SIGDEFARG(s)	(s) int s;
+! # define SIGDUMMYARG	0
+  # undef  HAVE_AVAIL_MEM
+  # ifndef HAVE_CONFIG_H
+  #  define RETSIGTYPE void
+--- 268,282 ----
+   */
+  
+  #ifdef MACOS_X_UNIX
+! # ifndef SIGPROTOARG
+! #  define SIGPROTOARG	(int)
+! # endif
+! # ifndef SIGDEFARG
+! #  define SIGDEFARG(s)	(s) int s UNUSED;
+! # endif
+! # ifndef SIGDUMMYARG
+! #  define SIGDUMMYARG	0
+! # endif
+  # undef  HAVE_AVAIL_MEM
+  # ifndef HAVE_CONFIG_H
+  #  define RETSIGTYPE void
+*** ../vim-7.2.211/src/version.c	2009-06-24 16:25:23.000000000 +0200
+--- src/version.c	2009-06-24 16:40:18.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     212,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+37. You start looking for hot HTML addresses in public restrooms.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.213 b/source/ap/vim/patches/7.2.213
new file mode 100644
index 000000000..74a0e1650
--- /dev/null
+++ b/source/ap/vim/patches/7.2.213
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.213
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.213
+Problem:    Warning for using vsprintf().
+Solution:   Use vim_vsnprintf().
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.2.212/src/netbeans.c	2009-06-16 16:57:53.000000000 +0200
+--- src/netbeans.c	2009-06-24 11:26:43.000000000 +0200
+***************
+*** 2586,2592 ****
+      va_list ap;
+  
+      va_start(ap, cmd);
+!     vsprintf(buf, cmd, ap);
+      va_end(ap);
+  
+      nbdebug(("    COLONCMD %s\n", buf));
+--- 2586,2592 ----
+      va_list ap;
+  
+      va_start(ap, cmd);
+!     vim_vsnprintf(buf, sizeof(buf), cmd, ap, NULL);
+      va_end(ap);
+  
+      nbdebug(("    COLONCMD %s\n", buf));
+*** ../vim-7.2.212/src/version.c	2009-06-24 16:41:01.000000000 +0200
+--- src/version.c	2009-06-24 16:49:06.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     213,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+38. You wake up at 3 a.m. to go to the bathroom and stop and check your e-mail
+    on the way back to bed.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.214 b/source/ap/vim/patches/7.2.214
new file mode 100644
index 000000000..17cb1569c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.214
@@ -0,0 +1,65 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.214
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.214
+Problem:    Crash with complete function for user command. (Andy Wokula)
+Solution:   Avoid using a NULL pointer (Dominique Pelle)
+Files:	    src/ex_getln.c
+
+
+*** ../vim-7.2.213/src/ex_getln.c	2009-05-16 17:29:37.000000000 +0200
+--- src/ex_getln.c	2009-06-24 16:57:28.000000000 +0200
+***************
+*** 4874,4887 ****
+      /* Loop over the items in the list. */
+      for (li = retlist->lv_first; li != NULL; li = li->li_next)
+      {
+! 	if (li->li_tv.v_type != VAR_STRING)
+! 	    continue;  /* Skip non-string items */
+  
+  	if (ga_grow(&ga, 1) == FAIL)
+  	    break;
+  
+  	((char_u **)ga.ga_data)[ga.ga_len] =
+! 	    vim_strsave(li->li_tv.vval.v_string);
+  	++ga.ga_len;
+      }
+      list_unref(retlist);
+--- 4874,4887 ----
+      /* Loop over the items in the list. */
+      for (li = retlist->lv_first; li != NULL; li = li->li_next)
+      {
+! 	if (li->li_tv.v_type != VAR_STRING || li->li_tv.vval.v_string == NULL)
+! 	    continue;  /* Skip non-string items and empty strings */
+  
+  	if (ga_grow(&ga, 1) == FAIL)
+  	    break;
+  
+  	((char_u **)ga.ga_data)[ga.ga_len] =
+! 					 vim_strsave(li->li_tv.vval.v_string);
+  	++ga.ga_len;
+      }
+      list_unref(retlist);
+*** ../vim-7.2.213/src/version.c	2009-06-24 16:49:50.000000000 +0200
+--- src/version.c	2009-06-24 17:03:58.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     214,
+  /**/
+
+-- 
+He who laughs last, thinks slowest.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.215 b/source/ap/vim/patches/7.2.215
new file mode 100644
index 000000000..90e746cea
--- /dev/null
+++ b/source/ap/vim/patches/7.2.215
@@ -0,0 +1,310 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.215
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.215
+Problem:    ml_get error when using ":vimgrep".
+Solution:   Load the memfile for the hidden buffer before putting it in a
+	    window.  Correct the order of splitting the window and filling
+	    the window and buffer with data.
+Files:	    src/fileio.c, src/proto/window.pro, src/quickfix.c, src/window.c
+
+
+*** ../vim-7.2.214/src/fileio.c	2009-06-24 11:57:53.000000000 +0200
+--- src/fileio.c	2009-06-24 12:53:19.000000000 +0200
+***************
+*** 710,716 ****
+  #endif
+  #ifdef UNIX
+  	/* Set swap file protection bits after creating it. */
+! 	if (swap_mode > 0 && curbuf->b_ml.ml_mfp->mf_fname != NULL)
+  	    (void)mch_setperm(curbuf->b_ml.ml_mfp->mf_fname, (long)swap_mode);
+  #endif
+      }
+--- 710,717 ----
+  #endif
+  #ifdef UNIX
+  	/* Set swap file protection bits after creating it. */
+! 	if (swap_mode > 0 && curbuf->b_ml.ml_mfp != NULL
+! 			  && curbuf->b_ml.ml_mfp->mf_fname != NULL)
+  	    (void)mch_setperm(curbuf->b_ml.ml_mfp->mf_fname, (long)swap_mode);
+  #endif
+      }
+***************
+*** 8435,8443 ****
+  	 * effects, insert it in a the current tab page.
+  	 * Anything related to a window (e.g., setting folds) may have
+  	 * unexpected results. */
+! 	curwin = aucmd_win;
+! 	curwin->w_buffer = buf;
+  	++buf->b_nwindows;
+  
+  #ifdef FEAT_WINDOWS
+  	/* Split the current window, put the aucmd_win in the upper half. */
+--- 8436,8444 ----
+  	 * effects, insert it in a the current tab page.
+  	 * Anything related to a window (e.g., setting folds) may have
+  	 * unexpected results. */
+! 	aucmd_win->w_buffer = buf;
+  	++buf->b_nwindows;
++ 	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
+  
+  #ifdef FEAT_WINDOWS
+  	/* Split the current window, put the aucmd_win in the upper half. */
+***************
+*** 8448,8459 ****
+  	(void)win_comp_pos();   /* recompute window positions */
+  	p_ea = save_ea;
+  #endif
+! 	/* set cursor and topline to safe values */
+! 	curwin_init();
+! #ifdef FEAT_VERTSPLIT
+! 	curwin->w_wincol = 0;
+! 	curwin->w_width = Columns;
+! #endif
+      }
+      curbuf = buf;
+      aco->new_curwin = curwin;
+--- 8449,8455 ----
+  	(void)win_comp_pos();   /* recompute window positions */
+  	p_ea = save_ea;
+  #endif
+! 	curwin = aucmd_win;
+      }
+      curbuf = buf;
+      aco->new_curwin = curwin;
+*** ../vim-7.2.214/src/proto/window.pro	2009-06-16 16:01:34.000000000 +0200
+--- src/proto/window.pro	2009-06-24 12:53:13.000000000 +0200
+***************
+*** 14,19 ****
+--- 14,20 ----
+  win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
+  void close_others __ARGS((int message, int forceit));
+  void curwin_init __ARGS((void));
++ void win_init_empty __ARGS((win_T *wp));
+  int win_alloc_first __ARGS((void));
+  void win_alloc_aucmd_win __ARGS((void));
+  void win_init_size __ARGS((void));
+*** ../vim-7.2.214/src/quickfix.c	2009-05-17 13:30:58.000000000 +0200
+--- src/quickfix.c	2009-06-24 15:30:06.000000000 +0200
+***************
+*** 3411,3424 ****
+      /* Init the options. */
+      buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
+  
+!     /* set curwin/curbuf to buf and save a few things */
+!     aucmd_prepbuf(&aco, newbuf);
+  
+!     /* Need to set the filename for autocommands. */
+!     (void)setfname(curbuf, fname, NULL, FALSE);
+  
+-     if (ml_open(curbuf) == OK)
+-     {
+  	/* Create swap file now to avoid the ATTENTION message. */
+  	check_need_swap(TRUE);
+  
+--- 3411,3425 ----
+      /* Init the options. */
+      buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
+  
+!     /* need to open the memfile before putting the buffer in a window */
+!     if (ml_open(newbuf) == OK)
+!     {
+! 	/* set curwin/curbuf to buf and save a few things */
+! 	aucmd_prepbuf(&aco, newbuf);
+  
+! 	/* Need to set the filename for autocommands. */
+! 	(void)setfname(curbuf, fname, NULL, FALSE);
+  
+  	/* Create swap file now to avoid the ATTENTION message. */
+  	check_need_swap(TRUE);
+  
+***************
+*** 3441,3450 ****
+  		newbuf = curbuf;
+  	    }
+  	}
+-     }
+  
+!     /* restore curwin/curbuf and a few other things */
+!     aucmd_restbuf(&aco);
+  
+      if (!buf_valid(newbuf))
+  	return NULL;
+--- 3442,3451 ----
+  		newbuf = curbuf;
+  	    }
+  	}
+  
+! 	/* restore curwin/curbuf and a few other things */
+! 	aucmd_restbuf(&aco);
+!     }
+  
+      if (!buf_valid(newbuf))
+  	return NULL;
+*** ../vim-7.2.214/src/window.c	2009-06-16 16:01:34.000000000 +0200
+--- src/window.c	2009-06-24 14:35:16.000000000 +0200
+***************
+*** 2354,2366 ****
+      frame_T	*frp;
+      win_T	*wp;
+  
+- #ifdef FEAT_FOLDING
+-     clearFolding(win);
+- #endif
+- 
+-     /* reduce the reference count to the argument list. */
+-     alist_unlink(win->w_alist);
+- 
+      /* Remove the window and its frame from the tree of frames. */
+      frp = win->w_frame;
+      wp = winframe_remove(win, dirp, tp);
+--- 2354,2359 ----
+***************
+*** 2386,2394 ****
+  	tabpage_close(TRUE);
+  # endif
+  
+-     while (firstwin != NULL)
+- 	(void)win_free_mem(firstwin, &dummy, NULL);
+- 
+  # ifdef FEAT_AUTOCMD
+      if (aucmd_win != NULL)
+      {
+--- 2379,2384 ----
+***************
+*** 2396,2401 ****
+--- 2386,2394 ----
+  	aucmd_win = NULL;
+      }
+  # endif
++ 
++     while (firstwin != NULL)
++ 	(void)win_free_mem(firstwin, &dummy, NULL);
+  }
+  #endif
+  
+***************
+*** 3204,3230 ****
+      void
+  curwin_init()
+  {
+!     redraw_win_later(curwin, NOT_VALID);
+!     curwin->w_lines_valid = 0;
+!     curwin->w_cursor.lnum = 1;
+!     curwin->w_curswant = curwin->w_cursor.col = 0;
+  #ifdef FEAT_VIRTUALEDIT
+!     curwin->w_cursor.coladd = 0;
+  #endif
+!     curwin->w_pcmark.lnum = 1;	/* pcmark not cleared but set to line 1 */
+!     curwin->w_pcmark.col = 0;
+!     curwin->w_prev_pcmark.lnum = 0;
+!     curwin->w_prev_pcmark.col = 0;
+!     curwin->w_topline = 1;
+  #ifdef FEAT_DIFF
+!     curwin->w_topfill = 0;
+  #endif
+!     curwin->w_botline = 2;
+  #ifdef FEAT_FKMAP
+!     if (curwin->w_p_rl)
+! 	curwin->w_farsi = W_CONV + W_R_L;
+      else
+! 	curwin->w_farsi = W_CONV;
+  #endif
+  }
+  
+--- 3197,3230 ----
+      void
+  curwin_init()
+  {
+!     win_init_empty(curwin);
+! }
+! 
+!     void
+! win_init_empty(wp)
+!     win_T *wp;
+! {
+!     redraw_win_later(wp, NOT_VALID);
+!     wp->w_lines_valid = 0;
+!     wp->w_cursor.lnum = 1;
+!     wp->w_curswant = wp->w_cursor.col = 0;
+  #ifdef FEAT_VIRTUALEDIT
+!     wp->w_cursor.coladd = 0;
+  #endif
+!     wp->w_pcmark.lnum = 1;	/* pcmark not cleared but set to line 1 */
+!     wp->w_pcmark.col = 0;
+!     wp->w_prev_pcmark.lnum = 0;
+!     wp->w_prev_pcmark.col = 0;
+!     wp->w_topline = 1;
+  #ifdef FEAT_DIFF
+!     wp->w_topfill = 0;
+  #endif
+!     wp->w_botline = 2;
+  #ifdef FEAT_FKMAP
+!     if (wp->w_p_rl)
+! 	wp->w_farsi = W_CONV + W_R_L;
+      else
+! 	wp->w_farsi = W_CONV;
+  #endif
+  }
+  
+***************
+*** 4325,4330 ****
+--- 4325,4337 ----
+  {
+      int		i;
+  
++ #ifdef FEAT_FOLDING
++     clearFolding(wp);
++ #endif
++ 
++     /* reduce the reference count to the argument list. */
++     alist_unlink(wp->w_alist);
++ 
+  #ifdef FEAT_AUTOCMD
+      /* Don't execute autocommands while the window is halfway being deleted.
+       * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */
+***************
+*** 4387,4393 ****
+      }
+  #endif /* FEAT_GUI */
+  
+!     win_remove(wp, tp);
+      vim_free(wp);
+  
+  #ifdef FEAT_AUTOCMD
+--- 4394,4403 ----
+      }
+  #endif /* FEAT_GUI */
+  
+! #ifdef FEAT_AUTOCMD
+!     if (wp != aucmd_win)
+! #endif
+! 	win_remove(wp, tp);
+      vim_free(wp);
+  
+  #ifdef FEAT_AUTOCMD
+*** ../vim-7.2.214/src/version.c	2009-06-24 17:04:40.000000000 +0200
+--- src/version.c	2009-06-24 17:27:38.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     215,
+  /**/
+
+-- 
+Micro$oft: where do you want to go today?
+    Linux: where do you want to go tomorrow?
+  FreeBSD: are you guys coming, or what?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.216 b/source/ap/vim/patches/7.2.216
new file mode 100644
index 000000000..5a7afdffc
--- /dev/null
+++ b/source/ap/vim/patches/7.2.216
@@ -0,0 +1,137 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.216
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.216
+Problem:    Two error messages have the same number E812.
+Solution:   Give one message a different number.
+Files:	    runtime/doc/autocmd.txt, runtime/doc/if_mzsch.txt, src/if_mzsch.c
+
+
+*** ../vim-7.2.215/runtime/doc/autocmd.txt	2008-08-09 19:36:46.000000000 +0200
+--- runtime/doc/autocmd.txt	2009-06-24 17:49:04.000000000 +0200
+***************
+*** 335,340 ****
+--- 335,342 ----
+  				NOTE: When this autocommand is executed, the
+  				current buffer "%" may be different from the
+  				buffer being deleted "<afile>" and "<abuf>".
++ 				Don't change to another buffer, it will cause
++ 				problems.
+  							*BufEnter*
+  BufEnter			After entering a buffer.  Useful for setting
+  				options for a file type.  Also executed when
+***************
+*** 397,402 ****
+--- 399,406 ----
+  				NOTE: When this autocommand is executed, the
+  				current buffer "%" may be different from the
+  				buffer being unloaded "<afile>".
++ 				Don't change to another buffer, it will cause
++ 				problems.
+  							*BufWinEnter*
+  BufWinEnter			After a buffer is displayed in a window.  This
+  				can be when the buffer is loaded (after
+***************
+*** 428,433 ****
+--- 432,439 ----
+  				NOTE: When this autocommand is executed, the
+  				current buffer "%" may be different from the
+  				buffer being deleted "<afile>".
++ 				Don't change to another buffer, it will cause
++ 				problems.
+  						*BufWrite* *BufWritePre*
+  BufWrite or BufWritePre		Before writing the whole buffer to a file.
+  							*BufWriteCmd*
+***************
+*** 748,755 ****
+  					'a'	abort, like hitting CTRL-C
+  				When set to an empty string the user will be
+  				asked, as if there was no SwapExists autocmd.
+! 				Note: Do not try to change the buffer, the
+! 				results are unpredictable.
+  							*Syntax*
+  Syntax				When the 'syntax' option has been set.  The
+  				pattern is matched against the syntax name.
+--- 754,763 ----
+  					'a'	abort, like hitting CTRL-C
+  				When set to an empty string the user will be
+  				asked, as if there was no SwapExists autocmd.
+! 							*E812*
+! 				It is not allowed to change to another buffer,
+! 				change a buffer name or change directory
+! 				here.
+  							*Syntax*
+  Syntax				When the 'syntax' option has been set.  The
+  				pattern is matched against the syntax name.
+*** ../vim-7.2.215/runtime/doc/if_mzsch.txt	2009-05-26 22:58:43.000000000 +0200
+--- runtime/doc/if_mzsch.txt	2009-06-24 12:08:20.000000000 +0200
+***************
+*** 1,4 ****
+! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 May 26
+  
+  
+  		  VIM REFERENCE MANUAL    by Sergey Khorev
+--- 1,4 ----
+! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 Jun 24
+  
+  
+  		  VIM REFERENCE MANUAL    by Sergey Khorev
+***************
+*** 231,237 ****
+      (set-cursor (line . col) [window])  Set cursor position.
+  
+  ==============================================================================
+! 5. Dynamic loading				    *mzscheme-dynamic* *E812*
+  
+  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
+  output then includes |+mzscheme/dyn|.
+--- 231,237 ----
+      (set-cursor (line . col) [window])  Set cursor position.
+  
+  ==============================================================================
+! 5. Dynamic loading				    *mzscheme-dynamic* *E815*
+  
+  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
+  output then includes |+mzscheme/dyn|.
+*** ../vim-7.2.215/src/if_mzsch.c	2009-05-26 22:58:43.000000000 +0200
+--- src/if_mzsch.c	2009-06-24 12:08:23.000000000 +0200
+***************
+*** 1040,1046 ****
+  #ifdef DYNAMIC_MZSCHEME
+  	if (!mzscheme_enabled(TRUE))
+  	{
+! 	    EMSG(_("E812: Sorry, this command is disabled, the MzScheme libraries could not be loaded."));
+  	    return -1;
+  	}
+  #endif
+--- 1040,1046 ----
+  #ifdef DYNAMIC_MZSCHEME
+  	if (!mzscheme_enabled(TRUE))
+  	{
+! 	    EMSG(_("E815: Sorry, this command is disabled, the MzScheme libraries could not be loaded."));
+  	    return -1;
+  	}
+  #endif
+*** ../vim-7.2.215/src/version.c	2009-06-24 17:31:27.000000000 +0200
+--- src/version.c	2009-06-24 17:46:56.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     216,
+  /**/
+
+-- 
+Everyone has a photographic memory. Some don't have film.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.217 b/source/ap/vim/patches/7.2.217
new file mode 100644
index 000000000..30d8aa6a9
--- /dev/null
+++ b/source/ap/vim/patches/7.2.217
@@ -0,0 +1,57 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.217
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.217
+Problem:    Running tests with valgrind doesn't work as advertised.
+Solution:   Fix the line in the Makefile.
+Files:	    src/testdir/Makefile
+
+
+*** ../vim-7.2.216/src/testdir/Makefile	2009-03-11 16:26:01.000000000 +0100
+--- src/testdir/Makefile	2009-06-24 14:59:42.000000000 +0200
+***************
+*** 4,12 ****
+  
+  VIMPROG = ../vim
+  
+! # Uncomment this line for using valgrind.
+! # The output goes into a file "valgrind.$PID" (sorry, no test number).
+! # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --logfile=valgrind
+  
+  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
+  		test7.out test8.out test9.out test10.out test11.out \
+--- 4,14 ----
+  
+  VIMPROG = ../vim
+  
+! # Uncomment this line to use valgrind for memory leaks and extra warnings.
+! #   The output goes into a file "valgrind.testN"
+! #   Vim should be compiled with EXITFREE to avoid false warnings.
+! #   This will make testing about 10 times as slow.
+! # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --log-file=valgrind.$*
+  
+  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
+  		test7.out test8.out test9.out test10.out test11.out \
+*** ../vim-7.2.216/src/version.c	2009-06-24 17:51:01.000000000 +0200
+--- src/version.c	2009-06-24 18:07:07.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     217,
+  /**/
+
+-- 
+A day without sunshine is like, well, night.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.218 b/source/ap/vim/patches/7.2.218
new file mode 100644
index 000000000..b48d7180b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.218
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.218
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.218
+Problem:    Cannot build GTK with hangul_input feature. (Dominique Pelle)
+Solution:   Adjuste #ifdef.  (SungHyun Nam)
+Files:	    src/gui.c
+
+
+*** ../vim-7.2.217/src/gui.c	2009-06-16 16:01:34.000000000 +0200
+--- src/gui.c	2009-06-24 17:45:01.000000000 +0200
+***************
+*** 959,965 ****
+  		guicolor_T fg, bg;
+  
+  		if (
+! # ifdef HAVE_GTK2
+  			preedit_get_status()
+  # else
+  			im_get_status()
+--- 959,965 ----
+  		guicolor_T fg, bg;
+  
+  		if (
+! # if defined(HAVE_GTK2) && !defined(FEAT_HANGULIN)
+  			preedit_get_status()
+  # else
+  			im_get_status()
+*** ../vim-7.2.217/src/version.c	2009-06-24 18:07:55.000000000 +0200
+--- src/version.c	2009-06-24 18:31:06.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     218,
+  /**/
+
+-- 
+The users that I support would double-click on a landmine to find out
+what happens.				-- A system administrator
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.219 b/source/ap/vim/patches/7.2.219
new file mode 100644
index 000000000..f9bbec04d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.219
@@ -0,0 +1,71 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.219 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.219 (extra)
+Problem:    Photon GUI is outdated.
+Solution:   Updates for QNX 6.4.0. (Sean Boudreau)
+Files:	    src/gui_photon.c
+
+
+*** ../vim-7.2.218/src/gui_photon.c	2007-05-10 20:23:35.000000000 +0200
+--- src/gui_photon.c	2009-07-01 16:08:36.000000000 +0200
+***************
+*** 838,844 ****
+--- 838,849 ----
+      static void
+  gui_ph_draw_start( void )
+  {
++     PhGC_t *gc;
++ 
++     gc = PgGetGC();
+      PgSetRegion( PtWidgetRid( PtFindDisjoint( gui.vimTextArea ) ) );
++     PgClearClippingsCx( gc );
++     PgClearTranslationCx( gc );
+  
+      PtWidgetOffset( gui.vimTextArea, &gui_ph_raw_offset );
+      PhTranslatePoint( &gui_ph_raw_offset, PtWidgetPos( gui.vimTextArea, NULL ) );
+***************
+*** 2970,2976 ****
+      if( vim_font_name == NULL )
+      {
+  	/* Default font */
+! 	vim_font_name = "PC Term";
+      }
+  
+      if( STRCMP( vim_font_name, "*" ) == 0 )
+--- 2975,2981 ----
+      if( vim_font_name == NULL )
+      {
+  	/* Default font */
+! 	vim_font_name = "PC Terminal";
+      }
+  
+      if( STRCMP( vim_font_name, "*" ) == 0 )
+*** ../vim-7.2.218/src/version.c	2009-06-24 18:31:36.000000000 +0200
+--- src/version.c	2009-07-01 16:11:34.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     219,
+  /**/
+
+-- 
+"Oh, no!  NOT the Spanish Inquisition!"
+"NOBODY expects the Spanish Inquisition!!!"
+				-- Monty Python sketch --
+"Oh, no!  NOT another option!"
+"EVERYBODY expects another option!!!"
+				-- Discussion in vim-dev mailing list --
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.220 b/source/ap/vim/patches/7.2.220
new file mode 100644
index 000000000..b3d63f35f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.220
@@ -0,0 +1,95 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.220
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.220 (after 7.2.215)
+Problem:    a BufEnter autocommand that changes directory causes problems.
+	    (Ajit Thakkar)
+Solution:   Disable autocommands when opening a hidden buffer in a window.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.219/src/fileio.c	2009-06-24 17:31:27.000000000 +0200
+--- src/fileio.c	2009-07-01 17:02:46.000000000 +0200
+***************
+*** 8441,8453 ****
+  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
+  
+  #ifdef FEAT_WINDOWS
+! 	/* Split the current window, put the aucmd_win in the upper half. */
+  	make_snapshot(SNAP_AUCMD_IDX);
+  	save_ea = p_ea;
+  	p_ea = FALSE;
+  	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
+  	(void)win_comp_pos();   /* recompute window positions */
+  	p_ea = save_ea;
+  #endif
+  	curwin = aucmd_win;
+      }
+--- 8441,8456 ----
+  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
+  
+  #ifdef FEAT_WINDOWS
+! 	/* Split the current window, put the aucmd_win in the upper half.
+! 	 * We don't want the BufEnter or WinEnter autocommands. */
+! 	block_autocmds();
+  	make_snapshot(SNAP_AUCMD_IDX);
+  	save_ea = p_ea;
+  	p_ea = FALSE;
+  	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
+  	(void)win_comp_pos();   /* recompute window positions */
+  	p_ea = save_ea;
++ 	unblock_autocmds();
+  #endif
+  	curwin = aucmd_win;
+      }
+***************
+*** 8474,8480 ****
+  	--curbuf->b_nwindows;
+  #ifdef FEAT_WINDOWS
+  	/* Find "aucmd_win", it can't be closed, but it may be in another tab
+! 	 * page. */
+  	if (curwin != aucmd_win)
+  	{
+  	    tabpage_T	*tp;
+--- 8477,8484 ----
+  	--curbuf->b_nwindows;
+  #ifdef FEAT_WINDOWS
+  	/* Find "aucmd_win", it can't be closed, but it may be in another tab
+! 	 * page. Do not trigger autocommands here. */
+! 	block_autocmds();
+  	if (curwin != aucmd_win)
+  	{
+  	    tabpage_T	*tp;
+***************
+*** 8498,8503 ****
+--- 8502,8508 ----
+  	last_status(FALSE);	    /* may need to remove last status line */
+  	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
+  	(void)win_comp_pos();   /* recompute window positions */
++ 	unblock_autocmds();
+  
+  	if (win_valid(aco->save_curwin))
+  	    curwin = aco->save_curwin;
+*** ../vim-7.2.219/src/version.c	2009-07-01 16:12:54.000000000 +0200
+--- src/version.c	2009-07-01 17:10:22.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     220,
+  /**/
+
+-- 
+Microsoft is to software what McDonalds is to gourmet cooking
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.221 b/source/ap/vim/patches/7.2.221
new file mode 100644
index 000000000..3c6180e3c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.221
@@ -0,0 +1,247 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.221
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.221
+Problem:    X cut_buffer0 text is used as-is, it may be in the wrong encoding.
+Solution:   Convert between 'enc' and latin1. (James Vega)
+Files:	    src/gui_gtk_x11.c, src/message.c, src/ops.c, src/proto/ui.pro,
+	    src/ui.c
+
+
+*** ../vim-7.2.220/src/gui_gtk_x11.c	2009-06-16 15:23:07.000000000 +0200
+--- src/gui_gtk_x11.c	2009-07-01 11:55:34.000000000 +0200
+***************
+*** 6717,6724 ****
+  {
+      GdkAtom	target;
+      unsigned	i;
+-     int		nbytes;
+-     char_u	*buffer;
+      time_t	start;
+  
+      for (i = 0; i < N_SELECTION_TARGETS; ++i)
+--- 6717,6722 ----
+***************
+*** 6746,6767 ****
+      }
+  
+      /* Final fallback position - use the X CUT_BUFFER0 store */
+!     nbytes = 0;
+!     buffer = (char_u *)XFetchBuffer(GDK_WINDOW_XDISPLAY(gui.mainwin->window),
+! 				    &nbytes, 0);
+!     if (nbytes > 0)
+!     {
+! 	/* Got something */
+! 	clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
+! 	if (p_verbose > 0)
+! 	{
+! 	    verbose_enter();
+! 	    smsg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
+! 	    verbose_leave();
+! 	}
+!     }
+!     if (buffer != NULL)
+! 	XFree(buffer);
+  }
+  
+  /*
+--- 6744,6750 ----
+      }
+  
+      /* Final fallback position - use the X CUT_BUFFER0 store */
+!     yank_cut_buffer0(GDK_WINDOW_XDISPLAY(gui.mainwin->window), cbd);
+  }
+  
+  /*
+*** ../vim-7.2.220/src/message.c	2009-05-17 13:30:58.000000000 +0200
+--- src/message.c	2009-07-01 16:43:08.000000000 +0200
+***************
+*** 107,113 ****
+  }
+  
+  #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \
+!     || defined(PROTO)
+  /*
+   * Like msg() but keep it silent when 'verbosefile' is set.
+   */
+--- 107,113 ----
+  }
+  
+  #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \
+!     || defined(FEAT_GUI_GTK) || defined(PROTO)
+  /*
+   * Like msg() but keep it silent when 'verbosefile' is set.
+   */
+*** ../vim-7.2.220/src/ops.c	2009-05-26 18:12:13.000000000 +0200
+--- src/ops.c	2009-07-01 12:15:31.000000000 +0200
+***************
+*** 5591,5596 ****
+--- 5591,5619 ----
+      if (dpy != NULL && str != NULL && motion_type >= 0
+  					       && len < 1024*1024 && len > 0)
+      {
++ #ifdef FEAT_MBYTE
++ 	/* The CUT_BUFFER0 is supposed to always contain latin1.  Convert from
++ 	 * 'enc' when it is a multi-byte encoding.  When 'enc' is an 8-bit
++ 	 * encoding conversion usually doesn't work, so keep the text as-is.
++ 	 */
++ 	if (has_mbyte)
++ 	{
++ 	    char_u	*conv_str = str;
++ 	    vimconv_T	vc;
++ 
++ 	    vc.vc_type = CONV_NONE;
++ 	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
++ 	    {
++ 		conv_str = string_convert(&vc, str, (int*)&len);
++ 		if (conv_str != NULL)
++ 		{
++ 		    vim_free(str);
++ 		    str = conv_str;
++ 		}
++ 		convert_setup(&vc, NULL, NULL);
++ 	    }
++ 	}
++ #endif
+  	XStoreBuffer(dpy, (char *)str, (int)len, 0);
+  	XFlush(dpy);
+      }
+*** ../vim-7.2.220/src/proto/ui.pro	2007-05-05 19:58:49.000000000 +0200
+--- src/proto/ui.pro	2009-07-01 11:48:11.000000000 +0200
+***************
+*** 48,53 ****
+--- 48,54 ----
+  void open_app_context __ARGS((void));
+  void x11_setup_atoms __ARGS((Display *dpy));
+  void clip_x11_request_selection __ARGS((Widget myShell, Display *dpy, VimClipboard *cbd));
++ void yank_cut_buffer0 __ARGS((Display *dpy, VimClipboard *cbd));
+  void clip_x11_lose_selection __ARGS((Widget myShell, VimClipboard *cbd));
+  int clip_x11_own_selection __ARGS((Widget myShell, VimClipboard *cbd));
+  void clip_x11_set_selection __ARGS((VimClipboard *cbd));
+*** ../vim-7.2.220/src/ui.c	2009-05-17 13:30:58.000000000 +0200
+--- src/ui.c	2009-07-01 15:44:07.000000000 +0200
+***************
+*** 2104,2111 ****
+      Atom	type;
+      static int	success;
+      int		i;
+-     int		nbytes = 0;
+-     char_u	*buffer;
+      time_t	start_time;
+      int		timed_out = FALSE;
+  
+--- 2104,2109 ----
+***************
+*** 2185,2199 ****
+      }
+  
+      /* Final fallback position - use the X CUT_BUFFER0 store */
+!     buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0);
+!     if (nbytes > 0)
+!     {
+! 	/* Got something */
+! 	clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
+! 	XFree((void *)buffer);
+! 	if (p_verbose > 0)
+! 	    verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
+!     }
+  }
+  
+  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
+--- 2183,2189 ----
+      }
+  
+      /* Final fallback position - use the X CUT_BUFFER0 store */
+!     yank_cut_buffer0(dpy, cbd);
+  }
+  
+  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
+***************
+*** 2369,2374 ****
+--- 2359,2418 ----
+  }
+  #endif
+  
++ #if defined(FEAT_XCLIPBOARD) || defined(FEAT_GUI_X11) \
++     || defined(FEAT_GUI_GTK) || defined(PROTO)
++ /*
++  * Get the contents of the X CUT_BUFFER0 and put it in "cbd".
++  */
++     void
++ yank_cut_buffer0(dpy, cbd)
++     Display		*dpy;
++     VimClipboard	*cbd;
++ {
++     int		nbytes = 0;
++     char_u	*buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0);
++ 
++     if (nbytes > 0)
++     {
++ #ifdef FEAT_MBYTE
++ 	int  done = FALSE;
++ 
++ 	/* CUT_BUFFER0 is supposed to be always latin1.  Convert to 'enc' when
++ 	 * using a multi-byte encoding.  Conversion between two 8-bit
++ 	 * character sets usually fails and the text might actually be in
++ 	 * 'enc' anyway. */
++ 	if (has_mbyte)
++ 	{
++ 	    char_u	*conv_buf = buffer;
++ 	    vimconv_T	vc;
++ 
++ 	    vc.vc_type = CONV_NONE;
++ 	    if (convert_setup(&vc, (char_u *)"latin1", p_enc) == OK)
++ 	    {
++ 		conv_buf = string_convert(&vc, buffer, &nbytes);
++ 		if (conv_buf != NULL)
++ 		{
++ 		    clip_yank_selection(MCHAR, conv_buf, (long)nbytes, cbd);
++ 		    vim_free(conv_buf);
++ 		    done = TRUE;
++ 		}
++ 		convert_setup(&vc, NULL, NULL);
++ 	    }
++ 	}
++ 	if (!done)  /* use the text without conversion */
++ #endif
++ 	    clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
++ 	XFree((void *)buffer);
++ 	if (p_verbose > 0)
++ 	{
++ 	    verbose_enter();
++ 	    verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
++ 	    verbose_leave();
++ 	}
++     }
++ }
++ #endif
++ 
+  #if defined(FEAT_MOUSE) || defined(PROTO)
+  
+  /*
+*** ../vim-7.2.220/src/version.c	2009-07-01 17:11:40.000000000 +0200
+--- src/version.c	2009-07-01 17:56:02.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     221,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+40. You tell the cab driver you live at
+    http://123.elm.street/house/bluetrim.html
+41. You actually try that 123.elm.street address.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.222 b/source/ap/vim/patches/7.2.222
new file mode 100644
index 000000000..dcf0b36c6
--- /dev/null
+++ b/source/ap/vim/patches/7.2.222
@@ -0,0 +1,59 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.222
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.222
+Problem:   ":mksession" doesn't work properly with 'acd' set. 
+Solution:   Make it work. (Yakov Lerner)
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.2.221/src/ex_docmd.c	2009-05-16 17:29:37.000000000 +0200
+--- src/ex_docmd.c	2009-07-01 20:18:22.000000000 +0200
+***************
+*** 8686,8691 ****
+--- 8693,8700 ----
+      }
+  
+  #ifdef FEAT_SESSION
++     /* Use the short file name until ":lcd" is used.  We also don't use the
++      * short file name when 'acd' is set, that is checked later. */
+      did_lcd = FALSE;
+  
+      /* ":mkview" or ":mkview 9": generate file name with 'viewdir' */
+***************
+*** 10573,10578 ****
+--- 10582,10590 ----
+      if (buf->b_sfname != NULL
+  	    && flagp == &ssop_flags
+  	    && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
++ #ifdef FEAT_AUTOCHDIR
++ 	    && !p_acd
++ #endif
+  	    && !did_lcd)
+  	name = buf->b_sfname;
+      else
+*** ../vim-7.2.221/src/version.c	2009-07-01 18:04:30.000000000 +0200
+--- src/version.c	2009-07-01 20:16:19.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     222,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+43. You tell the kids they can't use the computer because "Daddy's got work to
+    do" and you don't even have a job.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.223 b/source/ap/vim/patches/7.2.223
new file mode 100644
index 000000000..cac2126cf
--- /dev/null
+++ b/source/ap/vim/patches/7.2.223
@@ -0,0 +1,165 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.223
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.223
+Problem:    When a script is run with ":silent" it is not able to give warning
+	    messages.
+Solution:   Add the ":unsilent" command.
+Files:	    runtime/doc/various.txt, src/ex_cmds.h, src/ex_docmd.c
+
+
+*** ../vim-7.2.222/runtime/doc/various.txt	2008-08-09 19:36:54.000000000 +0200
+--- runtime/doc/various.txt	2009-07-09 15:52:54.000000000 +0200
+***************
+*** 508,513 ****
+--- 508,524 ----
+  			messages though.  Use ":silent" in the command itself
+  			to avoid that: ":silent menu .... :silent command".
+  
++ 						*:uns* *:unsilent*
++ :uns[ilent] {command}	Execute {command} not silently.  Only makes a
++ 			difference when |:silent| was used to get to this
++ 			command.
++ 			Use this for giving a message even when |:silent| was
++ 			used.  In this example |:silent| is used to avoid the
++ 			message about reading the file and |:unsilent| to be
++ 			able to list the first line of each file. >
++     		:silent argdo unsilent echo expand('%') . ": " . getline(1)
++ <
++ 
+  						*:verb* *:verbose*
+  :[count]verb[ose] {command}
+  			Execute {command} with 'verbose' set to [count].  If
+*** ../vim-7.2.222/src/ex_cmds.h	2008-11-09 13:43:25.000000000 +0100
+--- src/ex_cmds.h	2009-07-01 18:12:55.000000000 +0200
+***************
+*** 991,996 ****
+--- 991,998 ----
+  			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+  EX(CMD_unmenu,		"unmenu",	ex_menu,
+  			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
++ EX(CMD_unsilent,	"unsilent",	ex_wrongmodifier,
++ 			NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+  EX(CMD_update,		"update",	ex_update,
+  			RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR),
+  EX(CMD_vglobal,		"vglobal",	ex_global,
+*** ../vim-7.2.222/src/ex_docmd.c	2009-07-01 20:18:43.000000000 +0200
+--- src/ex_docmd.c	2009-07-09 15:24:03.000000000 +0200
+***************
+*** 1677,1684 ****
+      char_u		*errormsg = NULL;	/* error message */
+      exarg_T		ea;			/* Ex command arguments */
+      long		verbose_save = -1;
+!     int			save_msg_scroll = 0;
+!     int			did_silent = 0;
+      int			did_esilent = 0;
+  #ifdef HAVE_SANDBOX
+      int			did_sandbox = FALSE;
+--- 1677,1684 ----
+      char_u		*errormsg = NULL;	/* error message */
+      exarg_T		ea;			/* Ex command arguments */
+      long		verbose_save = -1;
+!     int			save_msg_scroll = msg_scroll;
+!     int			save_msg_silent = -1;
+      int			did_esilent = 0;
+  #ifdef HAVE_SANDBOX
+      int			did_sandbox = FALSE;
+***************
+*** 1856,1864 ****
+  			}
+  			if (!checkforcmd(&ea.cmd, "silent", 3))
+  			    break;
+! 			++did_silent;
+  			++msg_silent;
+- 			save_msg_scroll = msg_scroll;
+  			if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1]))
+  			{
+  			    /* ":silent!", but not "silent !cmd" */
+--- 1856,1864 ----
+  			}
+  			if (!checkforcmd(&ea.cmd, "silent", 3))
+  			    break;
+! 			if (save_msg_silent == -1)
+! 			    save_msg_silent = msg_silent;
+  			++msg_silent;
+  			if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1]))
+  			{
+  			    /* ":silent!", but not "silent !cmd" */
+***************
+*** 1886,1891 ****
+--- 1886,1898 ----
+  #endif
+  			continue;
+  
++ 	    case 'u':	if (!checkforcmd(&ea.cmd, "unsilent", 3))
++ 			    break;
++ 			if (save_msg_silent == -1)
++ 			    save_msg_silent = msg_silent;
++ 			msg_silent = 0;
++ 			continue;
++ 
+  	    case 'v':	if (checkforcmd(&ea.cmd, "vertical", 4))
+  			{
+  #ifdef FEAT_VERTSPLIT
+***************
+*** 2684,2696 ****
+  
+      cmdmod = save_cmdmod;
+  
+!     if (did_silent > 0)
+      {
+  	/* messages could be enabled for a serious error, need to check if the
+  	 * counters don't become negative */
+! 	msg_silent -= did_silent;
+! 	if (msg_silent < 0)
+! 	    msg_silent = 0;
+  	emsg_silent -= did_esilent;
+  	if (emsg_silent < 0)
+  	    emsg_silent = 0;
+--- 2691,2702 ----
+  
+      cmdmod = save_cmdmod;
+  
+!     if (save_msg_silent != -1)
+      {
+  	/* messages could be enabled for a serious error, need to check if the
+  	 * counters don't become negative */
+! 	if (!did_emsg)
+! 	    msg_silent = save_msg_silent;
+  	emsg_silent -= did_esilent;
+  	if (emsg_silent < 0)
+  	    emsg_silent = 0;
+***************
+*** 2987,2992 ****
+--- 2993,2999 ----
+      {"silent", 3, FALSE},
+      {"tab", 3, TRUE},
+      {"topleft", 2, FALSE},
++     {"unsilent", 3, FALSE},
+      {"verbose", 4, TRUE},
+      {"vertical", 4, FALSE},
+  };
+*** ../vim-7.2.222/src/version.c	2009-07-01 20:18:43.000000000 +0200
+--- src/version.c	2009-07-09 15:53:05.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     223,
+  /**/
+
+-- 
+Q: How many legs does a giraffe have?
+A: Eight: two in front, two behind, two on the left and two on the right
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.224 b/source/ap/vim/patches/7.2.224
new file mode 100644
index 000000000..d988eedad
--- /dev/null
+++ b/source/ap/vim/patches/7.2.224
@@ -0,0 +1,88 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.224
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.224
+Problem:    Crash when using 'completefunc'. (Ingo Karkat)
+Solution:   Disallow entering edit() recursively when doing completion.
+Files:	    src/edit.c
+
+
+*** ../vim-7.2.223/src/edit.c	2009-05-26 11:01:43.000000000 +0200
+--- src/edit.c	2009-07-09 18:01:49.000000000 +0200
+***************
+*** 114,119 ****
+--- 114,123 ----
+   * FALSE the word to be completed must be located. */
+  static int	  compl_started = FALSE;
+  
++ /* Set when doing something for completion that may call edit() recursively,
++  * which is not allowed. */
++ static int	  compl_busy = FALSE;
++ 
+  static int	  compl_matches = 0;
+  static char_u	  *compl_pattern = NULL;
+  static int	  compl_direction = FORWARD;
+***************
+*** 346,352 ****
+  
+  #ifdef FEAT_INS_EXPAND
+      /* Don't allow recursive insert mode when busy with completion. */
+!     if (compl_started || pum_visible())
+      {
+  	EMSG(_(e_secure));
+  	return FALSE;
+--- 350,356 ----
+  
+  #ifdef FEAT_INS_EXPAND
+      /* Don't allow recursive insert mode when busy with completion. */
+!     if (compl_started || compl_busy || pum_visible())
+      {
+  	EMSG(_(e_secure));
+  	return FALSE;
+***************
+*** 1340,1347 ****
+--- 1344,1353 ----
+  		goto normalchar;
+  
+  docomplete:
++ 	    compl_busy = TRUE;
+  	    if (ins_complete(c) == FAIL)
+  		compl_cont_status = 0;
++ 	    compl_busy = FALSE;
+  	    break;
+  #endif /* FEAT_INS_EXPAND */
+  
+***************
+*** 3172,3177 ****
+--- 3178,3184 ----
+  	vim_free(match);
+      } while (compl_curr_match != NULL && compl_curr_match != compl_first_match);
+      compl_first_match = compl_curr_match = NULL;
++     compl_shown_match = NULL;
+  }
+  
+      static void
+*** ../vim-7.2.223/src/version.c	2009-07-09 15:55:34.000000000 +0200
+--- src/version.c	2009-07-09 18:14:16.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     224,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+77. The phone company asks you to test drive their new PBX system
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.225 b/source/ap/vim/patches/7.2.225
new file mode 100644
index 000000000..32a4d357b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.225
@@ -0,0 +1,97 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.225
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.225
+Problem:    When using ":normal" a saved character may be executed.
+Solution:   Also store old_char when saving typeahead.
+Files:	    src/getchar.c, src/structs.h
+
+
+*** ../vim-7.2.224/src/getchar.c	2009-02-22 23:42:08.000000000 +0100
+--- src/getchar.c	2009-07-09 18:09:13.000000000 +0200
+***************
+*** 1309,1314 ****
+--- 1309,1317 ----
+      return OK;
+  }
+  
++ static int old_char = -1;	/* character put back by vungetc() */
++ static int old_mod_mask;	/* mod_mask for ungotten character */
++ 
+  #if defined(FEAT_EVAL) || defined(FEAT_EX_EXTRA) || defined(PROTO)
+  
+  /*
+***************
+*** 1323,1328 ****
+--- 1326,1335 ----
+      if (!tp->typebuf_valid)
+  	typebuf = tp->save_typebuf;
+  
++     tp->old_char = old_char;
++     tp->old_mod_mask = old_mod_mask;
++     old_char = -1;
++ 
+      tp->save_stuffbuff = stuffbuff;
+      stuffbuff.bh_first.b_next = NULL;
+  # ifdef USE_INPUT_BUF
+***************
+*** 1344,1349 ****
+--- 1351,1359 ----
+  	typebuf = tp->save_typebuf;
+      }
+  
++     old_char = tp->old_char;
++     old_mod_mask = tp->old_mod_mask;
++ 
+      free_buff(&stuffbuff);
+      stuffbuff = tp->save_stuffbuff;
+  # ifdef USE_INPUT_BUF
+***************
+*** 1499,1507 ****
+  #define KL_PART_KEY -1		/* keylen value for incomplete key-code */
+  #define KL_PART_MAP -2		/* keylen value for incomplete mapping */
+  
+- static int old_char = -1;	/* character put back by vungetc() */
+- static int old_mod_mask;	/* mod_mask for ungotten character */
+- 
+  /*
+   * Get the next input character.
+   * Can return a special key or a multi-byte character.
+--- 1509,1514 ----
+*** ../vim-7.2.224/src/structs.h	2009-06-16 16:01:34.000000000 +0200
+--- src/structs.h	2009-07-09 18:09:20.000000000 +0200
+***************
+*** 882,887 ****
+--- 882,889 ----
+  {
+      typebuf_T		save_typebuf;
+      int			typebuf_valid;	    /* TRUE when save_typebuf valid */
++     int			old_char;
++     int			old_mod_mask;
+      struct buffheader	save_stuffbuff;
+  #ifdef USE_INPUT_BUF
+      char_u		*save_inputbuf;
+*** ../vim-7.2.224/src/version.c	2009-07-09 18:15:19.000000000 +0200
+--- src/version.c	2009-07-09 18:21:56.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     225,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+78. You find yourself dialing IP numbers on the phone.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.226 b/source/ap/vim/patches/7.2.226
new file mode 100644
index 000000000..d922a080f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.226
@@ -0,0 +1,268 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.226
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.226
+Problem:    ml_get error after deleting the last line. (Xavier de Gaye)
+Solution:   When adjusting marks a callback may be invoked.  Adjust the cursor
+	    position before invoking deleted_lines_mark().
+Files:	    src/ex_cmds.c, src/ex_docmd.c, src/if_mzsch.c, src/if_python.c,
+	    src/if_perl.xs, src/misc1.c
+
+
+*** ../vim-7.2.225/src/ex_cmds.c	2009-05-17 13:30:58.000000000 +0200
+--- src/ex_cmds.c	2009-07-09 12:56:51.000000000 +0200
+***************
+*** 4013,4018 ****
+--- 4013,4021 ----
+  	    break;
+  	ml_delete(eap->line1, FALSE);
+      }
++ 
++     /* make sure the cursor is not beyond the end of the file now */
++     check_cursor_lnum();
+      deleted_lines_mark(eap->line1, (long)(eap->line2 - lnum));
+  
+      /* ":append" on the line above the deleted lines. */
+*** ../vim-7.2.225/src/ex_docmd.c	2009-07-09 15:55:34.000000000 +0200
+--- src/ex_docmd.c	2009-07-09 15:24:03.000000000 +0200
+***************
+*** 7845,7854 ****
+  		if (*ml_get(lnum) == NUL && u_savedel(lnum, 1L) == OK)
+  		{
+  		    ml_delete(lnum, FALSE);
+- 		    deleted_lines_mark(lnum, 1L);
+  		    if (curwin->w_cursor.lnum > 1
+  					     && curwin->w_cursor.lnum >= lnum)
+  			--curwin->w_cursor.lnum;
+  		}
+  	    }
+  	    redraw_curbuf_later(VALID);
+--- 7845,7854 ----
+  		if (*ml_get(lnum) == NUL && u_savedel(lnum, 1L) == OK)
+  		{
+  		    ml_delete(lnum, FALSE);
+  		    if (curwin->w_cursor.lnum > 1
+  					     && curwin->w_cursor.lnum >= lnum)
+  			--curwin->w_cursor.lnum;
++ 		    deleted_lines_mark(lnum, 1L);
+  		}
+  	    }
+  	    redraw_curbuf_later(VALID);
+*** ../vim-7.2.225/src/if_mzsch.c	2009-06-24 17:51:01.000000000 +0200
+--- src/if_mzsch.c	2009-07-09 12:59:17.000000000 +0200
+***************
+*** 2169,2177 ****
+  	    curbuf = savebuf;
+  	    raise_vim_exn(_("cannot delete line"));
+  	}
+- 	deleted_lines_mark((linenr_T)n, 1L);
+  	if (buf->buf == curwin->w_buffer)
+  	    mz_fix_cursor(n, n + 1, -1);
+  
+  	curbuf = savebuf;
+  
+--- 2169,2177 ----
+  	    curbuf = savebuf;
+  	    raise_vim_exn(_("cannot delete line"));
+  	}
+  	if (buf->buf == curwin->w_buffer)
+  	    mz_fix_cursor(n, n + 1, -1);
++ 	deleted_lines_mark((linenr_T)n, 1L);
+  
+  	curbuf = savebuf;
+  
+***************
+*** 2299,2307 ****
+  		    curbuf = savebuf;
+  		    raise_vim_exn(_("cannot delete line"));
+  		}
+- 	    deleted_lines_mark((linenr_T)lo, (long)old_len);
+  	    if (buf->buf == curwin->w_buffer)
+  		mz_fix_cursor(lo, hi, -old_len);
+  	}
+  
+  	curbuf = savebuf;
+--- 2299,2307 ----
+  		    curbuf = savebuf;
+  		    raise_vim_exn(_("cannot delete line"));
+  		}
+  	    if (buf->buf == curwin->w_buffer)
+  		mz_fix_cursor(lo, hi, -old_len);
++ 	    deleted_lines_mark((linenr_T)lo, (long)old_len);
+  	}
+  
+  	curbuf = savebuf;
+*** ../vim-7.2.225/src/if_python.c	2009-05-21 23:25:38.000000000 +0200
+--- src/if_python.c	2009-07-09 12:59:45.000000000 +0200
+***************
+*** 2497,2505 ****
+  	    PyErr_SetVim(_("cannot delete line"));
+  	else
+  	{
+- 	    deleted_lines_mark((linenr_T)n, 1L);
+  	    if (buf == curwin->w_buffer)
+  		py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
+  	}
+  
+  	curbuf = savebuf;
+--- 2497,2505 ----
+  	    PyErr_SetVim(_("cannot delete line"));
+  	else
+  	{
+  	    if (buf == curwin->w_buffer)
+  		py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
++ 	    deleted_lines_mark((linenr_T)n, 1L);
+  	}
+  
+  	curbuf = savebuf;
+***************
+*** 2596,2605 ****
+  		    break;
+  		}
+  	    }
+- 	    deleted_lines_mark((linenr_T)lo, (long)i);
+- 
+  	    if (buf == curwin->w_buffer)
+  		py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
+  	}
+  
+  	curbuf = savebuf;
+--- 2596,2604 ----
+  		    break;
+  		}
+  	    }
+  	    if (buf == curwin->w_buffer)
+  		py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
++ 	    deleted_lines_mark((linenr_T)lo, (long)i);
+  	}
+  
+  	curbuf = savebuf;
+*** ../vim-7.2.225/src/if_perl.xs	2009-06-16 16:01:34.000000000 +0200
+--- src/if_perl.xs	2009-07-09 13:02:16.000000000 +0200
+***************
+*** 1233,1241 ****
+  		    if (u_savedel(lnum, 1) == OK)
+  		    {
+  			ml_delete(lnum, 0);
+  			deleted_lines_mark(lnum, 1L);
+- 			if (aco.save_curbuf == curbuf)
+- 			    check_cursor();
+  		    }
+  
+  		    /* restore curwin/curbuf and a few other things */
+--- 1235,1242 ----
+  		    if (u_savedel(lnum, 1) == OK)
+  		    {
+  			ml_delete(lnum, 0);
++ 			check_cursor();
+  			deleted_lines_mark(lnum, 1L);
+  		    }
+  
+  		    /* restore curwin/curbuf and a few other things */
+*** ../vim-7.2.225/src/misc1.c	2009-06-24 16:25:23.000000000 +0200
+--- src/misc1.c	2009-07-09 13:00:59.000000000 +0200
+***************
+*** 2345,2356 ****
+      int		undo;		/* if TRUE, prepare for undo */
+  {
+      long	n;
+  
+      if (nlines <= 0)
+  	return;
+  
+      /* save the deleted lines for undo */
+!     if (undo && u_savedel(curwin->w_cursor.lnum, nlines) == FAIL)
+  	return;
+  
+      for (n = 0; n < nlines; )
+--- 2345,2357 ----
+      int		undo;		/* if TRUE, prepare for undo */
+  {
+      long	n;
++     linenr_T	first = curwin->w_cursor.lnum;
+  
+      if (nlines <= 0)
+  	return;
+  
+      /* save the deleted lines for undo */
+!     if (undo && u_savedel(first, nlines) == FAIL)
+  	return;
+  
+      for (n = 0; n < nlines; )
+***************
+*** 2358,2375 ****
+  	if (curbuf->b_ml.ml_flags & ML_EMPTY)	    /* nothing to delete */
+  	    break;
+  
+! 	ml_delete(curwin->w_cursor.lnum, TRUE);
+  	++n;
+  
+  	/* If we delete the last line in the file, stop */
+! 	if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
+  	    break;
+      }
+-     /* adjust marks, mark the buffer as changed and prepare for displaying */
+-     deleted_lines_mark(curwin->w_cursor.lnum, n);
+  
+      curwin->w_cursor.col = 0;
+      check_cursor_lnum();
+  }
+  
+      int
+--- 2359,2379 ----
+  	if (curbuf->b_ml.ml_flags & ML_EMPTY)	    /* nothing to delete */
+  	    break;
+  
+! 	ml_delete(first, TRUE);
+  	++n;
+  
+  	/* If we delete the last line in the file, stop */
+! 	if (first > curbuf->b_ml.ml_line_count)
+  	    break;
+      }
+  
++     /* Correct the cursor position before calling deleted_lines_mark(), it may
++      * trigger a callback to display the cursor. */
+      curwin->w_cursor.col = 0;
+      check_cursor_lnum();
++ 
++     /* adjust marks, mark the buffer as changed and prepare for displaying */
++     deleted_lines_mark(first, n);
+  }
+  
+      int
+***************
+*** 2621,2626 ****
+--- 2625,2632 ----
+  
+  /*
+   * Like deleted_lines(), but adjust marks first.
++  * Make sure the cursor is on a valid line before calling, a GUI callback may
++  * be triggered to display the cursor.
+   */
+      void
+  deleted_lines_mark(lnum, count)
+*** ../vim-7.2.225/src/version.c	2009-07-09 18:24:24.000000000 +0200
+--- src/version.c	2009-07-09 20:01:16.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     226,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+80. At parties, you introduce your spouse as your "service provider."
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.227 b/source/ap/vim/patches/7.2.227
new file mode 100644
index 000000000..84992128c
--- /dev/null
+++ b/source/ap/vim/patches/7.2.227
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.227
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.227
+Problem:    When using ":cd" in a script there is no way to track this.
+Solution:   Display the directory when 'verbose' is 5 or higher.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.2.226/src/ex_docmd.c	2009-07-09 20:06:30.000000000 +0200
+--- src/ex_docmd.c	2009-07-09 15:24:03.000000000 +0200
+***************
+*** 7964,7970 ****
+  	    shorten_fnames(TRUE);
+  
+  	    /* Echo the new current directory if the command was typed. */
+! 	    if (KeyTyped)
+  		ex_pwd(eap);
+  	}
+  	vim_free(tofree);
+--- 7964,7970 ----
+  	    shorten_fnames(TRUE);
+  
+  	    /* Echo the new current directory if the command was typed. */
+! 	    if (KeyTyped || p_verbose >= 5)
+  		ex_pwd(eap);
+  	}
+  	vim_free(tofree);
+*** ../vim-7.2.226/src/version.c	2009-07-09 20:06:30.000000000 +0200
+--- src/version.c	2009-07-09 20:13:13.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     227,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+83. Batteries in the TV remote now last for months.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.228 b/source/ap/vim/patches/7.2.228
new file mode 100644
index 000000000..a906bef40
--- /dev/null
+++ b/source/ap/vim/patches/7.2.228
@@ -0,0 +1,573 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.228
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.228
+Problem:    Cscope is limited to 8 connections.
+Solution:   Allocated the connection array to handle any number of
+	    connections. (Dominique Pelle)
+Files:	    runtime/doc/if_cscop.txt, src/if_cscope.h, src/if_cscope.c
+
+
+*** ../vim-7.2.227/runtime/doc/if_cscop.txt	2009-03-18 14:30:46.000000000 +0100
+--- runtime/doc/if_cscop.txt	2009-07-09 15:40:48.000000000 +0200
+***************
+*** 355,367 ****
+  The DJGPP-built version from http://cscope.sourceforge.net is known to not
+  work with Vim.
+  
+! There are a couple of hard-coded limitations:
+! 
+!     1. The maximum number of cscope connections allowed is 8.  Do you
+!     really need more?
+! 
+!     2. Doing a |:tjump| when |:cstag| searches the tag files is not
+!     configurable (e.g., you can't do a tselect instead).
+  
+  ==============================================================================
+  6. Suggested usage					*cscope-suggestions*
+--- 355,362 ----
+  The DJGPP-built version from http://cscope.sourceforge.net is known to not
+  work with Vim.
+  
+! Hard-coded limitation: doing a |:tjump| when |:cstag| searches the tag files
+! is not configurable (e.g., you can't do a tselect instead).
+  
+  ==============================================================================
+  6. Suggested usage					*cscope-suggestions*
+*** ../vim-7.2.227/src/if_cscope.h	2008-08-25 04:35:13.000000000 +0200
+--- src/if_cscope.h	2009-07-09 15:39:32.000000000 +0200
+***************
+*** 25,31 ****
+  
+  #define CSCOPE_SUCCESS		0
+  #define CSCOPE_FAILURE		-1
+- #define CSCOPE_MAX_CONNECTIONS	8   /* you actually need more? */
+  
+  #define	CSCOPE_DBFILE		"cscope.out"
+  #define	CSCOPE_PROMPT		">> "
+--- 25,30 ----
+*** ../vim-7.2.227/src/if_cscope.c	2009-05-16 17:29:37.000000000 +0200
+--- src/if_cscope.c	2009-07-09 15:39:32.000000000 +0200
+***************
+*** 46,52 ****
+  static int	    cs_find __ARGS((exarg_T *eap));
+  static int	    cs_find_common __ARGS((char *opt, char *pat, int, int, int));
+  static int	    cs_help __ARGS((exarg_T *eap));
+- static void	    cs_init __ARGS((void));
+  static void	    clear_csinfo __ARGS((int i));
+  static int	    cs_insert_filelist __ARGS((char *, char *, char *,
+  			struct stat *));
+--- 46,51 ----
+***************
+*** 66,72 ****
+  static int	    cs_show __ARGS((exarg_T *eap));
+  
+  
+! static csinfo_T	    csinfo[CSCOPE_MAX_CONNECTIONS];
+  static int	    eap_arg_len;    /* length of eap->arg, set in
+  				       cs_lookup_cmd() */
+  static cscmd_T	    cs_cmds[] =
+--- 65,74 ----
+  static int	    cs_show __ARGS((exarg_T *eap));
+  
+  
+! static csinfo_T *   csinfo = NULL;
+! static int	    csinfo_size = 0;	/* number of items allocated in
+! 					   csinfo[] */
+! 
+  static int	    eap_arg_len;    /* length of eap->arg, set in
+  				       cs_lookup_cmd() */
+  static cscmd_T	    cs_cmds[] =
+***************
+*** 144,166 ****
+  	}
+      case EXP_CSCOPE_KILL:
+  	{
+! 	    static char_u	connection[2];
+  
+  	    /* ":cscope kill" accepts connection numbers or partial names of
+  	     * the pathname of the cscope database as argument.  Only complete
+  	     * with connection numbers. -1 can also be used to kill all
+  	     * connections. */
+! 	    for (i = 0, current_idx = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+  	    {
+  		if (csinfo[i].fname == NULL)
+  		    continue;
+  		if (current_idx++ == idx)
+  		{
+! 		    /* Connection number fits in one character since
+! 		     * CSCOPE_MAX_CONNECTIONS is < 10 */
+! 		    connection[0] = i + '0';
+! 		    connection[1] = NUL;
+! 		    return connection;
+  		}
+  	    }
+  	    return (current_idx == idx && idx > 0) ? (char_u *)"-1" : NULL;
+--- 146,165 ----
+  	}
+      case EXP_CSCOPE_KILL:
+  	{
+! 	    static char	connection[5];
+  
+  	    /* ":cscope kill" accepts connection numbers or partial names of
+  	     * the pathname of the cscope database as argument.  Only complete
+  	     * with connection numbers. -1 can also be used to kill all
+  	     * connections. */
+! 	    for (i = 0, current_idx = 0; i < csinfo_size; i++)
+  	    {
+  		if (csinfo[i].fname == NULL)
+  		    continue;
+  		if (current_idx++ == idx)
+  		{
+! 		    vim_snprintf(connection, sizeof(connection), "%d", i);
+! 		    return (char_u *)connection;
+  		}
+  	    }
+  	    return (current_idx == idx && idx > 0) ? (char_u *)"-1" : NULL;
+***************
+*** 223,229 ****
+  {
+      cscmd_T *cmdp;
+  
+-     cs_init();
+      if ((cmdp = cs_lookup_cmd(eap)) == NULL)
+      {
+  	cs_help(eap);
+--- 222,227 ----
+***************
+*** 284,291 ****
+  {
+      int ret = FALSE;
+  
+-     cs_init();
+- 
+      if (*eap->arg == NUL)
+      {
+  	(void)EMSG(_("E562: Usage: cstag <ident>"));
+--- 282,287 ----
+***************
+*** 441,447 ****
+      if (num < 0 || num > 4 || (num > 0 && !dbpath))
+  	return FALSE;
+  
+!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+      {
+  	if (!csinfo[i].fname)
+  	    continue;
+--- 437,443 ----
+      if (num < 0 || num > 4 || (num > 0 && !dbpath))
+  	return FALSE;
+  
+!     for (i = 0; i < csinfo_size; i++)
+      {
+  	if (!csinfo[i].fname)
+  	    continue;
+***************
+*** 684,690 ****
+      short i;
+      short cnt = 0;
+  
+!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+      {
+  	if (csinfo[i].fname != NULL)
+  	    cnt++;
+--- 680,686 ----
+      short i;
+      short cnt = 0;
+  
+!     for (i = 0; i < csinfo_size; i++)
+      {
+  	if (csinfo[i].fname != NULL)
+  	    cnt++;
+***************
+*** 1112,1118 ****
+  {
+      int i;
+      char *cmd;
+!     int nummatches[CSCOPE_MAX_CONNECTIONS], totmatches;
+  #ifdef FEAT_QUICKFIX
+      char cmdletter;
+      char *qfpos;
+--- 1108,1115 ----
+  {
+      int i;
+      char *cmd;
+!     int *nummatches;
+!     int totmatches;
+  #ifdef FEAT_QUICKFIX
+      char cmdletter;
+      char *qfpos;
+***************
+*** 1123,1135 ****
+      if (cmd == NULL)
+  	return FALSE;
+  
+      /* send query to all open connections, then count the total number
+       * of matches so we can alloc matchesp all in one swell foop
+       */
+!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+  	nummatches[i] = 0;
+      totmatches = 0;
+!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+      {
+  	if (csinfo[i].fname == NULL || csinfo[i].to_fp == NULL)
+  	    continue;
+--- 1120,1136 ----
+      if (cmd == NULL)
+  	return FALSE;
+  
++     nummatches = (int *)alloc(sizeof(int)*csinfo_size);
++     if (nummatches == NULL)
++ 	return FALSE;
++ 
+      /* send query to all open connections, then count the total number
+       * of matches so we can alloc matchesp all in one swell foop
+       */
+!     for (i = 0; i < csinfo_size; i++)
+  	nummatches[i] = 0;
+      totmatches = 0;
+!     for (i = 0; i < csinfo_size; i++)
+      {
+  	if (csinfo[i].fname == NULL || csinfo[i].to_fp == NULL)
+  	    continue;
+***************
+*** 1154,1160 ****
+--- 1155,1164 ----
+  	char *buf;
+  
+  	if (!verbose)
++ 	{
++ 	    vim_free(nummatches);
+  	    return FALSE;
++ 	}
+  
+  	buf = (char *)alloc((unsigned)(strlen(opt) + strlen(pat) + strlen(nf)));
+  	if (buf == NULL)
+***************
+*** 1165,1170 ****
+--- 1169,1175 ----
+  	    (void)EMSG(buf);
+  	    vim_free(buf);
+  	}
++ 	vim_free(nummatches);
+  	return FALSE;
+      }
+  
+***************
+*** 1217,1222 ****
+--- 1222,1228 ----
+  		(void)EMSG(buf);
+  		vim_free(buf);
+  	    }
++ 	    vim_free(nummatches);
+  	    return FALSE;
+  	}
+      }
+***************
+*** 1264,1269 ****
+--- 1270,1276 ----
+  	}
+  	mch_remove(tmp);
+  	vim_free(tmp);
++ 	vim_free(nummatches);
+  	return TRUE;
+      }
+      else
+***************
+*** 1275,1280 ****
+--- 1282,1288 ----
+  	/* read output */
+  	cs_fill_results((char *)pat, totmatches, nummatches, &matches,
+  							 &contexts, &matched);
++ 	vim_free(nummatches);
+  	if (matches == NULL)
+  	    return FALSE;
+  
+***************
+*** 1328,1353 ****
+  } /* cs_help */
+  
+  
+- /*
+-  * PRIVATE: cs_init
+-  *
+-  * initialize cscope structure if not already
+-  */
+-     static void
+- cs_init()
+- {
+-     short i;
+-     static int init_already = FALSE;
+- 
+-     if (init_already)
+- 	return;
+- 
+-     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+- 	clear_csinfo(i);
+- 
+-     init_already = TRUE;
+- } /* cs_init */
+- 
+      static void
+  clear_csinfo(i)
+      int	    i;
+--- 1336,1341 ----
+***************
+*** 1444,1450 ****
+  #endif
+  
+      i = -1; /* can be set to the index of an empty item in csinfo */
+!     for (j = 0; j < CSCOPE_MAX_CONNECTIONS; j++)
+      {
+  	if (csinfo[j].fname != NULL
+  #if defined(UNIX)
+--- 1432,1438 ----
+  #endif
+  
+      i = -1; /* can be set to the index of an empty item in csinfo */
+!     for (j = 0; j < csinfo_size; j++)
+      {
+  	if (csinfo[j].fname != NULL
+  #if defined(UNIX)
+***************
+*** 1471,1479 ****
+  
+      if (i == -1)
+      {
+! 	if (p_csverbose)
+! 	    (void)EMSG(_("E569: maximum number of cscope connections reached"));
+! 	return -1;
+      }
+  
+      if ((csinfo[i].fname = (char *)alloc((unsigned)strlen(fname)+1)) == NULL)
+--- 1459,1483 ----
+  
+      if (i == -1)
+      {
+! 	i = csinfo_size;
+! 	if (csinfo_size == 0)
+! 	{
+! 	    /* First time allocation: allocate only 1 connection. It should
+! 	     * be enough for most users.  If more is needed, csinfo will be
+! 	     * reallocated. */
+! 	    csinfo_size = 1;
+! 	    csinfo = (csinfo_T *)alloc_clear(sizeof(csinfo_T));
+! 	}
+! 	else
+! 	{
+! 	    /* Reallocate space for more connections. */
+! 	    csinfo_size *= 2;
+! 	    csinfo = vim_realloc(csinfo, sizeof(csinfo_T)*csinfo_size);
+! 	}
+! 	if (csinfo == NULL)
+! 	    return -1;
+! 	for (j = csinfo_size/2; j < csinfo_size; j++)
+! 	    clear_csinfo(j);
+      }
+  
+      if ((csinfo[i].fname = (char *)alloc((unsigned)strlen(fname)+1)) == NULL)
+***************
+*** 1580,1594 ****
+  	/* It must be part of a name.  We will try to find a match
+  	 * within all the names in the csinfo data structure
+  	 */
+! 	for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+  	{
+  	    if (csinfo[i].fname != NULL && strstr(csinfo[i].fname, stok))
+  		break;
+  	}
+      }
+  
+!     if ((i >= CSCOPE_MAX_CONNECTIONS || i < -1 || csinfo[i].fname == NULL)
+! 	    && i != -1)
+      {
+  	if (p_csverbose)
+  	    (void)EMSG2(_("E261: cscope connection %s not found"), stok);
+--- 1584,1597 ----
+  	/* It must be part of a name.  We will try to find a match
+  	 * within all the names in the csinfo data structure
+  	 */
+! 	for (i = 0; i < csinfo_size; i++)
+  	{
+  	    if (csinfo[i].fname != NULL && strstr(csinfo[i].fname, stok))
+  		break;
+  	}
+      }
+  
+!     if ((i != -1) && (i >= csinfo_size || i < -1 || csinfo[i].fname == NULL))
+      {
+  	if (p_csverbose)
+  	    (void)EMSG2(_("E261: cscope connection %s not found"), stok);
+***************
+*** 1597,1603 ****
+      {
+  	if (i == -1)
+  	{
+! 	    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+  	    {
+  		if (csinfo[i].fname)
+  		    cs_kill_execute(i, csinfo[i].fname);
+--- 1600,1606 ----
+      {
+  	if (i == -1)
+  	{
+! 	    for (i = 0; i < csinfo_size; i++)
+  	    {
+  		if (csinfo[i].fname)
+  		    cs_kill_execute(i, csinfo[i].fname);
+***************
+*** 1857,1863 ****
+      if (buf == NULL)
+  	return;
+  
+!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+      {
+  	if (nummatches_a[i] < 1)
+  	    continue;
+--- 1860,1866 ----
+      if (buf == NULL)
+  	return;
+  
+!     for (i = 0; i < csinfo_size; i++)
+      {
+  	if (nummatches_a[i] < 1)
+  	    continue;
+***************
+*** 1929,1935 ****
+      if ((cntxts = (char **)alloc(sizeof(char *) * totmatches)) == NULL)
+  	goto parse_out;
+  
+!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+      {
+  	if (nummatches_a[i] < 1)
+  	    continue;
+--- 1932,1938 ----
+      if ((cntxts = (char **)alloc(sizeof(char *) * totmatches)) == NULL)
+  	goto parse_out;
+  
+!     for (i = 0; i < csinfo_size; i++)
+      {
+  	if (nummatches_a[i] < 1)
+  	    continue;
+***************
+*** 2383,2392 ****
+      int	i;
+      char buf[20]; /* for sprintf " (#%d)" */
+  
+      /* malloc our db and ppath list */
+!     dblist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
+!     pplist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
+!     fllist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
+      if (dblist == NULL || pplist == NULL || fllist == NULL)
+      {
+  	vim_free(dblist);
+--- 2386,2398 ----
+      int	i;
+      char buf[20]; /* for sprintf " (#%d)" */
+  
++     if (csinfo_size == 0)
++ 	return CSCOPE_SUCCESS;
++ 
+      /* malloc our db and ppath list */
+!     dblist = (char **)alloc(csinfo_size * sizeof(char *));
+!     pplist = (char **)alloc(csinfo_size * sizeof(char *));
+!     fllist = (char **)alloc(csinfo_size * sizeof(char *));
+      if (dblist == NULL || pplist == NULL || fllist == NULL)
+      {
+  	vim_free(dblist);
+***************
+*** 2395,2401 ****
+  	return CSCOPE_FAILURE;
+      }
+  
+!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+      {
+  	dblist[i] = csinfo[i].fname;
+  	pplist[i] = csinfo[i].ppath;
+--- 2401,2407 ----
+  	return CSCOPE_FAILURE;
+      }
+  
+!     for (i = 0; i < csinfo_size; i++)
+      {
+  	dblist[i] = csinfo[i].fname;
+  	pplist[i] = csinfo[i].ppath;
+***************
+*** 2405,2411 ****
+      }
+  
+      /* rebuild the cscope connection list */
+!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+      {
+  	if (dblist[i] != NULL)
+  	{
+--- 2411,2417 ----
+      }
+  
+      /* rebuild the cscope connection list */
+!     for (i = 0; i < csinfo_size; i++)
+      {
+  	if (dblist[i] != NULL)
+  	{
+***************
+*** 2502,2508 ****
+  	MSG_PUTS_ATTR(
+  	    _(" # pid    database name                       prepend path\n"),
+  	    hl_attr(HLF_T));
+! 	for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+  	{
+  	    if (csinfo[i].fname == NULL)
+  		continue;
+--- 2508,2514 ----
+  	MSG_PUTS_ATTR(
+  	    _(" # pid    database name                       prepend path\n"),
+  	    hl_attr(HLF_T));
+! 	for (i = 0; i < csinfo_size; i++)
+  	{
+  	    if (csinfo[i].fname == NULL)
+  		continue;
+***************
+*** 2531,2538 ****
+  {
+      int i;
+  
+!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+  	cs_release_csp(i, TRUE);
+  }
+  
+  #endif	/* FEAT_CSCOPE */
+--- 2537,2546 ----
+  {
+      int i;
+  
+!     for (i = 0; i < csinfo_size; i++)
+  	cs_release_csp(i, TRUE);
++     vim_free(csinfo);
++     csinfo_size = 0;
+  }
+  
+  #endif	/* FEAT_CSCOPE */
+*** ../vim-7.2.227/src/version.c	2009-07-09 20:13:59.000000000 +0200
+--- src/version.c	2009-07-09 21:21:48.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     228,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+84. Books in your bookcase bear the names Bongo, WinSock and Inside OLE
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.229 b/source/ap/vim/patches/7.2.229
new file mode 100644
index 000000000..bafaef0b8
--- /dev/null
+++ b/source/ap/vim/patches/7.2.229
@@ -0,0 +1,60 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.229
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.229
+Problem:    Warning for shadowed variable.
+Solution:   Rename "wait" to "wait_time".
+Files:	    src/os_unix.c
+
+
+*** ../vim-7.2.228/src/os_unix.c	2009-06-16 15:12:11.000000000 +0200
+--- src/os_unix.c	2009-07-09 16:24:14.000000000 +0200
+***************
+*** 1138,1147 ****
+       * to happen).
+       */
+      {
+! 	long wait;
+! 	for (wait = 0; !sigcont_received && wait <= 3L; wait++)
+  	    /* Loop is not entered most of the time */
+! 	    mch_delay(wait, FALSE);
+      }
+  # endif
+  
+--- 1138,1147 ----
+       * to happen).
+       */
+      {
+! 	long wait_time;
+! 	for (wait_time = 0; !sigcont_received && wait_time <= 3L; wait_time++)
+  	    /* Loop is not entered most of the time */
+! 	    mch_delay(wait_time, FALSE);
+      }
+  # endif
+  
+*** ../vim-7.2.228/src/version.c	2009-07-09 21:22:36.000000000 +0200
+--- src/version.c	2009-07-14 12:18:21.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     229,
+  /**/
+
+-- 
+From "know your smileys":
+ :-)	Funny
+ |-)	Funny Oriental
+ (-:	Funny Australian
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.230 b/source/ap/vim/patches/7.2.230
new file mode 100644
index 000000000..32379d2c2
--- /dev/null
+++ b/source/ap/vim/patches/7.2.230
@@ -0,0 +1,87 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.230
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.230
+Problem:    A few old lint-style ARGUSED comments.
+Solution:   Change to the new UNUSED style.
+Files:	    src/getchar.c
+
+
+*** ../vim-7.2.229/src/getchar.c	2009-07-09 18:24:24.000000000 +0200
+--- src/getchar.c	2009-07-09 18:09:13.000000000 +0200
+***************
+*** 3708,3718 ****
+   * Clear all mappings or abbreviations.
+   * 'abbr' should be FALSE for mappings, TRUE for abbreviations.
+   */
+- /*ARGSUSED*/
+      void
+  map_clear(cmdp, arg, forceit, abbr)
+      char_u	*cmdp;
+!     char_u	*arg;
+      int		forceit;
+      int		abbr;
+  {
+--- 3708,3717 ----
+   * Clear all mappings or abbreviations.
+   * 'abbr' should be FALSE for mappings, TRUE for abbreviations.
+   */
+      void
+  map_clear(cmdp, arg, forceit, abbr)
+      char_u	*cmdp;
+!     char_u	*arg UNUSED;
+      int		forceit;
+      int		abbr;
+  {
+***************
+*** 3741,3753 ****
+  /*
+   * Clear all mappings in "mode".
+   */
+- /*ARGSUSED*/
+      void
+  map_clear_int(buf, mode, local, abbr)
+!     buf_T	*buf;	    /* buffer for local mappings */
+!     int		mode;	    /* mode in which to delete */
+!     int		local;	    /* TRUE for buffer-local mappings */
+!     int		abbr;	    /* TRUE for abbreviations */
+  {
+      mapblock_T	*mp, **mpp;
+      int		hash;
+--- 3740,3751 ----
+  /*
+   * Clear all mappings in "mode".
+   */
+      void
+  map_clear_int(buf, mode, local, abbr)
+!     buf_T	*buf UNUSED;	/* buffer for local mappings */
+!     int		mode;		/* mode in which to delete */
+!     int		local UNUSED;	/* TRUE for buffer-local mappings */
+!     int		abbr;		/* TRUE for abbreviations */
+  {
+      mapblock_T	*mp, **mpp;
+      int		hash;
+*** ../vim-7.2.229/src/version.c	2009-07-14 12:20:28.000000000 +0200
+--- src/version.c	2009-07-14 13:44:05.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     230,
+  /**/
+
+-- 
+From "know your smileys":
+ :~)	A man with a tape recorder up his nose
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.231 b/source/ap/vim/patches/7.2.231
new file mode 100644
index 000000000..0f9a6d1e8
--- /dev/null
+++ b/source/ap/vim/patches/7.2.231
@@ -0,0 +1,49 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.231
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.231
+Problem:    Warning for unreacheable code.
+Solution:   Add #ifdef.
+Files:	    src/if_perl.xs
+
+
+*** ../vim-7.2.230/src/if_perl.xs	2009-07-09 20:06:30.000000000 +0200
+--- src/if_perl.xs	2009-07-09 13:02:16.000000000 +0200
+***************
+*** 720,728 ****
+--- 720,730 ----
+  #ifdef HAVE_SANDBOX
+      if (sandbox)
+      {
++ # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
+  	if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe))
+  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
+  	else
++ # endif
+  	{
+  	    PUSHMARK(SP);
+  	    XPUSHs(safe);
+*** ../vim-7.2.230/src/version.c	2009-07-14 13:44:43.000000000 +0200
+--- src/version.c	2009-07-14 16:04:07.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     231,
+  /**/
+
+-- 
+From "know your smileys":
+ ~#:-(	I just washed my hair, and I can't do nuthin' with it.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.232 b/source/ap/vim/patches/7.2.232
new file mode 100644
index 000000000..02727c741
--- /dev/null
+++ b/source/ap/vim/patches/7.2.232
@@ -0,0 +1,102 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.232
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.232
+Problem:    Cannot debug problems with being in a wrong directory.
+Solution:   When 'verbose' is 5 or higher report directory changes.
+Files:	    src/os_unix.c, src/os_unix.h, src/proto/os_unix.pro
+
+
+*** ../vim-7.2.231/src/os_unix.c	2009-07-14 12:20:28.000000000 +0200
+--- src/os_unix.c	2009-07-14 17:13:15.000000000 +0200
+***************
+*** 319,324 ****
+--- 319,341 ----
+      {-1,	    "Unknown!", FALSE}
+  };
+  
++     int
++ mch_chdir(path)
++     char *path;
++ {
++     if (p_verbose >= 5)
++     {
++ 	verbose_enter();
++ 	smsg((char_u *)"chdir(%s)", path);
++ 	verbose_leave();
++     }
++ # ifdef VMS
++     return chdir(vms_fixfilename(path));
++ # else
++     return chdir(path);
++ # endif
++ }
++ 
+  /*
+   * Write s[len] to the screen.
+   */
+***************
+*** 2424,2429 ****
+--- 2441,2452 ----
+  #ifdef HAVE_FCHDIR
+  	    if (fd >= 0)
+  	    {
++ 		if (p_verbose >= 5)
++ 		{
++ 		    verbose_enter();
++ 		    MSG("fchdir() to previous dir");
++ 		    verbose_leave();
++ 		}
+  		l = fchdir(fd);
+  		close(fd);
+  	    }
+*** ../vim-7.2.231/src/os_unix.h	2009-05-16 16:36:25.000000000 +0200
+--- src/os_unix.h	2009-07-14 16:55:05.000000000 +0200
+***************
+*** 482,492 ****
+  # else
+  int mch_rename __ARGS((const char *src, const char *dest));
+  # endif
+- # ifdef VMS
+- #  define mch_chdir(s) chdir(vms_fixfilename(s))
+- # else
+- #  define mch_chdir(s) chdir(s)
+- # endif
+  # ifndef VMS
+  #  ifdef __MVS__
+    /* on OS390 Unix getenv() doesn't return a pointer to persistent
+--- 482,487 ----
+*** ../vim-7.2.231/src/proto/os_unix.pro	2008-06-24 23:58:57.000000000 +0200
+--- src/proto/os_unix.pro	2009-07-14 16:58:08.000000000 +0200
+***************
+*** 1,4 ****
+--- 1,5 ----
+  /* os_unix.c */
++ int mch_chdir __ARGS((char *path));
+  void mch_write __ARGS((char_u *s, int len));
+  int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
+  int mch_char_avail __ARGS((void));
+*** ../vim-7.2.231/src/version.c	2009-07-14 16:05:14.000000000 +0200
+--- src/version.c	2009-07-14 17:37:15.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     232,
+  /**/
+
+-- 
+From "know your smileys":
+ O:-)	Saint
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.233 b/source/ap/vim/patches/7.2.233
new file mode 100644
index 000000000..f9fbd848d
--- /dev/null
+++ b/source/ap/vim/patches/7.2.233
@@ -0,0 +1,96 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.233 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.233 (extra part of 7.2.232)
+Problem:    Cannot debug problems with being in a wrong directory.
+Solution:   When 'verbose' is 5 or higher report directory changes.
+Files:	    src/os_msdos.c, src/os_mswin.c, src/os_riscos.c, src/os_mac.h
+
+
+*** ../vim-7.2.232/src/os_msdos.c	2008-06-24 23:30:18.000000000 +0200
+--- src/os_msdos.c	2009-07-14 16:50:57.000000000 +0200
+***************
+*** 2039,2044 ****
+--- 2039,2050 ----
+  {
+      if (path[0] == NUL)		    /* just checking... */
+  	return 0;
++     if (p_verbose >= 5)
++     {
++ 	verbose_enter();
++ 	smsg((char_u *)"chdir(%s)", path);
++ 	verbose_leave();
++     }
+      if (path[1] == ':')		    /* has a drive name */
+      {
+  	if (change_drive(TOLOWER_ASC(path[0]) - 'a' + 1))
+*** ../vim-7.2.232/src/os_mswin.c	2009-05-14 22:00:37.000000000 +0200
+--- src/os_mswin.c	2009-07-14 16:53:03.000000000 +0200
+***************
+*** 653,658 ****
+--- 653,664 ----
+      if (path[0] == NUL)		/* just checking... */
+  	return -1;
+  
++     if (p_verbose >= 5)
++     {
++ 	verbose_enter();
++ 	smsg((char_u *)"chdir(%s)", path);
++ 	verbose_leave();
++     }
+      if (isalpha(path[0]) && path[1] == ':')	/* has a drive name */
+      {
+  	/* If we can change to the drive, skip that part of the path.  If we
+*** ../vim-7.2.232/src/os_riscos.c	2006-03-07 23:25:50.000000000 +0100
+--- src/os_riscos.c	2009-07-14 16:53:35.000000000 +0200
+***************
+*** 1203,1208 ****
+--- 1203,1214 ----
+      int	    retval;
+      char_u  *new_dir;
+  
++     if (p_verbose >= 5)
++     {
++ 	verbose_enter();
++ 	smsg((char_u *)"chdir(%s)", dir);
++ 	verbose_leave();
++     }
+      length = strlen(dir);
+      if (dir[length - 1] != '.')
+  	return chdir(dir);	    /* No trailing dots - nothing to do. */
+*** ../vim-7.2.232/src/os_mac.h	2009-06-24 16:41:01.000000000 +0200
+--- src/os_mac.h	2009-07-14 16:54:33.000000000 +0200
+***************
+*** 291,297 ****
+  #  define HAVE_SETENV
+  #  define HAVE_RENAME
+  # endif
+- # define mch_chdir(s) chdir(s)
+  #endif
+  
+  #if defined(MACOS_X) && !defined(HAVE_CONFIG_H)
+--- 291,296 ----
+*** ../vim-7.2.232/src/version.c	2009-07-14 17:38:51.000000000 +0200
+--- src/version.c	2009-07-14 18:35:30.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     233,
+  /**/
+
+-- 
+From "know your smileys":
+ :-O>-o   Smiley American tourist (note big mouth and camera)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.234 b/source/ap/vim/patches/7.2.234
new file mode 100644
index 000000000..dd44d5d00
--- /dev/null
+++ b/source/ap/vim/patches/7.2.234
@@ -0,0 +1,111 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.234
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.234
+Problem:    It is not possible to ignore file names without a suffix.
+Solution:   Use an empty entry in 'suffixes' for file names without a dot.
+Files:	    runtime/doc/cmdline.txt, src/misc1.c
+
+
+*** ../vim-7.2.233/runtime/doc/cmdline.txt	2008-11-09 13:43:25.000000000 +0100
+--- runtime/doc/cmdline.txt	2009-07-14 13:35:56.000000000 +0200
+***************
+*** 441,453 ****
+  those files with an extension that is in the 'suffixes' option are ignored.
+  The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending
+  in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored.
+! It is impossible to ignore suffixes with two dots.  Examples:
+  
+    pattern:	files:				match:	~
+     test*	test.c test.h test.o		test.c
+     test*	test.h test.o			test.h and test.o
+     test*	test.i test.h test.c		test.i and test.c
+  
+  If there is more than one matching file (after ignoring the ones matching
+  the 'suffixes' option) the first file name is inserted.  You can see that
+  there is only one match when you type 'wildchar' twice and the completed
+--- 439,458 ----
+  those files with an extension that is in the 'suffixes' option are ignored.
+  The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending
+  in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored.
+! 
+! An empty entry, two consecutive commas, match a file name that does not
+! contain a ".", thus has no suffix.  This is useful to ignore "prog" and prefer
+! "prog.c".
+! 
+! Examples:
+  
+    pattern:	files:				match:	~
+     test*	test.c test.h test.o		test.c
+     test*	test.h test.o			test.h and test.o
+     test*	test.i test.h test.c		test.i and test.c
+  
++ It is impossible to ignore suffixes with two dots.
++ 
+  If there is more than one matching file (after ignoring the ones matching
+  the 'suffixes' option) the first file name is inserted.  You can see that
+  there is only one match when you type 'wildchar' twice and the completed
+*** ../vim-7.2.233/src/misc1.c	2009-07-09 20:06:30.000000000 +0200
+--- src/misc1.c	2009-07-14 15:51:55.000000000 +0200
+***************
+*** 8533,8543 ****
+      for (setsuf = p_su; *setsuf; )
+      {
+  	setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,");
+! 	if (fnamelen >= setsuflen
+! 		&& fnamencmp(suf_buf, fname + fnamelen - setsuflen,
+! 					      (size_t)setsuflen) == 0)
+! 	    break;
+! 	setsuflen = 0;
+      }
+      return (setsuflen != 0);
+  }
+--- 8534,8558 ----
+      for (setsuf = p_su; *setsuf; )
+      {
+  	setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,");
+! 	if (setsuflen == 0)
+! 	{
+! 	    char_u *tail = gettail(fname);
+! 
+! 	    /* empty entry: match name without a '.' */
+! 	    if (vim_strchr(tail, '.') == NULL)
+! 	    {
+! 		setsuflen = 1;
+! 		break;
+! 	    }
+! 	}
+! 	else
+! 	{
+! 	    if (fnamelen >= setsuflen
+! 		    && fnamencmp(suf_buf, fname + fnamelen - setsuflen,
+! 						  (size_t)setsuflen) == 0)
+! 		break;
+! 	    setsuflen = 0;
+! 	}
+      }
+      return (setsuflen != 0);
+  }
+*** ../vim-7.2.233/src/version.c	2009-07-14 18:38:09.000000000 +0200
+--- src/version.c	2009-07-14 21:38:30.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     234,
+  /**/
+
+-- 
+How many light bulbs does it take to change a person?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.235 b/source/ap/vim/patches/7.2.235
new file mode 100644
index 000000000..6aa8338eb
--- /dev/null
+++ b/source/ap/vim/patches/7.2.235
@@ -0,0 +1,94 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.235
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.235
+Problem:    Using CTRL-O z= in Insert mode has a delay before redrawing.
+Solution:   Reset msg_didout and msg_scroll.
+Files:	    src/misc1.c, src/spell.c
+
+
+*** ../vim-7.2.234/src/misc1.c	2009-07-14 21:40:30.000000000 +0200
+--- src/misc1.c	2009-07-14 15:51:55.000000000 +0200
+***************
+*** 3276,3281 ****
+--- 3276,3282 ----
+  	cmdline_row = msg_row - 1;
+  	need_wait_return = FALSE;
+  	msg_didany = FALSE;
++ 	msg_didout = FALSE;
+      }
+      else
+  	cmdline_row = save_cmdline_row;
+*** ../vim-7.2.234/src/spell.c	2009-05-17 13:30:58.000000000 +0200
+--- src/spell.c	2009-07-14 15:57:55.000000000 +0200
+***************
+*** 10252,10257 ****
+--- 10252,10258 ----
+      int		limit;
+      int		selected = count;
+      int		badlen = 0;
++     int		msg_scroll_save = msg_scroll;
+  
+      if (no_spell_checking(curwin))
+  	return;
+***************
+*** 10416,10422 ****
+  	selected = prompt_for_number(&mouse_used);
+  	if (mouse_used)
+  	    selected -= lines_left;
+! 	lines_left = Rows;	/* avoid more prompt */
+      }
+  
+      if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK)
+--- 10417,10425 ----
+  	selected = prompt_for_number(&mouse_used);
+  	if (mouse_used)
+  	    selected -= lines_left;
+! 	lines_left = Rows;		/* avoid more prompt */
+! 	/* don't delay for 'smd' in normal_cmd() */
+! 	msg_scroll = msg_scroll_save;
+      }
+  
+      if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK)
+***************
+*** 10441,10447 ****
+  	}
+  
+  	/* Replace the word. */
+! 	p = alloc((unsigned)STRLEN(line) - stp->st_orglen + stp->st_wordlen + 1);
+  	if (p != NULL)
+  	{
+  	    c = (int)(sug.su_badptr - line);
+--- 10444,10451 ----
+  	}
+  
+  	/* Replace the word. */
+! 	p = alloc((unsigned)STRLEN(line) - stp->st_orglen
+! 						       + stp->st_wordlen + 1);
+  	if (p != NULL)
+  	{
+  	    c = (int)(sug.su_badptr - line);
+*** ../vim-7.2.234/src/version.c	2009-07-14 21:40:30.000000000 +0200
+--- src/version.c	2009-07-22 11:00:34.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     235,
+  /**/
+
+-- 
+From "know your smileys":
+ |-(	Contact lenses, but has lost them
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.236 b/source/ap/vim/patches/7.2.236
new file mode 100644
index 000000000..aeb1f57d0
--- /dev/null
+++ b/source/ap/vim/patches/7.2.236
@@ -0,0 +1,81 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.236
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.236
+Problem:    Mac: Compiling with Ruby doesn't always work.
+Solution:   In configure filter out the --arch argument (Bjorn Winckler)
+Files:	    src/configure.in, src/auto/configure
+
+
+*** ../vim-7.2.235/src/configure.in	2009-05-26 22:58:43.000000000 +0200
+--- src/configure.in	2009-07-14 16:09:34.000000000 +0200
+***************
+*** 984,990 ****
+  	fi
+  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
+  	if test "X$rubyldflags" != "X"; then
+! 	  LDFLAGS="$rubyldflags $LDFLAGS"
+  	fi
+  	RUBY_SRC="if_ruby.c"
+  	RUBY_OBJ="objects/if_ruby.o"
+--- 984,996 ----
+  	fi
+  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
+  	if test "X$rubyldflags" != "X"; then
+! 	  dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only
+! 	  dnl be included if requested by passing --with-mac-arch to
+! 	  dnl configure, so strip these flags first (if present)
+! 	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
+! 	  if test "X$rubyldflags" != "X"; then
+! 	    LDFLAGS="$rubyldflags $LDFLAGS"
+! 	  fi
+  	fi
+  	RUBY_SRC="if_ruby.c"
+  	RUBY_OBJ="objects/if_ruby.o"
+*** ../vim-7.2.235/src/auto/configure	2009-05-26 22:58:43.000000000 +0200
+--- src/auto/configure	2009-07-14 16:11:58.000000000 +0200
+***************
+*** 5780,5786 ****
+  	fi
+  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
+  	if test "X$rubyldflags" != "X"; then
+! 	  LDFLAGS="$rubyldflags $LDFLAGS"
+  	fi
+  	RUBY_SRC="if_ruby.c"
+  	RUBY_OBJ="objects/if_ruby.o"
+--- 5780,5789 ----
+  	fi
+  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
+  	if test "X$rubyldflags" != "X"; then
+! 	  	  	  	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
+! 	  if test "X$rubyldflags" != "X"; then
+! 	    LDFLAGS="$rubyldflags $LDFLAGS"
+! 	  fi
+  	fi
+  	RUBY_SRC="if_ruby.c"
+  	RUBY_OBJ="objects/if_ruby.o"
+*** ../vim-7.2.235/src/version.c	2009-07-22 11:03:38.000000000 +0200
+--- src/version.c	2009-07-22 11:14:38.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     236,
+  /**/
+
+-- 
+From "know your smileys":
+ <|-) Chinese
+ <|-( Chinese and doesn't like these kind of jokes
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.237 b/source/ap/vim/patches/7.2.237
new file mode 100644
index 000000000..3592d3d6a
--- /dev/null
+++ b/source/ap/vim/patches/7.2.237
@@ -0,0 +1,76 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.237
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.237
+Problem:    Crash on exit when window icon not set.
+Solution:   Copy terminal name when using it for the icon name.
+Files:	    src/os_unix.c
+
+
+*** ../vim-7.2.236/src/os_unix.c	2009-07-14 17:38:51.000000000 +0200
+--- src/os_unix.c	2009-07-14 18:30:04.000000000 +0200
+***************
+*** 1734,1742 ****
+      if (oldicon == NULL && !test_only)
+      {
+  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
+! 	    oldicon = T_NAME + 8;
+  	else
+! 	    oldicon = T_NAME;
+      }
+  
+      return retval;
+--- 1734,1742 ----
+      if (oldicon == NULL && !test_only)
+      {
+  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
+! 	    oldicon = vim_strsave(T_NAME + 8);
+  	else
+! 	    oldicon = vim_strsave(T_NAME);
+      }
+  
+      return retval;
+***************
+*** 1939,1947 ****
+      if (!test_only)
+      {
+  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
+! 	    oldicon = T_NAME + 8;
+  	else
+! 	    oldicon = T_NAME;
+      }
+      return FALSE;
+  }
+--- 1939,1947 ----
+      if (!test_only)
+      {
+  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
+! 	    oldicon = vim_strsave(T_NAME + 8);
+  	else
+! 	    oldicon = vim_strsave(T_NAME);
+      }
+      return FALSE;
+  }
+*** ../vim-7.2.236/src/version.c	2009-07-22 11:16:54.000000000 +0200
+--- src/version.c	2009-07-22 13:26:30.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     237,
+  /**/
+
+-- 
+Common sense is what tells you that the world is flat.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.238 b/source/ap/vim/patches/7.2.238
new file mode 100644
index 000000000..a70976d8f
--- /dev/null
+++ b/source/ap/vim/patches/7.2.238
@@ -0,0 +1,117 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.238
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.238
+Problem:    Leaking memory when setting term to "builtin_dumb".
+Solution:   Free memory when resetting term option t_Co.
+Files:	    src/option.c, src/proto/option.pro, src/term.c
+
+
+*** ../vim-7.2.237/src/option.c	2009-06-16 17:50:56.000000000 +0200
+--- src/option.c	2009-07-22 12:49:19.000000000 +0200
+***************
+*** 403,410 ****
+  #define P_NUM		0x02	/* the option is numeric */
+  #define P_STRING	0x04	/* the option is a string */
+  #define P_ALLOCED	0x08	/* the string option is in allocated memory,
+! 				    must use vim_free() when assigning new
+! 				    value. Not set if default is the same. */
+  #define P_EXPAND	0x10	/* environment expansion.  NOTE: P_EXPAND can
+  				   never be used for local or hidden options! */
+  #define P_NODEFAULT	0x40	/* don't set to default value */
+--- 403,411 ----
+  #define P_NUM		0x02	/* the option is numeric */
+  #define P_STRING	0x04	/* the option is a string */
+  #define P_ALLOCED	0x08	/* the string option is in allocated memory,
+! 				   must use free_string_option() when
+! 				   assigning new value. Not set if default is
+! 				   the same. */
+  #define P_EXPAND	0x10	/* environment expansion.  NOTE: P_EXPAND can
+  				   never be used for local or hidden options! */
+  #define P_NODEFAULT	0x40	/* don't set to default value */
+***************
+*** 8927,8932 ****
+--- 8928,8955 ----
+  }
+  
+  /*
++  * Free the string for one term option, if it was allocated.
++  * Set the string to empty_option and clear allocated flag.
++  * "var" points to the option value.
++  */
++     void
++ free_one_termoption(var)
++     char_u *var;
++ {
++     struct vimoption   *p;
++ 
++     for (p = &options[0]; p->fullname != NULL; p++)
++ 	if (p->var == var)
++ 	{
++ 	    if (p->flags & P_ALLOCED)
++ 		free_string_option(*(char_u **)(p->var));
++ 	    *(char_u **)(p->var) = empty_option;
++ 	    p->flags &= ~P_ALLOCED;
++ 	    break;
++ 	}
++ }
++ 
++ /*
+   * Set the terminal option defaults to the current value.
+   * Used after setting the terminal name.
+   */
+*** ../vim-7.2.237/src/proto/option.pro	2009-02-21 20:27:00.000000000 +0100
+--- src/proto/option.pro	2009-07-22 12:52:31.000000000 +0200
+***************
+*** 29,34 ****
+--- 29,35 ----
+  int makefoldset __ARGS((FILE *fd));
+  void clear_termoptions __ARGS((void));
+  void free_termoptions __ARGS((void));
++ void free_one_termoption __ARGS((char_u *var));
+  void set_term_defaults __ARGS((void));
+  void comp_col __ARGS((void));
+  char_u *get_equalprg __ARGS((void));
+*** ../vim-7.2.237/src/term.c	2009-06-16 14:31:56.000000000 +0200
+--- src/term.c	2009-07-22 13:19:59.000000000 +0200
+***************
+*** 2881,2887 ****
+  
+  	/* if 'Sb' and 'AB' are not defined, reset "Co" */
+  	if (*T_CSB == NUL && *T_CAB == NUL)
+! 	    T_CCO = empty_option;
+  
+  	/* Set 'weirdinvert' according to value of 't_xs' */
+  	p_wiv = (*T_XS != NUL);
+--- 2881,2887 ----
+  
+  	/* if 'Sb' and 'AB' are not defined, reset "Co" */
+  	if (*T_CSB == NUL && *T_CAB == NUL)
+! 	    free_one_termoption(T_CCO);
+  
+  	/* Set 'weirdinvert' according to value of 't_xs' */
+  	p_wiv = (*T_XS != NUL);
+*** ../vim-7.2.237/src/version.c	2009-07-22 13:27:50.000000000 +0200
+--- src/version.c	2009-07-22 14:25:44.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     238,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+95. Only communication in your household is through email.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.239 b/source/ap/vim/patches/7.2.239
new file mode 100644
index 000000000..26b80ee28
--- /dev/null
+++ b/source/ap/vim/patches/7.2.239
@@ -0,0 +1,145 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.239
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.239
+Problem:    Using :diffpatch twice or when patching fails causes memory
+	    corruption and/or a crash.  (Bryan Venteicher)
+Solution:   Detect missing output file.  Avoid using non-existing buffer.
+Files:	    src/diff.c
+
+
+*** ../vim-7.2.238/src/diff.c	2009-05-14 22:19:19.000000000 +0200
+--- src/diff.c	2009-07-22 16:06:21.000000000 +0200
+***************
+*** 893,898 ****
+--- 893,899 ----
+      char_u	*browseFile = NULL;
+      int		browse_flag = cmdmod.browse;
+  #endif
++     struct stat st;
+  
+  #ifdef FEAT_BROWSE
+      if (cmdmod.browse)
+***************
+*** 999,1042 ****
+      STRCAT(buf, ".rej");
+      mch_remove(buf);
+  
+!     if (curbuf->b_fname != NULL)
+      {
+! 	newname = vim_strnsave(curbuf->b_fname,
+  					  (int)(STRLEN(curbuf->b_fname) + 4));
+! 	if (newname != NULL)
+! 	    STRCAT(newname, ".new");
+!     }
+  
+  #ifdef FEAT_GUI
+!     need_mouse_correct = TRUE;
+  #endif
+!     /* don't use a new tab page, each tab page has its own diffs */
+!     cmdmod.tab = 0;
+! 
+!     if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
+!     {
+! 	/* Pretend it was a ":split fname" command */
+! 	eap->cmdidx = CMD_split;
+! 	eap->arg = tmp_new;
+! 	do_exedit(eap, old_curwin);
+  
+! 	if (curwin != old_curwin)		/* split must have worked */
+  	{
+! 	    /* Set 'diff', 'scrollbind' on and 'wrap' off. */
+! 	    diff_win_options(curwin, TRUE);
+! 	    diff_win_options(old_curwin, TRUE);
+  
+! 	    if (newname != NULL)
+  	    {
+! 		/* do a ":file filename.new" on the patched buffer */
+! 		eap->arg = newname;
+! 		ex_file(eap);
+  
+  #ifdef FEAT_AUTOCMD
+! 		/* Do filetype detection with the new name. */
+! 		if (au_has_group((char_u *)"filetypedetect"))
+! 		    do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
+  #endif
+  	    }
+  	}
+      }
+--- 1000,1050 ----
+      STRCAT(buf, ".rej");
+      mch_remove(buf);
+  
+!     /* Only continue if the output file was created. */
+!     if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
+! 	EMSG(_("E816: Cannot read patch output"));
+!     else
+      {
+! 	if (curbuf->b_fname != NULL)
+! 	{
+! 	    newname = vim_strnsave(curbuf->b_fname,
+  					  (int)(STRLEN(curbuf->b_fname) + 4));
+! 	    if (newname != NULL)
+! 		STRCAT(newname, ".new");
+! 	}
+  
+  #ifdef FEAT_GUI
+! 	need_mouse_correct = TRUE;
+  #endif
+! 	/* don't use a new tab page, each tab page has its own diffs */
+! 	cmdmod.tab = 0;
+  
+! 	if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
+  	{
+! 	    /* Pretend it was a ":split fname" command */
+! 	    eap->cmdidx = CMD_split;
+! 	    eap->arg = tmp_new;
+! 	    do_exedit(eap, old_curwin);
+  
+! 	    /* check that split worked and editing tmp_new */
+! 	    if (curwin != old_curwin && win_valid(old_curwin))
+  	    {
+! 		/* Set 'diff', 'scrollbind' on and 'wrap' off. */
+! 		diff_win_options(curwin, TRUE);
+! 		diff_win_options(old_curwin, TRUE);
+! 
+! 		if (newname != NULL)
+! 		{
+! 		    /* do a ":file filename.new" on the patched buffer */
+! 		    eap->arg = newname;
+! 		    ex_file(eap);
+  
+  #ifdef FEAT_AUTOCMD
+! 		    /* Do filetype detection with the new name. */
+! 		    if (au_has_group((char_u *)"filetypedetect"))
+! 			do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
+  #endif
++ 		}
+  	    }
+  	}
+      }
+*** ../vim-7.2.238/src/version.c	2009-07-22 14:27:33.000000000 +0200
+--- src/version.c	2009-07-22 16:21:29.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     239,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+97. Your mother tells you to remember something, and you look for
+    a File/Save command.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.240 b/source/ap/vim/patches/7.2.240
new file mode 100644
index 000000000..7a1c22e2b
--- /dev/null
+++ b/source/ap/vim/patches/7.2.240
@@ -0,0 +1,69 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.240
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.240
+Problem:    Crash when using find/replace dialog repeatedly. (Michiel
+	    Hartsuiker)
+Solution:   Avoid doing the operation while busy or recursively.  Also refuse
+	    replace when text is locked.
+Files:	    src/gui.c
+
+
+*** ../vim-7.2.239/src/gui.c	2009-06-24 18:31:36.000000000 +0200
+--- src/gui.c	2009-07-22 16:54:16.000000000 +0200
+***************
+*** 5004,5009 ****
+--- 5004,5022 ----
+      char_u	*p;
+      regmatch_T	regmatch;
+      int		save_did_emsg = did_emsg;
++     static int  busy = FALSE;
++ 
++     /* When the screen is being updated we should not change buffers and
++      * windows structures, it may cause freed memory to be used.  Also don't
++      * do this recursively (pressing "Find" quickly several times. */
++     if (updating_screen || busy)
++ 	return FALSE;
++ 
++     /* refuse replace when text cannot be changed */
++     if ((type == FRD_REPLACE || type == FRD_REPLACEALL) && text_locked())
++ 	return FALSE;
++ 
++     busy = TRUE;
+  
+      ga_init2(&ga, 1, 100);
+      if (type == FRD_REPLACEALL)
+***************
+*** 5094,5099 ****
+--- 5107,5113 ----
+      }
+  
+      vim_free(ga.ga_data);
++     busy = FALSE;
+      return (ga.ga_len > 0);
+  }
+  
+*** ../vim-7.2.239/src/version.c	2009-07-22 16:22:33.000000000 +0200
+--- src/version.c	2009-07-29 11:09:13.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     240,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+113. You are asked about a bus schedule, you wonder if it is 16 or 32 bits.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.241 b/source/ap/vim/patches/7.2.241
new file mode 100644
index 000000000..42e9ade39
--- /dev/null
+++ b/source/ap/vim/patches/7.2.241
@@ -0,0 +1,169 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.241
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.241
+Problem:    When using a combination of ":bufdo" and "doautoall" we may end up
+	    in the wrong directory. (Ajit Thakkar)
+	    Crash when triggering an autocommand in ":vimgrep".  (Yukihiro
+	    Nakadaira)
+Solution:   Clear w_localdir and globaldir when using the aucmd_win.
+	    Use a separate flag to decide aucmd_win needs to be restored.
+Files:	    src/fileio.c, src/globals.h, src/structs.h
+
+
+*** ../vim-7.2.240/src/fileio.c	2009-07-01 17:11:40.000000000 +0200
+--- src/fileio.c	2009-07-22 19:08:55.000000000 +0200
+***************
+*** 8420,8425 ****
+--- 8420,8429 ----
+  	if (aucmd_win == NULL)
+  	    win = curwin;
+      }
++     if (win == NULL && aucmd_win_used)
++ 	/* Strange recursive autocommand, fall back to using the current
++ 	 * window.  Expect a few side effects... */
++ 	win = curwin;
+  
+      aco->save_curwin = curwin;
+      aco->save_curbuf = curbuf;
+***************
+*** 8428,8433 ****
+--- 8432,8438 ----
+  	/* There is a window for "buf" in the current tab page, make it the
+  	 * curwin.  This is preferred, it has the least side effects (esp. if
+  	 * "buf" is curbuf). */
++ 	aco->use_aucmd_win = FALSE;
+  	curwin = win;
+      }
+      else
+***************
+*** 8436,8444 ****
+--- 8441,8460 ----
+  	 * effects, insert it in a the current tab page.
+  	 * Anything related to a window (e.g., setting folds) may have
+  	 * unexpected results. */
++ 	aco->use_aucmd_win = TRUE;
++ 	aucmd_win_used = TRUE;
+  	aucmd_win->w_buffer = buf;
+  	++buf->b_nwindows;
+  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
++ 	vim_free(aucmd_win->w_localdir);
++ 	aucmd_win->w_localdir = NULL;
++ 
++ 	/* Make sure w_localdir and globaldir are NULL to avoid a chdir() in
++ 	 * win_enter_ext(). */
++ 	aucmd_win->w_localdir = NULL;
++ 	aco->globaldir = globaldir;
++ 	globaldir = NULL;
++ 
+  
+  #ifdef FEAT_WINDOWS
+  	/* Split the current window, put the aucmd_win in the upper half.
+***************
+*** 8472,8478 ****
+      int dummy;
+  #endif
+  
+!     if (aco->new_curwin == aucmd_win)
+      {
+  	--curbuf->b_nwindows;
+  #ifdef FEAT_WINDOWS
+--- 8488,8494 ----
+      int dummy;
+  #endif
+  
+!     if (aco->use_aucmd_win)
+      {
+  	--curbuf->b_nwindows;
+  #ifdef FEAT_WINDOWS
+***************
+*** 8499,8504 ****
+--- 8515,8521 ----
+  	/* Remove the window and frame from the tree of frames. */
+  	(void)winframe_remove(curwin, &dummy, NULL);
+  	win_remove(curwin, NULL);
++ 	aucmd_win_used = FALSE;
+  	last_status(FALSE);	    /* may need to remove last status line */
+  	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
+  	(void)win_comp_pos();   /* recompute window positions */
+***************
+*** 8517,8522 ****
+--- 8534,8542 ----
+  #endif
+  	curbuf = curwin->w_buffer;
+  
++ 	vim_free(globaldir);
++ 	globaldir = aco->globaldir;
++ 
+  	/* the buffer contents may have changed */
+  	check_cursor();
+  	if (curwin->w_topline > curbuf->b_ml.ml_line_count)
+***************
+*** 8541,8547 ****
+  #endif
+  	{
+  	    /* Restore the buffer which was previously edited by curwin, if
+! 	     * it was chagned, we are still the same window and the buffer is
+  	     * valid. */
+  	    if (curwin == aco->new_curwin
+  		    && curbuf != aco->new_curbuf
+--- 8561,8567 ----
+  #endif
+  	{
+  	    /* Restore the buffer which was previously edited by curwin, if
+! 	     * it was changed, we are still the same window and the buffer is
+  	     * valid. */
+  	    if (curwin == aco->new_curwin
+  		    && curbuf != aco->new_curbuf
+*** ../vim-7.2.240/src/globals.h	2009-06-16 16:01:34.000000000 +0200
+--- src/globals.h	2009-07-22 19:50:53.000000000 +0200
+***************
+*** 541,546 ****
+--- 541,547 ----
+  
+  #ifdef FEAT_AUTOCMD
+  EXTERN win_T	*aucmd_win;	/* window used in aucmd_prepbuf() */
++ EXTERN int	aucmd_win_used INIT(= FALSE);	/* aucmd_win is being used */
+  #endif
+  
+  /*
+*** ../vim-7.2.240/src/structs.h	2009-07-09 18:24:24.000000000 +0200
+--- src/structs.h	2009-07-22 18:58:35.000000000 +0200
+***************
+*** 2288,2296 ****
+--- 2288,2298 ----
+  {
+      buf_T	*save_curbuf;	/* saved curbuf */
+  #ifdef FEAT_AUTOCMD
++     int		use_aucmd_win;	/* using aucmd_win */
+      win_T	*save_curwin;	/* saved curwin */
+      win_T	*new_curwin;	/* new curwin */
+      buf_T	*new_curbuf;	/* new curbuf */
++     char_u	*globaldir;	/* saved value of globaldir */
+  #endif
+  } aco_save_T;
+  
+*** ../vim-7.2.240/src/version.c	2009-07-29 11:10:31.000000000 +0200
+--- src/version.c	2009-07-29 12:06:31.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     241,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+114. You are counting items, you go "0,1,2,3,4,5,6,7,8,9,A,B,C,D...".
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.242 b/source/ap/vim/patches/7.2.242
new file mode 100644
index 000000000..22341cd2e
--- /dev/null
+++ b/source/ap/vim/patches/7.2.242
@@ -0,0 +1,89 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.242
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.242
+Problem:    Setting 'lazyredraw' causes the cursor column to be recomputed.
+	    (Tom Link)
+Solution:   Only recompute the cursor column for a boolean option if changes
+	    the cursor position.
+Files:	    src/option.c
+
+
+*** ../vim-7.2.241/src/option.c	2009-07-22 14:27:33.000000000 +0200
+--- src/option.c	2009-07-29 10:03:39.000000000 +0200
+***************
+*** 7194,7199 ****
+--- 7194,7207 ----
+  	compatible_set();
+      }
+  
++     /* 'list', 'number' */
++     else if ((int *)varp == &curwin->w_p_list
++ 	  || (int *)varp == &curwin->w_p_nu)
++     {
++ 	if (curwin->w_curswant != MAXCOL)
++ 	    curwin->w_set_curswant = TRUE;
++     }
++ 
+      else if ((int *)varp == &curbuf->b_p_ro)
+      {
+  	/* when 'readonly' is reset globally, also reset readonlymode */
+***************
+*** 7645,7650 ****
+--- 7653,7666 ----
+  	    curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
+  # endif
+  	}
++ 	if (curwin->w_curswant != MAXCOL)
++ 	    curwin->w_set_curswant = TRUE;
++     }
++ 
++     else if ((int *)varp == &p_arshape)
++     {
++ 	if (curwin->w_curswant != MAXCOL)
++ 	    curwin->w_set_curswant = TRUE;
+      }
+  #endif
+  
+***************
+*** 7655,7662 ****
+      options[opt_idx].flags |= P_WAS_SET;
+  
+      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
+!     if (curwin->w_curswant != MAXCOL)
+! 	curwin->w_set_curswant = TRUE;  /* in case 'list' changed */
+      check_redraw(options[opt_idx].flags);
+  
+      return NULL;
+--- 7671,7677 ----
+      options[opt_idx].flags |= P_WAS_SET;
+  
+      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
+! 
+      check_redraw(options[opt_idx].flags);
+  
+      return NULL;
+*** ../vim-7.2.241/src/version.c	2009-07-29 12:09:49.000000000 +0200
+--- src/version.c	2009-07-29 15:40:43.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     242,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+117. You are more comfortable typing in html.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.243 b/source/ap/vim/patches/7.2.243
new file mode 100644
index 000000000..92a6580db
--- /dev/null
+++ b/source/ap/vim/patches/7.2.243
@@ -0,0 +1,67 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.243
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.243
+Problem:    Memory leak when using :vimgrep and resizing. (Dominique Pelle)
+Solution:   Free memory for aucmd_win when resizing and don't allocate it
+	    twice.
+Files:	    src/screen.c
+
+
+*** ../vim-7.2.242/src/screen.c	2009-06-16 17:22:38.000000000 +0200
+--- src/screen.c	2009-07-29 15:59:37.000000000 +0200
+***************
+*** 7467,7472 ****
+--- 7467,7476 ----
+       */
+      FOR_ALL_TAB_WINDOWS(tp, wp)
+  	win_free_lsize(wp);
++ #ifdef FEAT_AUTOCMD
++     if (aucmd_win != NULL)
++ 	win_free_lsize(aucmd_win);
++ #endif
+  
+      new_ScreenLines = (schar_T *)lalloc((long_u)(
+  			      (Rows + 1) * Columns * sizeof(schar_T)), FALSE);
+***************
+*** 7504,7510 ****
+  	}
+      }
+  #ifdef FEAT_AUTOCMD
+!     if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
+  	outofmem = TRUE;
+  #endif
+  #ifdef FEAT_WINDOWS
+--- 7508,7515 ----
+  	}
+      }
+  #ifdef FEAT_AUTOCMD
+!     if (aucmd_win != NULL && aucmd_win->w_lines == NULL
+! 					&& win_alloc_lines(aucmd_win) == FAIL)
+  	outofmem = TRUE;
+  #endif
+  #ifdef FEAT_WINDOWS
+*** ../vim-7.2.242/src/version.c	2009-07-29 15:41:32.000000000 +0200
+--- src/version.c	2009-07-29 16:07:47.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     243,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+118. You are on a first-name basis with your ISP's staff.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.244 b/source/ap/vim/patches/7.2.244
new file mode 100644
index 000000000..6c9b1fb80
--- /dev/null
+++ b/source/ap/vim/patches/7.2.244
@@ -0,0 +1,174 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.244
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.244
+Problem:    When 'enc' is utf-8 and 'fenc' is latin1, writing a non-latin1
+	    character gives a conversion error without any hint what is wrong.
+Solution:   When known add the line number to the error message.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.243/src/fileio.c	2009-07-29 12:09:49.000000000 +0200
+--- src/fileio.c	2009-07-29 17:04:06.000000000 +0200
+***************
+*** 121,126 ****
+--- 121,128 ----
+      char_u	*bw_conv_buf;	/* buffer for writing converted chars */
+      int		bw_conv_buflen; /* size of bw_conv_buf */
+      int		bw_conv_error;	/* set for conversion error */
++     linenr_T	bw_conv_error_lnum;  /* first line with error or zero */
++     linenr_T	bw_start_lnum;  /* line number at start of buffer */
+  # ifdef USE_ICONV
+      iconv_t	bw_iconv_fd;	/* descriptor for iconv() or -1 */
+  # endif
+***************
+*** 2924,2929 ****
+--- 2925,2931 ----
+      linenr_T	    lnum;
+      long	    nchars;
+      char_u	    *errmsg = NULL;
++     int		    errmsg_allocated = FALSE;
+      char_u	    *errnum = NULL;
+      char_u	    *buffer;
+      char_u	    smallbuf[SMBUFSIZE];
+***************
+*** 2987,2992 ****
+--- 2989,2995 ----
+      /* must init bw_conv_buf and bw_iconv_fd before jumping to "fail" */
+      write_info.bw_conv_buf = NULL;
+      write_info.bw_conv_error = FALSE;
++     write_info.bw_conv_error_lnum = 0;
+      write_info.bw_restlen = 0;
+  # ifdef USE_ICONV
+      write_info.bw_iconv_fd = (iconv_t)-1;
+***************
+*** 4243,4248 ****
+--- 4245,4251 ----
+  		nchars += write_info.bw_len;
+  	}
+      }
++     write_info.bw_start_lnum = start;
+  #endif
+  
+      write_info.bw_len = bufsize;
+***************
+*** 4278,4283 ****
+--- 4281,4289 ----
+  	    nchars += bufsize;
+  	    s = buffer;
+  	    len = 0;
++ #ifdef FEAT_MBYTE
++ 	    write_info.bw_start_lnum = lnum;
++ #endif
+  	}
+  	/* write failed or last line has no EOL: stop here */
+  	if (end == 0
+***************
+*** 4474,4480 ****
+  	{
+  #ifdef FEAT_MBYTE
+  	    if (write_info.bw_conv_error)
+! 		errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)");
+  	    else
+  #endif
+  		if (got_int)
+--- 4480,4496 ----
+  	{
+  #ifdef FEAT_MBYTE
+  	    if (write_info.bw_conv_error)
+! 	    {
+! 		if (write_info.bw_conv_error_lnum == 0)
+! 		    errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)");
+! 		else
+! 		{
+! 		    errmsg_allocated = TRUE;
+! 		    errmsg = alloc(300);
+! 		    vim_snprintf((char *)errmsg, 300, _("E513: write error, conversion failed in line %ld (make 'fenc' empty to override)"),
+! 					 (long)write_info.bw_conv_error_lnum);
+! 		}
+! 	    }
+  	    else
+  #endif
+  		if (got_int)
+***************
+*** 4550,4555 ****
+--- 4566,4577 ----
+  	{
+  	    STRCAT(IObuff, _(" CONVERSION ERROR"));
+  	    c = TRUE;
++ 	    if (write_info.bw_conv_error_lnum != 0)
++ 	    {
++ 		int l = STRLEN(IObuff);
++ 		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
++ 			(long)write_info.bw_conv_error_lnum);
++ 	    }
+  	}
+  	else if (notconverted)
+  	{
+***************
+*** 4746,4751 ****
+--- 4768,4775 ----
+  	}
+  	STRCAT(IObuff, errmsg);
+  	emsg(IObuff);
++ 	if (errmsg_allocated)
++ 	    vim_free(errmsg);
+  
+  	retval = FAIL;
+  	if (end == 0)
+***************
+*** 5105,5111 ****
+  			c = buf[wlen];
+  		}
+  
+! 		ip->bw_conv_error |= ucs2bytes(c, &p, flags);
+  	    }
+  	    if (flags & FIO_LATIN1)
+  		len = (int)(p - buf);
+--- 5129,5141 ----
+  			c = buf[wlen];
+  		}
+  
+! 		if (ucs2bytes(c, &p, flags) && !ip->bw_conv_error)
+! 		{
+! 		    ip->bw_conv_error = TRUE;
+! 		    ip->bw_conv_error_lnum = ip->bw_start_lnum;
+! 		}
+! 		if (c == NL)
+! 		    ++ip->bw_start_lnum;
+  	    }
+  	    if (flags & FIO_LATIN1)
+  		len = (int)(p - buf);
+***************
+*** 5386,5391 ****
+--- 5416,5422 ----
+  #ifdef FEAT_MBYTE
+  /*
+   * Convert a Unicode character to bytes.
++  * Return TRUE for an error, FALSE when it's OK.
+   */
+      static int
+  ucs2bytes(c, pp, flags)
+*** ../vim-7.2.243/src/version.c	2009-07-29 16:13:35.000000000 +0200
+--- src/version.c	2009-07-29 18:01:27.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     244,
+  /**/
+
+-- 
+Support your right to bare arms!  Wear short sleeves!
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/patches/7.2.245 b/source/ap/vim/patches/7.2.245
new file mode 100644
index 000000000..d046c97f1
--- /dev/null
+++ b/source/ap/vim/patches/7.2.245
@@ -0,0 +1,165 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.245
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.245
+Problem:    When 'enc' is "utf-16" and 'fenc' is "utf-8" writing a file does
+	    conversion while none should be done. (Yukihiro Nakadaira) When
+	    'fenc' is empty the file is written as utf-8 instead of utf-16.
+Solution:   Do proper comparison of encodings, taking into account that all
+	    Unicode values for 'enc' use utf-8 internally.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.244/src/fileio.c	2009-07-29 18:05:57.000000000 +0200
+--- src/fileio.c	2009-07-29 17:04:06.000000000 +0200
+***************
+*** 134,140 ****
+  #ifdef FEAT_MBYTE
+  static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp));
+  static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags));
+! static int same_encoding __ARGS((char_u *a, char_u *b));
+  static int get_fio_flags __ARGS((char_u *ptr));
+  static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags));
+  static int make_bom __ARGS((char_u *buf, char_u *name));
+--- 134,140 ----
+  #ifdef FEAT_MBYTE
+  static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp));
+  static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags));
+! static int need_conversion __ARGS((char_u *fenc));
+  static int get_fio_flags __ARGS((char_u *ptr));
+  static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags));
+  static int make_bom __ARGS((char_u *buf, char_u *name));
+***************
+*** 1043,1055 ****
+      }
+  
+      /*
+!      * Conversion is required when the encoding of the file is different
+!      * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4 (requires
+!      * conversion to UTF-8).
+       */
+      fio_flags = 0;
+!     converted = (*fenc != NUL && !same_encoding(p_enc, fenc));
+!     if (converted || enc_unicode != 0)
+      {
+  
+  	/* "ucs-bom" means we need to check the first bytes of the file
+--- 1043,1054 ----
+      }
+  
+      /*
+!      * Conversion may be required when the encoding of the file is different
+!      * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4.
+       */
+      fio_flags = 0;
+!     converted = need_conversion(fenc);
+!     if (converted)
+      {
+  
+  	/* "ucs-bom" means we need to check the first bytes of the file
+***************
+*** 3969,3978 ****
+  	fenc = buf->b_p_fenc;
+  
+      /*
+!      * The file needs to be converted when 'fileencoding' is set and
+!      * 'fileencoding' differs from 'encoding'.
+       */
+!     converted = (*fenc != NUL && !same_encoding(p_enc, fenc));
+  
+      /*
+       * Check if UTF-8 to UCS-2/4 or Latin1 conversion needs to be done.  Or
+--- 3968,3976 ----
+  	fenc = buf->b_p_fenc;
+  
+      /*
+!      * Check if the file needs to be converted.
+       */
+!     converted = need_conversion(fenc);
+  
+      /*
+       * Check if UTF-8 to UCS-2/4 or Latin1 conversion needs to be done.  Or
+***************
+*** 5502,5521 ****
+  }
+  
+  /*
+!  * Return TRUE if "a" and "b" are the same 'encoding'.
+!  * Ignores difference between "ansi" and "latin1", "ucs-4" and "ucs-4be", etc.
+   */
+      static int
+! same_encoding(a, b)
+!     char_u	*a;
+!     char_u	*b;
+  {
+!     int		f;
+  
+!     if (STRCMP(a, b) == 0)
+! 	return TRUE;
+!     f = get_fio_flags(a);
+!     return (f != 0 && get_fio_flags(b) == f);
+  }
+  
+  /*
+--- 5500,5536 ----
+  }
+  
+  /*
+!  * Return TRUE if file encoding "fenc" requires conversion from or to
+!  * 'encoding'.
+   */
+      static int
+! need_conversion(fenc)
+!     char_u	*fenc;
+  {
+!     int		same_encoding;
+!     int		enc_flags;
+!     int		fenc_flags;
+  
+!     if (*fenc == NUL || STRCMP(p_enc, fenc) == 0)
+! 	same_encoding = TRUE;
+!     else
+!     {
+! 	/* Ignore difference between "ansi" and "latin1", "ucs-4" and
+! 	 * "ucs-4be", etc. */
+! 	enc_flags = get_fio_flags(p_enc);
+! 	fenc_flags = get_fio_flags(fenc);
+! 	same_encoding = (enc_flags != 0 && fenc_flags == enc_flags);
+!     }
+!     if (same_encoding)
+!     {
+! 	/* Specified encoding matches with 'encoding'.  This requires
+! 	 * conversion when 'encoding' is Unicode but not UTF-8. */
+! 	return enc_unicode != 0;
+!     }
+! 
+!     /* Encodings differ.  However, conversion is not needed when 'enc' is any
+!      * Unicode encoding and the file is UTF-8. */
+!     return !(enc_utf8 && fenc_flags == FIO_UTF8);
+  }
+  
+  /*
+*** ../vim-7.2.244/src/version.c	2009-07-29 18:05:57.000000000 +0200
+--- src/version.c	2009-07-29 18:20:08.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     245,
+  /**/
+
+-- 
+An actual excerpt from a classified section of a city newspaper:
+"Illiterate?  Write today for free help!"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/source/ap/vim/slack-desc.vim b/source/ap/vim/slack-desc.vim
new file mode 100644
index 000000000..04b1d5eb4
--- /dev/null
+++ b/source/ap/vim/slack-desc.vim
@@ -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------------------------------------------------------|
+vim: vim (Vi IMproved)
+vim:
+vim: Vim is an almost compatible version of the UNIX editor vi.  Many new
+vim: features have been added:  multi level undo, command line history, 
+vim: filename completion, block operations, and more.
+vim:
+vim: Vim's development is led by Bram Moolenaar.
+vim:
+vim: This package also contains the Exuberant Ctags program
+vim: written by Darren Hiebert.
+vim:
diff --git a/source/ap/vim/slack-desc.vim-gvim b/source/ap/vim/slack-desc.vim-gvim
new file mode 100644
index 000000000..27efae73c
--- /dev/null
+++ b/source/ap/vim/slack-desc.vim-gvim
@@ -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------------------------------------------------------|
+vim-gvim: vim-gvim (gvim, the X/GTK2 enabled version of vim)
+vim-gvim:
+vim-gvim: Gvim is a graphical version of vim.  Vim is an almost compatible
+vim-gvim: version of the UNIX editor vi.  Many new features have been added,
+vim-gvim: such as multi level undo, command line history, filename completion,
+vim-gvim: block operations, and more.
+vim-gvim:
+vim-gvim: The main vim package in the AP series is required to use this package.
+vim-gvim:
+vim-gvim: Vim's development is led by Bram Moolenaar.
+vim-gvim:
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild
new file mode 100755
index 000000000..8c24b51d9
--- /dev/null
+++ b/source/ap/vim/vim-gvim.SlackBuild
@@ -0,0 +1,193 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+
+VIMVER=7.2
+# This is the directory in the VIM source archive to cd into.
+DIRVER=72
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+PYVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
+
+if [ "$ARCH" = "x86_64" ]; then
+  export SLKCFLAGS="-O2 -fPIC"
+  export LIBDIRSUFFIX="64"
+else
+  export SLKCFLAGS="-O2"
+  export LIBDIRSUFFIX=""
+fi
+export SLKLDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-vim-gvim
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Determine VIM patchlevel:
+if [ -d $CWD/patches ] ; then
+  cd $CWD/patches
+  PATCHLEVEL=$(/bin/ls 2> /dev/null | tail -1 | cut -f 3 -d . )
+    if [ "$PATCHLEVEL" = "" ]; then
+      PATCHLEVEL=000
+    fi
+  cd $CWD
+fi
+
+cd $TMP
+rm -rf vim$DIRVER
+tar xvf $CWD/vim-$VIMVER.tar.?z* || exit 1
+tar xvf $CWD/vim-$VIMVER-lang.tar.?z* || exit 1
+
+config_vim() {
+CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \
+./configure \
+  $* \
+  --prefix=/usr \
+  --enable-pythoninterp \
+  --with-python-config-dir=/usr/lib${LIBDIRSUFFIX}/python$PYVER/config \
+  --enable-perlinterp \
+  --disable-tclinterp \
+  --enable-multibyte \
+  --enable-cscope \
+  --with-features=huge \
+  --with-compiledby="<volkerdi@slackware.com>" \
+  --build=$ARCH-slackware-linux
+
+  # I had been adding this, but got 100% complaints and 0% kudos:
+  #  --enable-rubyinterp
+
+}
+
+cd $TMP/vim$DIRVER
+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 {} \;
+for file in $CWD/patches/* ; do
+  ( zcat $file 2> /dev/null | patch -p0 --verbose --batch )
+done
+
+config_vim --with-x --enable-gui=gtk2
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+rsync -lprvt $PKG/usr/share/man/ $PKG/usr/man/
+rm -r $PKG/usr/share/man
+
+# Fix manpage symlinks:
+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
+
+# Legacy binary links:
+( cd $PKG/usr/bin ; rm -rf ex )
+( cd $PKG/usr/bin ; ln -sf vim ex )
+( cd $PKG/usr/bin ; rm -rf rview )
+( cd $PKG/usr/bin ; ln -sf vim rview )
+( cd $PKG/usr/bin ; rm -rf rvim )
+( cd $PKG/usr/bin ; ln -sf vim rvim )
+( cd $PKG/usr/bin ; rm -rf view )
+( cd $PKG/usr/bin ; ln -sf vim view )
+( cd $PKG/usr/bin ; rm -rf eview )
+( cd $PKG/usr/bin ; ln -sf vim eview )
+( cd $PKG/usr/bin ; rm -rf evim )
+( cd $PKG/usr/bin ; ln -sf vim evim )
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc.vim-gvim > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# You'll have to run "gvim" to get the graphical version.
+# Seems like this is the common way for console and gui versions
+# of vim to co-exist.  If your "vi" symlink isn't pointed in a
+# way that suits you, it is fully user serviceable.  :-)
+( cd $PKG/usr/bin
+  rm -f gvim
+  mv vim gvim
+  for programlink in $(find . -type l | cut -b3-) ; do
+    rm $programlink
+    ln -sf gvim $programlink
+  done
+)
+rm -f vimtutor xxd
+
+# Perfect!
+# Now we get rid of everything that's not in the other vim package.
+# Let's assume (dangerous ;-) that we just built that in $TMP
+# and use it as a reference:
+if ! /bin/ls $TMP/vim-${VIMVER}*txz 1> /dev/null 2> /dev/null ; then
+  echo "FATAL: VIM package needed in $TMP"
+  exit 1
+fi
+mkdir $PKG/vim
+( cd $PKG
+  ( cd vim
+    echo "Extracting reference package $TMP/vim-${VIMVER}*txz:"
+    explodepkg $TMP/vim-${VIMVER}*txz 1> /dev/null
+    sh install/doinst.sh
+  )
+)
+rm -r $PKG/vim/install
+( cd $PKG
+  find vim | cut -b4- | while read sharedfile ; do
+    if [ ! -d $sharedfile ]; then
+      rm --verbose $PKG/$sharedfile
+    fi
+  done
+)
+
+# Finally, reference purge:
+rm -rf $PKG/vim
+
+# Perhaps we would be better off without this - forcing folks to run kappfinder
+# or something.  It seems better than starting with nothing, but might force
+# people into defaults they don't want.  Another nifty catch-22...
+mkdir -p $PKG/usr/share/applications
+cp -a $CWD/gvim.desktop $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/pixmaps
+cp -a $CWD/gvim.png $PKG/usr/share/pixmaps
+
+# Remove empty directories:
+find $PKG -type d -exec rmdir -p {} \; 2> /dev/null
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/vim-gvim-$VIMVER.$PATCHLEVEL-$ARCH-$BUILD.txz
+
diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
new file mode 100755
index 000000000..460b07a1e
--- /dev/null
+++ b/source/ap/vim/vim.SlackBuild
@@ -0,0 +1,196 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  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.
+
+VIMVER=7.2
+CTAGSVER=5.7
+# This is the directory in the VIM source archive to cd into.
+DIRVER=72
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+PYVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
+
+if [ "$ARCH" = "x86_64" ]; then
+  export SLKCFLAGS="-O2 -fPIC"
+  export LIBDIRSUFFIX="64"
+else
+  export SLKCFLAGS="-O2"
+  export LIBDIRSUFFIX=""
+fi
+export SLKLDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-vim
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Determine VIM patchlevel:
+if [ -d $CWD/patches ] ; then
+  cd $CWD/patches
+  PATCHLEVEL=$(/bin/ls 2> /dev/null | tail -1 | cut -f 3 -d . )
+    if [ "$PATCHLEVEL" = "" ]; then
+      PATCHLEVEL=000
+    fi
+  cd $CWD
+fi
+
+# ctags was once a part of vim,
+# but now we have to bundle it in
+cd $TMP
+rm -rf ctags-$CTAGSVER
+tar xvf $CWD/ctags-$CTAGSVER.tar.gz || exit 1
+cd ctags-$CTAGSVER
+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="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \
+./configure \
+  --prefix=/usr \
+  --build=$ARCH-slackware-linux
+make $NUMJOBS || make || exit 1
+mkdir -p $PKG/usr/bin
+cat ctags > $PKG/usr/bin/ctags
+chmod 755 $PKG/usr/bin/ctags
+mkdir -p $PKG/usr/man/man1
+cat ctags.1 | gzip -9c > $PKG/usr/man/man1/ctags.1.gz
+mkdir -p $PKG/usr/doc/ctags-$CTAGSVER
+cp -a \
+  COPYING EXTENDING.html FAQ INSTALL INSTALL.oth NEWS README \
+  $PKG/usr/doc/ctags-$CTAGSVER
+chmod 644 $PKG/usr/doc/ctags-$CTAGSVER/*
+
+cd $TMP
+rm -rf vim$DIRVER
+tar xvf $CWD/vim-$VIMVER.tar.?z* || exit 1
+tar xvf $CWD/vim-$VIMVER-lang.tar.?z* || exit 1
+
+config_vim() {
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  $* \
+  --prefix=/usr \
+  --enable-pythoninterp \
+  --with-python-config-dir=/usr/lib${LIBDIRSUFFIX}/python$PYVER/config \
+  --enable-perlinterp \
+  --disable-tclinterp \
+  --enable-multibyte \
+  --enable-cscope \
+  --with-features=huge \
+  --with-compiledby="<volkerdi@slackware.com>" \
+  --build=$ARCH-slackware-linux
+
+  # I had been adding this, but got 100% complaints and 0% kudos:
+  #  --enable-rubyinterp
+}
+
+cd $TMP/vim$DIRVER
+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 {} \;
+for file in $CWD/patches/* ; do
+  ( zcat $file 2> /dev/null | patch -p0 --verbose --batch )
+done
+
+config_vim --without-x --disable-gui
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+rsync -lprvt $PKG/usr/share/man/ $PKG/usr/man/
+rm -r $PKG/usr/share/man
+
+cp -a runtime/vimrc_example.vim runtime/vimrc.new
+
+# Don't make backups in /var/spool/cron/*, which fixes "crontab -e":
+zcat $CWD/vim.vimrc.diff.gz | patch -p1 --verbose || exit 1
+
+# Add patched vimrc to the package:
+cat runtime/vimrc.new > $PKG/usr/share/vim/vimrc.new
+
+# Fix manpage symlinks:
+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
+
+# Legacy binary links:
+( cd $PKG/usr/bin ; rm -rf ex )
+( cd $PKG/usr/bin ; ln -sf vim ex )
+( cd $PKG/usr/bin ; rm -rf rview )
+( cd $PKG/usr/bin ; ln -sf vim rview )
+( cd $PKG/usr/bin ; rm -rf rvim )
+( cd $PKG/usr/bin ; ln -sf vim rvim )
+( cd $PKG/usr/bin ; rm -rf view )
+( cd $PKG/usr/bin ; ln -sf vim view )
+( cd $PKG/usr/bin ; rm -rf eview )
+( cd $PKG/usr/bin ; ln -sf vim eview )
+( cd $PKG/usr/bin ; rm -rf evim )
+( cd $PKG/usr/bin ; ln -sf vim evim )
+
+mkdir -p $PKG/usr/doc/vim-$VIMVER.$PATCHLEVEL
+cp -a README.txt $PKG/usr/doc/vim-$VIMVER.$PATCHLEVEL
+find $PKG/usr/doc/vim-$VIMVER.$PATCHLEVEL -type f | xargs chmod 644
+( cd $PKG/usr/doc/vim-$VIMVER.$PATCHLEVEL ; rm -rf doc )
+( cd $PKG/usr/doc/vim-$VIMVER.$PATCHLEVEL ; ln -sf /usr/share/vim/vim$DIRVER doc )
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc.vim > $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...
+}
+config usr/share/vim/vimrc.new
+EOF
+zcat $CWD/doinst.sh.gz >> $PKG/install/doinst.sh
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/vim-$VIMVER.$PATCHLEVEL-$ARCH-$BUILD.txz
+
diff --git a/source/ap/vim/vim.vimrc.diff b/source/ap/vim/vim.vimrc.diff
new file mode 100644
index 000000000..c94104a5f
--- /dev/null
+++ b/source/ap/vim/vim.vimrc.diff
@@ -0,0 +1,12 @@
+--- ./runtime/vimrc.new.orig	2008-07-02 15:11:53.000000000 -0500
++++ ./runtime/vimrc.new	2009-05-28 13:19:24.000000000 -0500
+@@ -87,6 +87,9 @@
+ 
+ endif " has("autocmd")
+ 
++" Make vim work with the 'crontab -e' command
++set backupskip+=/var/spool/cron/*
++
+ " Convenient command to see the difference between the current buffer and the
+ " file it was loaded from, thus the changes you made.
+ " Only define it when not defined already.
diff --git a/source/ap/vorbis-tools/slack-desc b/source/ap/vorbis-tools/slack-desc
new file mode 100644
index 000000000..c55a780cd
--- /dev/null
+++ b/source/ap/vorbis-tools/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------------------------------------------------------|
+vorbis-tools: vorbis-tools (Ogg Vorbis Tools)
+vorbis-tools:
+vorbis-tools: The vorbis-tools package contains several basic tools for working with
+vorbis-tools: compressed audio files in the Ogg Vorbis (.ogg) format:
+vorbis-tools:
+vorbis-tools:   oggenc (an .ogg encoder), ogg123 (a playback tool), vorbiscomment
+vorbis-tools:   (add comments to vorbis files), ogginfo (show information about an
+vorbis-tools:   ogg file), oggdec (a command line decoder), and vcut (a tool for
+vorbis-tools:   splitting vorbis files).
+vorbis-tools:
+vorbis-tools: These tools require the libao, libogg, and libvorbis libraries.
diff --git a/source/ap/vorbis-tools/vorbis-tools.SlackBuild b/source/ap/vorbis-tools/vorbis-tools.SlackBuild
new file mode 100755
index 000000000..65c551a8d
--- /dev/null
+++ b/source/ap/vorbis-tools/vorbis-tools.SlackBuild
@@ -0,0 +1,80 @@
+#!/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=1.2.0
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-vorbis-tools
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf vorbis-tools-$VERSION
+tar xvf $CWD/vorbis-tools-$VERSION.tar.bz2 || exit 1
+cd vorbis-tools-$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 {} \;
+
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --program-prefix="" \
+  --program-suffix="" \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# No idea why this isn't built automatically any more...
+if [ ! -r $PKG/usr/bin/vcut ]; then
+  ( cd vcut
+    make
+    make install DESTDIR=$PKG
+  )
+fi
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+gzip -9 $PKG/usr/man/man?/*.?
+
+mv $PKG/usr/share/doc $PKG/usr
+cp -a \
+  AUTHORS COPYING README \
+  $PKG/usr/doc/vorbis-tools-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/vorbis-tools-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/workbone/slack-desc b/source/ap/workbone/slack-desc
new file mode 100644
index 000000000..322e280f2
--- /dev/null
+++ b/source/ap/workbone/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------------------------------------------------------|
+workbone: workbone (text-based CD player)
+workbone:
+workbone: WorkBone is a simple interactive tool for for playing audio CDs from
+workbone: the Linux console.
+workbone:
+workbone:
+workbone:
+workbone:
+workbone:
+workbone:
+workbone:
diff --git a/source/ap/workbone/workbone.1.diff b/source/ap/workbone/workbone.1.diff
new file mode 100644
index 000000000..31ecbb50b
--- /dev/null
+++ b/source/ap/workbone/workbone.1.diff
@@ -0,0 +1,11 @@
+--- ./workbone.1.orig	1997-12-02 14:33:22.000000000 -0800
++++ ./workbone.1	2003-02-14 00:22:20.000000000 -0800
+@@ -78,7 +78,7 @@
+ Note that total CD elapsed time includes times for non-audio data
+ tracks in addition to playable tracks.  Pushing the
+ DEL key on the numeric pad will bring up a help screen. 
+-.bp
++.PP
+ .ft CW
+ .nf
+                  +---- number pad -----+
diff --git a/source/ap/workbone/workbone.SlackBuild b/source/ap/workbone/workbone.SlackBuild
new file mode 100755
index 000000000..b2de0b48f
--- /dev/null
+++ b/source/ap/workbone/workbone.SlackBuild
@@ -0,0 +1,69 @@
+#!/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.
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-workbone
+
+VERSION=2.40
+SRCVER=2.4
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-3}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+tar xvf $CWD/workbone_$VERSION.orig.tar.gz || exit 1
+cd workbone-$SRCVER || 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 {} \;
+
+zcat $CWD/workbone_$VERSION-3.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/workbone.1.diff.gz | patch -p1 --verbose || exit 1
+
+make $NUMJOBS || make || exit 1
+
+strip workbone
+mkdir -p $PKG/usr/bin
+cat workbone > $PKG/usr/bin/workbone
+chmod 755 $PKG/usr/bin/workbone
+
+mkdir -p $PKG/usr/man/man1
+cat workbone.1 | gzip -9c > $PKG/usr/man/man1/workbone.1.gz
+
+mkdir -p $PKG/usr/doc/workbone-$VERSION
+cp -a README $PKG/usr/doc/workbone-$VERSION
+chmod 644 $PKG/usr/doc/workbone-$VERSION/README
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/workbone-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/workbone/workbone_2.40-3.diff b/source/ap/workbone/workbone_2.40-3.diff
new file mode 100644
index 000000000..ed32b2695
--- /dev/null
+++ b/source/ap/workbone/workbone_2.40-3.diff
@@ -0,0 +1,294 @@
+--- workbone-2.40.orig/hardware.c
++++ workbone-2.40/hardware.c
+@@ -177,7 +177,7 @@
+ 	if (cd_fd < 0)
+ 	{
+ 
+-		if ((cd_fd = open(cd_device, 0)) < 0)
++		if ((cd_fd = open(cd_device, O_RDONLY | O_NONBLOCK)) < 0)
+ 		{
+ 
+ 			if (errno == EACCES)
+@@ -611,7 +611,7 @@
+ 	if (fcntl(fd, F_SETLK, &fl) < 0)
+ 		exit(0);
+ 
+-	if (open(cd_device, 0) >= 0)
++	if (open(cd_device, O_RDONLY | O_NONBLOCK) >= 0)
+ 	{
+ 		brk(&end);
+ 		pause();
+--- workbone-2.40.orig/workbone.c
++++ workbone-2.40/workbone.c
+@@ -96,7 +96,7 @@
+ {
+ 
+   int sss, sel_stat, dly;
+-  int fastin = FALSE;
++  int fastin = TRUE;
+   int scmd = 0, tmppos = 0;
+   int save_track = 1;
+   fd_set rset;
+@@ -166,6 +166,22 @@
+   /* set graphics */
+   if(play_track<0) setgraf ();
+   /* check if drive is mounted (from Mark Buckaway's cdplayer code) */
++  /* link reading code from cdtool */
++
++    /* find out if the device is a link, resolve link name */
++    {
++
++    char *pszTest;
++    char caB[100];
++    int ii;
++
++    ii = readlink(cd_device, caB, sizeof(caB)-1);
++    if (ii < 0) {
++      pszTest = cd_device;
++    }else {
++      pszTest = &caB[0];
++      caB[ii] = '\0';
++    }
+   if ((fp = setmntent (MOUNTED, "r")) == NULL)
+     {
+       fprintf (stderr, "Couldn't open %s: %s\n", MOUNTED, strerror (errno));
+@@ -173,7 +189,7 @@
+     }
+   while ((mnt = getmntent (fp)) != NULL)
+     {
+-      if (strcmp (mnt->mnt_type, "iso9660") == 0)
++      if (strstr (mnt->mnt_fsname, pszTest) != NULL)
+ 	{
+ 	  fputs ("CDROM already mounted. Operation aborted.\n", stderr);
+ 	  endmntent (fp);
+@@ -181,6 +197,7 @@
+ 	}
+     }
+   endmntent (fp);
++    } /* end mount checking block */
+ 
+   /*  display control panel template */
+   if(play_track<0) control_panel ();
+--- workbone-2.40.orig/debian/README.debian
++++ workbone-2.40/debian/README.debian
+@@ -0,0 +1,14 @@
++workbone for DEBIAN
++----------------------
++
++Workbone for Debian is a nice CD player. I've created a login called
++cdplay that has workman as its shell. That way I can enjoy the
++benefits of workman without the security hassle of leaving a virtual
++console open. 
++
++Stephen Pitts <pitts2@memphisonline.com>, Tue, 29 Oct 1996 18:27:01 -0600
++
++Workbone no longer has a delay at startup. This was annoying and seems to
++serve no purpose with modern cdroms.
++
++Martin Mitchell <martin@debian.org>
+--- workbone-2.40.orig/debian/changelog
++++ workbone-2.40/debian/changelog
+@@ -0,0 +1,64 @@
++workbone (2.40-3) unstable; urgency=low
++
++  * Update to standards version 3.5.6.
++  * Update copyright file.
++  * Fix typo in package description. (closes: #125506)
++  * Add symlink to doc directory. (closes: #58785)
++  * Add open nonblocking patch from Chris Waters. (closes: #88641)
++
++ -- Martin Mitchell <martin@debian.org>  Thu, 25 Apr 2002 00:45:59 +1000
++
++workbone (2.40-2) unstable; urgency=low
++
++  * Update to standards version 3.0.1.
++  * Update copyright file.
++  * Fix cd mounted detection to ignore iso9660 fs. (closes: #32056, #33973)
++
++ -- Martin Mitchell <martin@debian.org>  Fri, 22 Oct 1999 03:04:38 +1000
++
++workbone (2.40-1) unstable; urgency=low
++
++  * New upstream release.
++  * Update copyright file.
++  * Update to standards version 2.4.1.
++  * Clean up rules file.
++
++ -- Martin Mitchell <martin@debian.org>  Wed, 14 Oct 1998 02:11:49 +1000
++
++workbone (2.31-5) unstable; urgency=low
++
++  * Libc6 compile.
++  * Remove startup delay. (#10958)
++  * New maintainer.
++
++ -- Martin Mitchell <martin@debian.org>  Tue, 11 Nov 1997 02:17:24 +1100
++
++workbone (2.31-4) unstable; urgency=low
++
++  * Added a postinst to let you know if you have a /dev/cdrom
++  * Closed all pending bugs
++
++ -- Stephen Pitts <pitts2@memphisonline.com>  Sat, 16 Nov 1996 13:27:57 -0600
++
++workbone (2.31-3) unstable; urgency=low
++
++  * Changed architecture from i386 to any
++
++ -- Stephen Pitts <pitts2@memphisonline.com>  Mon, 11 Nov 1996 20:02:03 -0600
++
++workbone (2.31-2) unstable; urgency=low
++
++  * Workbone was installed as /usr/bin instead of in /usr/bin. Whoops!
++
++ -- Stephen Pitts <pitts2@memphisonline.com>  Fri, 8 Nov 1996 20:39:05 -0600
++
++workbone (2.31-1) unstable; urgency=low
++ 
++  * Version number incremented because of questionable handling of epoch
++     by dpkg/dselect
++  * New maintainer
++  * Package rebuilt from upstream sources using deb-make!
++
++ -- Stephen Pitts <pitts2@memphisonline.com>  Tue, 29 Oct 1996 18:27:01 -0600
++
++
+--- workbone-2.40.orig/debian/control
++++ workbone-2.40/debian/control
+@@ -0,0 +1,14 @@
++Source: workbone
++Section: sound
++Priority: optional
++Maintainer: Martin Mitchell <martin@debian.org>
++Standards-Version: 3.5.6
++
++Package: workbone
++Architecture: any
++Depends: ${shlibs:Depends}
++Suggests: cdtool
++Description: A simple text-based CD player
++ Workbone is a simple, curses-based CD player that is controlled by
++ the num-lock keys. The cdtool package can be used to determine the
++ contents of a CD before playing it.  
+--- workbone-2.40.orig/debian/copyright
++++ workbone-2.40/debian/copyright
+@@ -0,0 +1,11 @@
++This package was debianized by Stephen Pitts pitts2@memphisonline.com on
++Tue, 29 Oct 1996 18:27:01 -0600.
++
++It was downloaded from ftp.ibiblio.org:/pub/linux/apps/sound/cdrom/curses
++
++This package is now maintained by Martin Mitchell <martin@debian.org>.
++
++Copyright:
++
++workbone is copyrighted under the GNU General Public License,
++version 2. A copy can be found in /usr/share/common-licenses/GPL.
+--- workbone-2.40.orig/debian/rules
++++ workbone-2.40/debian/rules
+@@ -0,0 +1,76 @@
++#!/usr/bin/make -f
++# Sample debian.rules file - for GNU Hello (1.3).
++# Copyright 1994,1995 by Ian Jackson.
++# I hereby give you perpetual unlimited permission to copy,
++# modify and relicense this file, provided that you do not remove
++# my name from the file itself.  (I assert my moral right of
++# paternity under the Copyright, Designs and Patents Act 1988.)
++# This file may have to be extensively modified
++
++package=workbone
++STRIP=strip --strip-unneeded --remove-section=.note --remove-section=.comment
++
++build:
++	$(checkdir)
++	make CFLAGS="-O2 -g" LDFLAGS=""
++	touch build
++
++clean:
++	$(checkdir)
++	-rm -f build
++	make clean
++	-rm -rf *~ debian/tmp debian/*~ debian/files debian/substvars
++
++binary-indep:	checkroot build
++	$(checkdir)
++# There are no architecture-independent files to be uploaded
++# generated by this package.  If there were any they would be
++# made here.
++
++binary-arch:	checkroot build
++	$(checkdir)
++	-rm -rf debian/tmp
++	install -d debian/tmp/DEBIAN debian/tmp/usr/share/man/man1 debian/tmp/usr/share/doc/workbone debian/tmp/usr/bin
++	install -m 0755 workbone debian/tmp/usr/bin/workbone
++	$(STRIP) debian/tmp/usr/bin/workbone
++	install -m 0644 workbone.1 debian/tmp/usr/share/man/man1
++	gzip -9v debian/tmp/usr/share/man/man1/*
++	install -m 0644 CHANGES README debian/README.debian debian/tmp/usr/share/doc/workbone
++	install -m 0644 debian/changelog debian/tmp/usr/share/doc/workbone/changelog.Debian
++	gzip -9v debian/tmp/usr/share/doc/workbone/*
++	( cd debian/tmp/usr/share/doc/workbone && ln -s CHANGES.gz changelog.gz )
++	install -m 0644 debian/copyright debian/tmp/usr/share/doc/workbone
++	install -m 0755 debian/postinst debian/tmp/DEBIAN
++	dpkg-shlibdeps debian/tmp/usr/bin/workbone
++
++        # Manage /usr/share/doc/* -> /usr/doc/* links
++	for name in workbone; \
++	do \
++		sed -e "s/PKG/$$name/g" debian/postinst > debian/$$name.postinst ; \
++		sed -e "s/PKG/$$name/g" debian/prerm > debian/$$name.prerm ; \
++		install -m 0755 debian/$$name.postinst debian/tmp/DEBIAN/postinst ; \
++		install -m 0755 debian/$$name.prerm debian/tmp/DEBIAN/prerm ; \
++		rm -f debian/$$name.postinst debian/$$name.prerm; \
++	done
++
++	dpkg-gencontrol -isp
++	chown -R root.root debian/tmp
++	chmod -R g-ws debian/tmp
++	dpkg --build debian/tmp ..
++
++define checkdir
++	test -f debian/rules
++endef
++
++# Below here is fairly generic really
++
++binary:		binary-indep binary-arch
++
++source diff:
++	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
++
++checkroot:
++	$(checkdir)
++	test root = "`whoami`"
++
++.PHONY: binary binary-arch binary-indep clean checkroot
+--- workbone-2.40.orig/debian/postinst
++++ workbone-2.40/debian/postinst
+@@ -0,0 +1,15 @@
++#!/bin/sh
++
++set -e
++
++if [ "$1" = "configure" ]; then
++	if [ -d /usr/doc -a ! -e /usr/doc/PKG -a -d /usr/share/doc/PKG ]
++	then
++		ln -sf ../share/doc/PKG /usr/doc/PKG
++	fi
++fi
++
++if [ ! -e /dev/cdrom ]
++then
++echo "Please link /dev/cdrom to your CDROM device before running workbone."
++fi
+--- workbone-2.40.orig/debian/prerm
++++ workbone-2.40/debian/prerm
+@@ -0,0 +1,8 @@
++#!/bin/sh
++
++set -e
++
++if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/PKG ]
++then
++	rm -f /usr/doc/PKG
++fi
diff --git a/source/ap/xfsdump/slack-desc b/source/ap/xfsdump/slack-desc
new file mode 100644
index 000000000..040b64cd8
--- /dev/null
+++ b/source/ap/xfsdump/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------------------------------------------------------|
+xfsdump: xfsdump (backup tools for the XFS filesystem)
+xfsdump:
+xfsdump: The xfsdump package contains the xfsdump and xfsrestore utilities for
+xfsdump: backing up and restoring XFS partitions.  xfsdump examines files in a
+xfsdump: filesystem, determines which need to be backed up, and copies those
+xfsdump: files to a specified disk, tape or other storage medium.  xfsrestore
+xfsdump: performs the inverse function of xfsdump; it can restore a full
+xfsdump: or incremental backup of a filesystem.
+xfsdump:
+xfsdump:
+xfsdump:
diff --git a/source/ap/xfsdump/xfsdump.SlackBuild b/source/ap/xfsdump/xfsdump.SlackBuild
new file mode 100755
index 000000000..378d46de2
--- /dev/null
+++ b/source/ap/xfsdump/xfsdump.SlackBuild
@@ -0,0 +1,107 @@
+#!/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=3.0.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-xfsdump
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf xfsdump-$(echo $VERSION | cut -f 1 -d '-')
+tar xvf $CWD/xfsdump-$VERSION.tar.?z* || exit 1
+cd xfsdump-$(echo $VERSION | cut -f 1 -d '-') || exit 1
+
+zcat $CWD/xfsdump.destdir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || 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 sure you have the same version of autoconf as the
+# developers did...  ;-)
+autoconf
+
+./configure \
+  --prefix=/usr \
+  --sbindir=/sbin \
+  --bindir=/usr/sbin \
+  --enable-gettext=yes \
+  --mandir=/usr/man \
+  --datadir=/usr/share \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+( cd $PKG/usr/sbin
+  rm -f xfsdump xfsrestore
+  ln -sf /sbin/xfsdump xfsdump
+  ln -sf /sbin/xfsrestore xfsrestore
+)
+
+# Strip libraries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# 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
+
+mv $PKG/usr/share/doc $PKG/usr
+( cd $PKG/usr/doc ; mv xfsdump xfsdump-$VERSION )
+cp -a \
+  README doc/COPYING doc/CREDITS doc/PORTING \
+  $PKG/usr/doc/xfsdump-$VERSION
+mkdir -p $PKG/usr/doc/xfsdump-$VERSION/html
+( cd doc
+  cp -a *.gif *.html $PKG/usr/doc/xfsdump-$VERSION/html
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/xfsdump-$(echo $VERSION | tr - _ )-$ARCH-$BUILD.txz
+
diff --git a/source/ap/xfsdump/xfsdump.destdir.diff b/source/ap/xfsdump/xfsdump.destdir.diff
new file mode 100644
index 000000000..1772465dc
--- /dev/null
+++ b/source/ap/xfsdump/xfsdump.destdir.diff
@@ -0,0 +1,36 @@
+--- ./include/buildmacros.orig	2007-09-10 21:01:12.000000000 -0500
++++ ./include/buildmacros	2008-04-01 00:06:53.000000000 -0500
+@@ -27,7 +27,7 @@
+ 	  $(LFILES:.l=.o) \
+ 	  $(YFILES:%.y=%.tab.o)
+ 
+-INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/install-sh
+ 
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
+--- ./include/builddefs.in.orig	2007-09-10 21:01:12.000000000 -0500
++++ ./include/builddefs.in	2008-04-01 00:06:53.000000000 -0500
+@@ -30,14 +30,14 @@
+ PKG_VERSION	= @pkg_version@
+ PKG_PLATFORM	= @pkg_platform@
+ PKG_DISTRIBUTION= @pkg_distribution@
+-PKG_BIN_DIR	= @bindir@
+-PKG_SBIN_DIR	= @sbindir@
+-PKG_LIB_DIR	= @libdir@@libdirsuffix@
+-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
+-PKG_INC_DIR	= @includedir@
+-PKG_MAN_DIR	= @mandir@
+-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
+-PKG_LOCALE_DIR	= @datadir@/locale
++PKG_BIN_DIR	= $(DESTDIR)@bindir@
++PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
++PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
++PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
++PKG_INC_DIR	= $(DESTDIR)@includedir@
++PKG_MAN_DIR	= $(DESTDIR)@mandir@
++PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@
++PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
+ 
+ CC		= @cc@
+ AWK		= @awk@
diff --git a/source/ap/zsh/doinst.sh b/source/ap/zsh/doinst.sh
new file mode 100644
index 000000000..5a862deb6
--- /dev/null
+++ b/source/ap/zsh/doinst.sh
@@ -0,0 +1,6 @@
+if ! grep zsh etc/shells 1> /dev/null 2> /dev/null; then
+  echo "/bin/zsh" >> etc/shells
+fi
+if [ ! -e etc/zprofile ]; then
+  ( cd etc ; ln -sf profile zprofile )
+fi
diff --git a/source/ap/zsh/slack-desc b/source/ap/zsh/slack-desc
new file mode 100644
index 000000000..8d9290001
--- /dev/null
+++ b/source/ap/zsh/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------------------------------------------------------|
+zsh: zsh (the Z shell)
+zsh:
+zsh: Zsh is a UNIX command interpreter (shell) which of the standard shells
+zsh: most resembles the Korn shell (ksh), although it is not completely
+zsh: compatible.  It includes enhancements of many types, notably in the
+zsh: command-line editor, options for customizing its behavior, filename
+zsh: globbing, features to make C-shell (csh) users feel more at home and
+zsh: extra features drawn from tcsh (another 'custom' shell).  Zsh was 
+zsh: written by Paul Falstad.
+zsh:
+zsh:
diff --git a/source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff b/source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff
new file mode 100644
index 000000000..a30665a0e
--- /dev/null
+++ b/source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff
@@ -0,0 +1,26 @@
+diff -Naur zsh-4.3.10.old/Completion/Linux/Command/_pkgtool zsh-4.3.10/Completion/Linux/Command/_pkgtool
+--- zsh-4.3.10.old/Completion/Linux/Command/_pkgtool	2005-06-24 10:15:27.000000000 -0400
++++ zsh-4.3.10/Completion/Linux/Command/_pkgtool	2009-07-07 20:39:01.000000000 -0400
+@@ -12,7 +12,7 @@
+       "-ask[always ask on package installation regardless of package's priority]" \
+       '-priority[provide a priority for the entire package list to use]:priority list:(ADD REC OPT SKP)' \
+       '-tagfile[specify a different file to use for package priorities]:tagfile:_files -/' \
+-      '*:package file:_files -g "*.tgz(-.)"'
++      '*:package file:_files -g "*.t[gblx]z(-.)"'
+   ;;
+ 
+   removepkg)
+@@ -29,11 +29,11 @@
+       '--install-new[install new packages in addition to upgrading existing ones]' \
+       '--reinstall[upgrade even when the same version is already installed]' \
+       '--verbose[show all the gory details of the upgrade]' \
+-      '*:package file:_files -g "*.tgz(-.)"'
++      '*:package file:_files -g "*.t[gblx]z(-.)"'
+   ;;
+ 
+   explodepkg)
+-    _wanted file expl 'package file' _files -g '*.tgz(-.)'
++    _wanted file expl 'package file' _files -g '*.t[gblx]z(-.)'
+   ;;
+ 
+   makepkg)
diff --git a/source/ap/zsh/zsh.SlackBuild b/source/ap/zsh/zsh.SlackBuild
new file mode 100755
index 000000000..2a874fbf3
--- /dev/null
+++ b/source/ap/zsh/zsh.SlackBuild
@@ -0,0 +1,116 @@
+#!/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=4.3.10
+ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-1}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-zsh
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf zsh-$VERSION
+tar xvf $CWD/zsh-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/zsh-$VERSION-doc.tar.?z* || exit 1
+cd zsh-$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 {} \;
+
+# Add t[blx]z to the zsh tab completion stuff
+zcat $CWD/zsh-4.3.10-add_new_pkg_completion.diff.gz | patch -p1 || exit 1
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/zsh-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mv $PKG/usr/bin $PKG
+( cd $PKG/bin ; ln -sf zsh zsh-$VERSION )
+
+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/etc
+
+mkdir -p $PKG/usr/doc/zsh-$VERSION/html-docs
+cp -a INSTALL LICENCE META-FAQ README $PKG/usr/doc/zsh-$VERSION
+cp -a Doc/*.html $PKG/usr/doc/zsh-$VERSION/html-docs
+
+mkdir -p $PKG/usr/info
+cp -a Doc/*info* $PKG/usr/info
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+mkdir $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/zsh-$VERSION-$ARCH-$BUILD.txz
+